From 9658d7afe5c4656a44bafed1ba0554546897323a Mon Sep 17 00:00:00 2001
From: Jonathan Boiser <jboiser@gmail.com>
Date: Mon, 11 May 2020 12:03:19 -0700
Subject: [PATCH 01/29] Update SelectAddressForm

---
 .../SelectAddressModalGroup/SelectAddressForm.vue | 15 ++++++---------
 .../assets/src/views/PostSetupModalGroup.vue      |  2 ++
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/kolibri/core/assets/src/views/sync/SelectAddressModalGroup/SelectAddressForm.vue b/kolibri/core/assets/src/views/sync/SelectAddressModalGroup/SelectAddressForm.vue
index 6fb51facdb6..a0ce6537cec 100644
--- a/kolibri/core/assets/src/views/sync/SelectAddressModalGroup/SelectAddressForm.vue
+++ b/kolibri/core/assets/src/views/sync/SelectAddressModalGroup/SelectAddressForm.vue
@@ -48,7 +48,7 @@
             :disabled="!a.available || !a.hasContent"
           />
           <KButton
-            v-if="!readOnlyStaticAddrersses"
+            v-if="!hideSavedAddresses"
             :key="`forget-${idx}`"
             :text="$tr('forgetAddressButtonLabel')"
             appearance="basic-link"
@@ -57,7 +57,7 @@
         </div>
       </template>
 
-      <hr v-if="discoveredAddresses.length > 0">
+      <hr v-if="!hideSavedAddresses && discoveredAddresses.length > 0">
 
       <template v-for="d in discoveredAddresses">
         <div :key="`div-${d.id}`">
@@ -140,9 +140,8 @@
         required: false,
         default: '',
       },
-      // Customizes the component specifically for the PostSetupModalGroup
-      // Turns off: discovery + add new + forget
-      readOnlyStaticAddrersses: {
+      // Hides "New address" button and other saved locations
+      hideSavedAddresses: {
         type: Boolean,
         default: false,
       },
@@ -176,7 +175,7 @@
         );
       },
       newAddressButtonDisabled() {
-        return this.readOnlyStaticAddrersses || this.stage === this.Stages.FETCHING_ADDRESSES;
+        return this.hideSavedAddresses || this.stage === this.Stages.FETCHING_ADDRESSES;
       },
       requestsFailed() {
         return (
@@ -212,9 +211,7 @@
       },
     },
     beforeMount() {
-      if (!this.readOnlyStaticAddrersses) {
-        this.startDiscoveryPolling();
-      }
+      this.startDiscoveryPolling();
       return this.refreshSavedAddressList();
     },
     mounted() {
diff --git a/kolibri/plugins/device/assets/src/views/PostSetupModalGroup.vue b/kolibri/plugins/device/assets/src/views/PostSetupModalGroup.vue
index 86ccb0afa1a..47a9b5057f1 100644
--- a/kolibri/plugins/device/assets/src/views/PostSetupModalGroup.vue
+++ b/kolibri/plugins/device/assets/src/views/PostSetupModalGroup.vue
@@ -11,9 +11,11 @@
       v-if="step === Steps.PERMISSIONS_CHANGE"
       newRole="superadmin"
     />
+
     <SelectAddressForm
       v-else-if="step === Steps.SELECT_SOURCE_FACILITY_PEER"
       :title="getCommonSyncString('selectSourceTitle')"
+      hideSavedAddresses
       @submit="handleSubmit"
       @cancel="$emit('cancel')"
     >

From 998ef20c650db69a5de5a19a2d36cbb30d8c17e0 Mon Sep 17 00:00:00 2001
From: Jonathan Boiser <jboiser@gmail.com>
Date: Mon, 11 May 2020 12:33:58 -0700
Subject: [PATCH 02/29] On AvailableChannelsPage, select all channels if
 `?setup=true`

---
 .../src/views/AvailableChannelsPage/index.vue  | 18 +++++++++++++++---
 .../assets/src/views/PostSetupModalGroup.vue   |  5 ++++-
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/kolibri/plugins/device/assets/src/views/AvailableChannelsPage/index.vue b/kolibri/plugins/device/assets/src/views/AvailableChannelsPage/index.vue
index 06d36984252..613b737269f 100644
--- a/kolibri/plugins/device/assets/src/views/AvailableChannelsPage/index.vue
+++ b/kolibri/plugins/device/assets/src/views/AvailableChannelsPage/index.vue
@@ -205,7 +205,10 @@
       },
       multipleMode() {
         const { multiple } = this.$route.query;
-        return multiple === true || multiple === 'true';
+        return this.setupMode || multiple === true || multiple === 'true';
+      },
+      setupMode() {
+        return Boolean(this.$route.query.setup);
       },
       documentTitle() {
         switch (this.transferType) {
@@ -253,6 +256,13 @@
         this.setAppBarTitle(this.toolbarTitle(this.transferType));
       }
     },
+    mounted() {
+      // If arriving here from the PostSetupModalGroup/WelcomeModal,
+      // then select all the channels automatically
+      if (this.setupMode) {
+        this.selectedChannels = [...this.allChannels];
+      }
+    },
     methods: {
       ...mapMutations('coreBase', {
         setAppBarTitle: 'SET_APP_BAR_TITLE',
@@ -277,14 +287,16 @@
       toggleMultipleMode() {
         let newQuery;
         if (this.multipleMode) {
-          newQuery = omit(this.$route.query, ['multiple']);
+          // Remove the 'setup' query param if switching to single-channel mode.
+          // When the user returns, none of the channels will be selected
+          newQuery = omit(this.$route.query, ['multiple', 'setup']);
         } else {
           newQuery = {
             ...this.$route.query,
             multiple: true,
           };
         }
-        this.$router.push({ query: newQuery });
+        return this.$router.push({ query: newQuery });
       },
       handleSubmitToken(channel) {
         if (this.multipleMode) {
diff --git a/kolibri/plugins/device/assets/src/views/PostSetupModalGroup.vue b/kolibri/plugins/device/assets/src/views/PostSetupModalGroup.vue
index 47a9b5057f1..079880c2bae 100644
--- a/kolibri/plugins/device/assets/src/views/PostSetupModalGroup.vue
+++ b/kolibri/plugins/device/assets/src/views/PostSetupModalGroup.vue
@@ -87,7 +87,10 @@
             this.$emit('cancel');
           }
         } else if (this.step === Steps.SELECT_SOURCE_FACILITY_PEER) {
-          this.$router.push(availableChannelsPageLink({ addressId: data.id }));
+          this.$emit('cancel');
+          let newRoute = availableChannelsPageLink({ addressId: data.id });
+          newRoute.query.setup = true;
+          this.$router.push(newRoute);
         }
       },
     },

From 2d018f9e702f1f9c8f91591013c716fbbc68f109 Mon Sep 17 00:00:00 2001
From: Jonathan Boiser <jboiser@gmail.com>
Date: Tue, 12 May 2020 12:09:59 -0700
Subject: [PATCH 03/29] Add FacilityUser is_admin filter

---
 kolibri/core/auth/api.py           | 12 ++++++-
 kolibri/core/auth/test/test_api.py | 55 ++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/kolibri/core/auth/api.py b/kolibri/core/auth/api.py
index 684defcdc5e..0e40f327569 100644
--- a/kolibri/core/auth/api.py
+++ b/kolibri/core/auth/api.py
@@ -24,6 +24,7 @@
 from django_filters.rest_framework import DjangoFilterBackend
 from django_filters.rest_framework import FilterSet
 from django_filters.rest_framework import ModelChoiceFilter
+from django_filters.rest_framework import BooleanFilter
 from rest_framework import filters
 from rest_framework import permissions
 from rest_framework import status
@@ -145,12 +146,21 @@ class FacilityUserFilter(FilterSet):
         method="filter_member_of", queryset=Collection.objects.all()
     )
 
+    is_admin = BooleanFilter(method="filter_is_admin")
+
     def filter_member_of(self, queryset, name, value):
         return queryset.filter(Q(memberships__collection=value) | Q(facility=value))
 
+    def filter_is_admin(self, queryset, name, value):
+        if (value is True):
+            return queryset.filter(Q(devicepermissions__is_superuser=True) | Q(roles__kind__contains="admin"))
+        else:
+            return queryset.filter(Q(devicepermissions__is_superuser=True))
+            # return queryset.exclude(Q(is_superuser=True) | Q(kind="admin"))
+
     class Meta:
         model = FacilityUser
-        fields = ["member_of"]
+        fields = ["member_of", "is_admin"]
 
 
 class FacilityUserViewSet(ValuesViewset):
diff --git a/kolibri/core/auth/test/test_api.py b/kolibri/core/auth/test/test_api.py
index dd360836fe8..71e0520b19f 100644
--- a/kolibri/core/auth/test/test_api.py
+++ b/kolibri/core/auth/test/test_api.py
@@ -630,6 +630,61 @@ def test_user_list(self):
         )
 
 
+class FacilityUserFilterTestCase(APITestCase):
+    def setUp(self):
+        provision_device()
+        # Fixtures: 2 facilities with 1 learner + 1 admin each
+        self.facility_1 = FacilityFactory.create()
+        self.facility_2 = FacilityFactory.create()
+
+        self.user_1 = FacilityUserFactory.create(
+            facility=self.facility_1, username="learner_1"
+        )
+        self.admin_1 = FacilityUserFactory.create(
+            facility=self.facility_1, username="admin_1"
+        )
+        self.facility_1.add_admin(self.admin_1)
+
+        self.user_2 = FacilityUserFactory.create(
+            facility=self.facility_2, username="learner_2"
+        )
+        self.admin_2 = FacilityUserFactory.create(
+            facility=self.facility_2, username="admin_2"
+        )
+        self.facility_2.add_admin(self.admin_2)
+
+        # Superuser is in facility 1
+        self.superuser = create_superuser(self.facility_1, username="a_superuser")
+        self.client.login(
+            username=self.superuser.username,
+            password=DUMMY_PASSWORD,
+            facility=self.facility_1,
+        )
+
+    def _sort_by_username(self, data):
+        return sorted(data, key=lambda x: x["username"])
+
+    def test_user_member_of_filter(self):
+        response = self.client.get(
+            reverse("kolibri:core:facilityuser-list"), {"member_of": self.facility_1.id}
+        )
+        data = self._sort_by_username(response.data)
+        self.assertEqual(len(data), 3)
+        self.assertEqual(data[0]["id"], self.superuser.id)
+        self.assertEqual(data[1]["id"], self.admin_1.id)
+        self.assertEqual(data[2]["id"], self.user_1.id)
+
+    def test_user_is_admin_filter(self):
+        response = self.client.get(
+            reverse("kolibri:core:facilityuser-list"), {"is_admin": True}
+        )
+        data = self._sort_by_username(response.data)
+        self.assertEqual(len(data), 3)
+        self.assertEqual(data[0]["id"], self.superuser.id)
+        self.assertEqual(data[1]["id"], self.admin_1.id)
+        self.assertEqual(data[2]["id"], self.admin_2.id)
+
+
 class LoginLogoutTestCase(APITestCase):
     def setUp(self):
         provision_device()

From 00cdf0d303bdb36c3c39520ab34fd08b0219ba4a Mon Sep 17 00:00:00 2001
From: Jonathan Boiser <jboiser@gmail.com>
Date: Tue, 12 May 2020 15:03:46 -0700
Subject: [PATCH 04/29] Add really basic /facilityadmins endpoint

---
 kolibri/core/auth/api.py                       |  7 +++++--
 kolibri/plugins/setup_wizard/api.py            | 15 +++++++++++++++
 kolibri/plugins/setup_wizard/api_urls.py       | 11 +++++++++++
 kolibri/plugins/setup_wizard/kolibri_plugin.py |  1 +
 4 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 kolibri/plugins/setup_wizard/api.py
 create mode 100644 kolibri/plugins/setup_wizard/api_urls.py

diff --git a/kolibri/core/auth/api.py b/kolibri/core/auth/api.py
index 0e40f327569..9067d32276e 100644
--- a/kolibri/core/auth/api.py
+++ b/kolibri/core/auth/api.py
@@ -152,8 +152,11 @@ def filter_member_of(self, queryset, name, value):
         return queryset.filter(Q(memberships__collection=value) | Q(facility=value))
 
     def filter_is_admin(self, queryset, name, value):
-        if (value is True):
-            return queryset.filter(Q(devicepermissions__is_superuser=True) | Q(roles__kind__contains="admin"))
+        if value is True:
+            return queryset.filter(
+                Q(devicepermissions__is_superuser=True)
+                | Q(roles__kind__contains="admin")
+            )
         else:
             return queryset.filter(Q(devicepermissions__is_superuser=True))
             # return queryset.exclude(Q(is_superuser=True) | Q(kind="admin"))
