Merge pull request #8 from Exabyte-io/fix/SOF-6197

Fix/sof 6197

Author: timurbazhirov

package-lock.json

@@ -38,10 +38,10 @@
         "@babel/preset-react": "7.16.7",
         "@babel/register": "^7.16.0",
         "@babel/runtime-corejs3": "7.16.8",
-        "@exabyte-io/ade.js": "2022.7.27-0",
+        "@exabyte-io/ade.js": "2022.9.2-0",
         "@exabyte-io/ide.js": "2022.7.28-1",
-        "@exabyte-io/mode.js": "2022.8.30-0",
-        "@exabyte-io/code.js": "2022.8.30-0",
+        "@exabyte-io/mode.js": "2022.8.31-0",
+        "@exabyte-io/code.js": "2022.9.2-0",
         "js-yaml": "^4.1.0",
         "lodash": "^4.17.21",
         "mixwith": "^0.1.1",

package.json

@@ -1,4 +1,5 @@
 import { context } from "@exabyte-io/mode.js";
+
 const {
     BoundaryConditionsFormDataProvider,
     MLSettingsContextProvider,
@@ -12,41 +13,68 @@ const {
 } = context;
 
 const CONTEXT_DOMAINS = {
-    important: "important",  // used to generate `ImportantSettings` form
-}
+    important: "important", // used to generate `ImportantSettings` form
+};
 
-const _makeImportant = (config) => Object.assign(config, {domain: CONTEXT_DOMAINS.important});
+const _makeImportant = (config) => Object.assign(config, { domain: CONTEXT_DOMAINS.important });
 
-/**********************************
+/** ********************************
  * Method-based context providers *
- **********************************/
-
-// NOTE: subworkflow-level data manager. Will override the unit-level data with the same name via subworkflow context.
-export const PlanewaveCutoffDataManager = PlanewaveCutoffsContextProvider.getConstructorConfig(_makeImportant({
-    name: "cutoffs",
-    entityName: "subworkflow"
-}));
-export const KGridFormDataManager = PointsGridFormDataProvider.getConstructorConfig(_makeImportant({name: "kgrid"}));
-export const QGridFormDataManager = PointsGridFormDataProvider.getConstructorConfig(_makeImportant({
-    name: "qgrid",
-    divisor: 5,  // Using less points for Qgrid by default
-}));
-export const IGridFormDataManager = PointsGridFormDataProvider.getConstructorConfig(_makeImportant({
-    name: "igrid",
-    divisor: 0.2,  // Using more points for interpolated grid by default
-}));
-
-export const QPathFormDataManager = PointsPathFormDataProvider.getConstructorConfig(_makeImportant({name: "qpath"}));
-export const IPathFormDataManager = PointsPathFormDataProvider.getConstructorConfig(_makeImportant({name: "ipath"}));
-export const KPathFormDataManager = PointsPathFormDataProvider.getConstructorConfig(_makeImportant({name: "kpath"}));
-export const ExplicitKPathFormDataManager = ExplicitPointsPathFormDataProvider.getConstructorConfig(_makeImportant({name: "explicitKPath"}));
-export const ExplicitKPath2PIBAFormDataManager = ExplicitPointsPath2PIBAFormDataProvider.getConstructorConfig(_makeImportant({name: "explicitKPath2PIBA"}));
-
-// NEBFormDataManager context is stored under the same key (`input`) as InputDataManager contexts.
-export const NEBFormDataManager = NEBFormDataProvider.getConstructorConfig(_makeImportant({name: "neb"}));
-
-export const BoundaryConditionsFormDataManager = BoundaryConditionsFormDataProvider.getConstructorConfig(_makeImportant({name: "boundaryConditions"}));
-
-export const MLSettingsDataManager = MLSettingsContextProvider.getConstructorConfig(_makeImportant({name: "mlSettings"}));
-export const MLTrainTestSplitDataManager = MLTrainTestSplitContextProvider.getConstructorConfig(_makeImportant({name: "mlTrainTestSplit"}));
+ ********************************* */
 
+export const wodeProviders = {
+    // NOTE: subworkflow-level data manager. Will override the unit-level data with the same name via subworkflow context.
+    PlanewaveCutoffDataManager: {
+        providerCls: PlanewaveCutoffsContextProvider,
+        config: _makeImportant({ name: "cutoffs", entityName: "subworkflow" }),
+    },
+    KGridFormDataManager: {
+        providerCls: PointsGridFormDataProvider,
+        config: _makeImportant({ name: "kgrid" }),
+    },
+    QGridFormDataManager: {
+        providerCls: PointsGridFormDataProvider,
+        config: _makeImportant({ name: "qgrid", divisor: 5 }), // Using less points for Qgrid by default
+    },
+    IGridFormDataManager: {
+        providerCls: PointsGridFormDataProvider,
+        config: _makeImportant({ name: "igrid", divisor: 0.2 }), // Using more points for interpolated grid by default
+    },
+    QPathFormDataManager: {
+        providerCls: PointsPathFormDataProvider,
+        config: _makeImportant({ name: "qpath" }),
+    },
+    IPathFormDataManager: {
+        providerCls: PointsPathFormDataProvider,
+        config: _makeImportant({ name: "ipath" }),
+    },
+    KPathFormDataManager: {
+        providerCls: PointsPathFormDataProvider,
+        config: _makeImportant({ name: "kpath" }),
+    },
+    ExplicitKPathFormDataManager: {
+        providerCls: ExplicitPointsPathFormDataProvider,
+        config: _makeImportant({ name: "explicitKPath" }),
+    },
+    ExplicitKPath2PIBAFormDataManager: {
+        providerCls: ExplicitPointsPath2PIBAFormDataProvider,
+        config: _makeImportant({ name: "explicitKPath2PIBA" }),
+    },
+    // NEBFormDataManager context is stored under the same key (`input`) as InputDataManager contexts.
+    NEBFormDataManager: {
+        providerCls: NEBFormDataProvider,
+        config: _makeImportant({ name: "neb" }),
+    },
+    BoundaryConditionsFormDataManager: {
+        providerCls: BoundaryConditionsFormDataProvider,
+        config: _makeImportant({ name: "boundaryConditions" }),
+    },
+    MLSettingsDataManager: {
+        providerCls: MLSettingsContextProvider,
+        config: _makeImportant({ name: "mlSettings" }),
+    },
+    MLTrainTestSplitDataManager: {
+        providerCls: MLTrainTestSplitContextProvider,
+        config: _makeImportant({ name: "mlTrainTestSplit" }),
+    },
+};

src/context/providers.js

@@ -1,13 +1,6 @@
 import { ContextProviderRegistry as clsInstance } from "@exabyte-io/ade.js";
-import _ from "underscore";
+import { extendAndPatchRegistry } from "@exabyte-io/code.js/dist/context";
 
-import * as allContextProviders from "./providers";
+import { wodeProviders } from "./providers";
 
-_.map(allContextProviders, (instance, name) =>
-    clsInstance.addProvider({
-        instance,
-        name,
-    }),
-);
-
-export const ContextProviderRegistry = clsInstance;
+export const ContextProviderRegistry = extendAndPatchRegistry(clsInstance, wodeProviders);