From c0c721b98262c55bed61935d1a78d394bb9ff20a Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Fri, 15 Dec 2023 15:52:39 -0800
Subject: [PATCH 1/5] Add autocomplete attribute to username component.

---
 kolibri/core/assets/src/views/userAccounts/UsernameTextbox.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kolibri/core/assets/src/views/userAccounts/UsernameTextbox.vue b/kolibri/core/assets/src/views/userAccounts/UsernameTextbox.vue
index 522e9c0bb1b..6d1ff15cf79 100644
--- a/kolibri/core/assets/src/views/userAccounts/UsernameTextbox.vue
+++ b/kolibri/core/assets/src/views/userAccounts/UsernameTextbox.vue
@@ -9,6 +9,7 @@
     :maxlength="30"
     :invalid="Boolean(shownInvalidText)"
     :invalidText="shownInvalidText"
+    autocomplete="username"
     @blur="blurred = true"
     @input="handleInput"
   />

From a1abca0fb0269ed4ff43033b510f56b571f1b7df Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Fri, 15 Dec 2023 15:53:07 -0800
Subject: [PATCH 2/5] Prevent vue prop warnings and form warnings for user
 credentials form.

---
 .../views/onboarding-forms/UserCredentialsForm.vue    | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/UserCredentialsForm.vue b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/UserCredentialsForm.vue
index ae1b0acd533..8f928bfb7e0 100644
--- a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/UserCredentialsForm.vue
+++ b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/UserCredentialsForm.vue
@@ -12,11 +12,10 @@
   >
     <slot name="aboveform"></slot>
 
-    <!-- HACK in Import mode, this slot will be replaced by Password-only form -->
     <!-- VUE3-COMPAT: linter doesn't like that we are injecting "footer" slot from
          inside a slot default
     -->
-    <slot name="form">
+    <form>
       <!-- Hiding the fullname and username textboxes, but their values are filled in and presumed
            valid if we're given the user that we're taking credentials for (ie, just entering
            password for admin)
@@ -57,7 +56,7 @@
 
       <PrivacyLinkAndModal v-if="!hidePrivacyLink" />
 
-    </slot>
+    </form>
 
     <slot name="footer">
       <div class="reminder">
