Skip to content

Cache data provider config #1400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
srosset81 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Cache data provider config #1400

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 39 additions & 17 deletions src/frontend/packages/semantic-data-provider/src/dataProvider/dataProvider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,45 +21,67 @@ const dataProvider = originalConfig => {
// Keep in memory for refresh
let config = { ...originalConfig };

const prepareConfig = async () => {
config.dataServers ??= {};
const prepareConfig = async loadFromCache => {
// Get the config immediately from cache and fetch the latest version in background
if (loadFromCache) {
const cachedConfig = localStorage.getItem('dataProvider.cache');
if (cachedConfig) {
config.dataServers = JSON.parse(localStorage.getItem('dataProvider.dataServers'));
config.ontologies = JSON.parse(localStorage.getItem('dataProvider.ontologies'));
config.jsonContext = JSON.parse(localStorage.getItem('dataProvider.jsonContext'));
config.resources = JSON.parse(localStorage.getItem('dataProvider.resources'));
config.httpClient = httpClient(config.dataServers);
config.ready = true; // Mark config as ready so that waitForPrepareConfig is not blocked
}
}

let newConfig = { ...originalConfig };

newConfig.dataServers ??= {};

// Configure httpClient with initial data servers, so that plugins may use it
config.httpClient = httpClient(config.dataServers);
newConfig.httpClient = httpClient(originalConfig.dataServers);
// Useful for debugging.
document.httpClient = config.httpClient;
document.httpClient = newConfig.httpClient;

for (const plugin of config.plugins) {
for (const plugin of newConfig.plugins) {
if (plugin.transformConfig) {
config = await plugin.transformConfig(config);
newConfig = await plugin.transformConfig(newConfig);
}
}

// Configure again httpClient with possibly updated data servers
config.httpClient = httpClient(config.dataServers);
newConfig.httpClient = httpClient(newConfig.dataServers);

if (!config.ontologies && config.jsonContext) {
config.ontologies = await getOntologiesFromContext(config.jsonContext);
} else if (!config.jsonContext && config.ontologies) {
config.jsonContext = config.ontologies;
} else if (!config.jsonContext && !config.ontologies) {
if (!newConfig.ontologies && newConfig.jsonContext) {
newConfig.ontologies = await getOntologiesFromContext(newConfig.jsonContext);
} else if (!newConfig.jsonContext && newConfig.ontologies) {
newConfig.jsonContext = newConfig.ontologies;
} else if (!newConfig.jsonContext && !newConfig.ontologies) {
throw new Error(`Either the JSON context or the ontologies must be set`);
}

if (!config.returnFailedResources) config.returnFailedResources = false;
if (!newConfig.returnFailedResources) newConfig.returnFailedResources = false;

config = await normalizeConfig(newConfig);
config.ready = true;

config = await normalizeConfig(config);
localStorage.setItem('dataProvider.dataServers', JSON.stringify(config.dataServers));
localStorage.setItem('dataProvider.ontologies', JSON.stringify(config.ontologies));
localStorage.setItem('dataProvider.jsonContext', JSON.stringify(config.jsonContext));
localStorage.setItem('dataProvider.resources', JSON.stringify(config.resources));
localStorage.setItem('dataProvider.cache', true);

console.log('Config after plugins', config);
};

// Immediately call the preload plugins
const prepareConfigPromise = prepareConfig();
const prepareConfigPromise = prepareConfig(true);

const waitForPrepareConfig =
method =>
async (...arg) => {
await prepareConfigPromise; // Return immediately if plugins have already been loaded
if (!config.ready) await prepareConfigPromise; // Return immediately if plugins have already been loaded
return method(config)(...arg);
};

Expand All @@ -86,7 +108,7 @@ const dataProvider = originalConfig => {
getConfig: waitForPrepareConfig(c => () => c),
refreshConfig: async () => {
config = { ...originalConfig };
await prepareConfig();
await prepareConfig(false);
return config;
}
};
Expand Down