oa-componentbook 1.0.1-stage.435 → 1.0.1-stage.437

package/build/layout/EntityOverviewLayout/EntityOverviewLayout.js

@@ -123,12 +123,16 @@ function EntityOverviewLayout(_ref) {
     });
   };
   const handleCloseDrawer = async () => {
-    // Preserve current profile data and accordion data when closing drawer
-    // to maintain selected enterprise and prevent data mismatch
-    const currentProfileData = state === null || state === void 0 ? void 0 : state.profileData;
-    const currentAccordionData = state === null || state === void 0 ? void 0 : state.accordionData;
-    const currentMisc = state === null || state === void 0 ? void 0 : state.misc; // Preserve misc to maintain enterpriseId
+    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
@@ -137,35 +141,50 @@ function EntityOverviewLayout(_ref) {
       const {
         error,
         data
-      } = await (getInitialData === null || getInitialData === void 0 ? void 0 : getInitialData(_objectSpread({}, currentMisc !== null && currentMisc !== void 0 ? currentMisc : {})));
+      } = await (getInitialData === null || getInitialData === void 0 ? void 0 : getInitialData(_objectSpread({}, currentMisc)));
       if (error) {
         showErrorNotification(error);
         const dynamicConfig = (0, _staticConfigResolver.default)(config, {});
-        // Preserve profile data, accordion data, and misc to maintain sync
-        if (currentProfileData) {
-          dynamicConfig.profileData = currentProfileData;
-        }
-        if (currentAccordionData) {
-          dynamicConfig.accordionData = currentAccordionData;
-        }
+        // Update misc with enterpriseId from session storage
         if (currentMisc) {
-          dynamicConfig.misc = currentMisc; // Preserve misc with correct enterpriseId
+          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 : {});
-        // Preserve profile data, accordion data, and misc to maintain sync
-        if (currentProfileData) {
-          dynamicConfig.profileData = currentProfileData;
+        // Update misc with enterpriseId from session storage
+        if (currentMisc) {
+          dynamicConfig.misc = currentMisc;
         }
-        if (currentAccordionData) {
-          dynamicConfig.accordionData = currentAccordionData;
+        // 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
+          });
         }
-        if (currentMisc) {
-          dynamicConfig.misc = currentMisc; // Preserve misc with correct enterpriseId
+        // 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,
@@ -174,15 +193,9 @@ function EntityOverviewLayout(_ref) {
       }
     } else {
       const dynamicConfig = (0, _staticConfigResolver.default)(config, {});
-      // Preserve profile data, accordion data, and misc to maintain sync
-      if (currentProfileData) {
-        dynamicConfig.profileData = currentProfileData;
-      }
-      if (currentAccordionData) {
-        dynamicConfig.accordionData = currentAccordionData;
-      }
+      // Update misc with enterpriseId from session storage
       if (currentMisc) {
-        dynamicConfig.misc = currentMisc; // Preserve misc with correct enterpriseId
+        dynamicConfig.misc = currentMisc;
       }
       dispatch({
         type: _entityOverviewLayoutReducer.actionTypes.INIT,
@@ -237,7 +250,6 @@ function EntityOverviewLayout(_ref) {
         // 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);
-        console.log('Checking accordion data from response:', accordionDataFromResponse);
 
         // Check if accordionDataFromResponse is an object with data array, or if it's directly an array
         if (accordionDataFromResponse) {
@@ -250,7 +262,6 @@ function EntityOverviewLayout(_ref) {
             accordionDataToUpdate = accordionDataFromResponse.data;
           }
           if (accordionDataToUpdate) {
-            console.log('Dispatching UPDATE_ACCORDION_DATA with:', accordionDataToUpdate);
             dispatch({
               type: _entityOverviewLayoutReducer.actionTypes.UPDATE_ACCORDION_DATA,
               payload: accordionDataToUpdate
@@ -259,14 +270,13 @@ function EntityOverviewLayout(_ref) {
             console.log('Accordion data structure not recognized:', accordionDataFromResponse);
           }
         } else {
-          console.log('Accordion data not found. Checking refresh option...');
           if (getInitialData && config !== null && config !== void 0 && config.refreshAccordionOnSwitch) {
-            var _state$misc2;
+            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$misc2 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc2 !== void 0 ? _state$misc2 : {}), {}, {
+            } = 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) {

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

@@ -8,6 +8,9 @@ Object.defineProperty(exports, "__esModule", {
 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"));
@@ -239,15 +242,38 @@ function _default(_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
           }
@@ -258,7 +284,7 @@ function _default(_ref) {
         return /*#__PURE__*/_react.default.createElement(_antd.Form.Item, {
           name: fieldNameWithPrefix,
           label: field.label,
-          rules: field.rules,
+          rules: processedRules,
           style: {
             marginBottom: 16
           }
@@ -273,7 +299,7 @@ function _default(_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.435",
+  "version": "1.0.1-stage.437",
   "private": false,
   "description": "Reusable components",
   "main": "build/index.js",