npm - oa-componentbook - Versions diffs - 0.18.359 → 0.18.361 - Mend

oa-componentbook 0.18.359 → 0.18.361

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 (5) hide show

package/build/layout/GenricLayOut/GenricLayOut.js +111 -89
package/build/layout/GenricLayOut/components/Header.js +7 -1
package/build/layout/GenricLayOut/styles.js +1 -1
package/build/widgets/oa-form-widget/FormWidget.js +55 -15
package/package.json +1 -1

package/build/layout/GenricLayOut/GenricLayOut.js CHANGED Viewed

@@ -51,7 +51,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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 GenricLayOut(_ref) {
-  var _parent$children, _state$misc19, _imageViewer$content, _imageViewer$content2, _leftHeaderFirstButto, _leftHeaderFirstButto2, _customDrawer$applied12, _state$customDrawer3, _state$customDrawer4, _tabs$list, _tables$columns3, _tables$columns4, _tabs$active3, _state$tables3, _tables$selectionType, _tabs$active4, _tables$selectionType2, _tables$pagination33, _drawer$data, _tabs$active5, _drawer$data$drawer$a, _drawer$data2, _tabs$active6, _tabs$active7, _nestedDrawer$data, _nestedDrawer$data$ca, _nestedDrawer$data2, _customDrawer$data, _customDrawer$data2, _contentPanel$dataSou, _tables$tableFooter, _tables$selectedRowKe, _tables$tableFooter2, _tables$tableFooter3, _tables$tableFooter5;
+  var _state$misc19, _imageViewer$content, _imageViewer$content2, _leftHeaderFirstButto, _leftHeaderFirstButto2, _state$customDrawer3, _state$customDrawer4, _tabs$list, _tables$columns3, _tables$columns4, _tabs$active3, _state$tables3, _tables$selectionType, _tabs$active4, _tables$selectionType2, _tables$pagination31, _drawer$data, _tabs$active5, _drawer$data$drawer$a, _drawer$data2, _tabs$active6, _tabs$active7, _nestedDrawer$data, _nestedDrawer$data$ca, _nestedDrawer$data2, _customDrawer$data, _customDrawer$data2, _contentPanel$dataSou, _tables$tableFooter, _tables$selectedRowKe, _tables$tableFooter2, _tables$tableFooter3, _tables$tableFooter5;
   let {
     config,
     getInitialData,
@@ -80,6 +80,7 @@ function GenricLayOut(_ref) {
     } = {}
   } = _ref;
   const [state, dispatch] = (0, _react.useReducer)(_layoutReducer.genericLayoutReducer, config !== null && config !== void 0 ? config : _layoutReducer.initialState);
+  const [headerButtons, setHeaderButtons] = (0, _react.useState)(null);
   const stateRef = (0, _react.useRef)(state);
   const notificationRef = (0, _react.useRef)(null);
   const openNotification = (0, _react.useCallback)(params => notificationRef.current.openNotification(params), []);
@@ -108,10 +109,25 @@ function GenricLayOut(_ref) {
   (0, _react.useEffect)(() => {
     stateRef.current = state;
   }, [state]);
-  const parent = document.querySelector(".oaheaderButtons");
-  if ((parent === null || parent === void 0 || (_parent$children = parent.children) === null || _parent$children === void 0 ? void 0 : _parent$children.length) === 1) {
-    parent.classList.add("single-child");
-  }
+  (0, _react.useEffect)(() => {
+    const observer = new MutationObserver(e => {
+      const parent = document.querySelector(".oaheaderButtons");
+      if (parent) {
+        var _parent$children;
+        setHeaderButtons(parent);
+        if ((parent === null || parent === void 0 || (_parent$children = parent.children) === null || _parent$children === void 0 ? void 0 : _parent$children.length) === 1) {
+          parent.classList.add("single-child");
+        }
+      }
+    });
+    observer.observe(document.body, {
+      childList: true,
+      subtree: true
+    });
+    return () => {
+      observer.disconnect();
+    };
+  }, [headerButtons]);
   /**
    * Initializes the layout by fetching initial data and updating the state.
@@ -238,11 +254,7 @@ function GenricLayOut(_ref) {
           data
         } = await handleInputSearchChange(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, state === null || state === void 0 || (_state$inputSearch = state.inputSearch) === null || _state$inputSearch === void 0 ? void 0 : _state$inputSearch.request), state !== null && state !== void 0 && (_state$tabs2 = state.tabs) !== null && _state$tabs2 !== void 0 && _state$tabs2.active ? {
           selectedTab: state.tabs.active
-        } : {}), (customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) && Object.keys((_customDrawer$applied = customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) !== null && _customDrawer$applied !== void 0 ? _customDrawer$applied : {}).length > 0 && {
-          filterOn: customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters.filterBy,
-          fromDate: customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters.fromDate,
-          toDate: customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters.toDate
-        }), {}, {
+        } : {}), (customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) && Object.keys((_customDrawer$applied = customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) !== null && _customDrawer$applied !== void 0 ? _customDrawer$applied : {}).length > 0 && _objectSpread({}, customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters)), {}, {
           current: tables === null || tables === void 0 || (_tables$pagination = tables.pagination) === null || _tables$pagination === void 0 ? void 0 : _tables$pagination.current,
           pageSize: tables === null || tables === void 0 || (_tables$pagination2 = tables.pagination) === null || _tables$pagination2 === void 0 ? void 0 : _tables$pagination2.pageSize,
           field: tables === null || tables === void 0 || (_tables$sorting = tables.sorting) === null || _tables$sorting === void 0 ? void 0 : _tables$sorting.sortBy,
@@ -314,11 +326,7 @@ function GenricLayOut(_ref) {
         pageSize: tables === null || tables === void 0 || (_tables$pagination4 = tables.pagination) === null || _tables$pagination4 === void 0 ? void 0 : _tables$pagination4.pageSize,
         field: tables === null || tables === void 0 || (_tables$sorting3 = tables.sorting) === null || _tables$sorting3 === void 0 ? void 0 : _tables$sorting3.sortBy,
         order: tables === null || tables === void 0 || (_tables$sorting4 = tables.sorting) === null || _tables$sorting4 === void 0 ? void 0 : _tables$sorting4.sortDirection
-      }, (customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) && Object.keys((_customDrawer$applied2 = customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) !== null && _customDrawer$applied2 !== void 0 ? _customDrawer$applied2 : {}).length > 0 && {
-        filterOn: customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters.filterBy,
-        fromDate: customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters.fromDate,
-        toDate: customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters.toDate
-      }), inputSearch !== null && inputSearch !== void 0 && inputSearch.queryField ? {
+      }, (customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) && Object.keys((_customDrawer$applied2 = customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) !== null && _customDrawer$applied2 !== void 0 ? _customDrawer$applied2 : {}).length > 0 && _objectSpread({}, customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters)), inputSearch !== null && inputSearch !== void 0 && inputSearch.queryField ? {
         queryField: inputSearch.queryField
       } : {}), (header === null || header === void 0 || (_header$subHeading3 = header.subHeading) === null || _header$subHeading3 === void 0 || (_header$subHeading3 = _header$subHeading3.jsxConfig) === null || _header$subHeading3 === void 0 ? void 0 : _header$subHeading3.type) == "select" ? {
         subHeadingSelectVal: header === null || header === void 0 || (_header$subHeading4 = header.subHeading) === null || _header$subHeading4 === void 0 || (_header$subHeading4 = _header$subHeading4.jsxConfig) === null || _header$subHeading4 === void 0 ? void 0 : _header$subHeading4.value
@@ -383,11 +391,7 @@ function GenricLayOut(_ref) {
           columnFilterStatus: tables === null || tables === void 0 ? void 0 : tables.filter
         }), (staticFilter === null || staticFilter === void 0 ? void 0 : staticFilter.visible) && ((_staticFilter$data = staticFilter.data) === null || _staticFilter$data === void 0 || (_staticFilter$data = _staticFilter$data.find(item => item.selected)) === null || _staticFilter$data === void 0 ? void 0 : _staticFilter$data.value) && {
           staticFilter: staticFilter.data.find(item => item.selected).value
-        }), (customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) && Object.keys((_customDrawer$applied3 = customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) !== null && _customDrawer$applied3 !== void 0 ? _customDrawer$applied3 : {}).length > 0 && {
-          filterOn: customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters.filterBy,
-          fromDate: customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters.fromDate,
-          toDate: customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters.toDate
-        }), (_state$misc2 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc2 !== void 0 ? _state$misc2 : {}));
+        }), (customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) && Object.keys((_customDrawer$applied3 = customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) !== null && _customDrawer$applied3 !== void 0 ? _customDrawer$applied3 : {}).length > 0 && _objectSpread({}, customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters)), (_state$misc2 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc2 !== void 0 ? _state$misc2 : {}));
         if (error) {
           showErrorNotification(error);
           dispatch({
@@ -465,11 +469,7 @@ function GenricLayOut(_ref) {
         columnFilterStatus: tables === null || tables === void 0 ? void 0 : tables.filter
       }), (staticFilter === null || staticFilter === void 0 ? void 0 : staticFilter.visible) && ((_staticFilter$data2 = staticFilter.data) === null || _staticFilter$data2 === void 0 || (_staticFilter$data2 = _staticFilter$data2.find(item => item.selected)) === null || _staticFilter$data2 === void 0 ? void 0 : _staticFilter$data2.value) && {
         staticFilter: staticFilter.data.find(item => item.selected).value
-      }), (customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) && Object.keys((_customDrawer$applied4 = customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) !== null && _customDrawer$applied4 !== void 0 ? _customDrawer$applied4 : {}).length > 0 && {
-        filterOn: customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters.filterBy,
-        fromDate: customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters.fromDate,
-        toDate: customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters.toDate
-      }), (_state$misc3 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc3 !== void 0 ? _state$misc3 : {}));
+      }), (customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) && Object.keys((_customDrawer$applied4 = customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) !== null && _customDrawer$applied4 !== void 0 ? _customDrawer$applied4 : {}).length > 0 && _objectSpread({}, customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters)), (_state$misc3 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc3 !== void 0 ? _state$misc3 : {}));
       if (error) {
         showErrorNotification(error);
         dispatch({
@@ -519,11 +519,7 @@ function GenricLayOut(_ref) {
         pageSize: tables === null || tables === void 0 || (_tables$pagination10 = tables.pagination) === null || _tables$pagination10 === void 0 ? void 0 : _tables$pagination10.pageSize
       }, (staticFilter === null || staticFilter === void 0 ? void 0 : staticFilter.visible) && ((_staticFilter$data3 = staticFilter.data) === null || _staticFilter$data3 === void 0 || (_staticFilter$data3 = _staticFilter$data3.find(item => item.selected)) === null || _staticFilter$data3 === void 0 ? void 0 : _staticFilter$data3.value) && {
         staticFilter: staticFilter.data.find(item => item.selected).value
-      }), (customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) && Object.keys((_customDrawer$applied5 = customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) !== null && _customDrawer$applied5 !== void 0 ? _customDrawer$applied5 : {}).length > 0 && {
-        filterOn: customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters.filterBy,
-        fromDate: customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters.fromDate,
-        toDate: customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters.toDate
-      }), (_state$misc4 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc4 !== void 0 ? _state$misc4 : {}));
+      }), (customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) && Object.keys((_customDrawer$applied5 = customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) !== null && _customDrawer$applied5 !== void 0 ? _customDrawer$applied5 : {}).length > 0 && _objectSpread({}, customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters)), (_state$misc4 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc4 !== void 0 ? _state$misc4 : {}));
       if (error) {
         showErrorNotification(error);
         dispatch({
@@ -629,11 +625,7 @@ function GenricLayOut(_ref) {
         columnFilterStatus: tables === null || tables === void 0 ? void 0 : tables.filter
       }), (staticFilter === null || staticFilter === void 0 ? void 0 : staticFilter.visible) && ((_staticFilter$data4 = staticFilter.data) === null || _staticFilter$data4 === void 0 || (_staticFilter$data4 = _staticFilter$data4.find(item => item.selected)) === null || _staticFilter$data4 === void 0 ? void 0 : _staticFilter$data4.value) && {
         staticFilter: staticFilter.data.find(item => item.selected).value
-      }), (customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) && Object.keys((_customDrawer$applied6 = customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) !== null && _customDrawer$applied6 !== void 0 ? _customDrawer$applied6 : {}).length > 0 && {
-        filterOn: customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters.filterBy,
-        fromDate: customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters.fromDate,
-        toDate: customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters.toDate
-      }), (_state$misc5 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc5 !== void 0 ? _state$misc5 : {}));
+      }), (customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) && Object.keys((_customDrawer$applied6 = customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) !== null && _customDrawer$applied6 !== void 0 ? _customDrawer$applied6 : {}).length > 0 && _objectSpread({}, customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters)), (_state$misc5 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc5 !== void 0 ? _state$misc5 : {}));
       if (error) {
         showErrorNotification(error);
         dispatch({
@@ -682,11 +674,7 @@ function GenricLayOut(_ref) {
         pageSize: tables === null || tables === void 0 || (_tables$pagination14 = tables.pagination) === null || _tables$pagination14 === void 0 ? void 0 : _tables$pagination14.pageSize,
         field: tables === null || tables === void 0 || (_tables$sorting11 = tables.sorting) === null || _tables$sorting11 === void 0 ? void 0 : _tables$sorting11.sortBy,
         order: tables === null || tables === void 0 || (_tables$sorting12 = tables.sorting) === null || _tables$sorting12 === void 0 ? void 0 : _tables$sorting12.sortDirection
-      }, (customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) && Object.keys((_customDrawer$applied7 = customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) !== null && _customDrawer$applied7 !== void 0 ? _customDrawer$applied7 : {}).length > 0 && {
-        filterOn: customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters.filterBy,
-        fromDate: customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters.fromDate,
-        toDate: customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters.toDate
-      }), (header === null || header === void 0 || (_header$subHeading5 = header.subHeading) === null || _header$subHeading5 === void 0 || (_header$subHeading5 = _header$subHeading5.jsxConfig) === null || _header$subHeading5 === void 0 ? void 0 : _header$subHeading5.type) == "select" ? {
+      }, (customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) && Object.keys((_customDrawer$applied7 = customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) !== null && _customDrawer$applied7 !== void 0 ? _customDrawer$applied7 : {}).length > 0 && _objectSpread({}, customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters)), (header === null || header === void 0 || (_header$subHeading5 = header.subHeading) === null || _header$subHeading5 === void 0 || (_header$subHeading5 = _header$subHeading5.jsxConfig) === null || _header$subHeading5 === void 0 ? void 0 : _header$subHeading5.type) == "select" ? {
         subHeadingSelectVal: header === null || header === void 0 || (_header$subHeading6 = header.subHeading) === null || _header$subHeading6 === void 0 || (_header$subHeading6 = _header$subHeading6.jsxConfig) === null || _header$subHeading6 === void 0 ? void 0 : _header$subHeading6.value
       } : {}));
       if (error) {
@@ -874,9 +862,9 @@ function GenricLayOut(_ref) {
    * If an error occurs during any action, an error notification is shown.
    */
   const customTableSelectFooterClick = async configData => {
-    var _state$modal;
-    const modalContent = state === null || state === void 0 || (_state$modal = state.modal) === null || _state$modal === void 0 ? void 0 : _state$modal.modalContent;
     if ((configData === null || configData === void 0 ? void 0 : configData.action) === "OPEN_MODAL") {
+      var _state$modal;
+      const modalContent = state === null || state === void 0 || (_state$modal = state.modal) === null || _state$modal === void 0 ? void 0 : _state$modal.modalContent;
       if (handleModalDataSet) {
         const {
           error,
@@ -898,6 +886,29 @@ function GenricLayOut(_ref) {
           });
         }
       }
+    } else if ((configData === null || configData === void 0 ? void 0 : configData.action) === "CALL_API") {
+      if (handleTableFooterApi) {
+        var _handleTableFooterApi;
+        const {
+          error,
+          data
+        } = await ((_handleTableFooterApi = handleTableFooterApi) === null || _handleTableFooterApi === void 0 ? void 0 : _handleTableFooterApi(state));
+        if (error) {
+          showErrorNotification(error);
+        } else {
+          const updatedModalContent = (0, _staticConfigResolver.default)(config === null || config === void 0 ? void 0 : config.modal, data);
+          dispatch({
+            type: _layoutReducer.actionTypes.SET_MODAL,
+            payload: {
+              modalData: updatedModalContent
+            }
+          });
+          dispatch({
+            type: _layoutReducer.actionTypes.TOGGLE_MODAL,
+            payload: true
+          });
+        }
+      }
     }
   };
@@ -1011,11 +1022,7 @@ function GenricLayOut(_ref) {
         subHeadingSelectVal: header === null || header === void 0 || (_header$subHeading8 = header.subHeading) === null || _header$subHeading8 === void 0 || (_header$subHeading8 = _header$subHeading8.jsxConfig) === null || _header$subHeading8 === void 0 ? void 0 : _header$subHeading8.value
       } : {}), (staticFilter === null || staticFilter === void 0 ? void 0 : staticFilter.visible) && ((_staticFilter$data5 = staticFilter.data) === null || _staticFilter$data5 === void 0 || (_staticFilter$data5 = _staticFilter$data5.find(item => item.selected)) === null || _staticFilter$data5 === void 0 ? void 0 : _staticFilter$data5.value) && {
         staticFilter: staticFilter.data.find(item => item.selected).value
-      }), (customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) && Object.keys((_customDrawer$applied8 = customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) !== null && _customDrawer$applied8 !== void 0 ? _customDrawer$applied8 : {}).length > 0 && {
-        filterOn: customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters.filterBy,
-        fromDate: customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters.fromDate,
-        toDate: customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters.toDate
-      }), {}, {
+      }), (customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) && Object.keys((_customDrawer$applied8 = customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) !== null && _customDrawer$applied8 !== void 0 ? _customDrawer$applied8 : {}).length > 0 && _objectSpread({}, customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters)), {}, {
         order: (sorter === null || sorter === void 0 ? void 0 : sorter.order) === "ascend" && "ASC" || (sorter === null || sorter === void 0 ? void 0 : sorter.order) === "descend" && "DESC" || ""
       }, (_state$misc7 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc7 !== void 0 ? _state$misc7 : {}));
       if (error) {
@@ -1118,11 +1125,7 @@ function GenricLayOut(_ref) {
       }, (state === null || state === void 0 || (_state$dropdownSearch4 = state.dropdownSearch) === null || _state$dropdownSearch4 === void 0 || (_state$dropdownSearch4 = _state$dropdownSearch4.value) === null || _state$dropdownSearch4 === void 0 ? void 0 : _state$dropdownSearch4.trim()) && {
         searchedValue: state.dropdownSearch.value,
         selectedOption: state.dropdownSearch.selectedOption
-      }), (customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) && Object.keys((_customDrawer$applied9 = customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) !== null && _customDrawer$applied9 !== void 0 ? _customDrawer$applied9 : {}).length > 0 && {
-        filterOn: customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters.filterBy,
-        fromDate: customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters.fromDate,
-        toDate: customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters.toDate
-      }));
+      }), (customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) && Object.keys((_customDrawer$applied9 = customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) !== null && _customDrawer$applied9 !== void 0 ? _customDrawer$applied9 : {}).length > 0 && _objectSpread({}, customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters)));
       if (error) {
         showErrorNotification(error);
         dispatch({
@@ -1303,6 +1306,12 @@ function GenricLayOut(_ref) {
     // Check if this is a cancel/clear action - check both buttonClickType and the actual button data
     if (formData.type === "FILTER-CANCEL") {
       var _state$dropdownSearch6, _state$inputSearch6, _state$tabs13, _tables$pagination19, _tables$pagination20, _tables$filter7, _tables$sorting17, _header$subHeading11, _header$subHeading12, _staticFilter$data7, _tables$sorting18, _state$misc10;
+      if (isFiltersEmpty(customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters)) {
+        dispatch({
+          type: _layoutReducer.actionTypes.CUSTOM_DRAWER_CLOSED
+        });
+        return;
+      }
       const {
         error,
         data
@@ -1372,8 +1381,8 @@ function GenricLayOut(_ref) {
     }
     // Only process filter data if this is actually a filter drawer
-    if (formData.drawerKey === "filterData") {
-      var _state$dropdownSearch7, _state$inputSearch7, _ref4, _appliedFilters$filte, _state$tabs14, _tables$pagination21, _tables$pagination22, _tables$filter8, _tables$sorting19, _header$subHeading13, _header$subHeading14, _staticFilter$data8, _tables$sorting20, _state$misc11;
+    if (formData.type === "FILTER-SUBMIT") {
+      var _state$dropdownSearch7, _state$inputSearch7, _ref4, _appliedFilters$filte, _state$tabs14, _config$tables, _config$tables2, _tables$filter8, _tables$sorting19, _header$subHeading13, _header$subHeading14, _staticFilter$data8, _tables$sorting20, _state$misc11;
       const appliedFilters = {};
       Object.keys(formData).forEach(key => {
         const value = formData[key];
@@ -1381,21 +1390,27 @@ function GenricLayOut(_ref) {
           appliedFilters[key] = value;
         }
       });
+      if (isFiltersEmpty(appliedFilters)) {
+        dispatch({
+          type: _layoutReducer.actionTypes.CUSTOM_DRAWER_CLOSED
+        });
+        return;
+      }
       const {
         error,
         data
-      } = await handleTableChange(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, (state === null || state === void 0 || (_state$dropdownSearch7 = state.dropdownSearch) === null || _state$dropdownSearch7 === void 0 || (_state$dropdownSearch7 = _state$dropdownSearch7.value) === null || _state$dropdownSearch7 === void 0 ? void 0 : _state$dropdownSearch7.trim()) && {
+      } = await handleTableChange(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, (state === null || state === void 0 || (_state$dropdownSearch7 = state.dropdownSearch) === null || _state$dropdownSearch7 === void 0 || (_state$dropdownSearch7 = _state$dropdownSearch7.value) === null || _state$dropdownSearch7 === void 0 ? void 0 : _state$dropdownSearch7.trim()) && {
         searchedValue: state.dropdownSearch.value,
         selectedOption: state.dropdownSearch.selectedOption
       }), (state === null || state === void 0 || (_state$inputSearch7 = state.inputSearch) === null || _state$inputSearch7 === void 0 || (_state$inputSearch7 = _state$inputSearch7.value) === null || _state$inputSearch7 === void 0 ? void 0 : _state$inputSearch7.trim()) && {
         searchedValue: state.inputSearch.value
-      }), {}, {
+      }), appliedFilters), {}, {
         filterOn: (_ref4 = (_appliedFilters$filte = appliedFilters === null || appliedFilters === void 0 ? void 0 : appliedFilters.filterBy) !== null && _appliedFilters$filte !== void 0 ? _appliedFilters$filte : customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.defaultAppliedFilter) !== null && _ref4 !== void 0 ? _ref4 : "",
         fromDate: appliedFilters === null || appliedFilters === void 0 ? void 0 : appliedFilters.fromDate,
         toDate: appliedFilters === null || appliedFilters === void 0 ? void 0 : appliedFilters.toDate,
         selectedTab: state === null || state === void 0 || (_state$tabs14 = state.tabs) === null || _state$tabs14 === void 0 ? void 0 : _state$tabs14.active,
-        current: tables === null || tables === void 0 || (_tables$pagination21 = tables.pagination) === null || _tables$pagination21 === void 0 ? void 0 : _tables$pagination21.current,
-        pageSize: tables === null || tables === void 0 || (_tables$pagination22 = tables.pagination) === null || _tables$pagination22 === void 0 ? void 0 : _tables$pagination22.pageSize
+        current: config === null || config === void 0 || (_config$tables = config.tables) === null || _config$tables === void 0 || (_config$tables = _config$tables.pagination) === null || _config$tables === void 0 ? void 0 : _config$tables.current,
+        pageSize: config === null || config === void 0 || (_config$tables2 = config.tables) === null || _config$tables2 === void 0 || (_config$tables2 = _config$tables2.pagination) === null || _config$tables2 === void 0 ? void 0 : _config$tables2.pageSize
       }, (tables === null || tables === void 0 || (_tables$filter8 = tables.filter) === null || _tables$filter8 === void 0 ? void 0 : _tables$filter8.key) && {
         columnFilterStatus: tables === null || tables === void 0 ? void 0 : tables.filter
       }), {}, {
@@ -1413,6 +1428,7 @@ function GenricLayOut(_ref) {
           type: _layoutReducer.actionTypes.SET_TABLE_EMPTY
         });
       } else {
+        var _config$tables3, _config$tables4;
         if (staticFilter !== null && staticFilter !== void 0 && staticFilter.visible) {
           var _staticFilter$data$fi3, _config$staticFilter2;
           const selectedKey = staticFilter === null || staticFilter === void 0 || (_staticFilter$data$fi3 = staticFilter.data.find(item => item.selected)) === null || _staticFilter$data$fi3 === void 0 ? void 0 : _staticFilter$data$fi3.value;
@@ -1438,14 +1454,20 @@ function GenricLayOut(_ref) {
           type: _layoutReducer.actionTypes.UPDATE_FILTER_DEFAULT_VALUES,
           payload: formData
         });
+        dispatch({
+          type: _layoutReducer.actionTypes.SET_PAGINATION,
+          payload: {
+            current: config === null || config === void 0 || (_config$tables3 = config.tables) === null || _config$tables3 === void 0 || (_config$tables3 = _config$tables3.pagination) === null || _config$tables3 === void 0 ? void 0 : _config$tables3.current,
+            pageSize: config === null || config === void 0 || (_config$tables4 = config.tables) === null || _config$tables4 === void 0 || (_config$tables4 = _config$tables4.pagination) === null || _config$tables4 === void 0 ? void 0 : _config$tables4.pageSize
+          }
+        });
         dispatch({
           type: _layoutReducer.actionTypes.CUSTOM_DRAWER_CLOSED
         });
       }
     } else if (formData.drawerKey === "exportDrawer") {
-      console.log(formData, "formData");
       if (handleSecondaryTableCTAClick) {
-        var _state$dropdownSearch8, _state$inputSearch8, _state$tabs15, _tables$pagination23, _tables$pagination24, _tables$filter9, _tables$sorting21, _tables$sorting22, _header$subHeading15, _header$subHeading16, _staticFilter$data9, _state$misc12;
+        var _state$dropdownSearch8, _state$inputSearch8, _state$tabs15, _tables$pagination21, _tables$pagination22, _tables$filter9, _tables$sorting21, _tables$sorting22, _header$subHeading15, _header$subHeading16, _staticFilter$data9, _state$misc12;
         const {
           error,
           data
@@ -1456,8 +1478,8 @@ function GenricLayOut(_ref) {
           searchedValue: state.inputSearch.value
         }), {}, {
           selectedTab: state === null || state === void 0 || (_state$tabs15 = state.tabs) === null || _state$tabs15 === void 0 ? void 0 : _state$tabs15.active,
-          current: tables === null || tables === void 0 || (_tables$pagination23 = tables.pagination) === null || _tables$pagination23 === void 0 ? void 0 : _tables$pagination23.current,
-          pageSize: tables === null || tables === void 0 || (_tables$pagination24 = tables.pagination) === null || _tables$pagination24 === void 0 ? void 0 : _tables$pagination24.pageSize,
+          current: tables === null || tables === void 0 || (_tables$pagination21 = tables.pagination) === null || _tables$pagination21 === void 0 ? void 0 : _tables$pagination21.current,
+          pageSize: tables === null || tables === void 0 || (_tables$pagination22 = tables.pagination) === null || _tables$pagination22 === void 0 ? void 0 : _tables$pagination22.pageSize,
           columnFilterStatus: tables === null || tables === void 0 || (_tables$filter9 = tables.filter) === null || _tables$filter9 === void 0 ? void 0 : _tables$filter9.value,
           field: tables === null || tables === void 0 || (_tables$sorting21 = tables.sorting) === null || _tables$sorting21 === void 0 ? void 0 : _tables$sorting21.sortBy,
           order: tables === null || tables === void 0 || (_tables$sorting22 = tables.sorting) === null || _tables$sorting22 === void 0 ? void 0 : _tables$sorting22.sortDirection
@@ -1484,7 +1506,7 @@ function GenricLayOut(_ref) {
     }
   };
   const onClearAllAppliedFilters = async () => {
-    var _state$dropdownSearch9, _state$inputSearch9, _state$tabs16, _tables$pagination25, _tables$pagination26, _tables$filter10, _tables$sorting23, _header$subHeading17, _header$subHeading18, _staticFilter$data10, _tables$sorting24, _state$misc13;
+    var _state$dropdownSearch9, _state$inputSearch9, _state$tabs16, _tables$pagination23, _tables$pagination24, _tables$filter10, _tables$sorting23, _header$subHeading17, _header$subHeading18, _staticFilter$data10, _tables$sorting24, _state$misc13;
     const {
       error,
       data
@@ -1495,8 +1517,8 @@ function GenricLayOut(_ref) {
       searchedValue: state.inputSearch.value
     }), {}, {
       selectedTab: state === null || state === void 0 || (_state$tabs16 = state.tabs) === null || _state$tabs16 === void 0 ? void 0 : _state$tabs16.active,
-      current: tables === null || tables === void 0 || (_tables$pagination25 = tables.pagination) === null || _tables$pagination25 === void 0 ? void 0 : _tables$pagination25.current,
-      pageSize: tables === null || tables === void 0 || (_tables$pagination26 = tables.pagination) === null || _tables$pagination26 === void 0 ? void 0 : _tables$pagination26.pageSize
+      current: tables === null || tables === void 0 || (_tables$pagination23 = tables.pagination) === null || _tables$pagination23 === void 0 ? void 0 : _tables$pagination23.current,
+      pageSize: tables === null || tables === void 0 || (_tables$pagination24 = tables.pagination) === null || _tables$pagination24 === void 0 ? void 0 : _tables$pagination24.pageSize
     }, (tables === null || tables === void 0 || (_tables$filter10 = tables.filter) === null || _tables$filter10 === void 0 ? void 0 : _tables$filter10.key) && {
       columnFilterStatus: tables === null || tables === void 0 ? void 0 : tables.filter
     }), {}, {
@@ -1638,7 +1660,6 @@ function GenricLayOut(_ref) {
    * - "OPEN_MODAL": Opens a modal with updated content.
    */
   const leftHeaderFirstButtonClick = async () => {
-    console.log(leftHeaderFirstButton, "leftHeaderFirstButton");
     if ((leftHeaderFirstButton === null || leftHeaderFirstButton === void 0 ? void 0 : leftHeaderFirstButton.action) === "OPEN_CUSTOM_DRAWER") {
       var _config$customDrawer3;
       const drawerData = config === null || config === void 0 || (_config$customDrawer3 = config.customDrawer) === null || _config$customDrawer3 === void 0 || (_config$customDrawer3 = _config$customDrawer3.data) === null || _config$customDrawer3 === void 0 ? void 0 : _config$customDrawer3[leftHeaderFirstButton === null || leftHeaderFirstButton === void 0 ? void 0 : leftHeaderFirstButton.drawerKey];
@@ -1689,7 +1710,7 @@ function GenricLayOut(_ref) {
   };
   const rightHeaderSecondButtonClick = async () => {
     if ((rightHeaderSecondButton === null || rightHeaderSecondButton === void 0 ? void 0 : rightHeaderSecondButton.action) === "RESET_CUSTOM_DRAWER") {
-      var _state$dropdownSearch10, _state$inputSearch10, _state$tabs17, _tables$pagination27, _tables$pagination28, _tables$filter11, _tables$sorting25, _header$subHeading19, _header$subHeading20, _staticFilter$data11, _tables$sorting26, _state$misc15;
+      var _state$dropdownSearch10, _state$inputSearch10, _state$tabs17, _tables$pagination25, _tables$pagination26, _tables$filter11, _tables$sorting25, _header$subHeading19, _header$subHeading20, _staticFilter$data11, _tables$sorting26, _state$misc15;
       const {
         error,
         data
@@ -1700,8 +1721,8 @@ function GenricLayOut(_ref) {
         searchedValue: state.inputSearch.value
       }), {}, {
         selectedTab: state === null || state === void 0 || (_state$tabs17 = state.tabs) === null || _state$tabs17 === void 0 ? void 0 : _state$tabs17.active,
-        current: tables === null || tables === void 0 || (_tables$pagination27 = tables.pagination) === null || _tables$pagination27 === void 0 ? void 0 : _tables$pagination27.current,
-        pageSize: tables === null || tables === void 0 || (_tables$pagination28 = tables.pagination) === null || _tables$pagination28 === void 0 ? void 0 : _tables$pagination28.pageSize
+        current: tables === null || tables === void 0 || (_tables$pagination25 = tables.pagination) === null || _tables$pagination25 === void 0 ? void 0 : _tables$pagination25.current,
+        pageSize: tables === null || tables === void 0 || (_tables$pagination26 = tables.pagination) === null || _tables$pagination26 === void 0 ? void 0 : _tables$pagination26.pageSize
       }, (tables === null || tables === void 0 || (_tables$filter11 = tables.filter) === null || _tables$filter11 === void 0 ? void 0 : _tables$filter11.key) && {
         columnFilterStatus: tables === null || tables === void 0 ? void 0 : tables.filter
       }), {}, {
@@ -1763,7 +1784,7 @@ function GenricLayOut(_ref) {
   };
   const handleSubHeadingSelect = async val => {
     if (val) {
-      var _tables$pagination29, _tables$pagination30, _state$misc16;
+      var _tables$pagination27, _tables$pagination28, _state$misc16;
       dispatch({
         type: _layoutReducer.actionTypes.SET_SUBHEADING_SELECTED_CONFIG,
         payload: val
@@ -1773,8 +1794,8 @@ function GenricLayOut(_ref) {
         data
       } = await handleSubHeadingSelectClick(_objectSpread({
         searchedValue: inputSearch === null || inputSearch === void 0 ? void 0 : inputSearch.value,
-        current: tables === null || tables === void 0 || (_tables$pagination29 = tables.pagination) === null || _tables$pagination29 === void 0 ? void 0 : _tables$pagination29.current,
-        pageSize: tables === null || tables === void 0 || (_tables$pagination30 = tables.pagination) === null || _tables$pagination30 === void 0 ? void 0 : _tables$pagination30.pageSize,
+        current: tables === null || tables === void 0 || (_tables$pagination27 = tables.pagination) === null || _tables$pagination27 === void 0 ? void 0 : _tables$pagination27.current,
+        pageSize: tables === null || tables === void 0 || (_tables$pagination28 = tables.pagination) === null || _tables$pagination28 === void 0 ? void 0 : _tables$pagination28.pageSize,
         subHeadingSelectVal: val
       }, (_state$misc16 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc16 !== void 0 ? _state$misc16 : {}));
       if (error) {
@@ -1803,7 +1824,7 @@ function GenricLayOut(_ref) {
     // Call the handler if provided
     if (handleTableChange) {
-      var _state$dropdownSearch11, _state$inputSearch11, _state$tabs18, _tables$pagination31, _tables$sorting27, _tables$sorting28, _header$subHeading21, _header$subHeading22, _customDrawer$applied10, _state$misc17;
+      var _state$dropdownSearch11, _state$inputSearch11, _state$tabs18, _tables$pagination29, _tables$sorting27, _tables$sorting28, _header$subHeading21, _header$subHeading22, _customDrawer$applied10, _state$misc17;
       dispatch({
         type: _layoutReducer.actionTypes.SET_LOADING,
         payload: true
@@ -1820,17 +1841,13 @@ function GenricLayOut(_ref) {
         selectedTab: state === null || state === void 0 || (_state$tabs18 = state.tabs) === null || _state$tabs18 === void 0 ? void 0 : _state$tabs18.active,
         current: 1,
         // Reset to first page when filtering
-        pageSize: tables === null || tables === void 0 || (_tables$pagination31 = tables.pagination) === null || _tables$pagination31 === void 0 ? void 0 : _tables$pagination31.pageSize,
+        pageSize: tables === null || tables === void 0 || (_tables$pagination29 = tables.pagination) === null || _tables$pagination29 === void 0 ? void 0 : _tables$pagination29.pageSize,
         filterStatus: filterValue,
         field: tables === null || tables === void 0 || (_tables$sorting27 = tables.sorting) === null || _tables$sorting27 === void 0 ? void 0 : _tables$sorting27.sortBy,
         order: tables === null || tables === void 0 || (_tables$sorting28 = tables.sorting) === null || _tables$sorting28 === void 0 ? void 0 : _tables$sorting28.sortDirection
       }, (header === null || header === void 0 || (_header$subHeading21 = header.subHeading) === null || _header$subHeading21 === void 0 || (_header$subHeading21 = _header$subHeading21.jsxConfig) === null || _header$subHeading21 === void 0 ? void 0 : _header$subHeading21.type) == "select" ? {
         subHeadingSelectVal: header === null || header === void 0 || (_header$subHeading22 = header.subHeading) === null || _header$subHeading22 === void 0 || (_header$subHeading22 = _header$subHeading22.jsxConfig) === null || _header$subHeading22 === void 0 ? void 0 : _header$subHeading22.value
-      } : {}), (customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) && Object.keys((_customDrawer$applied10 = customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) !== null && _customDrawer$applied10 !== void 0 ? _customDrawer$applied10 : {}).length > 0 && {
-        filterOn: customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters.filterBy,
-        fromDate: customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters.fromDate,
-        toDate: customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters.toDate
-      }), (_state$misc17 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc17 !== void 0 ? _state$misc17 : {}), {}, {
+      } : {}), (customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) && Object.keys((_customDrawer$applied10 = customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) !== null && _customDrawer$applied10 !== void 0 ? _customDrawer$applied10 : {}).length > 0 && _objectSpread({}, customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters)), (_state$misc17 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc17 !== void 0 ? _state$misc17 : {}), {}, {
         staticFilter: filterValue // Pass static filter value
       }));
       if (error) {
@@ -1839,7 +1856,7 @@ function GenricLayOut(_ref) {
           type: _layoutReducer.actionTypes.SET_TABLE_EMPTY
         });
       } else {
-        var _tables$pagination32;
+        var _tables$pagination30;
         dispatch({
           type: _layoutReducer.actionTypes.SET_TABLE_DATA,
           payload: data
@@ -1849,7 +1866,7 @@ function GenricLayOut(_ref) {
           type: _layoutReducer.actionTypes.SET_PAGINATION,
           payload: {
             current: 1,
-            pageSize: tables === null || tables === void 0 || (_tables$pagination32 = tables.pagination) === null || _tables$pagination32 === void 0 ? void 0 : _tables$pagination32.pageSize
+            pageSize: tables === null || tables === void 0 || (_tables$pagination30 = tables.pagination) === null || _tables$pagination30 === void 0 ? void 0 : _tables$pagination30.pageSize
           }
         });
       }
@@ -1892,11 +1909,7 @@ function GenricLayOut(_ref) {
         subHeadingSelectVal: header === null || header === void 0 || (_header$subHeading24 = header.subHeading) === null || _header$subHeading24 === void 0 || (_header$subHeading24 = _header$subHeading24.jsxConfig) === null || _header$subHeading24 === void 0 ? void 0 : _header$subHeading24.value
       } : {}), (staticFilter === null || staticFilter === void 0 ? void 0 : staticFilter.visible) && ((_staticFilter$data12 = staticFilter.data) === null || _staticFilter$data12 === void 0 || (_staticFilter$data12 = _staticFilter$data12.find(item => item.selected)) === null || _staticFilter$data12 === void 0 ? void 0 : _staticFilter$data12.value) && {
         staticFilter: staticFilter.data.find(item => item.selected).value
-      }), (customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) && Object.keys((_customDrawer$applied11 = customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) !== null && _customDrawer$applied11 !== void 0 ? _customDrawer$applied11 : {}).length > 0 && {
-        filterOn: customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters.filterBy,
-        fromDate: customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters.fromDate,
-        toDate: customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters.toDate
-      }), (_state$misc18 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc18 !== void 0 ? _state$misc18 : {}));
+      }), (customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) && Object.keys((_customDrawer$applied11 = customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) !== null && _customDrawer$applied11 !== void 0 ? _customDrawer$applied11 : {}).length > 0 && _objectSpread({}, customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters)), (_state$misc18 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc18 !== void 0 ? _state$misc18 : {}));
       if (error) {
         showErrorNotification(error);
         dispatch({
@@ -1913,6 +1926,15 @@ function GenricLayOut(_ref) {
       }
     }
   };
+  function isFiltersEmpty() {
+    let filters = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    const filtersKeyLength = Object.keys(filters).length;
+    if (filtersKeyLength === 0) return true;
+    if (filtersKeyLength === 2) {
+      return (filters === null || filters === void 0 ? void 0 : filters.drawerKey) && (filters === null || filters === void 0 ? void 0 : filters.type);
+    }
+    return false;
+  }
   console.log(state, "GenricLayOutstate");
   return /*#__PURE__*/_react.default.createElement(_styles.OapageWithDataStyle, {
     className: (state === null || state === void 0 || (_state$misc19 = state.misc) === null || _state$misc19 === void 0 ? void 0 : _state$misc19.flow) === "hubAutomation" ? "hubAutomationContainer" : ""
@@ -2008,7 +2030,7 @@ function GenricLayOut(_ref) {
       }),
       position: "left"
     })
-  }), Object.keys((_customDrawer$applied12 = customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) !== null && _customDrawer$applied12 !== void 0 ? _customDrawer$applied12 : {}).length > 0 && /*#__PURE__*/_react.default.createElement("span", {
+  }), !isFiltersEmpty(customDrawer === null || customDrawer === void 0 ? void 0 : customDrawer.appliedFilters) && /*#__PURE__*/_react.default.createElement("span", {
     className: "notifyDot"
   })))))), (inputSearch === null || inputSearch === void 0 ? void 0 : inputSearch.visible) && /*#__PURE__*/_react.default.createElement(_antd.Skeleton, {
     loading: state === null || state === void 0 ? void 0 : state.isLoading,
@@ -2081,7 +2103,7 @@ function GenricLayOut(_ref) {
       emptyText: emptyTableState
     },
     emptyStateCard: emptyTableState,
-    onMobilePageChange: tables !== null && tables !== void 0 && (_tables$pagination33 = tables.pagination) !== null && _tables$pagination33 !== void 0 && _tables$pagination33.mwebPagination ? onMobilePageChange : undefined
+    onMobilePageChange: tables !== null && tables !== void 0 && (_tables$pagination31 = tables.pagination) !== null && _tables$pagination31 !== void 0 && _tables$pagination31.mwebPagination ? onMobilePageChange : undefined
   })))), (drawer === null || drawer === void 0 ? void 0 : drawer.visible) && /*#__PURE__*/_react.default.createElement(_CustomDrawer.default, {
     className: "oaDrawer",
     title: drawer === null || drawer === void 0 || (_drawer$data = drawer.data) === null || _drawer$data === void 0 || (_drawer$data = _drawer$data[(_tabs$active5 = tabs === null || tabs === void 0 ? void 0 : tabs.active) !== null && _tabs$active5 !== void 0 ? _tabs$active5 : "default"]) === null || _drawer$data === void 0 || (_drawer$data = _drawer$data[drawer === null || drawer === void 0 ? void 0 : drawer.active]) === null || _drawer$data === void 0 ? void 0 : _drawer$data.title,
@@ -2139,7 +2161,7 @@ function GenricLayOut(_ref) {
     className: "bottomSelectedSecion"
   }, /*#__PURE__*/_react.default.createElement(_Typography.default, {
     color: "secondary-content",
-    typography: "ype-button-500"
+    typography: "type-button-500"
   }, /*#__PURE__*/_react.default.createElement("span", null, "".concat(tables === null || tables === void 0 || (_tables$selectedRowKe = tables.selectedRowKeys) === null || _tables$selectedRowKe === void 0 ? void 0 : _tables$selectedRowKe.length, " ").concat(tables === null || tables === void 0 || (_tables$tableFooter2 = tables.tableFooter) === null || _tables$tableFooter2 === void 0 ? void 0 : _tables$tableFooter2.text))), /*#__PURE__*/_react.default.createElement(_CustomButton.default, {
     type: tables === null || tables === void 0 || (_tables$tableFooter3 = tables.tableFooter) === null || _tables$tableFooter3 === void 0 || (_tables$tableFooter3 = _tables$tableFooter3.jsxConfig) === null || _tables$tableFooter3 === void 0 ? void 0 : _tables$tableFooter3.buttonType,
     onClick: () => {

package/build/layout/GenricLayOut/components/Header.js CHANGED Viewed

@@ -17,6 +17,7 @@ function Header(_ref) {
   let {
     heading,
     subHeading,
+    subHeading1,
     onSubHeadingClick,
     handleSubHeadingSelect
   } = _ref;
@@ -63,6 +64,11 @@ function Header(_ref) {
     color: (_subHeading$color = subHeading === null || subHeading === void 0 ? void 0 : subHeading.color) !== null && _subHeading$color !== void 0 ? _subHeading$color : "secondary-content"
   }, (subHeading === null || subHeading === void 0 || (_subHeading$icon = subHeading.icon) === null || _subHeading$icon === void 0 ? void 0 : _subHeading$icon.position) === "left" && /*#__PURE__*/_react.default.createElement(_MaterialIcon.default, _extends({}, subHeading === null || subHeading === void 0 || (_subHeading$icon2 = subHeading.icon) === null || _subHeading$icon2 === void 0 ? void 0 : _subHeading$icon2.iconConfig, {
     className: "margin-right-8"
-  })), subHeading === null || subHeading === void 0 ? void 0 : subHeading.text, (subHeading === null || subHeading === void 0 || (_subHeading$icon3 = subHeading.icon) === null || _subHeading$icon3 === void 0 ? void 0 : _subHeading$icon3.position) === "right" && /*#__PURE__*/_react.default.createElement(_MaterialIcon.default, subHeading === null || subHeading === void 0 || (_subHeading$icon4 = subHeading.icon) === null || _subHeading$icon4 === void 0 ? void 0 : _subHeading$icon4.iconConfig)), subHeadingJsx(subHeading)));
+  })), subHeading === null || subHeading === void 0 ? void 0 : subHeading.text, (subHeading === null || subHeading === void 0 || (_subHeading$icon3 = subHeading.icon) === null || _subHeading$icon3 === void 0 ? void 0 : _subHeading$icon3.position) === "right" && /*#__PURE__*/_react.default.createElement(_MaterialIcon.default, subHeading === null || subHeading === void 0 || (_subHeading$icon4 = subHeading.icon) === null || _subHeading$icon4 === void 0 ? void 0 : _subHeading$icon4.iconConfig)), subHeadingJsx(subHeading)), subHeading1 && /*#__PURE__*/_react.default.createElement("div", {
+    className: "subHadingText marginNone"
+  }, /*#__PURE__*/_react.default.createElement(_Typography.default, {
+    typography: subHeading1 === null || subHeading1 === void 0 ? void 0 : subHeading1.type,
+    color: "secondary-content"
+  }, subHeading1 === null || subHeading1 === void 0 ? void 0 : subHeading1.text)));
 }
 var _default = exports.default = Header;

