oa-componentbook 0.18.343 → 0.18.344

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/build/components/oa-component-table/CustomTableV1.js +1 -1
  2. package/build/layout/GenricLayOut/GenricLayOut.js +86 -80
  3. package/build/layout/GenricLayOut/components/AppliedFilters.js +8 -26
  4. package/build/layout/GenricLayOut/reducer/layoutReducer.js +3 -3
  5. package/build/widgets/oa-form-widget/FormWidget.js +26 -10
  6. package/build/widgets/oa-form-widget/FormWidgetStyle.js +1 -1
  7. package/build/widgets/oa-widget-hub-automation-modal/HubAutomationModalStyle.js +1 -1
  8. package/build/widgets/oa-widget-item-info-card/styles.js +1 -1
  9. package/package.json +1 -1
package/build/components/oa-component-table/CustomTableV1.js CHANGED
@@ -162,7 +162,7 @@ function CustomTableV1(_ref) {
162
162
  key: idx
163
163
  }, (option === null || option === void 0 ? void 0 : option.type) === "button" ? /*#__PURE__*/_react.default.createElement(_CustomButton.default, {
164
164
  type: (option === null || option === void 0 ? void 0 : option.subType) || "primary",
165
- label: (option === null || option === void 0 ? void 0 : option.label) || _,
165
+ label: (option === null || option === void 0 ? void 0 : option.label) || (record === null || record === void 0 ? void 0 : record[option === null || option === void 0 ? void 0 : option.key]) || "",
166
166
  onClick: () => customTableChange(record, config)
167
167
  }) : (option === null || option === void 0 ? void 0 : option.type) === "tag" ? /*#__PURE__*/_react.default.createElement(_CustomTag.default, {
168
168
  label: getByPath(record, option === null || option === void 0 ? void 0 : option.key) || "",
package/build/layout/GenricLayOut/GenricLayOut.js CHANGED
@@ -50,7 +50,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
50
50
  function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
51
51
  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 */
52
52
  function GenricLayOut(_ref) {
53
- var _state$misc15, _imageViewer$content, _imageViewer$content2, _state$filterDrawer, _filterDrawer$data2, _tabs$list, _tables$columns3, _tables$columns4, _tabs$active3, _state$tables3, _tables$selectionType, _tabs$active4, _tables$selectionType2, _drawer$data, _tabs$active5, _drawer$data$drawer$a, _drawer$data2, _tabs$active6, _tabs$active7, _nestedDrawer$data, _nestedDrawer$data$ca, _nestedDrawer$data2, _filterDrawer$data3, _filterDrawer$data$fi, _filterDrawer$data4, _contentPanel$dataSou, _tables$tableFooter, _tables$selectedRowKe, _tables$tableFooter2, _tables$tableFooter3, _tables$tableFooter5;
53
+ var _state$misc16, _imageViewer$content, _imageViewer$content2, _filterDrawer$applied11, _state$filterDrawer2, _state$filterDrawer3, _filterDrawer$data2, _tabs$list, _tables$columns3, _tables$columns4, _tabs$active3, _state$tables3, _tables$selectionType, _tabs$active4, _tables$selectionType2, _drawer$data, _tabs$active5, _drawer$data$drawer$a, _drawer$data2, _tabs$active6, _tabs$active7, _nestedDrawer$data, _nestedDrawer$data$ca, _nestedDrawer$data2, _filterDrawer$data3, _filterDrawer$data$fi, _filterDrawer$data4, _contentPanel$dataSou, _tables$tableFooter, _tables$selectedRowKe, _tables$tableFooter2, _tables$tableFooter3, _tables$tableFooter5;
54
54
  let {
55
55
  config,
56
56
  getInitialData,
@@ -196,16 +196,16 @@ function GenricLayOut(_ref) {
196
196
  });
197
197
  if (value === "") {
198
198
  if (handleInputSearchChange) {
199
- var _state$inputSearch, _state$tabs2, _tables$pagination, _tables$pagination2, _tables$sorting, _tables$sorting2, _header$subHeading, _header$subHeading2;
199
+ var _state$inputSearch, _state$tabs2, _filterDrawer$applied, _tables$pagination, _tables$pagination2, _tables$sorting, _tables$sorting2, _header$subHeading, _header$subHeading2;
200
200
  const {
201
201
  error,
202
202
  data
203
203
  } = 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 ? {
204
204
  selectedTab: state.tabs.active
205
- } : {}), (filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters) && Object.keys(filterDrawer.appliedFilters).length > 0 && {
206
- filterOn: filterDrawer.appliedFilters.filterBy,
207
- fromDate: filterDrawer.appliedFilters.fromDate,
208
- toDate: filterDrawer.appliedFilters.toDate
205
+ } : {}), (filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters) && Object.keys((_filterDrawer$applied = filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters) !== null && _filterDrawer$applied !== void 0 ? _filterDrawer$applied : {}).length > 0 && {
206
+ filterOn: filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters.filterBy,
207
+ fromDate: filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters.fromDate,
208
+ toDate: filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters.toDate
209
209
  }), {}, {
210
210
  current: tables === null || tables === void 0 || (_tables$pagination = tables.pagination) === null || _tables$pagination === void 0 ? void 0 : _tables$pagination.current,
211
211
  pageSize: tables === null || tables === void 0 || (_tables$pagination2 = tables.pagination) === null || _tables$pagination2 === void 0 ? void 0 : _tables$pagination2.pageSize,
@@ -259,7 +259,7 @@ function GenricLayOut(_ref) {
259
259
  payload: trimedValue
260
260
  });
261
261
  if (handleInputSearchEnter) {
262
- var _state$tabs3, _tables$pagination3, _tables$pagination4, _tables$sorting3, _tables$sorting4, _header$subHeading3, _header$subHeading4;
262
+ var _state$tabs3, _tables$pagination3, _tables$pagination4, _tables$sorting3, _tables$sorting4, _filterDrawer$applied2, _header$subHeading3, _header$subHeading4;
263
263
  const {
264
264
  error,
265
265
  data
@@ -271,10 +271,10 @@ function GenricLayOut(_ref) {
271
271
  pageSize: tables === null || tables === void 0 || (_tables$pagination4 = tables.pagination) === null || _tables$pagination4 === void 0 ? void 0 : _tables$pagination4.pageSize,
272
272
  field: tables === null || tables === void 0 || (_tables$sorting3 = tables.sorting) === null || _tables$sorting3 === void 0 ? void 0 : _tables$sorting3.sortBy,
273
273
  order: tables === null || tables === void 0 || (_tables$sorting4 = tables.sorting) === null || _tables$sorting4 === void 0 ? void 0 : _tables$sorting4.sortDirection
274
- }, (filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters) && Object.keys(filterDrawer.appliedFilters).length > 0 && {
275
- filterOn: filterDrawer.appliedFilters.filterBy,
276
- fromDate: filterDrawer.appliedFilters.fromDate,
277
- toDate: filterDrawer.appliedFilters.toDate
274
+ }, (filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters) && Object.keys((_filterDrawer$applied2 = filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters) !== null && _filterDrawer$applied2 !== void 0 ? _filterDrawer$applied2 : {}).length > 0 && {
275
+ filterOn: filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters.filterBy,
276
+ fromDate: filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters.fromDate,
277
+ toDate: filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters.toDate
278
278
  }), inputSearch !== null && inputSearch !== void 0 && inputSearch.queryField ? {
279
279
  queryField: inputSearch.queryField
280
280
  } : {}), (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" ? {
@@ -319,7 +319,7 @@ function GenricLayOut(_ref) {
319
319
  });
320
320
  if (value === "") {
321
321
  if (handleDropdownSearchInputChange) {
322
- var _state$tabs4, _tables$pagination5, _tables$pagination6, _tables$sorting5, _tables$sorting6, _tables$filter, _staticFilter$data, _state$misc2;
322
+ var _state$tabs4, _tables$pagination5, _tables$pagination6, _tables$sorting5, _tables$sorting6, _tables$filter, _staticFilter$data, _filterDrawer$applied3, _state$misc2;
323
323
  const {
324
324
  error,
325
325
  data
@@ -333,10 +333,10 @@ function GenricLayOut(_ref) {
333
333
  columnFilterStatus: tables === null || tables === void 0 ? void 0 : tables.filter
334
334
  }), (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) && {
335
335
  staticFilter: staticFilter.data.find(item => item.selected).value
336
- }), (filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters) && Object.keys(filterDrawer.appliedFilters).length > 0 && {
337
- filterOn: filterDrawer.appliedFilters.filterBy,
338
- fromDate: filterDrawer.appliedFilters.fromDate,
339
- toDate: filterDrawer.appliedFilters.toDate
336
+ }), (filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters) && Object.keys((_filterDrawer$applied3 = filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters) !== null && _filterDrawer$applied3 !== void 0 ? _filterDrawer$applied3 : {}).length > 0 && {
337
+ filterOn: filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters.filterBy,
338
+ fromDate: filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters.fromDate,
339
+ toDate: filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters.toDate
340
340
  }), (_state$misc2 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc2 !== void 0 ? _state$misc2 : {}));
