From 34c0d2d804a160d55d768e27ec35161376227e9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C5=BEe=20Fortun?= <joze.fortun@gmail.com>
Date: Tue, 7 Nov 2023 17:14:42 +0100
Subject: [PATCH] Make namespace import handle required

---
 .../Settings/System/CSystemEditorAuthBgScreen.vue    | 12 +-----------
 .../Namespaces/Importer/ImportConfiguration.vue      | 11 +++++++----
 locale/en/corteza-webapp-compose/namespace.yaml      |  2 ++
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/client/web/admin/src/components/Settings/System/CSystemEditorAuthBgScreen.vue b/client/web/admin/src/components/Settings/System/CSystemEditorAuthBgScreen.vue
index 0aaf54340..b5e113965 100644
--- a/client/web/admin/src/components/Settings/System/CSystemEditorAuthBgScreen.vue
+++ b/client/web/admin/src/components/Settings/System/CSystemEditorAuthBgScreen.vue
@@ -46,19 +46,9 @@
         lg="6"
       >
         <b-form-group
+          :label="$t('image.editor.label')"
           label-class="d-flex align-items-center text-primary"
         >
-          <template #label>
-            {{ $t("image.editor.label") }}
-
-            <c-input-confirm
-              v-if="uploadedFile('auth.ui.background-image-src')"
-              show-icon
-              class="ml-auto"
-              @confirmed="$emit('resetAttachment', 'auth.ui.background-image-src')"
-            />
-          </template>
-
           <ace-editor
             data-test-id="auth-bg-image-styling-editor"
             :font-size="14"
diff --git a/client/web/compose/src/components/Namespaces/Importer/ImportConfiguration.vue b/client/web/compose/src/components/Namespaces/Importer/ImportConfiguration.vue
index 4f6e3f3bc..b04a5bc72 100644
--- a/client/web/compose/src/components/Namespaces/Importer/ImportConfiguration.vue
+++ b/client/web/compose/src/components/Namespaces/Importer/ImportConfiguration.vue
@@ -4,7 +4,10 @@
     footer-bg-variant="white"
     footer-class="d-flex justify-content-between align-items-center"
   >
-    <b-form-group :label="$t('name.label')">
+    <b-form-group
+      :label="$t('name.label')"
+      label-class="text-primary"
+    >
       <b-form-input
         v-model="name"
         data-test-id="input-name"
@@ -14,7 +17,7 @@
     </b-form-group>
 
     <b-form-group
-      :label="$t('slug.label')"
+      :label="$t('import.slug.label')"
       label-class="text-primary"
     >
       <b-form-input
@@ -33,7 +36,7 @@
       <b-button
         data-test-id="button-back"
         variant="link"
-        class="back px-0"
+        class="text-dark back text-left text-nowrap p-1"
         @click="$emit('back')"
       >
         <font-awesome-icon
@@ -80,7 +83,7 @@ export default {
 
   computed: {
     submitDisabled () {
-      return [this.nameState, this.slugState].includes(false)
+      return [this.nameState, this.slugState, this.slug].includes(false)
     },
 
     nameState () {
diff --git a/locale/en/corteza-webapp-compose/namespace.yaml b/locale/en/corteza-webapp-compose/namespace.yaml
index 158691ce1..6dbf31974 100644
--- a/locale/en/corteza-webapp-compose/namespace.yaml
+++ b/locale/en/corteza-webapp-compose/namespace.yaml
@@ -10,6 +10,8 @@ import:
   uploadFilePlaceholder: Click or drop file here to upload (.zip format)
   back: Back
   import: Import
+  slug:
+    label: Short name *
 description:
   label: Namespace description
   placeholder: Enter namespace description