diff --git a/kolibri/plugins/setup_wizard/api.py b/kolibri/plugins/setup_wizard/api.py
new file mode 100644
index 00000000000..d683d37156d
--- /dev/null
+++ b/kolibri/plugins/setup_wizard/api.py
@@ -0,0 +1,15 @@
+from kolibri.core.auth.models import FacilityUser
+from rest_framework.viewsets import GenericViewSet
+from django.db.models import Q
+from rest_framework.response import Response
+
+
+class FacilityAdminView(GenericViewSet):
+    queryset = FacilityUser.objects.filter(
+        Q(roles__kind__contains="admin") | Q(devicepermissions__is_superuser=True)
+    )
+
+    def list(self, request):
+        queryset = self.get_queryset()
+        data = [{"username": user.username, "id": user.id} for user in queryset]
+        return Response(data)
diff --git a/kolibri/plugins/setup_wizard/api_urls.py b/kolibri/plugins/setup_wizard/api_urls.py
new file mode 100644
index 00000000000..aa7f4bac553
--- /dev/null
+++ b/kolibri/plugins/setup_wizard/api_urls.py
@@ -0,0 +1,11 @@
+from django.conf.urls import include
+from django.conf.urls import url
+from rest_framework import routers
+
+from .api import FacilityAdminView
+
+router = routers.DefaultRouter()
+
+router.register(r"facilityadmins", FacilityAdminView, base_name="facilityadmins")
+
+urlpatterns = [url(r"^", include(router.urls))]
diff --git a/kolibri/plugins/setup_wizard/kolibri_plugin.py b/kolibri/plugins/setup_wizard/kolibri_plugin.py
index 3c5a3ca9699..49c1dffafc6 100644
--- a/kolibri/plugins/setup_wizard/kolibri_plugin.py
+++ b/kolibri/plugins/setup_wizard/kolibri_plugin.py
@@ -9,6 +9,7 @@
 
 
 class SetupWizardPlugin(KolibriPluginBase):
+    untranslated_view_urls = "api_urls"
     translated_view_urls = "urls"
 
 

From 0c3afc539b9dc3bfbd87c6fd07b191abdb637eb1 Mon Sep 17 00:00:00 2001
From: Jonathan Boiser <jboiser@gmail.com>
Date: Tue, 12 May 2020 15:43:01 -0700
Subject: [PATCH 05/29] Integrate SelectSuperAdminAccountForm with
 /facilityadmins

---
 .../assets/src/modules/pluginModule.js        |  7 ++++
 .../SelectSuperAdminAccountForm.vue           | 33 +++++++------------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/kolibri/plugins/setup_wizard/assets/src/modules/pluginModule.js b/kolibri/plugins/setup_wizard/assets/src/modules/pluginModule.js
