Merge branch 'develop-2.0.0-beta' of https://github.com/FederatedAI/F…

…ATE-Board into develop-2.0.0-beta
FederatedAI · Aug 16, 2023 · d02e68b · d02e68b
2 parents b5955aa + 2e7ee4d
commit d02e68b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/resources-front-end/src/views/job-dashboard/board/Board.vue b/resources-front-end/src/views/job-dashboard/board/Board.vue
@@ -53,20 +53,23 @@ const ascending = (a, b) => {
 
 const getDatasetFromSummary = obj => {
   const { roles, dataset } = obj
-  const result = Object.keys(roles).map(role => {
-    const options = roles[role].map(item => ({ value: item, label: item }))
-    return {
-      role: role.toUpperCase(),
-      options,
-      roleValue: options[0].label,
-      datasetData: dataset[role] || ''
-    }
-  })
-  result.sort((a, b) => {
-    return ascending(ROLE_ORDER_MAP[a.role], ROLE_ORDER_MAP[b.role])
-  })
-
-  return result
+  if (obj && roles && dataset) {
+    const result = Object.keys(roles).map(role => {
+      const options = roles[role].map(item => ({ value: item, label: item }))
+      return {
+        role: role.toUpperCase(),
+        options,
+        roleValue: options[0].label,
+        datasetData: dataset[role] || ''
+      }
+    })
+    result.sort((a, b) => {
+      return ascending(ROLE_ORDER_MAP[a.role], ROLE_ORDER_MAP[b.role])
+    })
+    return result
+  } else {
+    return []
+  }
 }
 
 export default {

diff --git a/resources-front-end/src/views/job-dashboard/log/Logs.vue b/resources-front-end/src/views/job-dashboard/log/Logs.vue
@@ -227,6 +227,8 @@ export default {
   created() {
     this.getInstanceIdFromFlow().then(() => {
       this.initLogSocket()
+    }).catch(() => {
+      this.initLogSocket()
     })
   },
   beforeDestroy() {