@tap-payments/os-micro-frontend-shared 0.1.438-test.5 → 0.1.438-test.7

package/build/components/TableHeader/TableView/hooks/useCustomTableViews.js

@@ -13,6 +13,8 @@ import { handleTemplateUpdate, mapColumnsToLayoutSection, convertTemplateToColum
 export function useCustomTableViews({ templates, setTemplates, createTemplate, updateTemplate, deleteTemplate, tableMode, lang = 'en', columnModifiers, }) {
     const [selectedTemplateId, setSelectedTemplateId] = useState(undefined);
     const defaultTemplate = useMemo(() => { var _a; return (_a = templates.find((t) => t.default)) !== null && _a !== void 0 ? _a : templates[0]; }, [templates]);
+    const getModeAliases = useCallback((mode) => (mode === 'sheet' ? ['sheet', 'sheets'] : ['advanced', 'default']), []);
+    const getOppositeModeCode = useCallback((mode) => (mode === 'sheet' ? 'Advanced' : 'Sheet'), []);
     const createRequiredColumn = useCallback((code, sortOrder) => {
         const label = code === 'date' ? 'Date' : 'Index';
         return {
@@ -95,15 +97,23 @@ export function useCustomTableViews({ templates, setTemplates, createTemplate, u
         }
     }, [templates, defaultTemplate, selectedTemplateId]);
     const onCreateCustomView = useCallback(({ name, layout }) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const created = yield createTemplate({ name, layout: [layout] });
         if (created) {
-            const normalized = handleTemplateUpdate(created);
+            const normalized = handleTemplateUpdate(Object.assign(Object.assign({}, created), { layout: [
+                    ...((_a = created.layout) !== null && _a !== void 0 ? _a : []),
+                    // Ensure the other mode does not inherit default columns.
+                    { code: getOppositeModeCode(tableMode), columns: [] },
+                ].filter((section, index, all) => {
+                    var _a;
+                    const code = (_a = section.code) === null || _a === void 0 ? void 0 : _a.toLowerCase();
+                    return all.findIndex((item) => { var _a; return ((_a = item.code) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === code; }) === index;
+                }) }));
             setTemplates((prev) => [...prev, normalized]);
             setSelectedTemplateId(normalized.id);
-            return { id: created.id, name: (_a = created.name) !== null && _a !== void 0 ? _a : '' };
+            return { id: created.id, name: (_b = created.name) !== null && _b !== void 0 ? _b : '' };
         }
-    }), [createTemplate, setTemplates]);
+    }), [createTemplate, setTemplates, tableMode, getOppositeModeCode]);
     const onDeleteCustomView = useCallback((templateId) => __awaiter(this, void 0, void 0, function* () {
         yield deleteTemplate(templateId);
         setTemplates((prev) => prev.filter((t) => !isTemplateMatchingId(t, templateId)));
@@ -149,13 +159,15 @@ export function useCustomTableViews({ templates, setTemplates, createTemplate, u
         setSelectedTemplateId((_a = matchingTemplate === null || matchingTemplate === void 0 ? void 0 : matchingTemplate.id) !== null && _a !== void 0 ? _a : defaultTemplate.id);
     }, [templates, defaultTemplate]);
     const columnsViewData = useMemo(() => {
-        var _a;
+        var _a, _b, _c;
         const selectedTemplate = (_a = templates.find((t) => (selectedTemplateId ? isTemplateMatchingId(t, selectedTemplateId) : false))) !== null && _a !== void 0 ? _a : defaultTemplate;
         let templateColumnsView = [];
+        const hasSelectedModeLayoutSection = (_c = (_b = selectedTemplate === null || selectedTemplate === void 0 ? void 0 : selectedTemplate.layout) === null || _b === void 0 ? void 0 : _b.some((section) => { var _a, _b; return getModeAliases(tableMode).includes((_b = (_a = section.code) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== null && _b !== void 0 ? _b : ''); })) !== null && _c !== void 0 ? _c : false;
         if (selectedTemplate) {
             templateColumnsView = convertTemplateToColumnsView(selectedTemplate, tableMode);
         }
-        if (templateColumnsView.length === 0 && (templates === null || templates === void 0 ? void 0 : templates.length) > 0) {
+        // Fallback to default template only when selected template has no layout for this mode.
+        if (templateColumnsView.length === 0 && (templates === null || templates === void 0 ? void 0 : templates.length) > 0 && !hasSelectedModeLayoutSection) {
             templateColumnsView = convertTemplatesToColumnsView(templates, tableMode);
         }
         if (templateColumnsView.length === 0) {
@@ -173,7 +185,7 @@ export function useCustomTableViews({ templates, setTemplates, createTemplate, u
             return normalizeMandatoryColumns(result, tableMode);
         }
         return normalizeMandatoryColumns(templateColumnsView, tableMode);
-    }, [tableMode, templates, selectedTemplateId, defaultTemplate, columnModifiers, normalizeMandatoryColumns]);
+    }, [tableMode, templates, selectedTemplateId, defaultTemplate, columnModifiers, normalizeMandatoryColumns, getModeAliases]);
     return {
         customViews,
         onViewChange,

package/build/components/TableHeader/TableView/hooks/useViewsMenu.js

@@ -98,16 +98,26 @@ export const useViewsMenu = ({ mode, onViewChange, onCreateCustomView, onEditCus
         setAnchorEl(null);
     }, []);
     const handleOpenEditDialog = useCallback((view) => {
-        setEditingView(view);
+        var _a;
+        const latestView = (_a = allTemplates.find((templateView) => templateView.id === view.id)) !== null && _a !== void 0 ? _a : view;
+        setEditingView(latestView);
         setShouldUseCurrentState(true);
         setIsCreateDialogOpen(true);
-    }, []);
+    }, [allTemplates]);
     const handleCloseCreateDialog = useCallback(() => {
         setIsCreateDialogOpen(false);
         setEditingView(null);
         setShouldUseCurrentState(false);
         setInitialColumnsForCreate(null);
     }, []);
+    useEffect(() => {
+        if (!isCreateDialogOpen || !(editingView === null || editingView === void 0 ? void 0 : editingView.id))
+            return;
+        const latestEditingView = allTemplates.find((view) => view.id === editingView.id);
+        if (latestEditingView) {
+            setEditingView(latestEditingView);
+        }
+    }, [isCreateDialogOpen, editingView === null || editingView === void 0 ? void 0 : editingView.id, allTemplates]);
     const handleSaveView = useCallback((data) => __awaiter(void 0, void 0, void 0, function* () {
         if (editingView) {
             const viewId = editingView.id;

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@tap-payments/os-micro-frontend-shared",
   "description": "Shared components and utilities for Tap Payments micro frontends",
-  "version": "0.1.438-test.5",
-  "testVersion": 5,
+  "version": "0.1.438-test.7",
+  "testVersion": 7,
   "type": "module",
   "main": "build/index.js",
   "module": "build/index.js",