index f29a75eb343..add39d198f3 100644
--- a/kolibri/plugins/setup_wizard/assets/src/modules/pluginModule.js
+++ b/kolibri/plugins/setup_wizard/assets/src/modules/pluginModule.js
@@ -51,6 +51,13 @@ export default {
     error: false,
   },
   actions: {
+    getFacilityAdmins() {
+      return client({
+        path: urls['kolibri:kolibri.plugins.setupWizard:facilityadminsList'](),
+      }).then(response => {
+        return response.entity;
+      });
+    },
     provisionDevice(store) {
       const onboardingData = store.state.onboardingData;
 
diff --git a/kolibri/plugins/setup_wizard/assets/src/views/importFacility/SelectSuperAdminAccountForm.vue b/kolibri/plugins/setup_wizard/assets/src/views/importFacility/SelectSuperAdminAccountForm.vue
index 97f00f63421..30bbfdf4d89 100644
--- a/kolibri/plugins/setup_wizard/assets/src/views/importFacility/SelectSuperAdminAccountForm.vue
+++ b/kolibri/plugins/setup_wizard/assets/src/views/importFacility/SelectSuperAdminAccountForm.vue
@@ -1,6 +1,7 @@
 <template>
 
   <SuperuserCredentialsForm
+    v-if="!loading"
     :header="$tr('header')"
     :description="$tr('description')"
     @click_next="handleClickNext"
@@ -63,23 +64,6 @@
 
   const CREATE_NEW_SUPER_ADMIN = 'CREATE_NEW_SUPER_ADMIN';
 
-  const fakeAdmins = [
-    {
-      id: '1234',
-      username: 'superadmin',
-    },
-    {
-      id: '2345',
-      username: 'otheradmin1',
-    },
-    {
-      id: '3456',
-      username: 'otheradmin2',
-    },
-  ];
-
-  // TODO
-  // - Required field validation for simple password
   export default {
     name: 'SelectSuperAdminAccountForm',
     components: {
@@ -130,11 +114,16 @@
     },
     methods: {
       fetchFacilityAdmins() {
-        return Promise.resolve(fakeAdmins).then(() => {
-          this.facilityAdmins = [...fakeAdmins];
-          this.selected = { ...this.dropdownOptions[0] };
-          this.loading = false;
-        });
+        this.$store
+          .dispatch('getFacilityAdmins')
+          .then(admins => {
+            this.facilityAdmins = [...admins];
+            this.selected = { ...this.dropdownOptions[0] };
+            this.loading = false;
+          })
+          .catch(error => {
+            this.$store.dispatch('handleApiError', error);
+          });
       },
       resetFormAndRefocus() {
         this.shouldValidate = false;

From 5243a4ea9bf32a80ae685eada25f513872378186 Mon Sep 17 00:00:00 2001
From: Jonathan Boiser <jboiser@gmail.com>
Date: Tue, 12 May 2020 15:51:16 -0700
Subject: [PATCH 06/29] Stub GrantSuperUserPermissionsView and
 StartFacilityImportView

---
 kolibri/plugins/setup_wizard/api.py      | 73 ++++++++++++++++++++++--
 kolibri/plugins/setup_wizard/api_urls.py | 12 ++++
 2 files changed, 80 insertions(+), 5 deletions(-)

diff --git a/kolibri/plugins/setup_wizard/api.py b/kolibri/plugins/setup_wizard/api.py
index d683d37156d..13e9418f6a8 100644
--- a/kolibri/plugins/setup_wizard/api.py
+++ b/kolibri/plugins/setup_wizard/api.py
@@ -1,15 +1,78 @@
 from kolibri.core.auth.models import FacilityUser
+from kolibri.core.device.models import DevicePermissions
+from rest_framework.exceptions import AuthenticationFailed
+from rest_framework.exceptions import NotFound
 from rest_framework.viewsets import GenericViewSet
-from django.db.models import Q
 from rest_framework.response import Response
+from rest_framework.permissions import BasePermission
+
+
+# Basic class that makes these endpoints unusable if device is provisioned
+class HasPermissionDuringSetup(BasePermission):
+    def has_permission(self, request, view):
+        from kolibri.core.device.utils import device_provisioned
+        return device_provisioned()
 
 
 class FacilityAdminView(GenericViewSet):
-    queryset = FacilityUser.objects.filter(
-        Q(roles__kind__contains="admin") | Q(devicepermissions__is_superuser=True)
-    )
+    """
+    Returns basic data about admins from the just-imported Facility
+    """
+    permission_classes = (HasPermissionDuringSetup, )
 
     def list(self, request):
-        queryset = self.get_queryset()
+        # The filter is very loose, since we areassuming that the only
+        # users are from the new facility
+        queryset = FacilityUser.objects.filter(roles__kind__contains="admin")
         data = [{"username": user.username, "id": user.id} for user in queryset]
         return Response(data)
+
+
+class GrantSuperuserPermissionsView(GenericViewSet):
+    """
+    Given a FacilityUser and their credentials, creates a DevicePermissions
+    record with is_superuser = True
+    """
+    permission_classes = (HasPermissionDuringSetup, )
+
+    def create(self, request):
+        user_id = request.data.get("user_id", "")
+        password = request.data.get("password", "")
+
+        # Step 1: Get the Facility User object
+        # TODO fail if user isn't admin
+        try:
+            facilityuser = FacilityUser.objects.get(id=user_id)
+        except (Exception, FacilityUser.DoesNotExist):
+            raise NotFound()
+
+        # Step 2: Test the password
+        if not facilityuser.check_password(password):
+            raise AuthenticationFailed()
+
+        # Step 3: If it succeeds, create a DevicePermissions model for
+        # the user
+        DevicePermissions.objects.update_or_create(
+            user=facilityuser,
+            defaults={"is_superuser": True, "can_manage_content": True},
+        )
+
+        # Finally: return a simple 200 so UI can continue on
+        return Response({"user_id": user_id})
+
+
+class StartFacilityImportTaskView(GenericViewSet):
+    """
+    Given a Device ID, Facility ID, and admin credentials, start
+    a Facility Import task
+    """
+
+    permission_classes = (HasPermissionDuringSetup, )
+
+    def create(self, request):
+        # Step 1: Send all of the info over to the facility-import endpoint
+
+        # If it fails, returns a 400
+
+        # Step 2: If it succeeds, return 200. UI will continue to the progress page
+        return Response(request.data)
diff --git a/kolibri/plugins/setup_wizard/api_urls.py b/kolibri/plugins/setup_wizard/api_urls.py
index aa7f4bac553..796c7cd1477 100644
--- a/kolibri/plugins/setup_wizard/api_urls.py
+++ b/kolibri/plugins/setup_wizard/api_urls.py
@@ -3,9 +3,21 @@
 from rest_framework import routers
 
 from .api import FacilityAdminView
+from .api import GrantSuperuserPermissionsView
+from .api import StartFacilityImportTaskView
 
 router = routers.DefaultRouter()
 
 router.register(r"facilityadmins", FacilityAdminView, base_name="facilityadmins")
+router.register(
+    r"grantsuperuserpermissions",
+    GrantSuperuserPermissionsView,
+    base_name="grantsuperuserpermissions",
+)
+router.register(
+    r"startfacilityimporttask",
+    StartFacilityImportTaskView,
+    base_name="startfacilityimporttask",
+)
 
 urlpatterns = [url(r"^", include(router.urls))]

From bbca21be35717ffc31049231ad5745277dd099ff Mon Sep 17 00:00:00 2001
From: Jonathan Boiser <jboiser@gmail.com>
Date: Wed, 13 May 2020 16:03:14 -0700
Subject: [PATCH 07/29] Integrate SelectSuperAdminAccountForm with backend

---
 kolibri/plugins/setup_wizard/api.py           |  6 ++--
 .../assets/src/modules/pluginModule.js        |  9 ++++++
 .../SelectSuperAdminAccountForm.vue           | 30 +++++++++++++++++--
 3 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/kolibri/plugins/setup_wizard/api.py b/kolibri/plugins/setup_wizard/api.py
index 13e9418f6a8..cf5c80ec9b0 100644
--- a/kolibri/plugins/setup_wizard/api.py
+++ b/kolibri/plugins/setup_wizard/api.py
@@ -1,7 +1,7 @@
 from kolibri.core.auth.models import FacilityUser
 from kolibri.core.device.models import DevicePermissions
-from rest_framework.exceptions import AuthenticationFailed
 from rest_framework.exceptions import NotFound
+from rest_framework.exceptions import PermissionDenied
 from rest_framework.viewsets import GenericViewSet
 from rest_framework.response import Response
 from rest_framework.permissions import BasePermission
@@ -11,7 +11,7 @@
 class HasPermissionDuringSetup(BasePermission):
     def has_permission(self, request, view):
         from kolibri.core.device.utils import device_provisioned
-        return device_provisioned()
+        return not device_provisioned()
 
 
 class FacilityAdminView(GenericViewSet):
@@ -48,7 +48,7 @@ def create(self, request):
 
         # Step 2: Test the password
         if not facilityuser.check_password(password):
-            raise AuthenticationFailed()
+            raise PermissionDenied()
 
         # Step 3: If it succeeds, create a DevicePermissions model for
         # the user
diff --git a/kolibri/plugins/setup_wizard/assets/src/modules/pluginModule.js b/kolibri/plugins/setup_wizard/assets/src/modules/pluginModule.js
index add39d198f3..26d6e2fb173 100644
--- a/kolibri/plugins/setup_wizard/assets/src/modules/pluginModule.js
+++ b/kolibri/plugins/setup_wizard/assets/src/modules/pluginModule.js
@@ -58,6 +58,15 @@ export default {
         return response.entity;
       });
     },
+    grantSuperuserPermisions(store, data) {
+      return client({
+        path: urls['kolibri:kolibri.plugins.setupWizard:grantsuperuserpermissionsList'](),
+        entity: {
+          user_id: data.user_id,
+          password: data.password,
+        },
+      });
+    },
     provisionDevice(store) {
       const onboardingData = store.state.onboardingData;
 
diff --git a/kolibri/plugins/setup_wizard/assets/src/views/importFacility/SelectSuperAdminAccountForm.vue b/kolibri/plugins/setup_wizard/assets/src/views/importFacility/SelectSuperAdminAccountForm.vue
index 30bbfdf4d89..0cadbd41b23 100644
--- a/kolibri/plugins/setup_wizard/assets/src/views/importFacility/SelectSuperAdminAccountForm.vue
+++ b/kolibri/plugins/setup_wizard/assets/src/views/importFacility/SelectSuperAdminAccountForm.vue
@@ -7,6 +7,9 @@
     @click_next="handleClickNext"
   >
     <template v-slot:aboveform>
+      <p v-if="error" class="error">
+        {{ coreString('invalidCredentialsError') }}
+      </p>
       <p>
         {{ $tr('chooseAdminPrompt', {
           facility: facility.name
@@ -83,6 +86,8 @@
         password: '',
         passwordValid: false,
         shouldValidate: false,
+        loading: true,
+        error: false,
         facilityAdmins: [],
       };
     },
@@ -131,10 +136,27 @@
           this.$refs.password.resetAndFocus();
         }
       },
+      grantPermissions(data) {
+        this.error = false;
+        return this.$store.dispatch('grantSuperuserPermisions', data);
+      },
       handleClickNext() {
         this.shouldValidate = true;
-        if (this.existingUser && !this.passwordValid) {
-          this.$refs.password.focus();
+        if (this.existingUser) {
+          if (this.passwordValid) {
+            this.grantPermissions({
+              user_id: this.selected.value,
+              password: this.password,
+            })
+              .then(() => {
+                this.$emit('click_next');
+              })
+              .catch(() => {
+                this.error = true;
+              });
+          } else {
+            this.$refs.password.focus();
+          }
         } else {
           this.$emit('click_next');
         }
@@ -179,4 +201,8 @@
     margin: 24px 0;
   }
 
+  .error {
+    color: red;
+  }
+
 </style>

From 0f12d395821e276e44eeb6f4e4811365b979fc24 Mon Sep 17 00:00:00 2001
From: Jonathan Boiser <jboiser@gmail.com>
Date: Tue, 19 May 2020 16:45:21 -0700
Subject: [PATCH 08/29] Add check for admin role

---
 kolibri/plugins/setup_wizard/api.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/kolibri/plugins/setup_wizard/api.py b/kolibri/plugins/setup_wizard/api.py
index cf5c80ec9b0..787c48769e7 100644
--- a/kolibri/plugins/setup_wizard/api.py
+++ b/kolibri/plugins/setup_wizard/api.py
@@ -1,4 +1,5 @@
 from kolibri.core.auth.models import FacilityUser
+from kolibri.core.auth.constants import user_kinds
 from kolibri.core.device.models import DevicePermissions
 from rest_framework.exceptions import NotFound
 from rest_framework.exceptions import PermissionDenied
@@ -11,6 +12,7 @@
 class HasPermissionDuringSetup(BasePermission):
     def has_permission(self, request, view):
         from kolibri.core.device.utils import device_provisioned
+
         return not device_provisioned()
 
 
@@ -18,7 +20,8 @@ class FacilityAdminView(GenericViewSet):
     """
     Returns basic data about admins from the just-imported Facility
     """
-    permission_classes = (HasPermissionDuringSetup, )
+
+    permission_classes = (HasPermissionDuringSetup,)
 
     def list(self, request):
         # The filter is very loose, since we areassuming that the only
@@ -33,21 +36,24 @@ class GrantSuperuserPermissionsView(GenericViewSet):
     Given a FacilityUser and their credentials, creates a DevicePermissions
     record with is_superuser = True
     """
-    permission_classes = (HasPermissionDuringSetup, )
+
+    permission_classes = (HasPermissionDuringSetup,)
 
     def create(self, request):
         user_id = request.data.get("user_id", "")
         password = request.data.get("password", "")
 
         # Step 1: Get the Facility User object
-        # TODO fail if user isn't admin
         try:
             facilityuser = FacilityUser.objects.get(id=user_id)
         except (Exception, FacilityUser.DoesNotExist):
             raise NotFound()
 
-        # Step 2: Test the password
-        if not facilityuser.check_password(password):
+        # Step 2: Test for password and admin role
+        if (
+            not facilityuser.check_password(password)
+            or user_kinds.ADMIN not in facilityuser.session_data["kind"]
+        ):
             raise PermissionDenied()
 
         # Step 3: If it succeeds, create a DevicePermissions model for
@@ -67,7 +73,7 @@ class StartFacilityImportTaskView(GenericViewSet):
     a Facility Import task
     """
 
-    permission_classes = (HasPermissionDuringSetup, )
+    permission_classes = (HasPermissionDuringSetup,)
 
     def create(self, request):
         # Step 1: Send all of the info over to the facility-import endpoint

From d3dce16a056a954ce3e1cbb9cbfb9aa944533e5a Mon Sep 17 00:00:00 2001
From: Jonathan Boiser <jboiser@gmail.com>
Date: Wed, 20 May 2020 14:33:46 -0700
Subject: [PATCH 09/29] Add startOverAction to commonCoreStrings

---
 .../assets/src/views/importFacility/LoadingTaskPage.vue         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kolibri/plugins/setup_wizard/assets/src/views/importFacility/LoadingTaskPage.vue b/kolibri/plugins/setup_wizard/assets/src/views/importFacility/LoadingTaskPage.vue
index d28fdb11f1e..58f2c3964f9 100644
--- a/kolibri/plugins/setup_wizard/assets/src/views/importFacility/LoadingTaskPage.vue
+++ b/kolibri/plugins/setup_wizard/assets/src/views/importFacility/LoadingTaskPage.vue
@@ -20,7 +20,7 @@
           @click="retryImport"
         />
         <KButton
-          text="Start over"
+          :text="coreString('starOverAction')"
           appearance="flat-button"
           @click="startOver"
         />

From a692c40516ce8106f407cba74e37ef026f7efc2c Mon Sep 17 00:00:00 2001
From: Jonathan Boiser <jboiser@gmail.com>
Date: Tue, 26 May 2020 13:45:11 -0700
Subject: [PATCH 10/29] Add tests for device setup APIs

---
 kolibri/plugins/setup_wizard/api.py           |  8 +-
 kolibri/plugins/setup_wizard/test/__init__.py |  0
 kolibri/plugins/setup_wizard/test/test_api.py | 73 +++++++++++++++++++
 3 files changed, 78 insertions(+), 3 deletions(-)
 create mode 100644 kolibri/plugins/setup_wizard/test/__init__.py
 create mode 100644 kolibri/plugins/setup_wizard/test/test_api.py

diff --git a/kolibri/plugins/setup_wizard/api.py b/kolibri/plugins/setup_wizard/api.py
index 787c48769e7..1f9d5fb5bb4 100644
--- a/kolibri/plugins/setup_wizard/api.py
+++ b/kolibri/plugins/setup_wizard/api.py
@@ -24,11 +24,13 @@ class FacilityAdminView(GenericViewSet):
     permission_classes = (HasPermissionDuringSetup,)
 
     def list(self, request):
-        # The filter is very loose, since we areassuming that the only
+        # The filter is very loose, since we are assuming that the only
         # users are from the new facility
         queryset = FacilityUser.objects.filter(roles__kind__contains="admin")
-        data = [{"username": user.username, "id": user.id} for user in queryset]
-        return Response(data)
+        response_data = [
+            {"username": user.username, "id": user.id} for user in queryset
+        ]
+        return Response(response_data)
 
 
 class GrantSuperuserPermissionsView(GenericViewSet):
diff --git a/kolibri/plugins/setup_wizard/test/__init__.py b/kolibri/plugins/setup_wizard/test/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/kolibri/plugins/setup_wizard/test/test_api.py b/kolibri/plugins/setup_wizard/test/test_api.py
new file mode 100644
index 00000000000..008fd421a20
--- /dev/null
+++ b/kolibri/plugins/setup_wizard/test/test_api.py
@@ -0,0 +1,73 @@
+from __future__ import absolute_import
+from __future__ import print_function
+from __future__ import unicode_literals
+
+from django.core.urlresolvers import reverse
+from rest_framework.test import APITestCase
+from kolibri.core.auth.test.helpers import provision_device
+from kolibri.core.auth.test.helpers import create_dummy_facility_data
+
+
+class FacilityAdminViewTest(APITestCase):
+    def setUp(self):
+        create_dummy_facility_data(classroom_count=1)
+
+    def _make_request(self):
+        return self.client.get(
+            reverse("kolibri:kolibri.plugins.setup_wizard:facilityadmins-list"),
+            format="json",
+        )
+
+    def test_fails_if_device_provisioned(self):
+        provision_device()
+        response = self._make_request()
+        self.assertEqual(response.status_code, 403)
+
+    def test_only_returns_admins(self):
+        response = self._make_request()
+        sorted_admins = sorted(response.data, key=lambda x: x["username"])
+        self.assertEqual(sorted_admins[0]["username"], "classadmin0")
+        self.assertEqual(sorted_admins[1]["username"], "facadmin")
+
+
+class GrantSuperuserPermissionsViewTest(APITestCase):
+    def setUp(self):
+        facility_data = create_dummy_facility_data(classroom_count=1)
+        self.admin = facility_data["facility_admin"]
+        self.admin.set_password('password')
+        self.admin.save()
+        self.coach = facility_data["classroom_coaches"][0]
+        self.coach.set_password('password')
+        self.coach.save()
+
+    def _make_request(self, data):
+        return self.client.post(
+            reverse(
+                "kolibri:kolibri.plugins.setup_wizard:grantsuperuserpermissions-list"
+            ),
+            data,
+            format="json",
+        )
+
+    def test_fails_if_device_provisioned(self):
+        provision_device()
+        response = self._make_request({"user_id": self.admin.id, "password": "password"})
+        self.assertEqual(response.status_code, 403)
+
+    def test_fails_if_user_not_found(self):
+        id_copy = self.admin.id
+        self.admin.delete()
+        response = self._make_request({"user_id": id_copy, "password": "password"})
+        self.assertEqual(response.status_code, 404)
+
+    def test_fails_if_password_invalid(self):
+        response = self._make_request({"user_id": self.admin.id, "password": "passward"})
+        self.assertEqual(response.status_code, 403)
+
+    def test_fails_if_user_not_admin(self):
+        response = self._make_request({"user_id": self.coach.id, "password": "password"})
+        self.assertEqual(response.status_code, 403)
+
+    def test_successfully_adds_device_permissions(self):
+        response = self._make_request({"user_id": self.admin.id, "password": "password"})
+        self.assertEqual(response.status_code, 200)

From 997316283b486a3836c1adc2cec183e390477cf2 Mon Sep 17 00:00:00 2001
From: Jonathan Boiser <jboiser@gmail.com>
Date: Mon, 8 Jun 2020 15:25:31 -0700
Subject: [PATCH 11/29] Fix problems with Sync Modals on Data Page

---
 .../src/views/sync/ConfirmationRegisterModal.vue    |  6 +++++-
 .../src/views/sync/FacilityNameAndSyncStatus.vue    | 13 -------------
 .../src/views/DataPage/SyncInterface/index.vue      |  7 +++----
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/kolibri/core/assets/src/views/sync/ConfirmationRegisterModal.vue b/kolibri/core/assets/src/views/sync/ConfirmationRegisterModal.vue
index 960878d4a84..5547579e54f 100644
--- a/kolibri/core/assets/src/views/sync/ConfirmationRegisterModal.vue
+++ b/kolibri/core/assets/src/views/sync/ConfirmationRegisterModal.vue
@@ -2,7 +2,7 @@
 
   <KModal
     :title="$tr('registerFacility')"
-    :submitText="$tr('register')"
+    :submitText="registerText"
     :cancelText="cancelText"
     @submit="registerFacility"
     @cancel="$emit('cancel')"
@@ -56,6 +56,9 @@
           ? this.coreString('closeAction')
           : this.coreString('cancelAction');
       },
+      registerText() {
+        return this.alreadyRegistered ? null : this.$tr('register');
+      },
     },
     methods: {
       registerFacility() {
@@ -71,6 +74,7 @@
               data: { registered: true },
               exists: true,
             }).then(() => {
+              this.$emit('success', this.targetFacility);
               this.submitting = false;
             });
           })
diff --git a/kolibri/core/assets/src/views/sync/FacilityNameAndSyncStatus.vue b/kolibri/core/assets/src/views/sync/FacilityNameAndSyncStatus.vue
index a366679c979..4ccfe58b8b5 100644
--- a/kolibri/core/assets/src/views/sync/FacilityNameAndSyncStatus.vue
+++ b/kolibri/core/assets/src/views/sync/FacilityNameAndSyncStatus.vue
@@ -46,18 +46,8 @@
 <script>
 
   import UiIcon from 'keen-ui/src/UiIcon';
-  import has from 'lodash/has';
-  import every from 'lodash/every';
   import { now } from 'kolibri.utils.serverClock';
 
-  const facilityFields = [
-    'name',
-    'dataset.registered',
-    'syncing',
-    'last_sync_failed',
-    'last_synced',
-  ];
-
   export default {
     name: 'FacilityNameAndSyncStatus',
     components: {
@@ -68,9 +58,6 @@
       facility: {
         type: Object,
         required: true,
-        validator(value) {
-          return every(facilityFields, field => has(value, field));
-        },
       },
     },
     data() {
diff --git a/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue b/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue
index 1c133d68c7c..5b34ffc4aa6 100644
--- a/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue
+++ b/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue
@@ -108,14 +108,13 @@
         });
       },
       handleValidateSuccess(payload) {
-        const { projectName, token } = payload;
-        this.$store.commit('manageSync/SET_PROJECT_NAME', projectName);
+        const { name, token } = payload;
+        this.$store.commit('manageSync/SET_PROJECT_NAME', name);
         this.$store.commit('manageSync/SET_TOKEN', token);
         this.displayModal(Modals.CONFIRMATION_REGISTER);
       },
       handleConfirmationSuccess(payload) {
-        const { targetFacility } = payload;
-        this.$store.commit('manageCSV/SET_REGISTERED', targetFacility);
+        this.$store.commit('manageCSV/SET_REGISTERED', payload);
         this.displayModal(false);
       },
     },

