From 28831714e4411a5805f3ababf66cd198bff20e7d Mon Sep 17 00:00:00 2001
From: Wck-iipi <21dcs006@nith.ac.in>
Date: Mon, 15 May 2023 01:20:07 +0530
Subject: [PATCH 01/11] Crude update for facility join problem.

In this, I have added a basic logic of how the problem will be solved.
---
 .../SelectDeviceForm.vue                      | 173 ++++++++++++++----
 1 file changed, 140 insertions(+), 33 deletions(-)

diff --git a/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue b/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue
index e5e4e97a4b2..c82f96e56e3 100644
--- a/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue
+++ b/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue
@@ -32,25 +32,28 @@
       </UiAlert>
 
       <!-- Static Devices -->
-      <template v-for="(d, idx) in savedDevices">
-        <div :key="`div-${idx}`">
-          <KRadioButton
-            :key="idx"
-            v-model="selectedDeviceId"
-            class="radio-button"
-            :value="d.id"
-            :label="d.nickname"
-            :description="d.base_url"
-            :disabled="formDisabled || !isDeviceAvailable(d.id)"
-          />
-          <KButton
-            :key="`forget-${idx}`"
-            :text="coreString('removeAction')"
-            class="remove-device-button"
-            appearance="basic-link"
-            @click="removeSavedDevice(d.id)"
-          />
-        </div>
+      <template v-if="!anySavedDeviceSeen">
+        <template v-for="(d, idx) in savedDevices">
+          <div :key="`div-${idx}`">
+            <KRadioButton
+              v-if="canLearnerSignUp(d.id)"
+              :key="idx"
+              v-model="selectedDeviceId"
+              class="radio-button"
+              :value="d.id"
+              :label="d.nickname"
+              :description="d.base_url"
+              :disabled="formDisabled || !isDeviceAvailable(d.id)"
+            />
+            <KButton
+              :key="`forget-${idx}`"
+              :text="coreString('removeAction')"
+              class="remove-device-button"
+              appearance="basic-link"
+              @click="removeSavedDevice(d.id)"
+            />
+          </div>
+        </template>
       </template>
 
       <hr
@@ -59,18 +62,24 @@
       >
 
       <!-- Dynamic Devices -->
-      <template v-for="d in discoveredDevices">
-        <div :key="`div-${d.id}`">
-          <KRadioButton
-            :key="d.id"
-            v-model="selectedDeviceId"
-            class="radio-button"
-            :value="d.instance_id"
-            :label="formatNameAndId(d.device_name, d.id)"
-            :description="formatBaseDevice(d)"
-            :disabled="formDisabled || fetchFailed || !isDeviceAvailable(d.id)"
-          />
-        </div>
+      <template v-if="!anyDiscoveredDeviceSeen">
+        <template v-for="d in discoveredDevices">
+          <div :key="`div-${d.id}`">
+            <KRadioButton
+              v-if="canLearnerSignUp(d.id)"
+              :key="d.id"
+              v-model="selectedDeviceId"
+              class="radio-button"
+              :value="d.instance_id"
+              :label="formatNameAndId(d.device_name, d.id)"
+              :description="formatBaseDevice(d)"
+              :disabled="formDisabled || fetchFailed || !isDeviceAvailable(d.id)"
+            />
+          </div>
+        </template>
+      </template>
+      <template v-else>
+        <p> {{ $tr('noDeviceText') }} </p>
       </template>
     </template>
 
@@ -123,8 +132,9 @@
 
 <script>
 
-  import { computed } from 'kolibri.lib.vueCompositionApi';
-  import { useLocalStorage, get } from '@vueuse/core';
+  import { NetworkLocationResource } from 'kolibri.resources';
+  import { computed, ref } from 'kolibri.lib.vueCompositionApi';
+  import { useLocalStorage, get, useMemoize, computedAsync } from '@vueuse/core';
   import find from 'lodash/find';
   import UiAlert from 'kolibri-design-system/lib/keen/UiAlert';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
