Merge pull request #71 from Exabyte-io/update/SOF-7161

SOF-7161: esse schema

Author: k0stik

package-lock.json

@@ -48,7 +48,8 @@
     "devDependencies": {
         "@exabyte-io/ade.js": "2024.1.23-1",
         "@exabyte-io/application-flavors.js": "2024.1.23-1",
-        "@exabyte-io/code.js": "2024.1.18-0",
+        "@exabyte-io/code.js": "2024.2.20-0",
+        "@mat3ra/esse": "2024.2.19-1",
         "@exabyte-io/eslint-config": "^2022.11.17-0",
         "@exabyte-io/ide.js": "2022.7.28-1",
         "@exabyte-io/made.js": "2023.3.8-0",
@@ -75,7 +76,8 @@
         "@exabyte-io/ade.js": "*",
         "@exabyte-io/ide.js": "*",
         "@exabyte-io/mode.js": "*",
-        "@exabyte-io/code.js": "*"
+        "@exabyte-io/code.js": "*",
+        "@mat3ra/esse": "*"
     },
     "engines": {
         "node": ">=12.0.0"

package.json

@@ -90,7 +90,9 @@ export class Subworkflow extends BaseSubworkflow {
             _id: Cls.generateSubworkflowId(),
             name,
             application: application.toJSON(),
-            properties: lodash.sortedUniq(lodash.flatten(units.map((x) => x.resultNames))),
+            properties: lodash.sortedUniq(
+                lodash.flatten(units.filter((x) => x.resultNames).map((x) => x.resultNames)),
+            ),
             model: {
                 ...model.toJSON(),
                 method: method.toJSON(),
@@ -149,7 +151,7 @@ export class Subworkflow extends BaseSubworkflow {
             ...super.toJSON(exclude),
             model: this.model.toJSON(),
             units: this.units.map((x) => x.toJSON()),
-            compute: this.compute,
+            ...(this.compute ? { compute: this.compute } : {}), // {"compute": null } won't pass esse validation
         };
     }
 

src/subworkflows/subworkflow.js

@@ -3,6 +3,7 @@ import { NamedDefaultableRepetitionContextAndRenderInMemoryEntity } from "@exaby
 import { calculateHashFromObject, getUUID } from "@exabyte-io/code.js/dist/utils";
 import { ComputedEntityMixin, getDefaultComputeConfig } from "@exabyte-io/ide.js";
 import { tree } from "@exabyte-io/mode.js";
+import workflowSchema from "@mat3ra/esse/lib/js/schema/workflow.json";
 import lodash from "lodash";
 import { mix } from "mixwith";
 import _ from "underscore";
@@ -27,6 +28,8 @@ class BaseWorkflow extends mix(NamedDefaultableRepetitionContextAndRenderInMemor
 export class Workflow extends BaseWorkflow {
     static getDefaultComputeConfig = getDefaultComputeConfig;
 
+    static jsonSchema = workflowSchema;
+
     constructor(config) {
         super(config);
         this._Subworkflow = Subworkflow;
@@ -152,7 +155,7 @@ export class Workflow extends BaseWorkflow {
                 units: this._units.map((x) => x.toJSON()),
                 subworkflows: this._subworkflows.map((x) => x.toJSON()),
                 workflows: this.workflows.map((x) => x.toJSON()),
-                compute: this.compute,
+                ...(this.compute ? { compute: this.compute } : {}), // {"compute": null } won't pass esse validation
             },
             exclude,
         );

src/workflows/workflow.js

@@ -13,7 +13,7 @@ describe("assignement unit", () => {
                 index: 0,
                 type: "assignment",
                 config: {
-                    attributes: { operand: "someOtherOperand", value: 42 },
+                    attributes: { operand: "someOtherOperand", value: "42" },
                 },
             },
         ];

tests/patchUnit.test.js

@@ -1,6 +1,6 @@
 import { expect } from "chai";
 
-import { createWorkflows } from "../src/workflows";
+import { createWorkflows, Workflow } from "../src/workflows";
 import { createWorkflow } from "../src/workflows/create";
 import { workflowData as allWorkflowData } from "../src/workflows/workflows";
 
@@ -10,6 +10,15 @@ describe("workflows", () => {
         workflows.map((wf) => {
             // eslint-disable-next-line no-unused-expressions
             expect(wf).to.exist;
+            // eslint-disable-next-line no-unused-expressions
+            expect(wf.isValid()).to.be.true;
+
+            const wfCopy = new Workflow(wf.toJSON());
+
+            // eslint-disable-next-line no-unused-expressions
+            expect(wfCopy.isValid()).to.be.true;
+
+            // expect(wf.validate()).to.be.true;
             return null;
         });
     });