@zac-apps/helium 1.0.0 → 1.0.2-beta.1

package/dist/index.js

@@ -1500,6 +1500,29 @@ function HeliumGraph(_ref4) {
     matches = _ref4.matches;
   var height = matches ? 250 : 200;
   var width = matches ? 300 : 280;
+
+  // Catch missing data
+
+  if (graphData.error) {
+    return /*#__PURE__*/jsxs(React.Fragment, {
+      children: [/*#__PURE__*/jsx(DivTitle, {
+        children: /*#__PURE__*/jsx("strong", {
+          children: "Helium level monitoring"
+        })
+      }), /*#__PURE__*/jsx(Grid, {
+        sx: {
+          display: "flex",
+          justifyContent: "center"
+        },
+        children: /*#__PURE__*/jsx("em", {
+          children: "No graph data available"
+        })
+      })]
+    });
+  }
+
+  // Render component
+
   return /*#__PURE__*/jsxs(React.Fragment, {
     children: [/*#__PURE__*/jsxs(DivTitle, {
       children: [/*#__PURE__*/jsx("strong", {
@@ -1540,10 +1563,16 @@ function HeliumGraph(_ref4) {
 
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var heliumLookupData = require("/conf/heliumLookup.json");
+
+// Principal function
+
 function Helium(props) {
+  var basePath = props.basePath || "";
+
   // State
 
-  var _useImmer = useImmer(null),
+  var _useImmer = useImmer({}),
     _useImmer2 = _slicedToArray(_useImmer, 2),
     heliumData = _useImmer2[0],
     SetHeliumData = _useImmer2[1];
@@ -1555,6 +1584,10 @@ function Helium(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     preprocessed = _useState4[0],
     SetPreprocessed = _useState4[1];
+  var _useState5 = useState({}),
+    _useState6 = _slicedToArray(_useState5, 2);
+    _useState6[0];
+    var SetHeliumError = _useState6[1];
 
   // Query Media size for responsive column wrapping
 
@@ -1565,18 +1598,16 @@ function Helium(props) {
 
   // fetch data
 
-  var heliumLookupData = PublicFetch({
-    url: "/heliumLookup.json"
-  });
   var fetchGraph = PublicFetch({
-    url: "/graphdata.json"
+    url: basePath + "/graphdata.json"
   });
   PublicFetch({
-    url: "/helium.json",
-    SetState: SetHeliumData
+    url: basePath + "/helium.json",
+    SetState: SetHeliumData,
+    SetError: SetHeliumError
   });
   useEffect(function () {
-    if (heliumData) {
+    if (heliumData && heliumData.helium) {
       Object.keys(heliumData.helium).map(function (spec) {
         SetHeliumData(function (heliumData) {
           heliumData.helium[spec] = Number(heliumData.helium[spec]);
@@ -1588,14 +1619,32 @@ function Helium(props) {
 
   // Catch empty data
 
-  if (!heliumData || !heliumLookupData || !fetchGraph || preprocessed === false) {
+  // useEffect(() => {
+  //     if (heliumData) {
+  //         SetHeliumData((heliumData) => {
+  //             heliumData.helium = {};
+  //         });
+  //         Object.keys(heliumLookupData.lookup).map((spec) => {
+  //             SetHeliumData((heliumData) => {
+  //                 heliumData.helium[spec] = 0;
+  //             });
+  //         });
+  //         SetHeliumData((heliumData) => {
+  //             heliumData.meta = {};
+  //             heliumData.meta.date = 0;
+  //         });
+  //         SetPreprocessed(true);
+  //     }
+  // }, [heliumError]);
+
+  if (!heliumData || !fetchGraph || !preprocessed) {
     return /*#__PURE__*/jsx(Progress, {});
   }
   var graphDataMeta = fetchGraph.meta;
   var graphData = _objectSpread({}, fetchGraph);
   delete graphData.meta;
   if (!graphDataMeta) {
-    return /*#__PURE__*/jsx(Progress, {});
+    graphDataMeta = {};
   }
   return /*#__PURE__*/jsx(AppGrid, {
     children: /*#__PURE__*/jsxs(LookupContext.Provider, {
@@ -1624,9 +1673,9 @@ function Helium(props) {
               children: [/*#__PURE__*/jsx("strong", {
                 children: "Current levels"
               }), " ", /*#__PURE__*/jsxs("em", {
-                children: ["(updated", " ", moment(heliumData.meta.date).fromNow(), /*#__PURE__*/jsx(EditAdmon, {
+                children: [heliumData.meta.date || heliumData.meta.date !== 0 ? "(updated " + moment(heliumData.meta.date).fromNow() + ")" : "(manual)", /*#__PURE__*/jsx(EditAdmon, {
                   levelsEdited: levelsEdited
-                }), ")"]
+                })]
               })]
             })
           }), /*#__PURE__*/jsx(Grid, {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zac-apps/helium",
-    "version": "1.0.0",
+    "version": "1.0.2-beta.1",
     "scripts": {
         "rollup": "node_modules/rollup/dist/rollup.js",
         "dev": "next dev",
@@ -28,15 +28,15 @@
     "author": "ZAC",
     "license": "CC-BY-SA-4.0",
     "dependencies": {
-        "@mui/icons-material": "^5.15.13",
-        "@mui/material": "^5.15.13",
-        "@zac-apps/commons": "^1.3.3",
+        "@mui/icons-material": "^5.15.14",
+        "@mui/material": "^5.15.14",
+        "@zac-apps/commons": "^1.3.5-beta.2",
         "moment": "^2.30.1",
         "recharts": "^2.12.3",
         "use-immer": "^0.9.0"
     },
     "devDependencies": {
-        "@babel/plugin-transform-runtime": "^7.24.0",
+        "@babel/plugin-transform-runtime": "^7.24.3",
         "@emotion/react": "^11.11.4",
         "@emotion/styled": "^11.11.0",
         "@rollup/plugin-babel": "^6.0.4",
@@ -46,21 +46,21 @@
         "@semantic-release/git": "^10.0.1",
         "@semantic-release/gitlab": "^13.0.3",
         "@semantic-release/npm": "^12.0.0",
-        "@storybook/addon-essentials": "^8.0.0",
-        "@storybook/addon-interactions": "^8.0.0",
-        "@storybook/addon-links": "^8.0.0",
-        "@storybook/addon-onboarding": "^8.0.0",
-        "@storybook/blocks": "^8.0.0",
-        "@storybook/nextjs": "^8.0.0",
-        "@storybook/react": "^8.0.0",
-        "@storybook/test": "^8.0.0",
+        "@storybook/addon-essentials": "^8.0.5",
+        "@storybook/addon-interactions": "^8.0.5",
+        "@storybook/addon-links": "^8.0.5",
+        "@storybook/addon-onboarding": "^8.0.5",
+        "@storybook/blocks": "^8.0.5",
+        "@storybook/nextjs": "^8.0.5",
+        "@storybook/react": "^8.0.5",
+        "@storybook/test": "^8.0.5",
         "babel-loader": "^9.1.3",
         "eslint": "^8",
-        "eslint-config-next": "14.1.3",
+        "eslint-config-next": "14.1.4",
         "eslint-plugin-storybook": "^0.8.0",
-        "rollup": "^4.13.0",
-        "semantic-release": "^23.0.5",
-        "storybook": "^8.0.0"
+        "rollup": "^4.13.1",
+        "semantic-release": "^23.0.6",
+        "storybook": "^8.0.5"
     },
     "peerDependencies": {
         "next": "^14.0.4",