@@ -186,6 +196,74 @@
       const discoveredDevices = computed(() => get(devices).filter(d => d.dynamic));
       const savedDevices = computed(() => get(devices).filter(d => !d.dynamic));
 
+      const fetchDeviceFacilities = useMemoize(
+        async device => {
+          try {
+            const { facilities } = await NetworkLocationResource.fetchFacilities(device.id);
+
+            return facilities.map(facility => {
+              return {
+                id: facility.id,
+                name: facility.name,
+                base_url: device.base_url,
+                address_id: device.id,
+                learner_can_sign_up: facility.learner_can_sign_up,
+                learner_can_login_with_no_password: facility.learner_can_login_with_no_password,
+                kolibri_version: device.kolibri_version,
+              };
+            });
+          } catch (e) {
+            return [];
+          }
+        },
+        {
+          getKey: device => device.id,
+        }
+      );
+
+      const isLoading = ref(false);
+
+      const availableAddressIds = computed(() =>
+        get(devices)
+          .filter(d => d.available)
+          .map(d => d.id)
+      );
+
+      const availableFacilities = computedAsync(
+        async () => {
+          // Extract available devices, and sort to most recently accessed so when we dedupe
+          // facilities across two+ devices, the most recently connected device's facility is shown
+          const _devices = get(devices)
+            .filter(d => get(availableAddressIds).includes(d.id))
+            .sort((deviceA, deviceB) => deviceA.since_last_accessed - deviceB.since_last_accessed);
+          const facilitiesFromDevices = await Promise.all(
+            _devices.map(d => fetchDeviceFacilities(d))
+          );
+          const facilities = {};
+          // Promise.all will resolve with an array of arrays
+          for (const deviceFacilities of facilitiesFromDevices) {
+            for (const facility of deviceFacilities) {
+              // deduplicate the same facility across more than one device
+              if (!facility[facility.id]) {
+                facilities[facility.id] = facility;
+              }
+            }
+          }
+          // Sort alphabetically for predictable ordering
+          return Object.values(facilities).sort((facilityA, facilityB) => {
+            if (facilityA.name < facilityB.name) {
+              return -1;
+            }
+            if (facilityA.name > facilityB.name) {
+              return 1;
+            }
+            return 0;
+          });
+        },
+        [],
+        isLoading
+      );
+
       return {
         // useDevices
         devices,
@@ -205,6 +283,7 @@
         discoveredDevices,
         savedDevices,
         storageDeviceId,
+        availableFacilities,
       };
     },
     props: {
@@ -356,6 +435,34 @@
           this.$emit('removed_address');
         });
       },
