@procore/saved-views 5.1.0-alpha.5 → 5.1.0-alpha.6

package/dist/legacy/index.js

@@ -11881,7 +11881,9 @@ var PanelContent = (props) => {
   const { showToast } = (0, import_toast_alert2.useToastAlertContext)();
   const I18n = (0, import_core_react8.useI18nContext)();
   const { data: savedViewsFromQuery, error: savedViewsError } = useSavedViewsQuery(props.queryInput);
-  const { mutate: updateSavedView, isPending: isUpdateLoading } = useUpdateSavedView(queryInput);
+  const updateMutation = useUpdateSavedView(queryInput);
+  const { mutate: updateSavedView } = updateMutation;
+  const isUpdateLoading = "isPending" in updateMutation ? updateMutation.isPending : updateMutation.isLoading ?? false;
   const savedViews = props.savedViews ?? savedViewsFromQuery;
   const errorToastRef = import_react9.default.useRef(null);
   import_react9.default.useEffect(() => {
@@ -14710,9 +14712,6 @@ var SharedViewFormModal = ({
   );
 };
 
-// src/components/saved-views/SavedViews.tsx
-var import_toast_alert4 = require("@procore/toast-alert");
-
 // src/utils/hooks/useViewSelection.ts
 var import_react12 = require("react");
 var import_react_router_dom = require("react-router-dom");
@@ -14726,8 +14725,14 @@ var ViewStorage = {
   load(key, defaultView) {
     try {
       const stored = localStorage.getItem(key);
-      return stored ? JSON.parse(stored) : null;
-    } catch (e2) {
+      if (!stored)
+        return defaultView;
+      const parsed = JSON.parse(stored);
+      if (!parsed)
+        return defaultView;
+      const isTableConfigOnly = !parsed.id && !parsed.share_token;
+      return isTableConfigOnly ? { ...defaultView, table_config: parsed } : parsed;
+    } catch {
       return defaultView;
     }
   },
@@ -14772,7 +14777,7 @@ var restoreUrlParameter = (currentParam, previousParam, setSearchParams) => {
     );
   }
 };
-var useViewSelection = (config, savedViews, openSharedViewModal) => {
+var useViewSelection = (config, savedViews, presetViews, openSharedViewModal) => {
   const I18n = (0, import_core_react13.useI18nContext)();
   const storageKey = `savedView_${config.domain}_${config.tableName}_${config.companyId}_${config.projectId}_${config.userId}`;
   const temporaryStorageKey = `${storageKey}-temporary`;
@@ -14783,7 +14788,8 @@ var useViewSelection = (config, savedViews, openSharedViewModal) => {
     return stored ?? config.defaultView;
   });
   const [temporaryView, setTemporaryView] = (0, import_react12.useState)(() => {
-    return ViewStorage.load(temporaryStorageKey, config.defaultView);
+    const loaded = ViewStorage.load(temporaryStorageKey, config.defaultView);
+    return loaded && (loaded.id === "temporary" || loaded.view_level === "temporary") ? loaded : null;
   });
   const persistViewToStorageAndUrl = (0, import_react12.useCallback)(
     (view) => {
@@ -14792,7 +14798,10 @@ var useViewSelection = (config, savedViews, openSharedViewModal) => {
     },
     [storageKey, setSearchParams]
   );
-  const baseViews = savedViews ?? [];
+  const baseViews = (0, import_react12.useMemo)(
+    () => [...savedViews ?? [], ...presetViews ?? []],
+    [savedViews, presetViews]
+  );
   const allViews = (0, import_react12.useMemo)(
     () => temporaryView ? [...baseViews, temporaryView] : baseViews,
     [baseViews, temporaryView]
@@ -14804,7 +14813,7 @@ var useViewSelection = (config, savedViews, openSharedViewModal) => {
       persistViewToStorageAndUrl(viewToSelect);
       return viewToSelect;
     },
-    [config, persistViewToStorageAndUrl, temporaryView, temporaryStorageKey]
+    [config, persistViewToStorageAndUrl]
   );
   const createTemporaryView = (0, import_react12.useCallback)(
     (fetchedView) => {
@@ -14857,14 +14866,7 @@ var useViewSelection = (config, savedViews, openSharedViewModal) => {
     if (savedViewId && allViews.length > 0) {
       handleSavedViewFromUrl(savedViewId);
     }
-  }, [
-    searchParams,
-    savedViews,
-    temporaryView,
-    handleSavedViewFromUrl,
-    setSearchParams,
-    allViews.length
-  ]);
+  }, [searchParams, handleSavedViewFromUrl, allViews.length]);
   return {
     selectedView: selectedSavedView,
     selectView,
@@ -14923,6 +14925,7 @@ var SavedViewsContent = (props) => {
       onSelect: props.onSelect
     },
     savedViews,
+    props.presetViews,
     openSharedViewModal
   );
   const { data: fetchedView, isError: fetchError } = useFetchSavedViewById(
@@ -15061,7 +15064,7 @@ var SavedViewsContent = (props) => {
   ));
 };
 var SavedViews = (props) => {
-  return /* @__PURE__ */ import_react13.default.createElement(EnvironmentI18nProvider, null, /* @__PURE__ */ import_react13.default.createElement(import_react_query3.QueryClientProvider, { client: queryClient }, /* @__PURE__ */ import_react13.default.createElement(import_toast_alert4.ToastAlertProvider, null, /* @__PURE__ */ import_react13.default.createElement(SavedViewsContent, { ...props }))));
+  return /* @__PURE__ */ import_react13.default.createElement(EnvironmentI18nProvider, null, /* @__PURE__ */ import_react13.default.createElement(import_react_query3.QueryClientProvider, { client: queryClient }, /* @__PURE__ */ import_react13.default.createElement(import_toast_alert3.ToastAlertProvider, null, /* @__PURE__ */ import_react13.default.createElement(SavedViewsContent, { ...props }))));
 };
 
 // src/components/adapters/smart-grid/SmartGridSavedViews.tsx
@@ -15106,9 +15109,9 @@ var getColumnStateFromDefs = (columnDefs) => {
 var extractDefaultView = (gridApi, receivedConfig) => {
   var _a, _b;
   const columnDefs = gridApi.getColumnDefs() ?? [];
-  const defaultColumnState = getColumnStateFromDefs(columnDefs);
+  const defaultColumnState = ((_a = receivedConfig == null ? void 0 : receivedConfig.columnState) == null ? void 0 : _a.length) ? receivedConfig.columnState : getColumnStateFromDefs(columnDefs);
   const result = {
-    columnState: ((_a = receivedConfig == null ? void 0 : receivedConfig.columnState) == null ? void 0 : _a.length) ? receivedConfig.columnState : defaultColumnState,
+    columnState: defaultColumnState,
     columnGroupState: (receivedConfig == null ? void 0 : receivedConfig.columnGroupState) ?? [],
     rowGroupState: (receivedConfig == null ? void 0 : receivedConfig.rowGroupState) ?? [],
     filterState: (receivedConfig == null ? void 0 : receivedConfig.filterState) ?? {},
@@ -15276,7 +15279,6 @@ var useNormalizedDefaultViews2 = (defaultViews, columnDefinitions) => {
 
 // src/components/adapters/data-table/DataTableSavedViews.tsx
 var DataTableSavedViews = (0, import_react18.forwardRef)((props, ref) => {
-  var _a;
   const { tableApi, userId, projectId, companyId } = props;
   const presetViews = useNormalizedDefaultViews2(
     props.defaultViews,
@@ -15284,7 +15286,7 @@ var DataTableSavedViews = (0, import_react18.forwardRef)((props, ref) => {
   );
   const defaultView = presetViews.find((view) => view.id === "default") ?? presetViews[0];
   const [internalTableConfig, setInternalTableConfig] = (0, import_react18.useState)(
-    ((_a = ViewStorage.load(props.stickyViewsKey, defaultView)) == null ? void 0 : _a.table_config) ?? defaultView.table_config
+    ViewStorage.load(props.stickyViewsKey, defaultView).table_config
   );
   (0, import_react18.useImperativeHandle)(ref, () => ({
     setTableConfig: (newConfig) => {

package/dist/legacy/index.mjs

@@ -11888,7 +11888,9 @@ var PanelContent = (props) => {
   const { showToast } = useToastAlertContext2();
   const I18n = useI18nContext5();
   const { data: savedViewsFromQuery, error: savedViewsError } = useSavedViewsQuery(props.queryInput);
-  const { mutate: updateSavedView, isPending: isUpdateLoading } = useUpdateSavedView(queryInput);
+  const updateMutation = useUpdateSavedView(queryInput);
+  const { mutate: updateSavedView } = updateMutation;
+  const isUpdateLoading = "isPending" in updateMutation ? updateMutation.isPending : updateMutation.isLoading ?? false;
   const savedViews = props.savedViews ?? savedViewsFromQuery;
   const errorToastRef = React17.useRef(null);
   React17.useEffect(() => {
@@ -12015,7 +12017,7 @@ import {
 } from "@procore/core-react";
 import React22, { useState as useState4, useEffect as useEffect3, useCallback as useCallback3 } from "react";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { useToastAlertContext as useToastAlertContext3 } from "@procore/toast-alert";
+import { useToastAlertContext as useToastAlertContext3, ToastAlertProvider } from "@procore/toast-alert";
 
 // src/components/modals/DeleteConfirmationModal.tsx
 import {
@@ -14754,9 +14756,6 @@ var SharedViewFormModal = ({
   );
 };
 
-// src/components/saved-views/SavedViews.tsx
-import { ToastAlertProvider } from "@procore/toast-alert";
-
 // src/utils/hooks/useViewSelection.ts
 import { useState as useState3, useCallback as useCallback2, useEffect as useEffect2, useRef as useRef2, useMemo } from "react";
 import { useSearchParams } from "react-router-dom";
@@ -14770,8 +14769,14 @@ var ViewStorage = {
   load(key, defaultView) {
     try {
       const stored = localStorage.getItem(key);
-      return stored ? JSON.parse(stored) : null;
-    } catch (e2) {
+      if (!stored)
+        return defaultView;
+      const parsed = JSON.parse(stored);
+      if (!parsed)
+        return defaultView;
+      const isTableConfigOnly = !parsed.id && !parsed.share_token;
+      return isTableConfigOnly ? { ...defaultView, table_config: parsed } : parsed;
+    } catch {
       return defaultView;
     }
   },
@@ -14816,7 +14821,7 @@ var restoreUrlParameter = (currentParam, previousParam, setSearchParams) => {
     );
   }
 };
-var useViewSelection = (config, savedViews, openSharedViewModal) => {
+var useViewSelection = (config, savedViews, presetViews, openSharedViewModal) => {
   const I18n = useI18nContext10();
   const storageKey = `savedView_${config.domain}_${config.tableName}_${config.companyId}_${config.projectId}_${config.userId}`;
   const temporaryStorageKey = `${storageKey}-temporary`;
@@ -14827,7 +14832,8 @@ var useViewSelection = (config, savedViews, openSharedViewModal) => {
     return stored ?? config.defaultView;
   });
   const [temporaryView, setTemporaryView] = useState3(() => {
-    return ViewStorage.load(temporaryStorageKey, config.defaultView);
+    const loaded = ViewStorage.load(temporaryStorageKey, config.defaultView);
+    return loaded && (loaded.id === "temporary" || loaded.view_level === "temporary") ? loaded : null;
   });
   const persistViewToStorageAndUrl = useCallback2(
     (view) => {
@@ -14836,7 +14842,10 @@ var useViewSelection = (config, savedViews, openSharedViewModal) => {
     },
     [storageKey, setSearchParams]
   );
-  const baseViews = savedViews ?? [];
+  const baseViews = useMemo(
+    () => [...savedViews ?? [], ...presetViews ?? []],
+    [savedViews, presetViews]
+  );
   const allViews = useMemo(
     () => temporaryView ? [...baseViews, temporaryView] : baseViews,
     [baseViews, temporaryView]
@@ -14848,7 +14857,7 @@ var useViewSelection = (config, savedViews, openSharedViewModal) => {
       persistViewToStorageAndUrl(viewToSelect);
       return viewToSelect;
     },
-    [config, persistViewToStorageAndUrl, temporaryView, temporaryStorageKey]
+    [config, persistViewToStorageAndUrl]
   );
   const createTemporaryView = useCallback2(
     (fetchedView) => {
@@ -14901,14 +14910,7 @@ var useViewSelection = (config, savedViews, openSharedViewModal) => {
     if (savedViewId && allViews.length > 0) {
       handleSavedViewFromUrl(savedViewId);
     }
-  }, [
-    searchParams,
-    savedViews,
-    temporaryView,
-    handleSavedViewFromUrl,
-    setSearchParams,
-    allViews.length
-  ]);
+  }, [searchParams, handleSavedViewFromUrl, allViews.length]);
   return {
     selectedView: selectedSavedView,
     selectView,
@@ -14967,6 +14969,7 @@ var SavedViewsContent = (props) => {
       onSelect: props.onSelect
     },
     savedViews,
+    props.presetViews,
     openSharedViewModal
   );
   const { data: fetchedView, isError: fetchError } = useFetchSavedViewById(
@@ -15150,9 +15153,9 @@ var getColumnStateFromDefs = (columnDefs) => {
 var extractDefaultView = (gridApi, receivedConfig) => {
   var _a, _b;
   const columnDefs = gridApi.getColumnDefs() ?? [];
-  const defaultColumnState = getColumnStateFromDefs(columnDefs);
+  const defaultColumnState = ((_a = receivedConfig == null ? void 0 : receivedConfig.columnState) == null ? void 0 : _a.length) ? receivedConfig.columnState : getColumnStateFromDefs(columnDefs);
   const result = {
-    columnState: ((_a = receivedConfig == null ? void 0 : receivedConfig.columnState) == null ? void 0 : _a.length) ? receivedConfig.columnState : defaultColumnState,
+    columnState: defaultColumnState,
     columnGroupState: (receivedConfig == null ? void 0 : receivedConfig.columnGroupState) ?? [],
     rowGroupState: (receivedConfig == null ? void 0 : receivedConfig.rowGroupState) ?? [],
     filterState: (receivedConfig == null ? void 0 : receivedConfig.filterState) ?? {},
@@ -15325,7 +15328,6 @@ var useNormalizedDefaultViews2 = (defaultViews, columnDefinitions) => {
 
 // src/components/adapters/data-table/DataTableSavedViews.tsx
 var DataTableSavedViews = forwardRef11((props, ref) => {
-  var _a;
   const { tableApi, userId, projectId, companyId } = props;
   const presetViews = useNormalizedDefaultViews2(
     props.defaultViews,
@@ -15333,7 +15335,7 @@ var DataTableSavedViews = forwardRef11((props, ref) => {
   );
   const defaultView = presetViews.find((view) => view.id === "default") ?? presetViews[0];
   const [internalTableConfig, setInternalTableConfig] = useState6(
-    ((_a = ViewStorage.load(props.stickyViewsKey, defaultView)) == null ? void 0 : _a.table_config) ?? defaultView.table_config
+    ViewStorage.load(props.stickyViewsKey, defaultView).table_config
   );
   useImperativeHandle(ref, () => ({
     setTableConfig: (newConfig) => {

package/dist/modern/index.js

@@ -11878,7 +11878,9 @@ var PanelContent = (props) => {
   const { showToast } = (0, import_toast_alert2.useToastAlertContext)();
   const I18n = (0, import_core_react8.useI18nContext)();
   const { data: savedViewsFromQuery, error: savedViewsError } = useSavedViewsQuery(props.queryInput);
-  const { mutate: updateSavedView, isPending: isUpdateLoading } = useUpdateSavedView(queryInput);
+  const updateMutation = useUpdateSavedView(queryInput);
+  const { mutate: updateSavedView } = updateMutation;
+  const isUpdateLoading = "isPending" in updateMutation ? updateMutation.isPending : updateMutation.isLoading ?? false;
   const savedViews = props.savedViews ?? savedViewsFromQuery;
   const errorToastRef = import_react9.default.useRef(null);
   import_react9.default.useEffect(() => {
@@ -14707,9 +14709,6 @@ var SharedViewFormModal = ({
   );
 };
 
-// src/components/saved-views/SavedViews.tsx
-var import_toast_alert4 = require("@procore/toast-alert");
-
 // src/utils/hooks/useViewSelection.ts
 var import_react12 = require("react");
 var import_react_router_dom = require("react-router-dom");
@@ -14723,8 +14722,14 @@ var ViewStorage = {
   load(key, defaultView) {
     try {
       const stored = localStorage.getItem(key);
-      return stored ? JSON.parse(stored) : null;
-    } catch (e2) {
+      if (!stored)
+        return defaultView;
+      const parsed = JSON.parse(stored);
+      if (!parsed)
+        return defaultView;
+      const isTableConfigOnly = !parsed.id && !parsed.share_token;
+      return isTableConfigOnly ? { ...defaultView, table_config: parsed } : parsed;
+    } catch {
       return defaultView;
     }
   },
@@ -14769,7 +14774,7 @@ var restoreUrlParameter = (currentParam, previousParam, setSearchParams) => {
     );
   }
 };
-var useViewSelection = (config, savedViews, openSharedViewModal) => {
+var useViewSelection = (config, savedViews, presetViews, openSharedViewModal) => {
   const I18n = (0, import_core_react13.useI18nContext)();
   const storageKey = `savedView_${config.domain}_${config.tableName}_${config.companyId}_${config.projectId}_${config.userId}`;
   const temporaryStorageKey = `${storageKey}-temporary`;
@@ -14780,7 +14785,8 @@ var useViewSelection = (config, savedViews, openSharedViewModal) => {
     return stored ?? config.defaultView;
   });
   const [temporaryView, setTemporaryView] = (0, import_react12.useState)(() => {
-    return ViewStorage.load(temporaryStorageKey, config.defaultView);
+    const loaded = ViewStorage.load(temporaryStorageKey, config.defaultView);
+    return loaded && (loaded.id === "temporary" || loaded.view_level === "temporary") ? loaded : null;
   });
   const persistViewToStorageAndUrl = (0, import_react12.useCallback)(
     (view) => {
@@ -14789,7 +14795,10 @@ var useViewSelection = (config, savedViews, openSharedViewModal) => {
     },
     [storageKey, setSearchParams]
   );
-  const baseViews = savedViews ?? [];
+  const baseViews = (0, import_react12.useMemo)(
+    () => [...savedViews ?? [], ...presetViews ?? []],
+    [savedViews, presetViews]
+  );
   const allViews = (0, import_react12.useMemo)(
     () => temporaryView ? [...baseViews, temporaryView] : baseViews,
     [baseViews, temporaryView]
@@ -14801,7 +14810,7 @@ var useViewSelection = (config, savedViews, openSharedViewModal) => {
       persistViewToStorageAndUrl(viewToSelect);
       return viewToSelect;
     },
-    [config, persistViewToStorageAndUrl, temporaryView, temporaryStorageKey]
+    [config, persistViewToStorageAndUrl]
   );
   const createTemporaryView = (0, import_react12.useCallback)(
     (fetchedView) => {
@@ -14854,14 +14863,7 @@ var useViewSelection = (config, savedViews, openSharedViewModal) => {
     if (savedViewId && allViews.length > 0) {
       handleSavedViewFromUrl(savedViewId);
     }
-  }, [
-    searchParams,
-    savedViews,
-    temporaryView,
-    handleSavedViewFromUrl,
-    setSearchParams,
-    allViews.length
-  ]);
+  }, [searchParams, handleSavedViewFromUrl, allViews.length]);
   return {
     selectedView: selectedSavedView,
     selectView,
@@ -14920,6 +14922,7 @@ var SavedViewsContent = (props) => {
       onSelect: props.onSelect
     },
     savedViews,
+    props.presetViews,
     openSharedViewModal
   );
   const { data: fetchedView, isError: fetchError } = useFetchSavedViewById(
@@ -15058,7 +15061,7 @@ var SavedViewsContent = (props) => {
   ));
 };
 var SavedViews = (props) => {
-  return /* @__PURE__ */ import_react13.default.createElement(EnvironmentI18nProvider, null, /* @__PURE__ */ import_react13.default.createElement(import_react_query3.QueryClientProvider, { client: queryClient }, /* @__PURE__ */ import_react13.default.createElement(import_toast_alert4.ToastAlertProvider, null, /* @__PURE__ */ import_react13.default.createElement(SavedViewsContent, { ...props }))));
+  return /* @__PURE__ */ import_react13.default.createElement(EnvironmentI18nProvider, null, /* @__PURE__ */ import_react13.default.createElement(import_react_query3.QueryClientProvider, { client: queryClient }, /* @__PURE__ */ import_react13.default.createElement(import_toast_alert3.ToastAlertProvider, null, /* @__PURE__ */ import_react13.default.createElement(SavedViewsContent, { ...props }))));
 };
 
 // src/components/adapters/smart-grid/SmartGridSavedViews.tsx
@@ -15102,9 +15105,9 @@ var getColumnStateFromDefs = (columnDefs) => {
 };
 var extractDefaultView = (gridApi, receivedConfig) => {
   const columnDefs = gridApi.getColumnDefs() ?? [];
-  const defaultColumnState = getColumnStateFromDefs(columnDefs);
+  const defaultColumnState = receivedConfig?.columnState?.length ? receivedConfig.columnState : getColumnStateFromDefs(columnDefs);
   const result = {
-    columnState: receivedConfig?.columnState?.length ? receivedConfig.columnState : defaultColumnState,
+    columnState: defaultColumnState,
     columnGroupState: receivedConfig?.columnGroupState ?? [],
     rowGroupState: receivedConfig?.rowGroupState ?? [],
     filterState: receivedConfig?.filterState ?? {},
@@ -15278,7 +15281,7 @@ var DataTableSavedViews = (0, import_react18.forwardRef)((props, ref) => {
   );
   const defaultView = presetViews.find((view) => view.id === "default") ?? presetViews[0];
   const [internalTableConfig, setInternalTableConfig] = (0, import_react18.useState)(
-    ViewStorage.load(props.stickyViewsKey, defaultView)?.table_config ?? defaultView.table_config
+    ViewStorage.load(props.stickyViewsKey, defaultView).table_config
   );
   (0, import_react18.useImperativeHandle)(ref, () => ({
     setTableConfig: (newConfig) => {

package/dist/modern/index.mjs

@@ -11885,7 +11885,9 @@ var PanelContent = (props) => {
   const { showToast } = useToastAlertContext2();
   const I18n = useI18nContext5();
   const { data: savedViewsFromQuery, error: savedViewsError } = useSavedViewsQuery(props.queryInput);
-  const { mutate: updateSavedView, isPending: isUpdateLoading } = useUpdateSavedView(queryInput);
+  const updateMutation = useUpdateSavedView(queryInput);
+  const { mutate: updateSavedView } = updateMutation;
+  const isUpdateLoading = "isPending" in updateMutation ? updateMutation.isPending : updateMutation.isLoading ?? false;
   const savedViews = props.savedViews ?? savedViewsFromQuery;
   const errorToastRef = React17.useRef(null);
   React17.useEffect(() => {
@@ -12012,7 +12014,7 @@ import {
 } from "@procore/core-react";
 import React22, { useState as useState4, useEffect as useEffect3, useCallback as useCallback3 } from "react";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { useToastAlertContext as useToastAlertContext3 } from "@procore/toast-alert";
+import { useToastAlertContext as useToastAlertContext3, ToastAlertProvider } from "@procore/toast-alert";
 
 // src/components/modals/DeleteConfirmationModal.tsx
 import {
@@ -14751,9 +14753,6 @@ var SharedViewFormModal = ({
   );
 };
 
-// src/components/saved-views/SavedViews.tsx
-import { ToastAlertProvider } from "@procore/toast-alert";
-
 // src/utils/hooks/useViewSelection.ts
 import { useState as useState3, useCallback as useCallback2, useEffect as useEffect2, useRef as useRef2, useMemo } from "react";
 import { useSearchParams } from "react-router-dom";
@@ -14767,8 +14766,14 @@ var ViewStorage = {
   load(key, defaultView) {
     try {
       const stored = localStorage.getItem(key);
-      return stored ? JSON.parse(stored) : null;
-    } catch (e2) {
+      if (!stored)
+        return defaultView;
+      const parsed = JSON.parse(stored);
+      if (!parsed)
+        return defaultView;
+      const isTableConfigOnly = !parsed.id && !parsed.share_token;
+      return isTableConfigOnly ? { ...defaultView, table_config: parsed } : parsed;
+    } catch {
       return defaultView;
     }
   },
@@ -14813,7 +14818,7 @@ var restoreUrlParameter = (currentParam, previousParam, setSearchParams) => {
     );
   }
 };
-var useViewSelection = (config, savedViews, openSharedViewModal) => {
+var useViewSelection = (config, savedViews, presetViews, openSharedViewModal) => {
   const I18n = useI18nContext10();
   const storageKey = `savedView_${config.domain}_${config.tableName}_${config.companyId}_${config.projectId}_${config.userId}`;
   const temporaryStorageKey = `${storageKey}-temporary`;
@@ -14824,7 +14829,8 @@ var useViewSelection = (config, savedViews, openSharedViewModal) => {
     return stored ?? config.defaultView;
   });
   const [temporaryView, setTemporaryView] = useState3(() => {
-    return ViewStorage.load(temporaryStorageKey, config.defaultView);
+    const loaded = ViewStorage.load(temporaryStorageKey, config.defaultView);
+    return loaded && (loaded.id === "temporary" || loaded.view_level === "temporary") ? loaded : null;
   });
   const persistViewToStorageAndUrl = useCallback2(
     (view) => {
@@ -14833,7 +14839,10 @@ var useViewSelection = (config, savedViews, openSharedViewModal) => {
     },
     [storageKey, setSearchParams]
   );
-  const baseViews = savedViews ?? [];
+  const baseViews = useMemo(
+    () => [...savedViews ?? [], ...presetViews ?? []],
+    [savedViews, presetViews]
+  );
   const allViews = useMemo(
     () => temporaryView ? [...baseViews, temporaryView] : baseViews,
     [baseViews, temporaryView]
@@ -14845,7 +14854,7 @@ var useViewSelection = (config, savedViews, openSharedViewModal) => {
       persistViewToStorageAndUrl(viewToSelect);
       return viewToSelect;
     },
-    [config, persistViewToStorageAndUrl, temporaryView, temporaryStorageKey]
+    [config, persistViewToStorageAndUrl]
   );
   const createTemporaryView = useCallback2(
     (fetchedView) => {
@@ -14898,14 +14907,7 @@ var useViewSelection = (config, savedViews, openSharedViewModal) => {
     if (savedViewId && allViews.length > 0) {
       handleSavedViewFromUrl(savedViewId);
     }
-  }, [
-    searchParams,
-    savedViews,
-    temporaryView,
-    handleSavedViewFromUrl,
-    setSearchParams,
-    allViews.length
-  ]);
+  }, [searchParams, handleSavedViewFromUrl, allViews.length]);
   return {
     selectedView: selectedSavedView,
     selectView,
@@ -14964,6 +14966,7 @@ var SavedViewsContent = (props) => {
       onSelect: props.onSelect
     },
     savedViews,
+    props.presetViews,
     openSharedViewModal
   );
   const { data: fetchedView, isError: fetchError } = useFetchSavedViewById(
@@ -15146,9 +15149,9 @@ var getColumnStateFromDefs = (columnDefs) => {
 };
 var extractDefaultView = (gridApi, receivedConfig) => {
   const columnDefs = gridApi.getColumnDefs() ?? [];
-  const defaultColumnState = getColumnStateFromDefs(columnDefs);
+  const defaultColumnState = receivedConfig?.columnState?.length ? receivedConfig.columnState : getColumnStateFromDefs(columnDefs);
   const result = {
-    columnState: receivedConfig?.columnState?.length ? receivedConfig.columnState : defaultColumnState,
+    columnState: defaultColumnState,
     columnGroupState: receivedConfig?.columnGroupState ?? [],
     rowGroupState: receivedConfig?.rowGroupState ?? [],
     filterState: receivedConfig?.filterState ?? {},
@@ -15327,7 +15330,7 @@ var DataTableSavedViews = forwardRef11((props, ref) => {
   );
   const defaultView = presetViews.find((view) => view.id === "default") ?? presetViews[0];
   const [internalTableConfig, setInternalTableConfig] = useState6(
-    ViewStorage.load(props.stickyViewsKey, defaultView)?.table_config ?? defaultView.table_config
+    ViewStorage.load(props.stickyViewsKey, defaultView).table_config
   );
   useImperativeHandle(ref, () => ({
     setTableConfig: (newConfig) => {

package/package.json

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