Merge pull request #31 from Exabyte-io/feat/SOF-6379

SOF-6379: Update templates for PointsPathFormDataProvider
Exabyte-io · Feb 23, 2023 · c8811c1 · c8811c1
2 parents 2a116e3 + 1db2a50
commit c8811c1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -70,6 +70,7 @@
         "prettier": "^2.7.1"
     },
     "peerDependencies": {
+        "@exabyte-io/made.js": "*",
         "@exabyte-io/ade.js": "*",
         "@exabyte-io/ide.js": "*",
         "@exabyte-io/mode.js": "*",

diff --git a/src/context/providers/PointsGridFormDataProvider.js b/src/context/providers/PointsGridFormDataProvider.js
@@ -59,7 +59,7 @@ export class PointsGridFormDataProvider extends mix(JSONSchemaFormDataProvider).
             return {
                 ...vector,
                 items: {
-                    type: "number",
+                    type: this.isUsingJinjaVariables ? "string" : "number",
                     default: defaultValue,
                 },
             };
@@ -154,7 +154,17 @@ export class PointsGridFormDataProvider extends mix(JSONSchemaFormDataProvider).
         return grid.dimensions.reduce((a, b) => a * b) * nAtoms;
     }
 
+    static _canTransform(data) {
+        return (
+            (data.preferKPPRA && data.KPPRA) ||
+            (!data.preferKPPRA && data.dimensions.every((d) => typeof d === "number"))
+        );
+    }
+
     transformData(data) {
+        if (!this.constructor._canTransform(data)) {
+            return data;
+        }
         // 1. check if KPPRA is preferred
         if (data.preferKPPRA) {
             // 2. KPPRA is preferred => recalculate grid; NOTE: `data.KPPRA` is undefined at first

diff --git a/src/context/providers/PointsPathFormDataProvider.js b/src/context/providers/PointsPathFormDataProvider.js
@@ -81,7 +81,7 @@ export class PointsPathFormDataProvider extends mix(JSONSchemaFormDataProvider).
         };
     }
 
-    get fields() {
+    get templates() {
         const hasRequiredFn = typeof this.material.getBrillouinZoneImageComponent === "function";
         if (!hasRequiredFn) {
             console.log(
@@ -92,7 +92,7 @@ export class PointsPathFormDataProvider extends mix(JSONSchemaFormDataProvider).
         }
         return {
             // eslint-disable-next-line no-unused-vars
-            TitleField: ({ title, required }) =>
+            TitleFieldTemplate: ({ title, required }) =>
                 this.material.getBrillouinZoneImageComponent(title),
         };
     }