oa-componentbook 1.0.1-stage.434 → 1.0.1-stage.436

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 {
@@ -149,7 +176,7 @@ function UserManagementWidget(_ref) {
           const {
             error,
             data
-          } = await addUserClick(userData, misc);
+          } = await addUserClick(userData, misc, branchId);
           if (error) {
             showErrorNotification(error);
           } else {
@@ -215,15 +242,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 +284,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 +299,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.434",
+  "version": "1.0.1-stage.436",
   "private": false,
   "description": "Reusable components",
   "main": "build/index.js",