Merge pull request #102 from ulitol97/master

0.2.12

Author: ulitol97

.env

@@ -1,3 +1,3 @@
 REACT_APP_RDFSHAPE_HOST=https://api.rdfshape.weso.es
 REACT_APP_RDFSHAPE_WS_HOST=wss://api.rdfshape.weso.es
-REACT_APP_VERSION=0.2.11
+REACT_APP_VERSION=0.2.12

.env.development

@@ -1,3 +1,3 @@
 REACT_APP_RDFSHAPE_HOST=http://localhost:8080
 REACT_APP_RDFSHAPE_WS_HOST=ws://localhost:8080
-REACT_APP_VERSION=0.2.11
+REACT_APP_VERSION=0.2.12

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "rdfshape-client",
-  "version": "0.2.11",
+  "version": "0.2.12",
   "private": true,
   "dependencies": {
     "3dshex": "^0.5.2",

package.json

@@ -34,7 +34,7 @@ function ResultValidateStream({
         [API.queryParameters.streaming.date]:
           result[API.queryParameters.streaming.date],
       };
-    // Stream will to halt on invalid: invalidating result, the report is contained in itself and there's no date
+    // Stream will halt on invalid: invalidating result, the report is contained in itself and there's no date
     else
       return {
         ...result,

src/results/ResultValidateStream.js

@@ -153,8 +153,18 @@ function ShexValidate(props) {
         const { type, content } = messageData;
         switch (type) {
           case API.queryParameters.streaming.responseTypes.result:
-            // Result received, update result list with it if not errored
-            if (content.status != errored) setResults([content, ...results]);
+            // We got a result with an embedded error message, set error
+            if (!Array.isArray(content?.report?.shapeMap)) {
+              setStreamValidationError(
+                content?.report?.message ||
+                  API.texts.streamingTexts.unknownError
+              );
+              // Stream was not stopped, so we disconnect ourselves
+              stopStreamingValidation();
+            }
+            // Result received, update result list with it after checking that it is not errored (and thus omitted)
+            else if (content.status != errored)
+              setResults([content, ...results]);
             break;
           case API.queryParameters.streaming.responseTypes.error:
             // Stream was stopped, show/handle errors, set state...
@@ -531,7 +541,7 @@ function ShexValidate(props) {
             </Button>
           </Form>
         </Col>
-        {loading || results || permalink || error ? (
+        {loading || results.length || permalink || error ? (
           <Col className={"half-col"}>
             {loading ? (
               <ProgressBar