@@ -109,15 +108,15 @@
       },
       step: {
         type: Number,
-        required: true,
+        default: null,
       },
       steps: {
         type: Number,
-        required: true,
+        default: null,
       },
       footerMessageType: {
         type: String,
-        required: true,
+        default: null,
       },
       // A passthrough to the onboarding step base to hide "GO BACK" when needed
       noBackAction: {

From 1a95d79f1c6b41f9ce42ed422946b3f77bc8f2f6 Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Fri, 15 Dec 2023 15:53:27 -0800
Subject: [PATCH 3/5] Simplify AppError component.

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

diff --git a/packages/kolibri-common/components/AppError/index.vue b/packages/kolibri-common/components/AppError/index.vue
index 74b6089c9d3..ab93b820bff 100644
--- a/packages/kolibri-common/components/AppError/index.vue
+++ b/packages/kolibri-common/components/AppError/index.vue
@@ -8,27 +8,26 @@
       {{ headerText }}
     </h1>
 
-    <template v-if="!hideParagraphs">
-      <p v-for="(paragraph, idx) in paragraphTexts" :key="idx">
-        {{ paragraph }}
-      </p>
-    </template>
+    <p v-for="paragraph in paragraphTexts" :key="paragraph">
+      {{ paragraph }}
+    </p>
 
     <p>
-      <slot name="buttons"></slot>
-      <KButtonGroup v-if="!$slots.buttons">
-        <KButton
-          v-if="!isPageNotFound"
-          :text="coreString('refresh')"
-          :primary="true"
-          @click="reloadPage"
-        />
-        <KButton
-          :primary="isPageNotFound"
-          appearance="raised-button"
-          :text="exitButtonLabel"
-          @click="handleClickBackToHome"
-        />
+      <KButtonGroup>
+        <slot name="buttons">
+          <KButton
+            v-if="!isPageNotFound"
+            :text="coreString('refresh')"
+            :primary="true"
+            @click="reloadPage"
+          />
+          <KButton
+            :primary="isPageNotFound"
+            appearance="raised-button"
+            :text="exitButtonLabel"
+            @click="handleClickBackToHome"
+          />
+        </slot>
       </KButtonGroup>
     </p>
 
@@ -89,6 +88,9 @@
         return this.$tr('defaultErrorHeader');
       },
       paragraphTexts() {
+        if (this.hideParagraphs) {
+          return [];
+        }
         if (this.isPageNotFound) {
           return [this.$tr('resourceNotFoundMessage')];
         }

From 1b8ae3681682b1334316bf791ca6f65180c6da13 Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Fri, 15 Dec 2023 15:54:06 -0800
Subject: [PATCH 4/5] Revert previous suggestion to use UIAlert directly.
 Always show retry and restart buttons when there is an error.

---
 .../onboarding-forms/SettingUpKolibri.vue     | 43 +++++++++----------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/SettingUpKolibri.vue b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/SettingUpKolibri.vue
index e26eca6e8e2..e0fa309dd10 100644
--- a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/SettingUpKolibri.vue
+++ b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/SettingUpKolibri.vue
@@ -1,21 +1,23 @@
 <template>
 
   <div class="full-page">
-    <UiAlert
-      v-if="coreError"
-      :dismissible="false"
-      class="alert"
-      type="error"
+    <AppError :hideParagraphs="true">
+      <template #buttons>
+        <KButton
+          :text="coreString('startOverAction')"
+          @click="startOver"
+        />
+        <KButton
+          :primary="true"
+          :text="coreString('retryAction')"
+          @click="provisionDevice"
+        />
+      </template>
+    </AppError>
+    <main
+      v-if="!coreError"
+      class="content"
     >
-      <span>{{ coreError }}</span><br>
-      <KButton
-        v-if="restart"
-        appearance="basic-link"
-        :text="coreString('startOverAction')"
-        @click="startOver"
-      />
-    </UiAlert>
-    <main class="content">
       <KolibriLoadingSnippet />
       <h1 class="page-title">
         {{ $tr('pageTitle') }}
@@ -33,12 +35,12 @@
 
   import omitBy from 'lodash/omitBy';
   import get from 'lodash/get';
+  import AppError from 'kolibri-common/components/AppError';
   import { currentLanguage } from 'kolibri.utils.i18n';
   import { checkCapability } from 'kolibri.utils.appCapabilities';
   import redirectBrowser from 'kolibri.utils.redirectBrowser';
   import KolibriLoadingSnippet from 'kolibri.coreVue.components.KolibriLoadingSnippet';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
-  import UiAlert from 'kolibri-design-system/lib/keen/UiAlert';
   import urls from 'kolibri.urls';
   import client from 'kolibri.client';
   import Lockr from 'lockr';
@@ -46,14 +48,9 @@
 
   export default {
     name: 'SettingUpKolibri',
-    components: { UiAlert, KolibriLoadingSnippet },
+    components: { AppError, KolibriLoadingSnippet },
     inject: ['wizardService'],
     mixins: [commonCoreStrings],
-    data() {
-      return {
-        restart: false,
-      };
-    },
     computed: {
       coreError() {
         if (this.$store) {
@@ -166,7 +163,7 @@
         return this.wizardContext('onMyOwnOrGroup') == UsePresets.ON_MY_OWN;
       },
     },
-    mounted() {
+    created() {
       this.provisionDevice();
     },
     methods: {
@@ -179,6 +176,7 @@
         return this.wizardService.state.context[key];
       },
       provisionDevice() {
+        this.$store.dispatch('clearError');
         client({
           url: urls['kolibri:core:deviceprovision'](),
           method: 'POST',
@@ -192,7 +190,6 @@
             redirectBrowser();
           })
           .catch(e => {
-            this.restart = e.response.status === 400;
             this.$store.dispatch('handleApiError', { error: e });
           });
       },

From 8e7aa55241066355d48a46cdb05a30dbcc2ced90 Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Thu, 4 Jan 2024 09:38:32 -0800
Subject: [PATCH 5/5] Restore conditional display of errors.

---
 .../assets/src/views/onboarding-forms/SettingUpKolibri.vue    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/SettingUpKolibri.vue b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/SettingUpKolibri.vue
index e0fa309dd10..344b96f407c 100644
--- a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/SettingUpKolibri.vue
+++ b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/SettingUpKolibri.vue
@@ -1,7 +1,7 @@
 <template>
 
   <div class="full-page">
-    <AppError :hideParagraphs="true">
+    <AppError v-if="coreError" :hideParagraphs="true">
       <template #buttons>
         <KButton
           :text="coreString('startOverAction')"
@@ -15,7 +15,7 @@
       </template>
     </AppError>
     <main
-      v-if="!coreError"
+      v-else
       class="content"
     >
       <KolibriLoadingSnippet />