341
341
  if (error) {
342
342
  showErrorNotification(error);
@@ -392,7 +392,7 @@ function GenricLayOut(_ref) {
392
392
  payload: value
393
393
  });
394
394
  if (handleDropdownSearchEnter) {
395
- var _state$tabs5, _tables$pagination7, _tables$pagination8, _tables$sorting7, _tables$sorting8, _tables$filter2, _staticFilter$data2, _state$misc3;
395
+ var _state$tabs5, _tables$pagination7, _tables$pagination8, _tables$sorting7, _tables$sorting8, _tables$filter2, _staticFilter$data2, _filterDrawer$applied4, _state$misc3;
396
396
  const {
397
397
  error,
398
398
  data
@@ -408,10 +408,10 @@ function GenricLayOut(_ref) {
408
408
  columnFilterStatus: tables === null || tables === void 0 ? void 0 : tables.filter
409
409
  }), (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) && {
410
410
  staticFilter: staticFilter.data.find(item => item.selected).value
411
- }), (filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters) && Object.keys(filterDrawer.appliedFilters).length > 0 && {
412
- filterOn: filterDrawer.appliedFilters.filterBy,
413
- fromDate: filterDrawer.appliedFilters.fromDate,
414
- toDate: filterDrawer.appliedFilters.toDate
411
+ }), (filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters) && Object.keys((_filterDrawer$applied4 = filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters) !== null && _filterDrawer$applied4 !== void 0 ? _filterDrawer$applied4 : {}).length > 0 && {
412
+ filterOn: filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters.filterBy,
413
+ fromDate: filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters.fromDate,
414
+ toDate: filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters.toDate
415
415
  }), (_state$misc3 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc3 !== void 0 ? _state$misc3 : {}));
416
416
  if (error) {
417
417
  showErrorNotification(error);
@@ -445,21 +445,21 @@ function GenricLayOut(_ref) {
445
445
  payload: option === null || option === void 0 ? void 0 : option.value
446
446
  });