From b56f267348b2841f392f365852c52d2796ff3bde Mon Sep 17 00:00:00 2001
From: Jonathan Boiser <jboiser@gmail.com>
Date: Mon, 8 Jun 2020 15:35:36 -0700
Subject: [PATCH 12/29] Fix missing birthyear

---
 .../core/assets/src/views/userAccounts/BirthYearDisplayText.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kolibri/core/assets/src/views/userAccounts/BirthYearDisplayText.vue b/kolibri/core/assets/src/views/userAccounts/BirthYearDisplayText.vue
index 82a5b4fd6fa..829a99fb3b7 100644
--- a/kolibri/core/assets/src/views/userAccounts/BirthYearDisplayText.vue
+++ b/kolibri/core/assets/src/views/userAccounts/BirthYearDisplayText.vue
@@ -1,7 +1,7 @@
 <template>
 
   <span v-if="isSpecified && birthYear">
-    {{ displayText }}
+    {{ birthYear }}
   </span>
   <KEmptyPlaceholder v-else />
 

From ba98d78f3796d2ea11d5490935ff22c8f84691ec Mon Sep 17 00:00:00 2001
From: Jonathan Boiser <jboiser@gmail.com>
Date: Mon, 8 Jun 2020 16:22:31 -0700
Subject: [PATCH 13/29] Update requirements/dev.txt

---
 requirements/dev.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/requirements/dev.txt b/requirements/dev.txt
index 2f772752b24..a329992a501 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -1,5 +1,6 @@
 -r base.txt
-flake8==3.8.0
+ipdb=0.13.2
+flake8==3.8.3
 pre-commit==1.15.1
 tox==3.1.3
 django-debug-panel==0.8.3

From 9a229621ff9890521ce587168fb0bbd3124eddf6 Mon Sep 17 00:00:00 2001
From: Jonathan Boiser <jboiser@gmail.com>
Date: Mon, 8 Jun 2020 16:22:46 -0700
Subject: [PATCH 14/29] Stub peer facilities client-server endpoint

---
 kolibri/core/discovery/api.py      | 16 ++++++++++++++++
 kolibri/core/discovery/api_urls.py |  3 +++
 2 files changed, 19 insertions(+)

diff --git a/kolibri/core/discovery/api.py b/kolibri/core/discovery/api.py
index ad44085688c..b53487ef309 100644
--- a/kolibri/core/discovery/api.py
+++ b/kolibri/core/discovery/api.py
@@ -1,4 +1,6 @@
+import requests
 from rest_framework import viewsets
+from rest_framework.response import Response
 
 from .models import DynamicNetworkLocation
 from .models import NetworkLocation
@@ -20,3 +22,17 @@ class DynamicNetworkLocationViewSet(NetworkLocationViewSet):
 
 class StaticNetworkLocationViewSet(NetworkLocationViewSet):
     queryset = StaticNetworkLocation.objects.all()
+
+
+class NetworkLocationFacilitiesView(viewsets.GenericViewSet):
+    """
+    Given a NetworkLocation ID, returns a list of Facilities that are on
+    that NetworkLocation, for the purposes of syncing
+    """
+    def retrieve(self, request, pk=None):
+        base_url = 'http://192.168.1.8:8000/'
+        facility_url = "{}api/public/v1/facility".format(base_url)
+        response = requests.get(facility_url)
+        response.raise_for_status()
+        facilities_data = response.json()
+        return Response(facilities_data)
diff --git a/kolibri/core/discovery/api_urls.py b/kolibri/core/discovery/api_urls.py
index c8627aeded8..f6e5286d216 100644
--- a/kolibri/core/discovery/api_urls.py
+++ b/kolibri/core/discovery/api_urls.py
@@ -3,6 +3,7 @@
 from .api import DynamicNetworkLocationViewSet
 from .api import NetworkLocationViewSet
 from .api import StaticNetworkLocationViewSet
+from .api import NetworkLocationFacilitiesView
 
 router = routers.SimpleRouter()
 
@@ -18,4 +19,6 @@
     base_name="dynamicnetworklocation",
 )
 
+router.register(r"networklocation_facilities", NetworkLocationFacilitiesView, basename="networklocation_facilities")
+
 urlpatterns = router.urls

From 5f0af18d73fdd504f984b5e2d96799b70a296f38 Mon Sep 17 00:00:00 2001
From: Jonathan Boiser <jboiser@gmail.com>
Date: Tue, 9 Jun 2020 12:20:12 -0700
Subject: [PATCH 15/29] Remove manageSync vuex module

---
 .../assets/src/modules/manageSync/index.js    | 38 -------------------
 .../assets/src/modules/pluginModule.js        |  2 -
 kolibri/plugins/facility/assets/src/routes.js |  1 -
 .../views/DataPage/SyncInterface/index.vue    | 33 ++++++++++------
 4 files changed, 21 insertions(+), 53 deletions(-)
 delete mode 100644 kolibri/plugins/facility/assets/src/modules/manageSync/index.js

diff --git a/kolibri/plugins/facility/assets/src/modules/manageSync/index.js b/kolibri/plugins/facility/assets/src/modules/manageSync/index.js
deleted file mode 100644
index 69904c8d997..00000000000
--- a/kolibri/plugins/facility/assets/src/modules/manageSync/index.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import { displayModal, SET_BUSY, SET_ERROR, SET_MODAL } from '../shared';
-
-function defaultState() {
-  return {
-    modalShown: false,
-    projectName: '',
-    targetFacility: null,
-    token: '',
-  };
-}
-
-export default {
-  namespaced: true,
-  state: defaultState(),
-  mutations: {
-    SET_STATE(state, payload) {
-      Object.assign(state, payload);
-    },
-    RESET_STATE(state) {
-      Object.assign(state, defaultState());
-    },
-    SET_PROJECT_NAME(state, name) {
-      state.projectName = name;
-    },
-    SET_TOKEN(state, token) {
-      state.token = token;
-    },
-    SET_TARGET_FACILITY(state, facility) {
-      state.targetFacility = facility;
-    },
-    SET_BUSY,
-    SET_ERROR,
-    SET_MODAL,
-  },
-  actions: {
-    displayModal,
-  },
-};
diff --git a/kolibri/plugins/facility/assets/src/modules/pluginModule.js b/kolibri/plugins/facility/assets/src/modules/pluginModule.js
index 5b45588f8f6..1c43895793f 100644
--- a/kolibri/plugins/facility/assets/src/modules/pluginModule.js
+++ b/kolibri/plugins/facility/assets/src/modules/pluginModule.js
@@ -6,7 +6,6 @@ import classManagement from './classManagement';
 import facilityConfig from './facilityConfig';
 import userManagement from './userManagement';
 import manageCSV from './manageCSV';
-import manageSync from './manageSync';
 import importCSV from './importCSV';
 
 export default {
@@ -53,7 +52,6 @@ export default {
     userManagement,
     facilityConfig,
     manageCSV,
-    manageSync,
     importCSV,
   },
 };
