Add proper handling for showing scheduled tasks for unknown devices.

learningequality · Jun 1, 2023 · 1768bce · 1768bce
1 parent a605c9f
commit 1768bce
Showing 1 changed file with 24 additions and 16 deletions.
diff --git a/packages/kolibri-common/components/SyncSchedule/ManageSyncSchedule.vue b/packages/kolibri-common/components/SyncSchedule/ManageSyncSchedule.vue
@@ -40,19 +40,19 @@
       <!--      creating the table-->
       <CoreTable>
         <template #tbody>
-          <tbody v-if="facilitySyncTasks.length > 0">
+          <tbody v-if="scheduledTasks.length > 0">
             <tr>
               <th>{{ coreString('deviceNameLabel') }}</th>
               <th>{{ $tr('Schedule') }}</th>
               <th>{{ coreString('statusLabel') }}</th>
               <th></th>
             </tr>
             <tr
-              v-for="task in facilitySyncTasks"
+              v-for="task in scheduledTasks"
               :key="task.id"
             >
               <td>
-                <span>{{ devicesById[getDeviceId(task)].device_name }}<br>
+                <span>{{ task.deviceName }}<br>
                   {{ task.extra_metadata.baseurl }}
                 </span>
               </td>
@@ -63,21 +63,11 @@
               </td>
 
               <td>
-                <span
-                  v-if="
-                    devicesById[task.extra_metadata.device_id] &&
-                      devicesById[task.extra_metadata.device_id].available
-                  "
-                >
+                <span v-if="task.deviceAvailable">
                   <KIcon icon="onDevice" />
                   <span>{{ $tr('connected') }}</span>
                 </span>
-                <span
-                  v-else-if="
-                    devicesById[task.extra_metadata.device_id] &&
-                      !devicesById[task.extra_metadata.device_id].isKDP
-                  "
-                >
+                <span v-else-if="!task.isKDP">
                   <KIcon icon="disconnected" />
                   <span>{{ $tr('disconnected') }}</span>
                 </span>
@@ -165,7 +155,6 @@
               // eslint-disable-next-line kolibri/vue-no-undefined-string-uses
               device_name: kdpNameTranslator.$tr('syncToKDP'),
               base_url: '',
-              isKDP: true,
             },
           }
         );
@@ -196,6 +185,25 @@
         facilitySyncTasks: [],
       };
     },
+    computed: {
+      scheduledTasks() {
+        return this.facilitySyncTasks.map(task => {
+          const deviceName = this.devicesById[this.getDeviceId(task)]
+            ? this.devicesById[this.getDeviceId(task)].device_name
+            : task.extra_metadata.device_name;
+          const deviceAvailable =
+            this.devicesById[task.extra_metadata.device_id] &&
+            this.devicesById[task.extra_metadata.device_id].available;
+          const isKDP = task.type === TaskTypes.SYNCDATAPORTAL;
+          return {
+            ...task,
+            deviceName,
+            deviceAvailable,
+            isKDP,
+          };
+        });
+      },
+    },
     beforeMount() {
       this.pollFacilityTasks();
       this.fetchFacility();