WIP build up displaysets.
This commit is contained in:
1 parent
d4f51c5e3c
commit
5c19671d3c
26 files changed
+1496
-350
No files matched your search
@@ -25,15 +25,15 @@ export default class ExtensionManager {
|
||||
*
|
||||
* @param {Object[]} extensions - Array of extensions
|
||||
*/
|
||||
registerExtensions = extensions => {
|
||||
registerExtensions = (extensions, dataSources) => {
|
||||
extensions.forEach(extension => {
|
||||
const hasConfiguration = Array.isArray(extension);
|
||||
|
||||
if (hasConfiguration) {
|
||||
const [ohifExtension, configuration] = extension;
|
||||
this.registerExtension(ohifExtension, configuration);
|
||||
this.registerExtension(ohifExtension, dataSources, configuration);
|
||||
} else {
|
||||
this.registerExtension(extension);
|
||||
this.registerExtension(extension, dataSources);
|
||||
}
|
||||
});
|
||||
};
|
||||
@@ -44,7 +44,7 @@ export default class ExtensionManager {
|
||||
* @param {Object} extension
|
||||
* @param {Object} configuration
|
||||
*/
|
||||
registerExtension = (extension, configuration = {}) => {
|
||||
registerExtension = (extension, dataSources, configuration = {}) => {
|
||||
if (!extension) {
|
||||
log.warn(
|
||||
'Attempting to register a null/undefined extension. Exiting early.'
|
||||
@@ -89,7 +89,12 @@ export default class ExtensionManager {
|
||||
);
|
||||
|
||||
if (extensionModule) {
|
||||
this._initSpecialModuleTypes(moduleType, extensionModule);
|
||||
this._initSpecialModuleTypes(
|
||||
extensionId,
|
||||
moduleType,
|
||||
extensionModule,
|
||||
dataSources
|
||||
);
|
||||
|
||||
this.modules[moduleType].push({
|
||||
extensionId,
|
||||
@@ -112,9 +117,9 @@ export default class ExtensionManager {
|
||||
return this.modulesMap[stringEntry];
|
||||
};
|
||||
|
||||
getDataSource = dataSourceId => {
|
||||
getDataSources = dataSourceName => {
|
||||
// Note: this currently uses the data source name, which feels weird...
|
||||
return this.dataSourceMap[dataSourceId];
|
||||
return this.dataSourceMap[dataSourceName];
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -155,7 +160,12 @@ export default class ExtensionManager {
|
||||
}
|
||||
};
|
||||
|
||||
_initSpecialModuleTypes = (moduleType, extensionModule) => {
|
||||
_initSpecialModuleTypes = (
|
||||
extensionId,
|
||||
moduleType,
|
||||
extensionModule,
|
||||
dataSources
|
||||
) => {
|
||||
switch (moduleType) {
|
||||
case 'commandsModule': {
|
||||
const { definitions, defaultContext } = extensionModule;
|
||||
@@ -168,7 +178,25 @@ export default class ExtensionManager {
|
||||
}
|
||||
case 'dataSourcesModule': {
|
||||
extensionModule.forEach(element => {
|
||||
this.dataSourceMap[element.name] = element;
|
||||
const namespace = `${extensionId}.${moduleType}.${element.name}`;
|
||||
|
||||
dataSources.forEach(dataSource => {
|
||||
if (dataSource.namespace === namespace) {
|
||||
const dataSourceInstance = element.createDataSource(
|
||||
dataSource.configuration
|
||||
);
|
||||
|
||||
if (this.dataSourceMap[dataSource.sourceName]) {
|
||||
this.dataSourceMap[dataSource.sourceName].push(
|
||||
dataSourceInstance
|
||||
);
|
||||
} else {
|
||||
this.dataSourceMap[dataSource.sourceName] = [
|
||||
dataSourceInstance,
|
||||
];
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
break;
|
||||
|
||||
Reference in new issue
Block a user