447
447
  if (handleDropdownSearchOptionChange) {
448
- var _tables$pagination9, _tables$pagination10, _staticFilter$data3;
448
+ var _tables$pagination9, _tables$pagination10, _staticFilter$data3, _filterDrawer$applied5, _state$misc4;
449
449
  const {
450
450
  error,
451
451
  data
452
- } = await handleDropdownSearchOptionChange(_objectSpread(_objectSpread({
452
+ } = await handleDropdownSearchOptionChange(_objectSpread(_objectSpread(_objectSpread({
453
453
  selectedTab: tabs === null || tabs === void 0 ? void 0 : tabs.active,
454
454
  current: tables === null || tables === void 0 || (_tables$pagination9 = tables.pagination) === null || _tables$pagination9 === void 0 ? void 0 : _tables$pagination9.current,
455
455
  pageSize: tables === null || tables === void 0 || (_tables$pagination10 = tables.pagination) === null || _tables$pagination10 === void 0 ? void 0 : _tables$pagination10.pageSize
456
456
  }, (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) && {
457
457
  staticFilter: staticFilter.data.find(item => item.selected).value
458
- }), (filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters) && Object.keys(filterDrawer.appliedFilters).length > 0 && {
459
- filterOn: filterDrawer.appliedFilters.filterBy,
460
- fromDate: filterDrawer.appliedFilters.fromDate,
461
- toDate: filterDrawer.appliedFilters.toDate
462
- }));
458
+ }), (filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters) && Object.keys((_filterDrawer$applied5 = filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters) !== null && _filterDrawer$applied5 !== void 0 ? _filterDrawer$applied5 : {}).length > 0 && {
459
+ filterOn: filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters.filterBy,
460
+ fromDate: filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters.fromDate,
461
+ toDate: filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters.toDate
462
+ }), (_state$misc4 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc4 !== void 0 ? _state$misc4 : {}));
463
463
  if (error) {
464
464
  showErrorNotification(error);
465
465
  dispatch({
@@ -545,7 +545,7 @@ function GenricLayOut(_ref) {
545
545
  payload: null
546
546
  });
547
547
  if (handleDropdownSearchClear) {
548
- var _state$tabs6, _tables$pagination11, _tables$pagination12, _tables$sorting9, _tables$sorting10, _tables$filter3, _staticFilter$data4, _state$misc4;
548
+ var _state$tabs6, _tables$pagination11, _tables$pagination12, _tables$sorting9, _tables$sorting10, _tables$filter3, _staticFilter$data4, _filterDrawer$applied6, _state$misc5;
549
549
  const {
550
550
  error,
551
551
  data
@@ -559,11 +559,11 @@ function GenricLayOut(_ref) {
559
559
  columnFilterStatus: tables === null || tables === void 0 ? void 0 : tables.filter
560
560
  }), (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) && {
561
561
  staticFilter: staticFilter.data.find(item => item.selected).value
562
- }), (filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters) && Object.keys(filterDrawer.appliedFilters).length > 0 && {
563
- filterOn: filterDrawer.appliedFilters.filterBy,
564
- fromDate: filterDrawer.appliedFilters.fromDate,
565
- toDate: filterDrawer.appliedFilters.toDate
566
- }), (_state$misc4 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc4 !== void 0 ? _state$misc4 : {}));
562
+ }), (filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters) && Object.keys((_filterDrawer$applied6 = filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters) !== null && _filterDrawer$applied6 !== void 0 ? _filterDrawer$applied6 : {}).length > 0 && {
563
+ filterOn: filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters.filterBy,
564
+ fromDate: filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters.fromDate,
565
+ toDate: filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters.toDate
566
+ }), (_state$misc5 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc5 !== void 0 ? _state$misc5 : {}));
567
567
  if (error) {
568
568
  showErrorNotification(error);
569
569
  dispatch({
@@ -598,7 +598,7 @@ function GenricLayOut(_ref) {
598
598
  payload: null
599
599
  });
600
600
  if (handleInputSearchClear) {
601
- var _state$tabs7, _tables$pagination13, _tables$pagination14, _tables$sorting11, _tables$sorting12, _header$subHeading5, _header$subHeading6;
601
+ var _state$tabs7, _tables$pagination13, _tables$pagination14, _tables$sorting11, _tables$sorting12, _filterDrawer$applied7, _header$subHeading5, _header$subHeading6;
602
602
  const {
603
603
  error,
604
604
  data
@@ -609,10 +609,10 @@ function GenricLayOut(_ref) {
609
609
  pageSize: tables === null || tables === void 0 || (_tables$pagination14 = tables.pagination) === null || _tables$pagination14 === void 0 ? void 0 : _tables$pagination14.pageSize,
610
610
  field: tables === null || tables === void 0 || (_tables$sorting11 = tables.sorting) === null || _tables$sorting11 === void 0 ? void 0 : _tables$sorting11.sortBy,
611
611
  order: tables === null || tables === void 0 || (_tables$sorting12 = tables.sorting) === null || _tables$sorting12 === void 0 ? void 0 : _tables$sorting12.sortDirection
612
- }, (filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters) && Object.keys(filterDrawer.appliedFilters).length > 0 && {
613
- filterOn: filterDrawer.appliedFilters.filterBy,
614
- fromDate: filterDrawer.appliedFilters.fromDate,
615
- toDate: filterDrawer.appliedFilters.toDate
612
+ }, (filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters) && Object.keys((_filterDrawer$applied7 = filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters) !== null && _filterDrawer$applied7 !== void 0 ? _filterDrawer$applied7 : {}).length > 0 && {
613
+ filterOn: filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters.filterBy,
614
+ fromDate: filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters.fromDate,
615
+ toDate: filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters.toDate
616
616
  }), (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" ? {
617
617
  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
618
618
  } : {}));
@@ -657,14 +657,14 @@ function GenricLayOut(_ref) {
657
657
  }
658
658
  if ((configArgs === null || configArgs === void 0 ? void 0 : configArgs.action) === "OPEN_DRAWER_AND_FETCH") {
659
659
  if (handleTableColumnClick) {
660
- var _state$misc5;
660
+ var _state$misc6;
661
661
  const {
662
662
  error,
663
663
  data
664
664
  } = await (handleTableColumnClick === null || handleTableColumnClick === void 0 ? void 0 : handleTableColumnClick(_objectSpread({
665
665
  record: record,
666
666
  type: configArgs === null || configArgs === void 0 ? void 0 : configArgs.call
667
- }, (_state$misc5 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc5 !== void 0 ? _state$misc5 : {})));
667
+ }, (_state$misc6 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc6 !== void 0 ? _state$misc6 : {})));
668
668
  if (error) {
669
669
  showErrorNotification(error);
670
670
  } else {
@@ -891,7 +891,7 @@ function GenricLayOut(_ref) {
891
891
  }
892
892
  });
893
893
  if (handleTableChange) {
894
- var _state$dropdownSearch3, _state$inputSearch4, _state$tabs9, _header$subHeading7, _header$subHeading8, _staticFilter$data5, _state$misc6;
894
+ var _state$dropdownSearch3, _state$inputSearch4, _state$tabs9, _header$subHeading7, _header$subHeading8, _staticFilter$data5, _filterDrawer$applied8, _state$misc7;
895
895
  const {
896
896
  error,
897
897
  data
@@ -910,13 +910,13 @@ function GenricLayOut(_ref) {
910
910
  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
911
911
  } : {}), (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) && {
912
912
  staticFilter: staticFilter.data.find(item => item.selected).value
913
- }), (filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters) && Object.keys(filterDrawer.appliedFilters).length > 0 && {
914
- filterOn: filterDrawer.appliedFilters.filterBy,
915
- fromDate: filterDrawer.appliedFilters.fromDate,
916
- toDate: filterDrawer.appliedFilters.toDate
913
+ }), (filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters) && Object.keys((_filterDrawer$applied8 = filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters) !== null && _filterDrawer$applied8 !== void 0 ? _filterDrawer$applied8 : {}).length > 0 && {
914
+ filterOn: filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters.filterBy,
915
+ fromDate: filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters.fromDate,
916
+ toDate: filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters.toDate
917
917
  }), {}, {
918
918
  order: (sorter === null || sorter === void 0 ? void 0 : sorter.order) === "ascend" && "ASC" || (sorter === null || sorter === void 0 ? void 0 : sorter.order) === "descend" && "DESC" || ""
919
- }, (_state$misc6 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc6 !== void 0 ? _state$misc6 : {}));
919
+ }, (_state$misc7 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc7 !== void 0 ? _state$misc7 : {}));
920
920
  if (error) {
921
921
  showErrorNotification(error);
922
922
  dispatch({
@@ -990,7 +990,7 @@ function GenricLayOut(_ref) {
990
990
  });
991
991
  const selectedStaticFilterValue = tables !== null && tables !== void 0 && tables.staticFilterKey && (tables === null || tables === void 0 ? void 0 : tables.staticFilterKey) == key && Array.isArray(staticFilter.data) ? (_staticFilter$data$fi = staticFilter.data.find(item => item.selected)) === null || _staticFilter$data$fi === void 0 ? void 0 : _staticFilter$data$fi.value : undefined;
992
992
  if (handleTabClick) {
993
- var _tables$pagination15, _tables$pagination16, _tables$sorting13, _tables$sorting14, _state$dropdownSearch4;
993
+ var _tables$pagination15, _tables$pagination16, _tables$sorting13, _tables$sorting14, _state$dropdownSearch4, _filterDrawer$applied9;
994
994
  const {
995
995
  error,
996
996
  data
@@ -1006,10 +1006,10 @@ function GenricLayOut(_ref) {
1006
1006
  }, (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()) && {
1007
1007
  searchedValue: state.dropdownSearch.value,
1008
1008
  selectedOption: state.dropdownSearch.selectedOption
1009
- }), (filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters) && Object.keys(filterDrawer.appliedFilters).length > 0 && {
1010
- filterOn: filterDrawer.appliedFilters.filterBy,
1011
- fromDate: filterDrawer.appliedFilters.fromDate,
1012
- toDate: filterDrawer.appliedFilters.toDate
1009
+ }), (filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters) && Object.keys((_filterDrawer$applied9 = filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters) !== null && _filterDrawer$applied9 !== void 0 ? _filterDrawer$applied9 : {}).length > 0 && {
1010
+ filterOn: filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters.filterBy,
1011
+ fromDate: filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters.fromDate,
1012
+ toDate: filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters.toDate
1013
1013
  }));
