@tap-payments/os-micro-frontend-shared 0.1.438-test.4 → 0.1.438-test.6

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

@@ -80,34 +80,6 @@ export function useCustomTableViews({ templates, setTemplates, createTemplate, u
         const orderedColumns = mode === 'sheet' ? [indexColumn, dateColumn, ...restColumns] : [dateColumn, ...restColumns];
         return orderedColumns.filter((column) => Boolean(column));
     }, [createRequiredColumn]);
-    const alignCreatedTemplateToCurrentMode = useCallback((createdTemplate) => {
-        var _a, _b, _c, _d;
-        const normalized = handleTemplateUpdate(createdTemplate);
-        const selectedModeCode = tableMode === 'sheet' ? 'sheet' : 'advanced';
-        const otherModeCode = tableMode === 'sheet' ? 'advanced' : 'sheet';
-        const selectedModeLayout = (_a = normalized.layout) === null || _a === void 0 ? void 0 : _a.find((section) => {
-            var _a;
-            const code = (_a = section.code) === null || _a === void 0 ? void 0 : _a.toLowerCase();
-            if (selectedModeCode === 'advanced')
-                return code === 'advanced' || code === 'default';
-            return code === 'sheet' || code === 'sheets';
-        });
-        const defaultOtherModeLayout = (_b = defaultTemplate === null || defaultTemplate === void 0 ? void 0 : defaultTemplate.layout) === null || _b === void 0 ? void 0 : _b.find((section) => {
-            var _a;
-            const code = (_a = section.code) === null || _a === void 0 ? void 0 : _a.toLowerCase();
-            if (otherModeCode === 'advanced')
-                return code === 'advanced' || code === 'default';
-            return code === 'sheet' || code === 'sheets';
-        });
-        const nextLayout = [];
-        if (selectedModeLayout) {
-            nextLayout.push(Object.assign(Object.assign({}, selectedModeLayout), { columns: [...((_c = selectedModeLayout.columns) !== null && _c !== void 0 ? _c : [])] }));
-        }
-        if (defaultOtherModeLayout) {
-            nextLayout.push(Object.assign(Object.assign({}, defaultOtherModeLayout), { columns: [...((_d = defaultOtherModeLayout.columns) !== null && _d !== void 0 ? _d : [])] }));
-        }
-        return nextLayout.length > 0 ? Object.assign(Object.assign({}, normalized), { layout: nextLayout }) : normalized;
-    }, [tableMode, defaultTemplate]);
     useEffect(() => {
         if (!defaultTemplate) {
             setSelectedTemplateId(undefined);
@@ -126,12 +98,12 @@ export function useCustomTableViews({ templates, setTemplates, createTemplate, u
         var _a;
         const created = yield createTemplate({ name, layout: [layout] });
         if (created) {
-            const normalized = alignCreatedTemplateToCurrentMode(created);
+            const normalized = handleTemplateUpdate(created);
             setTemplates((prev) => [...prev, normalized]);
             setSelectedTemplateId(normalized.id);
             return { id: created.id, name: (_a = created.name) !== null && _a !== void 0 ? _a : '' };
         }
-    }), [createTemplate, setTemplates, alignCreatedTemplateToCurrentMode]);
+    }), [createTemplate, setTemplates]);
     const onDeleteCustomView = useCallback((templateId) => __awaiter(this, void 0, void 0, function* () {
         yield deleteTemplate(templateId);
         setTemplates((prev) => prev.filter((t) => !isTemplateMatchingId(t, templateId)));
@@ -149,15 +121,9 @@ export function useCustomTableViews({ templates, setTemplates, createTemplate, u
     const onEditCustomView = useCallback((viewId, data) => __awaiter(this, void 0, void 0, function* () {
         const template = templates.find((t) => isTemplateMatchingId(t, viewId));
         const { name, layout } = updateCurrentTemplate(template, data);
-        const optimisticTemplate = template ? Object.assign(Object.assign({}, template), { name, layout }) : undefined;
-        if (optimisticTemplate) {
-            const optimisticNormalized = handleTemplateUpdate(optimisticTemplate);
-            setTemplates((prev) => replaceTemplateInList(prev, (t) => isTemplateMatchingId(t, viewId), optimisticNormalized));
-        }
         const updated = yield updateTemplate(viewId, { name, layout });
-        const candidateTemplate = updated !== null && updated !== void 0 ? updated : optimisticTemplate;
-        if (candidateTemplate) {
-            const normalized = handleTemplateUpdate(candidateTemplate);
+        if (updated) {
+            const normalized = handleTemplateUpdate(updated);
             setTemplates((prev) => replaceTemplateInList(prev, (t) => isTemplateMatchingId(t, viewId), normalized));
             setSelectedTemplateId(normalized.id);
         }
@@ -195,7 +161,6 @@ export function useCustomTableViews({ templates, setTemplates, createTemplate, u
         if (templateColumnsView.length === 0) {
             return [];
         }
-        templateColumnsView = normalizeMandatoryColumns(templateColumnsView, tableMode);
         if (columnModifiers === null || columnModifiers === void 0 ? void 0 : columnModifiers.length) {
             let result = templateColumnsView;
             for (const mod of columnModifiers) {
@@ -205,9 +170,9 @@ export function useCustomTableViews({ templates, setTemplates, createTemplate, u
                     selected: mod.selected,
                 });
             }
-            return result;
+            return normalizeMandatoryColumns(result, tableMode);
         }
-        return templateColumnsView;
+        return normalizeMandatoryColumns(templateColumnsView, tableMode);
     }, [tableMode, templates, selectedTemplateId, defaultTemplate, columnModifiers, normalizeMandatoryColumns]);
     return {
         customViews,

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.4",
-  "testVersion": 4,
+  "version": "0.1.438-test.6",
+  "testVersion": 6,
   "type": "module",
   "main": "build/index.js",
   "module": "build/index.js",