package/build/layout/GenricLayOut/styles.js CHANGED Viewed

@@ -16,7 +16,7 @@ function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(
 const DrawerWithOutFooter = exports.DrawerWithOutFooter = (0, _styledComponents.createGlobalStyle)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n.hubAutomationContainer .fullPageLayout {padding: 0 !important; background: #fff !important;}\n.hubAutomationContainer .fullPageLayout  .oaRightLayouts{\n    max-width: 1154px;\n    margin: 24px auto;\n    padding: 0 16px;\n    box-shadow: none;}\n.oaDrawer div + div.ant-drawer-body{padding-bottom:100px !important;}\n\n.ant-checkbox-indeterminate .ant-checkbox-inner:after {\n    background-color: #014fc5;\n}\n\n.ant-form-item .ant-form-item-label >label.ant-form-item-required::before {display:none;}\n.ant-form-item .ant-form-item-label >label.ant-form-item-required::after{ content: \"*\"; color: #DE350B; visibility: visible !important;}\n\n\n.cstUplaodWithFullWidth{margin-bottom:24px;}\n.cstUplaodWithFullWidth:last-child{margin-bottom:0;}\n.cstUplaodWithFullWidth .uploadDiv{width:100%;}\n.cstUplaodWithFullWidth .uploadDiv .ant-upload-list-item-container, .cstUplaodWithFullWidth .uploadDiv .ant-upload-wrapper .ant-upload-list-picture-card .ant-upload-select, .cstUplaodWithFullWidth .uploadDiv .ant-upload-wrapper.ant-upload-picture-card-wrapper .ant-upload-list.ant-upload-list-picture-card .ant-upload-list-item-container {\n     width: 100%; \n    height: 120px;\n}\n\n\n\n\n.oaDrawer .ant-form-item .ant-form-item-explain-error {\n    color: #DE350B;\n    font-size: 12px;\n    margin: 4px 0 0 0;\n}\n.bottomSelectedSecion{background: #F6F6F6; padding: 16px 36px; position: fixed; bottom: 0; left: 0; right: 0;\nbox-shadow: 0px 2px 10px 0px rgba(0, 0, 0, 0.14);\n    display: flex; z-index: 2;\n    align-items: center;\n    justify-content: end;\n    gap: 24px;}\n\n\n\n.listOfItems{ border-radius: 12px;\n    border: 1px solid #E0E0E0;\n    padding: 24px;\n    margin: 24px 0 0 0;}\n    modalSubheading{\n    padding: 24px;\n    margin: 24px 0 0 0;}\n\n.listOfItemsWithoutBorder{\n    padding: 24px 0;\n    margin: 24px 0 0 0;}\n\n    modalSubheading{\n    padding: 24px;\n    margin: 24px 0 0 0;}\n\n\n\n\n.modalIconAndTextBox{display:flex; flex-direction:row; align-items: center;  margin: 0 0 16px 0; gap:4px;}\n"])));
 const FormWidgetStyle = exports.FormWidgetStyle = _styledComponents.default.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  .formBottomAction {\n    position: absolute;\n    bottom: 0px;\n    background-color: rgb(249, 249, 249);\n    box-shadow: rgba(0, 0, 0, 0.1) 0px -2px 8px;\n    padding: 16px;\n    display: flex;\n    justify-content: flex-end;\n    gap: 12px;\n    z-index: 10;\n    left: 0;\n    right: 0;\n  }\n\n  .formBottomAction .ant-form-item {\n    margin-bottom: 0px;\n  }\n\n  .searchErrorMsg {\n    font-size: 12px;\n  }\n  .searchErrorMsg {\n    font-size: 12px;\n  }\n"])));
 const TableDataStyle = exports.TableDataStyle = _styledComponents.default.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  .tableContainerList th,\n  button {\n    white-space: nowrap;\n  }\n  .tableContainerList th,\n  button {\n    white-space: nowrap;\n  }\n"])));
-const OapageWithDataStyle = exports.OapageWithDataStyle = _styledComponents.default.aside(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  .oaTopHeaderAndBtnSec {\n    display: flex;\n    flex-direction: row;\n    justify-content: space-between;\n  }\n\n  .fullPageLayout {\n    display: flex;\n    padding: 8px;\n    background: #f6f6f6;\n  }\n  .ant-pagination {\n    padding: 0 16px;\n    justify-content: end;\n  }\n  .layoutHeadingPage {\n    display: flex;\n    gap: 8px;\n    margin: 0 0 32px 0;\n    flex-direction: column;\n    justify-content: flex-start;\n  }\n\n  .topHadingWithIcon span {\n    display: flex;\n    align-items: center;\n    justify-content: flex-start;\n    gap: 8px;\n  }\n\n  .subHadingText {\n    margin: 0 0 0 36px;\n  }\n\n  .marginNone {\n    margin: 0 !important;\n  }\n\n  .subHadingText > span {\n    display: flex;\n    flex-direction: row;\n    gap: 4px;\n    align-items: center;\n  }\n\n  .oaRightLayouts {\n    width: 100%;\n    min-height: calc(100vh - 16px);\n    padding: 76px 48px;\n    overflow-y: auto;\n    border-radius: 16px;\n    background: #fff;\n    box-shadow: 0px 2px 10px 0px rgba(0, 0, 0, 0.14);\n  }\n\n  .oaheaderSearchAndFilter {\n    display: flex;\n    align-items: center;\n    justify-content: space-between;\n    margin: 0 0 16px 0;\n    gap: 16px;\n  }\n\n\n  .oaRightLayouts .iconAndTextSecBox {\n    display: flex;\n    flex-direction: row;\n    align-items: center;\n    gap: 8px;\n  }\n  .inLine {\n    display: flex;\n    flex-direction: row;\n    align-items: center;\n    gap: 4px;\n  }\n\n  .customeSelectDropdown {\n    margin: 4px 0 0 8px;\n  }\n\n  .cardData {\n    padding: 28px 0 48px 0;\n  }\n\n  .ant-carousel .slick-dots {\n    position: static;\n    margin: 20px auto 12px 0;\n  }\n  .ant-carousel .slick-dots li {\n    width: 8px;\n    height: 8px;\n  }\n  .ant-carousel .slick-dots li button {\n    width: 8px;\n    height: 8px;\n    background: #cacaca;\n    border-radius: 50%;\n    opacity: 0.5;\n  }\n  .ant-carousel .slick-dots li.slick-active {\n    width: 8px;\n    height: 8px;\n  }\n  .ant-carousel .slick-dots li.slick-active button {\n    width: 8px;\n    height: 8px;\n    opacity: 1;\n  }\n  .ant-carousel .slick-dots li::after {\n    width: 8px;\n    height: 8px;\n    border-radius: 50%;\n    opacity: 1;\n    background: #717171;\n  }\n\n  .oaTabs .ant-tabs-nav {\n    border-top: 1px solid #e0e0e0;\n    border-left: 1px solid #e0e0e0;\n    border-right: 1px solid #e0e0e0;\n    padding: 12px 22px 0 22px;\n    margin: 0 0 8px 0;\n    background: #fff;\n    border-radius: 4px 4px 0 0;\n  }\n  .ant-card-body {\n    padding: 24px 16px !important;\n    border-radius: 16px;\n    background: #f6f6f6;\n  }\n  .cardContainer {\n    display: flex;\n    gap: 24px;\n  }\n  .selectAndSearch .noClear {\n    border-radius: 0 4px 4px 0;\n    max-width: 320px;\n    width: 100%;\n  }\n\n  .searchErrorMsg {\n    font-size: 12px;\n    margin: 4px 0px 0px;\n    color: #de350b;\n  }\n  .searchOnly {\n    margin: 0px 0px 16px;\n    position: relative;\n  }\n  .searchOnly .ant-input-affix-wrapper {\n    border-radius: 4px;\n    max-width: 420px;\n    padding-left: 44px;\n  }\n  .searchOnly .cstSearchIcon {\n    position: absolute;\n    left: 16px;\n    top: 14px;\n    z-index: 2;\n  }\n\n  .selectAndSearch .ant-input-affix-wrapper {\n    border-radius: 0 4px 4px 0;\n    width: 320px;\n  }\n\n  .selectAndSearch {\n    flex-shrink: 0;\n  }\n\n  .customeSelectDropdown .ant-select-selector {\n    border: none;\n    padding: 0;\n  }\n  .customeSelectDropdown .ant-select-selection-item > span {\n    font-size: 24px;\n    font-weight: 500;\n    line-height: 32px;\n  }\n\n  .customeSelectDropdown .ant-select {\n    margin: 0 0 0 32px;\n  }\n\n  .customeSelectDropdown .ant-select .ant-select-arrow {\n    color: #014fc5;\n    inset-inline-end: -6px;\n  }\n\n  .customeSelectDropdown .ant-select-selector {\n    box-shadow: none !important;\n  }\n  .oaheaderButtons {\n    display: flex;\n    gap: 24px;\n    align-items: center;\n    position: relative;\n    flex-grow: 1;\n    justify-content:space-between;\n  }\n\n  .oaheaderButtons.single-child {\n  justify-content: flex-end;\n}\n\n  .oaheaderButtonsRight{display:flex; flex-direction:row; gap:16px;} \n\n  .oaheaderButtons .notifyDot {\n    width: 12px;\n    height: 12px;\n    background: #de350b;\n    position: absolute;\n    top: -4px;\n    right: -4px;\n    border-radius: 50%;\n  }\n\n  @media only screen and (max-width: 600px) {\n\n\n    .selectAndSearch .ant-input-affix-wrapper {\n    width:calc(100% - 84px);\n  }\n.oaheaderSearchAndFilter .dropDownSearchContainer {width:100%;}\n\n\n.oaheaderSearchAndFilter{   \n    align-items: flex-end;\n    flex-direction: column;\n    gap: 16px;\n  }\n\n    .inLine {\n      flex-direction: column;\n      gap: 0;\n      align-items: flex-start;\n    }\n\n    .subHadingText > span {\n      flex-direction: column;\n      align-items: flex-start;\n    }\n\n    .fullPageLayout {\n      flex-direction: column;\n      padding: 0;\n    }\n    .oaRightLayouts {\n      padding: 16px;\n      border-radius: 0;\n      background: #fff;\n      box-shadow: none;\n      height: auto;\n      background: #f6f6f6;\n    }\n    .oaTabs .ant-tabs-nav {\n      margin: 0 0 28px 0;\n      padding: 12px 0 0 0;\n    }\n    .layoutHeadingPage {\n      margin: 0 0 16px 0;\n      background: #fff;\n      padding: 16px;\n      border-radius: 8px;\n      width: 100%;\n    }\n    .layoutHeadingAndSearch {\n      background: #fff;\n      padding: 20px 16px;\n      margin: 0;\n      width: 100%;\n      border-radius: 8px;\n    }\n  }\n"])));
+const OapageWithDataStyle = exports.OapageWithDataStyle = _styledComponents.default.aside(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  .oaTopHeaderAndBtnSec {\n    display: flex;\n    flex-direction: row;\n    justify-content: space-between;\n  }\n\n  .fullPageLayout {\n    display: flex;\n    padding: 8px;\n    background: #f6f6f6;\n  }\n  .ant-pagination {\n    padding: 0 16px;\n    justify-content: end;\n  }\n  .layoutHeadingPage {\n    display: flex;\n    gap: 8px;\n    margin: 0 0 32px 0;\n    flex-direction: column;\n    justify-content: flex-start;\n  }\n\n  .topHadingWithIcon span {\n    display: flex;\n    align-items: center;\n    justify-content: flex-start;\n    gap: 8px;\n  }\n\n  .subHadingText {\n    margin: 0 0 0 36px;\n  }\n\n  .marginNone {\n    margin: 0 !important;\n  }\n\n  .subHadingText > span {\n    display: flex;\n    flex-direction: row;\n    gap: 4px;\n    align-items: center;\n  }\n\n  .oaRightLayouts {\n    width: 100%;\n    min-height: calc(100vh - 16px);\n    padding: 76px 48px;\n    overflow-y: auto;\n    border-radius: 16px;\n    background: #fff;\n    box-shadow: 0px 2px 10px 0px rgba(0, 0, 0, 0.14);\n  }\n\n  .oaheaderSearchAndFilter {\n    display: flex;\n    align-items: center;\n    justify-content: space-between;\n    margin: 0 0 16px 0;\n    gap: 16px;\n  }\n\n  .oaRightLayouts .iconAndTextSecBox {\n    display: flex;\n    flex-direction: row;\n    align-items: center;\n    gap: 8px;\n  }\n  .inLine {\n    display: flex;\n    flex-direction: row;\n    align-items: center;\n    gap: 4px;\n  }\n\n  .customeSelectDropdown {\n    margin: 4px 0 0 8px;\n  }\n\n  .cardData {\n    padding: 28px 0 48px 0;\n  }\n\n  .ant-carousel .slick-dots {\n    position: static;\n    margin: 20px auto 12px 0;\n  }\n  .ant-carousel .slick-dots li {\n    width: 8px;\n    height: 8px;\n  }\n  .ant-carousel .slick-dots li button {\n    width: 8px;\n    height: 8px;\n    background: #cacaca;\n    border-radius: 50%;\n    opacity: 0.5;\n  }\n  .ant-carousel .slick-dots li.slick-active {\n    width: 8px;\n    height: 8px;\n  }\n  .ant-carousel .slick-dots li.slick-active button {\n    width: 8px;\n    height: 8px;\n    opacity: 1;\n  }\n  .ant-carousel .slick-dots li::after {\n    width: 8px;\n    height: 8px;\n    border-radius: 50%;\n    opacity: 1;\n    background: #717171;\n  }\n\n  .oaTabs .ant-tabs-nav {\n    border-top: 1px solid #e0e0e0;\n    border-left: 1px solid #e0e0e0;\n    border-right: 1px solid #e0e0e0;\n    padding: 12px 22px 0 22px;\n    margin: 0 0 8px 0;\n    background: #fff;\n    border-radius: 4px 4px 0 0;\n  }\n  .ant-card-body {\n    padding: 24px 16px !important;\n    border-radius: 16px;\n    background: #f6f6f6;\n  }\n  .cardContainer {\n    display: flex;\n    gap: 24px;\n  }\n  .selectAndSearch .noClear {\n    border-radius: 0 4px 4px 0;\n    width: 320px;\n  }\n\n  .searchErrorMsg {\n    font-size: 12px;\n    margin: 4px 0px 0px;\n    color: #de350b;\n  }\n  .searchOnly {\n    margin: 0px 0px 16px;\n    position: relative;\n  }\n  .searchOnly .ant-input-affix-wrapper {\n    border-radius: 4px;\n    max-width: 420px;\n    padding-left: 44px;\n  }\n  .searchOnly .cstSearchIcon {\n    position: absolute;\n    left: 16px;\n    top: 14px;\n    z-index: 2;\n  }\n\n  .selectAndSearch .ant-input-affix-wrapper {\n    border-radius: 0 4px 4px 0;\n    width: 320px;\n  }\n\n  .selectAndSearch {\n    flex-shrink: 0;\n  }\n\n  .customeSelectDropdown .ant-select-selector {\n    border: none;\n    padding: 0;\n  }\n  .customeSelectDropdown .ant-select-selection-item > span {\n    font-size: 24px;\n    font-weight: 500;\n    line-height: 32px;\n  }\n\n  .customeSelectDropdown .ant-select {\n    margin: 0 0 0 32px;\n  }\n\n  .customeSelectDropdown .ant-select .ant-select-arrow {\n    color: #014fc5;\n    inset-inline-end: -6px;\n  }\n\n  .customeSelectDropdown .ant-select-selector {\n    box-shadow: none !important;\n  }\n  .oaheaderButtons {\n    display: flex;\n    gap: 24px;\n    align-items: center;\n    position: relative;\n    flex-grow: 1;\n    justify-content: space-between;\n  }\n\n  .oaheaderButtons.single-child {\n    justify-content: flex-end;\n  }\n\n  .oaheaderButtonsRight {\n    display: flex;\n    flex-direction: row;\n    gap: 16px;\n  }\n\n  .oaheaderButtons .notifyDot {\n    width: 12px;\n    height: 12px;\n    background: #de350b;\n    position: absolute;\n    top: -4px;\n    right: -4px;\n    border-radius: 50%;\n  }\n\n  @media only screen and (max-width: 600px) {\n    .selectAndSearch .ant-input-affix-wrapper {\n      width: calc(100% - 84px);\n    }\n    .oaheaderSearchAndFilter .dropDownSearchContainer {\n      width: 100%;\n    }\n\n    .oaheaderSearchAndFilter {\n      align-items: flex-end;\n      flex-direction: column;\n      gap: 16px;\n    }\n\n    .inLine {\n      flex-direction: column;\n      gap: 0;\n      align-items: flex-start;\n    }\n\n    .subHadingText > span {\n      flex-direction: column;\n      align-items: flex-start;\n    }\n\n    .fullPageLayout {\n      flex-direction: column;\n      padding: 0;\n    }\n    .oaRightLayouts {\n      padding: 16px;\n      border-radius: 0;\n      background: #fff;\n      box-shadow: none;\n      height: auto;\n      background: #f6f6f6;\n    }\n    .oaTabs .ant-tabs-nav {\n      margin: 0 0 28px 0;\n      padding: 12px 0 0 0;\n    }\n    .layoutHeadingPage {\n      margin: 0 0 16px 0;\n      background: #fff;\n      padding: 16px;\n      border-radius: 8px;\n      width: 100%;\n    }\n    .layoutHeadingAndSearch {\n      background: #fff;\n      padding: 20px 16px;\n      margin: 0;\n      width: 100%;\n      border-radius: 8px;\n    }\n  }\n"])));
 const ListofDamageParts = exports.ListofDamageParts = _styledComponents.default.div(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  ul.damagedParts {\n    display: flex;\n    flex-direction: column;\n    margin: 8px 0 0 16px;\n    list-style-type: disc;\n  }\n  ul.damagedParts li {\n    padding: 4px 0;\n    width: 100%;\n  }\n  ul.damagedParts li::marker {\n    color: #717171;\n    font-size: 20px;\n  }\n"])));
 const IncidentListParts = exports.IncidentListParts = _styledComponents.default.div(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n  .qaSec dl {\n    display: flex;\n    flex-direction: column;\n    margin: 0;\n    padding: 0;\n  }\n  .qaSec dl dt {\n    display: flex;\n    flex-direction: column;\n    margin: 16px 0 0 0;\n  }\n  .qaSec dl dt:first-child {\n    margin-top: 8px;\n  }\n"])));
 var _default = exports.default = {};

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

@@ -8,6 +8,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = FormWidget;
 require("core-js/modules/web.dom-collections.iterator.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");
 require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.string.includes.js");
 var _antd = require("antd");
@@ -43,7 +46,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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 FormWidget(props) {
-  var _cancel$type, _cancel$size, _clear$type, _clear$size, _submit$type;
+  var _cancel$type, _cancel$size, _clear$type, _clear$size, _submit$type, _submit$disabled;
   const [form] = _antd.Form.useForm();
   const [dynamicRules, setDynamicRules] = (0, _react.useState)({});
   const {
@@ -61,16 +64,47 @@ function FormWidget(props) {
     visible,
     clear
   } = cta !== null && cta !== void 0 ? cta : {};
-  const getFieldRules = item => {
-    return dynamicRules[item === null || item === void 0 ? void 0 : item.name] || (item === null || item === void 0 ? void 0 : item.rules) || [];
+  const getFieldRules = (itemData, item) => {
+    console.log(item, "item");
+    console.log(itemData, "itemData");
+    if (item.customRulesCheck) {
+      return dynamicRules[item === null || item === void 0 ? void 0 : item.name] || (item === null || item === void 0 ? void 0 : item.rules) || [];
+    } else {
+      return getInputRules(itemData, item);
+    }
+  };
+  const getInputRules = (itemData, item) => {
+    var _ref;
+    console.log(itemData, item, "getInputRules");
+    if (itemData !== null && itemData !== void 0 && itemData.customRules) {
+      for (const key in itemData === null || itemData === void 0 ? void 0 : itemData.customRules) {
+        if (item[key]) {
+          var _itemData$customRules;
+          return itemData === null || itemData === void 0 || (_itemData$customRules = itemData.customRules[key]) === null || _itemData$customRules === void 0 ? void 0 : _itemData$customRules.map(r => {
+            var _r$rule;
+            if (r !== null && r !== void 0 && (_r$rule = r.rule) !== null && _r$rule !== void 0 && _r$rule.pattern) {
+              r.rule.pattern = new RegExp(r.rule.pattern);
+            }
+            return (r === null || r === void 0 ? void 0 : r.checkValidator) && (r === null || r === void 0 ? void 0 : r.rule);
+          });
+        }
+      }
+    }
+    return (_ref = itemData || item) === null || _ref === void 0 || (_ref = _ref.rules) === null || _ref === void 0 ? void 0 : _ref.map(r => {
+      var _r$rule2;
+      if (r !== null && r !== void 0 && (_r$rule2 = r.rule) !== null && _r$rule2 !== void 0 && _r$rule2.pattern) {
+        r.rule.pattern = new RegExp(r.rule.pattern);
+      }
+      return (r === null || r === void 0 ? void 0 : r.checkValidator) && (r === null || r === void 0 ? void 0 : r.rule);
+    });
   };
   const handleDynamicRuleUpdate = (fieldName, value, dynamicRulesConfig) => {
     if (!dynamicRulesConfig) return;
-    console.log(value, "handleDynamicRuleUpdate");
-    Object.entries(dynamicRulesConfig).forEach(_ref => {
+    Object.entries(dynamicRulesConfig).forEach(_ref2 => {
       var _config$conditions;
-      let [targetField, config] = _ref;
+      let [targetField, config] = _ref2;
       const condition = (_config$conditions = config.conditions) === null || _config$conditions === void 0 ? void 0 : _config$conditions.find(c => c.type === "equals" ? value == c.value : c.type == "not_equals" ? value != c.value : c.type == "includes" ? value === null || value === void 0 ? void 0 : value.includes(c.value) : c.validator ? c.validator(value) : false);
+      console.log(condition, "condition");
       const newRules = condition ? condition.rules : config.defaultRules || [];
       setDynamicRules(prev => _objectSpread(_objectSpread({}, prev), {}, {
         [targetField]: newRules
@@ -82,6 +116,7 @@ function FormWidget(props) {
       }
     });
   };
+  console.log(dynamicRules, "dynamicrule");
   const dynamicClassInCaseOfUpload = item => {
     if ((item === null || item === void 0 ? void 0 : item.width) === "full") {
       return "cstUplaodWithFullWidth";
@@ -103,7 +138,7 @@ function FormWidget(props) {
   };
   const renderFieldWidget = (item, index, itemData) => {
     if ((item === null || item === void 0 ? void 0 : item.widget) === "date" && (item === null || item === void 0 ? void 0 : item.visible) !== false) {
-      var _item$props, _item$props$getDisabl;
+      var _item$props, _item$props$getDisabl, _item$disabled;
       return /*#__PURE__*/_react.default.createElement(_antd.Form.Item, {
         value: item === null || item === void 0 ? void 0 : item.value,
         name: item === null || item === void 0 ? void 0 : item.name,
@@ -116,11 +151,12 @@ function FormWidget(props) {
           width: "100%"
         },
         disabledDateFunction: item === null || item === void 0 || (_item$props = item.props) === null || _item$props === void 0 || (_item$props$getDisabl = _item$props.getDisabledDateLogic) === null || _item$props$getDisabl === void 0 ? void 0 : _item$props$getDisabl.call(_item$props, item.valueProp),
+        disabled: (_item$disabled = item.disabled) !== null && _item$disabled !== void 0 ? _item$disabled : false,
         defaultValue: item.defaultValue
       }, item === null || item === void 0 ? void 0 : item.props)));
     }
     if ((item === null || item === void 0 ? void 0 : item.widget) === "select" && (item === null || item === void 0 ? void 0 : item.visible) !== false) {
-      var _item$disabled, _item$showSearch, _item$optionLabelProp;
+      var _item$disabled2, _item$showSearch, _item$optionLabelProp;
       return /*#__PURE__*/_react.default.createElement(_antd.Form.Item, {
         name: item === null || item === void 0 ? void 0 : item.name,
         label: item === null || item === void 0 ? void 0 : item.label,
@@ -130,7 +166,7 @@ function FormWidget(props) {
         options: item === null || item === void 0 ? void 0 : item.value,
         placeholder: item === null || item === void 0 ? void 0 : item.placeholder,
         defaultValue: item.defaultValueRequired && (item === null || item === void 0 ? void 0 : item.defaultValue) !== "" ? item === null || item === void 0 ? void 0 : item.defaultValue : undefined,
-        disabled: (_item$disabled = item.disabled) !== null && _item$disabled !== void 0 ? _item$disabled : false
+        disabled: (_item$disabled2 = item.disabled) !== null && _item$disabled2 !== void 0 ? _item$disabled2 : false
       }, (item === null || item === void 0 ? void 0 : item.onChange) && {
         onChange: value => {
           // Call the original onChange if provided
@@ -151,20 +187,22 @@ function FormWidget(props) {
         },
         showSearch: (_item$showSearch = item === null || item === void 0 ? void 0 : item.showSearch) !== null && _item$showSearch !== void 0 ? _item$showSearch : false,
         filterOption: (input, option) => {
-          var _toLowerCase, _ref2, _option$label$props$t, _option$label, _input$toLowerCase;
-          return (_toLowerCase = (_ref2 = (_option$label$props$t = option === null || option === void 0 || (_option$label = option.label) === null || _option$label === void 0 || (_option$label = _option$label.props) === null || _option$label === void 0 ? void 0 : _option$label.title) !== null && _option$label$props$t !== void 0 ? _option$label$props$t : "").toLowerCase) === null || _toLowerCase === void 0 || (_toLowerCase = _toLowerCase.call(_ref2)) === null || _toLowerCase === void 0 ? void 0 : _toLowerCase.includes(input === null || input === void 0 || (_input$toLowerCase = input.toLowerCase) === null || _input$toLowerCase === void 0 ? void 0 : _input$toLowerCase.call(input));
+          var _toLowerCase, _ref3, _option$label$props$t, _option$label, _input$toLowerCase;
+          return (_toLowerCase = (_ref3 = (_option$label$props$t = option === null || option === void 0 || (_option$label = option.label) === null || _option$label === void 0 || (_option$label = _option$label.props) === null || _option$label === void 0 ? void 0 : _option$label.title) !== null && _option$label$props$t !== void 0 ? _option$label$props$t : "").toLowerCase) === null || _toLowerCase === void 0 || (_toLowerCase = _toLowerCase.call(_ref3)) === null || _toLowerCase === void 0 ? void 0 : _toLowerCase.includes(input === null || input === void 0 || (_input$toLowerCase = input.toLowerCase) === null || _input$toLowerCase === void 0 ? void 0 : _input$toLowerCase.call(input));
         }
       }, item.optionLabelProp && {
         optionLabelProp: (_item$optionLabelProp = item === null || item === void 0 ? void 0 : item.optionLabelProp) !== null && _item$optionLabelProp !== void 0 ? _item$optionLabelProp : ""
       })));
     }
     if ((item === null || item === void 0 ? void 0 : item.widget) === "textArea") {
+      var _item$disabled3;
       return /*#__PURE__*/_react.default.createElement(_antd.Form.Item, {
         name: item === null || item === void 0 ? void 0 : item.name,
         label: item === null || item === void 0 ? void 0 : item.label,
         rules: item === null || item === void 0 ? void 0 : item.rules
       }, /*#__PURE__*/_react.default.createElement(_CustomTextArea.default, {
         rows: 4,
+        disabled: (_item$disabled3 = item.disabled) !== null && _item$disabled3 !== void 0 ? _item$disabled3 : false,
         placeholder: item === null || item === void 0 ? void 0 : item.placeholder
       }));
     }
@@ -185,7 +223,7 @@ function FormWidget(props) {
       return /*#__PURE__*/_react.default.createElement(_antd.Form.Item, {
         name: "".concat(item === null || item === void 0 ? void 0 : item.name).concat(index ? index : ""),
         label: renderLabelWithTooltip(item === null || item === void 0 ? void 0 : item.label, item === null || item === void 0 ? void 0 : item.tooltip),
-        rules: getFieldRules(item),
+        rules: getFieldRules(itemData, item),
         extra: item === null || item === void 0 ? void 0 : item.helpText,
         initialValue: item === null || item === void 0 ? void 0 : item.value
       }, /*#__PURE__*/_react.default.createElement(_CustomInput.default, _extends({}, item === null || item === void 0 ? void 0 : item.props, {
@@ -198,13 +236,14 @@ function FormWidget(props) {
       })));
     }
     if ((item === null || item === void 0 ? void 0 : item.widget) === "checkbox") {
-      var _item$rules, _item$className;
+      var _item$rules, _item$disabled4, _item$className;
       return /*#__PURE__*/_react.default.createElement(_FormWidgetStyle.BgColorCheckBox, null, /*#__PURE__*/_react.default.createElement(_antd.Form.Item, {
         name: "".concat(item === null || item === void 0 ? void 0 : item.name).concat(index ? index : ""),
         rules: item === null || item === void 0 || (_item$rules = item.rules) === null || _item$rules === void 0 ? void 0 : _item$rules.map(r => (r === null || r === void 0 ? void 0 : r.checkValidator) && (r === null || r === void 0 ? void 0 : r.rule)).filter(Boolean),
         valuePropName: "checked",
         initialValue: item === null || item === void 0 ? void 0 : item.checked
       }, /*#__PURE__*/_react.default.createElement(_CustomCheckBox.default, {
+        disabled: (_item$disabled4 = item.disabled) !== null && _item$disabled4 !== void 0 ? _item$disabled4 : false,
         size: "large",
         label: item === null || item === void 0 ? void 0 : item.label,
         className: (_item$className = item === null || item === void 0 ? void 0 : item.className) !== null && _item$className !== void 0 ? _item$className : ""
@@ -242,7 +281,7 @@ function FormWidget(props) {
     }
   };
   const renderWidget = item => {
-    var _item$value, _item$value2, _item$value2$map, _item$value3, _item$value4, _item$value5, _item$value6, _item$iconConfig, _item$subType, _item$disabled2;
+    var _item$value, _item$value2, _item$value2$map, _item$value3, _item$value4, _item$value5, _item$value6, _item$iconConfig, _item$subType, _item$disabled5;
     switch (item === null || item === void 0 ? void 0 : item.type) {
       case "simpleList":
         if ((item === null || item === void 0 || (_item$value = item.value) === null || _item$value === void 0 ? void 0 : _item$value.length) === 0) return null;
@@ -344,7 +383,7 @@ function FormWidget(props) {
         }, /*#__PURE__*/_react.default.createElement(_CustomButton.default, _extends({
           type: (_item$subType = item === null || item === void 0 ? void 0 : item.subType) !== null && _item$subType !== void 0 ? _item$subType : "primary",
           label: item === null || item === void 0 ? void 0 : item.label,
-          disabled: (_item$disabled2 = item === null || item === void 0 ? void 0 : item.disabled) !== null && _item$disabled2 !== void 0 ? _item$disabled2 : false,
+          disabled: (_item$disabled5 = item === null || item === void 0 ? void 0 : item.disabled) !== null && _item$disabled5 !== void 0 ? _item$disabled5 : false,
           onClick: () => {
             if (item !== null && item !== void 0 && item.onClick) {
               item.onClick(item === null || item === void 0 ? void 0 : item.action, item === null || item === void 0 ? void 0 : item.key);
@@ -456,6 +495,7 @@ function FormWidget(props) {
     }
   })), submit && /*#__PURE__*/_react.default.createElement(_antd.Form.Item, null, /*#__PURE__*/_react.default.createElement(_CustomButton.default, {
     type: (_submit$type = submit === null || submit === void 0 ? void 0 : submit.type) !== null && _submit$type !== void 0 ? _submit$type : "primary",
+    disabled: (_submit$disabled = submit.disabled) !== null && _submit$disabled !== void 0 ? _submit$disabled : false,
     onClick: () => {
       var _form$validateFields3;
       form === null || form === void 0 || (_form$validateFields3 = form.validateFields()) === null || _form$validateFields3 === void 0 || _form$validateFields3.then(value => {

package/package.json CHANGED Viewed

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