oa-componentbook 1.0.1-stage.445 → 1.0.1-stage.446

package/build/components/oa-component-progress-bar/CustomProgressBar.js

@@ -18,6 +18,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * @param {number} totalStep - The total number of steps in the progress.
  * @param {string} headingColor - The color used for the step text heading.
  * @param {string} barColor - The color used for the progress bar.
+ * @param {boolean} showStepText - Whether to display the step text (Step X out of Y).
  *
  * @returns {React.ReactElement} A component displaying the current progress.
  */
@@ -26,9 +27,10 @@ function ProgressBar(_ref) {
     currentStep,
     totalStep,
     headingColor,
-    barColor
+    barColor,
+    showStepText
   } = _ref;
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, showStepText && /*#__PURE__*/_react.default.createElement("div", {
     className: "margin-bottom-8"
   }, /*#__PURE__*/_react.default.createElement(_Typography.default, {
     color: headingColor,
@@ -57,12 +59,14 @@ ProgressBar.propTypes = {
   currentStep: _propTypes.default.number,
   totalStep: _propTypes.default.number,
   headingColor: _propTypes.default.string,
-  barColor: _propTypes.default.string
+  barColor: _propTypes.default.string,
+  showStepText: _propTypes.default.bool
 };
 ProgressBar.defaultProps = {
   currentStep: 1,
   totalStep: 1,
   headingColor: 'positive',
-  barColor: 'positive'
+  barColor: 'positive',
+  showStepText: true
 };
 var _default = exports.default = ProgressBar;

package/build/components/oa-component-table-with-search-and-filter/TableWithSearchAndFilter.js

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 require("core-js/modules/web.dom-collections.iterator.js");
+require("core-js/modules/es.json.stringify.js");
 var _react = _interopRequireWildcard(require("react"));
 var _Search = _interopRequireDefault(require("@material-ui/icons/Search"));
 var _FilterList = _interopRequireDefault(require("@material-ui/icons/FilterList"));
@@ -115,7 +116,6 @@ function TableWithSearchAndFilter(_ref) {
   // Filter drawer state
   const [isFilterDrawerVisible, setIsFilterDrawerVisible] = (0, _react.useState)(false);
   const [filterValues, setFilterValues] = (0, _react.useState)({});
-  const [areAllRequiredFieldsFilled, setAreAllRequiredFieldsFilled] = (0, _react.useState)(true);
 
   // Search handlers
   const handleSearchChange = e => {
@@ -133,47 +133,6 @@ function TableWithSearchAndFilter(_ref) {
     }
   };
 
-  // Memoized required keys calculation for better performance
-  const requiredKeys = (0, _react.useMemo)(() => {
-    const keys = [];
-    filterConfig.forEach(filter => {
-      const {
-        type,
-        key,
-        required,
-        fields = []
-      } = filter;
-      if (required) {
-        if (type === 'dateRange' || type === 'group') {
-          fields.forEach(field => {
-            keys.push(field.key);
-          });
-        } else {
-          keys.push(key);
-        }
-      }
-    });
-    return keys;
-  }, [filterConfig]);
-
-  // Helper function to validate if all required fields are filled
-  const validateRequiredFields = (filters, keys) => {
-    if (keys.length === 0) return true;
-    return keys.every(requiredKey => {
-      const val = filters[requiredKey];
-      if (val === undefined || val === null || val === '') {
-        return false;
-      }
-      if (Array.isArray(val)) {
-        return val.length > 0;
-      }
-      if (typeof val === 'object' && !(val instanceof Date)) {
-        return Object.keys(val).length > 0;
-      }
-      return true;
-    });
-  };
-
   // Filter handlers
   const handleOpenFilterDrawer = () => setIsFilterDrawerVisible(true);
   const handleCloseFilterDrawer = () => setIsFilterDrawerVisible(false);
@@ -184,15 +143,8 @@ function TableWithSearchAndFilter(_ref) {
     const updatedFilters = _objectSpread(_objectSpread({}, filterValues), {}, {
       [key]: normalizedValue
     });
-
-    // Update filter values
     setFilterValues(updatedFilters);
 
-    // Immediately update validation state to ensure button state is always correct
-    // This avoids React production optimization issues with dependency tracking
-    const isValid = validateRequiredFields(updatedFilters, requiredKeys);
-    setAreAllRequiredFieldsFilled(isValid);
-
     // Call onChange callback if provided for real-time filter changes
     if (onFilterChange) {
       onFilterChange(key, normalizedValue, updatedFilters, action);
@@ -206,21 +158,73 @@ function TableWithSearchAndFilter(_ref) {
   };
   const handleClearFilters = () => {
     setFilterValues({});
-    // Update validation state immediately
-    const isValid = validateRequiredFields({}, requiredKeys);
-    setAreAllRequiredFieldsFilled(isValid);
     if (onFiltersClear) {
       onFiltersClear();
     }
   };
 
-  // Initialize/update validation state when requiredKeys or filterConfig changes
-  // This handles cases where filterConfig prop changes externally
-  _react.default.useEffect(() => {
-    const isValid = validateRequiredFields(filterValues, requiredKeys);
-    setAreAllRequiredFieldsFilled(isValid);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [requiredKeys]);
+  // Memoized required keys calculation for better performance
+  const requiredKeys = (0, _react.useMemo)(() => {
+    const keys = [];
+    filterConfig.forEach(filter => {
+      const {
+        type,
+        key,
+        required,
+        fields = []
+      } = filter;
+      if (required) {
+        if (type === 'dateRange' || type === 'group') {
+          fields.forEach(field => {
+            keys.push(field.key);
+          });
+        } else {
+          keys.push(key);
+        }
+      }
+    });
+    return keys;
+  }, [filterConfig]);
+
+  // Create a stable string representation of filterValues for required keys
+  // This ensures reliable dependency tracking in production builds
+  const requiredFieldsSignature = (0, _react.useMemo)(() => requiredKeys.map(key => {
+    const value = filterValues[key];
+    // Create a stable string representation that changes when value changes
+    if (value === undefined || value === null) return "".concat(key, ":null");
+    if (value instanceof Date) return "".concat(key, ":").concat(value.getTime());
+    return "".concat(key, ":").concat(JSON.stringify(value));
+  }).join('|'), [requiredKeys, filterValues]);
+
+  // Memoized check if all required fields are filled
+  const areAllRequiredFieldsFilled = (0, _react.useMemo)(() => {
+    // If no required fields, button should be enabled
+    if (requiredKeys.length === 0) {
+      return true;
+    }
+
+    // Check each required field has a valid value
+    return requiredKeys.every(requiredKey => {
+      const value = filterValues[requiredKey];
+
+      // Check if value exists and is not empty/null/undefined
+      // Also handle edge cases: empty arrays, empty objects, etc.
+      if (value === undefined || value === null || value === '') {
+        return false;
+      }
+
+      // Handle arrays
+      if (Array.isArray(value)) {
+        return value.length > 0;
+      }
+
+      // Handle objects (but allow Date objects and other valid objects)
+      if (typeof value === 'object' && !(value instanceof Date)) {
+        return Object.keys(value).length > 0;
+      }
+      return true;
+    });
+  }, [requiredKeys, requiredFieldsSignature, filterValues]);
 
   // Helper function to determine notFoundContent message
   const getNotFoundContent = (isApiCallInProgress, query) => {

package/build/components/oa-component-textarea/CustomTextArea.js

@@ -1,16 +1,25 @@
 "use strict";
 
 require("core-js/modules/es.object.assign.js");
+require("core-js/modules/es.weak-map.js");
+require("core-js/modules/web.dom-collections.iterator.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+require("core-js/modules/es.string.trim.js");
 var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _antd = require("antd");
-var _styles = _interopRequireDefault(require("./styles"));
+var _SendRounded = _interopRequireDefault(require("@material-ui/icons/SendRounded"));
+var _styles = _interopRequireWildcard(require("./styles"));
 var _ColorVariablesMap = _interopRequireDefault(require("../../global-css/ColorVariablesMap"));
-const _excluded = ["rows", "placeholder", "maxLength", "className"];
+var _MaterialIcon = _interopRequireDefault(require("../oa-component-icons/MaterialIcon"));
+var _constants = require("./constants");
+const _excluded = ["rows", "placeholder", "maxLength", "className", "variant"],
+  _excluded2 = ["minRows", "maxRows", "sendIconConfig", "onSend", "value", "onChange", "disabled"];
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
@@ -19,19 +28,25 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
  * A custom text area component.
  *
  * The component includes the following properties:
- * - `rows`: The number of rows for the text area.
+ * - `rows`: The number of rows for the text area (used for default variant).
  * - `placeholder`: The placeholder text for the text area.
  * - `maxLength`: The maximum length of the input value.
  * - `className`: Additional CSS class to apply to the text area.
+ * - `variant`: 'default' or 'gradient' - determines the styling variant.
+ * - `minRows`: Initial line height for gradient variant (default: 1).
+ * - `maxRows`: Maximum rows before scrolling starts for gradient variant (default: null for unlimited).
+ * - `sendIconConfig`: Object with `show` (boolean, default: false) and `disabled` (boolean, default: false) for gradient variant only.
+ * - `onSend`: Callback function called when send icon is clicked (gradient variant only).
  * - `antDesignProps`: Any other props to pass to the antd Input.TextArea component.
  *
  * The component will apply the following styles:
  * - A dark grey background when the component is disabled.
  * - A dark grey text color when the component is disabled.
  * - A custom style class of `custom-textarea` to the outer element.
+ * - Gradient border and auto-growing height for gradient variant.
  *
  * The component will also apply the following props to the antd Input.TextArea component:
- * - `rows`
+ * - `rows` (for default variant) or `minRows`/`maxRows` (for gradient variant)
  * - `placeholder`
  * - `maxLength`
  * - `className` (appended to the outer element)
@@ -42,9 +57,79 @@ function CustomTextArea(_ref) {
       rows,
       placeholder,
       maxLength,
-      className
+      className,
+      variant = 'default'
     } = _ref,
     antDesignProps = _objectWithoutProperties(_ref, _excluded);
+  // Render gradient variant
+  if (variant === 'gradient') {
+    // Extract gradient-specific props from antDesignProps
+    const _ref2 = antDesignProps || {},
+      {
+        minRows = _constants.DEFAULT_MIN_ROWS,
+        maxRows = _constants.DEFAULT_MAX_ROWS,
+        sendIconConfig = _constants.DEFAULT_SEND_ICON_CONFIG,
+        onSend,
+        value,
+        onChange,
+        disabled
+      } = _ref2,
+      restAntDesignProps = _objectWithoutProperties(_ref2, _excluded2);
+
+    // Handle send icon click - gradient variant only
+    // Use value prop directly - no internal state management
+    const handleSendClick = () => {
+      const currentValue = value || '';
+      // Only allow click if textarea is enabled, icon config is not disabled, and has content
+      if (onSend && !disabled && !sendIconConfig.disabled && currentValue.trim()) {
+        onSend(currentValue);
+      }
+    };
+
+    // Determine if send icon should be enabled - gradient variant only
+    // Icon is enabled if: textarea is enabled AND config says it's not disabled AND there's content
+    // Use value prop directly - no internal state
+    const currentValue = value || '';
+    const isSendEnabled = !disabled && !sendIconConfig.disabled && currentValue.trim().length > 0;
+
+    // Determine if icon should be shown - only for gradient variant
+    // Hidden by default, only show when explicitly requested via sendIconConfig.show
+    const shouldShowIcon = sendIconConfig.show;
+    return /*#__PURE__*/_react.default.createElement(_antd.ConfigProvider, {
+      theme: {
+        token: {
+          colorBgContainerDisabled: _ColorVariablesMap.default['--color-divider'],
+          colorTextDisabled: _ColorVariablesMap.default['--color-secondary-content']
+        }
+      }
+    }, /*#__PURE__*/_react.default.createElement(_styles.TextAreaWrapper, {
+      className: className,
+      $disabled: disabled
+    }, /*#__PURE__*/_react.default.createElement(_styles.default, _extends({
+      placeholder: placeholder,
+      maxLength: maxLength,
+      className: "custom-textarea-gradient",
+      value: value,
+      onChange: onChange,
+      disabled: disabled,
+      autoSize: maxRows ? {
+        minRows,
+        maxRows
+      } : {
+        minRows
+      }
+    }, restAntDesignProps)), shouldShowIcon && /*#__PURE__*/_react.default.createElement(_styles.SendIconWrapper, {
+      className: disabled || sendIconConfig.disabled || !isSendEnabled ? 'icon-disabled' : 'icon-enabled'
+    }, /*#__PURE__*/_react.default.createElement(_MaterialIcon.default, {
+      icon: _SendRounded.default,
+      size: 24,
+      color: isSendEnabled ? 'primary' : 'placeholder-text',
+      onClick: handleSendClick
+    }))));
+  }
+
+  // Render default variant (existing behavior - completely unchanged)
+  // All props including value, onChange pass through naturally via antDesignProps
   return /*#__PURE__*/_react.default.createElement(_antd.ConfigProvider, {
     theme: {
       token: {
@@ -63,12 +148,14 @@ CustomTextArea.propTypes = {
   rows: _propTypes.default.number,
   placeholder: _propTypes.default.string,
   maxLength: _propTypes.default.number,
-  className: _propTypes.default.string
+  className: _propTypes.default.string,
+  variant: _propTypes.default.oneOf(['default', 'gradient'])
 };
 CustomTextArea.defaultProps = {
-  rows: 2,
+  rows: _constants.DEFAULT_ROWS,
   placeholder: null,
   maxLength: 5000,
-  className: ''
+  className: '',
+  variant: 'default'
 };
 var _default = exports.default = CustomTextArea;

package/build/components/oa-component-textarea/constants.js

@@ -0,0 +1,39 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.TEXTAREA_SHADOW = exports.TEXTAREA_BORDER_RADIUS = exports.SEND_ICON_SIZE = exports.GRADIENT_BORDER_COLORS = exports.DEFAULT_SEND_ICON_CONFIG = exports.DEFAULT_ROWS = exports.DEFAULT_MIN_ROWS = exports.DEFAULT_MAX_ROWS = void 0;
+/**
+ * Constants for CustomTextArea component
+ */
+
+// Default values for textarea configuration
+const DEFAULT_MIN_ROWS = exports.DEFAULT_MIN_ROWS = 1;
+const DEFAULT_MAX_ROWS = exports.DEFAULT_MAX_ROWS = null; // null means unlimited growth
+const DEFAULT_ROWS = exports.DEFAULT_ROWS = 2;
+
+// Gradient border colors
+const GRADIENT_BORDER_COLORS = exports.GRADIENT_BORDER_COLORS = {
+  top: '#0098FF',
+  // Blue
+  middle: '#9A6CFF',
+  // Purple
+  bottom: '#FB6252' // Coral/Orange-Red
+};
+
+// Shadow styles
+const TEXTAREA_SHADOW = exports.TEXTAREA_SHADOW = '0px 2px 10px rgba(0, 0, 0, 0.14)';
+
+// Border radius
+const TEXTAREA_BORDER_RADIUS = exports.TEXTAREA_BORDER_RADIUS = '12px';
+
+// Icon sizes
+const SEND_ICON_SIZE = exports.SEND_ICON_SIZE = 24;
+
+// Default send icon configuration
+const DEFAULT_SEND_ICON_CONFIG = exports.DEFAULT_SEND_ICON_CONFIG = {
+  show: false,
+  // Hidden by default - only show when explicitly requested
+  disabled: false
+};

package/build/components/oa-component-textarea/styles.js

@@ -3,14 +3,23 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.default = exports.TextAreaWrapper = exports.SendIconWrapper = void 0;
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 var _antd = require("antd");
-var _templateObject;
+var _constants = require("./constants");
+var _templateObject, _templateObject2, _templateObject3;
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 const {
   TextArea: AntdTextArea
 } = _antd.Input;
-const StyledTextArea = (0, _styledComponents.default)(AntdTextArea)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  &.custom-textarea {\n    padding: 16px;\n    resize: none;\n    border-radius: 4px;\n    max-height: 92px;\n    border: 1px solid var(--color-placeholder-text);\n  }\n  &.custom-textarea:hover {\n    border: 1px solid var(--color-primary);\n  }\n  &.custom-textarea:focus-within {\n     box-shadow: 0px 0px 4px 0px rgba(1, 79, 197, 0.90);\n  }\n"])));
+
+// Default textarea styles (existing)
+const StyledTextArea = (0, _styledComponents.default)(AntdTextArea)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  &.custom-textarea {\n    padding: 16px;\n    resize: none;\n    border-radius: 4px;\n    max-height: 92px;\n    border: 1px solid var(--color-placeholder-text);\n  }\n  &.custom-textarea:hover {\n    border: 1px solid var(--color-primary);\n  }\n  &.custom-textarea:focus-within {\n     box-shadow: 0px 0px 4px 0px rgba(1, 79, 197, 0.90);\n  }\n\n  /* Gradient variant styles */\n  &.custom-textarea-gradient {\n    padding: 16px 48px 16px 16px;\n    resize: none;\n    border-radius: calc(", " - 2px);\n    border: none;\n    background: var(--color-primary-background);\n    font-size: 16px;\n    line-height: 24px;\n    color: var(--color-primary-content);\n    min-height: auto !important;\n    box-shadow: none;\n    width: 100%;\n  }\n\n  &.custom-textarea-gradient::placeholder {\n    color: var(--color-secondary-content);\n  }\n\n  &.custom-textarea-gradient:hover {\n    box-shadow: none;\n  }\n\n  &.custom-textarea-gradient:focus {\n    outline: none;\n    box-shadow: none;\n  }\n\n  &.custom-textarea-gradient:focus-within {\n    box-shadow: none;\n  }\n"])), _constants.TEXTAREA_BORDER_RADIUS);
+
+// Wrapper for gradient variant with gradient border
+const TextAreaWrapper = exports.TextAreaWrapper = _styledComponents.default.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  position: relative;\n  display: block;\n  width: 100%;\n  border-radius: ", ";\n  padding: 2px;\n  background: ", ";\n  box-shadow: ", ";\n  opacity: ", ";\n"])), _constants.TEXTAREA_BORDER_RADIUS, props => props.$disabled ? 'var(--color-divider)' : "linear-gradient(\n      135deg,\n      ".concat(_constants.GRADIENT_BORDER_COLORS.top, " 0%,\n      ").concat(_constants.GRADIENT_BORDER_COLORS.middle, " 50%,\n      ").concat(_constants.GRADIENT_BORDER_COLORS.bottom, " 100%\n    )"), props => props.$disabled ? 'none' : _constants.TEXTAREA_SHADOW, props => props.$disabled ? 0.6 : 1);
+
+// Send icon wrapper positioned absolutely
+const SendIconWrapper = exports.SendIconWrapper = _styledComponents.default.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  position: absolute;\n  top: 18px;\n  right: 18px;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  z-index: 10;\n  pointer-events: none;\n\n  button,\n  svg {\n    pointer-events: auto;\n  }\n\n  /* Icon disabled state */\n  &.icon-disabled {\n    opacity: 0.5;\n    \n    button,\n    svg {\n      cursor: not-allowed;\n    }\n  }\n\n  /* Icon enabled state */\n  &.icon-enabled {\n    opacity: 1;\n    \n    button,\n    svg {\n      cursor: pointer;\n    }\n  }\n"])));
 var _default = exports.default = StyledTextArea;

package/build/layout/EntityOverviewLayout/EntityOverviewLayout.js

@@ -58,7 +58,8 @@ function EntityOverviewLayout(_ref) {
     profileData,
     accordionData,
     drawer,
-    modal
+    modal,
+    misc
   } = state !== null && state !== void 0 ? state : {};
   (0, _react.useEffect)(() => {
     init();
@@ -121,8 +122,90 @@ function EntityOverviewLayout(_ref) {
       placement: "bottomRight"
     });
   };
-  const handleCloseDrawer = () => {
-    init();
+  const handleCloseDrawer = async () => {
+    var _state$misc2, _state$misc3, _state$misc4;
+    // Get selected enterprise from session storage to ensure profile data reflects correct enterprise
+    const selectedEnterpriseFromStorage = JSON.parse(sessionStorage.getItem('selectedEnterprise') || 'null');
+    const enterpriseIdFromStorage = (selectedEnterpriseFromStorage === null || selectedEnterpriseFromStorage === void 0 ? void 0 : selectedEnterpriseFromStorage.value) || (selectedEnterpriseFromStorage === null || selectedEnterpriseFromStorage === void 0 ? void 0 : selectedEnterpriseFromStorage.enterpriseId) || (selectedEnterpriseFromStorage === null || selectedEnterpriseFromStorage === void 0 ? void 0 : selectedEnterpriseFromStorage.id);
+
+    // Update misc with enterpriseId from session storage
+    const currentMisc = _objectSpread(_objectSpread({}, (_state$misc2 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc2 !== void 0 ? _state$misc2 : {}), {}, {
+      enterpriseId: enterpriseIdFromStorage || (state === null || state === void 0 || (_state$misc3 = state.misc) === null || _state$misc3 === void 0 ? void 0 : _state$misc3.enterpriseId),
+      enterpriseData: selectedEnterpriseFromStorage || (state === null || state === void 0 || (_state$misc4 = state.misc) === null || _state$misc4 === void 0 ? void 0 : _state$misc4.enterpriseData)
+    });
+    dispatch({
+      type: _entityOverviewLayoutReducer.actionTypes.SET_LOADING,
+      payload: true
+    });
+    if (getInitialData) {
+      const {
+        error,
+        data
+      } = await (getInitialData === null || getInitialData === void 0 ? void 0 : getInitialData(_objectSpread({}, currentMisc)));
+      if (error) {
+        showErrorNotification(error);
+        const dynamicConfig = (0, _staticConfigResolver.default)(config, {});
+        // Update misc with enterpriseId from session storage
+        if (currentMisc) {
+          dynamicConfig.misc = currentMisc;
+        }
+        // Don't preserve profile data - let it be re-rendered from config with correct enterprise
+        // Don't preserve accordion data - use fresh data from API (or empty if error)
+        dispatch({
+          type: _entityOverviewLayoutReducer.actionTypes.INIT,
+          payload: dynamicConfig
+        });
+      } else {
+        const dynamicConfig = (0, _staticConfigResolver.default)(config, data !== null && data !== void 0 ? data : {});
+        // Update misc with enterpriseId from session storage
+        if (currentMisc) {
+          dynamicConfig.misc = currentMisc;
+        }
+        // Use fresh profile data from API response to reflect correct enterprise
+        if (data !== null && data !== void 0 && data.data) {
+          dispatch({
+            type: _entityOverviewLayoutReducer.actionTypes.UPDATE_PROFILE_DATA,
+            payload: data.data
+          });
+        }
+        // Use fresh accordion data from API response (includes newly added users)
+        // Check for both 'accordionData' and 'accordianData' (typo in API response)
+        const freshAccordionData = (data === null || data === void 0 ? void 0 : data.accordionData) || (data === null || data === void 0 ? void 0 : data.accordianData);
+        if (freshAccordionData) {
+          let accordionDataToUpdate;
+          if (Array.isArray(freshAccordionData)) {
+            accordionDataToUpdate = freshAccordionData;
+          } else if (freshAccordionData.data && Array.isArray(freshAccordionData.data)) {
+            accordionDataToUpdate = freshAccordionData.data;
+          } else {
+            accordionDataToUpdate = freshAccordionData;
+          }
+          // Update accordion data with fresh data from API
+          dispatch({
+            type: _entityOverviewLayoutReducer.actionTypes.UPDATE_ACCORDION_DATA,
+            payload: accordionDataToUpdate
+          });
+        }
+        dispatch({
+          type: _entityOverviewLayoutReducer.actionTypes.INIT,
+          payload: dynamicConfig
+        });
+      }
+    } else {
+      const dynamicConfig = (0, _staticConfigResolver.default)(config, {});
+      // Update misc with enterpriseId from session storage
+      if (currentMisc) {
+        dynamicConfig.misc = currentMisc;
+      }
+      dispatch({
+        type: _entityOverviewLayoutReducer.actionTypes.INIT,
+        payload: dynamicConfig
+      });
+    }
+    dispatch({
+      type: _entityOverviewLayoutReducer.actionTypes.SET_LOADING,
+      payload: false
+    });
     dispatch({
       type: _entityOverviewLayoutReducer.actionTypes.CLOSE_DRAWER
     });
@@ -140,14 +223,70 @@ function EntityOverviewLayout(_ref) {
       {
         (config === null || config === void 0 ? void 0 : config.storageType) == "sessionStorage" && (config === null || config === void 0 ? void 0 : config.storageKey) && sessionStorage.setItem(config === null || config === void 0 ? void 0 : config.storageKey, JSON.stringify(selectedData));
       }
+      // Always update 'selectedEnterprise' in sessionStorage to keep misc.enterpriseId in sync
+      if (selectedData) {
+        sessionStorage.setItem('selectedEnterprise', JSON.stringify(selectedData));
+      }
       showSuccessNotification(config === null || config === void 0 ? void 0 : config.successMessage);
       if (error) {
         showErrorNotification(error);
       } else {
+        // Update misc.enterpriseId to keep it in sync with selected enterprise
+        // Read from selectedData to match the sessionStorage structure
+        const enterpriseId = (selectedData === null || selectedData === void 0 ? void 0 : selectedData.value) || (selectedData === null || selectedData === void 0 ? void 0 : selectedData.enterpriseId) || (selectedData === null || selectedData === void 0 ? void 0 : selectedData.id) || selectedValue;
+        if (enterpriseId) {
+          dispatch({
+            type: _entityOverviewLayoutReducer.actionTypes.SET_MISC,
+            payload: _objectSpread(_objectSpread({}, state === null || state === void 0 ? void 0 : state.misc), {}, {
+              enterpriseId: enterpriseId,
+              enterpriseData: selectedData // Also update enterpriseData to match sessionStorage
+            })
+          });
+        }
         dispatch({
           type: _entityOverviewLayoutReducer.actionTypes.UPDATE_PROFILE_DATA,
           payload: selectedItem
         });
+        // Update accordion data if provided in the response
+        // Note: API returns 'accordianData' (typo) but we check for both
+        const accordionDataFromResponse = (data === null || data === void 0 ? void 0 : data.accordionData) || (data === null || data === void 0 ? void 0 : data.accordianData);
+
+        // Check if accordionDataFromResponse is an object with data array, or if it's directly an array
+        if (accordionDataFromResponse) {
+          let accordionDataToUpdate;
+          if (Array.isArray(accordionDataFromResponse)) {
+            // If it's directly an array, use it as is
+            accordionDataToUpdate = accordionDataFromResponse;
+          } else if (accordionDataFromResponse.data && Array.isArray(accordionDataFromResponse.data)) {
+            // If it's an object with a data property containing the array, extract the data array
+            accordionDataToUpdate = accordionDataFromResponse.data;
+          }
+          if (accordionDataToUpdate) {
+            dispatch({
+              type: _entityOverviewLayoutReducer.actionTypes.UPDATE_ACCORDION_DATA,
+              payload: accordionDataToUpdate
+            });
+          } else {
+            console.log('Accordion data structure not recognized:', accordionDataFromResponse);
+          }
+        } else {
+          if (getInitialData && config !== null && config !== void 0 && config.refreshAccordionOnSwitch) {
+            var _state$misc5;
+            // Optionally refresh accordion data by calling getInitialData again
+            const {
+              error: refreshError,
+              data: refreshData
+            } = await (getInitialData === null || getInitialData === void 0 ? void 0 : getInitialData(_objectSpread(_objectSpread({}, (_state$misc5 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc5 !== void 0 ? _state$misc5 : {}), {}, {
+              selectedValue
+            })));
+            if (!refreshError && refreshData !== null && refreshData !== void 0 && refreshData.accordionData) {
+              dispatch({
+                type: _entityOverviewLayoutReducer.actionTypes.UPDATE_ACCORDION_DATA,
+                payload: refreshData.accordionData
+              });
+            }
+          }
+        }
       }
     }
   };
@@ -255,7 +394,9 @@ function EntityOverviewLayout(_ref) {
     customPageModal: modal,
     addUserClick: addUserClick,
     deleteUserClick: deleteUserClick,
-    editUserClick: editUserClick
+    editUserClick: editUserClick,
+    misc: misc,
+    drawer: drawer
   }))))));
 }
 EntityOverviewLayout.propTypes = {};

package/build/layout/EntityOverviewLayout/reducer/entityOverviewLayoutReducer.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.initialState = exports.entityOverviewLayoutReducer = exports.actionTypes = void 0;
+require("core-js/modules/web.dom-collections.iterator.js");
 require("core-js/modules/es.symbol.description.js");
 var _staticConfigResolver = require("../../GenricLayOut/resolver/staticConfigResolver");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -19,7 +20,8 @@ const actionTypes = exports.actionTypes = {
   SET_DRAWER: 'SET_DRAWER',
   TOGGLE_DRAWER: 'TOGGLE_DRAWER',
   CLOSE_DRAWER: 'CLOSE_DRAWER',
-  UPDATE_PROFILE_DATA: 'UPDATE_PROFILE_DATA'
+  UPDATE_PROFILE_DATA: 'UPDATE_PROFILE_DATA',
+  UPDATE_ACCORDION_DATA: 'UPDATE_ACCORDION_DATA'
 };
 const initialState = exports.initialState = {};
 const entityOverviewLayoutReducer = (state, action) => {
@@ -38,6 +40,21 @@ const entityOverviewLayoutReducer = (state, action) => {
       return _objectSpread(_objectSpread({}, state), {}, {
         profileData: action.payload
       });
+    case actionTypes.UPDATE_ACCORDION_DATA:
+      {
+        var _state$accordionData$, _state$accordionData;
+        console.log('Reducer: Updating accordion data with payload:', action.payload);
+        const newAccordionData = _objectSpread(_objectSpread({}, (state === null || state === void 0 ? void 0 : state.accordionData) || {}), {}, {
+          // Preserve all existing accordionData properties
+          visible: (_state$accordionData$ = state === null || state === void 0 || (_state$accordionData = state.accordionData) === null || _state$accordionData === void 0 ? void 0 : _state$accordionData.visible) !== null && _state$accordionData$ !== void 0 ? _state$accordionData$ : true,
+          // Preserve visible property, default to true
+          data: Array.isArray(action.payload) ? [...action.payload] : action.payload // Ensure new array reference
+        });
+        console.log('Reducer: New accordion data:', newAccordionData);
+        return _objectSpread(_objectSpread({}, state), {}, {
+          accordionData: newAccordionData
+        });
+      }
     case actionTypes.SET_MISC:
       return _objectSpread(_objectSpread({}, state), {}, {
         misc: _objectSpread(_objectSpread({}, state.misc), action.payload)

package/build/widgets/oa-form-widget/FormWidget.js

@@ -452,7 +452,8 @@ function FormWidget(props) {
           initialData: (item === null || item === void 0 ? void 0 : item.value) || [],
           fields: item === null || item === void 0 ? void 0 : item.fields,
           disabled: (item === null || item === void 0 ? void 0 : item.disabled) || false,
-          customPageModal: props === null || props === void 0 ? void 0 : props.customPageModal
+          customPageModal: props === null || props === void 0 ? void 0 : props.customPageModal,
+          misc: props === null || props === void 0 ? void 0 : props.misc
         }, props)));
       case "field":
         return renderFieldWidget(item);

package/build/widgets/oa-widget-user-management/UserManagementWidget.js

@@ -5,9 +5,12 @@ require("core-js/modules/es.weak-map.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = UserManagementWidget;
+exports.default = _default;
 require("core-js/modules/web.dom-collections.iterator.js");
 require("core-js/modules/es.promise.js");
+require("core-js/modules/es.regexp.constructor.js");
+require("core-js/modules/es.regexp.exec.js");
+require("core-js/modules/es.regexp.to-string.js");
 var _react = _interopRequireWildcard(require("react"));
 var _antd = require("antd");
 var _EditOutlined = _interopRequireDefault(require("@material-ui/icons/EditOutlined"));
@@ -28,7 +31,8 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); } /* eslint-disable */
-function UserManagementWidget(_ref) {
+function _default(_ref) {
+  var _drawer$data, _activeDrawerData$mis;
   let {
     form,
     fieldName = "users",
@@ -39,7 +43,8 @@ function UserManagementWidget(_ref) {
     addUserClick,
     deleteUserClick,
     editUserClick,
-    misc
+    misc,
+    drawer
   } = _ref;
   const finalFields = fields || [];
   const [editingUserId, setEditingUserId] = (0, _react.useState)(null);
@@ -88,6 +93,28 @@ function UserManagementWidget(_ref) {
       [fieldName]: defaultUsers
     });
   }, [initialData, fieldName, form]);
+
+  // Reset form state when drawer closes or opens to ensure fresh context
+  (0, _react.useEffect)(() => {
+    if (drawer && drawer.visible === false) {
+      // Reset adding/editing state when drawer closes
+      setAddingUser(false);
+      setEditingUserId(null);
+      setDeleteModalVisible(false);
+      setUserToDelete(null);
+
+      // Clear form fields
+      const clearData = {};
+      finalFields.forEach(field => {
+        clearData["".concat(fieldName, "_").concat(field.key)] = "";
+      });
+      form.setFieldsValue(clearData);
+    }
+  }, [drawer === null || drawer === void 0 ? void 0 : drawer.visible, form, fieldName, finalFields]);
+
+  // Access branchId dynamically from drawer data using active drawer key
+  const activeDrawerData = drawer === null || drawer === void 0 || (_drawer$data = drawer.data) === null || _drawer$data === void 0 ? void 0 : _drawer$data[drawer === null || drawer === void 0 ? void 0 : drawer.active];
+  const branchId = activeDrawerData === null || activeDrawerData === void 0 || (_activeDrawerData$mis = activeDrawerData.misc) === null || _activeDrawerData$mis === void 0 ? void 0 : _activeDrawerData$mis.branchId;
   const handleEdit = user => {
     setEditingUserId(user.id);
     setAddingUser(false);
@@ -127,7 +154,7 @@ function UserManagementWidget(_ref) {
           const {
             error,
             data
-          } = await editUserClick(editingUserId, userData);
+          } = await editUserClick(editingUserId, userData, misc);
           if (error) {
             showErrorNotification(error);
           } else {
@@ -146,10 +173,13 @@ function UserManagementWidget(_ref) {
       } else if (addingUser) {
         // Add new user
         if (addUserClick) {
+          console.log("userData", userData);
+          console.log("misc", misc);
+          console.log("branchId", branchId);
           const {
             error,
             data
-          } = await addUserClick(userData, misc);
+          } = await addUserClick(userData, misc, branchId);
           if (error) {
             showErrorNotification(error);
           } else {
@@ -215,15 +245,38 @@ function UserManagementWidget(_ref) {
   };
   const canDelete = users.length > 1;
   const isEditing = editingUserId !== null || addingUser;
+
+  // Process rules to handle checkValidator structure (similar to FormWidget)
+  const processRules = rules => {
+    if (!rules || !Array.isArray(rules)) {
+      return rules;
+    }
+    return rules.map(r => {
+      // If rule has checkValidator, extract the nested rule object
+      if (r !== null && r !== void 0 && r.checkValidator && r !== null && r !== void 0 && r.rule) {
+        let processedRule = _objectSpread({}, r.rule);
+
+        // Handle pattern conversion if it's a string
+        if (processedRule.pattern && typeof processedRule.pattern === "string") {
+          processedRule.pattern = new RegExp(processedRule.pattern);
+        }
+        return processedRule;
+      }
+
+      // Return rule as-is if it doesn't have checkValidator structure
+      return r;
+    });
+  };
   const renderFormField = field => {
     var _field$options;
     const fieldNameWithPrefix = "".concat(fieldName, "_").concat(field.key);
+    const processedRules = processRules(field.rules);
     switch (field.widget || field.type) {
       case "input":
         return /*#__PURE__*/_react.default.createElement(_antd.Form.Item, {
           name: fieldNameWithPrefix,
           label: field.label,
-          rules: field.rules,
+          rules: processedRules,
           style: {
             marginBottom: 16
           }
@@ -234,7 +287,7 @@ function UserManagementWidget(_ref) {
         return /*#__PURE__*/_react.default.createElement(_antd.Form.Item, {
           name: fieldNameWithPrefix,
           label: field.label,
-          rules: field.rules,
+          rules: processedRules,
           style: {
             marginBottom: 16
           }
@@ -249,7 +302,7 @@ function UserManagementWidget(_ref) {
         return /*#__PURE__*/_react.default.createElement(_antd.Form.Item, {
           name: fieldNameWithPrefix,
           label: field.label,
-          rules: field.rules,
+          rules: processedRules,
           style: {
             marginBottom: 16
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oa-componentbook",
-  "version": "1.0.1-stage.445",
+  "version": "1.0.1-stage.446",
   "private": false,
   "description": "Reusable components",
   "main": "build/index.js",