Merge pull request #249 from Exabyte-io/fix/remove-made-material

SOF-7444 fix made material usage

Author: VsevolodX

dist/MDMaterial.d.ts

@@ -0,0 +1,40 @@
+import { Made } from "@mat3ra/made";
+export class MDMaterial extends Made.Material {
+    constructor(config) {
+        super({ ...Made.defaultMaterialConfig, ...config });
+    }
+    static fromMadeMaterial(madeMaterial, metadata = {}) {
+        return new MDMaterial({ ...madeMaterial.toJSON(), ...metadata });
+    }
+    get id() {
+        return this.prop("_id", "");
+    }
+    set id(id) {
+        this.setProp("_id", id);
+    }
+    get isUpdated() {
+        return this.prop("isUpdated", false);
+    }
+    set isUpdated(bool) {
+        this.setProp("isUpdated", bool);
+    }
+    get metadata() {
+        return this.prop("metadata", {});
+    }
+    set metadata(object) {
+        this.setProp("metadata", object);
+    }
+    toJSON() {
+        return {
+            ...super.toJSON(),
+            _id: this.id,
+            metadata: this.metadata,
+        };
+    }
+    cleanOnCopy() {
+        ["_id"].forEach((p) => this.unsetProp(p));
+    }
+    get boundaryConditions() {
+        return this.metadata.boundaryConditions || {};
+    }
+}

dist/MDMaterial.js

@@ -23,7 +23,7 @@ import HeaderMenuToolbar from "./components/header_menu/HeaderMenuToolbar";
 import ItemsList from "./components/items_list/ItemsList";
 import BasisEditor from "./components/source_editor/Basis";
 import LatticeEditor from "./components/source_editor/Lattice";
-import { Material } from "./material";
+import { MDMaterial } from "./MDMaterial";
 import { theme } from "./settings";
 const data = MaterialStandata.runtimeData;
 const materialConfigs = Object.values(data.filesMapByName);
@@ -140,10 +140,7 @@ class MaterialsDesigner extends mix(React.Component).with(FullscreenComponentMix
                                         }, className: "materials-designer-source-editor", children: [_jsx(Grid, { item: true, xs: 12, mt: 0.25, children: _jsx(LatticeEditor, { material: this.props.material, onUpdate: this.props.onUpdate }) }), _jsx(Grid, { item: true, xs: 12, mt: 0.25, children: _jsx(BasisEditor, { material: this.props.material, onUpdate: this.props.onUpdate }) })] })), isVisibleThreeDEditorFullscreen && (
                                     // eslint-disable-next-line react/jsx-props-no-spreading
                                     _jsx(Grid, { item: true, ...gridConfig[3], mt: 0.25, children: _jsx(ThreeDEditorFullscreen, { editable: true, material: this.props.material, isConventionalCellShown: this.props.isConventionalCellShown, boundaryConditions: this.props.material.boundaryConditions, onUpdate: (material) => {
-                                                // convert made material to MD material and re-set metadata
-                                                const newMaterial = Material.createFromMadeMaterial(material);
-                                                newMaterial.metadata =
-                                                    this.props.material.metadata || {};
+                                                const newMaterial = MDMaterial.fromMadeMaterial(material, this.props.material.metadata);
                                                 this.props.onUpdate(newMaterial);
                                             } }) })), this.state.isVisibleJupyterLiteSessionDrawer && (_jsx(JupyterLiteSessionDrawer, { materials: this.props.materials, show: this.state.isVisibleJupyterLiteSessionDrawer, onMaterialsUpdate: (...args) => {
                                             this.props.onAdd(...args);

dist/MaterialsDesigner.js

@@ -10,11 +10,11 @@ import logger from "redux-logger";
 import { ActionCreators } from "redux-undo";
 import _ from "underscore";
 import { addMaterials, cloneOneMaterial, exportMaterials, generateSupercellForOneMaterial, generateSurfaceForOneMaterial, MATERIALS_SAVE, materialsToggleIsNonPeriodicForOne, removeMaterials, resetState, saveMaterials, setBoundaryConditionsForOneMaterial, updateMaterialsIndex, updateNameForOneMaterial, updateOneMaterial, } from "./actions";
-import { Material } from "./material";
 import MaterialsDesignerComponent from "./MaterialsDesigner";
+import { MDMaterial } from "./MDMaterial";
 import { createMaterialsDesignerReducer } from "./reducers";
 import ReduxProvider from "./utils/react/provider";
-const initialMaterials = Array(1).fill(new Material());
+const initialMaterials = Array(1).fill(new MDMaterial());
 const initialState = ({ materials = initialMaterials } = {}) => {
     return {
         index: 0,

dist/MaterialsDesignerContainer.js

@@ -6,7 +6,7 @@ import PropTypes from "prop-types";
 import React from "react";
 import _ from "underscore";
 import { displayMessage } from "../../../i18n/messages";
-import { Material } from "../../../material";
+import { MDMaterial } from "../../../MDMaterial";
 import BasisText from "../../source_editor/BasisText";
 // TODO: adjust this component and SourceEditor to inherit from the same one - XYZBasisEditor
 class CombinatorialBasisDialog extends React.Component {
@@ -50,7 +50,7 @@ class CombinatorialBasisDialog extends React.Component {
                 basis: basis.toJSON(),
                 name: `${material.name} - ${basis.formula}`,
             };
-            const newMaterial = new Material(newMaterialConfig);
+            const newMaterial = new MDMaterial(newMaterialConfig);
             newMaterial.cleanOnCopy();
             newMaterials.push(newMaterial);
         });

dist/components/3d_editor/advanced_geometry/CombinatorialBasisDialog.js

@@ -8,7 +8,7 @@ import PropTypes from "prop-types";
 import React from "react";
 import _ from "underscore";
 import { displayMessage } from "../../../i18n/messages";
-import { Material } from "../../../material";
+import { MDMaterial } from "../../../MDMaterial";
 import BasisText from "../../source_editor/BasisText";
 class InterpolateBasesDialog extends React.Component {
     constructor(props) {
@@ -57,7 +57,7 @@ class InterpolateBasesDialog extends React.Component {
                 basis: newBasis.toJSON(),
                 name: `${idx} - ${material.name} - ${newBasis.formula}`,
             };
-            const newMaterial = new Material(newMaterialConfig);
+            const newMaterial = new MDMaterial(newMaterialConfig);
             newMaterial.isUpdated = true;
             newMaterial.cleanOnCopy();
             newMaterials.push(newMaterial);