+      canLearnerSignUp(id) {
+        for (const facility of this.availableFacilities) {
+          if (facility.address_id === id) {
+            return facility.learner_can_sign_up;
+          }
+        }
+        return true;
+      },
+      anyDiscoveredDeviceSeen() {
+        for (const device of this.discoveredDevices) {
+          for (const facility of this.availableFacilities) {
+            if (facility.address_id === device.id && facility.learner_can_sign_up) {
+              return true;
+            }
+          }
+        }
+        return false;
+      },
+      anySavedDeviceSeen() {
+        for (const device of this.discoveredDevices) {
+          for (const facility of this.availableFacilities) {
+            if (facility.address_id === device.id && facility.learner_can_sign_up) {
+              return true;
+            }
+          }
+        }
+        return false;
+      },
     },
     $trs: {
       deletingFailedText: {

From 8b54332189d59aa3c4130b06a52131536a7556ef Mon Sep 17 00:00:00 2001
From: Wck-iipi <21dcs006@nith.ac.in>
Date: Mon, 15 May 2023 01:37:03 +0530
Subject: [PATCH 02/11] Used canLearnerSignUp instead of for loop.

---
 .../sync/SelectDeviceModalGroup/SelectDeviceForm.vue | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue b/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue
index c82f96e56e3..71e15df2556 100644
--- a/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue
+++ b/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue
@@ -445,20 +445,16 @@
       },
       anyDiscoveredDeviceSeen() {
         for (const device of this.discoveredDevices) {
-          for (const facility of this.availableFacilities) {
-            if (facility.address_id === device.id && facility.learner_can_sign_up) {
-              return true;
-            }
+          if (this.canLearnerSignUp(device.id)) {
+            return true;
           }
         }
         return false;
       },
       anySavedDeviceSeen() {
         for (const device of this.discoveredDevices) {
-          for (const facility of this.availableFacilities) {
-            if (facility.address_id === device.id && facility.learner_can_sign_up) {
-              return true;
-            }
+          if (this.canLearnerSignUp(device.id)) {
+            return true;
           }
         }
         return false;

From bf6575889ca8c693cb8dba7426431b6308aab699 Mon Sep 17 00:00:00 2001
From: Wck-iipi <21dcs006@nith.ac.in>
Date: Wed, 17 May 2023 00:01:50 +0530
Subject: [PATCH 03/11] Fixed boolean issues and uses NetworkLocationResource

---
 .../sync/SelectDeviceModalGroup/SelectDeviceForm.vue | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue b/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue
index 71e15df2556..ac3cd4e2f0e 100644
--- a/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue
+++ b/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue
@@ -32,7 +32,7 @@
       </UiAlert>
 
       <!-- Static Devices -->
-      <template v-if="!anySavedDeviceSeen">
+      <template v-if="anySavedDeviceSeen">
         <template v-for="(d, idx) in savedDevices">
           <div :key="`div-${idx}`">
             <KRadioButton
@@ -62,7 +62,7 @@
       >
 
       <!-- Dynamic Devices -->
-      <template v-if="!anyDiscoveredDeviceSeen">
+      <template v-if="anyDiscoveredDeviceSeen()">
         <template v-for="d in discoveredDevices">
           <div :key="`div-${d.id}`">
             <KRadioButton
@@ -437,11 +437,15 @@
       },
       canLearnerSignUp(id) {
         for (const facility of this.availableFacilities) {
+          console.log("can learner working")
+          console.log(id);
+          console.log(facility.address_id);
           if (facility.address_id === id) {
+            console.log(facility.learner_can_sign_up)
             return facility.learner_can_sign_up;
           }
         }
-        return true;
+        return false;
       },
       anyDiscoveredDeviceSeen() {
         for (const device of this.discoveredDevices) {
@@ -452,7 +456,7 @@
         return false;
       },
       anySavedDeviceSeen() {
-        for (const device of this.discoveredDevices) {
+        for (const device of this.savedDevices) {
           if (this.canLearnerSignUp(device.id)) {
             return true;
           }

From f730e5a9bc87f4211e4308b70b40e387335d1274 Mon Sep 17 00:00:00 2001
From: Wck-iipi <21dcs006@nith.ac.in>
Date: Wed, 17 May 2023 01:05:54 +0530
Subject: [PATCH 04/11] Disabling of KRadioButton, passes tests.

---
 .../SelectDeviceForm.vue                      | 58 ++++++-------------
 1 file changed, 17 insertions(+), 41 deletions(-)

diff --git a/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue b/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue
index ac3cd4e2f0e..946810b2515 100644
--- a/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue
+++ b/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue
@@ -36,14 +36,13 @@
         <template v-for="(d, idx) in savedDevices">
           <div :key="`div-${idx}`">
             <KRadioButton
-              v-if="canLearnerSignUp(d.id)"
               :key="idx"
               v-model="selectedDeviceId"
               class="radio-button"
-              :value="d.id"
+              :value="canLearnerSignUp(d.id) ? d.id : false"
               :label="d.nickname"
               :description="d.base_url"
-              :disabled="formDisabled || !isDeviceAvailable(d.id)"
+              :disabled="canLearnerSignUp(d.id) || formDisabled || !isDeviceAvailable(d.id)"
             />
             <KButton
               :key="`forget-${idx}`"
@@ -62,24 +61,21 @@
       >
 
       <!-- Dynamic Devices -->
-      <template v-if="anyDiscoveredDeviceSeen()">
-        <template v-for="d in discoveredDevices">
-          <div :key="`div-${d.id}`">
-            <KRadioButton
-              v-if="canLearnerSignUp(d.id)"
-              :key="d.id"
-              v-model="selectedDeviceId"
-              class="radio-button"
-              :value="d.instance_id"
-              :label="formatNameAndId(d.device_name, d.id)"
-              :description="formatBaseDevice(d)"
-              :disabled="formDisabled || fetchFailed || !isDeviceAvailable(d.id)"
-            />
-          </div>
-        </template>
-      </template>
-      <template v-else>
-        <p> {{ $tr('noDeviceText') }} </p>
+      <template v-for="d in discoveredDevices">
+        <div :key="`div-${d.id}`">
+          <KRadioButton
+            :key="d.id"
+            v-model="selectedDeviceId"
+            class="radio-button"
+            :value="canLearnerSignUp(d.id) ? d.instance_id : false"
+            :label="formatNameAndId(d.device_name, d.id)"
+            :description="formatBaseDevice(d)"
+            :disabled="!canLearnerSignUp(d.id)
+              || formDisabled
+              || fetchFailed
+              || !isDeviceAvailable(d.id)"
+          />
+        </div>
       </template>
     </template>
 
@@ -437,32 +433,12 @@
       },
       canLearnerSignUp(id) {
         for (const facility of this.availableFacilities) {
-          console.log("can learner working")
-          console.log(id);
-          console.log(facility.address_id);
           if (facility.address_id === id) {
-            console.log(facility.learner_can_sign_up)
             return facility.learner_can_sign_up;
           }
         }
         return false;
       },
-      anyDiscoveredDeviceSeen() {
-        for (const device of this.discoveredDevices) {
-          if (this.canLearnerSignUp(device.id)) {
-            return true;
-          }
-        }
-        return false;
-      },
-      anySavedDeviceSeen() {
-        for (const device of this.savedDevices) {
-          if (this.canLearnerSignUp(device.id)) {
-            return true;
-          }
-        }
-        return false;
-      },
     },
     $trs: {
       deletingFailedText: {

From 9e388b9e3d5c36de421c3ff6ad77500a3b1dbea6 Mon Sep 17 00:00:00 2001
From: Wck-iipi <21dcs006@nith.ac.in>
Date: Wed, 17 May 2023 01:14:47 +0530
Subject: [PATCH 05/11] Removed Static Device's condition.

---
 .../SelectDeviceForm.vue                      | 40 +++++++++----------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue b/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue
index 946810b2515..a1cd0c04c0b 100644
--- a/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue
+++ b/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue
@@ -32,27 +32,25 @@
       </UiAlert>
 
       <!-- Static Devices -->
-      <template v-if="anySavedDeviceSeen">
-        <template v-for="(d, idx) in savedDevices">
-          <div :key="`div-${idx}`">
-            <KRadioButton
-              :key="idx"
-              v-model="selectedDeviceId"
-              class="radio-button"
-              :value="canLearnerSignUp(d.id) ? d.id : false"
-              :label="d.nickname"
-              :description="d.base_url"
-              :disabled="canLearnerSignUp(d.id) || formDisabled || !isDeviceAvailable(d.id)"
-            />
-            <KButton
-              :key="`forget-${idx}`"
-              :text="coreString('removeAction')"
-              class="remove-device-button"
-              appearance="basic-link"
-              @click="removeSavedDevice(d.id)"
-            />
-          </div>
-        </template>
+      <template v-for="(d, idx) in savedDevices">
+        <div :key="`div-${idx}`">
+          <KRadioButton
+            :key="idx"
+            v-model="selectedDeviceId"
+            class="radio-button"
+            :value="canLearnerSignUp(d.id) ? d.id : false"
+            :label="d.nickname"
+            :description="d.base_url"
+            :disabled="canLearnerSignUp(d.id) || formDisabled || !isDeviceAvailable(d.id)"
+          />
+          <KButton
+            :key="`forget-${idx}`"
+            :text="coreString('removeAction')"
+            class="remove-device-button"
+            appearance="basic-link"
+            @click="removeSavedDevice(d.id)"
+          />
+        </div>
       </template>
 
       <hr

From 3e1e158910fe2ce17018891f1a64bda9e7673c06 Mon Sep 17 00:00:00 2001
From: Wck-iipi <21dcs006@nith.ac.in>
Date: Thu, 18 May 2023 02:09:57 +0530
Subject: [PATCH 06/11] Added deviceFacilityCanSignUp and removed code.

---
 .../SelectDeviceForm.vue                      | 86 +++----------------
 .../views/sync/SelectDeviceModalGroup/api.js  | 14 +++
 2 files changed, 26 insertions(+), 74 deletions(-)

diff --git a/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue b/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue
index a1cd0c04c0b..4dad8da272e 100644
--- a/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue
+++ b/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue
@@ -41,7 +41,7 @@
             :value="canLearnerSignUp(d.id) ? d.id : false"
             :label="d.nickname"
             :description="d.base_url"
-            :disabled="canLearnerSignUp(d.id) || formDisabled || !isDeviceAvailable(d.id)"
+            :disabled="!canLearnerSignUp(d.id) || formDisabled || !isDeviceAvailable(d.id)"
           />
           <KButton
             :key="`forget-${idx}`"
@@ -126,9 +126,8 @@
 
 <script>
 
-  import { NetworkLocationResource } from 'kolibri.resources';
-  import { computed, ref } from 'kolibri.lib.vueCompositionApi';
-  import { useLocalStorage, get, useMemoize, computedAsync } from '@vueuse/core';
+  import { computed } from 'kolibri.lib.vueCompositionApi';
+  import { useLocalStorage, get } from '@vueuse/core';
   import find from 'lodash/find';
   import UiAlert from 'kolibri-design-system/lib/keen/UiAlert';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
@@ -141,6 +140,7 @@
     useDevicesForLearnOnlyDevice,
   } from './useDevices.js';
   import useConnectionChecker from './useConnectionChecker.js';
+  import { deviceFacilityCanSignUp } from './api.js';
 
   export default {
     name: 'SelectDeviceForm',
@@ -190,72 +190,10 @@
       const discoveredDevices = computed(() => get(devices).filter(d => d.dynamic));
       const savedDevices = computed(() => get(devices).filter(d => !d.dynamic));
 
-      const fetchDeviceFacilities = useMemoize(
-        async device => {
-          try {
-            const { facilities } = await NetworkLocationResource.fetchFacilities(device.id);
-
-            return facilities.map(facility => {
-              return {
-                id: facility.id,
-                name: facility.name,
-                base_url: device.base_url,
-                address_id: device.id,
-                learner_can_sign_up: facility.learner_can_sign_up,
-                learner_can_login_with_no_password: facility.learner_can_login_with_no_password,
-                kolibri_version: device.kolibri_version,
-              };
-            });
-          } catch (e) {
-            return [];
-          }
-        },
-        {
-          getKey: device => device.id,
-        }
-      );
-
-      const isLoading = ref(false);
-
-      const availableAddressIds = computed(() =>
-        get(devices)
-          .filter(d => d.available)
-          .map(d => d.id)
-      );
-
-      const availableFacilities = computedAsync(
-        async () => {
-          // Extract available devices, and sort to most recently accessed so when we dedupe
-          // facilities across two+ devices, the most recently connected device's facility is shown
-          const _devices = get(devices)
-            .filter(d => get(availableAddressIds).includes(d.id))
-            .sort((deviceA, deviceB) => deviceA.since_last_accessed - deviceB.since_last_accessed);
-          const facilitiesFromDevices = await Promise.all(
-            _devices.map(d => fetchDeviceFacilities(d))
-          );
-          const facilities = {};
-          // Promise.all will resolve with an array of arrays
-          for (const deviceFacilities of facilitiesFromDevices) {
-            for (const facility of deviceFacilities) {
-              // deduplicate the same facility across more than one device
-              if (!facility[facility.id]) {
-                facilities[facility.id] = facility;
-              }
-            }
-          }
-          // Sort alphabetically for predictable ordering
-          return Object.values(facilities).sort((facilityA, facilityB) => {
-            if (facilityA.name < facilityB.name) {
-              return -1;
-            }
-            if (facilityA.name > facilityB.name) {
-              return 1;
-            }
-            return 0;
-          });
-        },
-        [],
-        isLoading
+      const LODDevicesWithSignUpFacility = computed(() =>
+        get(devices).filter(async (d) => {
+          await deviceFacilityCanSignUp(d.id)
+        })
       );
 
       return {
@@ -277,7 +215,7 @@
         discoveredDevices,
         savedDevices,
         storageDeviceId,
-        availableFacilities,
+        LODDevicesWithSignUpFacility,
       };
     },
     props: {
@@ -430,9 +368,9 @@
         });
       },
       canLearnerSignUp(id) {
-        for (const facility of this.availableFacilities) {
-          if (facility.address_id === id) {
-            return facility.learner_can_sign_up;
+        for (const device of this.LODDevicesWithSignUpFacility) {
+          if (device.id === id) {
+            return true;
           }
         }
         return false;
diff --git a/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/api.js b/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/api.js
index 8c4ae4f6f2e..93de78abf6e 100644
--- a/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/api.js
+++ b/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/api.js
@@ -58,3 +58,17 @@ export function channelIsAvailableAtDevice(channelId, device) {
 export function updateConnectionStatus(device) {
   return NetworkLocationResource.updateConnectionStatus(device.id);
 }
+
+export function deviceFacilityCanSignUp(deviceId) {
+  return NetworkLocationResource.fetchFacilities(deviceId)
+    .then(({ device_id, facilities }) => {
+      if (deviceId === device_id) {
+        for (const facility of facilities) {
+          if (facility.learner_can_sign_up) {
+            return facility.learner_can_sign_up;
+          }
+        }
+      }
+      return false;
+  });
+}

From 7f216d5cb6bb315913f3c43ef804c547b42298c5 Mon Sep 17 00:00:00 2001
From: Wck-iipi <21dcs006@nith.ac.in>
Date: Fri, 19 May 2023 00:58:46 +0530
Subject: [PATCH 07/11] Added LodDevicesWithSignUpFacitlity.

---
 .../SelectDeviceForm.vue                      | 28 +++++++++++++------
 .../views/sync/SelectDeviceModalGroup/api.js  |  6 +++-
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue b/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue
index 4dad8da272e..5d323375a42 100644
--- a/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue
+++ b/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue
@@ -126,8 +126,8 @@
 
 <script>
 
-  import { computed } from 'kolibri.lib.vueCompositionApi';
-  import { useLocalStorage, get } from '@vueuse/core';
+  import { computed, ref } from 'kolibri.lib.vueCompositionApi';
+  import { useLocalStorage, get, computedAsync } from '@vueuse/core';
   import find from 'lodash/find';
   import UiAlert from 'kolibri-design-system/lib/keen/UiAlert';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
@@ -190,10 +190,22 @@
       const discoveredDevices = computed(() => get(devices).filter(d => d.dynamic));
       const savedDevices = computed(() => get(devices).filter(d => !d.dynamic));
 
-      const LODDevicesWithSignUpFacility = computed(() =>
-        get(devices).filter(async (d) => {
-          await deviceFacilityCanSignUp(d.id)
-        })
+      const isLoading = ref(false);
+
+      const LODDevicesWithSignUpFacility = computedAsync(
+        async () => {
+          const devicesAvailable = get(devices);
+          const allDevices = {};
+          for (const i of devicesAvailable) {
+            const canSignUp = await deviceFacilityCanSignUp(i.id);
+            if (canSignUp) {
+              allDevices[i.id] = true;
+            }
+          }
+          return allDevices;
+        },
+        {},
+        isLoading
       );
 
       return {
@@ -368,8 +380,8 @@
         });
       },
       canLearnerSignUp(id) {
-        for (const device of this.LODDevicesWithSignUpFacility) {
-          if (device.id === id) {
+        if (this.LODDevicesWithSignUpFacility){
+          if (id in this.LODDevicesWithSignUpFacility) {
             return true;
           }
         }
diff --git a/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/api.js b/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/api.js
index 93de78abf6e..b4eda991414 100644
--- a/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/api.js
+++ b/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/api.js
@@ -59,13 +59,17 @@ export function updateConnectionStatus(device) {
   return NetworkLocationResource.updateConnectionStatus(device.id);
 }
 
+/**
+ * @param {string} deviceId
+ * @return {Promise<boolean>}
+*/
 export function deviceFacilityCanSignUp(deviceId) {
   return NetworkLocationResource.fetchFacilities(deviceId)
     .then(({ device_id, facilities }) => {
       if (deviceId === device_id) {
         for (const facility of facilities) {
           if (facility.learner_can_sign_up) {
-            return facility.learner_can_sign_up;
+            return true;
           }
         }
       }

From 56e88476f6b46949891cca20754225314893e758 Mon Sep 17 00:00:00 2001
From: Wck-iipi <21dcs006@nith.ac.in>
Date: Sat, 20 May 2023 00:06:33 +0530
Subject: [PATCH 08/11] fixed Linting issues

---
 .../SelectDeviceModalGroup/SelectDeviceForm.vue |  2 +-
 .../views/sync/SelectDeviceModalGroup/api.js    | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue b/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue
index 5d323375a42..4a562a230ec 100644
--- a/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue
+++ b/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue
@@ -380,7 +380,7 @@
         });
       },
       canLearnerSignUp(id) {
-        if (this.LODDevicesWithSignUpFacility){
+        if (this.LODDevicesWithSignUpFacility) {
           if (id in this.LODDevicesWithSignUpFacility) {
             return true;
           }
diff --git a/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/api.js b/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/api.js
index b4eda991414..5b937cb5a9d 100644
--- a/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/api.js
+++ b/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/api.js
@@ -62,17 +62,16 @@ export function updateConnectionStatus(device) {
 /**
  * @param {string} deviceId
  * @return {Promise<boolean>}
-*/
+ */
 export function deviceFacilityCanSignUp(deviceId) {
-  return NetworkLocationResource.fetchFacilities(deviceId)
-    .then(({ device_id, facilities }) => {
-      if (deviceId === device_id) {
-        for (const facility of facilities) {
-          if (facility.learner_can_sign_up) {
-            return true;
-          }
+  return NetworkLocationResource.fetchFacilities(deviceId).then(({ device_id, facilities }) => {
+    if (deviceId === device_id) {
+      for (const facility of facilities) {
+        if (facility.learner_can_sign_up) {
+          return true;
         }
       }
-      return false;
+    }
+    return false;
   });
 }

From 2e4fd9d7016f587a53069dbc320e24291fac7138 Mon Sep 17 00:00:00 2001
From: Wck-iipi <21dcs006@nith.ac.in>
Date: Tue, 23 May 2023 23:25:28 +0530
Subject: [PATCH 09/11] Changed var name to lodsWithSignupFacility and reduced
 canLearnerSignUp

---
 .../sync/SelectDeviceModalGroup/SelectDeviceForm.vue  | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue b/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue
index 4a562a230ec..5540a28db64 100644
--- a/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue
+++ b/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue
@@ -192,7 +192,7 @@
 
       const isLoading = ref(false);
 
-      const LODDevicesWithSignUpFacility = computedAsync(
+      const lodsWithSignupFacility = computedAsync(
         async () => {
           const devicesAvailable = get(devices);
           const allDevices = {};
@@ -227,7 +227,7 @@
         discoveredDevices,
         savedDevices,
         storageDeviceId,
-        LODDevicesWithSignUpFacility,
+        lodsWithSignupFacility,
       };
     },
     props: {
@@ -380,12 +380,7 @@
         });
       },
       canLearnerSignUp(id) {
-        if (this.LODDevicesWithSignUpFacility) {
-          if (id in this.LODDevicesWithSignUpFacility) {
-            return true;
-          }
-        }
-        return false;
+        return this.lodsWithSignupFacility && id in this.lodsWithSignupFacility;
       },
     },
     $trs: {

From 0ed7994add81fd66e84a36972c2dd4056c471ad9 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Fri, 9 Jun 2023 13:06:57 -0700
Subject: [PATCH 10/11] add needed mock to test suite

---
 .../__test__/SelectDeviceForm.spec.js                      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/__test__/SelectDeviceForm.spec.js b/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/__test__/SelectDeviceForm.spec.js
index b0c2d171658..35b40b0c0c9 100644
--- a/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/__test__/SelectDeviceForm.spec.js
+++ b/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/__test__/SelectDeviceForm.spec.js
@@ -6,6 +6,7 @@ jest.mock('../api.js', () => ({
   fetchDevices: jest.fn(),
   deleteDevice: jest.fn().mockResolvedValue(),
   updateConnectionStatus: jest.fn(),
+  deviceFacilityCanSignUp: jest.fn().mockResolvedValue(true),
 }));
 
 const devices = [
@@ -39,7 +40,11 @@ const staticDevices = devices.map(a => ({ ...a, dynamic: false }));
 const dynamicDevices = devices.map(a => ({ ...a, dynamic: true }));
 
 function makeWrapper() {
-  const wrapper = mount(SelectDeviceForm);
+  const deviceIdMap = devices.reduce((acc, device) => {
+    acc[device.id] = device;
+    return acc;
+  }, {});
+  const wrapper = mount(SelectDeviceForm, { mocks: { lodsWithSignupFacility: deviceIdMap } });
   // prettier-ignore
   const els = {
     KModal: () => wrapper.findComponent({ name: 'KModal' }),

From eae1aa87218723b2039b8fbcac6db5079f17f9c4 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Fri, 9 Jun 2023 14:51:52 -0700
Subject: [PATCH 11/11] lint

---
 .../SelectDeviceModalGroup/__test__/SelectDeviceForm.spec.js  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/__test__/SelectDeviceForm.spec.js b/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/__test__/SelectDeviceForm.spec.js
index d97bde15565..54892d7cd5a 100644
--- a/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/__test__/SelectDeviceForm.spec.js
+++ b/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/__test__/SelectDeviceForm.spec.js
@@ -44,7 +44,9 @@ function makeWrapper() {
     acc[device.id] = device;
     return acc;
   }, {});
-  const wrapper = shallowMount(SelectDeviceForm, { mocks: { lodsWithSignupFacility: deviceIdMap } });
+  const wrapper = shallowMount(SelectDeviceForm, {
+    mocks: { lodsWithSignupFacility: deviceIdMap },
+  });
   // prettier-ignore
   const els = {
     KModal: () => wrapper.findComponent({ name: 'KModal' }),