@dev.smartpricing/message-composer-layer 4.3.2-fix.1 → 4.5.1-next.0

package/app/stores/emailEditor.ts

@@ -199,7 +199,11 @@ export const useEmailEditorStore = defineStore('emailEditor', () => {
     sort_by?: 'created_at' | 'name'
     direction?: 'asc' | 'desc'
   }) {
-    brands.value = await brandsApi.getAll(options)
+    // The Brands of the Effective Organization: the edited Message Group's.
+    brands.value = await brandsApi.getAll({
+      ...options,
+      organization_id: useEffectiveOrganizationStore().requireOrganizationId(),
+    })
     return brands.value
   }
 

package/app/stores/metaSubmission.ts

@@ -1,7 +1,6 @@
 import type { SubmissionJob } from '@dev.smartpricing/message-composer-utils/types'
 import { metaApi } from '~/api/meta'
 import { useQueryCache } from '@pinia/colada'
-import { useAppContextStore } from './appContext'
 
 interface ActiveJob {
   jobId: string
@@ -12,21 +11,17 @@ interface ActiveJob {
 export const useMetaSubmissionStore = () => {
   const toast = useToast()
   const queryCache = useQueryCache()
-  const appContext = useAppContextStore()
   const { t } = useI18n()
 
   const activeJobs = useState<Map<string, ActiveJob>>('meta-submission-jobs', () => new Map())
   const pollingInterval = useState<NodeJS.Timeout | null>('meta-polling-interval', () => null)
 
-  const isConfigured = computed(() => !!appContext.metaWabaId)
-
-  const submitToMeta = async (messageGroupId: string) => {
-    if (!isConfigured.value) {
-      throw new Error('Meta configuration not available')
-    }
-
+  // `wabaId` is the WABA the user picked for a first submission, if any.
+  const submitToMeta = async (messageGroupId: string, wabaId?: string) => {
     try {
-      const response = await metaApi.submitGroup(messageGroupId)
+      const response = await metaApi.submitGroup(messageGroupId, wabaId)
+      // The Message Group is on its WABA from now on: read it again.
+      queryCache.invalidateQueries({ key: ['message-groups', messageGroupId] })
       startBackgroundPolling(response.jobId, messageGroupId)
       return response
     } catch (error) {
@@ -38,13 +33,9 @@ export const useMetaSubmissionStore = () => {
   // Submit a single message (one language) for Meta review. Synchronous:
   // the endpoint submits inline and flips the message to `pending`, so there
   // is no job to poll — unlike the group flow.
-  const submitMessageToMeta = async (messageId: string) => {
-    if (!isConfigured.value) {
-      throw new Error('Meta configuration not available')
-    }
-
+  const submitMessageToMeta = async (messageId: string, wabaId?: string) => {
     try {
-      const response = await metaApi.submitMessage(messageId)
+      const response = await metaApi.submitMessage(messageId, wabaId)
       toast.add({
         color: 'success',
         title: t('meta_submission.message_success'),
@@ -133,7 +124,6 @@ export const useMetaSubmissionStore = () => {
   return {
     activeJobs,
     hasActiveJobs,
-    isConfigured,
     submitToMeta,
     submitMessageToMeta,
     startBackgroundPolling,

package/app/types/tracking.ts

@@ -1,5 +1,10 @@
+import type { MessageGroupProduct } from '@dev.smartpricing/message-composer-utils/types'
+
 export type MessagesKind = 'email' | 'whatsapp'
 
+/** The step an operator was on when leaving the Message Send Flow. */
+export type MessageSendFlowStep = 'message' | 'parameters'
+
 export interface MessageActionProperties {
   message_name: string
   languages: string[]
@@ -83,6 +88,8 @@ export interface TrackingEventMap {
     search_term: string
     category: string
     status: string
+    /** The Product filter; `all` when not narrowed. */
+    product: MessageGroupProduct | 'all'
     messages_kind: MessagesKind
   }
   change_tab: { messages_kind: MessagesKind }
@@ -160,4 +167,14 @@ export interface TrackingEventMap {
     to_recipients: number
     language: string
   }
+
+  // === Message Send Flow (spec #67) ===
+  'send_flow.confirm': {
+    message_name: string
+    message_category: string
+    language: string
+    parameters_count: number
+  }
+  'send_flow.cancel': { step: MessageSendFlowStep }
+  'send_flow.error': { code: string }
 }

package/app/utils/testIds.const.ts

@@ -513,11 +513,16 @@ export const templateListTableTestIds = {
   searchInput: 'template-list-table-search-input',
   categorySelect: 'template-list-table-category-select',
   statusSelect: 'template-list-table-status-select',
+  productSelect: 'template-list-table-product-select',
+  visibilitySelect: 'template-list-table-visibility-select',
+  pagination: 'template-list-table-pagination',
+  paginationSummary: 'template-list-table-pagination-summary',
   card: 'template-list-table-card',
   table: 'template-list-table-table',
   rowName: 'template-list-table-row-name',
   rowInternalBadge: 'template-list-table-row-internal-badge',
   rowCategoryBadge: 'template-list-table-row-category-badge',
+  rowProductBadge: 'template-list-table-row-product-badge',
   rowPreview: 'template-list-table-row-preview',
   rowActions: 'template-list-table-row-actions',
   rowEditAction: 'template-list-table-row-edit',
@@ -751,7 +756,31 @@ export const previewByIdTestIds = {
 
 export const messageGroupSelectTestIds = {
   root: 'message-group-select-root',
+  loadMore: 'message-group-select-load-more',
 } as const
 
 /** @deprecated Use `messageGroupSelectTestIds` instead */
 export const templateSelectTestIds = messageGroupSelectTestIds
+
+export const messageSendFlowTestIds = {
+  root: 'message-send-flow-root',
+  stepper: 'message-send-flow-stepper',
+  alert: 'message-send-flow-alert',
+  picker: 'message-send-flow-picker',
+  languageGroup: 'message-send-flow-language-group',
+  parametersForm: 'message-send-flow-parameters-form',
+  /** One per visible key; the key is on `data-parameter`. */
+  parameterInput: 'message-send-flow-parameter-input',
+  noParameters: 'message-send-flow-no-parameters',
+  /** Right panel, present on every step, holding the channel preview. */
+  previewPanel: 'message-send-flow-preview-panel',
+  preview: 'message-send-flow-preview',
+  /** The compiled email of the Preview step (`render_type` email_v1). */
+  emailPreview: 'message-send-flow-email-preview',
+  /** The Cancel/Back/Next/Confirm bar, inline or teleported to `actionsTo`. */
+  actions: 'message-send-flow-actions',
+  back: 'message-send-flow-back',
+  next: 'message-send-flow-next',
+  cancel: 'message-send-flow-cancel',
+  confirm: 'message-send-flow-confirm',
+} as const

package/i18n/locales/de.ts

@@ -18,6 +18,7 @@ export default {
     all: 'Alle',
     copy: 'Kopieren',
     copy_of: 'Kopie von {name}',
+    context_error_title: 'Konfigurationsfehler des Composers',
     desktop: 'Desktop',
     error: 'Fehler',
     errore: 'Fehler',
@@ -50,6 +51,17 @@ export default {
     },
     internal: 'Intern',
     mobile: 'Mobil',
+    organization: {
+      label: 'Organisation',
+      lookup_failed_description:
+        'Beim Laden der Organisationen, auf die Sie Zugriff haben, ist ein Fehler aufgetreten. Versuchen Sie es erneut.',
+      lookup_failed_title: 'Ihre Organisationen konnten nicht geladen werden',
+      none_description: 'Ihr Benutzer hat auf keine Organisation Zugriff.',
+      none_title: 'Keine Organisation verfügbar',
+      resolving: 'Ihre Organisationen werden geladen...',
+      retry: 'Erneut versuchen',
+      search_placeholder: 'Organisationen suchen...',
+    },
     preview: 'Vorschau',
     search: 'Suchen...',
     success: 'Erfolg',
@@ -57,10 +69,21 @@ export default {
     messageGroupSelect: {
       inactive_tooltip:
         'Diese Nachrichtengruppe enthält nicht genehmigte oder fehlende Nachrichten',
+      not_sendable_tooltip: 'Diese Nachrichtengruppe enthält keine genehmigten Nachrichten',
       hide_inactive: 'Inaktive ausblenden',
+      hide_not_sendable: 'Nicht sendbare ausblenden',
+      load_more: 'Mehr laden',
     },
     view_less: 'Weniger anzeigen',
     view_more: 'Mehr anzeigen',
+    whatsapp_not_configured_description:
+      'Diese Organisation hat kein WhatsApp-Business-Konto. WhatsApp-Nachrichten können als Entwurf gespeichert, aber nicht zur Genehmigung eingereicht werden.',
+    whatsapp_not_configured_title: 'WhatsApp ist nicht konfiguriert',
+    whatsapp_waba_detached_description:
+      'Sie kann nicht mehr zur Genehmigung eingereicht werden. Dupliziere sie, um die Kopie bei einem anderen WhatsApp Business-Konto einzureichen.',
+    whatsapp_waba_detached_title:
+      'Diese Nachricht gehört zu einem WhatsApp Business-Konto, das nicht mehr verbunden ist',
+    whatsapp_waba_label: 'WhatsApp Business-Konto:',
   },
   dialogs: {
     delete_message: {
@@ -107,6 +130,13 @@ export default {
         'Die {language}-Übersetzung zur Überprüfung einreichen? Sie können sie nicht bearbeiten, solange sie auf Genehmigung wartet.',
       title: 'Überprüfung anfordern',
     },
+    select_waba: {
+      confirm: 'Genehmigung anfordern',
+      description:
+        'Diese Organisation hat mehr als ein WhatsApp Business-Konto. Wähle das Konto, bei dem diese Nachricht eingereicht wird: Es kann danach nicht mehr geändert werden.',
+      no_numbers: 'Keine verbundene Nummer',
+      title: 'WhatsApp Business-Konto auswählen',
+    },
     unpublish_message_group: {
       message:
         'Veröffentlichung von „{name}“ aufheben? Es ist dann nicht mehr für Kundinnen und Kunden sichtbar.',
@@ -783,20 +813,28 @@ export default {
     },
     message_library: {
       add_message_group: 'Neue Nachricht',
+      all_products: 'Alle Produkte',
       category_placeholder: 'Kategorie auswählen',
       headers: {
         category: 'Kategorie',
         name: 'Name',
         preview: 'Vorschau',
+        product: 'Produkt',
         status: 'Status',
-        tags: 'Tags',
         updated_at: 'Aktualisiert am',
       },
+      pagination_summary: '{from}–{to} von {total}',
+      product_placeholder: 'Produkt auswählen',
       render_type_placeholder: 'Render-Typ auswählen',
       search_placeholder: 'Suchen',
       status_placeholder: 'Status auswählen',
-      tags_placeholder: 'Nach Tags filtern',
       title: 'Nachrichtenbibliothek',
+      visibility: {
+        all: 'Alle',
+        internal: 'Intern',
+        public: 'Öffentlich',
+      },
+      visibility_placeholder: 'Sichtbarkeit auswählen',
     },
     whatsapp: {
       create_message_group: {
@@ -829,6 +867,12 @@ export default {
       },
     },
   },
+  products: {
+    chat: 'Smartchat',
+    connect: 'Smartconnect',
+    pms: 'Smartpms',
+    pricing: 'Smartpricing',
+  },
   public: {
     select_message: {
       choose_language: 'Sprache auswählen...',
@@ -838,6 +882,44 @@ export default {
       send_message: 'Nachricht senden',
     },
   },
+  send_flow: {
+    actions: {
+      back: 'Zurück',
+      cancel: 'Abbrechen',
+      confirm: 'Bestätigen',
+      next: 'Weiter',
+    },
+    errors: {
+      COMPILE_FAILED:
+        'Die Nachricht konnte nicht vorbereitet werden. Bitte versuchen Sie es erneut.',
+      MISSING_PARAMETERS: 'Füllen Sie alle Parameter aus, bevor Sie bestätigen.',
+      NOT_OFFERED:
+        '„{name}“ kann von hier aus nicht gesendet werden. Wählen Sie eine andere Nachrichtengruppe.',
+      NOT_SENDABLE:
+        '„{name}“ hat keine genehmigte Nachricht und kann nicht gesendet werden. Wählen Sie eine andere Nachrichtengruppe.',
+      TEMPLATE_NOT_APPROVED:
+        'Diese Nachricht wurde von Meta nicht genehmigt und kann nicht gesendet werden.',
+      TEMPLATE_NOT_SUBMITTED:
+        'Diese Nachricht wurde nicht bei Meta eingereicht und kann nicht gesendet werden.',
+    },
+    language: {
+      approved: 'Genehmigt',
+      approved_count: 'Genehmigte Sprachen für {name}: {count}',
+      not_sendable: 'Nicht sendbar ({status})',
+    },
+    no_parameters: 'Diese Nachricht hat keine auszufüllenden Parameter.',
+    not_sendable_hint: 'Ausgegraute Nachrichtengruppen haben keine genehmigte Nachricht.',
+    questions: {
+      language: 'In welcher Sprache?',
+      message: 'Welche Nachricht möchten Sie senden?',
+      parameters: 'Parameter ausfüllen',
+      preview: 'Das erhält der Gast',
+    },
+    steps: {
+      message: { description: 'Sendbare Nachrichtengruppe auswählen', title: 'Nachricht' },
+      parameters: { description: 'Felder ausfüllen', title: 'Parameter' },
+    },
+  },
   status: {
     approved: 'Genehmigt',
     draft: 'Entwurf',

package/i18n/locales/en.ts

@@ -18,6 +18,7 @@ export default {
     all: 'All',
     copy: 'Copy',
     copy_of: 'Copy of {name}',
+    context_error_title: 'Composer configuration error',
     desktop: 'Desktop',
     error: 'Error',
     errore: 'Error',
@@ -49,16 +50,38 @@ export default {
     },
     internal: 'Internal',
     mobile: 'Mobile',
+    organization: {
+      label: 'Organization',
+      lookup_failed_description:
+        'Something went wrong while loading the organizations you can access. Try again.',
+      lookup_failed_title: 'Your organizations could not be loaded',
+      none_description: 'Your user has no access to any organization.',
+      none_title: 'No organization available',
+      resolving: 'Loading your organizations...',
+      retry: 'Try again',
+      search_placeholder: 'Search organizations...',
+    },
     preview: 'Preview',
     search: 'Search...',
     success: 'Success',
     translation_failed: 'Translation failed',
     messageGroupSelect: {
       inactive_tooltip: 'This message group has unapproved or missing messages',
+      not_sendable_tooltip: 'This message group has no approved messages',
       hide_inactive: 'Hide inactive',
+      hide_not_sendable: 'Hide not sendable',
+      load_more: 'Load more',
     },
     view_less: 'View less',
     view_more: 'View more',
+    whatsapp_not_configured_description:
+      'This organization has no WhatsApp Business Account. WhatsApp messages can be saved as drafts, but not submitted for approval.',
+    whatsapp_not_configured_title: 'WhatsApp is not configured',
+    whatsapp_waba_detached_description:
+      'It can no longer be submitted for approval. Duplicate it to submit the copy to another WhatsApp Business Account.',
+    whatsapp_waba_detached_title:
+      'This message is on a WhatsApp Business Account that is no longer connected',
+    whatsapp_waba_label: 'WhatsApp Business Account:',
   },
   dialogs: {
     delete_message: {
@@ -103,6 +126,13 @@ export default {
         "Submit the {language} translation for review? You won't be able to edit it while it's pending approval.",
       title: 'Request review',
     },
+    select_waba: {
+      confirm: 'Request approval',
+      description:
+        'This organization has more than one WhatsApp Business Account. Choose the one this message is submitted to: it cannot be changed afterwards.',
+      no_numbers: 'No connected number',
+      title: 'Choose the WhatsApp Business Account',
+    },
     unpublish_message_group: {
       message: 'Unpublish "{name}"? It will no longer be visible to clients.',
       success: '"{name}" has been unpublished.',
@@ -772,20 +802,28 @@ export default {
     },
     message_library: {
       add_message_group: 'New message',
+      all_products: 'All products',
       category_placeholder: 'Select category',
       headers: {
         category: 'Category',
         name: 'Name',
         preview: 'Preview',
+        product: 'Product',
         status: 'Status',
-        tags: 'Tags',
         updated_at: 'Updated at',
       },
+      pagination_summary: '{from}–{to} of {total}',
+      product_placeholder: 'Select product',
       render_type_placeholder: 'Select render type',
       search_placeholder: 'Search',
       status_placeholder: 'Select status',
-      tags_placeholder: 'Filter by tags',
       title: 'Messages',
+      visibility: {
+        all: 'All',
+        internal: 'Internal',
+        public: 'Public',
+      },
+      visibility_placeholder: 'Select visibility',
     },
     whatsapp: {
       create_message_group: {
@@ -818,6 +856,12 @@ export default {
       },
     },
   },
+  products: {
+    chat: 'Smartchat',
+    connect: 'Smartconnect',
+    pms: 'Smartpms',
+    pricing: 'Smartpricing',
+  },
   public: {
     select_message: {
       choose_language: 'Choose a language...',
@@ -827,6 +871,40 @@ export default {
       send_message: 'Send message',
     },
   },
+  send_flow: {
+    actions: {
+      back: 'Back',
+      cancel: 'Cancel',
+      confirm: 'Confirm',
+      next: 'Next',
+    },
+    errors: {
+      COMPILE_FAILED: 'The message could not be prepared. Please try again.',
+      MISSING_PARAMETERS: 'Fill in every parameter before confirming.',
+      NOT_OFFERED: '"{name}" cannot be sent from here. Pick another message group.',
+      NOT_SENDABLE:
+        '"{name}" has no approved message and cannot be sent. Pick another message group.',
+      TEMPLATE_NOT_APPROVED: 'This message has not been approved by Meta and cannot be sent.',
+      TEMPLATE_NOT_SUBMITTED: 'This message has not been submitted to Meta and cannot be sent.',
+    },
+    language: {
+      approved: 'Approved',
+      approved_count: 'Approved languages for {name}: {count}',
+      not_sendable: 'Not sendable ({status})',
+    },
+    no_parameters: 'This message has no parameters to fill in.',
+    not_sendable_hint: 'Greyed-out message groups have no approved message.',
+    questions: {
+      language: 'In which language?',
+      message: 'Which message do you want to send?',
+      parameters: 'Fill in the parameters',
+      preview: 'This is what the guest will receive',
+    },
+    steps: {
+      message: { description: 'Pick a sendable message group', title: 'Message' },
+      parameters: { description: 'Fill in the blanks', title: 'Parameters' },
+    },
+  },
   status: {
     approved: 'Approved',
     draft: 'Draft',

package/i18n/locales/es.ts

@@ -18,6 +18,7 @@ export default {
     all: 'Todos',
     copy: 'Copiar',
     copy_of: 'Copia de {name}',
+    context_error_title: 'Error de configuración del composer',
     desktop: 'Escritorio',
     error: 'Error',
     errore: 'Error',
@@ -50,16 +51,38 @@ export default {
     },
     internal: 'Interno',
     mobile: 'Móvil',
+    organization: {
+      label: 'Organización',
+      lookup_failed_description:
+        'Se produjo un error al cargar las organizaciones a las que tienes acceso. Inténtalo de nuevo.',
+      lookup_failed_title: 'No se pudieron cargar tus organizaciones',
+      none_description: 'Tu usuario no tiene acceso a ninguna organización.',
+      none_title: 'Ninguna organización disponible',
+      resolving: 'Cargando tus organizaciones...',
+      retry: 'Reintentar',
+      search_placeholder: 'Buscar organizaciones...',
+    },
     preview: 'Vista previa',
     search: 'Buscar...',
     success: 'Éxito',
     translation_failed: 'La traducción ha fallado',
     messageGroupSelect: {
       inactive_tooltip: 'Este grupo de mensajes tiene mensajes no aprobados o faltantes',
+      not_sendable_tooltip: 'Este grupo de mensajes no tiene mensajes aprobados',
       hide_inactive: 'Ocultar inactivos',
+      hide_not_sendable: 'Ocultar no enviables',
+      load_more: 'Cargar más',
     },
     view_less: 'Ver menos',
     view_more: 'Ver más',
+    whatsapp_not_configured_description:
+      'Esta organización no tiene una cuenta de WhatsApp Business. Los mensajes de WhatsApp se pueden guardar como borradores, pero no enviar para su aprobación.',
+    whatsapp_not_configured_title: 'WhatsApp no está configurado',
+    whatsapp_waba_detached_description:
+      'Ya no se puede enviar para su aprobación. Duplícalo para enviar la copia a otra cuenta de WhatsApp Business.',
+    whatsapp_waba_detached_title:
+      'Este mensaje está en una cuenta de WhatsApp Business que ya no está conectada',
+    whatsapp_waba_label: 'Cuenta de WhatsApp Business:',
   },
   dialogs: {
     delete_message: {
@@ -104,6 +127,13 @@ export default {
         '¿Enviar la traducción en {language} para revisión? No podrá editarla mientras esté pendiente de aprobación.',
       title: 'Solicitar revisión',
     },
+    select_waba: {
+      confirm: 'Solicitar aprobación',
+      description:
+        'Esta organización tiene más de una cuenta de WhatsApp Business. Elige a cuál se envía este mensaje: no se podrá cambiar después.',
+      no_numbers: 'Ningún número conectado',
+      title: 'Elige la cuenta de WhatsApp Business',
+    },
     unpublish_message_group: {
       message: '¿Despublicar "{name}"? Ya no será visible para los clientes.',
       success: '"{name}" se ha despublicado.',
@@ -781,20 +811,28 @@ export default {
     },
     message_library: {
       add_message_group: 'Nuevo mensaje',
+      all_products: 'Todos los productos',
       category_placeholder: 'Seleccionar categoría',
       headers: {
         category: 'Categoría',
         name: 'Nombre',
         preview: 'Vista previa',
+        product: 'Producto',
         status: 'Estado',
-        tags: 'Etiquetas',
         updated_at: 'Actualizado el',
       },
+      pagination_summary: '{from}–{to} de {total}',
+      product_placeholder: 'Seleccionar producto',
       render_type_placeholder: 'Seleccionar tipo de renderizado',
       search_placeholder: 'Buscar',
       status_placeholder: 'Seleccionar estado',
-      tags_placeholder: 'Filtrar por etiquetas',
       title: 'Libreria de mensajes',
+      visibility: {
+        all: 'Todas',
+        internal: 'Internas',
+        public: 'Públicas',
+      },
+      visibility_placeholder: 'Seleccionar visibilidad',
     },
     whatsapp: {
       create_message_group: {
@@ -827,6 +865,12 @@ export default {
       },
     },
   },
+  products: {
+    chat: 'Smartchat',
+    connect: 'Smartconnect',
+    pms: 'Smartpms',
+    pricing: 'Smartpricing',
+  },
   public: {
     select_message: {
       choose_language: 'Elige un idioma...',
@@ -836,6 +880,41 @@ export default {
       send_message: 'Enviar mensaje',
     },
   },
+  send_flow: {
+    actions: {
+      back: 'Atrás',
+      cancel: 'Cancelar',
+      confirm: 'Confirmar',
+      next: 'Siguiente',
+    },
+    errors: {
+      COMPILE_FAILED: 'No se ha podido preparar el mensaje. Inténtelo de nuevo.',
+      MISSING_PARAMETERS: 'Rellene todos los parámetros antes de confirmar.',
+      NOT_OFFERED: '"{name}" no se puede enviar desde aquí. Elija otro grupo de mensajes.',
+      NOT_SENDABLE:
+        '"{name}" no tiene ningún mensaje aprobado y no se puede enviar. Elija otro grupo de mensajes.',
+      TEMPLATE_NOT_APPROVED: 'Meta no ha aprobado este mensaje y no se puede enviar.',
+      TEMPLATE_NOT_SUBMITTED:
+        'Este mensaje no se ha enviado a Meta para su aprobación y no se puede enviar.',
+    },
+    language: {
+      approved: 'Aprobado',
+      approved_count: 'Idiomas aprobados para {name}: {count}',
+      not_sendable: 'No se puede enviar ({status})',
+    },
+    no_parameters: 'Este mensaje no tiene parámetros que rellenar.',
+    not_sendable_hint: 'Los grupos de mensajes en gris no tienen ningún mensaje aprobado.',
+    questions: {
+      language: '¿En qué idioma?',
+      message: '¿Qué mensaje quiere enviar?',
+      parameters: 'Rellenar los parámetros',
+      preview: 'Esto es lo que recibirá el huésped',
+    },
+    steps: {
+      message: { description: 'Elegir un grupo de mensajes que se pueda enviar', title: 'Mensaje' },
+      parameters: { description: 'Rellenar los campos', title: 'Parámetros' },
+    },
+  },
   status: {
     approved: 'Aprobado',
     draft: 'Borrador',