Merge branch '92_SAMP_bugfix' into 'master'

bugfix in SAMP grid, it could not handle 'null' values

See merge request astron-sdc/esap-gui!83

package-lock.json

 {
-  "name": "alta-query",
+  "name": "esap-gui",
   "version": "0.9.0",
   "lockfileVersion": 1,
   "requires": true,
@@ -2731,6 +2731,11 @@
         "@babel/types": "^7.3.0"
       }
     },
+    "@types/base16": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@types/base16/-/base16-1.0.2.tgz",
+      "integrity": "sha512-oYO/U4VD1DavwrKuCSQWdLG+5K22SLPem2OQaHmFcQuwHoVeGC+JGVRji2MUqZUAIQZHEonOeVfAX09hYiLsdg=="
+    },
     "@types/color-name": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
@@ -2783,6 +2788,11 @@
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.4.tgz",
       "integrity": "sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA=="
     },
+    "@types/lodash": {
+      "version": "4.14.178",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.178.tgz",
+      "integrity": "sha512-0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw=="
+    },
     "@types/minimatch": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
@@ -4116,6 +4126,11 @@
         }
       }
     },
+    "base16": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/base16/-/base16-1.0.0.tgz",
+      "integrity": "sha1-4pf2DX7BAUp6lxo568ipjAtoHnA="
+    },
     "base64-js": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
@@ -8294,6 +8309,11 @@
       "resolved": "https://registry.npmjs.org/immer/-/immer-1.10.0.tgz",
       "integrity": "sha512-O3sR1/opvCDGLEVcvrGTMtLac8GJ5IwZC4puPrLuRj3l7ICKvkmA0vGuU9OW8mV9WIBRnaxp5GJh9IEAaNOoYg=="
     },
+    "immutable": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.0.0.tgz",
+      "integrity": "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw=="
+    },
     "import-cwd": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
@@ -9746,6 +9766,11 @@
       "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
       "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0="
     },
+    "lodash.curry": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.curry/-/lodash.curry-4.1.1.tgz",
+      "integrity": "sha1-JI42By7ekGUB11lmIAqG2riyMXA="
+    },
     "lodash.memoize": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
@@ -12283,6 +12308,44 @@
         "whatwg-fetch": "^3.0.0"
       }
     },
+    "react-base16-styling": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/react-base16-styling/-/react-base16-styling-0.8.1.tgz",
+      "integrity": "sha512-Qf8MiaeZRa6EiooXEtQWGvPuJDp1CuN2EjS9QUiBTBY5lmpFLvL58lCfRNkkAs8fBVsXOmkiKTcFQuEl4vYTgw==",
+      "requires": {
+        "@types/base16": "^1.0.2",
+        "@types/lodash": "^4.14.176",
+        "base16": "^1.0.0",
+        "color": "^3.2.1",
+        "csstype": "^3.0.9",
+        "lodash.curry": "^4.1.1"
+      },
+      "dependencies": {
+        "color": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz",
+          "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==",
+          "requires": {
+            "color-convert": "^1.9.3",
+            "color-string": "^1.6.0"
+          }
+        },
+        "color-string": {
+          "version": "1.9.0",
+          "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz",
+          "integrity": "sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==",
+          "requires": {
+            "color-name": "^1.0.0",
+            "simple-swizzle": "^0.2.2"
+          }
+        },
+        "csstype": {
+          "version": "3.0.10",
+          "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz",
+          "integrity": "sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA=="
+        }
+      }
+    },
     "react-bootstrap": {
       "version": "1.0.0-beta.14",
       "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-1.0.0-beta.14.tgz",
@@ -12597,6 +12660,23 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.11.0.tgz",
       "integrity": "sha512-gbBVYR2p8mnriqAwWx9LbuUrShnAuSCNnuPGyc7GJrMVQtPDAh8iLpv7FRuMPFb56KkaVZIYSz1PrjI9q0QPCw=="
     },
+    "react-json-tree": {
+      "version": "0.15.1",
+      "resolved": "https://registry.npmjs.org/react-json-tree/-/react-json-tree-0.15.1.tgz",
+      "integrity": "sha512-9HTejgI4yuR1RBSQ8HOp4AOZ513MZru/PC7abzo0EG+++IoMHqnCKw43hIySUyBNGz81un/0M575Hvwnp4oQiA==",
+      "requires": {
+        "@types/prop-types": "^15.7.4",
+        "prop-types": "^15.7.2",
+        "react-base16-styling": "^0.8.1"
+      },
+      "dependencies": {
+        "@types/prop-types": {
+          "version": "15.7.4",
+          "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.4.tgz",
+          "integrity": "sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ=="
+        }
+      }
+    },
     "react-jsonschema-form": {
       "version": "2.0.0-alpha.1",
       "resolved": "https://registry.npmjs.org/react-jsonschema-form/-/react-jsonschema-form-2.0.0-alpha.1.tgz",

src/components/services/samp/SampGrid.js

@@ -46,7 +46,12 @@ export default function SampResults(props) {
                                 <AddToBasket id={id} item={SAMPBasketItem(record)} />
                             </td>
                             {record.map((col) => {
-                                let value = col.toString()
+                                let value = 'n/a'
+
+                                try {
+                                    value = col.toString()
+                                } catch (e) {
+                                }
 
                                 if (value.includes('http')) {
                                     value = <a href={value} target="_blank" rel="noopener noreferrer">{value}</a>

src/routes/Routes.js

@@ -100,7 +100,7 @@ export default function Routes() {
 
         </Switch>
 
-      <footer><small>esap-gui version 16 nov 2021 - 12:00</small></footer>
+      <footer><small>esap-gui version 9 dec 2021 - 9:00</small></footer>
     </Router>
   );
 }