Epic/sof 5386

dockerfiles/centos/Dockerfile

@@ -36,6 +36,11 @@ WORKDIR /opt/app
 
 COPY . .
 
+RUN yum install -y git
+RUN git init
+RUN git config --global url."https://github.com".insteadOf [email protected]:
+RUN git config --global url."https://".insteadOf git://
+
 # Enabling devtoolset puts compilers like g++
 # in the PATH so that node-gyp can build native
 # compiled node modules as part of the install

package.json

@@ -29,7 +29,7 @@
         "@babel/preset-react": "7.0.0",
         "@babel/runtime": "^7.5.0",
         "@babel/runtime-corejs2": "^7.5.0",
-        "@exabyte-io/made.js": "2021.12.22-0",
+        "@exabyte-io/made.js": "git+https://github.com/Exabyte-io/made.js.git#3144ca42b45b8dadf4835dcb1945c345b2f9e9ef",
         "@exabyte-io/wave.js": "3.1.5",
         "bootstrap": "^3.3.7",
         "classnames": "^2.2.5",

run-tests.sh

@@ -76,7 +76,8 @@ SCREENSHOTS_DIR="${CUCUMBER_DIR}/screenshots"
 export ROOT_URL="${HOST}:${PORT}"
 
 cd ${TESTS_DIR}
-source ${NVM_DIR}/nvm.sh
+DEFAULT_NVM_DIR="${HOME}/.nvm"
+source ${NVM_DIR:-$DEFAULT_NVM_DIR}/nvm.sh
 nvm use ${NODE_VERSION}
 npm ci
 

src/components/source_editor/BasisText.js

@@ -2,8 +2,7 @@ import _ from "underscore";
 import React from 'react';
 import setClass from 'classnames';
 import {Made} from "@exabyte-io/made.js";
-
-import {displayMessage} from "../../i18n/messages";
+import { xyzValidationErrorMessagesConfig } from "./enums";
 
 import "codemirror/lib/codemirror.css";
 import "codemirror/theme/darcula.css";
@@ -31,25 +30,25 @@ class BasisText extends React.Component {
     }
 
     isContentPassingValidation(content) {
-        try {
-            Made.parsers.xyz.validate(content);
-            // only show the success message first time after last failure
+        const error = Made.parsers.xyz.validateAll(content);
+        const errorMessage = xyzValidationErrorMessagesConfig[error];
+        if (error !== 0) {
+            this.setState({
+                isContentValidated: false,
+                message: errorMessage
+            });
+            return false;
+        } else {
             if (!this.state.isContentValidated) {
                 this.setState({
                     isContentValidated: true,
                     // TODO: consider removing the success message after a timeout period
-                    message: displayMessage('basis.validationSuccess')
+                    message: errorMessage
                 });
             } else {
                 // already validated before -> remove message
                 this.setState({message: ''});
             }
-        } catch (err) {
-            this.setState({
-                isContentValidated: false,
-                message: displayMessage('basis.validationError')
-            });
-            return false;
         }
         return true;
     }

src/components/source_editor/enums.js

@@ -0,0 +1,8 @@
+import {Made} from "@exabyte-io/made.js";
+import {displayMessage} from "../../i18n/messages";
+
+export const xyzValidationErrorMessagesConfig = {
+    0: displayMessage('basis.validationSuccess'),
+    1001: displayMessage('basis.validationError'),
+    2001: displayMessage('basis.maxAtomError', Made.Basis.nonPeriodicMaxAtomsCount)
+}

src/i18n/en/messages.js

@@ -6,6 +6,7 @@ export default {
         "elementsNotEqual": "Atomic elements differ",
         "validationError": "Invalid basis format. Please see documentation",
         "validationSuccess": "Valid basis format",
+        "maxAtomError": "Number of atoms (%s) exceeded for non-periodic structures."
     },
     "resetToLast": "Material is reset to last valid state",
     "combinatorialBasesCountExceeded": "Number of combinations exceeded the limit (%s)"