@open-mercato/ui 0.7.1-develop.7186.1.6e080a5017 → 0.7.1-develop.7193.1.910a5b0a1e

package/dist/backend/DataTable.js

@@ -161,13 +161,17 @@ function collectUniqueById(entries, warningScope) {
   }
   return Array.from(byId.values());
 }
-function resolveExportSections(config) {
+const DEFAULT_VIEW_EXPORT_TITLE = "Export what you view";
+const DEFAULT_FULL_EXPORT_TITLE = "Full data export";
+function resolveExportSections(config, t) {
   if (!config) return [];
   const sections = [];
   const baseFormats = config.formats && config.formats.length > 0 ? config.formats : DEFAULT_EXPORT_FORMATS;
-  const addSection = (key, section, fallbackTitle) => {
+  const addSection = (key, section, fallbackTitle, fallbackFilenameBase) => {
     if (!section || !section.getUrl && !section.prepare) return;
-    const title = section.title?.trim().length ? section.title.trim() : fallbackTitle;
+    const explicitTitle = section.title?.trim().length ? section.title.trim() : null;
+    const title = explicitTitle ?? fallbackTitle;
+    const filenameBase = explicitTitle ?? fallbackFilenameBase;
     const seen = /* @__PURE__ */ new Set();
     const formatsSource = section.formats && section.formats.length > 0 ? section.formats : baseFormats;
     const formats = formatsSource.filter((format) => {
@@ -179,6 +183,7 @@ function resolveExportSections(config) {
     sections.push({
       key,
       title,
+      filenameBase,
       description: section.description,
       formats,
       getUrl: section.getUrl,
@@ -193,17 +198,19 @@ function resolveExportSections(config) {
     });
   };
   const hasExplicitSections = Array.isArray(config.sections) && config.sections.length > 0;
+  const viewTitle = t("ui.dataTable.export.viewTitle", DEFAULT_VIEW_EXPORT_TITLE);
   if (!config.view && !config.full && !hasExplicitSections && config.getUrl) {
-    addSection("view", { getUrl: config.getUrl, formats: config.formats }, "Export what you view");
+    addSection("view", { getUrl: config.getUrl, formats: config.formats }, viewTitle, DEFAULT_VIEW_EXPORT_TITLE);
   } else {
-    addSection("view", config.view, "Export what you view");
+    addSection("view", config.view, viewTitle, DEFAULT_VIEW_EXPORT_TITLE);
   }
   if (hasExplicitSections) {
     config.sections.forEach((section, idx) => {
-      addSection(`section-${idx}`, section, section.title?.trim().length ? section.title : `Export ${idx + 1}`);
+      const numberedTitle = t("ui.dataTable.export.sectionTitle", "Export {index}", { index: idx + 1 });
+      addSection(`section-${idx}`, section, numberedTitle, `Export ${idx + 1}`);
     });
   }
-  addSection("full", config.full, "Full data export");
+  addSection("full", config.full, t("ui.dataTable.export.fullTitle", DEFAULT_FULL_EXPORT_TITLE), DEFAULT_FULL_EXPORT_TITLE);
   return sections;
 }
 const COLUMN_MIN_WIDTH = 60;
@@ -426,7 +433,7 @@ function ExportMenu({ config, sections }) {
         if (!preparedResult) return;
         const prepared = preparedResult.prepared;
         const serialized = serializeExport(prepared, format);
-        const filename = preparedResult.filename ?? section.filename?.(format) ?? config.filename?.(format) ?? defaultExportFilename(section.title, format);
+        const filename = preparedResult.filename ?? section.filename?.(format) ?? config.filename?.(format) ?? defaultExportFilename(section.filenameBase, format);
         if (typeof window !== "undefined") {
           const blob = new Blob([serialized.body], { type: serialized.contentType });
           const href = URL.createObjectURL(blob);
@@ -831,6 +838,8 @@ function DataTable({
   const perspectiveEnabled = Boolean(perspectiveTableId);
   const initialSnapshotRef = React.useRef(null);
   const snapshotHydratedTableRef = React.useRef(null);
+  const serverReconciledTableRef = React.useRef(null);
+  const hydratedSnapshotRef = React.useRef(null);
   const initialSettingsSource = perspectiveConfig?.initialState?.initialSettings ?? null;
   const mergedInitialSettings = React.useMemo(
     () => sanitizePerspectiveSettings(initialSettingsSource),
@@ -1399,6 +1408,7 @@ function DataTable({
     const snapshot = readPerspectiveSnapshot(perspectiveTableId);
     if (!snapshot) return;
     initialSnapshotRef.current = snapshot;
+    hydratedSnapshotRef.current = snapshot;
     const preserveAdvancedFilter = !!advancedFilter?.onApplyTree;
     applyPerspectiveSettings(
       snapshot.settings,
@@ -1818,14 +1828,42 @@ function DataTable({
   React.useLayoutEffect(() => {
     if (!canUsePerspectives) return;
     if (!perspectiveTableId) return;
-    if (initialSnapshotRef.current) return;
-    if (initialPerspectiveAppliedRef.current) return;
     const source = perspectiveData ?? perspectiveConfig?.initialState?.response;
     if (!source) return;
+    let orphanedSnapshotDropped = false;
     const tryResolve = (id) => {
       if (!id) return void 0;
       return source.perspectives.find((p) => p.id === id) ?? source.rolePerspectives.find((p) => p.id === id);
     };
+    if (initialSnapshotRef.current || initialPerspectiveAppliedRef.current) {
+      if (serverReconciledTableRef.current === perspectiveTableId) return;
+      serverReconciledTableRef.current = perspectiveTableId;
+      const hydrated = hydratedSnapshotRef.current;
+      const snapshot = hydrated && (!activePerspectiveId || activePerspectiveId === hydrated.perspectiveId) ? hydrated : null;
+      const localId = snapshot?.perspectiveId ?? activePerspectiveId;
+      if (!localId) return;
+      const local = tryResolve(localId);
+      if (local) {
+        const serverUpdatedAt = local.updatedAt ? Date.parse(local.updatedAt) : NaN;
+        const serverIsNewer = snapshot != null && Number.isFinite(serverUpdatedAt) && serverUpdatedAt > snapshot.updatedAt;
+        const settingsDiffer = snapshot != null && diffPerspectiveSettings(
+          sanitizePerspectiveSettings(local.settings) ?? {},
+          sanitizePerspectiveSettings(snapshot.settings) ?? {}
+        ).length > 0;
+        if (serverIsNewer && settingsDiffer) {
+          applyPerspectiveSettings(local.settings, local.id, {
+            preserveAdvancedFilter: !!advancedFilter?.onApplyTree
+          });
+          initialPerspectiveAppliedRef.current = true;
+        }
+        return;
+      }
+      writePerspectiveSnapshot(perspectiveTableId, null);
+      initialSnapshotRef.current = null;
+      hydratedSnapshotRef.current = null;
+      initialPerspectiveAppliedRef.current = false;
+      orphanedSnapshotDropped = true;
+    }
     let target;
     if (activePerspectiveId) {
       target = tryResolve(activePerspectiveId);
@@ -1842,10 +1880,18 @@ function DataTable({
       target = source.perspectives[0];
     }
     if (target) {
-      applyPerspectiveSettings(target.settings, target.id);
+      applyPerspectiveSettings(
+        target.settings,
+        target.id,
+        orphanedSnapshotDropped ? { preserveAdvancedFilter: !!advancedFilter?.onApplyTree } : void 0
+      );
+    } else if (orphanedSnapshotDropped) {
+      applyPerspectiveSettings({}, null, {
+        preserveAdvancedFilter: !!advancedFilter?.onApplyTree
+      });
     }
     initialPerspectiveAppliedRef.current = true;
-  }, [canUsePerspectives, perspectiveData, perspectiveTableId, perspectiveConfig, applyPerspectiveSettings, activePerspectiveId]);
+  }, [canUsePerspectives, perspectiveData, perspectiveTableId, perspectiveConfig, applyPerspectiveSettings, activePerspectiveId, advancedFilter?.onApplyTree]);
   const scrollTableIntoView = React.useCallback(() => {
     const rect = containerRef.current?.getBoundingClientRect();
     if (!rect || rect.top >= 0) return;
@@ -2367,7 +2413,7 @@ function DataTable({
   const hasActions = actions !== void 0 && actions !== null && actions !== false;
   const shouldReserveActionsSpace = actions === null || actions === false;
   const exportConfig = exporter === false ? null : exporter || null;
-  const resolvedExportSections = React.useMemo(() => resolveExportSections(exportConfig), [exportConfig]);
+  const resolvedExportSections = React.useMemo(() => resolveExportSections(exportConfig, t), [exportConfig, t]);
   const hasExport = resolvedExportSections.length > 0;
   const refreshButtonConfig = refreshButton;
   const hasRefreshButton = Boolean(refreshButtonConfig);