1014
1014
  if (error) {
1015
1015
  showErrorNotification(error);
@@ -1096,11 +1096,11 @@ function GenricLayOut(_ref) {
1096
1096
  return;
1097
1097
  }
1098
1098
  if (handleDrawerFormOnFinish) {
1099
- var _state$misc7;
1099
+ var _state$misc8;
1100
1100
  const {
1101
1101
  error,
1102
1102
  data
1103
- } = await (handleDrawerFormOnFinish === null || handleDrawerFormOnFinish === void 0 ? void 0 : handleDrawerFormOnFinish(_objectSpread(_objectSpread(_objectSpread({}, record), formData), (_state$misc7 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc7 !== void 0 ? _state$misc7 : {})));
1103
+ } = await (handleDrawerFormOnFinish === null || handleDrawerFormOnFinish === void 0 ? void 0 : handleDrawerFormOnFinish(_objectSpread(_objectSpread(_objectSpread({}, record), formData), (_state$misc8 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc8 !== void 0 ? _state$misc8 : {})));
1104
1104
  if (error) {
1105
1105
  showErrorNotification(error);
1106
1106
  } else {
@@ -1116,14 +1116,15 @@ function GenricLayOut(_ref) {
1116
1116
  }
1117
1117
  };
1118
1118
  const onRemoveAppliedFilter = async filterKey => {
1119
- const currentFilters = _objectSpread({}, state.filterDrawer.appliedFilters);
1119
+ var _state$filterDrawer;
1120
+ const currentFilters = _objectSpread({}, state === null || state === void 0 || (_state$filterDrawer = state.filterDrawer) === null || _state$filterDrawer === void 0 ? void 0 : _state$filterDrawer.appliedFilters);
1120
1121
 
1121
1122
  // Remove the specific filter
1122
1123
  delete currentFilters[filterKey];
1123
1124
 
1124
1125
  // If there are remaining filters, reapply them
1125
1126
  if (Object.keys(currentFilters).length > 0) {
1126
- var _state$dropdownSearch5, _state$inputSearch5, _state$tabs12, _tables$pagination17, _tables$pagination18, _tables$filter6, _tables$sorting15, _header$subHeading9, _header$subHeading10, _staticFilter$data6, _tables$sorting16, _state$misc8;
1127
+ var _state$dropdownSearch5, _state$inputSearch5, _state$tabs12, _tables$pagination17, _tables$pagination18, _tables$filter6, _tables$sorting15, _header$subHeading9, _header$subHeading10, _staticFilter$data6, _tables$sorting16, _state$misc9;
1127
1128
  const {
1128
1129
  error,
1129
1130
  data
@@ -1149,7 +1150,7 @@ function GenricLayOut(_ref) {
1149
1150
  staticFilter: staticFilter.data.find(item => item.selected).value
1150
1151
  }), {}, {
1151
1152
  order: tables === null || tables === void 0 || (_tables$sorting16 = tables.sorting) === null || _tables$sorting16 === void 0 ? void 0 : _tables$sorting16.sortDirection
1152
- }, (_state$misc8 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc8 !== void 0 ? _state$misc8 : {}));
1153
+ }, (_state$misc9 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc9 !== void 0 ? _state$misc9 : {}));
1153
1154
  if (error) {
1154
1155
  showErrorNotification(error);
1155
1156
  dispatch({
@@ -1177,7 +1178,7 @@ function GenricLayOut(_ref) {
1177
1178
  }
1178
1179
  };
1179
1180
  const filterFormOnFinish = async formData => {
1180
- var _state$dropdownSearch6, _state$inputSearch6, _state$tabs13, _tables$pagination19, _tables$pagination20, _tables$filter7, _tables$sorting17, _header$subHeading11, _header$subHeading12, _staticFilter$data7, _tables$sorting18, _state$misc9;
1181
+ var _state$dropdownSearch6, _state$inputSearch6, _ref4, _appliedFilters$filte, _state$tabs13, _tables$pagination19, _tables$pagination20, _tables$filter7, _tables$sorting17, _header$subHeading11, _header$subHeading12, _staticFilter$data7, _tables$sorting18, _state$misc10;
1181
1182
  // Check if this is a cancel/clear action - check both buttonClickType and the actual button data
1182
1183
  if (formData.type === "FILTER-CANCEL" || formData.type === "text-only" || formData.text === "Clear All") {
1183
1184
  var _config$filterDrawer;
@@ -1220,7 +1221,7 @@ function GenricLayOut(_ref) {
1220
1221
  }), (state === null || state === void 0 || (_state$inputSearch6 = state.inputSearch) === null || _state$inputSearch6 === void 0 || (_state$inputSearch6 = _state$inputSearch6.value) === null || _state$inputSearch6 === void 0 ? void 0 : _state$inputSearch6.trim()) && {
1221
1222
  searchedValue: state.inputSearch.value
1222
1223
  }), {}, {
1223
- filterOn: appliedFilters === null || appliedFilters === void 0 ? void 0 : appliedFilters.filterBy,
1224
+ filterOn: (_ref4 = (_appliedFilters$filte = appliedFilters === null || appliedFilters === void 0 ? void 0 : appliedFilters.filterBy) !== null && _appliedFilters$filte !== void 0 ? _appliedFilters$filte : filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.defaultAppliedFilter) !== null && _ref4 !== void 0 ? _ref4 : "",
1224
1225
  fromDate: appliedFilters === null || appliedFilters === void 0 ? void 0 : appliedFilters.fromDate,
1225
1226
  toDate: appliedFilters === null || appliedFilters === void 0 ? void 0 : appliedFilters.toDate,
1226
1227
  selectedTab: state === null || state === void 0 || (_state$tabs13 = state.tabs) === null || _state$tabs13 === void 0 ? void 0 : _state$tabs13.active,
@@ -1236,7 +1237,7 @@ function GenricLayOut(_ref) {
1236
1237
  staticFilter: staticFilter.data.find(item => item.selected).value
1237
1238
  }), {}, {
1238
1239
  order: tables === null || tables === void 0 || (_tables$sorting18 = tables.sorting) === null || _tables$sorting18 === void 0 ? void 0 : _tables$sorting18.sortDirection
1239
- }, (_state$misc9 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc9 !== void 0 ? _state$misc9 : {}));
1240
+ }, (_state$misc10 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc10 !== void 0 ? _state$misc10 : {}));
1240
1241
  if (error) {
1241
1242
  showErrorNotification(error);
1242
1243
  dispatch({
@@ -1261,7 +1262,7 @@ function GenricLayOut(_ref) {
1261
1262
  }
1262
1263
  };
1263
1264
  const onClearAllAppliedFilters = async () => {
1264
- var _state$dropdownSearch7, _state$inputSearch7, _state$tabs14, _tables$pagination21, _tables$pagination22, _tables$filter8, _tables$sorting19, _header$subHeading13, _header$subHeading14, _staticFilter$data8, _tables$sorting20, _state$misc10;
1265
+ var _state$dropdownSearch7, _state$inputSearch7, _state$tabs14, _tables$pagination21, _tables$pagination22, _tables$filter8, _tables$sorting19, _header$subHeading13, _header$subHeading14, _staticFilter$data8, _tables$sorting20, _state$misc11;
1265
1266
  const {
1266
1267
  error,
1267
1268
  data
@@ -1284,7 +1285,7 @@ function GenricLayOut(_ref) {
1284
1285
  staticFilter: staticFilter.data.find(item => item.selected).value
1285
1286
  }), {}, {
1286
1287
  order: tables === null || tables === void 0 || (_tables$sorting20 = tables.sorting) === null || _tables$sorting20 === void 0 ? void 0 : _tables$sorting20.sortDirection
1287
- }, (_state$misc10 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc10 !== void 0 ? _state$misc10 : {}));
1288
+ }, (_state$misc11 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc11 !== void 0 ? _state$misc11 : {}));
1288
1289
  if (error) {
1289
1290
  showErrorNotification(error);
1290
1291
  dispatch({
@@ -1337,14 +1338,14 @@ function GenricLayOut(_ref) {
1337
1338
  return;
1338
1339
  } else if (action === "CLOSE_MODAL_AND_FETCH") {
1339
1340
  if (handleModalCloseSuccess) {
1340
- var _stateRef$current, _state$misc11;
1341
+ var _stateRef$current, _state$misc12;
1341
1342
  const {
1342
1343
  error,
1343
1344
  data
1344
1345
  } = await (handleModalCloseSuccess === null || handleModalCloseSuccess === void 0 ? void 0 : handleModalCloseSuccess(_objectSpread({
1345
1346
  modalValue: stateRef === null || stateRef === void 0 || (_stateRef$current = stateRef.current) === null || _stateRef$current === void 0 || (_stateRef$current = _stateRef$current.modal) === null || _stateRef$current === void 0 ? void 0 : _stateRef$current.value,
1346
1347
  call: buttonConfig === null || buttonConfig === void 0 ? void 0 : buttonConfig.call
1347
- }, (_state$misc11 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc11 !== void 0 ? _state$misc11 : {})));
1348
+ }, (_state$misc12 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc12 !== void 0 ? _state$misc12 : {})));
1348
1349
  if (error) {
1349
1350
  showErrorNotification(error);
1350
1351
  } else {
@@ -1422,11 +1423,16 @@ function GenricLayOut(_ref) {
1422
1423
  dispatch({
1423
1424
  type: _layoutReducer.actionTypes.FILTER_DRAWER_OPEN
1424
1425
  });
1426
+ } else if ((rightHeaderFirstButton === null || rightHeaderFirstButton === void 0 ? void 0 : rightHeaderFirstButton.action) === "OPEN_DRAWER") {
1427
+ dispatch({
1428
+ type: _layoutReducer.actionTypes.TOGGLE_DRAWER,
1429
+ payload: rightHeaderFirstButton === null || rightHeaderFirstButton === void 0 ? void 0 : rightHeaderFirstButton.key
1430
+ });
1425
1431
  }
1426
1432
  };
1427
1433
  const rightHeaderSecondButtonClick = async () => {
1428
1434
  if ((rightHeaderSecondButton === null || rightHeaderSecondButton === void 0 ? void 0 : rightHeaderSecondButton.action) === "RESET_FILTER_DRAWER") {
1429
- var _state$dropdownSearch8, _state$inputSearch8, _state$tabs15, _tables$pagination23, _tables$pagination24, _tables$filter9, _tables$sorting21, _header$subHeading15, _header$subHeading16, _staticFilter$data9, _tables$sorting22, _state$misc12;
1435
+ var _state$dropdownSearch8, _state$inputSearch8, _state$tabs15, _tables$pagination23, _tables$pagination24, _tables$filter9, _tables$sorting21, _header$subHeading15, _header$subHeading16, _staticFilter$data9, _tables$sorting22, _state$misc13;
1430
1436
  const {
1431
1437
  error,
1432
1438
  data
@@ -1449,7 +1455,7 @@ function GenricLayOut(_ref) {
1449
1455
  staticFilter: staticFilter.data.find(item => item.selected).value
1450
1456
  }), {}, {
1451
1457
  order: tables === null || tables === void 0 || (_tables$sorting22 = tables.sorting) === null || _tables$sorting22 === void 0 ? void 0 : _tables$sorting22.sortDirection
1452
- }, (_state$misc12 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc12 !== void 0 ? _state$misc12 : {}));
1458
+ }, (_state$misc13 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc13 !== void 0 ? _state$misc13 : {}));
1453
1459
  if (error) {
1454
1460
  showErrorNotification(error);
1455
1461
  dispatch({
@@ -1508,7 +1514,7 @@ function GenricLayOut(_ref) {
1508
1514
  };
1509
1515
  const handleSubHeadingSelect = async val => {
1510
1516
  if (val) {
1511
- var _tables$pagination25, _tables$pagination26, _state$misc13;
1517
+ var _tables$pagination25, _tables$pagination26, _state$misc14;
1512
1518
  dispatch({
1513
1519
  type: _layoutReducer.actionTypes.SET_SUBHEADING_SELECTED_CONFIG,
1514
1520
  payload: val
@@ -1521,7 +1527,7 @@ function GenricLayOut(_ref) {
1521
1527
  current: tables === null || tables === void 0 || (_tables$pagination25 = tables.pagination) === null || _tables$pagination25 === void 0 ? void 0 : _tables$pagination25.current,
1522
1528
  pageSize: tables === null || tables === void 0 || (_tables$pagination26 = tables.pagination) === null || _tables$pagination26 === void 0 ? void 0 : _tables$pagination26.pageSize,
1523
1529
  subHeadingSelectVal: val
1524
- }, (_state$misc13 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc13 !== void 0 ? _state$misc13 : {}));
1530
+ }, (_state$misc14 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc14 !== void 0 ? _state$misc14 : {}));
1525
1531
  if (error) {
1526
1532
  showErrorNotification(error);
1527
1533
  dispatch({
@@ -1548,7 +1554,7 @@ function GenricLayOut(_ref) {
1548
1554
 
1549
1555
  // Call the handler if provided
1550
1556
  if (handleTableChange) {
1551
- var _state$dropdownSearch9, _state$inputSearch9, _state$tabs16, _tables$pagination27, _tables$sorting23, _tables$sorting24, _header$subHeading17, _header$subHeading18, _state$misc14;
1557
+ var _state$dropdownSearch9, _state$inputSearch9, _state$tabs16, _tables$pagination27, _tables$sorting23, _tables$sorting24, _header$subHeading17, _header$subHeading18, _filterDrawer$applied10, _state$misc15;
1552
1558
  const {
1553
1559
  error,
1554
1560
  data
@@ -1567,11 +1573,11 @@ function GenricLayOut(_ref) {
1567
1573
  order: tables === null || tables === void 0 || (_tables$sorting24 = tables.sorting) === null || _tables$sorting24 === void 0 ? void 0 : _tables$sorting24.sortDirection
1568
1574
  }, (header === null || header === void 0 || (_header$subHeading17 = header.subHeading) === null || _header$subHeading17 === void 0 || (_header$subHeading17 = _header$subHeading17.jsxConfig) === null || _header$subHeading17 === void 0 ? void 0 : _header$subHeading17.type) == "select" ? {
1569
1575
  subHeadingSelectVal: header === null || header === void 0 || (_header$subHeading18 = header.subHeading) === null || _header$subHeading18 === void 0 || (_header$subHeading18 = _header$subHeading18.jsxConfig) === null || _header$subHeading18 === void 0 ? void 0 : _header$subHeading18.value
1570
- } : {}), (filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters) && Object.keys(filterDrawer.appliedFilters).length > 0 && {
1571
- filterOn: filterDrawer.appliedFilters.filterBy,
1572
- fromDate: filterDrawer.appliedFilters.fromDate,
1573
- toDate: filterDrawer.appliedFilters.toDate
1574
- }), (_state$misc14 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc14 !== void 0 ? _state$misc14 : {}), {}, {
1576
+ } : {}), (filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters) && Object.keys((_filterDrawer$applied10 = filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters) !== null && _filterDrawer$applied10 !== void 0 ? _filterDrawer$applied10 : {}).length > 0 && {
1577
+ filterOn: filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters.filterBy,
1578
+ fromDate: filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters.fromDate,
1579
+ toDate: filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters.toDate
1580
+ }), (_state$misc15 = state === null || state === void 0 ? void 0 : state.misc) !== null && _state$misc15 !== void 0 ? _state$misc15 : {}), {}, {
1575
1581
  staticFilter: filterValue // Pass static filter value
1576
1582
  }));
1577
1583
  if (error) {
@@ -1598,7 +1604,7 @@ function GenricLayOut(_ref) {
1598
1604
  };
1599
1605
  console.log(state, "GenricLayOutstate");
1600
1606
  return /*#__PURE__*/_react.default.createElement(_styles.OapageWithDataStyle, {
1601
- className: (state === null || state === void 0 || (_state$misc15 = state.misc) === null || _state$misc15 === void 0 ? void 0 : _state$misc15.flow) === "hubAutomation" ? "hubAutomationContainer" : ""
1607
+ className: (state === null || state === void 0 || (_state$misc16 = state.misc) === null || _state$misc16 === void 0 ? void 0 : _state$misc16.flow) === "hubAutomation" ? "hubAutomationContainer" : ""
1602
1608
  }, /*#__PURE__*/_react.default.createElement(_styles.DrawerWithOutFooter, null), /*#__PURE__*/_react.default.createElement("div", {
1603
1609
  className: "fullPageLayout"
1604
1610
  }, /*#__PURE__*/_react.default.createElement(_GlobalCss.default, null, (sidebar === null || sidebar === void 0 ? void 0 : sidebar.visible) && /*#__PURE__*/_react.default.createElement(_SidebarWidget.default, _extends({}, sidebar, {
@@ -1648,15 +1654,15 @@ function GenricLayOut(_ref) {
1648
1654
  onClick: rightHeaderFirstButtonClick,
1649
1655
  type: rightHeaderFirstButton === null || rightHeaderFirstButton === void 0 ? void 0 : rightHeaderFirstButton.type,
1650
1656
  size: rightHeaderFirstButton === null || rightHeaderFirstButton === void 0 ? void 0 : rightHeaderFirstButton.size,
1651
- iconConfig: {
1657
+ iconConfig: _objectSpread({}, (rightHeaderFirstButton === null || rightHeaderFirstButton === void 0 ? void 0 : rightHeaderFirstButton.showIcon) === false ? {} : {
1652
1658
  icon: /*#__PURE__*/_react.default.createElement(_MaterialIcon.default, {
1653
1659
  icon: _FilterListRounded.default,
1654
1660
  size: 24,
1655
1661
  color: "primary"
1656
1662
  }),
1657
1663
  position: "left"
1658
- }
1659
- }), Object.keys(filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters).length > 0 && /*#__PURE__*/_react.default.createElement("span", {
1664
+ })
1665
+ }), Object.keys((_filterDrawer$applied11 = filterDrawer === null || filterDrawer === void 0 ? void 0 : filterDrawer.appliedFilters) !== null && _filterDrawer$applied11 !== void 0 ? _filterDrawer$applied11 : {}).length > 0 && /*#__PURE__*/_react.default.createElement("span", {
1660
1666
  className: "notifyDot"
1661
1667
  })))), (inputSearch === null || inputSearch === void 0 ? void 0 : inputSearch.visible) && /*#__PURE__*/_react.default.createElement(_Search.default, _extends({}, inputSearch, {
1662
1668
  onInputChange: onSearchInputChange,
@@ -1664,8 +1670,8 @@ function GenricLayOut(_ref) {
1664
1670
  allowClear: true,
1665
1671
  onClear: onInputSearchClear,
1666
1672
  onBlur: onInputSearchBlur
1667
- })), Object.keys((state === null || state === void 0 || (_state$filterDrawer = state.filterDrawer) === null || _state$filterDrawer === void 0 ? void 0 : _state$filterDrawer.appliedFilters) || {}).length > 0 && /*#__PURE__*/_react.default.createElement(_AppliedFilters.default, {
1668
- appliedFilters: state.filterDrawer.appliedFilters,
1673
+ })), Object.keys((state === null || state === void 0 || (_state$filterDrawer2 = state.filterDrawer) === null || _state$filterDrawer2 === void 0 ? void 0 : _state$filterDrawer2.appliedFilters) || {}).length > 0 && /*#__PURE__*/_react.default.createElement(_AppliedFilters.default, {
1674
+ appliedFilters: state === null || state === void 0 || (_state$filterDrawer3 = state.filterDrawer) === null || _state$filterDrawer3 === void 0 ? void 0 : _state$filterDrawer3.appliedFilters,
1669
1675
  filterConfig: filterDrawer === null || filterDrawer === void 0 || (_filterDrawer$data2 = filterDrawer.data) === null || _filterDrawer$data2 === void 0 ? void 0 : _filterDrawer$data2.filterData,
1670
1676
  onRemoveFilter: onRemoveAppliedFilter,
1671
1677
  onClearAll: onClearAllAppliedFilters
package/build/layout/GenricLayOut/components/AppliedFilters.js CHANGED
@@ -9,7 +9,7 @@ var _antd = require("antd");
9
9
  var _Typography = _interopRequireDefault(require("../../../components/oa-component-typography/Typography"));
10
10
  var _CancelRounded = _interopRequireDefault(require("@material-ui/icons/CancelRounded"));
11
11
  var _MaterialIcon = _interopRequireDefault(require("../../../components/oa-component-icons/MaterialIcon"));
12
- var _moment = _interopRequireDefault(require("moment"));
12
+ var _dayjs = _interopRequireDefault(require("dayjs"));
13
13
  require("./StaticFilter.css");
14
14
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
15
15
  /* eslint-disable */
@@ -25,54 +25,36 @@ const AppliedFilters = _ref => {
25
25
  if (filterKeys.length === 0) {
26
26
  return null;
27
27
  }
28
- const getFilterDisplayValue = (key, value, config) => {
29
- // Handle different filter types based on the design
28
+ const getFilterDisplayValue = (key, value) => {
30
29
  switch (key) {
31
30
  case "filterBy":
32
- return value === "orderDate" ? "Order Date" : "Financier Approval Date";
31
+ return value === "orderCreationDate" ? "Order Date" : "Financier Approval Date";
33
32
  case "fromDate":
33
+ return (0, _dayjs.default)(value).format("DD MMM YYYY");
34
34
  case "toDate":
35
- // Format date as shown in design: "22 Apr 2025"
36
- return (0, _moment.default)(value).format("DD MMM YYYY");
35
+ return (0, _dayjs.default)(value).format("DD MMM YYYY");
37
36
  default:
38
37
  return value;
39
38
  }
40
39
  };
41
- const getFilterLabel = key => {
42
- // Don't show label for filterBy as it's self-explanatory
43
- switch (key) {
44
- case "filterBy":
45
- return "";
46
- case "fromDate":
47
- return "From Date";
48
- case "toDate":
49
- return "To Date";
50
- default:
51
- return key;
52
- }
53
- };
54
40
  const formatAppliedFilterDisplay = () => {
55
41
  const filterBy = appliedFilters.filterBy;
56
42
  const fromDate = appliedFilters.fromDate;
57
43
  const toDate = appliedFilters.toDate;
58
44
 
59
- // If only filterBy with orderDate, don't show applied filters
60
- const onlyDefaultFilter = Object.keys(appliedFilters).length === 1 && filterBy === "orderDate";
45
+ // If only filterBy with orderCreationDate, don't show applied filters
46
+ const onlyDefaultFilter = Object.keys(appliedFilters).length === 1 && filterBy === "orderCreationDate";
61
47
  if (onlyDefaultFilter) {
62
48
  return null;
63
49
  }
64
50
 
65
51
  // Create the combined filter display as shown in design
66
52
  let displayParts = [];
67
- if (filterBy && filterBy !== "orderDate") {
53
+ if (filterBy && filterBy !== "orderCreationDate") {
68
54
  displayParts.push(getFilterDisplayValue("filterBy", filterBy));
69
55
  }
70
56
  if (fromDate && toDate) {
71
57
  displayParts.push("From Date: ".concat(getFilterDisplayValue("fromDate", fromDate), " | To Date: ").concat(getFilterDisplayValue("toDate", toDate)));
72
- } else if (fromDate) {
73
- displayParts.push("From Date: ".concat(getFilterDisplayValue("fromDate", fromDate)));
74
- } else if (toDate) {
75
- displayParts.push("To Date: ".concat(getFilterDisplayValue("toDate", toDate)));
76
58
  }
77
59
  return displayParts.length > 0 ? displayParts.join(": ") : null;
78
60
  };
package/build/layout/GenricLayOut/reducer/layoutReducer.js CHANGED
@@ -174,7 +174,7 @@ const genericLayoutReducer = exports.genericLayoutReducer = (0, _immer.produce)(
174
174
  break;
175
175
  case actionTypes.SET_CUSTOM_DRAWER_DATA_SELECT:
176
176
  const record = _objectSpread({}, draft === null || draft === void 0 || (_draft$drawer = draft.drawer) === null || _draft$drawer === void 0 || (_draft$drawer = _draft$drawer.data) === null || _draft$drawer === void 0 || (_draft$drawer = _draft$drawer[(_draft$tabs$active2 = draft === null || draft === void 0 || (_draft$tabs3 = draft.tabs) === null || _draft$tabs3 === void 0 ? void 0 : _draft$tabs3.active) !== null && _draft$tabs$active2 !== void 0 ? _draft$tabs$active2 : "default"]) === null || _draft$drawer === void 0 ? void 0 : _draft$drawer[action.payload.key]);
177
- record.groups[4].items[1].value["Billing Address"] = action.payload.value;
177
+ record.groups[3].items[1].value["Billing Address"] = action.payload.value;
178
178
  break;
179
179
  case actionTypes.SET_SUBHEADING_SELECTED_CONFIG:
180
180
  draft.header.subHeading.jsxConfig.value = action.payload;
@@ -228,7 +228,7 @@ const genericLayoutReducer = exports.genericLayoutReducer = (0, _immer.produce)(
228
228
  draft.filterDrawer.data.filterData.groups.forEach(group => {
229
229
  group.items.forEach(item => {
230
230
  if (item.name === "filterBy") {
231
- item.defaultValue = "orderDate"; // Reset to default
231
+ item.defaultValue = "orderCreationDate"; // Reset to default
232
232
  } else if (item.name === "fromDate" || item.name === "toDate") {
233
233
  item.defaultValue = ""; // Reset dates to empty
234
234
  }
@@ -248,7 +248,7 @@ const genericLayoutReducer = exports.genericLayoutReducer = (0, _immer.produce)(
248
248
  } else if (item.name && !formValues.hasOwnProperty(item.name)) {
249
249
  // Reset to original default if not in applied filters
250
250
  if (item.name === "filterBy") {
251
- item.defaultValue = "orderDate";
251
+ item.defaultValue = "orderCreationDate";
252
252
  } else {
253
253
  item.defaultValue = "";
254
254
  }
package/build/widgets/oa-form-widget/FormWidget.js CHANGED
@@ -202,7 +202,6 @@ function FormWidget(props) {
202
202
  };
203
203
  const renderWidget = item => {
204
204
  var _item$value, _item$value2, _item$value2$map, _item$value3, _item$value4, _item$value5, _item$value6;
205
- console.log(item, "renderitem");
206
205
  switch (item === null || item === void 0 ? void 0 : item.type) {
207
206
  case "simpleList":
208
207
  if ((item === null || item === void 0 || (_item$value = item.value) === null || _item$value === void 0 ? void 0 : _item$value.length) === 0) return null;
@@ -245,22 +244,30 @@ function FormWidget(props) {
245
244
  style: {
246
245
  color: _ColorVariablesMap.default["--color-positive"]
247
246
  }
248
- }, item === null || item === void 0 ? void 0 : item.text), /*#__PURE__*/_react.default.createElement(_Typography.default, {
247
+ }, item === null || item === void 0 ? void 0 : item.text), /*#__PURE__*/_react.default.createElement("div", {
248
+ className: "gstAndCost"
249
+ }, /*#__PURE__*/_react.default.createElement(_Typography.default, {
249
250
  typography: "type-t1-500",
250
251
  style: {
251
252
  color: _ColorVariablesMap.default["--color-positive"]
252
253
  }
253
- }, "\u20B9", item.value));
254
+ }, "\u20B9", item.value), (item === null || item === void 0 ? void 0 : item.subText) && /*#__PURE__*/_react.default.createElement(_Typography.default, {
255
+ className: "margin-top-4",
256
+ typography: "type-button-500",
257
+ color: "secondary-content"
258
+ }, item.subText)));
254
259
  case "keyValue":
255
260
  return /*#__PURE__*/_react.default.createElement(_KeyValueWidget.default, {
256
261
  key: item.key,
257
262
  data: item.value
258
263
  });
259
264
  case "tag":
260
- return /*#__PURE__*/_react.default.createElement(_CustomTag.default, {
265
+ return /*#__PURE__*/_react.default.createElement("div", {
266
+ className: "margin-bottom-8"
267
+ }, /*#__PURE__*/_react.default.createElement(_CustomTag.default, {
261
268
  type: item.tagType,
262
269
  label: item.label
263
- });
270
+ }));
264
271
  case "customInfo":
265
272
  return /*#__PURE__*/_react.default.createElement(_CustomInfo.default, {
266
273
  description: item === null || item === void 0 ? void 0 : item.value
@@ -296,16 +303,25 @@ function FormWidget(props) {
296
303
  return /*#__PURE__*/_react.default.createElement(_FormWidgetStyle.FormWidgetStyleStyle, null, /*#__PURE__*/_react.default.createElement(_antd.Form, {
297
304
  form: form,
298
305
  layout: "vertical"
299
- }, groups === null || groups === void 0 ? void 0 : groups.map(_ref3 => {
300
- let {
306
+ }, groups === null || groups === void 0 ? void 0 : groups.map((group, index) => {
307
+ if (typeof group !== "object" || group === null || !Array.isArray(group.items)) {
308
+ return null; // Skip invalid group
309
+ }
310
+ const {
301
311
  bordered,
302
312
  heading,
303
313
  items,
304
314
  topDividerRequired = true
305
- } = _ref3;
306
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, bordered ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, Heading(heading), /*#__PURE__*/_react.default.createElement(_FormWidgetStyle.FieldBoxBorder, null, items === null || items === void 0 ? void 0 : items.map(item => /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, renderWidget(item))))) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_FormWidgetStyle.FieldWithoutBorder, null, topDividerRequired && /*#__PURE__*/_react.default.createElement(_antd.Divider, {
315
+ } = group;
316
+ return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
317
+ key: index
318
+ }, bordered ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, Heading(heading), /*#__PURE__*/_react.default.createElement(_FormWidgetStyle.FieldBoxBorder, null, items.map((item, i) => /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
319
+ key: i
320
+ }, renderWidget(item))))) : /*#__PURE__*/_react.default.createElement(_FormWidgetStyle.FieldWithoutBorder, null, topDividerRequired && /*#__PURE__*/_react.default.createElement(_antd.Divider, {
307
321
  className: "dividerLine"
308
- }), Heading(heading), items === null || items === void 0 ? void 0 : items.map(renderWidget))));
322
+ }), Heading(heading), items.map((item, i) => /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
323
+ key: i
324
+ }, renderWidget(item)))));
309
325
  }), /*#__PURE__*/_react.default.createElement(_FormWidgetStyle.FormWidgetStyle, null, visible && /*#__PURE__*/_react.default.createElement("div", {
310
326
  className: "formBottomAction"
311
327
  }, cancel && /*#__PURE__*/_react.default.createElement(_antd.Form.Item, null, /*#__PURE__*/_react.default.createElement(_CustomButton.default, {
package/build/widgets/oa-form-widget/FormWidgetStyle.js CHANGED
@@ -12,5 +12,5 @@ const FormWidgetStyle = exports.FormWidgetStyle = _styledComponents.default.div(
12
12
  const FormWidgetStyleStyle = exports.FormWidgetStyleStyle = _styledComponents.default.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n .ant-form-vertical\n .ant-form-item:not(.ant-form-item-horizontal)\n .ant-form-item-label {\n padding: 0 0 4px 0;\n }\n .ant-form-item-margin-offset {\n margin-bottom: 0px !important;\n }\n"])));
13
13
  const FieldBoxBorder = exports.FieldBoxBorder = _styledComponents.default.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n border-radius: 12px;\n border: 1px solid #e0e0e0;\n padding: 16px;\n"])));
14
14
  const FieldWithoutBorder = exports.FieldWithoutBorder = _styledComponents.default.div(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n .cstUplaodWithText {\n display: flex;\n width: 100%;\n flex-direction: row;\n justify-content: space-between;\n margin-bottom: 24px;\n }\n\n .cstUplaodWithText .uploadDiv,\n .cstUplaodWithText > div,\n .cstUplaodWithText > div > section {\n width: 100%;\n }\n\n .cstUplaodWithText .ant-form-item-row {\n justify-content: space-between;\n flex-direction: row;\n flex-flow: row !important;\n width: 100%;\n }\n\n .cstUplaodWithText .ant-form-item-control {\n flex-grow: 0;\n width: auto !important;\n }\n\n .cstUplaodWithTextTop {\n display: flex;\n width: 100%;\n flex-direction: column;\n justify-content: space-between;\n margin-bottom: 24px;\n gap: 4px;\n }\n"])));
15
- const TotalRow = exports.TotalRow = _styledComponents.default.div(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n display: flex;\n justify-content: space-between;\n align-items: center;\n border-top: 1px solid #e0e0e0;\n padding: 16px 16px 0 16px;\n margin: 0 0 0 -16px;\n width: calc(100% + 32px);\n"])));
15
+ const TotalRow = exports.TotalRow = _styledComponents.default.div(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n display: flex;\n justify-content: space-between;\n align-items: flex-start;\n border-top: 1px solid #e0e0e0;\n padding: 16px 16px 0 16px;\n margin: 0 0 0 -16px;\n width: calc(100% + 32px);\n\n.gstAndCost{display: flex;\n flex-direction: column;\n align-items: flex-end;\n justify-content: center;}\n\n\n\n"])));
16
16
  var _default = exports.default = {};
package/build/widgets/oa-widget-hub-automation-modal/HubAutomationModalStyle.js CHANGED
@@ -9,5 +9,5 @@ var _templateObject, _templateObject2;
9
9
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
10
10
  function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
11
11
  const KeyValueContainer = exports.KeyValueContainer = _styledComponents.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n .keyvalueContent {\n margin: 24px 0 0 0;\n padding: 16px;\n border-radius: 12px;\n background: #f6f6f6;\n }\n"])));
12
- const LessMarginHeading = exports.LessMarginHeading = _styledComponents.default.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n margin: -24px 0 0 0;\n"])));
12
+ const LessMarginHeading = exports.LessMarginHeading = _styledComponents.default.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n // margin: -24px 0 0 0;\n"])));
13
13
  var _default = exports.default = {};
package/build/widgets/oa-widget-item-info-card/styles.js CHANGED
@@ -9,6 +9,6 @@ var _templateObject, _templateObject2, _templateObject3;
9
9
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
10
10
  function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
11
11
  const Container = exports.Container = _styledComponents.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n background: #ffffff;\n border-radius: 12px;\n display: flex;\n flex-direction: column;\n gap: 12px;\n"])));
12
- const TotalRow = exports.TotalRow = _styledComponents.default.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n display: flex;\n justify-content: space-between;\n align-items: center;\n border-top: 1px solid #e0e0e0;\n padding: 16px 16px 0 16px;\n margin: 0 0 0 -16px;\n width: calc(100% + 32px);\n"])));
12
+ const TotalRow = exports.TotalRow = _styledComponents.default.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n display: flex;\n justify-content: space-between;\n align-items: flex-start;\n border-top: 1px solid #e0e0e0;\n padding: 16px 16px 0 16px;\n margin: 0 0 0 -16px;\n width: calc(100% + 32px);\n\n\n .gstAndCost{display: flex;\n flex-direction: column;\n align-items: flex-end;\n justify-content: center;}\n"])));
13
13
  const ItemInfoCard = exports.ItemInfoCard = _styledComponents.default.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n.productBox{width:100%; display:flex; flex-direction:row; justify-content: space-between; padding:12px 0;}\n.productIcon{border-radius: 12px; background: #F6F6F6; width:80px; height:80px; display:flex; align-items:center; justify-content:center;}\n.productIcon img{width:64px;}\n.iconAndtextSec{display:flex; flex-direction:row; gap:12px; width:calc(100% - 88px);}\n.product-info {display: flex; flex-direction: column; width: calc(100% - 92px);}\n"])));
14
14
  var _default = exports.default = {};
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "oa-componentbook",
3
- "version": "0.18.343",
3
+ "version": "0.18.344",
4
4
  "private": false,
5
5
  "description": "Reusable components",
6
6
  "main": "build/index.js",