diff --git a/kolibri/plugins/facility/assets/src/routes.js b/kolibri/plugins/facility/assets/src/routes.js
index 1711437c68a..fd22f508915 100644
--- a/kolibri/plugins/facility/assets/src/routes.js
+++ b/kolibri/plugins/facility/assets/src/routes.js
@@ -95,7 +95,6 @@ export default [
     path: '/:facility_id?/data',
     handler: () => {
       store.dispatch('preparePage', { isAsync: false });
-      store.commit('manageSync/RESET_STATE');
     },
   },
   {
diff --git a/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue b/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue
index 1c71c63049f..29708d92b29 100644
--- a/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue
+++ b/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue
@@ -47,18 +47,18 @@
 
     <PrivacyModal
       v-if="modalShown === Modals.PRIVACY"
-      @cancel="displayModal(false)"
+      @cancel="displayModal(null)"
     />
 
     <RegisterFacilityModal
       v-if="modalShown === Modals.REGISTER_FACILITY"
-      @cancel="displayModal(false)"
+      @cancel="displayModal(null)"
       @success="handleValidateSuccess"
     />
     <ConfirmationRegisterModal
       v-if="modalShown === Modals.CONFIRMATION_REGISTER"
       v-bind="{ projectName, targetFacility, token }"
-      @cancel="displayModal(false)"
+      @cancel="displayModal(null)"
       @success="handleConfirmationSuccess"
     />
 
@@ -69,7 +69,7 @@
 
 <script>
 
-  import { mapState, mapActions } from 'vuex';
+  import { mapState } from 'vuex';
   import CoreTable from 'kolibri.coreVue.components.CoreTable';
   import {
     FacilityNameAndSyncStatus,
@@ -89,8 +89,15 @@
       RegisterFacilityModal,
       ConfirmationRegisterModal,
     },
+    data() {
+      return {
+        projectName: '',
+        token: '',
+        targetFacility: null,
+        modalShown: null,
+      };
+    },
     computed: {
-      ...mapState('manageSync', ['modalShown', 'projectName', 'targetFacility', 'token']),
       ...mapState('manageCSV', ['facilityTaskId']),
       Modals: () => Modals,
       facilities() {
@@ -100,10 +107,12 @@
       },
     },
     methods: {
-      ...mapActions('manageSync', ['displayModal']),
+      displayModal(modal) {
+        this.modalShown = modal;
+      },
       register(facility) {
-        this.$store.commit('manageSync/SET_TARGET_FACILITY', facility);
-        this.displayModal(Modals.REGISTER_FACILITY);
+        this.targetFacility = facility;
+        this.modalShown = Modals.REGISTER_FACILITY;
       },
       sync(facility) {
         TaskResource.dataportalsync(facility.id).then(response => {
@@ -112,13 +121,13 @@
       },
       handleValidateSuccess(payload) {
         const { name, token } = payload;
-        this.$store.commit('manageSync/SET_PROJECT_NAME', name);
-        this.$store.commit('manageSync/SET_TOKEN', token);
-        this.displayModal(Modals.CONFIRMATION_REGISTER);
+        this.projectName = name;
+        this.token = token;
+        this.modalShown = Modals.CONFIRMATION_REGISTER;
       },
       handleConfirmationSuccess(payload) {
         this.$store.commit('manageCSV/SET_REGISTERED', payload);
-        this.displayModal(false);
+        this.modalShown = null;
       },
     },
     $trs: {

From 1cfdbf11c423c6ffc47b38950a68fb75a0284a54 Mon Sep 17 00:00:00 2001
From: Jonathan Boiser <jboiser@gmail.com>
Date: Tue, 9 Jun 2020 12:29:46 -0700
Subject: [PATCH 16/29] Simplify SyncInterface to show only a single facility

---
 .../views/DataPage/SyncInterface/index.vue    | 37 +++++++++----------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue b/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue
index 29708d92b29..5089b494716 100644
--- a/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue
+++ b/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue
@@ -18,31 +18,29 @@
           <th>{{ $tr('facility') }}</th>
         </tr>
       </thead>
-      <transition-group slot="tbody" tag="tbody" name="list">
-        <tr v-for="facility in facilities" :key="facility.id">
+      <tbody slot="tbody">
+        <tr>
           <td>
-            <FacilityNameAndSyncStatus :facility="facility" />
+            <FacilityNameAndSyncStatus :facility="theFacility" />
           </td>
           <td class="button-col">
-            <KButtonGroup style="margin-top: 8px;">
+            <KButtonGroup style="margin-top: 8px; overflow: visible">
               <KButton
                 appearance="raised-button"
                 :text="$tr('register')"
                 :disabled="facilityTaskId !== ''"
-
-                @click="register(facility)"
+                @click="register()"
               />
               <KButton
                 appearance="raised-button"
                 :text="$tr('sync')"
-
-                :disabled="facilityTaskId !== '' || !facility.dataset.registered"
-                @click="sync(facility)"
+                :disabled="facilityTaskId !== '' || !theFacility.dataset.registered"
+                @click="sync()"
               />
             </KButtonGroup>
           </td>
         </tr>
-      </transition-group>
+      </tbody>
     </CoreTable>
 
     <PrivacyModal
@@ -57,7 +55,7 @@
     />
     <ConfirmationRegisterModal
       v-if="modalShown === Modals.CONFIRMATION_REGISTER"
-      v-bind="{ projectName, targetFacility, token }"
+      v-bind="{ projectName, targetFacility: theFacility, token }"
       @cancel="displayModal(null)"
       @success="handleConfirmationSuccess"
     />
@@ -69,6 +67,7 @@
 
 <script>
 
+  import find from 'lodash/find';
   import { mapState } from 'vuex';
   import CoreTable from 'kolibri.coreVue.components.CoreTable';
   import {
@@ -93,29 +92,27 @@
       return {
         projectName: '',
         token: '',
-        targetFacility: null,
         modalShown: null,
       };
     },
     computed: {
       ...mapState('manageCSV', ['facilityTaskId']),
       Modals: () => Modals,
-      facilities() {
-        return this.$store.state.manageCSV.facilities.filter(
-          ({ id }) => id === this.$store.getters.activeFacilityId
-        );
+      theFacility() {
+        return find(this.$store.state.manageCSV.facilities, {
+          id: this.$store.getters.activeFacilityId,
+        });
       },
     },
     methods: {
       displayModal(modal) {
         this.modalShown = modal;
       },
-      register(facility) {
-        this.targetFacility = facility;
+      register() {
         this.modalShown = Modals.REGISTER_FACILITY;
       },
-      sync(facility) {
-        TaskResource.dataportalsync(facility.id).then(response => {
+      sync() {
+        TaskResource.dataportalsync(this.theFacility.id).then(response => {
           this.$store.commit('manageCSV/START_FACILITY_SYNC', response.entity);
         });
       },

From 1b0224e144dc8522068533b85477cad1c3fdff90 Mon Sep 17 00:00:00 2001
From: Jonathan Boiser <jboiser@gmail.com>
Date: Tue, 9 Jun 2020 13:22:04 -0700
Subject: [PATCH 17/29] Remove fake facilities from FacilitiesPage

---
 .../assets/src/views/FacilitiesPage/index.vue | 88 +++++--------------
 1 file changed, 22 insertions(+), 66 deletions(-)

diff --git a/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue b/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue
index d72608049fc..11574ad2ac3 100644
--- a/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue
+++ b/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue
@@ -54,7 +54,7 @@
 
     <RemoveFacilityModal
       v-if="Boolean(facilityForRemoval)"
-      :canRemove="facilityForRemoval.canRemove"
+      :canRemove="facilityCanBeRemoved(facilityForRemoval)"
       :facility="facilityForRemoval"
       @submit="handleSubmitRemoval"
       @cancel="facilityForRemoval = null"
@@ -92,6 +92,7 @@
 
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
   import CoreTable from 'kolibri.coreVue.components.CoreTable';
+  import { FacilityResource } from 'kolibri.resources';
   import {
     FacilityNameAndSyncStatus,
     RegisterFacilityModal,
@@ -103,6 +104,11 @@
   import SyncFacilityModalGroup from './SyncFacilityModalGroup';
   import ImportFacilityModalGroup from './ImportFacilityModalGroup';
 
+  const Options = Object.freeze({
+    REGISTER: 'REGISTER',
+    REMOVE: 'REMOVE',
+  });
+
   export default {
     name: 'FacilitiesPage',
     metaInfo() {
@@ -127,17 +133,11 @@
       return {
         showSyncAllModal: false,
         showImportModal: false,
+        facilities: [],
         facilityForSync: null,
         facilityForRemoval: null,
         facilityForRegister: null,
-        facilitiesTasks: [
-          {
-            status: 'COMPLETED',
-          },
-          {
-            status: 'RUNNING',
-          },
-        ],
+        facilitiesTasks: [],
       };
     },
     computed: {
@@ -145,73 +145,29 @@
         return [
           {
             label: this.coreString('registerAction'),
-            value: 'REGISTER',
+            value: Options.REGISTER,
           },
           {
             label: this.coreString('removeAction'),
-            value: 'REMOVE',
-          },
-        ];
-      },
-      facilities() {
-        return [
-          {
-            name: 'Atkinson Hall (d81c)',
-            id: 'D81C',
-            syncing: false,
-            dataset: {
-              registered: false,
-            },
-            last_sync_failed: false,
-            last_synced: null,
-            canRemove: true,
-          },
-          {
-            name: 'Atkinson Hall (d81c)',
-            id: 'D81C',
-            syncing: true,
-            dataset: {
-              registered: true,
-            },
-            last_sync_failed: false,
-            last_synced: null,
-            canRemove: true,
-          },
-          {
-            name: 'Atkinson Hall (d81c)',
-            id: 'D81C',
-            syncing: false,
-            dataset: {
-              registered: true,
-            },
-            last_sync_failed: false,
-            last_synced: 1588036798109,
-            canRemove: true,
+            value: Options.REMOVE,
           },
-          {
-            name: 'Atkinson Hall (d81c)',
-            id: 'D81C',
-            syncing: false,
-            dataset: {
-              registered: true,
-            },
-            last_sync_failed: true,
-            last_synced: 1588036798109,
-            canRemove: true,
-          },
-          // {
-          //   name: 'Cannot remove',
-          //   id: '4321',
-          //   canRemove: false,
-          // },
         ];
       },
     },
+    beforeMount() {
+      FacilityResource.fetchCollection().then(facilities => {
+        this.facilities = [...facilities];
+      });
+    },
     methods: {
+      facilityCanBeRemoved() {
+        // TODO return false if user is in the facility (determine from session)
+        return true;
+      },
       handleOptionSelect(option, facility) {
-        if (option === 'REMOVE') {
+        if (option === Options.REMOVE) {
           this.facilityForRemoval = facility;
-        } else if (option === 'REGISTER') {
+        } else if (option === Options.REGISTER) {
           this.facilityForRegister = facility;
         }
       },

From 649c5d5fba924fc51cde70afd5bbd6bd43703b39 Mon Sep 17 00:00:00 2001
From: Jonathan Boiser <jboiser@gmail.com>
Date: Tue, 9 Jun 2020 14:06:44 -0700
Subject: [PATCH 18/29] Integrate FacilitiesPage with KDP syncing API

---
 .../assets/src/views/FacilitiesPage/index.vue | 49 +++++++++++++++----
 .../views/DataPage/SyncInterface/index.vue    | 11 +++--
 2 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue b/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue
index 11574ad2ac3..794a8202b9a 100644
--- a/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue
+++ b/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue
@@ -72,11 +72,24 @@
       @cancel="showImportModal = false"
     />
 
-    <RegisterFacilityModal
-      v-if="Boolean(facilityForRegister)"
-      :facility="facilityForRegister"
-      @cancel="facilityForRegister = null"
-    />
+    <!-- NOTE similar code for KDP Registration in SyncInterface -->
+    <template v-if="Boolean(facilityForRegister)">
+      <RegisterFacilityModal
+        v-if="!kdpProject"
+        :facility="facilityForRegister"
+        @success="handleValidateSuccess"
+        @cancel="clearRegistrationState"
+      />
+
+      <ConfirmationRegisterModal
+        v-else
+        :targetFacility="facilityForRegister"
+        :projectName="kdpProject.name"
+        :token="kdpProject.token"
+        @success="handleConfirmationSuccess"
+        @cancel="clearRegistrationState"
+      />
+    </template>
 
     <SyncFacilityModalGroup
       v-if="Boolean(facilityForSync)"
@@ -96,8 +109,9 @@
   import {
     FacilityNameAndSyncStatus,
     RegisterFacilityModal,
+    ConfirmationRegisterModal,
   } from 'kolibri.coreVue.componentSets.sync';
-  import TasksBar from '../ManageContentPage/TasksBar.vue';
+  import TasksBar from '../ManageContentPage/TasksBar';
   import HeaderWithOptions from '../HeaderWithOptions';
   import RemoveFacilityModal from './RemoveFacilityModal';
   import SyncAllFacilitiesModal from './SyncAllFacilitiesModal';
@@ -117,6 +131,7 @@
       };
     },
     components: {
+      ConfirmationRegisterModal,
       CoreTable,
       HeaderWithOptions,
       FacilityNameAndSyncStatus,
@@ -137,6 +152,7 @@
         facilityForSync: null,
         facilityForRemoval: null,
         facilityForRegister: null,
+        kdpProject: null,
         facilitiesTasks: [],
       };
     },
@@ -155,9 +171,8 @@
       },
     },
     beforeMount() {
-      FacilityResource.fetchCollection().then(facilities => {
-        this.facilities = [...facilities];
-      });
+      this.fetchFacilites();
+      // TODO start polling for tasks
     },
     methods: {
       facilityCanBeRemoved() {
@@ -183,9 +198,25 @@
           );
         }
       },
+      fetchFacilites() {
+        return FacilityResource.fetchCollection({ force: true }).then(facilities => {
+          this.facilities = [...facilities];
+        });
+      },
       handleClickClearAll() {
         this.facilitiesTasks = [];
       },
+      handleValidateSuccess({ name, token }) {
+        this.kdpProject = { name, token };
+      },
+      handleConfirmationSuccess() {
+        this.fetchFacilites();
+        this.clearRegistrationState();
+      },
+      clearRegistrationState() {
+        this.facilityForRegister = null;
+        this.kdpProject = null;
+      },
     },
     $trs: {
       syncAllAction: {
diff --git a/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue b/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue
index 5089b494716..3ce3908c1b9 100644
--- a/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue
+++ b/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue
@@ -50,14 +50,16 @@
 
     <RegisterFacilityModal
       v-if="modalShown === Modals.REGISTER_FACILITY"
-      @cancel="displayModal(null)"
       @success="handleValidateSuccess"
+      @cancel="displayModal(null)"
     />
     <ConfirmationRegisterModal
       v-if="modalShown === Modals.CONFIRMATION_REGISTER"
-      v-bind="{ projectName, targetFacility: theFacility, token }"
-      @cancel="displayModal(null)"
+      :targetFacility="theFacility"
+      :projectName="projectName"
+      :token="token"
       @success="handleConfirmationSuccess"
+      @cancel="displayModal(null)"
     />
 
   </KPageContainer>
@@ -116,8 +118,7 @@
           this.$store.commit('manageCSV/START_FACILITY_SYNC', response.entity);
         });
       },
-      handleValidateSuccess(payload) {
-        const { name, token } = payload;
+      handleValidateSuccess({ name, token }) {
         this.projectName = name;
         this.token = token;
         this.modalShown = Modals.CONFIRMATION_REGISTER;

From a19f827f0d2561b6027cd5ed03e9b7a4d92c3e24 Mon Sep 17 00:00:00 2001
From: Jonathan Boiser <jboiser@gmail.com>
Date: Tue, 9 Jun 2020 14:49:25 -0700
Subject: [PATCH 19/29] Fix Coach AppBar

---
 kolibri/plugins/coach/assets/src/views/common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kolibri/plugins/coach/assets/src/views/common.js b/kolibri/plugins/coach/assets/src/views/common.js
index 9c1bbac1f13..bf8b79482aa 100644
--- a/kolibri/plugins/coach/assets/src/views/common.js
+++ b/kolibri/plugins/coach/assets/src/views/common.js
@@ -96,7 +96,7 @@ export const CoachCoreBase = {
         const { facility_id, name } = this.$store.state.classSummary;
         if (
           facility_id &&
-          this.$store.state.core.facilities.length > 0 &&
+          this.$store.state.core.facilities.length > 1 &&
           this.$store.getters.isSuperuser
         ) {
           const match = find(this.$store.state.core.facilities, { id: facility_id }) || {};

From c0cdcc600fdc683c311834dfbaa75a610ba6a09e Mon Sep 17 00:00:00 2001
From: Jonathan Boiser <jboiser@gmail.com>
Date: Tue, 9 Jun 2020 15:02:59 -0700
Subject: [PATCH 20/29] Integrate FacilityPage with KDP Sync API

---
 .../assets/src/mixins/commonSyncElements.js   |  8 ++++-
 .../views/sync/FacilityNameAndSyncStatus.vue  |  6 +++-
 .../FacilitiesPage/SyncFacilityModalGroup.vue | 32 ++++++++++++-------
 .../assets/src/views/FacilitiesPage/index.vue | 13 ++++++--
 .../views/DataPage/SyncInterface/index.vue    |  5 +--
 5 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/kolibri/core/assets/src/mixins/commonSyncElements.js b/kolibri/core/assets/src/mixins/commonSyncElements.js
index 231481109bc..b5425b72468 100644
--- a/kolibri/core/assets/src/mixins/commonSyncElements.js
+++ b/kolibri/core/assets/src/mixins/commonSyncElements.js
@@ -1,4 +1,4 @@
-import { StaticNetworkLocationResource } from 'kolibri.resources';
+import { StaticNetworkLocationResource, TaskResource } from 'kolibri.resources';
 import { createTranslator } from 'kolibri.utils.i18n';
 
 // Strings that might be shared among syncing-related UIs across plugins.
@@ -61,5 +61,11 @@ export default {
         nickname: device_name,
       }).save();
     },
+    startKdpSyncTask(facilityId) {
+      return TaskResource.dataportalsync(facilityId).then(response => {
+        // TODO update for axios
+        return response.entity;
+      });
+    },
   },
 };
diff --git a/kolibri/core/assets/src/views/sync/FacilityNameAndSyncStatus.vue b/kolibri/core/assets/src/views/sync/FacilityNameAndSyncStatus.vue
index 02d3f2a9960..ebfd174d0c0 100644
--- a/kolibri/core/assets/src/views/sync/FacilityNameAndSyncStatus.vue
+++ b/kolibri/core/assets/src/views/sync/FacilityNameAndSyncStatus.vue
@@ -21,7 +21,7 @@
     </div>
     <div>
       <span>
-        <template v-if="facility.syncing">
+        <template v-if="facility.syncing || isSyncing">
           <KCircularLoader class="loader" :size="16" :delay="false" />
           {{ $tr('syncing') }}
         </template>
@@ -59,6 +59,10 @@
         type: Object,
         required: true,
       },
+      isSyncing: {
+        type: Boolean,
+        default: false,
+      },
     },
     data() {
       return {
diff --git a/kolibri/plugins/device/assets/src/views/FacilitiesPage/SyncFacilityModalGroup.vue b/kolibri/plugins/device/assets/src/views/FacilitiesPage/SyncFacilityModalGroup.vue
index e5c282b408c..616c5927ce1 100644
--- a/kolibri/plugins/device/assets/src/views/FacilitiesPage/SyncFacilityModalGroup.vue
+++ b/kolibri/plugins/device/assets/src/views/FacilitiesPage/SyncFacilityModalGroup.vue
@@ -4,14 +4,14 @@
     <SelectSyncSourceModal
       v-if="atSelectSource"
       @submit="handleSubmit"
-      @cancel="$emit('cancel')"
+      @cancel="closeModal()"
     />
 
     <SelectAddressModalGroup
       v-else-if="atSelectAddress"
       :fetchAddressArgs="''"
       @submit="handleSubmit"
-      @cancel="$emit('cancel')"
+      @cancel="closeModal()"
     />
   </div>
 
@@ -25,8 +25,10 @@
   import { SelectAddressModalGroup } from 'kolibri.coreVue.componentSets.sync';
   import SelectSyncSourceModal from './SelectSyncSourceModal';
 
-  const SELECT_SOURCE = 'SELECT_SOURCE';
-  const SELECT_ADDRESS = 'SELECT_ADDRESS';
+  const Steps = Object.freeze({
+    SELECT_SOURCE: 'SELECT_SOURCE',
+    SELECT_ADDRESS: 'SELECT_ADDRESS',
+  });
 
   export default {
     name: 'SyncFacilityModalGroup',
@@ -35,25 +37,30 @@
       SelectAddressModalGroup,
     },
     mixins: [commonCoreStrings, commonSyncElements],
-    props: {},
+    props: {
+      facilityForSync: {
+        type: Object,
+        required: true,
+      },
+    },
     data() {
       return {
-        step: SELECT_SOURCE,
+        step: Steps.SELECT_SOURCE,
       };
     },
     computed: {
       atSelectSource() {
-        return this.step === SELECT_SOURCE;
+        return this.step === Steps.SELECT_SOURCE;
       },
       atSelectAddress() {
-        return this.step === SELECT_ADDRESS;
+        return this.step === Steps.SELECT_ADDRESS;
       },
     },
     methods: {
       handleSubmit(data) {
         if (this.atSelectSource) {
           if (data.source === 'PEER') {
-            this.step = SELECT_ADDRESS;
+            this.step = Steps.SELECT_ADDRESS;
           } else {
             this.startSync();
           }
@@ -61,9 +68,12 @@
           this.startSync();
         }
       },
+      closeModal() {
+        this.$emit('close');
+      },
       startSync() {
-        return Promise.resolve().then(() => {
-          this.$emit('cancel');
+        this.startKdpSyncTask(this.facilityForSync.id).then(task => {
+          this.$emit('success', task.id);
         });
       },
     },
diff --git a/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue b/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue
index 794a8202b9a..249c90163c0 100644
--- a/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue
+++ b/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue
@@ -2,6 +2,9 @@
 
   <div>
 
+    <pre>
+      {{ JSON.stringify(syncTaskIds, null, 2) }}
+    </pre>
     <HeaderWithOptions :headerText="coreString('facilitiesLabel')">
       <template #options>
         <KButton
@@ -93,8 +96,9 @@
 
     <SyncFacilityModalGroup
       v-if="Boolean(facilityForSync)"
-      @submit="facilityForSync = null"
-      @cancel="facilityForSync = null"
+      :facilityForSync="facilityForSync"
+      @close="facilityForSync = null"
+      @success="handleStartSyncSuccess"
     />
   </div>
 
@@ -154,6 +158,7 @@
         facilityForRegister: null,
         kdpProject: null,
         facilitiesTasks: [],
+        syncTaskIds: [],
       };
     },
     computed: {
@@ -217,6 +222,10 @@
         this.facilityForRegister = null;
         this.kdpProject = null;
       },
+      handleStartSyncSuccess(taskId) {
+        this.syncTaskIds = [...this.syncTaskIds, taskId];
+        this.facilityForSync = null;
+      },
     },
     $trs: {
       syncAllAction: {
diff --git a/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue b/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue
index 3ce3908c1b9..9d9e00a0154 100644
--- a/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue
+++ b/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue
@@ -77,7 +77,7 @@
     ConfirmationRegisterModal,
     RegisterFacilityModal,
   } from 'kolibri.coreVue.componentSets.sync';
-  import { TaskResource } from 'kolibri.resources';
+  import commonSyncElements from 'kolibri.coreVue.mixins.commonSyncElements';
   import { Modals } from '../../../constants';
   import PrivacyModal from './PrivacyModal';
 
@@ -90,6 +90,7 @@
       RegisterFacilityModal,
       ConfirmationRegisterModal,
     },
+    mixins: [commonSyncElements],
     data() {
       return {
         projectName: '',
@@ -114,7 +115,7 @@
         this.modalShown = Modals.REGISTER_FACILITY;
       },
       sync() {
-        TaskResource.dataportalsync(this.theFacility.id).then(response => {
+        return this.startKdpSyncTask(this.theFacility.id).then(response => {
           this.$store.commit('manageCSV/START_FACILITY_SYNC', response.entity);
         });
       },

From d371cc5cf1f20df013251b7356ec23e150c0ddfc Mon Sep 17 00:00:00 2001
From: Jonathan Boiser <jboiser@gmail.com>
Date: Wed, 10 Jun 2020 11:35:35 -0700
Subject: [PATCH 21/29] Update for axios

---
 kolibri/core/assets/src/mixins/commonSyncElements.js      | 3 +--
 .../assets/src/views/DataPage/SyncInterface/index.vue     | 4 ++--
 .../setup_wizard/assets/src/modules/pluginModule.js       | 8 ++++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/kolibri/core/assets/src/mixins/commonSyncElements.js b/kolibri/core/assets/src/mixins/commonSyncElements.js
index 0a61c1279a6..700ad67f4a9 100644
--- a/kolibri/core/assets/src/mixins/commonSyncElements.js
+++ b/kolibri/core/assets/src/mixins/commonSyncElements.js
@@ -63,8 +63,7 @@ export default {
     },
     startKdpSyncTask(facilityId) {
       return TaskResource.dataportalsync(facilityId).then(response => {
-        // TODO update for axios
-        return response.entity;
+        return response.data;
       });
     },
   },
diff --git a/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue b/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue
index cfbbefa91a8..300f42e3c1d 100644
--- a/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue
+++ b/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue
@@ -115,8 +115,8 @@
         this.modalShown = Modals.REGISTER_FACILITY;
       },
       sync() {
-        return this.startKdpSyncTask(this.theFacility.id).then(response => {
-          this.$store.commit('manageCSV/START_FACILITY_SYNC', response.data);
+        return this.startKdpSyncTask(this.theFacility.id).then(task => {
+          this.$store.commit('manageCSV/START_FACILITY_SYNC', task);
         });
       },
       handleValidateSuccess({ name, token }) {
diff --git a/kolibri/plugins/setup_wizard/assets/src/modules/pluginModule.js b/kolibri/plugins/setup_wizard/assets/src/modules/pluginModule.js
index b8eb32ea739..d5870d198ae 100644
--- a/kolibri/plugins/setup_wizard/assets/src/modules/pluginModule.js
+++ b/kolibri/plugins/setup_wizard/assets/src/modules/pluginModule.js
@@ -53,15 +53,15 @@ export default {
   actions: {
     getFacilityAdmins() {
       return client({
-        path: urls['kolibri:kolibri.plugins.setupWizard:facilityadminsList'](),
+        url: urls['kolibri:kolibri.plugins.setupWizard:facilityadminsList'](),
       }).then(response => {
-        return response.entity;
+        return response.data;
       });
     },
     grantSuperuserPermisions(store, data) {
       return client({
-        path: urls['kolibri:kolibri.plugins.setupWizard:grantsuperuserpermissionsList'](),
-        entity: {
+        url: urls['kolibri:kolibri.plugins.setupWizard:grantsuperuserpermissionsList'](),
+        data: {
           user_id: data.user_id,
           password: data.password,
         },

From 515887a5273efff23da2b11cce9c5529e5f79cb8 Mon Sep 17 00:00:00 2001
From: Jonathan Boiser <jboiser@gmail.com>
Date: Wed, 10 Jun 2020 14:30:44 -0700
Subject: [PATCH 22/29] =?UTF-8?q?Show=20=E2=80=9CSyncing=E2=80=9D=20indica?=
 =?UTF-8?q?tor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assets/src/mixins/commonSyncElements.js   | 15 ++++++++
 .../assets/src/views/FacilitiesPage/index.vue | 37 ++++++++++++++-----
 2 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/kolibri/core/assets/src/mixins/commonSyncElements.js b/kolibri/core/assets/src/mixins/commonSyncElements.js
index 700ad67f4a9..79ba42a29f5 100644
--- a/kolibri/core/assets/src/mixins/commonSyncElements.js
+++ b/kolibri/core/assets/src/mixins/commonSyncElements.js
@@ -1,3 +1,4 @@
+import some from 'lodash/some';
 import { StaticNetworkLocationResource, TaskResource } from 'kolibri.resources';
 import { createTranslator } from 'kolibri.utils.i18n';
 
@@ -66,5 +67,19 @@ export default {
         return response.data;
       });
     },
+    fetchKdpSyncTasks() {
+      return TaskResource.fetchCollection({ force: true }).then(tasks => {
+        return tasks.filter(task => (task.type = 'SYNCDATAPORTAL'));
+      });
+    },
+    cleanupKdpSyncTasks(tasks, cb) {
+      if (some(tasks, { type: 'SYNCDATAPORTAL', status: 'COMPLETED' })) {
+        return TaskResource.deleteFinishedTasks().then(() => {
+          if (cb) {
+            cb();
+          }
+        });
+      }
+    },
   },
 };
diff --git a/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue b/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue
index 249c90163c0..52a1aed4422 100644
--- a/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue
+++ b/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue
@@ -1,10 +1,6 @@
 <template>
 
   <div>
-
-    <pre>
-      {{ JSON.stringify(syncTaskIds, null, 2) }}
-    </pre>
     <HeaderWithOptions :headerText="coreString('facilitiesLabel')">
       <template #options>
         <KButton
@@ -35,7 +31,10 @@
       <tbody slot="tbody">
         <tr v-for="(facility, idx) in facilities" :key="idx">
           <td>
-            <FacilityNameAndSyncStatus :facility="facility" />
+            <FacilityNameAndSyncStatus
+              :facility="facility"
+              :isSyncing="facilityIsSyncing(facility)"
+            />
           </td>
           <td class="button-col">
             <div>
@@ -108,6 +107,7 @@
 <script>
 
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
+  import commonSyncElements from 'kolibri.coreVue.mixins.commonSyncElements';
   import CoreTable from 'kolibri.coreVue.components.CoreTable';
   import { FacilityResource } from 'kolibri.resources';
   import {
@@ -146,7 +146,7 @@
       SyncAllFacilitiesModal,
       TasksBar,
     },
-    mixins: [commonCoreStrings],
+    mixins: [commonCoreStrings, commonSyncElements],
     props: {},
     data() {
       return {
@@ -158,7 +158,7 @@
         facilityForRegister: null,
         kdpProject: null,
         facilitiesTasks: [],
-        syncTaskIds: [],
+        tasks: [],
       };
     },
     computed: {
@@ -177,7 +177,7 @@
     },
     beforeMount() {
       this.fetchFacilites();
-      // TODO start polling for tasks
+      this.pollSyncTasks();
     },
     methods: {
       facilityCanBeRemoved() {
@@ -222,10 +222,27 @@
         this.facilityForRegister = null;
         this.kdpProject = null;
       },
-      handleStartSyncSuccess(taskId) {
-        this.syncTaskIds = [...this.syncTaskIds, taskId];
+      handleStartSyncSuccess() {
+        this.pollSyncTasks();
         this.facilityForSync = null;
       },
+      pollSyncTasks() {
+        this.fetchKdpSyncTasks()
+          .then(tasks => {
+            this.tasks = tasks;
+            return this.cleanupKdpSyncTasks(this.tasks, this.fetchFacilites);
+          })
+          .then(() => {
+            if (this.tasks.length > 0) {
+              setTimeout(() => {
+                return this.pollSyncTasks();
+              }, 2000);
+            }
+          });
+      },
+      facilityIsSyncing(facility) {
+        return Boolean(this.tasks.find(task => task.facility === facility.id));
+      },
     },
     $trs: {
       syncAllAction: {

From 51f05c1c33f6477d6ce3f4348e29c4bb16dbaa42 Mon Sep 17 00:00:00 2001
From: Jonathan Boiser <jboiser@gmail.com>
Date: Wed, 10 Jun 2020 14:31:04 -0700
Subject: [PATCH 23/29] Fix AvailableChannels URL when picking a local peer

---
 .../ManageContentPage/SelectNetworkAddressModal/index.vue      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kolibri/plugins/device/assets/src/views/ManageContentPage/SelectNetworkAddressModal/index.vue b/kolibri/plugins/device/assets/src/views/ManageContentPage/SelectNetworkAddressModal/index.vue
index e867efe56fe..845c3a720b0 100644
--- a/kolibri/plugins/device/assets/src/views/ManageContentPage/SelectNetworkAddressModal/index.vue
+++ b/kolibri/plugins/device/assets/src/views/ManageContentPage/SelectNetworkAddressModal/index.vue
@@ -40,7 +40,8 @@
       ...mapMutations('manageContent/wizard', {
         resetContentWizardState: 'RESET_STATE',
       }),
-      handleSelectAddressSubmit(addressId) {
+      handleSelectAddressSubmit(address) {
+        const addressId = address.id;
         if (this.manageMode) {
           this.$emit('submit', { addressId });
         } else {

From 4f7cd78d027d37c79a55e4f1185ee516b4038405 Mon Sep 17 00:00:00 2001
From: Jonathan Boiser <jboiser@gmail.com>
Date: Wed, 10 Jun 2020 14:31:50 -0700
Subject: [PATCH 24/29] Pre commit fixes

---
 kolibri/core/auth/api.py                      |  2 +-
 kolibri/core/discovery/api.py                 |  3 ++-
 kolibri/core/discovery/api_urls.py            |  8 +++++--
 kolibri/plugins/setup_wizard/api.py           | 11 +++++----
 kolibri/plugins/setup_wizard/test/test_api.py | 23 +++++++++++++------
 5 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/kolibri/core/auth/api.py b/kolibri/core/auth/api.py
index e4af4b1196c..e9b9604011e 100644
--- a/kolibri/core/auth/api.py
+++ b/kolibri/core/auth/api.py
@@ -21,11 +21,11 @@
 from django.utils.decorators import method_decorator
 from django.utils.timezone import now
 from django.views.decorators.csrf import ensure_csrf_cookie
+from django_filters.rest_framework import BooleanFilter
 from django_filters.rest_framework import CharFilter
 from django_filters.rest_framework import DjangoFilterBackend
 from django_filters.rest_framework import FilterSet
 from django_filters.rest_framework import ModelChoiceFilter
-from django_filters.rest_framework import BooleanFilter
 from rest_framework import filters
 from rest_framework import permissions
 from rest_framework import status
diff --git a/kolibri/core/discovery/api.py b/kolibri/core/discovery/api.py
index b53487ef309..c52b4db200f 100644
--- a/kolibri/core/discovery/api.py
+++ b/kolibri/core/discovery/api.py
@@ -29,8 +29,9 @@ class NetworkLocationFacilitiesView(viewsets.GenericViewSet):
     Given a NetworkLocation ID, returns a list of Facilities that are on
     that NetworkLocation, for the purposes of syncing
     """
+
     def retrieve(self, request, pk=None):
-        base_url = 'http://192.168.1.8:8000/'
+        base_url = "http://192.168.1.8:8000/"
         facility_url = "{}api/public/v1/facility".format(base_url)
         response = requests.get(facility_url)
         response.raise_for_status()
diff --git a/kolibri/core/discovery/api_urls.py b/kolibri/core/discovery/api_urls.py
index f6e5286d216..1c93bce5d44 100644
--- a/kolibri/core/discovery/api_urls.py
+++ b/kolibri/core/discovery/api_urls.py
@@ -1,9 +1,9 @@
 from rest_framework import routers
 
 from .api import DynamicNetworkLocationViewSet
+from .api import NetworkLocationFacilitiesView
 from .api import NetworkLocationViewSet
 from .api import StaticNetworkLocationViewSet
-from .api import NetworkLocationFacilitiesView
 
 router = routers.SimpleRouter()
 
@@ -19,6 +19,10 @@
     base_name="dynamicnetworklocation",
 )
 
-router.register(r"networklocation_facilities", NetworkLocationFacilitiesView, basename="networklocation_facilities")
+router.register(
+    r"networklocation_facilities",
+    NetworkLocationFacilitiesView,
+    basename="networklocation_facilities",
+)
 
 urlpatterns = router.urls
diff --git a/kolibri/plugins/setup_wizard/api.py b/kolibri/plugins/setup_wizard/api.py
index 1f9d5fb5bb4..31d9961d97f 100644
--- a/kolibri/plugins/setup_wizard/api.py
+++ b/kolibri/plugins/setup_wizard/api.py
@@ -1,11 +1,12 @@
-from kolibri.core.auth.models import FacilityUser
-from kolibri.core.auth.constants import user_kinds
-from kolibri.core.device.models import DevicePermissions
 from rest_framework.exceptions import NotFound
 from rest_framework.exceptions import PermissionDenied
-from rest_framework.viewsets import GenericViewSet
-from rest_framework.response import Response
 from rest_framework.permissions import BasePermission
+from rest_framework.response import Response
+from rest_framework.viewsets import GenericViewSet
+
+from kolibri.core.auth.constants import user_kinds
+from kolibri.core.auth.models import FacilityUser
+from kolibri.core.device.models import DevicePermissions
 
 
 # Basic class that makes these endpoints unusable if device is provisioned
diff --git a/kolibri/plugins/setup_wizard/test/test_api.py b/kolibri/plugins/setup_wizard/test/test_api.py
index 008fd421a20..63c8be84de1 100644
--- a/kolibri/plugins/setup_wizard/test/test_api.py
+++ b/kolibri/plugins/setup_wizard/test/test_api.py
@@ -4,8 +4,9 @@
 
 from django.core.urlresolvers import reverse
 from rest_framework.test import APITestCase
-from kolibri.core.auth.test.helpers import provision_device
+
 from kolibri.core.auth.test.helpers import create_dummy_facility_data
+from kolibri.core.auth.test.helpers import provision_device
 
 
 class FacilityAdminViewTest(APITestCase):
@@ -34,10 +35,10 @@ class GrantSuperuserPermissionsViewTest(APITestCase):
     def setUp(self):
         facility_data = create_dummy_facility_data(classroom_count=1)
         self.admin = facility_data["facility_admin"]
-        self.admin.set_password('password')
+        self.admin.set_password("password")
         self.admin.save()
         self.coach = facility_data["classroom_coaches"][0]
-        self.coach.set_password('password')
+        self.coach.set_password("password")
         self.coach.save()
 
     def _make_request(self, data):
@@ -51,7 +52,9 @@ def _make_request(self, data):
 
     def test_fails_if_device_provisioned(self):
         provision_device()
-        response = self._make_request({"user_id": self.admin.id, "password": "password"})
+        response = self._make_request(
+            {"user_id": self.admin.id, "password": "password"}
+        )
         self.assertEqual(response.status_code, 403)
 
     def test_fails_if_user_not_found(self):
@@ -61,13 +64,19 @@ def test_fails_if_user_not_found(self):
         self.assertEqual(response.status_code, 404)
 
     def test_fails_if_password_invalid(self):
-        response = self._make_request({"user_id": self.admin.id, "password": "passward"})
+        response = self._make_request(
+            {"user_id": self.admin.id, "password": "passward"}
+        )
         self.assertEqual(response.status_code, 403)
 
     def test_fails_if_user_not_admin(self):
-        response = self._make_request({"user_id": self.coach.id, "password": "password"})
+        response = self._make_request(
+            {"user_id": self.coach.id, "password": "password"}
+        )
         self.assertEqual(response.status_code, 403)
 
     def test_successfully_adds_device_permissions(self):
-        response = self._make_request({"user_id": self.admin.id, "password": "password"})
+        response = self._make_request(
+            {"user_id": self.admin.id, "password": "password"}
+        )
         self.assertEqual(response.status_code, 200)

From 17c8a3b1e3ef143f3b24c4cc3db8a98827a58552 Mon Sep 17 00:00:00 2001
From: Jonathan Boiser <jboiser@gmail.com>
Date: Wed, 10 Jun 2020 14:41:02 -0700
Subject: [PATCH 25/29] Remove unused is_admin filter

---
 kolibri/core/auth/api.py           | 15 +--------------
 kolibri/core/auth/test/test_api.py | 10 ----------
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/kolibri/core/auth/api.py b/kolibri/core/auth/api.py
index e9b9604011e..960ae470511 100644
--- a/kolibri/core/auth/api.py
+++ b/kolibri/core/auth/api.py
@@ -21,7 +21,6 @@
 from django.utils.decorators import method_decorator
 from django.utils.timezone import now
 from django.views.decorators.csrf import ensure_csrf_cookie
-from django_filters.rest_framework import BooleanFilter
 from django_filters.rest_framework import CharFilter
 from django_filters.rest_framework import DjangoFilterBackend
 from django_filters.rest_framework import FilterSet
@@ -148,24 +147,12 @@ class FacilityUserFilter(FilterSet):
         method="filter_member_of", queryset=Collection.objects.all()
     )
 
-    is_admin = BooleanFilter(method="filter_is_admin")
-
     def filter_member_of(self, queryset, name, value):
         return queryset.filter(Q(memberships__collection=value) | Q(facility=value))
 
-    def filter_is_admin(self, queryset, name, value):
-        if value is True:
-            return queryset.filter(
-                Q(devicepermissions__is_superuser=True)
-                | Q(roles__kind__contains="admin")
-            )
-        else:
-            return queryset.filter(Q(devicepermissions__is_superuser=True))
-            # return queryset.exclude(Q(is_superuser=True) | Q(kind="admin"))
-
     class Meta:
         model = FacilityUser
-        fields = ["member_of", "is_admin"]
+        fields = ["member_of"]
 
 
 class FacilityUserViewSet(ValuesViewset):
diff --git a/kolibri/core/auth/test/test_api.py b/kolibri/core/auth/test/test_api.py
index 71e0520b19f..112b0f58fe7 100644
--- a/kolibri/core/auth/test/test_api.py
+++ b/kolibri/core/auth/test/test_api.py
@@ -674,16 +674,6 @@ def test_user_member_of_filter(self):
         self.assertEqual(data[1]["id"], self.admin_1.id)
         self.assertEqual(data[2]["id"], self.user_1.id)
 
-    def test_user_is_admin_filter(self):
-        response = self.client.get(
-            reverse("kolibri:core:facilityuser-list"), {"is_admin": True}
-        )
-        data = self._sort_by_username(response.data)
-        self.assertEqual(len(data), 3)
-        self.assertEqual(data[0]["id"], self.superuser.id)
-        self.assertEqual(data[1]["id"], self.admin_1.id)
-        self.assertEqual(data[2]["id"], self.admin_2.id)
-
 
 class LoginLogoutTestCase(APITestCase):
     def setUp(self):

From 1936c8808bbecd814242d10fec6de409d1d2e8c0 Mon Sep 17 00:00:00 2001
From: Jonathan Boiser <jboiser@gmail.com>
Date: Wed, 10 Jun 2020 14:55:21 -0700
Subject: [PATCH 26/29] Fix ipdb requirement

---
 requirements/dev.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/dev.txt b/requirements/dev.txt
index f6cb59bba01..c68c76cd7d4 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -1,5 +1,5 @@
 -r base.txt
-ipdb=0.13.2
+ipdb==0.13.2
 flake8==3.8.3
 pre-commit==1.15.1
 tox==3.1.3

From bfe1977268a61a234bc401f7f85b3d6caf542142 Mon Sep 17 00:00:00 2001
From: Jonathan Boiser <jboiser@gmail.com>
Date: Wed, 10 Jun 2020 16:45:15 -0700
Subject: [PATCH 27/29] Update for new facilitysync backend

---
 .../assets/src/api-resources/facilityTask.js   |  4 ++++
 .../assets/src/mixins/commonSyncElements.js    |  8 ++++----
 .../assets/src/modules/manageCSV/actions.js    | 18 ++++++++++++------
 .../src/views/DataPage/SyncInterface/index.vue |  9 +++++----
 4 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/kolibri/core/assets/src/api-resources/facilityTask.js b/kolibri/core/assets/src/api-resources/facilityTask.js
index 616b34ac5f4..09e2525bc77 100644
--- a/kolibri/core/assets/src/api-resources/facilityTask.js
+++ b/kolibri/core/assets/src/api-resources/facilityTask.js
@@ -17,4 +17,8 @@ export default new Resource({
   dataportalbulksync() {
     return this.postListEndpoint('startdataportalbulksync');
   },
+
+  deleteFinishedTasks() {
+    return this.postListEndpoint('deletefinishedtasks');
+  },
 });
diff --git a/kolibri/core/assets/src/mixins/commonSyncElements.js b/kolibri/core/assets/src/mixins/commonSyncElements.js
index 79ba42a29f5..83558b9ab71 100644
--- a/kolibri/core/assets/src/mixins/commonSyncElements.js
+++ b/kolibri/core/assets/src/mixins/commonSyncElements.js
@@ -1,5 +1,5 @@
 import some from 'lodash/some';
-import { StaticNetworkLocationResource, TaskResource } from 'kolibri.resources';
+import { StaticNetworkLocationResource, FacilityTaskResource } from 'kolibri.resources';
 import { createTranslator } from 'kolibri.utils.i18n';
 
 // Strings that might be shared among syncing-related UIs across plugins.
@@ -63,18 +63,18 @@ export default {
       }).save();
     },
     startKdpSyncTask(facilityId) {
-      return TaskResource.dataportalsync(facilityId).then(response => {
+      return FacilityTaskResource.dataportalsync(facilityId).then(response => {
         return response.data;
       });
     },
     fetchKdpSyncTasks() {
-      return TaskResource.fetchCollection({ force: true }).then(tasks => {
+      return FacilityTaskResource.fetchCollection({ force: true }).then(tasks => {
         return tasks.filter(task => (task.type = 'SYNCDATAPORTAL'));
       });
     },
     cleanupKdpSyncTasks(tasks, cb) {
       if (some(tasks, { type: 'SYNCDATAPORTAL', status: 'COMPLETED' })) {
-        return TaskResource.deleteFinishedTasks().then(() => {
+        return FacilityTaskResource.deleteFinishedTasks().then(() => {
           if (cb) {
             cb();
           }
diff --git a/kolibri/plugins/facility/assets/src/modules/manageCSV/actions.js b/kolibri/plugins/facility/assets/src/modules/manageCSV/actions.js
index 215df14f64b..7a3bca76b75 100644
--- a/kolibri/plugins/facility/assets/src/modules/manageCSV/actions.js
+++ b/kolibri/plugins/facility/assets/src/modules/manageCSV/actions.js
@@ -1,5 +1,5 @@
 import logger from 'kolibri.lib.logging';
-import { TaskResource } from 'kolibri.resources';
+import { TaskResource, FacilityTaskResource } from 'kolibri.resources';
 import client from 'kolibri.client';
 import urls from 'kolibri.urls';
 import { TaskStatuses, TaskTypes } from '../../constants';
@@ -95,10 +95,16 @@ function startExportUsers(store) {
 }
 
 function refreshTaskList(store) {
-  return TaskResource.fetchCollection({
-    force: true,
-  })
-    .then(newTasks => {
+  return Promise.all([
+    TaskResource.fetchCollection({
+      force: true,
+    }),
+    FacilityTaskResource.fetchCollection({
+      force: true,
+    }),
+  ])
+    .then(([newTasks, newFacilityTasks]) => {
+      console.log(newTasks);
       checkTaskStatus(
         store,
         newTasks,
@@ -117,7 +123,7 @@ function refreshTaskList(store) {
       );
       checkTaskStatus(
         store,
-        newTasks,
+        newFacilityTasks,
         TaskTypes.SYNCDATAPORTAL,
         store.state.facilityTaskId,
         'START_FACILITY_SYNC',
diff --git a/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue b/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue
index 1f52bfe99a6..5ad99eb2abd 100644
--- a/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue
+++ b/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue
@@ -77,7 +77,7 @@
     ConfirmationRegisterModal,
     RegisterFacilityModal,
   } from 'kolibri.coreVue.componentSets.sync';
-  import { FacilityTaskResource } from 'kolibri.resources';
+  import commonSyncElements from 'kolibri.coreVue.mixins.commonSyncElements';
   import { Modals } from '../../../constants';
   import PrivacyModal from './PrivacyModal';
 
@@ -90,6 +90,7 @@
       RegisterFacilityModal,
       ConfirmationRegisterModal,
     },
+    mixins: [commonSyncElements],
     data() {
       return {
         projectName: '',
@@ -113,9 +114,9 @@
       register() {
         this.modalShown = Modals.REGISTER_FACILITY;
       },
-      sync(facility) {
-        FacilityTaskResource.dataportalsync(facility.id).then(response => {
-          this.$store.commit('manageCSV/START_FACILITY_SYNC', response.data);
+      sync() {
+        this.startKdpSyncTask(this.theFacility.id).then(task => {
+          this.$store.commit('manageCSV/START_FACILITY_SYNC', task);
         });
       },
       handleValidateSuccess({ name, token }) {

From c6dcb747da0d0735c705b8874ad367451eecf948 Mon Sep 17 00:00:00 2001
From: Jonathan Boiser <jboiser@gmail.com>
Date: Wed, 10 Jun 2020 17:04:32 -0700
Subject: [PATCH 28/29] =?UTF-8?q?Add=20=E2=80=9Cnew=20or=20updated?=
 =?UTF-8?q?=E2=80=9D=20label=20to=20ChannelContentsSummary.vue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/SelectContentPage/ChannelContentsSummary.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/kolibri/plugins/device/assets/src/views/SelectContentPage/ChannelContentsSummary.vue b/kolibri/plugins/device/assets/src/views/SelectContentPage/ChannelContentsSummary.vue
index fba10a82097..1e3663b2577 100644
--- a/kolibri/plugins/device/assets/src/views/SelectContentPage/ChannelContentsSummary.vue
+++ b/kolibri/plugins/device/assets/src/views/SelectContentPage/ChannelContentsSummary.vue
@@ -45,6 +45,9 @@
         <td>{{ $tr('resourceCount', { count: channel.on_device_resources || 0 }) }}</td>
         <td>{{ bytesForHumans(channel.on_device_file_size || 0) }}</td>
       </tr>
+      <tr v-if="false">
+        <th>{{ $tr('newOrUpdatedLabel') }}</th>
+      </tr>
     </table>
   </section>
 
@@ -89,6 +92,10 @@
       totalSizeRow: 'Total size',
       version: 'Version {version, number, integer}',
       unlistedChannelTooltip: 'Unlisted channel',
+      newOrUpdatedLabel: {
+        message: 'New or updated',
+        context: 'Table header for the number and size of resources that will be added to a channel after upgrading'
+      }
     },
   };
 

From 15d5e2d4c325caa0b2db629b3113d4f57378d50b Mon Sep 17 00:00:00 2001
From: Jonathan Boiser <jboiser@gmail.com>
Date: Wed, 10 Jun 2020 17:09:44 -0700
Subject: [PATCH 29/29] Add messages for resources that are affected by channel
 upgrade

---
 .../ChannelContentsSummary.vue                |  5 +-
 .../ChannelUpdateAnnotations.vue              | 51 +++++++++++++++++++
 .../SelectContentPage/ContentNodeRow.vue      |  3 ++
 3 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 kolibri/plugins/device/assets/src/views/SelectContentPage/ChannelUpdateAnnotations.vue

diff --git a/kolibri/plugins/device/assets/src/views/SelectContentPage/ChannelContentsSummary.vue b/kolibri/plugins/device/assets/src/views/SelectContentPage/ChannelContentsSummary.vue
index 1e3663b2577..d6ee8b9a747 100644
--- a/kolibri/plugins/device/assets/src/views/SelectContentPage/ChannelContentsSummary.vue
+++ b/kolibri/plugins/device/assets/src/views/SelectContentPage/ChannelContentsSummary.vue
@@ -94,8 +94,9 @@
       unlistedChannelTooltip: 'Unlisted channel',
       newOrUpdatedLabel: {
         message: 'New or updated',
-        context: 'Table header for the number and size of resources that will be added to a channel after upgrading'
-      }
+        context:
+          'Table header for the number and size of resources that will be added to a channel after upgrading',
+      },
     },
   };
 
diff --git a/kolibri/plugins/device/assets/src/views/SelectContentPage/ChannelUpdateAnnotations.vue b/kolibri/plugins/device/assets/src/views/SelectContentPage/ChannelUpdateAnnotations.vue
new file mode 100644
index 00000000000..f1be0aec702
--- /dev/null
+++ b/kolibri/plugins/device/assets/src/views/SelectContentPage/ChannelUpdateAnnotations.vue
@@ -0,0 +1,51 @@
+<template>
+
+  <div>
+    <p v-if="false">
+      {{ $tr('newResource') }}
+    </p>
+    <p v-if="false">
+      {{ $tr('newResourcesInTopic') }}
+    </p>
+    <p v-if="false">
+      {{ $tr('inQueueForImport') }}
+    </p>
+  </div>
+
+</template>
+
+
+<script>
+
+  export default {
+    name: 'ChannelUpdateAnnotations',
+    components: {},
+    mixins: [],
+    props: {},
+    data() {
+      return {};
+    },
+    computed: {},
+    methods: {},
+    $trs: {
+      newResource: {
+        message: 'New',
+        context: 'Label that is shown with resources that were added after upgrading the channel',
+      },
+      newResourcesInTopic: {
+        message: '{count} {count, plural, one {new} other {new}}',
+        context:
+          'Label that is shown on topics with resources that were added after upgrading the channel',
+      },
+      inQueueForImport: {
+        message: 'In queue for import',
+        context:
+          'Label that is with resources that are not selectable for import since they are being re-downloaded after upgrading the channel',
+      },
+    },
+  };
+
+</script>
+
+
+<style lang="scss" scoped></style>
diff --git a/kolibri/plugins/device/assets/src/views/SelectContentPage/ContentNodeRow.vue b/kolibri/plugins/device/assets/src/views/SelectContentPage/ContentNodeRow.vue
index df7cc09d72b..133582651c6 100644
--- a/kolibri/plugins/device/assets/src/views/SelectContentPage/ContentNodeRow.vue
+++ b/kolibri/plugins/device/assets/src/views/SelectContentPage/ContentNodeRow.vue
@@ -39,6 +39,7 @@
     <td class="message">
       {{ message }}
     </td>
+    <ChannelUpdateAnnotations v-if="false" />
   </tr>
 
 </template>
@@ -49,12 +50,14 @@
   import ContentIcon from 'kolibri.coreVue.components.ContentIcon';
   import CoachContentLabel from 'kolibri.coreVue.components.CoachContentLabel';
   import { ContentNodeKinds } from 'kolibri.coreVue.vuex.constants';
+  import ChannelUpdateAnnotations from './ChannelUpdateAnnotations';
 
   export default {
     name: 'ContentNodeRow',
     components: {
       CoachContentLabel,
       ContentIcon,
+      ChannelUpdateAnnotations,
     },
     props: {
       node: {