@procore/saved-views 5.1.0-alpha.2 → 5.1.0-alpha.4

package/dist/legacy/index.js

@@ -14697,7 +14697,7 @@ var ViewStorage = {
 var getUpdatedSearchParams = (currentParams, view) => {
   const updatedParams = new URLSearchParams(currentParams);
   if (view.id === "default") {
-    updatedParams.delete("saved-view");
+    updatedParams.set("saved-view", "default");
   } else if (view.id === "temporary") {
     updatedParams.set("saved-view", "temporary");
   } else {
@@ -14712,6 +14712,7 @@ var useViewSelection = (config, savedViews, openSharedViewModal) => {
   const storageKey = `${config.domain}_${config.tableName}_${config.stickyViewsKey}_${config.projectId}_${config.userId}`;
   const temporaryStorageKey = `${storageKey}_temporary`;
   const [searchParams, setSearchParams] = (0, import_react_router_dom.useSearchParams)();
+  const previousSavedViewParamRef = (0, import_react13.useRef)(null);
   const [selectedSavedView, setSelectedSavedView] = (0, import_react13.useState)(() => {
     const stored = ViewStorage.load(storageKey);
     return stored ?? config.defaultView;
@@ -14730,7 +14731,9 @@ var useViewSelection = (config, savedViews, openSharedViewModal) => {
   const updateUrlForView = (0, import_react13.useCallback)(
     (view) => {
       setSearchParams(
-        (currentParams) => getUpdatedSearchParams(currentParams, view),
+        (currentParams) => {
+          return getUpdatedSearchParams(currentParams, view);
+        },
         { replace: true }
       );
     },
@@ -14776,35 +14779,45 @@ var useViewSelection = (config, savedViews, openSharedViewModal) => {
       if (isViewAlreadySelected(viewId)) {
         return;
       }
-      openSharedViewModal(viewId);
+      const viewInList = allViews.find((view) => view.share_token === viewId);
+      if (viewInList) {
+        selectView(viewInList);
+      } else {
+        openSharedViewModal(viewId);
+      }
     },
-    [isViewAlreadySelected, openSharedViewModal]
+    [isViewAlreadySelected, openSharedViewModal, allViews, selectView]
   );
-  const handleListViewFromUrl = (0, import_react13.useCallback)(() => {
-    if (config.defaultView.id !== (selectedSavedView == null ? void 0 : selectedSavedView.id)) {
-      selectView(config.defaultView);
-    }
-  }, [config.defaultView, selectedSavedView, selectView]);
   (0, import_react13.useEffect)(() => {
     if (!allViews.length)
       return;
     const savedViewId = searchParams.get("saved-view");
-    const viewParamFromConsumer = searchParams.get("view");
     if (savedViewId) {
       handleSavedViewFromUrl(savedViewId);
-      return;
-    }
-    if (viewParamFromConsumer === "list") {
-      handleListViewFromUrl();
     }
   }, [
-    searchParams,
+    searchParams.get("saved-view"),
     savedViews,
     temporaryView,
     handleSavedViewFromUrl,
-    handleListViewFromUrl,
     allViews.length
   ]);
+  (0, import_react13.useEffect)(() => {
+    const currentSavedViewParam = searchParams.get("saved-view");
+    if (previousSavedViewParamRef.current && !currentSavedViewParam) {
+      setSearchParams(
+        (currentParams) => {
+          const updatedParams = new URLSearchParams(currentParams);
+          updatedParams.set("saved-view", previousSavedViewParamRef.current);
+          return updatedParams;
+        },
+        { replace: true }
+      );
+    }
+    if (currentSavedViewParam) {
+      previousSavedViewParamRef.current = currentSavedViewParam;
+    }
+  }, [searchParams.get("saved-view"), setSearchParams]);
   return {
     selectedView: selectedSavedView,
     selectView,
@@ -14825,7 +14838,6 @@ var SavedViewsContent = (props) => {
   const queryInput = {
     domain: props.domain,
     tableName: props.tableName,
-    enableSavedViews: props.enableSavedViews,
     projectId,
     companyId
   };
@@ -15174,6 +15186,7 @@ var DataTableSavedViews = (0, import_react17.forwardRef)((props, ref) => {
         )
       };
       updateTableConfig(updatedView, tableApi, "data-table");
+      setInternalTableConfig(updatedView.table_config);
       return updatedView;
     },
     [defaultView, tableApi]

package/dist/legacy/index.mjs

@@ -14719,7 +14719,7 @@ var SharedViewFormModal = ({
 };
 
 // src/utils/Hooks/useViewSelection.ts
-import { useState as useState4, useCallback as useCallback2, useEffect as useEffect3 } from "react";
+import { useState as useState4, useCallback as useCallback2, useEffect as useEffect3, useRef as useRef2 } from "react";
 import { useSearchParams } from "react-router-dom";
 
 // src/utils/viewStorage.ts
@@ -14744,7 +14744,7 @@ var ViewStorage = {
 var getUpdatedSearchParams = (currentParams, view) => {
   const updatedParams = new URLSearchParams(currentParams);
   if (view.id === "default") {
-    updatedParams.delete("saved-view");
+    updatedParams.set("saved-view", "default");
   } else if (view.id === "temporary") {
     updatedParams.set("saved-view", "temporary");
   } else {
@@ -14759,6 +14759,7 @@ var useViewSelection = (config, savedViews, openSharedViewModal) => {
   const storageKey = `${config.domain}_${config.tableName}_${config.stickyViewsKey}_${config.projectId}_${config.userId}`;
   const temporaryStorageKey = `${storageKey}_temporary`;
   const [searchParams, setSearchParams] = useSearchParams();
+  const previousSavedViewParamRef = useRef2(null);
   const [selectedSavedView, setSelectedSavedView] = useState4(() => {
     const stored = ViewStorage.load(storageKey);
     return stored ?? config.defaultView;
@@ -14777,7 +14778,9 @@ var useViewSelection = (config, savedViews, openSharedViewModal) => {
   const updateUrlForView = useCallback2(
     (view) => {
       setSearchParams(
-        (currentParams) => getUpdatedSearchParams(currentParams, view),
+        (currentParams) => {
+          return getUpdatedSearchParams(currentParams, view);
+        },
         { replace: true }
       );
     },
@@ -14823,35 +14826,45 @@ var useViewSelection = (config, savedViews, openSharedViewModal) => {
       if (isViewAlreadySelected(viewId)) {
         return;
       }
-      openSharedViewModal(viewId);
+      const viewInList = allViews.find((view) => view.share_token === viewId);
+      if (viewInList) {
+        selectView(viewInList);
+      } else {
+        openSharedViewModal(viewId);
+      }
     },
-    [isViewAlreadySelected, openSharedViewModal]
+    [isViewAlreadySelected, openSharedViewModal, allViews, selectView]
   );
-  const handleListViewFromUrl = useCallback2(() => {
-    if (config.defaultView.id !== (selectedSavedView == null ? void 0 : selectedSavedView.id)) {
-      selectView(config.defaultView);
-    }
-  }, [config.defaultView, selectedSavedView, selectView]);
   useEffect3(() => {
     if (!allViews.length)
       return;
     const savedViewId = searchParams.get("saved-view");
-    const viewParamFromConsumer = searchParams.get("view");
     if (savedViewId) {
       handleSavedViewFromUrl(savedViewId);
-      return;
-    }
-    if (viewParamFromConsumer === "list") {
-      handleListViewFromUrl();
     }
   }, [
-    searchParams,
+    searchParams.get("saved-view"),
     savedViews,
     temporaryView,
     handleSavedViewFromUrl,
-    handleListViewFromUrl,
     allViews.length
   ]);
+  useEffect3(() => {
+    const currentSavedViewParam = searchParams.get("saved-view");
+    if (previousSavedViewParamRef.current && !currentSavedViewParam) {
+      setSearchParams(
+        (currentParams) => {
+          const updatedParams = new URLSearchParams(currentParams);
+          updatedParams.set("saved-view", previousSavedViewParamRef.current);
+          return updatedParams;
+        },
+        { replace: true }
+      );
+    }
+    if (currentSavedViewParam) {
+      previousSavedViewParamRef.current = currentSavedViewParam;
+    }
+  }, [searchParams.get("saved-view"), setSearchParams]);
   return {
     selectedView: selectedSavedView,
     selectView,
@@ -14872,7 +14885,6 @@ var SavedViewsContent = (props) => {
   const queryInput = {
     domain: props.domain,
     tableName: props.tableName,
-    enableSavedViews: props.enableSavedViews,
     projectId,
     companyId
   };
@@ -15226,6 +15238,7 @@ var DataTableSavedViews = forwardRef11((props, ref) => {
         )
       };
       updateTableConfig(updatedView, tableApi, "data-table");
+      setInternalTableConfig(updatedView.table_config);
       return updatedView;
     },
     [defaultView, tableApi]

package/dist/modern/index.js

@@ -14692,7 +14692,7 @@ var ViewStorage = {
 var getUpdatedSearchParams = (currentParams, view) => {
   const updatedParams = new URLSearchParams(currentParams);
   if (view.id === "default") {
-    updatedParams.delete("saved-view");
+    updatedParams.set("saved-view", "default");
   } else if (view.id === "temporary") {
     updatedParams.set("saved-view", "temporary");
   } else {
@@ -14707,6 +14707,7 @@ var useViewSelection = (config, savedViews, openSharedViewModal) => {
   const storageKey = `${config.domain}_${config.tableName}_${config.stickyViewsKey}_${config.projectId}_${config.userId}`;
   const temporaryStorageKey = `${storageKey}_temporary`;
   const [searchParams, setSearchParams] = (0, import_react_router_dom.useSearchParams)();
+  const previousSavedViewParamRef = (0, import_react13.useRef)(null);
   const [selectedSavedView, setSelectedSavedView] = (0, import_react13.useState)(() => {
     const stored = ViewStorage.load(storageKey);
     return stored ?? config.defaultView;
@@ -14725,7 +14726,9 @@ var useViewSelection = (config, savedViews, openSharedViewModal) => {
   const updateUrlForView = (0, import_react13.useCallback)(
     (view) => {
       setSearchParams(
-        (currentParams) => getUpdatedSearchParams(currentParams, view),
+        (currentParams) => {
+          return getUpdatedSearchParams(currentParams, view);
+        },
         { replace: true }
       );
     },
@@ -14771,35 +14774,45 @@ var useViewSelection = (config, savedViews, openSharedViewModal) => {
       if (isViewAlreadySelected(viewId)) {
         return;
       }
-      openSharedViewModal(viewId);
+      const viewInList = allViews.find((view) => view.share_token === viewId);
+      if (viewInList) {
+        selectView(viewInList);
+      } else {
+        openSharedViewModal(viewId);
+      }
     },
-    [isViewAlreadySelected, openSharedViewModal]
+    [isViewAlreadySelected, openSharedViewModal, allViews, selectView]
   );
-  const handleListViewFromUrl = (0, import_react13.useCallback)(() => {
-    if (config.defaultView.id !== selectedSavedView?.id) {
-      selectView(config.defaultView);
-    }
-  }, [config.defaultView, selectedSavedView, selectView]);
   (0, import_react13.useEffect)(() => {
     if (!allViews.length)
       return;
     const savedViewId = searchParams.get("saved-view");
-    const viewParamFromConsumer = searchParams.get("view");
     if (savedViewId) {
       handleSavedViewFromUrl(savedViewId);
-      return;
-    }
-    if (viewParamFromConsumer === "list") {
-      handleListViewFromUrl();
     }
   }, [
-    searchParams,
+    searchParams.get("saved-view"),
     savedViews,
     temporaryView,
     handleSavedViewFromUrl,
-    handleListViewFromUrl,
     allViews.length
   ]);
+  (0, import_react13.useEffect)(() => {
+    const currentSavedViewParam = searchParams.get("saved-view");
+    if (previousSavedViewParamRef.current && !currentSavedViewParam) {
+      setSearchParams(
+        (currentParams) => {
+          const updatedParams = new URLSearchParams(currentParams);
+          updatedParams.set("saved-view", previousSavedViewParamRef.current);
+          return updatedParams;
+        },
+        { replace: true }
+      );
+    }
+    if (currentSavedViewParam) {
+      previousSavedViewParamRef.current = currentSavedViewParam;
+    }
+  }, [searchParams.get("saved-view"), setSearchParams]);
   return {
     selectedView: selectedSavedView,
     selectView,
@@ -14820,7 +14833,6 @@ var SavedViewsContent = (props) => {
   const queryInput = {
     domain: props.domain,
     tableName: props.tableName,
-    enableSavedViews: props.enableSavedViews,
     projectId,
     companyId
   };
@@ -15168,6 +15180,7 @@ var DataTableSavedViews = (0, import_react17.forwardRef)((props, ref) => {
         )
       };
       updateTableConfig(updatedView, tableApi, "data-table");
+      setInternalTableConfig(updatedView.table_config);
       return updatedView;
     },
     [defaultView, tableApi]

package/dist/modern/index.mjs

@@ -14714,7 +14714,7 @@ var SharedViewFormModal = ({
 };
 
 // src/utils/Hooks/useViewSelection.ts
-import { useState as useState4, useCallback as useCallback2, useEffect as useEffect3 } from "react";
+import { useState as useState4, useCallback as useCallback2, useEffect as useEffect3, useRef as useRef2 } from "react";
 import { useSearchParams } from "react-router-dom";
 
 // src/utils/viewStorage.ts
@@ -14739,7 +14739,7 @@ var ViewStorage = {
 var getUpdatedSearchParams = (currentParams, view) => {
   const updatedParams = new URLSearchParams(currentParams);
   if (view.id === "default") {
-    updatedParams.delete("saved-view");
+    updatedParams.set("saved-view", "default");
   } else if (view.id === "temporary") {
     updatedParams.set("saved-view", "temporary");
   } else {
@@ -14754,6 +14754,7 @@ var useViewSelection = (config, savedViews, openSharedViewModal) => {
   const storageKey = `${config.domain}_${config.tableName}_${config.stickyViewsKey}_${config.projectId}_${config.userId}`;
   const temporaryStorageKey = `${storageKey}_temporary`;
   const [searchParams, setSearchParams] = useSearchParams();
+  const previousSavedViewParamRef = useRef2(null);
   const [selectedSavedView, setSelectedSavedView] = useState4(() => {
     const stored = ViewStorage.load(storageKey);
     return stored ?? config.defaultView;
@@ -14772,7 +14773,9 @@ var useViewSelection = (config, savedViews, openSharedViewModal) => {
   const updateUrlForView = useCallback2(
     (view) => {
       setSearchParams(
-        (currentParams) => getUpdatedSearchParams(currentParams, view),
+        (currentParams) => {
+          return getUpdatedSearchParams(currentParams, view);
+        },
         { replace: true }
       );
     },
@@ -14818,35 +14821,45 @@ var useViewSelection = (config, savedViews, openSharedViewModal) => {
       if (isViewAlreadySelected(viewId)) {
         return;
       }
-      openSharedViewModal(viewId);
+      const viewInList = allViews.find((view) => view.share_token === viewId);
+      if (viewInList) {
+        selectView(viewInList);
+      } else {
+        openSharedViewModal(viewId);
+      }
     },
-    [isViewAlreadySelected, openSharedViewModal]
+    [isViewAlreadySelected, openSharedViewModal, allViews, selectView]
   );
-  const handleListViewFromUrl = useCallback2(() => {
-    if (config.defaultView.id !== selectedSavedView?.id) {
-      selectView(config.defaultView);
-    }
-  }, [config.defaultView, selectedSavedView, selectView]);
   useEffect3(() => {
     if (!allViews.length)
       return;
     const savedViewId = searchParams.get("saved-view");
-    const viewParamFromConsumer = searchParams.get("view");
     if (savedViewId) {
       handleSavedViewFromUrl(savedViewId);
-      return;
-    }
-    if (viewParamFromConsumer === "list") {
-      handleListViewFromUrl();
     }
   }, [
-    searchParams,
+    searchParams.get("saved-view"),
     savedViews,
     temporaryView,
     handleSavedViewFromUrl,
-    handleListViewFromUrl,
     allViews.length
   ]);
+  useEffect3(() => {
+    const currentSavedViewParam = searchParams.get("saved-view");
+    if (previousSavedViewParamRef.current && !currentSavedViewParam) {
+      setSearchParams(
+        (currentParams) => {
+          const updatedParams = new URLSearchParams(currentParams);
+          updatedParams.set("saved-view", previousSavedViewParamRef.current);
+          return updatedParams;
+        },
+        { replace: true }
+      );
+    }
+    if (currentSavedViewParam) {
+      previousSavedViewParamRef.current = currentSavedViewParam;
+    }
+  }, [searchParams.get("saved-view"), setSearchParams]);
   return {
     selectedView: selectedSavedView,
     selectView,
@@ -14867,7 +14880,6 @@ var SavedViewsContent = (props) => {
   const queryInput = {
     domain: props.domain,
     tableName: props.tableName,
-    enableSavedViews: props.enableSavedViews,
     projectId,
     companyId
   };
@@ -15220,6 +15232,7 @@ var DataTableSavedViews = forwardRef11((props, ref) => {
         )
       };
       updateTableConfig(updatedView, tableApi, "data-table");
+      setInternalTableConfig(updatedView.table_config);
       return updatedView;
     },
     [defaultView, tableApi]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@procore/saved-views",
-  "version": "5.1.0-alpha.2",
+  "version": "5.1.0-alpha.4",
   "description": "Saved Views Component for Data Table",
   "author": "Procore Technologies, Inc",
   "repository": {