npm - @procore/saved-views - Versions diffs - 1.0.1-estimatingFork.6.1 → 1.0.1-estimatingFork.6.3 - Mend

@procore/saved-views 1.0.1-estimatingFork.6.1 → 1.0.1-estimatingFork.6.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/dist/legacy/index.d.mts CHANGED Viewed

@@ -31,6 +31,9 @@ interface ISmartGridConfig {
     rowGroupState: string[];
     rowHeight: number | undefined;
     filterState: FilterModel;
+    enableRowGrouping?: boolean;
+    enableColumnGrouping?: boolean;
+    enableSplitAssembliesForDynamicGrouping?: boolean;
 }
 declare const PROJECT_LEVEL_TOOL_VIEW_LEVELS: readonly ["company", "project", "personal"];
@@ -106,6 +109,12 @@ interface IDataTableSavedViewsExternalConsumerProps extends IBaseSavedViewsProps
 interface ISmartGridSavedViewsExternalConsumerProps extends IBaseSavedViewsProps {
     gridApi: GridApi;
     transformSettings?: (config: ISmartGridConfig) => ISmartGridConfig;
+    /**
+     * Merge live app state into the config used for Update visibility and persisting views.
+     * AG Grid events only report column/group/filter state — use this for flags such as
+     * enableRowGrouping / enableSplitAssembliesForDynamicGrouping that live outside the grid API.
+     */
+    augmentTableConfig?: (config: ISmartGridConfig) => ISmartGridConfig;
     defaultViews: ISmartGridDefaultViewConfig[];
 }

package/dist/legacy/index.d.ts CHANGED Viewed

@@ -31,6 +31,9 @@ interface ISmartGridConfig {
     rowGroupState: string[];
     rowHeight: number | undefined;
     filterState: FilterModel;
+    enableRowGrouping?: boolean;
+    enableColumnGrouping?: boolean;
+    enableSplitAssembliesForDynamicGrouping?: boolean;
 }
 declare const PROJECT_LEVEL_TOOL_VIEW_LEVELS: readonly ["company", "project", "personal"];
@@ -106,6 +109,12 @@ interface IDataTableSavedViewsExternalConsumerProps extends IBaseSavedViewsProps
 interface ISmartGridSavedViewsExternalConsumerProps extends IBaseSavedViewsProps {
     gridApi: GridApi;
     transformSettings?: (config: ISmartGridConfig) => ISmartGridConfig;
+    /**
+     * Merge live app state into the config used for Update visibility and persisting views.
+     * AG Grid events only report column/group/filter state — use this for flags such as
+     * enableRowGrouping / enableSplitAssembliesForDynamicGrouping that live outside the grid API.
+     */
+    augmentTableConfig?: (config: ISmartGridConfig) => ISmartGridConfig;
     defaultViews: ISmartGridDefaultViewConfig[];
 }

package/dist/legacy/index.js CHANGED Viewed

@@ -1469,7 +1469,7 @@ var require_lodash = __commonJS({
         return string3.match(reUnicodeWord) || [];
       }
       var runInContext = function runInContext2(context) {
-        context = context == null ? root : _3.defaults(root.Object(), context, _3.pick(root, contextProps));
+        context = context == null ? root : _4.defaults(root.Object(), context, _4.pick(root, contextProps));
         var Array2 = context.Array, Date = context.Date, Error2 = context.Error, Function2 = context.Function, Math2 = context.Math, Object2 = context.Object, RegExp2 = context.RegExp, String2 = context.String, TypeError2 = context.TypeError;
         var arrayProto = Array2.prototype, funcProto = Function2.prototype, objectProto = Object2.prototype;
         var coreJsData = context["__core-js_shared__"];
@@ -6263,17 +6263,17 @@ var require_lodash = __commonJS({
         }
         return lodash;
       };
-      var _3 = runInContext();
+      var _4 = runInContext();
       if (typeof define == "function" && typeof define.amd == "object" && define.amd) {
-        root._ = _3;
+        root._ = _4;
         define(function() {
-          return _3;
+          return _4;
         });
       } else if (freeModule) {
-        (freeModule.exports = _3)._ = _3;
-        freeExports._ = _3;
+        (freeModule.exports = _4)._ = _4;
+        freeExports._ = _4;
       } else {
-        root._ = _3;
+        root._ = _4;
       }
     }).call(exports);
   }
@@ -9151,7 +9151,7 @@ function Fe(e2, t2, n2) {
     return t3 ? t3 + "-" + r2 : r2;
   }(t2.displayName, t2.parentComponentId) : l2, h = t2.displayName, y2 = void 0 === h ? function(e3) {
     return Te(e3) ? "styled." + e3 : "Styled(" + E(e3) + ")";
-  }(e2) : h, v2 = t2.displayName && t2.componentId ? De(t2.displayName) + "-" + t2.componentId : t2.componentId || d, _3 = o2 && e2.attrs ? Array.prototype.concat(e2.attrs, c2).filter(Boolean) : c2, N = t2.shouldForwardProp;
+  }(e2) : h, v2 = t2.displayName && t2.componentId ? De(t2.displayName) + "-" + t2.componentId : t2.componentId || d, _4 = o2 && e2.attrs ? Array.prototype.concat(e2.attrs, c2).filter(Boolean) : c2, N = t2.shouldForwardProp;
   o2 && e2.shouldForwardProp && (N = t2.shouldForwardProp ? function(n3, r2, o3) {
     return e2.shouldForwardProp(n3, r2, o3) && t2.shouldForwardProp(n3, r2, o3);
   } : e2.shouldForwardProp);
@@ -9168,13 +9168,13 @@ function Fe(e2, t2, n2) {
       }(Pe(t4, (0, import_react.useContext)(Be), a3) || S, t4, o3), y3 = f2[0], v3 = f2[1], g2 = function(e5, t5, n4, r3) {
         var o4 = he(), s2 = pe(), i4 = t5 ? e5.generateAndInjectStyles(S, o4, s2) : e5.generateAndInjectStyles(n4, o4, s2);
         return "production" !== process.env.NODE_ENV && !t5 && r3 && r3(i4), i4;
-      }(i3, r2, y3, "production" !== process.env.NODE_ENV ? e4.warnTooManyClasses : void 0), E2 = n3, b2 = v3.$as || t4.$as || v3.as || t4.as || h2, _4 = Te(b2), N2 = v3 !== t4 ? m({}, t4, {}, v3) : t4, A3 = {};
+      }(i3, r2, y3, "production" !== process.env.NODE_ENV ? e4.warnTooManyClasses : void 0), E2 = n3, b2 = v3.$as || t4.$as || v3.as || t4.as || h2, _5 = Te(b2), N2 = v3 !== t4 ? m({}, t4, {}, v3) : t4, A3 = {};
       for (var C3 in N2)
-        "$" !== C3[0] && "as" !== C3 && ("forwardedAs" === C3 ? A3.as = N2[C3] : (l3 ? l3(C3, isPropValid, b2) : !_4 || isPropValid(C3)) && (A3[C3] = N2[C3]));
+        "$" !== C3[0] && "as" !== C3 && ("forwardedAs" === C3 ? A3.as = N2[C3] : (l3 ? l3(C3, isPropValid, b2) : !_5 || isPropValid(C3)) && (A3[C3] = N2[C3]));
       return t4.style && v3.style !== t4.style && (A3.style = m({}, t4.style, {}, v3.style)), A3.className = Array.prototype.concat(c3, d2, g2 !== d2 ? g2 : null, t4.className, v3.className).filter(Boolean).join(" "), A3.ref = E2, (0, import_react.createElement)(b2, A3);
     }(A2, e3, t3, I);
   };
