Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
2 changes: 1 addition & 1 deletion dist/js/subworkflows/create.js
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ function createSubworkflow({
function createSubworkflowByName({
appName,
swfName,
workflowSubworkflowMapByApplication = _standata.workflowSubforkflowMapByApplication,
workflowSubworkflowMapByApplication = _standata.workflowSubworkflowMapByApplication,
...swArgs
}) {
const {
Expand Down
4 changes: 2 additions & 2 deletions dist/js/workflows/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ _JSONSchemasInterface.default.setSchemas(_schemas.default);
function createWorkflows({
appName = null,
workflowCls = _workflow.Workflow,
workflowSubworkflowMapByApplication = _standata.workflowSubforkflowMapByApplication,
workflowSubworkflowMapByApplication = _standata.workflowSubworkflowMapByApplication,
...swArgs
}) {
let apps = appName !== null ? [appName] : _ade.allApplications;
Expand All @@ -51,7 +51,7 @@ function createWorkflows({
if (appName === null) {
if (apps && apps.sort().join(",") !== allApplicationsFromWorkflowData.sort().join(",")) {
// eslint-disable-next-line no-console
console.warn(`Warning: allApplications and allApplicationsFromWorkflowData do not match:
console.warn(`Warning: allApplications and allApplicationsFromWorkflowData do not match:
${apps.sort().join(",")} !== ${allApplicationsFromWorkflowData.sort().join(",")}`);
console.warn("Using allApplicationsFromWorkflowData");
}
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"@mat3ra/code": "2025.10.24-0",
"@mat3ra/esse": "2025.11.26-0",
"@mat3ra/made": "2025.7.15-0",
"@mat3ra/standata": "2025.11.12-0",
"@mat3ra/standata": "git+https://github.com/Exabyte-io/standata.git#3c5b6365a6a5fcfbbd4e5da3a30cd5dd4c0301ee",
"chai": "^4.3.4",
"eslint": "7.32.0",
"eslint-config-airbnb": "19.0.2",
Expand Down
7 changes: 5 additions & 2 deletions src/js/subworkflows/create.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ import {
MethodFactory,
ModelFactory,
} from "@mat3ra/mode";
import { ApplicationMethodStandata, workflowSubforkflowMapByApplication } from "@mat3ra/standata";
import {
ApplicationMethodStandata,
workflowSubworkflowMapByApplication as allWorkflows,
} from "@mat3ra/standata";
import _ from "lodash";

import { UnitFactory } from "../units";
Expand Down Expand Up @@ -202,7 +205,7 @@ function createSubworkflow({
function createSubworkflowByName({
appName,
swfName,
workflowSubworkflowMapByApplication = workflowSubforkflowMapByApplication,
workflowSubworkflowMapByApplication = allWorkflows,
...swArgs
}) {
const { subworkflows } = workflowSubworkflowMapByApplication;
Expand Down
6 changes: 3 additions & 3 deletions src/js/workflows/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { allApplications } from "@mat3ra/ade";
import JSONSchemasInterface from "@mat3ra/esse/dist/js/esse/JSONSchemasInterface";
import schemas from "@mat3ra/esse/dist/js/schemas.json";
import { workflowSubforkflowMapByApplication } from "@mat3ra/standata";
import { workflowSubworkflowMapByApplication as allWorkflows } from "@mat3ra/standata";

// Import Template here to apply context provider patch
// eslint-disable-next-line no-unused-vars
Expand All @@ -23,7 +23,7 @@ JSONSchemasInterface.setSchemas(schemas);
function createWorkflows({
appName = null,
workflowCls = Workflow,
workflowSubworkflowMapByApplication = workflowSubforkflowMapByApplication,
workflowSubworkflowMapByApplication = allWorkflows,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's just fix the typo and not introduce allWorkflows

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is impossible, we need to import object and then assign it to a prop with the same name

...swArgs
}) {
let apps = appName !== null ? [appName] : allApplications;
Expand All @@ -35,7 +35,7 @@ function createWorkflows({
if (apps && apps.sort().join(",") !== allApplicationsFromWorkflowData.sort().join(",")) {
// eslint-disable-next-line no-console
console.warn(
`Warning: allApplications and allApplicationsFromWorkflowData do not match:
`Warning: allApplications and allApplicationsFromWorkflowData do not match:
${apps.sort().join(",")} !== ${allApplicationsFromWorkflowData.sort().join(",")}`,
);
console.warn("Using allApplicationsFromWorkflowData");
Expand Down
4 changes: 2 additions & 2 deletions tests/js/subworkflow.test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ApplicationRegistry } from "@mat3ra/ade";
import { workflowSubforkflowMapByApplication } from "@mat3ra/standata";
import { workflowSubworkflowMapByApplication } from "@mat3ra/standata";
import { expect } from "chai";

import { createSubworkflowByName, Subworkflow } from "../../src/js/subworkflows";
Expand Down Expand Up @@ -27,7 +27,7 @@ describe("subworkflows", () => {
const subworkflow = createSubworkflowByName({
appName: "espresso",
swfName: "total_energy",
workflowSubworkflowMapByApplication: workflowSubforkflowMapByApplication,
workflowSubworkflowMapByApplication,
});
const newContext = { testKey: "testValue" };
subworkflow.updateContext(newContext);
Expand Down
22 changes: 11 additions & 11 deletions tests/js/workflow.test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { WorkflowStandata, workflowSubforkflowMapByApplication } from "@mat3ra/standata";
import { WorkflowStandata, workflowSubworkflowMapByApplication } from "@mat3ra/standata";
import { expect } from "chai";

import { builders, createWorkflows, Subworkflow, UnitFactory, Workflow } from "../../src/js";
Expand Down Expand Up @@ -105,14 +105,14 @@ describe("workflows", () => {
Workflow.usePredefinedIds = true;
const workflow1 = createWorkflow({
appName: "espresso",
workflowData: workflowSubforkflowMapByApplication.workflows.espresso.total_energy,
workflowSubworkflowMapByApplication: workflowSubforkflowMapByApplication,
workflowData: workflowSubworkflowMapByApplication.workflows.espresso.total_energy,
workflowSubworkflowMapByApplication,
workflowCls: Workflow,
});
const workflow2 = createWorkflow({
appName: "vasp",
workflowData: workflowSubforkflowMapByApplication.workflows.vasp.total_energy,
workflowSubworkflowMapByApplication: workflowSubforkflowMapByApplication,
workflowData: workflowSubworkflowMapByApplication.workflows.vasp.total_energy,
workflowSubworkflowMapByApplication,
workflowCls: Workflow,
});
expect(workflow1._id).to.not.equal(workflow2._id);
Expand All @@ -124,8 +124,8 @@ describe("workflow property", () => {
// Nudged Elastic Band is multi-material
const mmWorkflow = createWorkflow({
appName: "espresso",
workflowData: workflowSubforkflowMapByApplication.workflows.espresso.neb,
workflowSubworkflowMapByApplication: workflowSubforkflowMapByApplication,
workflowData: workflowSubworkflowMapByApplication.workflows.espresso.neb,
workflowSubworkflowMapByApplication,
});
// eslint-disable-next-line no-unused-expressions
expect(mmWorkflow.isMultiMaterial).to.be.true;
Expand All @@ -134,8 +134,8 @@ describe("workflow property", () => {
it("properties are not empty", () => {
const workflow = createWorkflow({
appName: "espresso",
workflowData: workflowSubforkflowMapByApplication.workflows.espresso.total_energy,
workflowSubworkflowMapByApplication: workflowSubforkflowMapByApplication,
workflowData: workflowSubworkflowMapByApplication.workflows.espresso.total_energy,
workflowSubworkflowMapByApplication,
});

// eslint-disable-next-line no-unused-expressions
Expand Down Expand Up @@ -189,8 +189,8 @@ describe("Workflow UUIDs", () => {
const createTestWorkflow = () =>
createWorkflow({
appName: "espresso",
workflowData: workflowSubforkflowMapByApplication.workflows.espresso.total_energy,
workflowSubworkflowMapByApplication: workflowSubforkflowMapByApplication,
workflowData: workflowSubworkflowMapByApplication.workflows.espresso.total_energy,
workflowSubworkflowMapByApplication,
workflowCls: Workflow,
});

Expand Down
Loading