Merge branch 'main' of https://github.com/weni-ai/weni-integrations-w…

…ebapp into feat/search-catalogs
weni-ai · Oct 30, 2023 · 31eb72c · 31eb72c
2 parents 1fe9270 + bf755ec
commit 31eb72c
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 19 deletions.
diff --git a/.github/workflows/build-integrations-webapp-push-tag-shared.yaml b/.github/workflows/build-integrations-webapp-push-tag-shared.yaml
@@ -33,7 +33,7 @@ jobs:
             echo "COMMIT_SHA=$GITHUB_SHA" | tee -a "${GITHUB_ENV}"
             echo "IMAGE_TAG=${{ secrets.ECR }}/integrations:webapp-$TAG" | tee -a "${GITHUB_ENV}"
             echo "IMAGE_SOURCE_URL=https://github.com/weni-ai/weni-integrations-webapp" | tee -a "${GITHUB_ENV}"
-            echo "MANIFESTS_REPOSITORY=Ilhasoft/kubernetes-manifests-platform" | tee -a "${GITHUB_ENV}"
+            echo "MANIFESTS_REPOSITORY=weni-ai/kubernetes-manifests-platform" | tee -a "${GITHUB_ENV}"
             echo "MANIFESTS_APPLICATION=integrations-webapp" | tee -a "${GITHUB_ENV}"
             echo "MANIFESTS_PATCH_TARGET=deployment-webapp.json" | tee -a "${GITHUB_ENV}"
 

diff --git a/src/components/whatsAppCatalogs/Card.vue b/src/components/whatsAppCatalogs/Card.vue
@@ -24,8 +24,8 @@
           size="small"
           :textRight="
             catalog.is_connected
-              ? $t('WhatsApp.catalog.list.actions.enabled_catalog')
-              : $t('WhatsApp.catalog.list.actions.disabled_catalog')
+              ? $t('WhatsApp.catalog.list.actions.active_catalog')
+              : $t('WhatsApp.catalog.list.actions.inactive_catalog')
           "
           @input="toggleCatalogConnect($event)"
         />
@@ -36,8 +36,8 @@
           size="small"
           :textRight="
             enabledCart
-              ? $t('WhatsApp.catalog.list.actions.enabled_cart')
-              : $t('WhatsApp.catalog.list.actions.disabled_cart')
+              ? $t('WhatsApp.catalog.list.actions.active_cart')
+              : $t('WhatsApp.catalog.list.actions.inactive_cart')
           "
           @click.native="toggleCart()"
         />

diff --git a/src/components/whatsAppCatalogs/List.vue b/src/components/whatsAppCatalogs/List.vue
@@ -54,14 +54,27 @@
       scheme="feedback-red"
       :validate="connectedCatalog.name"
       :validatePlaceholder="connectedCatalog.name"
-      :title="$t('WhatsApp.catalog.list.disable_modal.title')"
+      :title="
+        catalogToEnable
+          ? $t('WhatsApp.catalog.list.disable_modal.title_active')
+          : $t('WhatsApp.catalog.list.disable_modal.title')
+      "
       :actionPrimaryLabel="$t('WhatsApp.catalog.list.disable_modal.confirm')"
       :actionSecondaryLabel="$t('general.Cancel')"
       @click-action-secondary="closeModal"
       @click-action-primary="handleCatalogConfirmation"
     >
       <template slot="description">
-        {{ $t('WhatsApp.catalog.list.disable_modal.description') }}
+        <div v-if="catalogToEnable">
+          {{
+            $t('WhatsApp.catalog.list.disable_modal.description_active', {
+              name: connectedCatalog.name,
+            })
+          }}
+        </div>
+        <div v-else>
+          {{ $t('WhatsApp.catalog.list.disable_modal.description') }}
+        </div>
         <div>
           {{ $t('WhatsApp.catalog.list.disable_modal.label', { name: connectedCatalog.name }) }}
         </div>

diff --git a/src/locales/en.json b/src/locales/en.json
@@ -476,14 +476,16 @@
         "advanced_settings": "Advanced Settings",
         "identification": "Identification",
         "actions": {
-          "enabled_cart": "Cart enabled",
-          "disabled_cart": "Cart disabled",
-          "enabled_catalog": "Catalog enabled",
-          "disabled_catalog": "Disabled"
+          "active_cart": "Active cart",
+          "inactive_cart": "Inactive cart",
+          "active_catalog": "Active catalog",
+          "inactive_catalog": "Inactive"
         },
         "disable_modal": {
           "title": "Are you really going to disable the catalogue?",
+          "title_active": "You already have another active catalog",
           "description": "To continue sending your products on Whatsapp you need an active catalogue.",
+          "description_active": "This action will automatically deactivate the catalog “{name}”",
           "label": "Type “{name}” to confirm",
           "confirm": "Disable"
         },

diff --git a/src/locales/es_es.json b/src/locales/es_es.json
@@ -476,14 +476,16 @@
         "advanced_settings": "Configuraciones avanzadas",
         "identification": "Identificación",
         "actions": {
-          "enabled_cart": "Carrito activo",
-          "disabled_cart": "Carrito inactivo",
-          "enabled_catalog": "Catálogo activo",
-          "disabled_catalog": "Inactivo"
+          "active_cart": "Carrito activo",
+          "inactive_cart": "Carrito inactivo",
+          "active_catalog": "Catálogo activo",
+          "inactive_catalog": "Inactivo"
         },
         "disable_modal": {
           "title": "¿De verdad vas a desactivar el catálogo?",
+          "title_active": "Ya tienes otro catálogo activo",
           "description": "Para seguir enviando tus productos por Whatsapp necesitas un catálogo activo.",
+          "description_active": "Esta acción desactivará automáticamente el catálogo. “{name}”",
           "label": "Escriba “{name}” para confirmar",
           "confirm": "Desactivar"
         },

diff --git a/src/locales/pt_br.json b/src/locales/pt_br.json
@@ -476,14 +476,16 @@
         "advanced_settings": "Configurações avançadas",
         "identification": "Identificação",
         "actions": {
-          "enabled_cart": "Carrinho ativo",
-          "disabled_cart": "Carrinho inativo",
-          "enabled_catalog": "Catálogo ativo",
-          "disabled_catalog": "Inativo"
+          "active_cart": "Carrinho ativo",
+          "inactive_cart": "Carrinho inativo",
+          "active_catalog": "Catálogo ativo",
+          "inactive_catalog": "Inativo"
         },
         "disable_modal": {
           "title": "Vai mesmo desativar o catálogo?",
+          "title_active": "Você já tem outro catálogo ativo",
           "description": "Para continuar enviando seus produtos no Whatsapp você precisa de um catálogo ativo.",
+          "description_active": "Essa ação vai desativar automaticamente o catálogo “{name}”",
           "label": "Digite “{name}” para confirmar",
           "confirm": "Desativar"
         },