-  return P4.displayName = y2, (A2 = import_react.default.forwardRef(P4)).attrs = _3, A2.componentStyle = C2, A2.displayName = y2, A2.shouldForwardProp = N, A2.foldedComponentIds = o2 ? Array.prototype.concat(e2.foldedComponentIds, e2.styledComponentId) : g, A2.styledComponentId = v2, A2.target = o2 ? e2.target : e2, A2.withComponent = function(e3) {
+  return P4.displayName = y2, (A2 = import_react.default.forwardRef(P4)).attrs = _4, A2.componentStyle = C2, A2.displayName = y2, A2.shouldForwardProp = N, A2.foldedComponentIds = o2 ? Array.prototype.concat(e2.foldedComponentIds, e2.styledComponentId) : g, A2.styledComponentId = v2, A2.target = o2 ? e2.target : e2, A2.withComponent = function(e3) {
     var r2 = t2.componentId, o3 = function(e4, t3) {
       if (null == e4)
         return {};
@@ -9183,7 +9183,7 @@ function Fe(e2, t2, n2) {
         n3 = s3[r3], t3.indexOf(n3) >= 0 || (o4[n3] = e4[n3]);
       return o4;
     }(t2, ["componentId"]), s2 = r2 && r2 + "-" + (Te(e3) ? e3 : De(E(e3)));
-    return Fe(e3, m({}, o3, { attrs: _3, componentId: s2 }), n2);
+    return Fe(e3, m({}, o3, { attrs: _4, componentId: s2 }), n2);
   }, Object.defineProperty(A2, "defaultProps", { get: function() {
     return this._foldedDefaultProps;
   }, set: function(t3) {
@@ -9749,11 +9749,7 @@ var normalizeForComparison = (config) => {
     }
   );
   return {
-    ...import_lodash.default.omit(config, [
-      "enableRowGrouping",
-      "enableColumnGrouping",
-      "enableSplitAssembliesForDynamicGrouping"
-    ]),
+    ...config,
     columnState: filteredColumnState.map((col) => {
       const res = import_lodash.default.omit(col, ["aggFunc"]);
       if (col.flex) {
@@ -9763,6 +9759,15 @@ var normalizeForComparison = (config) => {
     })
   };
 };
+var withSmartGridGroupingDefaults = (config) => {
+  const c2 = config;
+  return {
+    ...c2,
+    enableRowGrouping: c2.enableRowGrouping ?? false,
+    enableColumnGrouping: c2.enableColumnGrouping ?? false,
+    enableSplitAssembliesForDynamicGrouping: c2.enableSplitAssembliesForDynamicGrouping ?? false
+  };
+};
 var isEqual = (viewTableConfig, tableConfig, defaultViewConfig, provider) => {
   if (!viewTableConfig || !tableConfig)
     return false;
@@ -9770,19 +9775,17 @@ var isEqual = (viewTableConfig, tableConfig, defaultViewConfig, provider) => {
     viewTableConfig,
     defaultViewConfig
   );
-  const normalizedViewConfig = normalizeForComparison(syncedViewTableConfig);
-  const normalizedCurrentConfig = normalizeForComparison(tableConfig);
-  const cleanedViewConfig = cleanObject(normalizedViewConfig, provider);
-  const cleanedCurrentConfig = cleanObject(normalizedCurrentConfig, provider);
-  const isEqual2 = import_lodash.default.isEqual(cleanedViewConfig, cleanedCurrentConfig);
-  if (!isEqual2) {
-    console.log(
-      "[SavedViews]: Showing update button - view config, current config",
-      cleanedViewConfig,
-      cleanedCurrentConfig
+  let normalizedViewConfig = normalizeForComparison(syncedViewTableConfig);
+  let normalizedCurrentConfig = normalizeForComparison(tableConfig);
+  if (provider === "smart-grid") {
+    normalizedViewConfig = withSmartGridGroupingDefaults(normalizedViewConfig);
+    normalizedCurrentConfig = withSmartGridGroupingDefaults(
+      normalizedCurrentConfig
     );
   }
-  return isEqual2;
+  const cleanedViewConfig = cleanObject(normalizedViewConfig, provider);
+  const cleanedCurrentConfig = cleanObject(normalizedCurrentConfig, provider);
+  return import_lodash.default.isEqual(cleanedViewConfig, cleanedCurrentConfig);
 };
 var hasPermissionForViewLevel = (viewLevel, permissions) => {
   switch (viewLevel) {
@@ -9892,7 +9895,6 @@ var PanelContent = (props) => {
     updateSavedView(newSavedView, {
       onSuccess: () => {
         showToast.success(I18n.t("savedViews.update.success"));
-        props.onSelect({ item: newSavedView });
       },
       onError: () => {
         showToast.error(I18n.t("savedViews.errors.update"));
@@ -11057,7 +11059,10 @@ var extractDefaultView = (gridApi, receivedConfig) => {
     columnGroupState: (receivedConfig == null ? void 0 : receivedConfig.columnGroupState) ?? [],
     rowGroupState: (receivedConfig == null ? void 0 : receivedConfig.rowGroupState) ?? [],
     filterState: (receivedConfig == null ? void 0 : receivedConfig.filterState) ?? {},
-    rowHeight: (receivedConfig == null ? void 0 : receivedConfig.rowHeight) ?? ((_b = gridApi.getSizesForCurrentTheme()) == null ? void 0 : _b.rowHeight)
+    rowHeight: (receivedConfig == null ? void 0 : receivedConfig.rowHeight) ?? ((_b = gridApi.getSizesForCurrentTheme()) == null ? void 0 : _b.rowHeight),
+    enableRowGrouping: receivedConfig == null ? void 0 : receivedConfig.enableRowGrouping,
+    enableColumnGrouping: receivedConfig == null ? void 0 : receivedConfig.enableColumnGrouping,
+    enableSplitAssembliesForDynamicGrouping: receivedConfig == null ? void 0 : receivedConfig.enableSplitAssembliesForDynamicGrouping
   };
   return result;
 };
@@ -11075,6 +11080,12 @@ var useNormalizedDefaultViews = (defaultViews, gridApi) => {
 // src/components/adapters/smart-grid/useSmartGridConfig.ts
 var import_react15 = require("react");
+var import_lodash2 = __toESM(require_lodash());
+var ESTIMATING_GROUPING_STATE_KEYS = [
+  "enableRowGrouping",
+  "enableColumnGrouping",
+  "enableSplitAssembliesForDynamicGrouping"
+];
 var GRID_STATE_EVENTS = [
   "sortChanged",
   "filterOpened",
@@ -11101,7 +11112,10 @@ var useSmartGridConfig = (gridApi) => {
       if (eventListenersDisabledRef.current) {
         return;
       }
-      setConfig(getSmartGridConfig(gridApi));
+      setConfig((prev) => ({
+        ...getSmartGridConfig(gridApi),
+        ...import_lodash2.default.pick(prev, ESTIMATING_GROUPING_STATE_KEYS)
+      }));
     };
     GRID_STATE_EVENTS.forEach((event) => {
       gridApi.addEventListener(event, updateConfig);
@@ -11132,6 +11146,12 @@ var SmartGridSavedViews = (props) => {
   } = useSmartGridConfig(gridApi);
   const presetViews = useNormalizedDefaultViews(props.defaultViews, gridApi);
   const defaultView = presetViews.find((view) => view.id === "default") ?? presetViews[0];
+  const tableConfigForSavedViews = (0, import_react16.useMemo)(() => {
+    if (!props.augmentTableConfig) {
+      return tableConfig;
+    }
+    return props.augmentTableConfig(tableConfig);
+  }, [props.augmentTableConfig, tableConfig]);
   const onSelect = (0, import_react16.useCallback)(
     ({ item }) => {
       var _a;
@@ -11163,7 +11183,7 @@ var SmartGridSavedViews = (props) => {
       }, 0);
       return updatedView;
     },
-    [gridApi, tableConfig, setTableConfig]
+    [gridApi, tableConfig, setTableConfig, props.transformSettings]
   );
   return /* @__PURE__ */ import_react16.default.createElement(
     SavedViews,
@@ -11177,7 +11197,7 @@ var SmartGridSavedViews = (props) => {
       defaultView,
       presetViews,
       tableName: props.tableName,
-      tableConfig,
+      tableConfig: tableConfigForSavedViews,
       backend: props.backend,
       enableSharingViews: props.enableSharingViews
     }

package/dist/legacy/index.mjs CHANGED Viewed

@@ -1470,7 +1470,7 @@ var require_lodash = __commonJS({
         return string3.match(reUnicodeWord) || [];
       }
       var runInContext = function runInContext2(context) {
-        context = context == null ? root : _3.defaults(root.Object(), context, _3.pick(root, contextProps));
+        context = context == null ? root : _4.defaults(root.Object(), context, _4.pick(root, contextProps));
         var Array2 = context.Array, Date = context.Date, Error2 = context.Error, Function2 = context.Function, Math2 = context.Math, Object2 = context.Object, RegExp2 = context.RegExp, String2 = context.String, TypeError2 = context.TypeError;
         var arrayProto = Array2.prototype, funcProto = Function2.prototype, objectProto = Object2.prototype;
         var coreJsData = context["__core-js_shared__"];
@@ -6264,17 +6264,17 @@ var require_lodash = __commonJS({
         }
         return lodash;
       };
-      var _3 = runInContext();
+      var _4 = runInContext();
       if (typeof define == "function" && typeof define.amd == "object" && define.amd) {
-        root._ = _3;
+        root._ = _4;
         define(function() {
-          return _3;
+          return _4;
         });
       } else if (freeModule) {
-        (freeModule.exports = _3)._ = _3;
-        freeExports._ = _3;
+        (freeModule.exports = _4)._ = _4;
+        freeExports._ = _4;
       } else {
-        root._ = _3;
+        root._ = _4;
       }
     }).call(exports);
   }
@@ -9138,7 +9138,7 @@ function Fe(e2, t2, n2) {
     return t3 ? t3 + "-" + r2 : r2;
   }(t2.displayName, t2.parentComponentId) : l2, h = t2.displayName, y2 = void 0 === h ? function(e3) {
     return Te(e3) ? "styled." + e3 : "Styled(" + E(e3) + ")";
-  }(e2) : h, v2 = t2.displayName && t2.componentId ? De(t2.displayName) + "-" + t2.componentId : t2.componentId || d, _3 = o2 && e2.attrs ? Array.prototype.concat(e2.attrs, c2).filter(Boolean) : c2, N = t2.shouldForwardProp;
+  }(e2) : h, v2 = t2.displayName && t2.componentId ? De(t2.displayName) + "-" + t2.componentId : t2.componentId || d, _4 = o2 && e2.attrs ? Array.prototype.concat(e2.attrs, c2).filter(Boolean) : c2, N = t2.shouldForwardProp;
   o2 && e2.shouldForwardProp && (N = t2.shouldForwardProp ? function(n3, r2, o3) {
     return e2.shouldForwardProp(n3, r2, o3) && t2.shouldForwardProp(n3, r2, o3);
   } : e2.shouldForwardProp);
@@ -9155,13 +9155,13 @@ function Fe(e2, t2, n2) {
       }(Pe(t4, s(Be), a3) || S, t4, o3), y3 = f2[0], v3 = f2[1], g2 = function(e5, t5, n4, r3) {
         var o4 = he(), s2 = pe(), i4 = t5 ? e5.generateAndInjectStyles(S, o4, s2) : e5.generateAndInjectStyles(n4, o4, s2);
         return "production" !== process.env.NODE_ENV && !t5 && r3 && r3(i4), i4;
-      }(i3, r2, y3, "production" !== process.env.NODE_ENV ? e4.warnTooManyClasses : void 0), E2 = n3, b2 = v3.$as || t4.$as || v3.as || t4.as || h2, _4 = Te(b2), N2 = v3 !== t4 ? m({}, t4, {}, v3) : t4, A3 = {};
+      }(i3, r2, y3, "production" !== process.env.NODE_ENV ? e4.warnTooManyClasses : void 0), E2 = n3, b2 = v3.$as || t4.$as || v3.as || t4.as || h2, _5 = Te(b2), N2 = v3 !== t4 ? m({}, t4, {}, v3) : t4, A3 = {};
       for (var C3 in N2)
-        "$" !== C3[0] && "as" !== C3 && ("forwardedAs" === C3 ? A3.as = N2[C3] : (l3 ? l3(C3, isPropValid, b2) : !_4 || isPropValid(C3)) && (A3[C3] = N2[C3]));
+        "$" !== C3[0] && "as" !== C3 && ("forwardedAs" === C3 ? A3.as = N2[C3] : (l3 ? l3(C3, isPropValid, b2) : !_5 || isPropValid(C3)) && (A3[C3] = N2[C3]));
       return t4.style && v3.style !== t4.style && (A3.style = m({}, t4.style, {}, v3.style)), A3.className = Array.prototype.concat(c3, d2, g2 !== d2 ? g2 : null, t4.className, v3.className).filter(Boolean).join(" "), A3.ref = E2, u(b2, A3);
     }(A2, e3, t3, I);
   };
-  return P4.displayName = y2, (A2 = r.forwardRef(P4)).attrs = _3, A2.componentStyle = C2, A2.displayName = y2, A2.shouldForwardProp = N, A2.foldedComponentIds = o2 ? Array.prototype.concat(e2.foldedComponentIds, e2.styledComponentId) : g, A2.styledComponentId = v2, A2.target = o2 ? e2.target : e2, A2.withComponent = function(e3) {
+  return P4.displayName = y2, (A2 = r.forwardRef(P4)).attrs = _4, A2.componentStyle = C2, A2.displayName = y2, A2.shouldForwardProp = N, A2.foldedComponentIds = o2 ? Array.prototype.concat(e2.foldedComponentIds, e2.styledComponentId) : g, A2.styledComponentId = v2, A2.target = o2 ? e2.target : e2, A2.withComponent = function(e3) {
     var r2 = t2.componentId, o3 = function(e4, t3) {
       if (null == e4)
         return {};
@@ -9170,7 +9170,7 @@ function Fe(e2, t2, n2) {
         n3 = s3[r3], t3.indexOf(n3) >= 0 || (o4[n3] = e4[n3]);
       return o4;
     }(t2, ["componentId"]), s2 = r2 && r2 + "-" + (Te(e3) ? e3 : De(E(e3)));
-    return Fe(e3, m({}, o3, { attrs: _3, componentId: s2 }), n2);
+    return Fe(e3, m({}, o3, { attrs: _4, componentId: s2 }), n2);
   }, Object.defineProperty(A2, "defaultProps", { get: function() {
     return this._foldedDefaultProps;
   }, set: function(t3) {
@@ -9747,11 +9747,7 @@ var normalizeForComparison = (config) => {
     }
   );
   return {
-    ...import_lodash.default.omit(config, [
-      "enableRowGrouping",
-      "enableColumnGrouping",
-      "enableSplitAssembliesForDynamicGrouping"
-    ]),
+    ...config,
     columnState: filteredColumnState.map((col) => {
       const res = import_lodash.default.omit(col, ["aggFunc"]);
       if (col.flex) {
@@ -9761,6 +9757,15 @@ var normalizeForComparison = (config) => {
     })
   };
 };
+var withSmartGridGroupingDefaults = (config) => {
+  const c2 = config;
+  return {
+    ...c2,
+    enableRowGrouping: c2.enableRowGrouping ?? false,
+    enableColumnGrouping: c2.enableColumnGrouping ?? false,
+    enableSplitAssembliesForDynamicGrouping: c2.enableSplitAssembliesForDynamicGrouping ?? false
+  };
+};
 var isEqual = (viewTableConfig, tableConfig, defaultViewConfig, provider) => {
   if (!viewTableConfig || !tableConfig)
     return false;
@@ -9768,19 +9773,17 @@ var isEqual = (viewTableConfig, tableConfig, defaultViewConfig, provider) => {
     viewTableConfig,
     defaultViewConfig
   );
-  const normalizedViewConfig = normalizeForComparison(syncedViewTableConfig);
-  const normalizedCurrentConfig = normalizeForComparison(tableConfig);
-  const cleanedViewConfig = cleanObject(normalizedViewConfig, provider);
-  const cleanedCurrentConfig = cleanObject(normalizedCurrentConfig, provider);
-  const isEqual2 = import_lodash.default.isEqual(cleanedViewConfig, cleanedCurrentConfig);
-  if (!isEqual2) {
-    console.log(
-      "[SavedViews]: Showing update button - view config, current config",
-      cleanedViewConfig,
-      cleanedCurrentConfig
+  let normalizedViewConfig = normalizeForComparison(syncedViewTableConfig);
+  let normalizedCurrentConfig = normalizeForComparison(tableConfig);
+  if (provider === "smart-grid") {
+    normalizedViewConfig = withSmartGridGroupingDefaults(normalizedViewConfig);
+    normalizedCurrentConfig = withSmartGridGroupingDefaults(
+      normalizedCurrentConfig
     );
   }
-  return isEqual2;
+  const cleanedViewConfig = cleanObject(normalizedViewConfig, provider);
+  const cleanedCurrentConfig = cleanObject(normalizedCurrentConfig, provider);
+  return import_lodash.default.isEqual(cleanedViewConfig, cleanedCurrentConfig);
 };
 var hasPermissionForViewLevel = (viewLevel, permissions) => {
   switch (viewLevel) {
@@ -9896,7 +9899,6 @@ var PanelContent = (props) => {
     updateSavedView(newSavedView, {
       onSuccess: () => {
         showToast.success(I18n.t("savedViews.update.success"));
-        props.onSelect({ item: newSavedView });
       },
       onError: () => {
         showToast.error(I18n.t("savedViews.errors.update"));
@@ -11039,7 +11041,7 @@ var SavedViews = (props) => {
 };
 // src/components/adapters/smart-grid/SmartGridSavedViews.tsx
-import React24, { useCallback as useCallback4 } from "react";
+import React24, { useCallback as useCallback4, useMemo as useMemo3 } from "react";
 // src/components/adapters/smart-grid/SmartGridDefaultSavedView.tsx
 import { useMemo as useMemo2 } from "react";
@@ -11097,7 +11099,10 @@ var extractDefaultView = (gridApi, receivedConfig) => {
     columnGroupState: (receivedConfig == null ? void 0 : receivedConfig.columnGroupState) ?? [],
     rowGroupState: (receivedConfig == null ? void 0 : receivedConfig.rowGroupState) ?? [],
     filterState: (receivedConfig == null ? void 0 : receivedConfig.filterState) ?? {},
-    rowHeight: (receivedConfig == null ? void 0 : receivedConfig.rowHeight) ?? ((_b = gridApi.getSizesForCurrentTheme()) == null ? void 0 : _b.rowHeight)
+    rowHeight: (receivedConfig == null ? void 0 : receivedConfig.rowHeight) ?? ((_b = gridApi.getSizesForCurrentTheme()) == null ? void 0 : _b.rowHeight),
+    enableRowGrouping: receivedConfig == null ? void 0 : receivedConfig.enableRowGrouping,
+    enableColumnGrouping: receivedConfig == null ? void 0 : receivedConfig.enableColumnGrouping,
+    enableSplitAssembliesForDynamicGrouping: receivedConfig == null ? void 0 : receivedConfig.enableSplitAssembliesForDynamicGrouping
   };
   return result;
 };
@@ -11114,7 +11119,13 @@ var useNormalizedDefaultViews = (defaultViews, gridApi) => {
 };
 // src/components/adapters/smart-grid/useSmartGridConfig.ts
+var import_lodash2 = __toESM(require_lodash());
 import { useState as useState5, useEffect as useEffect6, useRef as useRef4 } from "react";
+var ESTIMATING_GROUPING_STATE_KEYS = [
+  "enableRowGrouping",
+  "enableColumnGrouping",
+  "enableSplitAssembliesForDynamicGrouping"
+];
 var GRID_STATE_EVENTS = [
   "sortChanged",
   "filterOpened",
@@ -11141,7 +11152,10 @@ var useSmartGridConfig = (gridApi) => {
       if (eventListenersDisabledRef.current) {
         return;
       }
-      setConfig(getSmartGridConfig(gridApi));
+      setConfig((prev) => ({
+        ...getSmartGridConfig(gridApi),
+        ...import_lodash2.default.pick(prev, ESTIMATING_GROUPING_STATE_KEYS)
+      }));
     };
     GRID_STATE_EVENTS.forEach((event) => {
       gridApi.addEventListener(event, updateConfig);
@@ -11172,6 +11186,12 @@ var SmartGridSavedViews = (props) => {
   } = useSmartGridConfig(gridApi);
   const presetViews = useNormalizedDefaultViews(props.defaultViews, gridApi);
   const defaultView = presetViews.find((view) => view.id === "default") ?? presetViews[0];
+  const tableConfigForSavedViews = useMemo3(() => {
+    if (!props.augmentTableConfig) {
+      return tableConfig;
+    }
+    return props.augmentTableConfig(tableConfig);
+  }, [props.augmentTableConfig, tableConfig]);
   const onSelect = useCallback4(
     ({ item }) => {
       var _a;
@@ -11203,7 +11223,7 @@ var SmartGridSavedViews = (props) => {
       }, 0);
       return updatedView;
     },
-    [gridApi, tableConfig, setTableConfig]
+    [gridApi, tableConfig, setTableConfig, props.transformSettings]
   );
   return /* @__PURE__ */ React24.createElement(
     SavedViews,
@@ -11217,7 +11237,7 @@ var SmartGridSavedViews = (props) => {
       defaultView,
       presetViews,
       tableName: props.tableName,
-      tableConfig,
+      tableConfig: tableConfigForSavedViews,
       backend: props.backend,
       enableSharingViews: props.enableSharingViews
     }
@@ -11233,7 +11253,7 @@ import React25, {
 } from "react";
 // src/components/adapters/data-table/DataTableDefaultSavedView.tsx
-import { useMemo as useMemo3 } from "react";
+import { useMemo as useMemo4 } from "react";
 var DEFAULT_COLUMN_STATE2 = {
   hidden: false,
   pinned: null,
@@ -11281,7 +11301,7 @@ var extractDefaultView2 = (columnDefinitions, receivedConfigFromTool) => {
   return result;
 };
 var useNormalizedDefaultViews2 = (defaultViews, columnDefinitions) => {
-  return useMemo3(
+  return useMemo4(
     () => defaultViews.map((view) => ({
       ...view,
       share_token: "",

package/dist/modern/index.d.mts CHANGED Viewed

@@ -31,6 +31,9 @@ interface ISmartGridConfig {
     rowGroupState: string[];
     rowHeight: number | undefined;
     filterState: FilterModel;
+    enableRowGrouping?: boolean;
+    enableColumnGrouping?: boolean;
+    enableSplitAssembliesForDynamicGrouping?: boolean;
 }
 declare const PROJECT_LEVEL_TOOL_VIEW_LEVELS: readonly ["company", "project", "personal"];
@@ -106,6 +109,12 @@ interface IDataTableSavedViewsExternalConsumerProps extends IBaseSavedViewsProps
 interface ISmartGridSavedViewsExternalConsumerProps extends IBaseSavedViewsProps {
     gridApi: GridApi;
     transformSettings?: (config: ISmartGridConfig) => ISmartGridConfig;
+    /**
+     * Merge live app state into the config used for Update visibility and persisting views.
+     * AG Grid events only report column/group/filter state — use this for flags such as
+     * enableRowGrouping / enableSplitAssembliesForDynamicGrouping that live outside the grid API.
+     */
+    augmentTableConfig?: (config: ISmartGridConfig) => ISmartGridConfig;
     defaultViews: ISmartGridDefaultViewConfig[];
 }

package/dist/modern/index.d.ts CHANGED Viewed

@@ -31,6 +31,9 @@ interface ISmartGridConfig {
     rowGroupState: string[];
     rowHeight: number | undefined;
     filterState: FilterModel;
+    enableRowGrouping?: boolean;
+    enableColumnGrouping?: boolean;
+    enableSplitAssembliesForDynamicGrouping?: boolean;
 }
 declare const PROJECT_LEVEL_TOOL_VIEW_LEVELS: readonly ["company", "project", "personal"];
@@ -106,6 +109,12 @@ interface IDataTableSavedViewsExternalConsumerProps extends IBaseSavedViewsProps
 interface ISmartGridSavedViewsExternalConsumerProps extends IBaseSavedViewsProps {
     gridApi: GridApi;
     transformSettings?: (config: ISmartGridConfig) => ISmartGridConfig;
+    /**
+     * Merge live app state into the config used for Update visibility and persisting views.
+     * AG Grid events only report column/group/filter state — use this for flags such as
+     * enableRowGrouping / enableSplitAssembliesForDynamicGrouping that live outside the grid API.
+     */
+    augmentTableConfig?: (config: ISmartGridConfig) => ISmartGridConfig;
     defaultViews: ISmartGridDefaultViewConfig[];
 }

package/dist/modern/index.js CHANGED Viewed

@@ -1469,7 +1469,7 @@ var require_lodash = __commonJS({
         return string3.match(reUnicodeWord) || [];
       }
       var runInContext = function runInContext2(context) {
-        context = context == null ? root : _3.defaults(root.Object(), context, _3.pick(root, contextProps));
+        context = context == null ? root : _4.defaults(root.Object(), context, _4.pick(root, contextProps));
         var Array2 = context.Array, Date = context.Date, Error2 = context.Error, Function2 = context.Function, Math2 = context.Math, Object2 = context.Object, RegExp2 = context.RegExp, String2 = context.String, TypeError2 = context.TypeError;
         var arrayProto = Array2.prototype, funcProto = Function2.prototype, objectProto = Object2.prototype;
         var coreJsData = context["__core-js_shared__"];
@@ -6263,17 +6263,17 @@ var require_lodash = __commonJS({
         }
         return lodash;
       };
-      var _3 = runInContext();
+      var _4 = runInContext();
       if (typeof define == "function" && typeof define.amd == "object" && define.amd) {
-        root._ = _3;
+        root._ = _4;
         define(function() {
-          return _3;
+          return _4;
         });
       } else if (freeModule) {
-        (freeModule.exports = _3)._ = _3;
-        freeExports._ = _3;
+        (freeModule.exports = _4)._ = _4;
+        freeExports._ = _4;
       } else {
-        root._ = _3;
+        root._ = _4;
       }
     }).call(exports);
   }
@@ -9151,7 +9151,7 @@ function Fe(e2, t2, n2) {
     return t3 ? t3 + "-" + r2 : r2;
   }(t2.displayName, t2.parentComponentId) : l2, h = t2.displayName, y2 = void 0 === h ? function(e3) {
     return Te(e3) ? "styled." + e3 : "Styled(" + E(e3) + ")";
-  }(e2) : h, v2 = t2.displayName && t2.componentId ? De(t2.displayName) + "-" + t2.componentId : t2.componentId || d, _3 = o2 && e2.attrs ? Array.prototype.concat(e2.attrs, c2).filter(Boolean) : c2, N = t2.shouldForwardProp;
+  }(e2) : h, v2 = t2.displayName && t2.componentId ? De(t2.displayName) + "-" + t2.componentId : t2.componentId || d, _4 = o2 && e2.attrs ? Array.prototype.concat(e2.attrs, c2).filter(Boolean) : c2, N = t2.shouldForwardProp;
   o2 && e2.shouldForwardProp && (N = t2.shouldForwardProp ? function(n3, r2, o3) {
     return e2.shouldForwardProp(n3, r2, o3) && t2.shouldForwardProp(n3, r2, o3);
   } : e2.shouldForwardProp);
@@ -9168,13 +9168,13 @@ function Fe(e2, t2, n2) {
       }(Pe(t4, (0, import_react.useContext)(Be), a3) || S, t4, o3), y3 = f2[0], v3 = f2[1], g2 = function(e5, t5, n4, r3) {
         var o4 = he(), s2 = pe(), i4 = t5 ? e5.generateAndInjectStyles(S, o4, s2) : e5.generateAndInjectStyles(n4, o4, s2);
         return "production" !== process.env.NODE_ENV && !t5 && r3 && r3(i4), i4;
-      }(i3, r2, y3, "production" !== process.env.NODE_ENV ? e4.warnTooManyClasses : void 0), E2 = n3, b2 = v3.$as || t4.$as || v3.as || t4.as || h2, _4 = Te(b2), N2 = v3 !== t4 ? m({}, t4, {}, v3) : t4, A3 = {};
+      }(i3, r2, y3, "production" !== process.env.NODE_ENV ? e4.warnTooManyClasses : void 0), E2 = n3, b2 = v3.$as || t4.$as || v3.as || t4.as || h2, _5 = Te(b2), N2 = v3 !== t4 ? m({}, t4, {}, v3) : t4, A3 = {};
       for (var C3 in N2)
-        "$" !== C3[0] && "as" !== C3 && ("forwardedAs" === C3 ? A3.as = N2[C3] : (l3 ? l3(C3, isPropValid, b2) : !_4 || isPropValid(C3)) && (A3[C3] = N2[C3]));
+        "$" !== C3[0] && "as" !== C3 && ("forwardedAs" === C3 ? A3.as = N2[C3] : (l3 ? l3(C3, isPropValid, b2) : !_5 || isPropValid(C3)) && (A3[C3] = N2[C3]));
       return t4.style && v3.style !== t4.style && (A3.style = m({}, t4.style, {}, v3.style)), A3.className = Array.prototype.concat(c3, d2, g2 !== d2 ? g2 : null, t4.className, v3.className).filter(Boolean).join(" "), A3.ref = E2, (0, import_react.createElement)(b2, A3);
     }(A2, e3, t3, I);
   };
-  return P4.displayName = y2, (A2 = import_react.default.forwardRef(P4)).attrs = _3, A2.componentStyle = C2, A2.displayName = y2, A2.shouldForwardProp = N, A2.foldedComponentIds = o2 ? Array.prototype.concat(e2.foldedComponentIds, e2.styledComponentId) : g, A2.styledComponentId = v2, A2.target = o2 ? e2.target : e2, A2.withComponent = function(e3) {
+  return P4.displayName = y2, (A2 = import_react.default.forwardRef(P4)).attrs = _4, A2.componentStyle = C2, A2.displayName = y2, A2.shouldForwardProp = N, A2.foldedComponentIds = o2 ? Array.prototype.concat(e2.foldedComponentIds, e2.styledComponentId) : g, A2.styledComponentId = v2, A2.target = o2 ? e2.target : e2, A2.withComponent = function(e3) {
     var r2 = t2.componentId, o3 = function(e4, t3) {
       if (null == e4)
         return {};
@@ -9183,7 +9183,7 @@ function Fe(e2, t2, n2) {
         n3 = s3[r3], t3.indexOf(n3) >= 0 || (o4[n3] = e4[n3]);
       return o4;
     }(t2, ["componentId"]), s2 = r2 && r2 + "-" + (Te(e3) ? e3 : De(E(e3)));
-    return Fe(e3, m({}, o3, { attrs: _3, componentId: s2 }), n2);
+    return Fe(e3, m({}, o3, { attrs: _4, componentId: s2 }), n2);
   }, Object.defineProperty(A2, "defaultProps", { get: function() {
     return this._foldedDefaultProps;
   }, set: function(t3) {
@@ -9746,11 +9746,7 @@ var normalizeForComparison = (config) => {
     }
   );
   return {
-    ...import_lodash.default.omit(config, [
-      "enableRowGrouping",
-      "enableColumnGrouping",
-      "enableSplitAssembliesForDynamicGrouping"
-    ]),
+    ...config,
     columnState: filteredColumnState.map((col) => {
       const res = import_lodash.default.omit(col, ["aggFunc"]);
       if (col.flex) {
@@ -9760,6 +9756,15 @@ var normalizeForComparison = (config) => {
     })
   };
 };
+var withSmartGridGroupingDefaults = (config) => {
+  const c2 = config;
+  return {
+    ...c2,
+    enableRowGrouping: c2.enableRowGrouping ?? false,
+    enableColumnGrouping: c2.enableColumnGrouping ?? false,
+    enableSplitAssembliesForDynamicGrouping: c2.enableSplitAssembliesForDynamicGrouping ?? false
+  };
+};
 var isEqual = (viewTableConfig, tableConfig, defaultViewConfig, provider) => {
   if (!viewTableConfig || !tableConfig)
     return false;
@@ -9767,19 +9772,17 @@ var isEqual = (viewTableConfig, tableConfig, defaultViewConfig, provider) => {
     viewTableConfig,
     defaultViewConfig
   );
-  const normalizedViewConfig = normalizeForComparison(syncedViewTableConfig);
-  const normalizedCurrentConfig = normalizeForComparison(tableConfig);
-  const cleanedViewConfig = cleanObject(normalizedViewConfig, provider);
-  const cleanedCurrentConfig = cleanObject(normalizedCurrentConfig, provider);
-  const isEqual2 = import_lodash.default.isEqual(cleanedViewConfig, cleanedCurrentConfig);
-  if (!isEqual2) {
-    console.log(
-      "[SavedViews]: Showing update button - view config, current config",
-      cleanedViewConfig,
-      cleanedCurrentConfig
+  let normalizedViewConfig = normalizeForComparison(syncedViewTableConfig);
+  let normalizedCurrentConfig = normalizeForComparison(tableConfig);
+  if (provider === "smart-grid") {
+    normalizedViewConfig = withSmartGridGroupingDefaults(normalizedViewConfig);
+    normalizedCurrentConfig = withSmartGridGroupingDefaults(
+      normalizedCurrentConfig
     );
   }
-  return isEqual2;
+  const cleanedViewConfig = cleanObject(normalizedViewConfig, provider);
+  const cleanedCurrentConfig = cleanObject(normalizedCurrentConfig, provider);
+  return import_lodash.default.isEqual(cleanedViewConfig, cleanedCurrentConfig);
 };
 var hasPermissionForViewLevel = (viewLevel, permissions) => {
   switch (viewLevel) {
@@ -9889,7 +9892,6 @@ var PanelContent = (props) => {
     updateSavedView(newSavedView, {
       onSuccess: () => {
         showToast.success(I18n.t("savedViews.update.success"));
-        props.onSelect({ item: newSavedView });
       },
       onError: () => {
         showToast.error(I18n.t("savedViews.errors.update"));
@@ -11052,7 +11054,10 @@ var extractDefaultView = (gridApi, receivedConfig) => {
     columnGroupState: receivedConfig?.columnGroupState ?? [],
     rowGroupState: receivedConfig?.rowGroupState ?? [],
     filterState: receivedConfig?.filterState ?? {},
-    rowHeight: receivedConfig?.rowHeight ?? gridApi.getSizesForCurrentTheme()?.rowHeight
+    rowHeight: receivedConfig?.rowHeight ?? gridApi.getSizesForCurrentTheme()?.rowHeight,
+    enableRowGrouping: receivedConfig?.enableRowGrouping,
+    enableColumnGrouping: receivedConfig?.enableColumnGrouping,
+    enableSplitAssembliesForDynamicGrouping: receivedConfig?.enableSplitAssembliesForDynamicGrouping
   };
   return result;
 };
@@ -11070,6 +11075,12 @@ var useNormalizedDefaultViews = (defaultViews, gridApi) => {
 // src/components/adapters/smart-grid/useSmartGridConfig.ts
 var import_react15 = require("react");
+var import_lodash2 = __toESM(require_lodash());
+var ESTIMATING_GROUPING_STATE_KEYS = [
+  "enableRowGrouping",
+  "enableColumnGrouping",
+  "enableSplitAssembliesForDynamicGrouping"
+];
 var GRID_STATE_EVENTS = [
   "sortChanged",
   "filterOpened",
@@ -11096,7 +11107,10 @@ var useSmartGridConfig = (gridApi) => {
       if (eventListenersDisabledRef.current) {
         return;
       }
-      setConfig(getSmartGridConfig(gridApi));
+      setConfig((prev) => ({
+        ...getSmartGridConfig(gridApi),
+        ...import_lodash2.default.pick(prev, ESTIMATING_GROUPING_STATE_KEYS)
+      }));
     };
     GRID_STATE_EVENTS.forEach((event) => {
       gridApi.addEventListener(event, updateConfig);
@@ -11127,6 +11141,12 @@ var SmartGridSavedViews = (props) => {
   } = useSmartGridConfig(gridApi);
   const presetViews = useNormalizedDefaultViews(props.defaultViews, gridApi);
   const defaultView = presetViews.find((view) => view.id === "default") ?? presetViews[0];
+  const tableConfigForSavedViews = (0, import_react16.useMemo)(() => {
+    if (!props.augmentTableConfig) {
+      return tableConfig;
+    }
+    return props.augmentTableConfig(tableConfig);
+  }, [props.augmentTableConfig, tableConfig]);
   const onSelect = (0, import_react16.useCallback)(
     ({ item }) => {
       if (!gridApi)
@@ -11157,7 +11177,7 @@ var SmartGridSavedViews = (props) => {
       }, 0);
       return updatedView;
     },
-    [gridApi, tableConfig, setTableConfig]
+    [gridApi, tableConfig, setTableConfig, props.transformSettings]
   );
   return /* @__PURE__ */ import_react16.default.createElement(
     SavedViews,
@@ -11171,7 +11191,7 @@ var SmartGridSavedViews = (props) => {
       defaultView,
       presetViews,
       tableName: props.tableName,
-      tableConfig,
+      tableConfig: tableConfigForSavedViews,
       backend: props.backend,
       enableSharingViews: props.enableSharingViews
     }

package/dist/modern/index.mjs CHANGED Viewed

@@ -1470,7 +1470,7 @@ var require_lodash = __commonJS({
         return string3.match(reUnicodeWord) || [];
       }
       var runInContext = function runInContext2(context) {
-        context = context == null ? root : _3.defaults(root.Object(), context, _3.pick(root, contextProps));
+        context = context == null ? root : _4.defaults(root.Object(), context, _4.pick(root, contextProps));
         var Array2 = context.Array, Date = context.Date, Error2 = context.Error, Function2 = context.Function, Math2 = context.Math, Object2 = context.Object, RegExp2 = context.RegExp, String2 = context.String, TypeError2 = context.TypeError;
         var arrayProto = Array2.prototype, funcProto = Function2.prototype, objectProto = Object2.prototype;
         var coreJsData = context["__core-js_shared__"];
@@ -6264,17 +6264,17 @@ var require_lodash = __commonJS({
         }
         return lodash;
       };
-      var _3 = runInContext();
+      var _4 = runInContext();
       if (typeof define == "function" && typeof define.amd == "object" && define.amd) {
-        root._ = _3;
+        root._ = _4;
         define(function() {
-          return _3;
+          return _4;
         });
       } else if (freeModule) {
-        (freeModule.exports = _3)._ = _3;
-        freeExports._ = _3;
+        (freeModule.exports = _4)._ = _4;
+        freeExports._ = _4;
       } else {
-        root._ = _3;
+        root._ = _4;
       }
     }).call(exports);
   }
@@ -9138,7 +9138,7 @@ function Fe(e2, t2, n2) {
     return t3 ? t3 + "-" + r2 : r2;
   }(t2.displayName, t2.parentComponentId) : l2, h = t2.displayName, y2 = void 0 === h ? function(e3) {
     return Te(e3) ? "styled." + e3 : "Styled(" + E(e3) + ")";
-  }(e2) : h, v2 = t2.displayName && t2.componentId ? De(t2.displayName) + "-" + t2.componentId : t2.componentId || d, _3 = o2 && e2.attrs ? Array.prototype.concat(e2.attrs, c2).filter(Boolean) : c2, N = t2.shouldForwardProp;
+  }(e2) : h, v2 = t2.displayName && t2.componentId ? De(t2.displayName) + "-" + t2.componentId : t2.componentId || d, _4 = o2 && e2.attrs ? Array.prototype.concat(e2.attrs, c2).filter(Boolean) : c2, N = t2.shouldForwardProp;
   o2 && e2.shouldForwardProp && (N = t2.shouldForwardProp ? function(n3, r2, o3) {
     return e2.shouldForwardProp(n3, r2, o3) && t2.shouldForwardProp(n3, r2, o3);
   } : e2.shouldForwardProp);
@@ -9155,13 +9155,13 @@ function Fe(e2, t2, n2) {
       }(Pe(t4, s(Be), a3) || S, t4, o3), y3 = f2[0], v3 = f2[1], g2 = function(e5, t5, n4, r3) {
         var o4 = he(), s2 = pe(), i4 = t5 ? e5.generateAndInjectStyles(S, o4, s2) : e5.generateAndInjectStyles(n4, o4, s2);
         return "production" !== process.env.NODE_ENV && !t5 && r3 && r3(i4), i4;
-      }(i3, r2, y3, "production" !== process.env.NODE_ENV ? e4.warnTooManyClasses : void 0), E2 = n3, b2 = v3.$as || t4.$as || v3.as || t4.as || h2, _4 = Te(b2), N2 = v3 !== t4 ? m({}, t4, {}, v3) : t4, A3 = {};
+      }(i3, r2, y3, "production" !== process.env.NODE_ENV ? e4.warnTooManyClasses : void 0), E2 = n3, b2 = v3.$as || t4.$as || v3.as || t4.as || h2, _5 = Te(b2), N2 = v3 !== t4 ? m({}, t4, {}, v3) : t4, A3 = {};
       for (var C3 in N2)
-        "$" !== C3[0] && "as" !== C3 && ("forwardedAs" === C3 ? A3.as = N2[C3] : (l3 ? l3(C3, isPropValid, b2) : !_4 || isPropValid(C3)) && (A3[C3] = N2[C3]));
+        "$" !== C3[0] && "as" !== C3 && ("forwardedAs" === C3 ? A3.as = N2[C3] : (l3 ? l3(C3, isPropValid, b2) : !_5 || isPropValid(C3)) && (A3[C3] = N2[C3]));
       return t4.style && v3.style !== t4.style && (A3.style = m({}, t4.style, {}, v3.style)), A3.className = Array.prototype.concat(c3, d2, g2 !== d2 ? g2 : null, t4.className, v3.className).filter(Boolean).join(" "), A3.ref = E2, u(b2, A3);
     }(A2, e3, t3, I);
   };
-  return P4.displayName = y2, (A2 = r.forwardRef(P4)).attrs = _3, A2.componentStyle = C2, A2.displayName = y2, A2.shouldForwardProp = N, A2.foldedComponentIds = o2 ? Array.prototype.concat(e2.foldedComponentIds, e2.styledComponentId) : g, A2.styledComponentId = v2, A2.target = o2 ? e2.target : e2, A2.withComponent = function(e3) {
+  return P4.displayName = y2, (A2 = r.forwardRef(P4)).attrs = _4, A2.componentStyle = C2, A2.displayName = y2, A2.shouldForwardProp = N, A2.foldedComponentIds = o2 ? Array.prototype.concat(e2.foldedComponentIds, e2.styledComponentId) : g, A2.styledComponentId = v2, A2.target = o2 ? e2.target : e2, A2.withComponent = function(e3) {
     var r2 = t2.componentId, o3 = function(e4, t3) {
       if (null == e4)
         return {};
@@ -9170,7 +9170,7 @@ function Fe(e2, t2, n2) {
         n3 = s3[r3], t3.indexOf(n3) >= 0 || (o4[n3] = e4[n3]);
       return o4;
     }(t2, ["componentId"]), s2 = r2 && r2 + "-" + (Te(e3) ? e3 : De(E(e3)));
-    return Fe(e3, m({}, o3, { attrs: _3, componentId: s2 }), n2);
+    return Fe(e3, m({}, o3, { attrs: _4, componentId: s2 }), n2);
   }, Object.defineProperty(A2, "defaultProps", { get: function() {
     return this._foldedDefaultProps;
   }, set: function(t3) {
@@ -9744,11 +9744,7 @@ var normalizeForComparison = (config) => {
     }
   );
   return {
-    ...import_lodash.default.omit(config, [
-      "enableRowGrouping",
-      "enableColumnGrouping",
-      "enableSplitAssembliesForDynamicGrouping"
-    ]),
+    ...config,
     columnState: filteredColumnState.map((col) => {
       const res = import_lodash.default.omit(col, ["aggFunc"]);
       if (col.flex) {
@@ -9758,6 +9754,15 @@ var normalizeForComparison = (config) => {
     })
   };
 };
+var withSmartGridGroupingDefaults = (config) => {
+  const c2 = config;
+  return {
+    ...c2,
+    enableRowGrouping: c2.enableRowGrouping ?? false,
+    enableColumnGrouping: c2.enableColumnGrouping ?? false,
+    enableSplitAssembliesForDynamicGrouping: c2.enableSplitAssembliesForDynamicGrouping ?? false
+  };
+};
 var isEqual = (viewTableConfig, tableConfig, defaultViewConfig, provider) => {
   if (!viewTableConfig || !tableConfig)
     return false;
@@ -9765,19 +9770,17 @@ var isEqual = (viewTableConfig, tableConfig, defaultViewConfig, provider) => {
     viewTableConfig,
     defaultViewConfig
   );
-  const normalizedViewConfig = normalizeForComparison(syncedViewTableConfig);
-  const normalizedCurrentConfig = normalizeForComparison(tableConfig);
-  const cleanedViewConfig = cleanObject(normalizedViewConfig, provider);
-  const cleanedCurrentConfig = cleanObject(normalizedCurrentConfig, provider);
-  const isEqual2 = import_lodash.default.isEqual(cleanedViewConfig, cleanedCurrentConfig);
-  if (!isEqual2) {
-    console.log(
-      "[SavedViews]: Showing update button - view config, current config",
-      cleanedViewConfig,
-      cleanedCurrentConfig
+  let normalizedViewConfig = normalizeForComparison(syncedViewTableConfig);
+  let normalizedCurrentConfig = normalizeForComparison(tableConfig);
+  if (provider === "smart-grid") {
+    normalizedViewConfig = withSmartGridGroupingDefaults(normalizedViewConfig);
+    normalizedCurrentConfig = withSmartGridGroupingDefaults(
+      normalizedCurrentConfig
     );
   }
-  return isEqual2;
+  const cleanedViewConfig = cleanObject(normalizedViewConfig, provider);
+  const cleanedCurrentConfig = cleanObject(normalizedCurrentConfig, provider);
+  return import_lodash.default.isEqual(cleanedViewConfig, cleanedCurrentConfig);
 };
 var hasPermissionForViewLevel = (viewLevel, permissions) => {
   switch (viewLevel) {
@@ -9893,7 +9896,6 @@ var PanelContent = (props) => {
     updateSavedView(newSavedView, {
       onSuccess: () => {
         showToast.success(I18n.t("savedViews.update.success"));
-        props.onSelect({ item: newSavedView });
       },
       onError: () => {
         showToast.error(I18n.t("savedViews.errors.update"));
@@ -11035,7 +11037,7 @@ var SavedViews = (props) => {
 };
 // src/components/adapters/smart-grid/SmartGridSavedViews.tsx
-import React24, { useCallback as useCallback4 } from "react";
+import React24, { useCallback as useCallback4, useMemo as useMemo3 } from "react";
 // src/components/adapters/smart-grid/SmartGridDefaultSavedView.tsx
 import { useMemo as useMemo2 } from "react";
@@ -11092,7 +11094,10 @@ var extractDefaultView = (gridApi, receivedConfig) => {
     columnGroupState: receivedConfig?.columnGroupState ?? [],
     rowGroupState: receivedConfig?.rowGroupState ?? [],
     filterState: receivedConfig?.filterState ?? {},
-    rowHeight: receivedConfig?.rowHeight ?? gridApi.getSizesForCurrentTheme()?.rowHeight
+    rowHeight: receivedConfig?.rowHeight ?? gridApi.getSizesForCurrentTheme()?.rowHeight,
+    enableRowGrouping: receivedConfig?.enableRowGrouping,
+    enableColumnGrouping: receivedConfig?.enableColumnGrouping,
+    enableSplitAssembliesForDynamicGrouping: receivedConfig?.enableSplitAssembliesForDynamicGrouping
   };
   return result;
 };
@@ -11109,7 +11114,13 @@ var useNormalizedDefaultViews = (defaultViews, gridApi) => {
 };
 // src/components/adapters/smart-grid/useSmartGridConfig.ts
+var import_lodash2 = __toESM(require_lodash());
 import { useState as useState5, useEffect as useEffect6, useRef as useRef4 } from "react";
+var ESTIMATING_GROUPING_STATE_KEYS = [
+  "enableRowGrouping",
+  "enableColumnGrouping",
+  "enableSplitAssembliesForDynamicGrouping"
+];
 var GRID_STATE_EVENTS = [
   "sortChanged",
   "filterOpened",
@@ -11136,7 +11147,10 @@ var useSmartGridConfig = (gridApi) => {
       if (eventListenersDisabledRef.current) {
         return;
       }
-      setConfig(getSmartGridConfig(gridApi));
+      setConfig((prev) => ({
+        ...getSmartGridConfig(gridApi),
+        ...import_lodash2.default.pick(prev, ESTIMATING_GROUPING_STATE_KEYS)
+      }));
     };
     GRID_STATE_EVENTS.forEach((event) => {
       gridApi.addEventListener(event, updateConfig);
@@ -11167,6 +11181,12 @@ var SmartGridSavedViews = (props) => {
   } = useSmartGridConfig(gridApi);
   const presetViews = useNormalizedDefaultViews(props.defaultViews, gridApi);
   const defaultView = presetViews.find((view) => view.id === "default") ?? presetViews[0];
+  const tableConfigForSavedViews = useMemo3(() => {
+    if (!props.augmentTableConfig) {
+      return tableConfig;
+    }
+    return props.augmentTableConfig(tableConfig);
+  }, [props.augmentTableConfig, tableConfig]);
   const onSelect = useCallback4(
     ({ item }) => {
       if (!gridApi)
@@ -11197,7 +11217,7 @@ var SmartGridSavedViews = (props) => {
       }, 0);
       return updatedView;
     },
-    [gridApi, tableConfig, setTableConfig]
+    [gridApi, tableConfig, setTableConfig, props.transformSettings]
   );
   return /* @__PURE__ */ React24.createElement(
     SavedViews,
@@ -11211,7 +11231,7 @@ var SmartGridSavedViews = (props) => {
       defaultView,
       presetViews,
       tableName: props.tableName,
-      tableConfig,
+      tableConfig: tableConfigForSavedViews,
       backend: props.backend,
       enableSharingViews: props.enableSharingViews
     }
@@ -11227,7 +11247,7 @@ import React25, {
 } from "react";
 // src/components/adapters/data-table/DataTableDefaultSavedView.tsx
-import { useMemo as useMemo3 } from "react";
+import { useMemo as useMemo4 } from "react";
 var DEFAULT_COLUMN_STATE2 = {
   hidden: false,
   pinned: null,
@@ -11274,7 +11294,7 @@ var extractDefaultView2 = (columnDefinitions, receivedConfigFromTool) => {
   return result;
 };
 var useNormalizedDefaultViews2 = (defaultViews, columnDefinitions) => {
-  return useMemo3(
+  return useMemo4(
     () => defaultViews.map((view) => ({
       ...view,
       share_token: "",

package/package.json CHANGED Viewed

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