@procore/saved-views 1.0.1-alpha.1 → 1.0.1-estimatingFork.3

package/dist/legacy/index.js

@@ -3976,7 +3976,7 @@ var require_lodash = __commonJS({
           if (typeof func != "function") {
             throw new TypeError2(FUNC_ERROR_TEXT);
           }
-          return setTimeout(function() {
+          return setTimeout2(function() {
             func.apply(undefined2, args);
           }, wait);
         }
@@ -5807,7 +5807,7 @@ var require_lodash = __commonJS({
           return object2[key];
         }
         var setData = shortOut(baseSetData);
-        var setTimeout = ctxSetTimeout || function(func, wait) {
+        var setTimeout2 = ctxSetTimeout || function(func, wait) {
           return root.setTimeout(func, wait);
         };
         var setToString = shortOut(baseSetToString);
@@ -6599,7 +6599,7 @@ var require_lodash = __commonJS({
           }
           function leadingEdge(time) {
             lastInvokeTime = time;
-            timerId = setTimeout(timerExpired, wait);
+            timerId = setTimeout2(timerExpired, wait);
             return leading ? invokeFunc(time) : result2;
           }
           function remainingWait(time) {
@@ -6615,7 +6615,7 @@ var require_lodash = __commonJS({
             if (shouldInvoke(time)) {
               return trailingEdge(time);
             }
-            timerId = setTimeout(timerExpired, remainingWait(time));
+            timerId = setTimeout2(timerExpired, remainingWait(time));
           }
           function trailingEdge(time) {
             timerId = undefined2;
@@ -6646,12 +6646,12 @@ var require_lodash = __commonJS({
               }
               if (maxing) {
                 clearTimeout(timerId);
-                timerId = setTimeout(timerExpired, wait);
+                timerId = setTimeout2(timerExpired, wait);
                 return invokeFunc(lastCallTime);
               }
             }
             if (timerId === undefined2) {
-              timerId = setTimeout(timerExpired, wait);
+              timerId = setTimeout2(timerExpired, wait);
             }
             return result2;
           }
@@ -11520,10 +11520,12 @@ var getColumnIdentifier = (col) => {
 };
 var updateTableConfig = (view, tableApi, provider) => {
   if (provider === "smart-grid") {
-    setSmartGridConfig(
-      tableApi,
-      view.table_config
-    );
+    setTimeout(() => {
+      setSmartGridConfig(
+        tableApi,
+        view.table_config
+      );
+    }, 0);
   } else {
     const dataTableApi = tableApi;
     const tableConfig = view.table_config;
@@ -11595,9 +11597,15 @@ var cleanObject = (table_config, provider) => {
 var normalizeForComparison = (config) => {
   if (!(config == null ? void 0 : config.columnState))
     return config;
+  const filteredColumnState = config.columnState.filter(
+    (col) => {
+      const colId = getColumnIdentifier(col);
+      return colId !== "drag_handle" && colId !== "ag-Grid-AutoColumn";
+    }
+  );
   return {
     ...import_lodash.default.omit(config, ["enableRowGrouping", "enableColumnGrouping"]),
-    columnState: config.columnState.map((col) => {
+    columnState: filteredColumnState.map((col) => {
       const res = import_lodash.default.omit(col, ["aggFunc"]);
       if (col.flex) {
         return import_lodash.default.omit(res, ["width", "flex"]);
@@ -11617,7 +11625,15 @@ var isEqual = (viewTableConfig, tableConfig, defaultViewConfig, provider) => {
   const normalizedCurrentConfig = normalizeForComparison(tableConfig);
   const cleanedViewConfig = cleanObject(normalizedViewConfig, provider);
   const cleanedCurrentConfig = cleanObject(normalizedCurrentConfig, provider);
-  return import_lodash.default.isEqual(cleanedViewConfig, cleanedCurrentConfig);
+  const isEqual2 = import_lodash.default.isEqual(cleanedViewConfig, cleanedCurrentConfig);
+  if (!isEqual2) {
+    console.log(
+      "[SavedViews]: Showing update button - view config, current config",
+      cleanedViewConfig,
+      cleanedCurrentConfig
+    );
+  }
+  return isEqual2;
 };
 var hasPermissionForViewLevel = (viewLevel, permissions) => {
   switch (viewLevel) {
@@ -15229,28 +15245,43 @@ var useSmartGridConfig = (gridApi) => {
 // src/components/adapters/smart-grid/SmartGridSavedViews.tsx
 var SmartGridSavedViews = (props) => {
   const { gridApi, userId, projectId, companyId } = props;
-  const { config: tableConfig, setConfig: setTableConfig } = useSmartGridConfig(gridApi);
+  const {
+    config: tableConfig,
+    setConfig: setTableConfig,
+    disableEventListeners,
+    enableEventListeners
+  } = useSmartGridConfig(gridApi);
   const presetViews = useNormalizedDefaultViews(props.defaultViews, gridApi);
   const defaultView = presetViews.find((view) => view.id === "default") ?? presetViews[0];
   const onSelect = (0, import_react16.useCallback)(
     ({ item }) => {
+      var _a;
       if (!gridApi)
         return item;
       const isPresetView = item.view_level === "default";
+      const newConfig = item.table_config;
+      const transformedConfig = ((_a = props.transformSettings) == null ? void 0 : _a.call(props, newConfig)) ?? newConfig;
+      disableEventListeners();
       if (isPresetView) {
         updateTableConfig(item, gridApi, "smart-grid");
-        setTableConfig(item.table_config);
+        setTableConfig(transformedConfig);
+        setTimeout(() => {
+          enableEventListeners();
+        }, 0);
         return item;
       }
       const updatedView = {
         ...item,
         table_config: customAndConfigSync(
-          item.table_config,
+          transformedConfig,
           tableConfig
         )
       };
       updateTableConfig(updatedView, gridApi, "smart-grid");
       setTableConfig(updatedView.table_config);
+      setTimeout(() => {
+        enableEventListeners();
+      }, 0);
       return updatedView;
     },
     [gridApi, tableConfig, setTableConfig]

package/dist/legacy/index.mjs

@@ -3982,7 +3982,7 @@ var require_lodash = __commonJS({
           if (typeof func != "function") {
             throw new TypeError2(FUNC_ERROR_TEXT);
           }
-          return setTimeout(function() {
+          return setTimeout2(function() {
             func.apply(undefined2, args);
           }, wait);
         }
@@ -5813,7 +5813,7 @@ var require_lodash = __commonJS({
           return object2[key];
         }
         var setData = shortOut(baseSetData);
-        var setTimeout = ctxSetTimeout || function(func, wait) {
+        var setTimeout2 = ctxSetTimeout || function(func, wait) {
           return root.setTimeout(func, wait);
         };
         var setToString = shortOut(baseSetToString);
@@ -6605,7 +6605,7 @@ var require_lodash = __commonJS({
           }
           function leadingEdge(time) {
             lastInvokeTime = time;
-            timerId = setTimeout(timerExpired, wait);
+            timerId = setTimeout2(timerExpired, wait);
             return leading ? invokeFunc(time) : result2;
           }
           function remainingWait(time) {
@@ -6621,7 +6621,7 @@ var require_lodash = __commonJS({
             if (shouldInvoke(time)) {
               return trailingEdge(time);
             }
-            timerId = setTimeout(timerExpired, remainingWait(time));
+            timerId = setTimeout2(timerExpired, remainingWait(time));
           }
           function trailingEdge(time) {
             timerId = undefined2;
@@ -6652,12 +6652,12 @@ var require_lodash = __commonJS({
               }
               if (maxing) {
                 clearTimeout(timerId);
-                timerId = setTimeout(timerExpired, wait);
+                timerId = setTimeout2(timerExpired, wait);
                 return invokeFunc(lastCallTime);
               }
             }
             if (timerId === undefined2) {
-              timerId = setTimeout(timerExpired, wait);
+              timerId = setTimeout2(timerExpired, wait);
             }
             return result2;
           }
@@ -11516,10 +11516,12 @@ var getColumnIdentifier = (col) => {
 };
 var updateTableConfig = (view, tableApi, provider) => {
   if (provider === "smart-grid") {
-    setSmartGridConfig(
-      tableApi,
-      view.table_config
-    );
+    setTimeout(() => {
+      setSmartGridConfig(
+        tableApi,
+        view.table_config
+      );
+    }, 0);
   } else {
     const dataTableApi = tableApi;
     const tableConfig = view.table_config;
@@ -11591,9 +11593,15 @@ var cleanObject = (table_config, provider) => {
 var normalizeForComparison = (config) => {
   if (!(config == null ? void 0 : config.columnState))
     return config;
+  const filteredColumnState = config.columnState.filter(
+    (col) => {
+      const colId = getColumnIdentifier(col);
+      return colId !== "drag_handle" && colId !== "ag-Grid-AutoColumn";
+    }
+  );
   return {
     ...import_lodash.default.omit(config, ["enableRowGrouping", "enableColumnGrouping"]),
-    columnState: config.columnState.map((col) => {
+    columnState: filteredColumnState.map((col) => {
       const res = import_lodash.default.omit(col, ["aggFunc"]);
       if (col.flex) {
         return import_lodash.default.omit(res, ["width", "flex"]);
@@ -11613,7 +11621,15 @@ var isEqual = (viewTableConfig, tableConfig, defaultViewConfig, provider) => {
   const normalizedCurrentConfig = normalizeForComparison(tableConfig);
   const cleanedViewConfig = cleanObject(normalizedViewConfig, provider);
   const cleanedCurrentConfig = cleanObject(normalizedCurrentConfig, provider);
-  return import_lodash.default.isEqual(cleanedViewConfig, cleanedCurrentConfig);
+  const isEqual2 = import_lodash.default.isEqual(cleanedViewConfig, cleanedCurrentConfig);
+  if (!isEqual2) {
+    console.log(
+      "[SavedViews]: Showing update button - view config, current config",
+      cleanedViewConfig,
+      cleanedCurrentConfig
+    );
+  }
+  return isEqual2;
 };
 var hasPermissionForViewLevel = (viewLevel, permissions) => {
   switch (viewLevel) {
@@ -15273,28 +15289,43 @@ var useSmartGridConfig = (gridApi) => {
 // src/components/adapters/smart-grid/SmartGridSavedViews.tsx
 var SmartGridSavedViews = (props) => {
   const { gridApi, userId, projectId, companyId } = props;
-  const { config: tableConfig, setConfig: setTableConfig } = useSmartGridConfig(gridApi);
+  const {
+    config: tableConfig,
+    setConfig: setTableConfig,
+    disableEventListeners,
+    enableEventListeners
+  } = useSmartGridConfig(gridApi);
   const presetViews = useNormalizedDefaultViews(props.defaultViews, gridApi);
   const defaultView = presetViews.find((view) => view.id === "default") ?? presetViews[0];
   const onSelect = useCallback4(
     ({ item }) => {
+      var _a;
       if (!gridApi)
         return item;
       const isPresetView = item.view_level === "default";
+      const newConfig = item.table_config;
+      const transformedConfig = ((_a = props.transformSettings) == null ? void 0 : _a.call(props, newConfig)) ?? newConfig;
+      disableEventListeners();
       if (isPresetView) {
         updateTableConfig(item, gridApi, "smart-grid");
-        setTableConfig(item.table_config);
+        setTableConfig(transformedConfig);
+        setTimeout(() => {
+          enableEventListeners();
+        }, 0);
         return item;
       }
       const updatedView = {
         ...item,
         table_config: customAndConfigSync(
-          item.table_config,
+          transformedConfig,
           tableConfig
         )
       };
       updateTableConfig(updatedView, gridApi, "smart-grid");
       setTableConfig(updatedView.table_config);
+      setTimeout(() => {
+        enableEventListeners();
+      }, 0);
       return updatedView;
     },
     [gridApi, tableConfig, setTableConfig]

package/dist/modern/index.js

@@ -3976,7 +3976,7 @@ var require_lodash = __commonJS({
           if (typeof func != "function") {
             throw new TypeError2(FUNC_ERROR_TEXT);
           }
-          return setTimeout(function() {
+          return setTimeout2(function() {
             func.apply(undefined2, args);
           }, wait);
         }
@@ -5807,7 +5807,7 @@ var require_lodash = __commonJS({
           return object2[key];
         }
         var setData = shortOut(baseSetData);
-        var setTimeout = ctxSetTimeout || function(func, wait) {
+        var setTimeout2 = ctxSetTimeout || function(func, wait) {
           return root.setTimeout(func, wait);
         };
         var setToString = shortOut(baseSetToString);
@@ -6599,7 +6599,7 @@ var require_lodash = __commonJS({
           }
           function leadingEdge(time) {
             lastInvokeTime = time;
-            timerId = setTimeout(timerExpired, wait);
+            timerId = setTimeout2(timerExpired, wait);
             return leading ? invokeFunc(time) : result2;
           }
           function remainingWait(time) {
@@ -6615,7 +6615,7 @@ var require_lodash = __commonJS({
             if (shouldInvoke(time)) {
               return trailingEdge(time);
             }
-            timerId = setTimeout(timerExpired, remainingWait(time));
+            timerId = setTimeout2(timerExpired, remainingWait(time));
           }
           function trailingEdge(time) {
             timerId = undefined2;
@@ -6646,12 +6646,12 @@ var require_lodash = __commonJS({
               }
               if (maxing) {
                 clearTimeout(timerId);
-                timerId = setTimeout(timerExpired, wait);
+                timerId = setTimeout2(timerExpired, wait);
                 return invokeFunc(lastCallTime);
               }
             }
             if (timerId === undefined2) {
-              timerId = setTimeout(timerExpired, wait);
+              timerId = setTimeout2(timerExpired, wait);
             }
             return result2;
           }
@@ -11517,10 +11517,12 @@ var getColumnIdentifier = (col) => {
 };
 var updateTableConfig = (view, tableApi, provider) => {
   if (provider === "smart-grid") {
-    setSmartGridConfig(
-      tableApi,
-      view.table_config
-    );
+    setTimeout(() => {
+      setSmartGridConfig(
+        tableApi,
+        view.table_config
+      );
+    }, 0);
   } else {
     const dataTableApi = tableApi;
     const tableConfig = view.table_config;
@@ -11592,9 +11594,15 @@ var cleanObject = (table_config, provider) => {
 var normalizeForComparison = (config) => {
   if (!config?.columnState)
     return config;
+  const filteredColumnState = config.columnState.filter(
+    (col) => {
+      const colId = getColumnIdentifier(col);
+      return colId !== "drag_handle" && colId !== "ag-Grid-AutoColumn";
+    }
+  );
   return {
     ...import_lodash.default.omit(config, ["enableRowGrouping", "enableColumnGrouping"]),
-    columnState: config.columnState.map((col) => {
+    columnState: filteredColumnState.map((col) => {
       const res = import_lodash.default.omit(col, ["aggFunc"]);
       if (col.flex) {
         return import_lodash.default.omit(res, ["width", "flex"]);
@@ -11614,7 +11622,15 @@ var isEqual = (viewTableConfig, tableConfig, defaultViewConfig, provider) => {
   const normalizedCurrentConfig = normalizeForComparison(tableConfig);
   const cleanedViewConfig = cleanObject(normalizedViewConfig, provider);
   const cleanedCurrentConfig = cleanObject(normalizedCurrentConfig, provider);
-  return import_lodash.default.isEqual(cleanedViewConfig, cleanedCurrentConfig);
+  const isEqual2 = import_lodash.default.isEqual(cleanedViewConfig, cleanedCurrentConfig);
+  if (!isEqual2) {
+    console.log(
+      "[SavedViews]: Showing update button - view config, current config",
+      cleanedViewConfig,
+      cleanedCurrentConfig
+    );
+  }
+  return isEqual2;
 };
 var hasPermissionForViewLevel = (viewLevel, permissions) => {
   switch (viewLevel) {
@@ -15225,7 +15241,12 @@ var useSmartGridConfig = (gridApi) => {
 // src/components/adapters/smart-grid/SmartGridSavedViews.tsx
 var SmartGridSavedViews = (props) => {
   const { gridApi, userId, projectId, companyId } = props;
-  const { config: tableConfig, setConfig: setTableConfig } = useSmartGridConfig(gridApi);
+  const {
+    config: tableConfig,
+    setConfig: setTableConfig,
+    disableEventListeners,
+    enableEventListeners
+  } = useSmartGridConfig(gridApi);
   const presetViews = useNormalizedDefaultViews(props.defaultViews, gridApi);
   const defaultView = presetViews.find((view) => view.id === "default") ?? presetViews[0];
   const onSelect = (0, import_react16.useCallback)(
@@ -15233,20 +15254,29 @@ var SmartGridSavedViews = (props) => {
       if (!gridApi)
         return item;
       const isPresetView = item.view_level === "default";
+      const newConfig = item.table_config;
+      const transformedConfig = props.transformSettings?.(newConfig) ?? newConfig;
+      disableEventListeners();
       if (isPresetView) {
         updateTableConfig(item, gridApi, "smart-grid");
-        setTableConfig(item.table_config);
+        setTableConfig(transformedConfig);
+        setTimeout(() => {
+          enableEventListeners();
+        }, 0);
         return item;
       }
       const updatedView = {
         ...item,
         table_config: customAndConfigSync(
-          item.table_config,
+          transformedConfig,
           tableConfig
         )
       };
       updateTableConfig(updatedView, gridApi, "smart-grid");
       setTableConfig(updatedView.table_config);
+      setTimeout(() => {
+        enableEventListeners();
+      }, 0);
       return updatedView;
     },
     [gridApi, tableConfig, setTableConfig]

package/dist/modern/index.mjs

@@ -3982,7 +3982,7 @@ var require_lodash = __commonJS({
           if (typeof func != "function") {
             throw new TypeError2(FUNC_ERROR_TEXT);
           }
-          return setTimeout(function() {
+          return setTimeout2(function() {
             func.apply(undefined2, args);
           }, wait);
         }
@@ -5813,7 +5813,7 @@ var require_lodash = __commonJS({
           return object2[key];
         }
         var setData = shortOut(baseSetData);
-        var setTimeout = ctxSetTimeout || function(func, wait) {
+        var setTimeout2 = ctxSetTimeout || function(func, wait) {
           return root.setTimeout(func, wait);
         };
         var setToString = shortOut(baseSetToString);
@@ -6605,7 +6605,7 @@ var require_lodash = __commonJS({
           }
           function leadingEdge(time) {
             lastInvokeTime = time;
-            timerId = setTimeout(timerExpired, wait);
+            timerId = setTimeout2(timerExpired, wait);
             return leading ? invokeFunc(time) : result2;
           }
           function remainingWait(time) {
@@ -6621,7 +6621,7 @@ var require_lodash = __commonJS({
             if (shouldInvoke(time)) {
               return trailingEdge(time);
             }
-            timerId = setTimeout(timerExpired, remainingWait(time));
+            timerId = setTimeout2(timerExpired, remainingWait(time));
           }
           function trailingEdge(time) {
             timerId = undefined2;
@@ -6652,12 +6652,12 @@ var require_lodash = __commonJS({
               }
               if (maxing) {
                 clearTimeout(timerId);
-                timerId = setTimeout(timerExpired, wait);
+                timerId = setTimeout2(timerExpired, wait);
                 return invokeFunc(lastCallTime);
               }
             }
             if (timerId === undefined2) {
-              timerId = setTimeout(timerExpired, wait);
+              timerId = setTimeout2(timerExpired, wait);
             }
             return result2;
           }
@@ -11513,10 +11513,12 @@ var getColumnIdentifier = (col) => {
 };
 var updateTableConfig = (view, tableApi, provider) => {
   if (provider === "smart-grid") {
-    setSmartGridConfig(
-      tableApi,
-      view.table_config
-    );
+    setTimeout(() => {
+      setSmartGridConfig(
+        tableApi,
+        view.table_config
+      );
+    }, 0);
   } else {
     const dataTableApi = tableApi;
     const tableConfig = view.table_config;
@@ -11588,9 +11590,15 @@ var cleanObject = (table_config, provider) => {
 var normalizeForComparison = (config) => {
   if (!config?.columnState)
     return config;
+  const filteredColumnState = config.columnState.filter(
+    (col) => {
+      const colId = getColumnIdentifier(col);
+      return colId !== "drag_handle" && colId !== "ag-Grid-AutoColumn";
+    }
+  );
   return {
     ...import_lodash.default.omit(config, ["enableRowGrouping", "enableColumnGrouping"]),
-    columnState: config.columnState.map((col) => {
+    columnState: filteredColumnState.map((col) => {
       const res = import_lodash.default.omit(col, ["aggFunc"]);
       if (col.flex) {
         return import_lodash.default.omit(res, ["width", "flex"]);
@@ -11610,7 +11618,15 @@ var isEqual = (viewTableConfig, tableConfig, defaultViewConfig, provider) => {
   const normalizedCurrentConfig = normalizeForComparison(tableConfig);
   const cleanedViewConfig = cleanObject(normalizedViewConfig, provider);
   const cleanedCurrentConfig = cleanObject(normalizedCurrentConfig, provider);
-  return import_lodash.default.isEqual(cleanedViewConfig, cleanedCurrentConfig);
+  const isEqual2 = import_lodash.default.isEqual(cleanedViewConfig, cleanedCurrentConfig);
+  if (!isEqual2) {
+    console.log(
+      "[SavedViews]: Showing update button - view config, current config",
+      cleanedViewConfig,
+      cleanedCurrentConfig
+    );
+  }
+  return isEqual2;
 };
 var hasPermissionForViewLevel = (viewLevel, permissions) => {
   switch (viewLevel) {
@@ -15269,7 +15285,12 @@ var useSmartGridConfig = (gridApi) => {
 // src/components/adapters/smart-grid/SmartGridSavedViews.tsx
 var SmartGridSavedViews = (props) => {
   const { gridApi, userId, projectId, companyId } = props;
-  const { config: tableConfig, setConfig: setTableConfig } = useSmartGridConfig(gridApi);
+  const {
+    config: tableConfig,
+    setConfig: setTableConfig,
+    disableEventListeners,
+    enableEventListeners
+  } = useSmartGridConfig(gridApi);
   const presetViews = useNormalizedDefaultViews(props.defaultViews, gridApi);
   const defaultView = presetViews.find((view) => view.id === "default") ?? presetViews[0];
   const onSelect = useCallback4(
@@ -15277,20 +15298,29 @@ var SmartGridSavedViews = (props) => {
       if (!gridApi)
         return item;
       const isPresetView = item.view_level === "default";
+      const newConfig = item.table_config;
+      const transformedConfig = props.transformSettings?.(newConfig) ?? newConfig;
+      disableEventListeners();
       if (isPresetView) {
         updateTableConfig(item, gridApi, "smart-grid");
-        setTableConfig(item.table_config);
+        setTableConfig(transformedConfig);
+        setTimeout(() => {
+          enableEventListeners();
+        }, 0);
         return item;
       }
       const updatedView = {
         ...item,
         table_config: customAndConfigSync(
-          item.table_config,
+          transformedConfig,
           tableConfig
         )
       };
       updateTableConfig(updatedView, gridApi, "smart-grid");
       setTableConfig(updatedView.table_config);
+      setTimeout(() => {
+        enableEventListeners();
+      }, 0);
       return updatedView;
     },
     [gridApi, tableConfig, setTableConfig]

package/package.json

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