fix not found setup

airalab · Mar 12, 2024 · 59cee6d · 59cee6d
1 parent c616c26
commit 59cee6d
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 61 deletions.
diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
     "ipfs-http-client": "^60.0.0",
     "libp2p": "^1.2.4",
     "robonomics-interface": "^0.3.2",
-    "robonomics-ui-vue": "^0.2.9",
+    "robonomics-ui-vue": "^0.3.0",
     "uuid": "^9.0.1",
     "vue": "^3.4.15",
     "vue-router": "^4.2.5",

diff --git a/src/views/telemetry/common.js b/src/views/telemetry/common.js
@@ -72,26 +72,22 @@ export const catFileController = async (cid, controller, store, ipfs) => {
 };
 
 const loadSetup = (store) => {
-  if (!store.state.robonomicsUIvue.rws.active) {
-    return;
-  }
-  const setupRaw = store.state.robonomicsUIvue.rws.list.find(
-    (item) => item.owner === store.state.robonomicsUIvue.rws.active
-  );
-  if (setupRaw) {
-    try {
-      return {
-        controller: encryptor(createPair(setupRaw.scontroller)),
-        owner: setupRaw.owner
-      };
-    } catch (error) {
-      console.log(error);
+  if (store.state.robonomicsUIvue.rws.active) {
+    const setupRaw = store.state.robonomicsUIvue.rws.list.find(
+      (item) => item.owner === store.state.robonomicsUIvue.rws.active
+    );
+    if (setupRaw) {
+      try {
+        return {
+          controller: encryptor(createPair(setupRaw.scontroller)),
+          owner: setupRaw.owner
+        };
+      } catch (error) {
+        console.log(error);
+      }
     }
   }
-  return {
-    controller: null,
-    owner: null
-  };
+  return false;
 };
 
 export const useSetup = () => {
@@ -104,8 +100,10 @@ export const useSetup = () => {
     () => store.state.robonomicsUIvue.rws.active,
     () => {
       const setup = loadSetup(store);
-      controller.value = setup.controller;
-      owner.value = setup.owner;
+      if (setup) {
+        controller.value = setup.controller;
+        owner.value = setup.owner;
+      }
     },
     { immediate: true }
   );
@@ -139,15 +137,20 @@ export const useLastDatalog = () => {
   const { controller } = useSetup();
 
   (async () => {
-    const datalog = await getLastDatalog(robonomics, controller.value.address);
-    cid.value = datalog.cid;
-    updateTime.value = datalog.timestamp;
-    data.value = await catFileController(
-      cid.value,
-      controller.value,
-      store,
-      ipfs
-    );
+    if (controller.value) {
+      const datalog = await getLastDatalog(
+        robonomics,
+        controller.value.address
+      );
+      cid.value = datalog.cid;
+      updateTime.value = datalog.timestamp;
+      data.value = await catFileController(
+        cid.value,
+        controller.value,
+        store,
+        ipfs
+      );
+    }
   })();
 
   return { cid, updateTime, data };
@@ -163,35 +166,40 @@ export const useConfig = () => {
   const { controller } = useSetup();
 
   (async () => {
-    notify(store, "Find twin id");
-    const datalog = await getLastDatalog(robonomics, controller.value.address);
-    const result = await catFileController(
-      datalog.cid,
-      controller.value,
-      store,
-      ipfs
-    );
-
-    if (result) {
-      const twin_id = result.twin_id;
-      notify(store, `Twin id #${twin_id}`);
-
-      notify(store, `Start load config`);
-      cid.value = await getConfigCid(
+    if (controller.value) {
+      notify(store, "Find twin id");
+      const datalog = await getLastDatalog(
         robonomics,
-        controller.value.address,
-        twin_id
+        controller.value.address
       );
-
-      config.value = await catFileController(
-        cid.value,
+      const result = await catFileController(
+        datalog.cid,
         controller.value,
         store,
         ipfs
       );
-      notify(store, `Config loaded`);
-    } else {
-      notify(store, "Error: not found twin id");
+
+      if (result) {
+        const twin_id = result.twin_id;
+        notify(store, `Twin id #${twin_id}`);
+
+        notify(store, `Start load config`);
+        cid.value = await getConfigCid(
+          robonomics,
+          controller.value.address,
+          twin_id
+        );
+
+        config.value = await catFileController(
+          cid.value,
+          controller.value,
+          store,
+          ipfs
+        );
+        notify(store, `Config loaded`);
+      } else {
+        notify(store, "Error: not found twin id");
+      }
     }
   })();
 

diff --git a/src/views/telemetry/launch.js b/src/views/telemetry/launch.js
@@ -46,7 +46,9 @@ export const useData = () => {
       (results) => {
         const r = results.filter((item) => {
           return (
-            item.success && item.data[0].toHuman() === controller.value.address
+            item.success &&
+            controller.value &&
+            item.data[0].toHuman() === controller.value.address
           );
         });
         for (const item of r) {
@@ -68,9 +70,14 @@ export const useData = () => {
   });
 
   const run = async () => {
-    const datalog = await getLastDatalog(robonomics, controller.value.address);
-    cid.value = datalog.cid;
-    updateTime.value = datalog.timestamp;
+    if (controller.value) {
+      const datalog = await getLastDatalog(
+        robonomics,
+        controller.value.address
+      );
+      cid.value = datalog.cid;
+      updateTime.value = datalog.timestamp;
+    }
     watchDatalog();
   };
 

diff --git a/yarn.lock b/yarn.lock
@@ -7688,10 +7688,10 @@ robonomics-interface@^0.3.2:
     cids "^1.1.9"
     multihashing-async "^2.1.4"
 
-robonomics-ui-vue@^0.2.9:
-  version "0.2.9"
-  resolved "https://registry.yarnpkg.com/robonomics-ui-vue/-/robonomics-ui-vue-0.2.9.tgz#bd59a6def3bec35ab35393d227775df715d52791"
-  integrity sha512-nr4q2owm548QSRVmvUZPZqNTSiP4PT1PEC7eOUhHM1YNMf+C+s6JGLzD1aOwmcuOcxZNHNobtVY8mlwGanNHgw==
+robonomics-ui-vue@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/robonomics-ui-vue/-/robonomics-ui-vue-0.3.0.tgz#3324250a845bdff50a1723318a54812ef59183d8"
+  integrity sha512-0GNYkNXuyRixqagKwbOcNP3m83u2pjtLIMmWr/kFwdDGvGNyWCB8v+tDas4iQaO5DD49JpR7C+NbFfYaun7uRQ==
   dependencies:
     "@polkadot/ui-keyring" "^3.6.4"
     "@polkadot/util-crypto" "^12.6.2"