@dev.smartpricing/message-composer-layer 4.5.1-next.2 → 4.5.1-next.3

package/README.md

@@ -85,14 +85,14 @@ watch(
 )
 ```
 
-**WABA.** The Host does not supply the WABA: the WABAs follow the Organization and the backend resolves them (ADR [0015](../../docs/adr/0015-message-group-waba-fixed-at-first-submission.md)). WhatsApp is configured when the Host's `channels` include `whatsapp` and the Organization has at least one WABA. A Message Group is submitted to one WABA, chosen at its first submission and fixed from then on; with several WABAs the user picks one when requesting approval. `metaWabaId` in the context is optional and is only the preselection in that picker. A Host that sends from one WABA only also sets `metaWabaLocked: ref(true)`: a new Message Group is then submitted to `metaWabaId` without asking, as long as it is one of the Organization's WABAs.
+**WABA.** The Host does not have to supply the WABA: the WABAs follow the Organization and the backend resolves them (ADR [0015](../../docs/adr/0015-message-group-waba-fixed-at-first-submission.md)). WhatsApp is configured when the Host's `channels` include `whatsapp` and the Organization has at least one WABA. A Message Group is submitted to one WABA, chosen at its first submission and fixed from then on; with several WABAs it is the `metaWabaId` the Host passed, when that is one of them, and otherwise the user picks one when requesting approval. `metaWabaId` in the context is optional.
 
 ### Upgrading to 4.5.0
 
 Nothing is required: a Host that keeps passing `organization_id` and `metaWabaId` behaves as before.
 
 - **Removed** from `ComposerContext` and from `AppContextConfig` in utils (no code read them): `authenticationToken`, `strategy`, `metaAccessToken`, `dinamicValues`. Remove them from the `defineComposerContext()` call. The utils types `AppContextState` and `ContextSource` are gone too.
-- **Changed**: `metaWabaId` no longer decides where a WhatsApp submission goes and is no longer required for the WhatsApp channel; it preselects the WABA when the user has to pick one.
+- **Changed**: `metaWabaId` no longer decides where a WhatsApp submission goes and is no longer required for the WhatsApp channel; with several WABAs on the Organization it names the one a new Message Group is submitted to, and the user is asked only without it.
 - **Deprecated**, removed in 5.0.0: the `sm-organization-id` and `x-meta-waba-id` request headers. The layer no longer sends them; the backend still accepts them from Hosts on an older layer.
 - **New**: `organization_id` is optional, the Organization selector, `useEffectiveOrganization()`, and the `organizationId` and `wabaId` props of the Message Send Flow.
 

package/app/components/Composer/WabaSelectModal.vue

@@ -8,13 +8,11 @@ import type { OrganizationWaba } from '@dev.smartpricing/message-composer-utils/
  */
 const props = defineProps<{
   wabas: OrganizationWaba[]
-  /** The Host's WABA, already checked to be one of `wabas`. */
-  preselected?: string
 }>()
 
 const emit = defineEmits<{ close: [wabaId?: string] }>()
 
-const selected = ref<string | undefined>(props.preselected)
+const selected = ref<string>()
 
 const items = computed(() =>
   props.wabas.map((waba) => ({

package/app/components/TemplateList/BaseTable.vue

@@ -5,6 +5,7 @@ import {
   MESSAGE_GROUP_PRODUCTS,
   MESSAGE_STATUS,
   type MessageGroupListSort,
+  type MessageGroupProduct,
   type MessageGroupWithMessageSummary,
   type PaginationMeta,
   type RenderType,
@@ -203,8 +204,17 @@ const categoryItems = computed(() =>
   toSelectItems(MESSAGE_GROUP_CATEGORIES, 'categories', t('common.all')),
 )
 const statusItems = computed(() => toSelectItems(MESSAGE_STATUS, 'status', t('common.all')))
+// Only the Products that have Message Groups today. The Host's own Product
+// is always offered, since the filter starts on it.
+const PRODUCTS_WITH_MESSAGES: readonly MessageGroupProduct[] = ['connect', 'chat']
 const productItems = computed(() =>
-  toSelectItems(MESSAGE_GROUP_PRODUCTS, 'products', t('pages.message_library.all_products')),
+  toSelectItems(
+    MESSAGE_GROUP_PRODUCTS.filter(
+      (product) => PRODUCTS_WITH_MESSAGES.includes(product) || product === appContext.product,
+    ),
+    'products',
+    t('pages.message_library.all_products'),
+  ),
 )
 
 const visibilityItems = computed(() =>

package/app/composables/composerContext.ts

@@ -17,17 +17,11 @@ export interface ComposerContext {
   mainLanguage?: Ref<string>
   default_tags?: Ref<string[]>
   /**
-   * The WABA the Host works on. Only a preselection: when the user has to
-   * pick the WABA of a Message Group, this one is proposed if it is one of
-   * the Organization's (ADR 0015).
+   * The WABA the Host works on. A new Message Group is submitted to it and
+   * the user is not asked, as long as it is one of the Organization's
+   * (ADR 0015). Without it the user picks when there are several.
    */
   metaWabaId?: Ref<string>
-  /**
-   * The Host works on `metaWabaId` only (Smartconnect): a new Message Group
-   * is submitted to it and the user is not asked. Applies while `metaWabaId`
-   * is one of the Organization's WABAs; otherwise the choice stays the user's.
-   */
-  metaWabaLocked?: Ref<boolean>
   isAdmin?: Ref<boolean>
   organizationData?: Ref<OrganizationData>
 }

package/app/composables/useMessageGroupWaba.ts

@@ -9,7 +9,7 @@ import WabaSelectModal from '~/components/Composer/WabaSelectModal.vue'
  */
 export function useMessageGroupWaba(storedWabaId: MaybeRefOrGetter<string | null | undefined>) {
   const { data: wabas, refresh } = useOrganizationWabasQuery()
-  const { metaWabaId, metaWabaLocked } = storeToRefs(useAppContextStore())
+  const { metaWabaId } = storeToRefs(useAppContextStore())
   const modal = useOverlay().create(WabaSelectModal)
 
   // A submission of one language does not read the Message Group again: its
@@ -43,12 +43,12 @@ export function useMessageGroupWaba(storedWabaId: MaybeRefOrGetter<string | null
   )
 
   /**
-   * The WABA to name in a submission. Asks the user only at the first
-   * submission of a Message Group whose Organization has several WABAs;
-   * otherwise names none and the backend resolves it. A Host that works on
-   * its own WABA only (`metaWabaLocked`) is not asked: that WABA is named.
-   * A lookup that has not answered yet is waited for; one that failed leaves
-   * it to the backend. Returns null when the user gives up.
+   * The WABA to name in a submission. At the first submission of a Message
+   * Group whose Organization has several WABAs, it is the Host's when the
+   * Host passed one of them, otherwise the user is asked. In every other
+   * case none is named and the backend resolves it. A lookup that has not
+   * answered yet is waited for; one that failed leaves it to the backend.
+   * Returns null when the user gives up.
    */
   async function chooseWaba(): Promise<{ wabaId?: string } | null> {
     if (wabaId.value) return {}
@@ -56,12 +56,12 @@ export function useMessageGroupWaba(storedWabaId: MaybeRefOrGetter<string | null
     const candidates = wabas.value
     if (!candidates || candidates.length < 2) return {}
 
-    const preselected = candidates.some((candidate) => candidate.id === metaWabaId.value)
-      ? metaWabaId.value
-      : undefined
-    if (preselected && metaWabaLocked.value) return { wabaId: preselected }
+    const hostWabaId = metaWabaId.value
+    if (hostWabaId && candidates.some((candidate) => candidate.id === hostWabaId)) {
+      return { wabaId: hostWabaId }
+    }
 
-    const chosen = await modal.open({ wabas: candidates, preselected }).result
+    const chosen = await modal.open({ wabas: candidates }).result
 
     return chosen ? { wabaId: chosen } : null
   }

package/app/stores/appContext.ts

@@ -23,10 +23,8 @@ export const useAppContextStore = defineStore('appContext', () => {
   const mainLanguage = computed(() => ctx.mainLanguage?.value ?? 'en')
   const default_tags = computed<string[]>(() => ctx.default_tags?.value ?? [])
   const isAdmin = computed(() => ctx.isAdmin?.value ?? false)
-  // The Host's preselection among the Organization's WABAs (ADR 0015).
+  // The WABA the Host works on: the target of a new Message Group (ADR 0015).
   const metaWabaId = computed(() => ctx.metaWabaId?.value || undefined)
-  // The Host's WABA is the only one it works on: no choice is offered.
-  const metaWabaLocked = computed(() => ctx.metaWabaLocked?.value ?? false)
 
   // Sync i18n locale when mainLanguage changes
   watch(
@@ -60,7 +58,6 @@ export const useAppContextStore = defineStore('appContext', () => {
     default_tags,
     isAdmin,
     metaWabaId,
-    metaWabaLocked,
 
     validationErrors,
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dev.smartpricing/message-composer-layer",
-  "version": "4.5.1-next.2",
+  "version": "4.5.1-next.3",
   "private": false,
   "type": "module",
   "main": "./nuxt.config.ts",
@@ -35,7 +35,7 @@
     "vue-router": "^5.0.7",
     "vue3-emoji-picker": "^1.1.8",
     "zod": "^4.4.3",
-    "@dev.smartpricing/message-composer-utils": "4.5.1-next.2"
+    "@dev.smartpricing/message-composer-utils": "4.5.1-next.3"
   },
   "devDependencies": {
     "@dev.smartpricing/platform-layer": "^0.0.23",