@adminide-stack/yantra-mobile 12.0.39-alpha.8 → 12.0.39

package/lib/features/templates/buildTemplateCards.ts

@@ -74,15 +74,41 @@ export function normalizeMarketplaceTemplatesPayload(payload: Record<string, unk
     return { ...leanGroups, ...(grafted as Record<string, unknown>) };
 }
 
+const GRAFTED_NAMESPACE_KEYS = new Set(['marketplace', 'aisearch', 'credential', 'appSettings']);
+
+/** Template entries (not groups) expose a `forms` map or credential-style ids. */
+function isTemplateShapedEntry(value: Record<string, unknown>): boolean {
+    if (value.forms && typeof value.forms === 'object') return true;
+    if (typeof value.templateName === 'string' && (value.formId || value.formExtensionId)) return true;
+    return false;
+}
+
+/**
+ * After `marketplace.templates.<group>` loads, a shared settings cache can replace the
+ * group map with that group's contents (`aieditor-…` keys). Those must not render as groups.
+ */
+function payloadLooksLikeGroupContents(groupsMap: Record<string, unknown>): boolean {
+    const values = Object.entries(groupsMap).filter(
+        ([key, value]) =>
+            value && typeof value === 'object' && !GRAFTED_NAMESPACE_KEYS.has(key) && key !== 'designSystems',
+    );
+    if (values.length === 0) return false;
+    const templateCount = values.filter(([, value]) => isTemplateShapedEntry(value as Record<string, unknown>)).length;
+    return templateCount > 0 && templateCount >= Math.ceil(values.length / 2);
+}
+
 export function extractMarketplaceTemplateGroups(payload: unknown): MarketplaceTemplateGroup[] {
     const raw = unwrapSettingsPayload(payload);
     if (!raw) return [];
     const groupsMap = normalizeMarketplaceTemplatesPayload(raw);
+    if (payloadLooksLikeGroupContents(groupsMap)) return [];
+
     const groups: MarketplaceTemplateGroup[] = [];
 
     Object.entries(groupsMap).forEach(([groupKey, groupValue]) => {
         if (!groupValue || typeof groupValue !== 'object') return;
-        if (groupKey === 'designSystems') return;
+        if (groupKey === 'designSystems' || GRAFTED_NAMESPACE_KEYS.has(groupKey)) return;
+        if (isTemplateShapedEntry(groupValue as Record<string, unknown>)) return;
         groups.push({
             id: groupKey,
             label: humanizeGroupKey(groupKey),
@@ -94,6 +120,23 @@ export function extractMarketplaceTemplateGroups(payload: unknown): MarketplaceT
     return groups.sort((a, b) => a.label.localeCompare(b.label));
 }
 
+/**
+ * Cards fetch is scoped to `marketplace.templates.<group>`. If a shared cache still
+ * returns the full group map, lift the selected group so extraction stays correct.
+ */
+export function resolveGroupTemplatesPayload(payload: unknown, group: string): unknown {
+    const selectedGroup = group.trim();
+    if (!selectedGroup) return payload;
+    const raw = unwrapSettingsPayload(payload);
+    if (!raw) return payload;
+    const normalized = normalizeMarketplaceTemplatesPayload(raw);
+    const nested = normalized[selectedGroup];
+    if (nested && typeof nested === 'object' && !isTemplateShapedEntry(nested as Record<string, unknown>)) {
+        return nested;
+    }
+    return payload;
+}
+
 function resolveSettingsUrl(
     form: Record<string, unknown>,
     parentGroup: Record<string, unknown> | undefined,

package/lib/hooks/useMarketplaceTemplateCards.js

@@ -1,4 +1,4 @@
-import {useSettings}from'@adminide-stack/platform-client';import {ConfigurationTarget,ContributionSchemaId}from'common';import {useMemo}from'react';import {extractGroupTemplateCards}from'../features/templates/buildTemplateCards.js';import {settingsUriForOrg}from'../utils/cdecodeUri.js';function useMarketplaceTemplateCards({
+import {useSettings}from'@adminide-stack/platform-client';import {ConfigurationTarget,ContributionSchemaId}from'common';import {useMemo}from'react';import {extractGroupTemplateCards,resolveGroupTemplatesPayload}from'../features/templates/buildTemplateCards.js';import {settingsUriForOrg}from'../utils/cdecodeUri.js';function useMarketplaceTemplateCards({
   group = "",
   orgName,
   enabled = true
@@ -23,7 +23,10 @@ import {useSettings}from'@adminide-stack/platform-client';import {ConfigurationT
     }
   });
   const payload = data != null ? data : settings;
-  const cards = useMemo(() => canFetch ? extractGroupTemplateCards(payload) : [], [canFetch, payload]);
+  const cards = useMemo(() => {
+    if (!canFetch) return [];
+    return extractGroupTemplateCards(resolveGroupTemplatesPayload(payload, selectedGroup));
+  }, [canFetch, payload, selectedGroup]);
   return {
     cards,
     loading: canFetch ? loading : false,

package/lib/hooks/useMarketplaceTemplateCards.js.map

@@ -1 +1 @@
-{"version":3,"file":"useMarketplaceTemplateCards.js","sources":["../../src/hooks/useMarketplaceTemplateCards.ts"],"sourcesContent":["import { useSettings } from '@adminide-stack/platform-client';\nimport { ConfigurationTarget, ContributionSchemaId } from 'common';\nimport { useMemo } from 'react';\nimport { extractGroupTemplateCards, type BuildTemplateCard } from '../features/templates/buildTemplateCards';\nimport { settingsUriForOrg, type SettingsUriInput } from '../utils/cdecodeUri';\n\nexport type UseMarketplaceTemplateCardsOptions = {\n    /** Selected marketplace group key (e.g. `codeAssistant`). */\n    group?: string | null;\n    orgName?: string | null;\n    enabled?: boolean;\n};\n\nexport type UseMarketplaceTemplateCardsReturn = {\n    cards: BuildTemplateCard[];\n    loading: boolean;\n    error: unknown;\n};\n\n/**\n * Cards under `marketplace.templates.<group>` for Build mode — browser\n * `useDefaultFormTemplateCards` parity (includes `snapshotId` for webbuilder remix).\n */\nexport function useMarketplaceTemplateCards({\n    group = '',\n    orgName,\n    enabled = true,\n}: UseMarketplaceTemplateCardsOptions): UseMarketplaceTemplateCardsReturn {\n    const selectedGroup = (group ?? '').trim();\n    const slug = (orgName ?? '').trim();\n    const canFetch = enabled && Boolean(selectedGroup) && Boolean(slug);\n\n    const resourceUri: SettingsUriInput | undefined = useMemo(\n        () => (canFetch ? settingsUriForOrg(slug) : undefined),\n        [canFetch, slug],\n    );\n\n    const { data, settings, loading, error } = useSettings({\n        resourceUri: resourceUri as never,\n        skip: !canFetch || !resourceUri,\n        options: {\n            schemaId: ContributionSchemaId.UiLayout,\n            configKey: `marketplace.templates.${selectedGroup}`,\n            includeMarketplace: true,\n            target: ConfigurationTarget.ORGANIZATION,\n        },\n    });\n\n    // See useMarketplaceTemplateGroups — prefer scoped `data`, fall back to raw settings subtree.\n    const payload = data ?? settings;\n\n    const cards = useMemo(() => (canFetch ? extractGroupTemplateCards(payload) : []), [canFetch, payload]);\n\n    return {\n        cards,\n        loading: canFetch ? loading : false,\n        error: canFetch ? error : undefined,\n    };\n}\n"],"names":[],"mappings":"+RAqBO,SAAS,2BAA4B,CAAA;AAAA,EAC1C,KAAQ,GAAA,EAAA;AAAA,EACR,OAAA;AAAA,EACA,OAAU,GAAA;AACZ,CAA0E,EAAA;AACxE,EAAM,MAAA,aAAA,GAAA,CAAiB,KAAS,IAAA,IAAA,GAAA,KAAA,GAAA,EAAA,EAAI,IAAK,EAAA;AACzC,EAAM,MAAA,IAAA,GAAA,CAAQ,OAAW,IAAA,IAAA,GAAA,OAAA,GAAA,EAAA,EAAI,IAAK,EAAA;AAClC,EAAA,MAAM,WAAW,OAAW,IAAA,OAAA,CAAQ,aAAa,CAAA,IAAK,QAAQ,IAAI,CAAA;AAClE,EAAM,MAAA,WAAA,GAA4C,OAAQ,CAAA,MAAM,QAAW,GAAA,iBAAA,CAAkB,IAAI,CAAA,GAAI,MAAW,EAAA,CAAC,QAAU,EAAA,IAAI,CAAC,CAAA;AAChI,EAAM,MAAA;AAAA,IACJ,IAAA;AAAA,IACA,QAAA;AAAA,IACA,OAAA;AAAA,IACA;AAAA,MACE,WAAY,CAAA;AAAA,IACd,WAAA;AAAA,IACA,IAAA,EAAM,CAAC,QAAA,IAAY,CAAC,WAAA;AAAA,IACpB,OAAS,EAAA;AAAA,MACP,UAAU,oBAAqB,CAAA,QAAA;AAAA,MAC/B,SAAA,EAAW,yBAAyB,aAAa,CAAA,CAAA;AAAA,MACjD,kBAAoB,EAAA,IAAA;AAAA,MACpB,QAAQ,mBAAoB,CAAA;AAAA;AAC9B,GACD,CAAA;AAGD,EAAA,MAAM,UAAU,IAAQ,IAAA,IAAA,GAAA,IAAA,GAAA,QAAA;AACxB,EAAA,MAAM,KAAQ,GAAA,OAAA,CAAQ,MAAM,QAAA,GAAW,yBAA0B,CAAA,OAAO,CAAI,GAAA,EAAI,EAAA,CAAC,QAAU,EAAA,OAAO,CAAC,CAAA;AACnG,EAAO,OAAA;AAAA,IACL,KAAA;AAAA,IACA,OAAA,EAAS,WAAW,OAAU,GAAA,KAAA;AAAA,IAC9B,KAAA,EAAO,WAAW,KAAQ,GAAA;AAAA,GAC5B;AACF"}
+{"version":3,"file":"useMarketplaceTemplateCards.js","sources":["../../src/hooks/useMarketplaceTemplateCards.ts"],"sourcesContent":["import { useSettings } from '@adminide-stack/platform-client';\nimport { ConfigurationTarget, ContributionSchemaId } from 'common';\nimport { useMemo } from 'react';\nimport {\n    extractGroupTemplateCards,\n    resolveGroupTemplatesPayload,\n    type BuildTemplateCard,\n} from '../features/templates/buildTemplateCards';\nimport { settingsUriForOrg, type SettingsUriInput } from '../utils/cdecodeUri';\n\nexport type UseMarketplaceTemplateCardsOptions = {\n    /** Selected marketplace group key (e.g. `codeAssistant`). */\n    group?: string | null;\n    orgName?: string | null;\n    enabled?: boolean;\n};\n\nexport type UseMarketplaceTemplateCardsReturn = {\n    cards: BuildTemplateCard[];\n    loading: boolean;\n    error: unknown;\n};\n\n/**\n * Cards under `marketplace.templates.<group>` for Build mode — browser\n * `useDefaultFormTemplateCards` parity (includes `snapshotId` for webbuilder remix).\n */\nexport function useMarketplaceTemplateCards({\n    group = '',\n    orgName,\n    enabled = true,\n}: UseMarketplaceTemplateCardsOptions): UseMarketplaceTemplateCardsReturn {\n    const selectedGroup = (group ?? '').trim();\n    const slug = (orgName ?? '').trim();\n    const canFetch = enabled && Boolean(selectedGroup) && Boolean(slug);\n\n    const resourceUri: SettingsUriInput | undefined = useMemo(\n        () => (canFetch ? settingsUriForOrg(slug) : undefined),\n        [canFetch, slug],\n    );\n\n    const { data, settings, loading, error } = useSettings({\n        resourceUri: resourceUri as never,\n        skip: !canFetch || !resourceUri,\n        options: {\n            schemaId: ContributionSchemaId.UiLayout,\n            configKey: `marketplace.templates.${selectedGroup}`,\n            includeMarketplace: true,\n            target: ConfigurationTarget.ORGANIZATION,\n        },\n    });\n\n    // See useMarketplaceTemplateGroups — prefer scoped `data`, fall back to raw settings subtree.\n    const payload = data ?? settings;\n\n    const cards = useMemo(() => {\n        if (!canFetch) return [];\n        return extractGroupTemplateCards(resolveGroupTemplatesPayload(payload, selectedGroup));\n    }, [canFetch, payload, selectedGroup]);\n\n    return {\n        cards,\n        loading: canFetch ? loading : false,\n        error: canFetch ? error : undefined,\n    };\n}\n"],"names":[],"mappings":"4TAqBO,SAAS,2BAA4B,CAAA;AAAA,EAC1C,KAAQ,GAAA,EAAA;AAAA,EACR,OAAA;AAAA,EACA,OAAU,GAAA;AACZ,CAA0E,EAAA;AACxE,EAAM,MAAA,aAAA,GAAA,CAAiB,KAAS,IAAA,IAAA,GAAA,KAAA,GAAA,EAAA,EAAI,IAAK,EAAA;AACzC,EAAM,MAAA,IAAA,GAAA,CAAQ,OAAW,IAAA,IAAA,GAAA,OAAA,GAAA,EAAA,EAAI,IAAK,EAAA;AAClC,EAAA,MAAM,WAAW,OAAW,IAAA,OAAA,CAAQ,aAAa,CAAA,IAAK,QAAQ,IAAI,CAAA;AAClE,EAAM,MAAA,WAAA,GAA4C,OAAQ,CAAA,MAAM,QAAW,GAAA,iBAAA,CAAkB,IAAI,CAAA,GAAI,MAAW,EAAA,CAAC,QAAU,EAAA,IAAI,CAAC,CAAA;AAChI,EAAM,MAAA;AAAA,IACJ,IAAA;AAAA,IACA,QAAA;AAAA,IACA,OAAA;AAAA,IACA;AAAA,MACE,WAAY,CAAA;AAAA,IACd,WAAA;AAAA,IACA,IAAA,EAAM,CAAC,QAAA,IAAY,CAAC,WAAA;AAAA,IACpB,OAAS,EAAA;AAAA,MACP,UAAU,oBAAqB,CAAA,QAAA;AAAA,MAC/B,SAAA,EAAW,yBAAyB,aAAa,CAAA,CAAA;AAAA,MACjD,kBAAoB,EAAA,IAAA;AAAA,MACpB,QAAQ,mBAAoB,CAAA;AAAA;AAC9B,GACD,CAAA;AAGD,EAAA,MAAM,UAAU,IAAQ,IAAA,IAAA,GAAA,IAAA,GAAA,QAAA;AACxB,EAAM,MAAA,KAAA,GAAQ,QAAQ,MAAM;AAC1B,IAAI,IAAA,CAAC,QAAU,EAAA,OAAO,EAAC;AACvB,IAAA,OAAO,yBAA0B,CAAA,4BAAA,CAA6B,OAAS,EAAA,aAAa,CAAC,CAAA;AAAA,GACpF,EAAA,CAAC,QAAU,EAAA,OAAA,EAAS,aAAa,CAAC,CAAA;AACrC,EAAO,OAAA;AAAA,IACL,KAAA;AAAA,IACA,OAAA,EAAS,WAAW,OAAU,GAAA,KAAA;AAAA,IAC9B,KAAA,EAAO,WAAW,KAAQ,GAAA;AAAA,GAC5B;AACF"}

package/lib/hooks/useMarketplaceTemplateGroups.js

@@ -1,4 +1,4 @@
-import {useSettings}from'@adminide-stack/platform-client';import {ConfigurationTarget,ContributionSchemaId}from'common';import {useMemo}from'react';import {extractMarketplaceTemplateGroups}from'../features/templates/buildTemplateCards.js';import {settingsUriForOrg}from'../utils/cdecodeUri.js';function useMarketplaceTemplateGroups({
+import {useSettings}from'@adminide-stack/platform-client';import {ConfigurationTarget,ContributionSchemaId}from'common';import {useMemo,useRef}from'react';import {extractMarketplaceTemplateGroups}from'../features/templates/buildTemplateCards.js';import {settingsUriForOrg}from'../utils/cdecodeUri.js';function useMarketplaceTemplateGroups({
   orgName,
   enabled = true
 }) {
@@ -23,7 +23,14 @@ import {useSettings}from'@adminide-stack/platform-client';import {ConfigurationT
     }
   });
   const payload = data != null ? data : settings;
-  const groups = useMemo(() => canFetch ? extractMarketplaceTemplateGroups(payload) : [], [canFetch, payload]);
+  const groupsRef = useRef([]);
+  const groups = useMemo(() => {
+    if (!canFetch) return [];
+    const next = extractMarketplaceTemplateGroups(payload);
+    if (next.length === 0) return groupsRef.current;
+    groupsRef.current = next;
+    return next;
+  }, [canFetch, payload]);
   return {
     groups,
     loading: canFetch ? loading : false,

package/lib/hooks/useMarketplaceTemplateGroups.js.map

@@ -1 +1 @@
-{"version":3,"file":"useMarketplaceTemplateGroups.js","sources":["../../src/hooks/useMarketplaceTemplateGroups.ts"],"sourcesContent":["import { useSettings } from '@adminide-stack/platform-client';\nimport { ConfigurationTarget, ContributionSchemaId } from 'common';\nimport { useMemo } from 'react';\nimport {\n    extractMarketplaceTemplateGroups,\n    type MarketplaceTemplateGroup,\n} from '../features/templates/buildTemplateCards';\nimport { settingsUriForOrg, type SettingsUriInput } from '../utils/cdecodeUri';\n\nexport type UseMarketplaceTemplateGroupsOptions = {\n    orgName?: string | null;\n    enabled?: boolean;\n};\n\nexport type UseMarketplaceTemplateGroupsReturn = {\n    groups: MarketplaceTemplateGroup[];\n    loading: boolean;\n    error: unknown;\n};\n\n/**\n * Lists marketplace template groups (`codeAssistant`, `mediaAssistant`, …)\n * for the Build-mode template picker — browser `useTemplates` parity.\n */\nexport function useMarketplaceTemplateGroups({\n    orgName,\n    enabled = true,\n}: UseMarketplaceTemplateGroupsOptions): UseMarketplaceTemplateGroupsReturn {\n    const slug = (orgName ?? '').trim();\n    const canFetch = enabled && Boolean(slug);\n    const resourceUri: SettingsUriInput | undefined = useMemo(\n        () => (canFetch ? settingsUriForOrg(slug) : undefined),\n        [canFetch, slug],\n    );\n\n    const { data, settings, loading, error } = useSettings({\n        resourceUri: resourceUri as never,\n        skip: !canFetch || !resourceUri,\n        options: {\n            schemaId: ContributionSchemaId.UiLayout,\n            configKey: 'marketplace.templates',\n            includeMarketplace: true,\n            // Group keys only — values collapse to `{}` (browser modal lists by key).\n            depth: 1,\n            target: ConfigurationTarget.ORGANIZATION,\n        },\n    });\n\n    // `useSettings` does lodash get(settings, configKey). When pageSettings already returns the\n    // configKey subtree as `settings` (depth comment: `{ codeAssistant: {} }`), that get is\n    // undefined — fall back to the raw settings payload.\n    const payload = data ?? settings;\n\n    const groups = useMemo(() => (canFetch ? extractMarketplaceTemplateGroups(payload) : []), [canFetch, payload]);\n\n    return {\n        groups,\n        loading: canFetch ? loading : false,\n        error: canFetch ? error : undefined,\n    };\n}\n"],"names":[],"mappings":"sSAmBO,SAAS,4BAA6B,CAAA;AAAA,EAC3C,OAAA;AAAA,EACA,OAAU,GAAA;AACZ,CAA4E,EAAA;AAC1E,EAAM,MAAA,IAAA,GAAA,CAAQ,OAAW,IAAA,IAAA,GAAA,OAAA,GAAA,EAAA,EAAI,IAAK,EAAA;AAClC,EAAM,MAAA,QAAA,GAAW,OAAW,IAAA,OAAA,CAAQ,IAAI,CAAA;AACxC,EAAM,MAAA,WAAA,GAA4C,OAAQ,CAAA,MAAM,QAAW,GAAA,iBAAA,CAAkB,IAAI,CAAA,GAAI,MAAW,EAAA,CAAC,QAAU,EAAA,IAAI,CAAC,CAAA;AAChI,EAAM,MAAA;AAAA,IACJ,IAAA;AAAA,IACA,QAAA;AAAA,IACA,OAAA;AAAA,IACA;AAAA,MACE,WAAY,CAAA;AAAA,IACd,WAAA;AAAA,IACA,IAAA,EAAM,CAAC,QAAA,IAAY,CAAC,WAAA;AAAA,IACpB,OAAS,EAAA;AAAA,MACP,UAAU,oBAAqB,CAAA,QAAA;AAAA,MAC/B,SAAW,EAAA,uBAAA;AAAA,MACX,kBAAoB,EAAA,IAAA;AAAA;AAAA,MAEpB,KAAO,EAAA,CAAA;AAAA,MACP,QAAQ,mBAAoB,CAAA;AAAA;AAC9B,GACD,CAAA;AAKD,EAAA,MAAM,UAAU,IAAQ,IAAA,IAAA,GAAA,IAAA,GAAA,QAAA;AACxB,EAAA,MAAM,MAAS,GAAA,OAAA,CAAQ,MAAM,QAAA,GAAW,gCAAiC,CAAA,OAAO,CAAI,GAAA,EAAI,EAAA,CAAC,QAAU,EAAA,OAAO,CAAC,CAAA;AAC3G,EAAO,OAAA;AAAA,IACL,MAAA;AAAA,IACA,OAAA,EAAS,WAAW,OAAU,GAAA,KAAA;AAAA,IAC9B,KAAA,EAAO,WAAW,KAAQ,GAAA;AAAA,GAC5B;AACF"}
+{"version":3,"file":"useMarketplaceTemplateGroups.js","sources":["../../src/hooks/useMarketplaceTemplateGroups.ts"],"sourcesContent":["import { useSettings } from '@adminide-stack/platform-client';\nimport { ConfigurationTarget, ContributionSchemaId } from 'common';\nimport { useMemo, useRef } from 'react';\nimport {\n    extractMarketplaceTemplateGroups,\n    type MarketplaceTemplateGroup,\n} from '../features/templates/buildTemplateCards';\nimport { settingsUriForOrg, type SettingsUriInput } from '../utils/cdecodeUri';\n\nexport type UseMarketplaceTemplateGroupsOptions = {\n    orgName?: string | null;\n    enabled?: boolean;\n};\n\nexport type UseMarketplaceTemplateGroupsReturn = {\n    groups: MarketplaceTemplateGroup[];\n    loading: boolean;\n    error: unknown;\n};\n\n/**\n * Lists marketplace template groups (`codeAssistant`, `mediaAssistant`, …)\n * for the Build-mode template picker — browser `useTemplates` parity.\n */\nexport function useMarketplaceTemplateGroups({\n    orgName,\n    enabled = true,\n}: UseMarketplaceTemplateGroupsOptions): UseMarketplaceTemplateGroupsReturn {\n    const slug = (orgName ?? '').trim();\n    const canFetch = enabled && Boolean(slug);\n    const resourceUri: SettingsUriInput | undefined = useMemo(\n        () => (canFetch ? settingsUriForOrg(slug) : undefined),\n        [canFetch, slug],\n    );\n\n    const { data, settings, loading, error } = useSettings({\n        resourceUri: resourceUri as never,\n        skip: !canFetch || !resourceUri,\n        options: {\n            schemaId: ContributionSchemaId.UiLayout,\n            configKey: 'marketplace.templates',\n            includeMarketplace: true,\n            // Group keys only — values collapse to `{}` (browser modal lists by key).\n            depth: 1,\n            target: ConfigurationTarget.ORGANIZATION,\n        },\n    });\n\n    // `useSettings` does lodash get(settings, configKey). When pageSettings already returns the\n    // configKey subtree as `settings` (depth comment: `{ codeAssistant: {} }`), that get is\n    // undefined — fall back to the raw settings payload.\n    const payload = data ?? settings;\n\n    const groupsRef = useRef<MarketplaceTemplateGroup[]>([]);\n    const groups = useMemo(() => {\n        if (!canFetch) return [];\n        const next = extractMarketplaceTemplateGroups(payload);\n        // Shared cache can swap the group map for a group's contents after deselect/reopen.\n        // Keep the last valid group list so the picker does not flip to nested templates.\n        if (next.length === 0) return groupsRef.current;\n        groupsRef.current = next;\n        return next;\n    }, [canFetch, payload]);\n\n    return {\n        groups,\n        loading: canFetch ? loading : false,\n        error: canFetch ? error : undefined,\n    };\n}\n"],"names":[],"mappings":"6SAmBO,SAAS,4BAA6B,CAAA;AAAA,EAC3C,OAAA;AAAA,EACA,OAAU,GAAA;AACZ,CAA4E,EAAA;AAC1E,EAAM,MAAA,IAAA,GAAA,CAAQ,OAAW,IAAA,IAAA,GAAA,OAAA,GAAA,EAAA,EAAI,IAAK,EAAA;AAClC,EAAM,MAAA,QAAA,GAAW,OAAW,IAAA,OAAA,CAAQ,IAAI,CAAA;AACxC,EAAM,MAAA,WAAA,GAA4C,OAAQ,CAAA,MAAM,QAAW,GAAA,iBAAA,CAAkB,IAAI,CAAA,GAAI,MAAW,EAAA,CAAC,QAAU,EAAA,IAAI,CAAC,CAAA;AAChI,EAAM,MAAA;AAAA,IACJ,IAAA;AAAA,IACA,QAAA;AAAA,IACA,OAAA;AAAA,IACA;AAAA,MACE,WAAY,CAAA;AAAA,IACd,WAAA;AAAA,IACA,IAAA,EAAM,CAAC,QAAA,IAAY,CAAC,WAAA;AAAA,IACpB,OAAS,EAAA;AAAA,MACP,UAAU,oBAAqB,CAAA,QAAA;AAAA,MAC/B,SAAW,EAAA,uBAAA;AAAA,MACX,kBAAoB,EAAA,IAAA;AAAA;AAAA,MAEpB,KAAO,EAAA,CAAA;AAAA,MACP,QAAQ,mBAAoB,CAAA;AAAA;AAC9B,GACD,CAAA;AAKD,EAAA,MAAM,UAAU,IAAQ,IAAA,IAAA,GAAA,IAAA,GAAA,QAAA;AACxB,EAAM,MAAA,SAAA,GAAY,MAAmC,CAAA,EAAE,CAAA;AACvD,EAAM,MAAA,MAAA,GAAS,QAAQ,MAAM;AAC3B,IAAI,IAAA,CAAC,QAAU,EAAA,OAAO,EAAC;AACvB,IAAM,MAAA,IAAA,GAAO,iCAAiC,OAAO,CAAA;AAGrD,IAAA,IAAI,IAAK,CAAA,MAAA,KAAW,CAAG,EAAA,OAAO,SAAU,CAAA,OAAA;AACxC,IAAA,SAAA,CAAU,OAAU,GAAA,IAAA;AACpB,IAAO,OAAA,IAAA;AAAA,GACN,EAAA,CAAC,QAAU,EAAA,OAAO,CAAC,CAAA;AACtB,EAAO,OAAA;AAAA,IACL,MAAA;AAAA,IACA,OAAA,EAAS,WAAW,OAAU,GAAA,KAAA;AAAA,IAC9B,KAAA,EAAO,WAAW,KAAQ,GAAA;AAAA,GAC5B;AACF"}

package/lib/routes.json

@@ -22,6 +22,7 @@
           "showFilter": true,
           "isSearchBack": false,
           "showGateway": true,
+          "showApps": true,
           "showHistory": true,
           "showNewChat": true
         }
@@ -71,6 +72,7 @@
           "isSearchBack": false,
           "showBack": true,
           "showGateway": true,
+          "showApps": true,
           "showHistory": false,
           "showNewChat": true
         }

package/lib/screens/Home/HomeScreen.js

@@ -1,4 +1,4 @@
-import {jsx,jsxs}from'react/jsx-runtime';import React,{useRef,useState,useEffect,useCallback,useMemo}from'react';import {useWindowDimensions,useColorScheme,Platform,Keyboard,TouchableWithoutFeedback,View,StyleSheet,ScrollView,Pressable}from'react-native';import {MaterialCommunityIcons}from'@expo/vector-icons';import {getDefaultLeftItems,getDefaultRightItems,Box,Text,InputToolBar}from'@admin-layout/gluestack-ui-mobile';import {useSafeAreaInsets,SafeAreaView}from'react-native-safe-area-context';import {useNavigation,useRoute,CommonActions}from'@react-navigation/native';import {useDispatch,useSelector}from'react-redux';import {v4}from'uuid';import {usePrerequisiteIds}from'../../hooks/usePrerequisiteIds.js';import {syncMobileOrgRouteContext}from'../../utils/syncMobileOrgRouteContext.js';import {useChatMutations}from'../../hooks/useChatApi.js';import {AudioRecorderPanel}from'../../features/audio-input/AudioRecorderPanel.js';import {MicErrorBoundary}from'../../features/audio-input/MicErrorBoundary.js';import {requestMicPermission}from'../../features/audio-input/useAudioPermission.js';import {mobileTokens}from'../../theme/mobileTokens.js';import {useMarketplaceTemplateGroups}from'../../hooks/useMarketplaceTemplateGroups.js';import {BuildTemplatesSection}from'./components/BuildTemplatesSection.js';import {WebBuilderPrewarm}from'./components/WebBuilderPrewarm.js';var __defProp = Object.defineProperty;
+import {jsx,jsxs}from'react/jsx-runtime';import React,{useRef,useState,useEffect,useCallback,useMemo}from'react';import {useWindowDimensions,useColorScheme,Platform,Keyboard,TouchableWithoutFeedback,View,StyleSheet}from'react-native';import {getDefaultLeftItems,getDefaultRightItems,Box,Text,InputToolBar}from'@admin-layout/gluestack-ui-mobile';import {useSafeAreaInsets,SafeAreaView}from'react-native-safe-area-context';import {useNavigation,useRoute,CommonActions}from'@react-navigation/native';import {useDispatch,useSelector}from'react-redux';import {v4}from'uuid';import {usePrerequisiteIds}from'../../hooks/usePrerequisiteIds.js';import {syncMobileOrgRouteContext}from'../../utils/syncMobileOrgRouteContext.js';import {useChatMutations}from'../../hooks/useChatApi.js';import {AudioRecorderPanel}from'../../features/audio-input/AudioRecorderPanel.js';import {MicErrorBoundary}from'../../features/audio-input/MicErrorBoundary.js';import {requestMicPermission}from'../../features/audio-input/useAudioPermission.js';import {mobileTokens}from'../../theme/mobileTokens.js';import {useMarketplaceTemplateGroups}from'../../hooks/useMarketplaceTemplateGroups.js';import {BuildTemplatesSection}from'./components/BuildTemplatesSection.js';import {ChooseTemplateModal}from'./components/ChooseTemplateModal.js';import {HomeSuggestions}from'./components/HomeSuggestions.js';import {WebBuilderPrewarm}from'./components/WebBuilderPrewarm.js';var __defProp = Object.defineProperty;
 var __defProps = Object.defineProperties;
 var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
@@ -27,57 +27,22 @@ const EmptyStateSection = React.memo(function EmptyStateSection2({
   secondaryTextColor,
   primaryTextColor,
   activeMode,
-  onModeSwitch,
-  orgName,
   selectedTemplateGroup,
   selectedBuildTemplateId,
-  onUseBuildTemplate
+  showSuggestions,
+  onInjectPrompt
 }) {
-  const isBuildMode = activeMode === "build";
-  return /* @__PURE__ */ jsx(Box, { flex: 1, width: "100%", children: /* @__PURE__ */ jsxs(ScrollView, { style: {
-    flex: 1,
-    width: "100%"
-  }, contentContainerStyle: styles.emptyCenterTitleWrap, keyboardShouldPersistTaps: "handled", showsVerticalScrollIndicator: false, children: [
-    /* @__PURE__ */ jsx(Text, { style: [styles.emptyEyebrow, {
-      color: secondaryTextColor
-    }], children: "Choose your mode" }),
-    /* @__PURE__ */ jsxs(View, { style: [styles.emptyModePillRow, {
-      backgroundColor: isDark ? "rgba(30, 41, 59, 0.9)" : "#eef2ff",
-      borderColor: isDark ? "rgba(148, 163, 184, 0.26)" : "rgba(67, 56, 202, 0.15)"
-    }], children: [
-      /* @__PURE__ */ jsxs(Pressable, { onPress: () => onModeSwitch("chat"), style: [styles.emptyModePill, activeMode === "chat" && styles.emptyModePillActive, activeMode === "chat" && {
-        backgroundColor: isDark ? "#312e81" : "#4338ca"
-      }], accessibilityRole: "button", accessibilityLabel: "Switch to chat mode", children: [
-        /* @__PURE__ */ jsx(MaterialCommunityIcons, { name: "magnify", size: 14, color: activeMode === "chat" ? "#ffffff" : secondaryTextColor }),
-        /* @__PURE__ */ jsx(Text, { style: [styles.emptyModePillLabel, {
-          color: activeMode === "chat" ? "#ffffff" : secondaryTextColor
-        }], children: "Chat" })
-      ] }),
-      /* @__PURE__ */ jsxs(Pressable, { onPress: () => onModeSwitch("deep-search"), style: [styles.emptyModePill, activeMode === "deep-search" && styles.emptyModePillActive, activeMode === "deep-search" && {
-        backgroundColor: isDark ? "#312e81" : "#4338ca"
-      }], accessibilityRole: "button", accessibilityLabel: "Switch to deep-search mode", children: [
-        /* @__PURE__ */ jsx(MaterialCommunityIcons, { name: "lightning-bolt-outline", size: 14, color: activeMode === "deep-search" ? "#ffffff" : secondaryTextColor }),
-        /* @__PURE__ */ jsx(Text, { style: [styles.emptyModePillLabel, {
-          color: activeMode === "deep-search" ? "#ffffff" : secondaryTextColor
-        }], children: "Deep Search" })
-      ] }),
-      /* @__PURE__ */ jsxs(Pressable, { onPress: () => onModeSwitch("build"), style: [styles.emptyModePill, activeMode === "build" && styles.emptyModePillActive, activeMode === "build" && {
-        backgroundColor: isDark ? "#312e81" : "#4338ca"
-      }], accessibilityRole: "button", accessibilityLabel: "Switch to build mode", children: [
-        /* @__PURE__ */ jsx(MaterialCommunityIcons, { name: "lightbulb-outline", size: 14, color: activeMode === "build" ? "#ffffff" : secondaryTextColor }),
-        /* @__PURE__ */ jsx(Text, { style: [styles.emptyModePillLabel, {
-          color: activeMode === "build" ? "#ffffff" : secondaryTextColor
-        }], children: "Build" })
-      ] })
-    ] }),
+  const title = activeMode === "build" ? "What should we build?" : activeMode === "deep-search" ? "What should we research?" : "Ask anything";
+  const subtitle = activeMode === "build" ? selectedBuildTemplateId ? "Describe the project, then send." : selectedTemplateGroup ? "Tap a starter below, then send." : "Tap Template to pick a group, then send." : activeMode === "deep-search" ? "Source-backed answers from the web." : "Chat, Deep Search, or Build from the composer.";
+  return /* @__PURE__ */ jsxs(View, { style: styles.emptyWrap, children: [
     /* @__PURE__ */ jsx(Text, { style: [styles.emptyCenterTitle, {
       color: primaryTextColor
-    }], children: "How do you want to start?" }),
+    }], children: title }),
     /* @__PURE__ */ jsx(Text, { style: [styles.emptySubtitle, {
       color: secondaryTextColor
-    }], children: isBuildMode ? selectedBuildTemplateId ? "Template armed \u2014 describe what to build, then send. Snapshot goes with your message." : selectedTemplateGroup ? "Tap a starter below to arm its snapshot, then type your prompt and send." : "Open Template to choose a group (Code Assistant, \u2026), pick a starter, then type & send." : "Use Chat for quick help, Deep Search for source-backed answers, or Build to assemble workflows." }),
-    isBuildMode ? /* @__PURE__ */ jsx(BuildTemplatesSection, { enabled: true, group: selectedTemplateGroup, orgName, isDark, primaryTextColor, secondaryTextColor, selectedTemplateId: selectedBuildTemplateId, onUseTemplate: onUseBuildTemplate }) : null
-  ] }) });
+    }], children: subtitle }),
+    activeMode === "chat" && showSuggestions ? /* @__PURE__ */ jsx(HomeSuggestions, { isDark, primaryTextColor, secondaryTextColor, onInjectPrompt }) : null
+  ] });
 });
 function HomeScreenContent({
   initialMode = "chat",
@@ -85,7 +50,7 @@ function HomeScreenContent({
   isLoading: isLoadingProp = false,
   disabled = false
 }) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e;
   const {
     width: screenWidth
   } = useWindowDimensions();
@@ -166,9 +131,7 @@ function HomeScreenContent({
   }, []);
   const handleModeSwitch = useCallback((mode) => {
     setActiveMode(mode);
-    if (mode === "build") {
-      setShowTemplateModal(true);
-    } else {
+    if (mode !== "build") {
       setShowTemplateModal(false);
       setSelectedTemplateGroup(null);
       setSelectedBuildTemplate(null);
@@ -233,9 +196,12 @@ function HomeScreenContent({
     setShowTemplateModal(false);
   }, []);
   const handleClearBuildTemplate = useCallback(() => {
-    setSelectedBuildTemplate(null);
+    if (selectedBuildTemplate) {
+      setSelectedBuildTemplate(null);
+      return;
+    }
     setSelectedTemplateGroup(null);
-  }, []);
+  }, [selectedBuildTemplate]);
   const handleSubmit = useCallback(async (attachments) => {
     var _a2;
     if (!canSubmit || isLoading || disabled) return;
@@ -325,6 +291,10 @@ function HomeScreenContent({
   const handleValueChange = useCallback((e) => {
     setValue(e.nativeEvent.text);
   }, []);
+  const handleInjectPrompt = useCallback((prompt, mode) => {
+    setValue(prompt);
+    if (mode) setActiveMode(mode);
+  }, []);
   const handleMicPress = useCallback(() => {
     if (hasQuery) return;
     setVoiceError(null);
@@ -401,6 +371,7 @@ function HomeScreenContent({
       title: "Choose Template"
     };
   }, [isBuildMode, showTemplateModal, templateModalItems, selectedTemplateGroup, handleSelectTemplateGroup]);
+  const renderTemplateModal = useCallback((config) => /* @__PURE__ */ jsx(ChooseTemplateModal, { isOpen: config.isOpen, onClose: config.onClose, templates: config.templates, selectedId: config.selectedId, onSelect: config.onSelect, suggestedId: config.suggestedId, title: config.title, isDark, loading: templateGroupsLoading }), [isDark, templateGroupsLoading]);
   const rightItems = useMemo(() => getDefaultRightItems({
     tag: {
       enabled: false
@@ -436,12 +407,13 @@ function HomeScreenContent({
     backgroundColor: surfaceColor
   }, children: [
     /* @__PURE__ */ jsx(WebBuilderPrewarm, { enabled: isBuildMode, orgName: effectiveOrgName, projectId: effectiveProjectId, tagId }),
-    /* @__PURE__ */ jsx(TouchableWithoutFeedback, { onPress: Keyboard.dismiss, accessible: false, children: /* @__PURE__ */ jsxs(Box, { flex: 1, width: "100%", position: "relative", children: [
-      /* @__PURE__ */ jsx(EmptyStateSection, { isDark, secondaryTextColor, primaryTextColor, activeMode, onModeSwitch: handleModeSwitch, orgName: effectiveOrgName, selectedTemplateGroup, selectedBuildTemplateId: (_d = selectedBuildTemplate == null ? void 0 : selectedBuildTemplate.id) != null ? _d : null, onUseBuildTemplate: handleUseBuildTemplate }),
-      /* @__PURE__ */ jsx(View, { style: [styles.bottomComposerWrap, {
-        bottom: Math.max(0, keyboardHeight - insets.bottom),
-        paddingBottom: Math.max(insets.bottom - 6, 2)
-      }], children: /* @__PURE__ */ jsxs(View, { style: [styles.bottomComposerInner, {
+    /* @__PURE__ */ jsx(TouchableWithoutFeedback, { onPress: Keyboard.dismiss, accessible: false, children: /* @__PURE__ */ jsxs(Box, { flex: 1, width: "100%", style: {
+      paddingBottom: Math.max(0, keyboardHeight - insets.bottom)
+    }, children: [
+      /* @__PURE__ */ jsx(EmptyStateSection, { isDark, secondaryTextColor, primaryTextColor, activeMode, selectedTemplateGroup, selectedBuildTemplateId: (_d = selectedBuildTemplate == null ? void 0 : selectedBuildTemplate.id) != null ? _d : null, showSuggestions: keyboardHeight === 0, onInjectPrompt: handleInjectPrompt }),
+      /* @__PURE__ */ jsx(View, { style: [styles.composerDock, {
+        paddingBottom: Math.max(insets.bottom - 6, 8)
+      }], children: /* @__PURE__ */ jsxs(View, { style: [styles.composerInner, {
         width: contentMaxWidth
       }], children: [
         voiceError ? /* @__PURE__ */ jsx(View, { style: [styles.voiceErrorBanner, {
@@ -450,79 +422,40 @@ function HomeScreenContent({
         }], children: /* @__PURE__ */ jsx(Text, { style: [styles.voiceErrorText, {
           color: isDark ? "#fecaca" : "#991b1b"
         }], children: voiceError }) }) : null,
-        showAudioRecorder ? (
-          /*
-           * Render-time JS errors thrown by `useAudioRecorder`
-           * (e.g. expo-audio native module missing, recorder
-           * constructor throws in a release build) are caught
-           * by the boundary and converted into a soft cancel
-           * via the same handlers the panel itself uses on
-           * runtime errors. Without this, a throw during the
-           * panel's render phase kills the JS thread in
-           * release / TestFlight.
-           */
-          /* @__PURE__ */ jsx(MicErrorBoundary, { onCancel: handleRecorderCancel, onError: handleRecorderError, children: /* @__PURE__ */ jsx(AudioRecorderPanel, { isDark, onTranscriptionComplete: handleTranscriptionComplete, onCancel: handleRecorderCancel, onError: handleRecorderError }) })
-        ) : /* @__PURE__ */ jsx(InputToolBar, { inputConfig, leftItems, rightItems, templateButton, templateModalConfig, micSendButton })
+        showAudioRecorder ? /* @__PURE__ */ jsx(MicErrorBoundary, { onCancel: handleRecorderCancel, onError: handleRecorderError, children: /* @__PURE__ */ jsx(AudioRecorderPanel, { isDark, onTranscriptionComplete: handleTranscriptionComplete, onCancel: handleRecorderCancel, onError: handleRecorderError }) }) : /* @__PURE__ */ jsx(InputToolBar, { inputConfig, leftItems, rightItems, templateButton, templateModalConfig, templateModalRender: renderTemplateModal, micSendButton }),
+        isBuildMode ? /* @__PURE__ */ jsx(BuildTemplatesSection, { enabled: true, compact: keyboardHeight > 0, group: selectedTemplateGroup, orgName: effectiveOrgName, isDark, primaryTextColor, secondaryTextColor, selectedTemplateId: (_e = selectedBuildTemplate == null ? void 0 : selectedBuildTemplate.id) != null ? _e : null, onUseTemplate: handleUseBuildTemplate }) : null
       ] }) })
     ] }) })
   ] });
 }
 const styles = StyleSheet.create({
-  emptyCenterTitleWrap: {
-    flexGrow: 1,
+  emptyWrap: {
+    flex: 1,
     alignItems: "center",
-    justifyContent: "flex-start",
-    paddingHorizontal: 24,
-    paddingTop: 88,
-    paddingBottom: 160,
-    maxWidth: 520,
-    width: "100%",
-    alignSelf: "center"
-  },
-  emptyEyebrow: {
-    fontSize: 12,
-    fontWeight: "600",
-    letterSpacing: 0.4,
-    textTransform: "uppercase",
-    marginBottom: 10
+    justifyContent: "center",
+    paddingHorizontal: 28,
+    width: "100%"
   },
   emptyCenterTitle: {
-    marginTop: 2,
-    fontSize: 30,
+    fontSize: 28,
     fontWeight: "700",
     textAlign: "center",
     letterSpacing: -0.5
   },
   emptySubtitle: {
-    marginTop: 12,
-    fontSize: 14,
+    marginTop: 8,
+    fontSize: 15,
     lineHeight: 22,
     textAlign: "center",
-    paddingHorizontal: 16,
-    maxWidth: 360
+    maxWidth: 320
   },
-  bottomComposerWrap: {
-    position: "absolute",
+  composerDock: {
     width: "100%",
-    left: 0,
-    right: 0,
-    bottom: 0,
-    alignItems: "center",
-    justifyContent: "flex-end",
-    shadowColor: "#0f172a",
-    shadowOpacity: 0.08,
-    shadowRadius: 8,
-    shadowOffset: {
-      width: 0,
-      height: -2
-    },
-    backgroundColor: "transparent",
-    elevation: 6
+    alignItems: "center"
   },
-  bottomComposerInner: {
+  composerInner: {
     paddingHorizontal: 14,
-    paddingTop: 10,
-    paddingBottom: 4
+    paddingTop: 4
   },
   voiceErrorBanner: {
     marginBottom: 8,
@@ -534,45 +467,6 @@ const styles = StyleSheet.create({
   voiceErrorText: {
     fontSize: 12,
     fontWeight: "500"
-  },
-  emptyModePillRow: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: 8,
-    marginBottom: 22,
-    borderRadius: 16,
-    padding: 6,
-    borderWidth: 1,
-    shadowColor: "#312e81",
-    shadowOpacity: 0.08,
-    shadowRadius: 8,
-    shadowOffset: {
-      width: 0,
-      height: 3
-    },
-    elevation: 3
-  },
-  emptyModePill: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: 4,
-    paddingHorizontal: 12,
-    paddingVertical: 7,
-    borderRadius: 11
-  },
-  emptyModePillActive: {
-    shadowColor: "#312e81",
-    shadowOpacity: 0.18,
-    shadowRadius: 6,
-    shadowOffset: {
-      width: 0,
-      height: 2
-    },
-    elevation: 2
-  },
-  emptyModePillLabel: {
-    fontSize: 12,
-    fontWeight: "600"
   }
 });
 const HomeScreen = (props) => /* @__PURE__ */ jsx(HomeScreenContent, __spreadValues({}, props));export{HomeScreen as default};//# sourceMappingURL=HomeScreen.js.map