@procore/saved-views 1.1.0-alpha.0 → 1.1.0-alpha.1

package/dist/legacy/index.js

@@ -11503,7 +11503,7 @@ var useApiRequest = (props, method, mutationKey) => {
   const queryClient2 = (0, import_react_query.useQueryClient)();
   const { locale: locale2 } = (0, import_core_react5.useI18nContext)();
   const basePath = getBasePath(companyId, projectId);
-  const queryKeyContext = projectId ?? companyId;
+  const queryKey = ["savedViews", domain, tableName, companyId, projectId];
   return (0, import_react_query.useMutation)({
     mutationKey,
     mutationFn: async (savedView) => {
@@ -11529,36 +11529,28 @@ var useApiRequest = (props, method, mutationKey) => {
     onSuccess: (savedView) => {
       if (method === "DELETE" || method === "POST") {
         queryClient2.invalidateQueries({
-          queryKey: ["savedViews", domain, tableName, queryKeyContext]
+          queryKey
         });
         return;
       } else {
-        const oldData = queryClient2.getQueryData([
-          "savedViews",
-          domain,
-          tableName,
-          queryKeyContext
-        ]);
+        const oldData = queryClient2.getQueryData(queryKey);
         const oldView = oldData == null ? void 0 : oldData.find(
           (item) => item.share_token === savedView.share_token
         );
         if ((oldView == null ? void 0 : oldView.name) !== savedView.name) {
           queryClient2.invalidateQueries({
-            queryKey: ["savedViews", domain, tableName, queryKeyContext]
+            queryKey
           });
           return;
         }
       }
-      queryClient2.setQueryData(
-        ["savedViews", domain, tableName, queryKeyContext],
-        (oldData) => {
-          if (!oldData)
-            return [savedView];
-          return oldData.map(
-            (item) => item.share_token === savedView.share_token ? savedView : item
-          );
-        }
-      );
+      queryClient2.setQueryData(queryKey, (oldData) => {
+        if (!oldData)
+          return [savedView];
+        return oldData.map(
+          (item) => item.share_token === savedView.share_token ? savedView : item
+        );
+      });
     }
   });
 };
@@ -11585,7 +11577,7 @@ var useSavedViewsQuery = (props) => {
   const basePath = getBasePath2(companyId, projectId);
   const url = `${basePath}?table_name=${tableName}&permissions_domain=${domain}`;
   return (0, import_react_query2.useQuery)({
-    queryKey: ["savedViews", domain, tableName, projectId ?? companyId],
+    queryKey: ["savedViews", domain, tableName, companyId, projectId],
     queryFn: async () => {
       const getUrl2 = `${url}&per_page=${PAGE_SIZE}`;
       const response = await requestJSON(getUrl2);
@@ -11598,7 +11590,7 @@ var useSavedViewsPermissions = (props) => {
   const basePath = getBasePath2(companyId, projectId);
   const url = `${basePath}/permissions?permissions_domain=${domain}`;
   return (0, import_react_query2.useQuery)({
-    queryKey: ["savedViewsConfig", domain, projectId ?? companyId],
+    queryKey: ["savedViewsConfig", domain, companyId, projectId],
     queryFn: async () => {
       const response = await requestJSON(url);
       return response.data;
@@ -11625,7 +11617,7 @@ var useFetchSavedViewById = (savedViewToken, queryInput, enabled = true) => {
   const basePath = getBasePath2(companyId, projectId);
   return (0, import_react_query2.useQuery)({
     enabled: enabled && Boolean(savedViewToken),
-    queryKey: ["savedView", savedViewToken, projectId ?? companyId],
+    queryKey: ["savedView", savedViewToken, companyId, projectId],
     queryFn: async () => {
       const url = `${basePath}/${savedViewToken}?permissions_domain=${domain}`;
       const response = await requestJSON(url);
@@ -14921,7 +14913,7 @@ var SavedViewsContent = (props) => {
   const queryInput = {
     domain: props.domain,
     tableName: props.tableName,
-    projectId: projectId ?? void 0,
+    projectId,
     companyId
   };
   const { data: savedViews } = useSavedViewsQuery(queryInput);
@@ -14953,7 +14945,7 @@ var SavedViewsContent = (props) => {
       domain: props.domain,
       tableName: props.tableName,
       userId: props.userId,
-      projectId: projectId ?? void 0,
+      projectId,
       companyId,
       defaultView: props.defaultView,
       onSelect: props.onSelect

package/dist/legacy/index.mjs

@@ -11499,7 +11499,7 @@ var useApiRequest = (props, method, mutationKey) => {
   const queryClient2 = useQueryClient();
   const { locale: locale2 } = useI18nContext3();
   const basePath = getBasePath(companyId, projectId);
-  const queryKeyContext = projectId ?? companyId;
+  const queryKey = ["savedViews", domain, tableName, companyId, projectId];
   return useMutation({
     mutationKey,
     mutationFn: async (savedView) => {
@@ -11525,36 +11525,28 @@ var useApiRequest = (props, method, mutationKey) => {
     onSuccess: (savedView) => {
       if (method === "DELETE" || method === "POST") {
         queryClient2.invalidateQueries({
-          queryKey: ["savedViews", domain, tableName, queryKeyContext]
+          queryKey
         });
         return;
       } else {
-        const oldData = queryClient2.getQueryData([
-          "savedViews",
-          domain,
-          tableName,
-          queryKeyContext
-        ]);
+        const oldData = queryClient2.getQueryData(queryKey);
         const oldView = oldData == null ? void 0 : oldData.find(
           (item) => item.share_token === savedView.share_token
         );
         if ((oldView == null ? void 0 : oldView.name) !== savedView.name) {
           queryClient2.invalidateQueries({
-            queryKey: ["savedViews", domain, tableName, queryKeyContext]
+            queryKey
           });
           return;
         }
       }
-      queryClient2.setQueryData(
-        ["savedViews", domain, tableName, queryKeyContext],
-        (oldData) => {
-          if (!oldData)
-            return [savedView];
-          return oldData.map(
-            (item) => item.share_token === savedView.share_token ? savedView : item
-          );
-        }
-      );
+      queryClient2.setQueryData(queryKey, (oldData) => {
+        if (!oldData)
+          return [savedView];
+        return oldData.map(
+          (item) => item.share_token === savedView.share_token ? savedView : item
+        );
+      });
     }
   });
 };
@@ -11581,7 +11573,7 @@ var useSavedViewsQuery = (props) => {
   const basePath = getBasePath2(companyId, projectId);
   const url = `${basePath}?table_name=${tableName}&permissions_domain=${domain}`;
   return useQuery({
-    queryKey: ["savedViews", domain, tableName, projectId ?? companyId],
+    queryKey: ["savedViews", domain, tableName, companyId, projectId],
     queryFn: async () => {
       const getUrl2 = `${url}&per_page=${PAGE_SIZE}`;
       const response = await requestJSON(getUrl2);
@@ -11594,7 +11586,7 @@ var useSavedViewsPermissions = (props) => {
   const basePath = getBasePath2(companyId, projectId);
   const url = `${basePath}/permissions?permissions_domain=${domain}`;
   return useQuery({
-    queryKey: ["savedViewsConfig", domain, projectId ?? companyId],
+    queryKey: ["savedViewsConfig", domain, companyId, projectId],
     queryFn: async () => {
       const response = await requestJSON(url);
       return response.data;
@@ -11621,7 +11613,7 @@ var useFetchSavedViewById = (savedViewToken, queryInput, enabled = true) => {
   const basePath = getBasePath2(companyId, projectId);
   return useQuery({
     enabled: enabled && Boolean(savedViewToken),
-    queryKey: ["savedView", savedViewToken, projectId ?? companyId],
+    queryKey: ["savedView", savedViewToken, companyId, projectId],
     queryFn: async () => {
       const url = `${basePath}/${savedViewToken}?permissions_domain=${domain}`;
       const response = await requestJSON(url);
@@ -14965,7 +14957,7 @@ var SavedViewsContent = (props) => {
   const queryInput = {
     domain: props.domain,
     tableName: props.tableName,
-    projectId: projectId ?? void 0,
+    projectId,
     companyId
   };
   const { data: savedViews } = useSavedViewsQuery(queryInput);
@@ -14997,7 +14989,7 @@ var SavedViewsContent = (props) => {
       domain: props.domain,
       tableName: props.tableName,
       userId: props.userId,
-      projectId: projectId ?? void 0,
+      projectId,
       companyId,
       defaultView: props.defaultView,
       onSelect: props.onSelect

package/dist/modern/index.js

@@ -11500,7 +11500,7 @@ var useApiRequest = (props, method, mutationKey) => {
   const queryClient2 = (0, import_react_query.useQueryClient)();
   const { locale: locale2 } = (0, import_core_react5.useI18nContext)();
   const basePath = getBasePath(companyId, projectId);
-  const queryKeyContext = projectId ?? companyId;
+  const queryKey = ["savedViews", domain, tableName, companyId, projectId];
   return (0, import_react_query.useMutation)({
     mutationKey,
     mutationFn: async (savedView) => {
@@ -11526,36 +11526,28 @@ var useApiRequest = (props, method, mutationKey) => {
     onSuccess: (savedView) => {
       if (method === "DELETE" || method === "POST") {
         queryClient2.invalidateQueries({
-          queryKey: ["savedViews", domain, tableName, queryKeyContext]
+          queryKey
         });
         return;
       } else {
-        const oldData = queryClient2.getQueryData([
-          "savedViews",
-          domain,
-          tableName,
-          queryKeyContext
-        ]);
+        const oldData = queryClient2.getQueryData(queryKey);
         const oldView = oldData?.find(
           (item) => item.share_token === savedView.share_token
         );
         if (oldView?.name !== savedView.name) {
           queryClient2.invalidateQueries({
-            queryKey: ["savedViews", domain, tableName, queryKeyContext]
+            queryKey
           });
           return;
         }
       }
-      queryClient2.setQueryData(
-        ["savedViews", domain, tableName, queryKeyContext],
-        (oldData) => {
-          if (!oldData)
-            return [savedView];
-          return oldData.map(
-            (item) => item.share_token === savedView.share_token ? savedView : item
-          );
-        }
-      );
+      queryClient2.setQueryData(queryKey, (oldData) => {
+        if (!oldData)
+          return [savedView];
+        return oldData.map(
+          (item) => item.share_token === savedView.share_token ? savedView : item
+        );
+      });
     }
   });
 };
@@ -11582,7 +11574,7 @@ var useSavedViewsQuery = (props) => {
   const basePath = getBasePath2(companyId, projectId);
   const url = `${basePath}?table_name=${tableName}&permissions_domain=${domain}`;
   return (0, import_react_query2.useQuery)({
-    queryKey: ["savedViews", domain, tableName, projectId ?? companyId],
+    queryKey: ["savedViews", domain, tableName, companyId, projectId],
     queryFn: async () => {
       const getUrl2 = `${url}&per_page=${PAGE_SIZE}`;
       const response = await requestJSON(getUrl2);
@@ -11595,7 +11587,7 @@ var useSavedViewsPermissions = (props) => {
   const basePath = getBasePath2(companyId, projectId);
   const url = `${basePath}/permissions?permissions_domain=${domain}`;
   return (0, import_react_query2.useQuery)({
-    queryKey: ["savedViewsConfig", domain, projectId ?? companyId],
+    queryKey: ["savedViewsConfig", domain, companyId, projectId],
     queryFn: async () => {
       const response = await requestJSON(url);
       return response.data;
@@ -11622,7 +11614,7 @@ var useFetchSavedViewById = (savedViewToken, queryInput, enabled = true) => {
   const basePath = getBasePath2(companyId, projectId);
   return (0, import_react_query2.useQuery)({
     enabled: enabled && Boolean(savedViewToken),
-    queryKey: ["savedView", savedViewToken, projectId ?? companyId],
+    queryKey: ["savedView", savedViewToken, companyId, projectId],
     queryFn: async () => {
       const url = `${basePath}/${savedViewToken}?permissions_domain=${domain}`;
       const response = await requestJSON(url);
@@ -14918,7 +14910,7 @@ var SavedViewsContent = (props) => {
   const queryInput = {
     domain: props.domain,
     tableName: props.tableName,
-    projectId: projectId ?? void 0,
+    projectId,
     companyId
   };
   const { data: savedViews } = useSavedViewsQuery(queryInput);
@@ -14950,7 +14942,7 @@ var SavedViewsContent = (props) => {
       domain: props.domain,
       tableName: props.tableName,
       userId: props.userId,
-      projectId: projectId ?? void 0,
+      projectId,
       companyId,
       defaultView: props.defaultView,
       onSelect: props.onSelect

package/dist/modern/index.mjs

@@ -11496,7 +11496,7 @@ var useApiRequest = (props, method, mutationKey) => {
   const queryClient2 = useQueryClient();
   const { locale: locale2 } = useI18nContext3();
   const basePath = getBasePath(companyId, projectId);
-  const queryKeyContext = projectId ?? companyId;
+  const queryKey = ["savedViews", domain, tableName, companyId, projectId];
   return useMutation({
     mutationKey,
     mutationFn: async (savedView) => {
@@ -11522,36 +11522,28 @@ var useApiRequest = (props, method, mutationKey) => {
     onSuccess: (savedView) => {
       if (method === "DELETE" || method === "POST") {
         queryClient2.invalidateQueries({
-          queryKey: ["savedViews", domain, tableName, queryKeyContext]
+          queryKey
         });
         return;
       } else {
-        const oldData = queryClient2.getQueryData([
-          "savedViews",
-          domain,
-          tableName,
-          queryKeyContext
-        ]);
+        const oldData = queryClient2.getQueryData(queryKey);
         const oldView = oldData?.find(
           (item) => item.share_token === savedView.share_token
         );
         if (oldView?.name !== savedView.name) {
           queryClient2.invalidateQueries({
-            queryKey: ["savedViews", domain, tableName, queryKeyContext]
+            queryKey
           });
           return;
         }
       }
-      queryClient2.setQueryData(
-        ["savedViews", domain, tableName, queryKeyContext],
-        (oldData) => {
-          if (!oldData)
-            return [savedView];
-          return oldData.map(
-            (item) => item.share_token === savedView.share_token ? savedView : item
-          );
-        }
-      );
+      queryClient2.setQueryData(queryKey, (oldData) => {
+        if (!oldData)
+          return [savedView];
+        return oldData.map(
+          (item) => item.share_token === savedView.share_token ? savedView : item
+        );
+      });
     }
   });
 };
@@ -11578,7 +11570,7 @@ var useSavedViewsQuery = (props) => {
   const basePath = getBasePath2(companyId, projectId);
   const url = `${basePath}?table_name=${tableName}&permissions_domain=${domain}`;
   return useQuery({
-    queryKey: ["savedViews", domain, tableName, projectId ?? companyId],
+    queryKey: ["savedViews", domain, tableName, companyId, projectId],
     queryFn: async () => {
       const getUrl2 = `${url}&per_page=${PAGE_SIZE}`;
       const response = await requestJSON(getUrl2);
@@ -11591,7 +11583,7 @@ var useSavedViewsPermissions = (props) => {
   const basePath = getBasePath2(companyId, projectId);
   const url = `${basePath}/permissions?permissions_domain=${domain}`;
   return useQuery({
-    queryKey: ["savedViewsConfig", domain, projectId ?? companyId],
+    queryKey: ["savedViewsConfig", domain, companyId, projectId],
     queryFn: async () => {
       const response = await requestJSON(url);
       return response.data;
@@ -11618,7 +11610,7 @@ var useFetchSavedViewById = (savedViewToken, queryInput, enabled = true) => {
   const basePath = getBasePath2(companyId, projectId);
   return useQuery({
     enabled: enabled && Boolean(savedViewToken),
-    queryKey: ["savedView", savedViewToken, projectId ?? companyId],
+    queryKey: ["savedView", savedViewToken, companyId, projectId],
     queryFn: async () => {
       const url = `${basePath}/${savedViewToken}?permissions_domain=${domain}`;
       const response = await requestJSON(url);
@@ -14962,7 +14954,7 @@ var SavedViewsContent = (props) => {
   const queryInput = {
     domain: props.domain,
     tableName: props.tableName,
-    projectId: projectId ?? void 0,
+    projectId,
     companyId
   };
   const { data: savedViews } = useSavedViewsQuery(queryInput);
@@ -14994,7 +14986,7 @@ var SavedViewsContent = (props) => {
       domain: props.domain,
       tableName: props.tableName,
       userId: props.userId,
-      projectId: projectId ?? void 0,
+      projectId,
       companyId,
       defaultView: props.defaultView,
       onSelect: props.onSelect

package/package.json

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