@leav/ui 1.4.1-5efc3d1e → 1.4.1-79c3ba25

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 (193) hide show
  1. package/dist/_gqlTypes/index.d.ts +5 -3
  2. package/dist/_gqlTypes/index.js +8 -2
  3. package/dist/_gqlTypes/index.js.map +1 -1
  4. package/dist/_queries/export/exportQuery.js +2 -2
  5. package/dist/components/Explorer/Explorer.d.ts +2 -1
  6. package/dist/components/Explorer/Explorer.js +50 -32
  7. package/dist/components/Explorer/Explorer.js.map +1 -1
  8. package/dist/components/Explorer/ExplorerFiltersAndSorts.js +8 -12
  9. package/dist/components/Explorer/ExplorerFiltersAndSorts.js.map +1 -1
  10. package/dist/components/Explorer/_queries/useExplorerData.d.ts +3 -2
  11. package/dist/components/Explorer/_queries/useExplorerData.js +1 -1
  12. package/dist/components/Explorer/_queries/useExplorerData.js.map +1 -1
  13. package/dist/components/Explorer/_types.d.ts +3 -115
  14. package/dist/components/Explorer/_types.js +1 -12
  15. package/dist/components/Explorer/_types.js.map +1 -1
  16. package/dist/components/Explorer/actions-mass/useDeleteLinkValues.d.ts +3 -1
  17. package/dist/components/Explorer/actions-mass/useDeleteLinkValues.js +3 -3
  18. package/dist/components/Explorer/actions-mass/useDeleteLinkValues.js.map +1 -1
  19. package/dist/components/Explorer/actions-mass/useExportMassAction.d.ts +17 -0
  20. package/dist/components/Explorer/actions-mass/useExportMassAction.js +95 -0
  21. package/dist/components/Explorer/actions-mass/useExportMassAction.js.map +1 -0
  22. package/dist/components/Explorer/actions-mass/useMassActions.d.ts +3 -1
  23. package/dist/components/Explorer/actions-mass/useMassActions.js +4 -4
  24. package/dist/components/Explorer/actions-mass/useMassActions.js.map +1 -1
  25. package/dist/components/Explorer/manage-view-settings/filter-items/FilterItems.js +3 -3
  26. package/dist/components/Explorer/manage-view-settings/filter-items/FilterItems.js.map +1 -1
  27. package/dist/components/Explorer/manage-view-settings/router-menu/SettingsPanel.js +3 -1
  28. package/dist/components/Explorer/manage-view-settings/router-menu/SettingsPanel.js.map +1 -1
  29. package/dist/components/Explorer/manage-view-settings/save-view/prepareViewForRequest.d.ts +2 -1
  30. package/dist/components/Explorer/manage-view-settings/save-view/prepareViewForRequest.js +6 -6
  31. package/dist/components/Explorer/manage-view-settings/save-view/prepareViewForRequest.js.map +1 -1
  32. package/dist/components/Explorer/manage-view-settings/save-view/useCreateNewView.js +15 -3
  33. package/dist/components/Explorer/manage-view-settings/save-view/useCreateNewView.js.map +1 -1
  34. package/dist/components/Explorer/manage-view-settings/save-view/useResetView.js +4 -0
  35. package/dist/components/Explorer/manage-view-settings/save-view/useResetView.js.map +1 -1
  36. package/dist/components/Explorer/manage-view-settings/save-view/useShareView.js +4 -2
  37. package/dist/components/Explorer/manage-view-settings/save-view/useShareView.js.map +1 -1
  38. package/dist/components/Explorer/manage-view-settings/save-view/useUpdateView.js +15 -3
  39. package/dist/components/Explorer/manage-view-settings/save-view/useUpdateView.js.map +1 -1
  40. package/dist/components/Explorer/manage-view-settings/store-view-settings/viewSettingsInitialState.js +1 -4
  41. package/dist/components/Explorer/manage-view-settings/store-view-settings/viewSettingsInitialState.js.map +1 -1
  42. package/dist/components/Explorer/manage-view-settings/store-view-settings/viewSettingsReducer.d.ts +8 -9
  43. package/dist/components/Explorer/manage-view-settings/store-view-settings/viewSettingsReducer.js +4 -128
  44. package/dist/components/Explorer/manage-view-settings/store-view-settings/viewSettingsReducer.js.map +1 -1
  45. package/dist/components/Explorer/useLoadView.js +15 -8
  46. package/dist/components/Explorer/useLoadView.js.map +1 -1
  47. package/dist/components/Explorer/useViewSettingsReducer.js +5 -10
  48. package/dist/components/Explorer/useViewSettingsReducer.js.map +1 -1
  49. package/dist/components/Filters/FiltersProvider.d.ts +3 -0
  50. package/dist/components/Filters/FiltersProvider.js +8 -0
  51. package/dist/components/Filters/FiltersProvider.js.map +1 -0
  52. package/dist/components/Filters/_types.d.ts +130 -0
  53. package/dist/components/Filters/_types.js +14 -0
  54. package/dist/components/Filters/_types.js.map +1 -0
  55. package/dist/components/Filters/conditionsHelper.d.ts +2 -0
  56. package/dist/components/Filters/conditionsHelper.js +16 -0
  57. package/dist/components/Filters/conditionsHelper.js.map +1 -0
  58. package/dist/components/Filters/context/filtersContext.d.ts +6 -0
  59. package/dist/components/Filters/context/filtersContext.js +9 -0
  60. package/dist/components/Filters/context/filtersContext.js.map +1 -0
  61. package/dist/components/Filters/context/filtersInitialState.d.ts +2 -0
  62. package/dist/components/Filters/context/filtersInitialState.js +10 -0
  63. package/dist/components/Filters/context/filtersInitialState.js.map +1 -0
  64. package/dist/components/Filters/context/filtersReducer.d.ts +64 -0
  65. package/dist/components/Filters/context/filtersReducer.js +179 -0
  66. package/dist/components/Filters/context/filtersReducer.js.map +1 -0
  67. package/dist/components/Filters/context/useFiltersReducer.d.ts +13 -0
  68. package/dist/components/Filters/context/useFiltersReducer.js +68 -0
  69. package/dist/components/Filters/context/useFiltersReducer.js.map +1 -0
  70. package/dist/components/Filters/filter-items/CommonFilterItem.d.ts +8 -0
  71. package/dist/components/{Explorer/manage-view-settings/_shared → Filters/filter-items}/CommonFilterItem.js +7 -7
  72. package/dist/components/Filters/filter-items/CommonFilterItem.js.map +1 -0
  73. package/dist/components/{Explorer/manage-view-settings → Filters}/filter-items/filter-type/BooleanAttributeDropdown.js +16 -8
  74. package/dist/components/Filters/filter-items/filter-type/BooleanAttributeDropdown.js.map +1 -0
  75. package/dist/components/{Explorer/manage-view-settings → Filters}/filter-items/filter-type/ColorAttributeDropDown.js +1 -1
  76. package/dist/components/Filters/filter-items/filter-type/ColorAttributeDropDown.js.map +1 -0
  77. package/dist/components/{Explorer/manage-view-settings → Filters}/filter-items/filter-type/DateAttributeDropDown.js +3 -3
  78. package/dist/components/Filters/filter-items/filter-type/DateAttributeDropDown.js.map +1 -0
  79. package/dist/components/{Explorer/manage-view-settings → Filters}/filter-items/filter-type/DateRangeAttributeDropDown.js +1 -1
  80. package/dist/components/Filters/filter-items/filter-type/DateRangeAttributeDropDown.js.map +1 -0
  81. package/dist/components/{Explorer/manage-view-settings → Filters}/filter-items/filter-type/EncryptedAttributeDropDown.js +1 -1
  82. package/dist/components/Filters/filter-items/filter-type/EncryptedAttributeDropDown.js.map +1 -0
  83. package/dist/components/{Explorer/manage-view-settings → Filters}/filter-items/filter-type/ExtendedAttributeDropDown.js +1 -1
  84. package/dist/components/Filters/filter-items/filter-type/ExtendedAttributeDropDown.js.map +1 -0
  85. package/dist/components/Filters/filter-items/filter-type/FilterDropDown.d.ts +3 -0
  86. package/dist/components/{Explorer/manage-view-settings → Filters}/filter-items/filter-type/FilterDropDown.js +9 -9
  87. package/dist/components/Filters/filter-items/filter-type/FilterDropDown.js.map +1 -0
  88. package/dist/components/{Explorer/manage-view-settings → Filters}/filter-items/filter-type/FilterDropdownContent.d.ts +3 -3
  89. package/dist/components/{Explorer/manage-view-settings → Filters}/filter-items/filter-type/FilterDropdownContent.js +6 -6
  90. package/dist/components/Filters/filter-items/filter-type/FilterDropdownContent.js.map +1 -0
  91. package/dist/components/{Explorer/manage-view-settings → Filters}/filter-items/filter-type/FilterValueListDropDown.d.ts +3 -3
  92. package/dist/components/{Explorer/manage-view-settings → Filters}/filter-items/filter-type/FilterValueListDropDown.js +5 -5
  93. package/dist/components/Filters/filter-items/filter-type/FilterValueListDropDown.js.map +1 -0
  94. package/dist/components/{Explorer/manage-view-settings → Filters}/filter-items/filter-type/LinkAttributeDropdown.js +6 -6
  95. package/dist/components/Filters/filter-items/filter-type/LinkAttributeDropdown.js.map +1 -0
  96. package/dist/components/{Explorer/manage-view-settings → Filters}/filter-items/filter-type/NumericAttributeDropDown.js +2 -2
  97. package/dist/components/Filters/filter-items/filter-type/NumericAttributeDropDown.js.map +1 -0
  98. package/dist/components/{Explorer/manage-view-settings → Filters}/filter-items/filter-type/TextAttributeDropDown.js +2 -2
  99. package/dist/components/Filters/filter-items/filter-type/TextAttributeDropDown.js.map +1 -0
  100. package/dist/components/{Explorer/manage-view-settings → Filters}/filter-items/filter-type/TreeAttributeDropDown.js +5 -5
  101. package/dist/components/Filters/filter-items/filter-type/TreeAttributeDropDown.js.map +1 -0
  102. package/dist/components/Filters/filter-items/filter-type/_types.d.ts +18 -0
  103. package/dist/components/Filters/filter-items/filter-type/_types.js.map +1 -0
  104. package/dist/components/{Explorer/manage-view-settings → Filters}/filter-items/filter-type/useConditionOptionsByType.d.ts +7 -7
  105. package/dist/components/{Explorer/manage-view-settings → Filters}/filter-items/filter-type/useConditionOptionsByType.js +14 -14
  106. package/dist/components/Filters/filter-items/filter-type/useConditionOptionsByType.js.map +1 -0
  107. package/dist/components/Filters/index.d.ts +8 -0
  108. package/dist/components/Filters/index.js +12 -0
  109. package/dist/components/Filters/index.js.map +1 -0
  110. package/dist/components/Filters/prepareFiltersForRequest.d.ts +4 -0
  111. package/dist/components/{Explorer/_queries → Filters}/prepareFiltersForRequest.js +12 -11
  112. package/dist/components/Filters/prepareFiltersForRequest.js.map +1 -0
  113. package/dist/components/Filters/useFilters.d.ts +1724 -0
  114. package/dist/components/Filters/useFilters.js +28 -0
  115. package/dist/components/Filters/useFilters.js.map +1 -0
  116. package/dist/components/Filters/useFiltersContext.d.ts +4 -0
  117. package/dist/components/Filters/useFiltersContext.js +13 -0
  118. package/dist/components/Filters/useFiltersContext.js.map +1 -0
  119. package/dist/components/{Explorer/manage-view-settings/_shared → Filters}/useTransformFilters.d.ts +7 -7
  120. package/dist/components/{Explorer/manage-view-settings/_shared → Filters}/useTransformFilters.js +8 -8
  121. package/dist/components/Filters/useTransformFilters.js.map +1 -0
  122. package/dist/components/LibraryItemsList/FiltersDropdown/FiltersDropdown.js +4 -4
  123. package/dist/components/LibraryItemsList/FiltersDropdown/FiltersDropdown.js.map +1 -1
  124. package/dist/components/RecordEdition/EditRecordContent/uiElements/LinkField/LinkField.js +9 -2
  125. package/dist/components/RecordEdition/EditRecordContent/uiElements/LinkField/LinkField.js.map +1 -1
  126. package/dist/components/RecordEdition/EditRecordContent/uiElements/LinkField/link-record/useLinkRecords.js +5 -2
  127. package/dist/components/RecordEdition/EditRecordContent/uiElements/LinkField/link-record/useLinkRecords.js.map +1 -1
  128. package/dist/components/RecordEdition/EditRecordContent/uiElements/StandardField/StandardField.js +12 -4
  129. package/dist/components/RecordEdition/EditRecordContent/uiElements/StandardField/StandardField.js.map +1 -1
  130. package/dist/components/RecordEdition/EditRecordContent/uiElements/StandardField/StandardFieldValue/DSColorPickerWrapper.js +1 -1
  131. package/dist/components/RecordEdition/EditRecordContent/uiElements/StandardField/StandardFieldValue/DSDatePickerWrapper.js +1 -1
  132. package/dist/components/RecordEdition/EditRecordContent/uiElements/StandardField/StandardFieldValue/DSInputEncryptedWrapper.js +1 -1
  133. package/dist/components/RecordEdition/EditRecordContent/uiElements/StandardField/StandardFieldValue/DSInputNumberWrapper.js +1 -1
  134. package/dist/components/RecordEdition/EditRecordContent/uiElements/StandardField/StandardFieldValue/DSInputWrapper.js +1 -1
  135. package/dist/components/RecordEdition/EditRecordContent/uiElements/StandardField/StandardFieldValue/DSRangePickerWrapper.js +1 -1
  136. package/dist/components/RecordEdition/EditRecordContent/uiElements/StandardField/StandardFieldValue/DSRichTextWrapper.js +1 -1
  137. package/dist/components/RecordEdition/EditRecordContent/uiElements/TreeField/TreeField.js +14 -2
  138. package/dist/components/RecordEdition/EditRecordContent/uiElements/TreeField/TreeField.js.map +1 -1
  139. package/dist/components/RecordEdition/EditRecordContent/uiElements/TreeField/display-tree-node/TreeNodeList.js +3 -1
  140. package/dist/components/RecordEdition/EditRecordContent/uiElements/TreeField/display-tree-node/TreeNodeList.js.map +1 -1
  141. package/dist/components/RecordEdition/EditRecordContent/uiElements/TreeField/manage-tree-node-selection/useManageTreeNodeSelection.js +1 -1
  142. package/dist/components/RecordEdition/EditRecordContent/uiElements/TreeField/manage-tree-node-selection/useManageTreeNodeSelection.js.map +1 -1
  143. package/dist/components/RecordEdition/EditRecordPage/EditRecordPage.d.ts +1 -0
  144. package/dist/components/RecordEdition/EditRecordPage/EditRecordPage.js +15 -2
  145. package/dist/components/RecordEdition/EditRecordPage/EditRecordPage.js.map +1 -1
  146. package/dist/components/index.d.ts +1 -0
  147. package/dist/components/index.js +1 -0
  148. package/dist/components/index.js.map +1 -1
  149. package/dist/constants.d.ts +2 -0
  150. package/dist/constants.js +2 -0
  151. package/dist/constants.js.map +1 -1
  152. package/dist/hooks/index.d.ts +1 -0
  153. package/dist/hooks/index.js +1 -0
  154. package/dist/hooks/index.js.map +1 -1
  155. package/dist/hooks/useIFrameMessenger/schema.d.ts +8 -2
  156. package/dist/hooks/useIFrameMessenger/schema.js +4 -3
  157. package/dist/hooks/useIFrameMessenger/schema.js.map +1 -1
  158. package/dist/locales/en/shared.json +6 -0
  159. package/dist/locales/fr/shared.json +6 -0
  160. package/package.json +3 -3
  161. package/dist/components/Explorer/_queries/prepareFiltersForRequest.d.ts +0 -4
  162. package/dist/components/Explorer/_queries/prepareFiltersForRequest.js.map +0 -1
  163. package/dist/components/Explorer/manage-view-settings/_shared/CommonFilterItem.d.ts +0 -6
  164. package/dist/components/Explorer/manage-view-settings/_shared/CommonFilterItem.js.map +0 -1
  165. package/dist/components/Explorer/manage-view-settings/_shared/useTransformFilters.js.map +0 -1
  166. package/dist/components/Explorer/manage-view-settings/filter-items/filter-type/BooleanAttributeDropdown.js.map +0 -1
  167. package/dist/components/Explorer/manage-view-settings/filter-items/filter-type/ColorAttributeDropDown.js.map +0 -1
  168. package/dist/components/Explorer/manage-view-settings/filter-items/filter-type/DateAttributeDropDown.js.map +0 -1
  169. package/dist/components/Explorer/manage-view-settings/filter-items/filter-type/DateRangeAttributeDropDown.js.map +0 -1
  170. package/dist/components/Explorer/manage-view-settings/filter-items/filter-type/EncryptedAttributeDropDown.js.map +0 -1
  171. package/dist/components/Explorer/manage-view-settings/filter-items/filter-type/ExtendedAttributeDropDown.js.map +0 -1
  172. package/dist/components/Explorer/manage-view-settings/filter-items/filter-type/FilterDropDown.d.ts +0 -3
  173. package/dist/components/Explorer/manage-view-settings/filter-items/filter-type/FilterDropDown.js.map +0 -1
  174. package/dist/components/Explorer/manage-view-settings/filter-items/filter-type/FilterDropdownContent.js.map +0 -1
  175. package/dist/components/Explorer/manage-view-settings/filter-items/filter-type/FilterValueListDropDown.js.map +0 -1
  176. package/dist/components/Explorer/manage-view-settings/filter-items/filter-type/LinkAttributeDropdown.js.map +0 -1
  177. package/dist/components/Explorer/manage-view-settings/filter-items/filter-type/NumericAttributeDropDown.js.map +0 -1
  178. package/dist/components/Explorer/manage-view-settings/filter-items/filter-type/TextAttributeDropDown.js.map +0 -1
  179. package/dist/components/Explorer/manage-view-settings/filter-items/filter-type/TreeAttributeDropDown.js.map +0 -1
  180. package/dist/components/Explorer/manage-view-settings/filter-items/filter-type/_types.d.ts +0 -18
  181. package/dist/components/Explorer/manage-view-settings/filter-items/filter-type/_types.js.map +0 -1
  182. package/dist/components/Explorer/manage-view-settings/filter-items/filter-type/useConditionOptionsByType.js.map +0 -1
  183. /package/dist/components/{Explorer/manage-view-settings → Filters}/filter-items/filter-type/BooleanAttributeDropdown.d.ts +0 -0
  184. /package/dist/components/{Explorer/manage-view-settings → Filters}/filter-items/filter-type/ColorAttributeDropDown.d.ts +0 -0
  185. /package/dist/components/{Explorer/manage-view-settings → Filters}/filter-items/filter-type/DateAttributeDropDown.d.ts +0 -0
  186. /package/dist/components/{Explorer/manage-view-settings → Filters}/filter-items/filter-type/DateRangeAttributeDropDown.d.ts +0 -0
  187. /package/dist/components/{Explorer/manage-view-settings → Filters}/filter-items/filter-type/EncryptedAttributeDropDown.d.ts +0 -0
  188. /package/dist/components/{Explorer/manage-view-settings → Filters}/filter-items/filter-type/ExtendedAttributeDropDown.d.ts +0 -0
  189. /package/dist/components/{Explorer/manage-view-settings → Filters}/filter-items/filter-type/LinkAttributeDropdown.d.ts +0 -0
  190. /package/dist/components/{Explorer/manage-view-settings → Filters}/filter-items/filter-type/NumericAttributeDropDown.d.ts +0 -0
  191. /package/dist/components/{Explorer/manage-view-settings → Filters}/filter-items/filter-type/TextAttributeDropDown.d.ts +0 -0
  192. /package/dist/components/{Explorer/manage-view-settings → Filters}/filter-items/filter-type/TreeAttributeDropDown.d.ts +0 -0
  193. /package/dist/components/{Explorer/manage-view-settings → Filters}/filter-items/filter-type/_types.js +0 -0
@@ -12,22 +12,26 @@ import { ViewSettingsActionTypes } from '../store-view-settings/viewSettingsRedu
12
12
  import useExecuteSaveViewMutation from '../../../../hooks/useExecuteSaveViewMutation';
13
13
  import { prepareViewForRequest } from './prepareViewForRequest';
14
14
  import { mapViewTypeFromExplorerToLegacy } from '../../_constants';
15
- import { useTransformFilters } from '../_shared/useTransformFilters';
15
+ import { useTransformFilters } from '../../../../components/Filters/useTransformFilters';
16
+ import { useFiltersContext } from '../../../../components/Filters/useFiltersContext';
17
+ import { FiltersActionTypes } from '../../../../components/Filters/context/filtersReducer';
16
18
  export const useCreateNewView = () => {
17
19
  const { t } = useSharedTranslation();
18
20
  const { toValidFilters } = useTransformFilters();
19
21
  const { view, dispatch } = useViewSettingsContext();
22
+ const { filtersData, dispatch: filtersDispatch } = useFiltersContext();
20
23
  const { saveView } = useExecuteSaveViewMutation();
21
24
  const [isModalOpen, setIsModalOpen] = useState(false);
22
25
  const _toggleModal = () => {
23
26
  setIsModalOpen(!isModalOpen);
24
27
  };
25
28
  const _createView = async (label) => {
26
- const mappedView = prepareViewForRequest(view, label);
29
+ const mappedView = prepareViewForRequest(view, filtersData.filters, label);
27
30
  const { data } = await saveView({
28
31
  view: mappedView
29
32
  });
30
33
  if (data) {
34
+ const validFilters = toValidFilters(data.saveView.filters);
31
35
  dispatch({
32
36
  type: ViewSettingsActionTypes.UPDATE_VIEWS,
33
37
  payload: {
@@ -35,7 +39,7 @@ export const useCreateNewView = () => {
35
39
  ownerId: data.saveView.created_by.id,
36
40
  label: data.saveView.label,
37
41
  shared: data.saveView.shared,
38
- filters: toValidFilters(data.saveView.filters),
42
+ filters: validFilters,
39
43
  sort: data.saveView.sort ?? [],
40
44
  display: data.saveView.display ?? {
41
45
  type: mapViewTypeFromExplorerToLegacy[view.viewType]
@@ -43,6 +47,14 @@ export const useCreateNewView = () => {
43
47
  attributes: data.saveView?.attributes?.map(({ id }) => id) ?? []
44
48
  }
45
49
  });
50
+ filtersDispatch({
51
+ type: FiltersActionTypes.UPDATE_VIEWS,
52
+ payload: {
53
+ ...filtersData,
54
+ viewId: data.saveView.id,
55
+ filters: validFilters
56
+ }
57
+ });
46
58
  }
47
59
  };
48
60
  return {
@@ -1 +1 @@
1
- {"version":3,"file":"useCreateNewView.js","sourceRoot":"","sources":["../../../../../src/components/Explorer/manage-view-settings/save-view/useCreateNewView.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"useCreateNewView.js","sourceRoot":"","sources":["../../../../../src/components/Explorer/manage-view-settings/save-view/useCreateNewView.tsx"],"names":[],"mappings":"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"}
@@ -7,11 +7,15 @@ import { useSharedTranslation } from '../../../../hooks/useSharedTranslation';
7
7
  import { useViewSettingsContext } from '../store-view-settings/useViewSettingsContext';
8
8
  import { ViewSettingsActionTypes } from '../store-view-settings/viewSettingsReducer';
9
9
  import { FaUndo } from 'react-icons/fa';
10
+ import { useFiltersContext } from '../../../../components/Filters/useFiltersContext';
11
+ import { FiltersActionTypes } from '../../../../components/Filters/context/filtersReducer';
10
12
  export const useResetView = () => {
11
13
  const { t } = useSharedTranslation();
12
14
  const { dispatch } = useViewSettingsContext();
15
+ const { dispatch: filtersDispatch } = useFiltersContext();
13
16
  const _resetView = () => {
14
17
  dispatch({ type: ViewSettingsActionTypes.RESTORE_INITIAL_VIEW_SETTINGS });
18
+ filtersDispatch({ type: FiltersActionTypes.RESTORE_INITIAL_VIEW_SETTINGS });
15
19
  };
16
20
  return {
17
21
  resetViewButton: (_jsx(KitButton, { type: "action", icon: _jsx(FaUndo, {}), onClick: _resetView, children: t('explorer.viewList.reinit-view') }))
@@ -1 +1 @@
1
- {"version":3,"file":"useResetView.js","sourceRoot":"","sources":["../../../../../src/components/Explorer/manage-view-settings/save-view/useResetView.tsx"],"names":[],"mappings":";AAAA,oFAAoF;AACpF,sCAAsC;AACtC,sEAAsE;AACtE,OAAO,EAAC,SAAS,EAAC,MAAM,YAAY,CAAC;AACrC,OAAO,EAAC,oBAAoB,EAAC,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAC,sBAAsB,EAAC,MAAM,+CAA+C,CAAC;AACrF,OAAO,EAAC,uBAAuB,EAAC,MAAM,4CAA4C,CAAC;AACnF,OAAO,EAAC,MAAM,EAAC,MAAM,gBAAgB,CAAC;AAEtC,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,EAAE;IAC7B,MAAM,EAAC,CAAC,EAAC,GAAG,oBAAoB,EAAE,CAAC;IACnC,MAAM,EAAC,QAAQ,EAAC,GAAG,sBAAsB,EAAE,CAAC;IAE5C,MAAM,UAAU,GAAG,GAAG,EAAE;QACpB,QAAQ,CAAC,EAAC,IAAI,EAAE,uBAAuB,CAAC,6BAA6B,EAAC,CAAC,CAAC;IAC5E,CAAC,CAAC;IAEF,OAAO;QACH,eAAe,EAAE,CACb,KAAC,SAAS,IAAC,IAAI,EAAC,QAAQ,EAAC,IAAI,EAAE,KAAC,MAAM,KAAG,EAAE,OAAO,EAAE,UAAU,YACzD,CAAC,CAAC,+BAA+B,CAAC,GAC3B,CACf;KACJ,CAAC;AACN,CAAC,CAAC"}
1
+ {"version":3,"file":"useResetView.js","sourceRoot":"","sources":["../../../../../src/components/Explorer/manage-view-settings/save-view/useResetView.tsx"],"names":[],"mappings":";AAAA,oFAAoF;AACpF,sCAAsC;AACtC,sEAAsE;AACtE,OAAO,EAAC,SAAS,EAAC,MAAM,YAAY,CAAC;AACrC,OAAO,EAAC,oBAAoB,EAAC,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAC,sBAAsB,EAAC,MAAM,+CAA+C,CAAC;AACrF,OAAO,EAAC,uBAAuB,EAAC,MAAM,4CAA4C,CAAC;AACnF,OAAO,EAAC,MAAM,EAAC,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAC,iBAAiB,EAAC,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAAC,kBAAkB,EAAC,MAAM,+CAA+C,CAAC;AAEjF,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,EAAE;IAC7B,MAAM,EAAC,CAAC,EAAC,GAAG,oBAAoB,EAAE,CAAC;IACnC,MAAM,EAAC,QAAQ,EAAC,GAAG,sBAAsB,EAAE,CAAC;IAC5C,MAAM,EAAC,QAAQ,EAAE,eAAe,EAAC,GAAG,iBAAiB,EAAE,CAAC;IAExD,MAAM,UAAU,GAAG,GAAG,EAAE;QACpB,QAAQ,CAAC,EAAC,IAAI,EAAE,uBAAuB,CAAC,6BAA6B,EAAC,CAAC,CAAC;QACxE,eAAe,CAAC,EAAC,IAAI,EAAE,kBAAkB,CAAC,6BAA6B,EAAC,CAAC,CAAC;IAC9E,CAAC,CAAC;IAEF,OAAO;QACH,eAAe,EAAE,CACb,KAAC,SAAS,IAAC,IAAI,EAAC,QAAQ,EAAC,IAAI,EAAE,KAAC,MAAM,KAAG,EAAE,OAAO,EAAE,UAAU,YACzD,CAAC,CAAC,+BAA+B,CAAC,GAC3B,CACf;KACJ,CAAC;AACN,CAAC,CAAC"}
@@ -11,11 +11,13 @@ import useExecuteSaveViewMutation from '../../../../hooks/useExecuteSaveViewMuta
11
11
  import { ViewSettingsActionTypes } from '../store-view-settings/viewSettingsReducer';
12
12
  import { prepareViewForRequest } from './prepareViewForRequest';
13
13
  import { mapViewTypeFromExplorerToLegacy } from '../../_constants';
14
- import { useTransformFilters } from '../_shared/useTransformFilters';
15
14
  import { useMeQuery } from '../../../../_gqlTypes';
15
+ import { useTransformFilters } from '../../../../components/Filters/useTransformFilters';
16
+ import { useFiltersContext } from '../../../../components/Filters';
16
17
  export const useShareView = () => {
17
18
  const { t } = useSharedTranslation();
18
19
  const { view, dispatch } = useViewSettingsContext();
20
+ const { filtersData } = useFiltersContext();
19
21
  const { saveView } = useExecuteSaveViewMutation();
20
22
  const { toValidFilters } = useTransformFilters();
21
23
  const [isSharedView, setIsSharedView] = useState(false);
@@ -31,7 +33,7 @@ export const useShareView = () => {
31
33
  }, [view.viewId]);
32
34
  const _toggleShareView = async () => {
33
35
  const mappedView = {
34
- ...prepareViewForRequest(view, view.viewLabels),
36
+ ...prepareViewForRequest(view, filtersData.filters, view.viewLabels),
35
37
  shared: !isSharedView,
36
38
  id: view.viewId
37
39
  };
@@ -1 +1 @@
1
- {"version":3,"file":"useShareView.js","sourceRoot":"","sources":["../../../../../src/components/Explorer/manage-view-settings/save-view/useShareView.tsx"],"names":[],"mappings":";AAAA,oFAAoF;AACpF,sCAAsC;AACtC,sEAAsE;AACtE,OAAO,EAAC,oBAAoB,EAAC,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAC,SAAS,EAAC,MAAM,YAAY,CAAC;AACrC,OAAO,EAAC,OAAO,EAAC,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAC,sBAAsB,EAAC,MAAM,+CAA+C,CAAC;AACrF,OAAO,EAAC,SAAS,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAC1C,OAAO,0BAA0B,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAC,uBAAuB,EAAC,MAAM,4CAA4C,CAAC;AACnF,OAAO,EAAC,qBAAqB,EAAC,MAAM,yBAAyB,CAAC;AAE9D,OAAO,EAAC,+BAA+B,EAAC,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAC,mBAAmB,EAAC,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAEzC,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,EAAE;IAC7B,MAAM,EAAC,CAAC,EAAC,GAAG,oBAAoB,EAAE,CAAC;IACnC,MAAM,EAAC,IAAI,EAAE,QAAQ,EAAC,GAAG,sBAAsB,EAAE,CAAC;IAClD,MAAM,EAAC,QAAQ,EAAC,GAAG,0BAA0B,EAAE,CAAC;IAChD,MAAM,EAAC,cAAc,EAAC,GAAG,mBAAmB,EAAE,CAAC;IAC/C,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IACxD,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAEtD,MAAM,EAAC,IAAI,EAAE,QAAQ,EAAC,GAAG,UAAU,EAAE,CAAC;IAEtC,SAAS,CAAC,GAAG,EAAE;QACX,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,MAAM,CAAC,CAAC;QACpE,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAC5B,OAAO;QACX,CAAC;QACD,eAAe,CAAC,WAAW,CAAC,MAAM,IAAI,KAAK,CAAC,CAAC;QAC7C,cAAc,CAAC,WAAW,CAAC,OAAO,KAAK,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IACrE,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAElB,MAAM,gBAAgB,GAAG,KAAK,IAAI,EAAE;QAChC,MAAM,UAAU,GAAG;YACf,GAAG,qBAAqB,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC;YAC/C,MAAM,EAAE,CAAC,YAAY;YACrB,EAAE,EAAE,IAAI,CAAC,MAAM;SAClB,CAAC;QAEF,MAAM,EAAC,IAAI,EAAC,GAAG,MAAM,QAAQ,CAAC;YAC1B,IAAI,EAAE,UAAU;SACnB,CAAC,CAAC;QAEH,eAAe,CAAC,CAAC,YAAY,CAAC,CAAC;QAC/B,IAAI,IAAI,EAAE,CAAC;YACP,QAAQ,CAAC;gBACL,IAAI,EAAE,uBAAuB,CAAC,YAAY;gBAC1C,OAAO,EAAE;oBACL,EAAE,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE;oBACpB,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;oBACpC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK;oBAC1B,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM;oBAC5B,OAAO,EAAE,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;oBAC9C,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,EAAE;oBAC9B,OAAO,EAAG,IAAI,CAAC,QAAQ,CAAC,OAAwB,IAAI;wBAChD,IAAI,EAAE,+BAA+B,CAAC,IAAI,CAAC,QAAQ,CAAC;qBACvD;oBACD,UAAU,EAAE,IAAI,CAAC,QAAQ,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC,EAAC,EAAE,EAAC,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE;iBACjE;aACJ,CAAC,CAAC;QACP,CAAC;IACL,CAAC,CAAC;IAEF,OAAO;QACH,eAAe,EACX,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,YAAY,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CACpD,KAAC,SAAS,IAAC,IAAI,EAAC,QAAQ,EAAC,IAAI,EAAE,KAAC,OAAO,KAAG,EAAE,OAAO,EAAE,gBAAgB,YAChE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,gCAAgC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,8BAA8B,CAAC,GAC/E,CACf;KACR,CAAC;AACN,CAAC,CAAC"}
1
+ {"version":3,"file":"useShareView.js","sourceRoot":"","sources":["../../../../../src/components/Explorer/manage-view-settings/save-view/useShareView.tsx"],"names":[],"mappings":";AAAA,oFAAoF;AACpF,sCAAsC;AACtC,sEAAsE;AACtE,OAAO,EAAC,oBAAoB,EAAC,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAC,SAAS,EAAC,MAAM,YAAY,CAAC;AACrC,OAAO,EAAC,OAAO,EAAC,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAC,sBAAsB,EAAC,MAAM,+CAA+C,CAAC;AACrF,OAAO,EAAC,SAAS,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAC1C,OAAO,0BAA0B,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAC,uBAAuB,EAAC,MAAM,4CAA4C,CAAC;AACnF,OAAO,EAAC,qBAAqB,EAAC,MAAM,yBAAyB,CAAC;AAE9D,OAAO,EAAC,+BAA+B,EAAC,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AACzC,OAAO,EAAC,mBAAmB,EAAC,MAAM,4CAA4C,CAAC;AAC/E,OAAO,EAAC,iBAAiB,EAAC,MAAM,wBAAwB,CAAC;AAEzD,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,EAAE;IAC7B,MAAM,EAAC,CAAC,EAAC,GAAG,oBAAoB,EAAE,CAAC;IACnC,MAAM,EAAC,IAAI,EAAE,QAAQ,EAAC,GAAG,sBAAsB,EAAE,CAAC;IAClD,MAAM,EAAC,WAAW,EAAC,GAAG,iBAAiB,EAAE,CAAC;IAC1C,MAAM,EAAC,QAAQ,EAAC,GAAG,0BAA0B,EAAE,CAAC;IAChD,MAAM,EAAC,cAAc,EAAC,GAAG,mBAAmB,EAAE,CAAC;IAC/C,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IACxD,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAEtD,MAAM,EAAC,IAAI,EAAE,QAAQ,EAAC,GAAG,UAAU,EAAE,CAAC;IAEtC,SAAS,CAAC,GAAG,EAAE;QACX,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,MAAM,CAAC,CAAC;QACpE,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAC5B,OAAO;QACX,CAAC;QACD,eAAe,CAAC,WAAW,CAAC,MAAM,IAAI,KAAK,CAAC,CAAC;QAC7C,cAAc,CAAC,WAAW,CAAC,OAAO,KAAK,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IACrE,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAElB,MAAM,gBAAgB,GAAG,KAAK,IAAI,EAAE;QAChC,MAAM,UAAU,GAAG;YACf,GAAG,qBAAqB,CAAC,IAAI,EAAE,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC;YACpE,MAAM,EAAE,CAAC,YAAY;YACrB,EAAE,EAAE,IAAI,CAAC,MAAM;SAClB,CAAC;QAEF,MAAM,EAAC,IAAI,EAAC,GAAG,MAAM,QAAQ,CAAC;YAC1B,IAAI,EAAE,UAAU;SACnB,CAAC,CAAC;QAEH,eAAe,CAAC,CAAC,YAAY,CAAC,CAAC;QAC/B,IAAI,IAAI,EAAE,CAAC;YACP,QAAQ,CAAC;gBACL,IAAI,EAAE,uBAAuB,CAAC,YAAY;gBAC1C,OAAO,EAAE;oBACL,EAAE,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE;oBACpB,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;oBACpC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK;oBAC1B,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM;oBAC5B,OAAO,EAAE,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;oBAC9C,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,EAAE;oBAC9B,OAAO,EAAG,IAAI,CAAC,QAAQ,CAAC,OAAwB,IAAI;wBAChD,IAAI,EAAE,+BAA+B,CAAC,IAAI,CAAC,QAAQ,CAAC;qBACvD;oBACD,UAAU,EAAE,IAAI,CAAC,QAAQ,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC,EAAC,EAAE,EAAC,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE;iBACjE;aACJ,CAAC,CAAC;QACP,CAAC;IACL,CAAC,CAAC;IAEF,OAAO;QACH,eAAe,EACX,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,YAAY,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CACpD,KAAC,SAAS,IAAC,IAAI,EAAC,QAAQ,EAAC,IAAI,EAAE,KAAC,OAAO,KAAG,EAAE,OAAO,EAAE,gBAAgB,YAChE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,gCAAgC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,8BAA8B,CAAC,GAC/E,CACf;KACR,CAAC;AACN,CAAC,CAAC"}
@@ -10,13 +10,16 @@ import { ViewSettingsActionTypes } from '../store-view-settings/viewSettingsRedu
10
10
  import useExecuteUpdateViewMutation from '../../_queries/useExecuteUpdateViewMutation';
11
11
  import { prepareViewForRequest } from './prepareViewForRequest';
12
12
  import { mapViewTypeFromExplorerToLegacy } from '../../_constants';
13
- import { useTransformFilters } from '../_shared/useTransformFilters';
14
13
  import { useEffect, useRef, useState } from 'react';
15
14
  import { useMeQuery } from '../../../../_gqlTypes';
15
+ import { useTransformFilters } from '../../../../components/Filters/useTransformFilters';
16
+ import { useFiltersContext } from '../../../../components/Filters/useFiltersContext';
17
+ import { FiltersActionTypes } from '../../../../components/Filters/context/filtersReducer';
16
18
  export const useUpdateView = () => {
17
19
  const { t } = useSharedTranslation();
18
20
  const { toValidFilters } = useTransformFilters();
19
21
  const { view, dispatch } = useViewSettingsContext();
22
+ const { filtersData, dispatch: filtersDispatch } = useFiltersContext();
20
23
  const { updateView } = useExecuteUpdateViewMutation();
21
24
  const [isOwnerView, setIsOwnerView] = useState(false);
22
25
  const currentView = useRef();
@@ -33,7 +36,7 @@ export const useUpdateView = () => {
33
36
  return;
34
37
  }
35
38
  const mappedView = {
36
- ...prepareViewForRequest(view, view.viewLabels),
39
+ ...prepareViewForRequest(view, filtersData.filters, view.viewLabels),
37
40
  id: view.viewId,
38
41
  shared: currentView.current?.shared ?? false
39
42
  };
@@ -41,6 +44,7 @@ export const useUpdateView = () => {
41
44
  view: mappedView
42
45
  });
43
46
  if (data) {
47
+ const validFilters = toValidFilters(data.updateView.filters);
44
48
  dispatch({
45
49
  type: ViewSettingsActionTypes.UPDATE_VIEWS,
46
50
  payload: {
@@ -48,7 +52,7 @@ export const useUpdateView = () => {
48
52
  ownerId: data.updateView.created_by.id,
49
53
  label: data.updateView.label,
50
54
  shared: data.updateView.shared,
51
- filters: toValidFilters(data.updateView.filters),
55
+ filters: validFilters,
52
56
  sort: data.updateView.sort ?? [],
53
57
  display: data.updateView.display ?? {
54
58
  type: mapViewTypeFromExplorerToLegacy[view.viewType]
@@ -56,6 +60,14 @@ export const useUpdateView = () => {
56
60
  attributes: data.updateView?.attributes?.map(({ id }) => id) ?? []
57
61
  }
58
62
  });
63
+ filtersDispatch({
64
+ type: FiltersActionTypes.UPDATE_VIEWS,
65
+ payload: {
66
+ ...filtersData,
67
+ viewId: data.updateView.id,
68
+ filters: data.updateView.filters
69
+ }
70
+ });
59
71
  }
60
72
  };
61
73
  return {
@@ -1 +1 @@
1
- {"version":3,"file":"useUpdateView.js","sourceRoot":"","sources":["../../../../../src/components/Explorer/manage-view-settings/save-view/useUpdateView.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"useUpdateView.js","sourceRoot":"","sources":["../../../../../src/components/Explorer/manage-view-settings/save-view/useUpdateView.tsx"],"names":[],"mappings":"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"}
@@ -15,15 +15,12 @@ export const viewSettingsInitialState = {
15
15
  fulltextSearch: '',
16
16
  sort: [],
17
17
  pageSize: defaultPageSizeOptions[0],
18
- filtersOperator: 'AND',
19
- filters: [],
20
18
  massSelection: [],
21
19
  initialViewSettings: {
22
20
  viewType: 'table',
23
21
  attributesIds: [],
24
22
  sort: [],
25
- pageSize: defaultPageSizeOptions[0],
26
- filters: []
23
+ pageSize: defaultPageSizeOptions[0]
27
24
  },
28
25
  defaultViewSettings: {
29
26
  viewType: 'table',
@@ -1 +1 @@
1
- {"version":3,"file":"viewSettingsInitialState.js","sourceRoot":"","sources":["../../../../../src/components/Explorer/manage-view-settings/store-view-settings/viewSettingsInitialState.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAE/C,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,CAAC;AAElC,MAAM,CAAC,MAAM,wBAAwB,GAAuB;IACxD,SAAS,EAAE,EAAE;IACb,QAAQ,EAAE,OAAO;IACjB,MAAM,EAAE,aAAa;IACrB,YAAY,EAAE,KAAK;IACnB,UAAU,EAAE,EAAE;IACd,UAAU,EAAE,EAAE;IACd,UAAU,EAAE;QACR,IAAI,EAAE,SAAS;QACf,SAAS,EAAE,EAAE;KAChB;IACD,aAAa,EAAE,EAAE;IACjB,cAAc,EAAE,EAAE;IAClB,IAAI,EAAE,EAAE;IACR,QAAQ,EAAE,sBAAsB,CAAC,CAAC,CAAC;IACnC,eAAe,EAAE,KAAK;IACtB,OAAO,EAAE,EAAE;IACX,aAAa,EAAE,EAAE;IACjB,mBAAmB,EAAE;QACjB,QAAQ,EAAE,OAAO;QACjB,aAAa,EAAE,EAAE;QACjB,IAAI,EAAE,EAAE;QACR,QAAQ,EAAE,sBAAsB,CAAC,CAAC,CAAC;QACnC,OAAO,EAAE,EAAE;KACd;IACD,mBAAmB,EAAE;QACjB,QAAQ,EAAE,OAAO;QACjB,aAAa,EAAE,EAAE;QACjB,IAAI,EAAE,EAAE;QACR,OAAO,EAAE,EAAE;KACd;IACD,mBAAmB,EAAE,KAAK;CAC7B,CAAC"}
1
+ {"version":3,"file":"viewSettingsInitialState.js","sourceRoot":"","sources":["../../../../../src/components/Explorer/manage-view-settings/store-view-settings/viewSettingsInitialState.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAE/C,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,CAAC;AAElC,MAAM,CAAC,MAAM,wBAAwB,GAAuB;IACxD,SAAS,EAAE,EAAE;IACb,QAAQ,EAAE,OAAO;IACjB,MAAM,EAAE,aAAa;IACrB,YAAY,EAAE,KAAK;IACnB,UAAU,EAAE,EAAE;IACd,UAAU,EAAE,EAAE;IACd,UAAU,EAAE;QACR,IAAI,EAAE,SAAS;QACf,SAAS,EAAE,EAAE;KAChB;IACD,aAAa,EAAE,EAAE;IACjB,cAAc,EAAE,EAAE;IAClB,IAAI,EAAE,EAAE;IACR,QAAQ,EAAE,sBAAsB,CAAC,CAAC,CAAC;IACnC,aAAa,EAAE,EAAE;IACjB,mBAAmB,EAAE;QACjB,QAAQ,EAAE,OAAO;QACjB,aAAa,EAAE,EAAE;QACjB,IAAI,EAAE,EAAE;QACR,QAAQ,EAAE,sBAAsB,CAAC,CAAC,CAAC;KACtC;IACD,mBAAmB,EAAE;QACjB,QAAQ,EAAE,OAAO;QACjB,aAAa,EAAE,EAAE;QACjB,IAAI,EAAE,EAAE;QACR,OAAO,EAAE,EAAE;KACd;IACD,mBAAmB,EAAE,KAAK;CAC7B,CAAC"}
@@ -1,5 +1,6 @@
1
1
  import { type SortOrder } from '../../../../_gqlTypes';
2
- import { type DefaultViewSettings, type Entrypoint, type ExplorerFilter, type IExplorerFilterTree, type IUserView, type MassSelection } from '../../_types';
2
+ import { type DefaultViewSettings, type Entrypoint, type IUserView, type MassSelection } from '../../_types';
3
+ import { type IUIFilterTree, type UIFilter } from '../../../../components/Filters';
3
4
  export type ViewType = 'table' | 'list' | 'timeline' | 'mosaic';
4
5
  export declare const ViewSettingsActionTypes: {
5
6
  readonly RESET: "RESET";
@@ -42,9 +43,7 @@ export interface IViewSettingsState {
42
43
  order: SortOrder;
43
44
  }>;
44
45
  pageSize: number;
45
- filtersOperator: 'AND' | 'OR';
46
- filters: ExplorerFilter[] | IExplorerFilterTree[];
47
- initialViewSettings: Pick<IViewSettingsState, 'viewType' | 'attributesIds' | 'sort' | 'pageSize' | 'filters'>;
46
+ initialViewSettings: Pick<IViewSettingsState, 'viewType' | 'attributesIds' | 'sort' | 'pageSize'>;
48
47
  defaultViewSettings: DefaultViewSettings;
49
48
  massSelection: MassSelection;
50
49
  enableConfigureView?: boolean;
@@ -121,19 +120,19 @@ interface IViewSettingsActionClearFulltextSearch {
121
120
  }
122
121
  interface IViewSettingsActionAddFilter {
123
122
  type: typeof ViewSettingsActionTypes.ADD_FILTER;
124
- payload: Omit<ExplorerFilter, 'id' | 'value' | 'condition'>;
123
+ payload: Omit<UIFilter, 'id' | 'value' | 'condition'>;
125
124
  }
126
125
  interface IViewSettingsActionResetFilter {
127
126
  type: typeof ViewSettingsActionTypes.RESET_FILTER;
128
- payload: Pick<ExplorerFilter, 'id'>;
127
+ payload: Pick<UIFilter, 'id'>;
129
128
  }
130
129
  interface IViewSettingsActionRemoveFilter {
131
130
  type: typeof ViewSettingsActionTypes.REMOVE_FILTER;
132
- payload: Pick<ExplorerFilter, 'id'>;
131
+ payload: Pick<UIFilter, 'id'>;
133
132
  }
134
133
  interface IViewSettingsActionChangeFilterConfig {
135
134
  type: typeof ViewSettingsActionTypes.CHANGE_FILTER_CONFIG;
136
- payload: ExplorerFilter | IExplorerFilterTree;
135
+ payload: UIFilter | IUIFilterTree;
137
136
  }
138
137
  interface IViewSettingsActionMoveFilter {
139
138
  type: typeof ViewSettingsActionTypes.MOVE_FILTER;
@@ -171,7 +170,7 @@ interface IViewSettingsActionDeleteView {
171
170
  id: string;
172
171
  };
173
172
  }
174
- export type IViewSettingsActionLoadViewPayload = Pick<IViewSettingsState, 'viewId' | 'viewLabels' | 'viewType' | 'attributesIds' | 'sort' | 'filters'>;
173
+ export type IViewSettingsActionLoadViewPayload = Pick<IViewSettingsState, 'viewId' | 'viewLabels' | 'viewType' | 'attributesIds' | 'sort'>;
175
174
  interface IViewSettingsActionLoadView {
176
175
  type: typeof ViewSettingsActionTypes.LOAD_VIEW;
177
176
  payload: IViewSettingsActionLoadViewPayload;
@@ -1,14 +1,4 @@
1
- // Copyright LEAV Solutions 2017 until 2023/11/05, Copyright Aristid from 2023/11/06
2
- // This file is released under LGPL V3
3
- // License text available at https://www.gnu.org/licenses/lgpl-3.0.txt
4
- import { v4 as uuid } from 'uuid';
5
- import { AttributeFormat } from '../../../../_gqlTypes';
6
- import { isExplorerFilterLink, isExplorerFilterStandard, isExplorerFilterThrough, isExplorerFilterTree, isExplorerFilterValueList } from '../../_types';
7
- import { hasOnlyNoValueConditions, nullValueConditions } from '../../conditionsHelper';
8
- import { conditionsByFormat, getFirstConditionByFilterType } from '../filter-items/filter-type/useConditionOptionsByType';
9
- import { AttributeConditionFilter, ThroughConditionFilter } from '../../../../types';
10
1
  import { DefaultViewId } from './viewSettingsInitialState';
11
- import { isLinkAttribute } from '../../../../_utils/attributeType';
12
2
  export const ViewSettingsActionTypes = {
13
3
  RESET: 'RESET',
14
4
  ADD_ATTRIBUTE: 'ADD_ATTRIBUTE',
@@ -102,118 +92,6 @@ export const clearFulltextSearch = state => ({
102
92
  ...state,
103
93
  fulltextSearch: ''
104
94
  });
105
- const addFilter = (state, payload) => {
106
- const hasValueList = payload.attribute.valuesList;
107
- let condition = hasOnlyNoValueConditions(payload.attribute.format)
108
- ? null
109
- : (conditionsByFormat[payload.attribute.format][0] ?? null);
110
- if (hasValueList) {
111
- condition = AttributeConditionFilter.EQUAL;
112
- }
113
- const filterToAdd = isExplorerFilterTree(payload)
114
- ? {
115
- ...payload,
116
- id: uuid(),
117
- field: Array.isArray(payload.field) ? payload.field : [payload.field],
118
- condition: hasOnlyNoValueConditions(payload.attribute.format)
119
- ? null
120
- : getFirstConditionByFilterType(payload)[0],
121
- value: null
122
- }
123
- : {
124
- ...payload,
125
- field: isLinkAttribute(payload.attribute.type) ? `${payload.field}.id` : payload.field,
126
- id: uuid(),
127
- condition,
128
- value: null,
129
- valuesList: hasValueList ? payload.attribute.valuesList : undefined
130
- };
131
- return {
132
- ...state,
133
- filters: [...state.filters, filterToAdd],
134
- viewModified: true
135
- };
136
- };
137
- const resetFilter = (state, payload) => ({
138
- ...state,
139
- filters: state.filters.map(filter => {
140
- if (filter.id === payload.id) {
141
- const initialViewFilter = state.initialViewSettings.filters.find(({ id }) => id === payload.id);
142
- if (initialViewFilter) {
143
- return initialViewFilter;
144
- }
145
- if (isExplorerFilterValueList(filter)) {
146
- return {
147
- ...filter,
148
- condition: null,
149
- value: null
150
- };
151
- }
152
- if (isExplorerFilterStandard(filter)) {
153
- return {
154
- ...filter,
155
- condition: hasOnlyNoValueConditions(filter.attribute.format)
156
- ? null
157
- : conditionsByFormat[filter.attribute.format][0],
158
- value: null
159
- };
160
- }
161
- if (isExplorerFilterThrough(filter)) {
162
- return {
163
- ...filter,
164
- condition: ThroughConditionFilter.THROUGH,
165
- value: null
166
- };
167
- }
168
- if (isExplorerFilterLink(filter)) {
169
- return {
170
- ...filter,
171
- condition: conditionsByFormat[AttributeFormat.text][0],
172
- value: null
173
- };
174
- }
175
- if (isExplorerFilterTree(filter)) {
176
- return {
177
- ...filter,
178
- condition: null,
179
- value: null
180
- };
181
- }
182
- }
183
- return filter;
184
- })
185
- });
186
- const removeFilter = (state, payload) => ({
187
- ...state,
188
- filters: state.filters.filter(({ id }) => id !== payload.id),
189
- viewModified: true
190
- });
191
- const changeFilterConfig = (state, payload) => ({
192
- ...state,
193
- filters: state.filters.map(filter => {
194
- if (filter.id !== payload.id) {
195
- return filter;
196
- }
197
- if (isExplorerFilterTree(filter) && payload.value && payload.value.length === 0) {
198
- return { ...filter, ...payload, value: null };
199
- }
200
- if (isExplorerFilterValueList(filter) && filter.condition && nullValueConditions.includes(filter.condition)) {
201
- return { ...filter, ...payload, value: null };
202
- }
203
- return { ...filter, ...payload };
204
- }),
205
- viewModified: true
206
- });
207
- const moveFilter = (state, payload) => {
208
- const attributesUsedToFilter = [...state.filters];
209
- const [filterToMove] = attributesUsedToFilter.splice(payload.indexFrom, 1);
210
- attributesUsedToFilter.splice(payload.indexTo, 0, filterToMove);
211
- return {
212
- ...state,
213
- filters: attributesUsedToFilter,
214
- viewModified: true
215
- };
216
- };
217
95
  const reset = (_, payload) => payload;
218
96
  const setSelectedKeys = (state, payload) => ({
219
97
  ...state,
@@ -235,8 +113,7 @@ const updateViewListAndCurrentView = (state, payload) => ({
235
113
  viewType: state.viewType,
236
114
  attributesIds: state.attributesIds,
237
115
  sort: state.sort,
238
- pageSize: state.pageSize,
239
- filters: state.filters
116
+ pageSize: state.pageSize
240
117
  },
241
118
  viewModified: false
242
119
  });
@@ -277,8 +154,7 @@ const loadView = (state, payload) => ({
277
154
  viewType: payload.viewType,
278
155
  attributesIds: payload.attributesIds,
279
156
  sort: payload.sort,
280
- pageSize: state.pageSize,
281
- filters: payload.filters
157
+ pageSize: state.pageSize
282
158
  },
283
159
  viewModified: false
284
160
  });
@@ -320,7 +196,7 @@ export const viewSettingsReducer = (state, action) => {
320
196
  case ViewSettingsActionTypes.CLEAR_FULLTEXT_SEARCH: {
321
197
  return clearFulltextSearch(state);
322
198
  }
323
- case ViewSettingsActionTypes.ADD_FILTER: {
199
+ /*case ViewSettingsActionTypes.ADD_FILTER: {
324
200
  return addFilter(state, action.payload);
325
201
  }
326
202
  case ViewSettingsActionTypes.RESET_FILTER: {
@@ -334,7 +210,7 @@ export const viewSettingsReducer = (state, action) => {
334
210
  }
335
211
  case ViewSettingsActionTypes.MOVE_FILTER: {
336
212
  return moveFilter(state, action.payload);
337
- }
213
+ }*/
338
214
  case ViewSettingsActionTypes.RESET: {
339
215
  return reset(state, action.payload);
340
216
  }
@@ -1 +1 @@
1
- {"version":3,"file":"viewSettingsReducer.js","sourceRoot":"","sources":["../../../../../src/components/Explorer/manage-view-settings/store-view-settings/viewSettingsReducer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"viewSettingsReducer.js","sourceRoot":"","sources":["../../../../../src/components/Explorer/manage-view-settings/store-view-settings/viewSettingsReducer.ts"],"names":[],"mappings":"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"}
@@ -5,12 +5,15 @@ import { useExplorerAttributesLazyQuery, useMeQuery } from '../../_gqlTypes';
5
5
  import { useRef } from 'react';
6
6
  import { useViewSettingsContext } from './manage-view-settings/store-view-settings/useViewSettingsContext';
7
7
  import { useEditSettings, ViewSettingsActionTypes } from './manage-view-settings';
8
- import { useTransformFilters } from './manage-view-settings/_shared/useTransformFilters';
9
8
  import { mapViewTypeFromExplorerToLegacy, mapViewTypeFromLegacyToExplorer } from './_constants';
9
+ import { useTransformFilters } from '../../components/Filters/useTransformFilters';
10
+ import { useFiltersContext } from '../../components/Filters/useFiltersContext';
11
+ import { FiltersActionTypes } from '../../components/Filters/context/filtersReducer';
10
12
  export const useLoadView = () => {
11
13
  const { view, dispatch } = useViewSettingsContext();
14
+ const { dispatch: filtersDispatch } = useFiltersContext();
12
15
  const { closeSettingsPanel } = useEditSettings();
13
- const { toExplorerFilters, toValidFilters } = useTransformFilters();
16
+ const { toUIFilters, toValidFilters } = useTransformFilters();
14
17
  const currentView = useRef(null);
15
18
  const [fetchAttributes] = useExplorerAttributesLazyQuery({
16
19
  fetchPolicy: 'network-only'
@@ -38,7 +41,7 @@ export const useLoadView = () => {
38
41
  }
39
42
  currentView.current = viewData;
40
43
  const attributesToHydrate = [
41
- ...new Set([...(viewData?.sort ?? []), ...(viewData?.sort ?? [])].map(({ field }) => field))
44
+ ...new Set([...(viewData?.filters ?? []), ...(viewData?.sort ?? [])].map(({ field }) => field))
42
45
  ];
43
46
  const fetchAttributesResult = await fetchAttributes({
44
47
  variables: {
@@ -60,16 +63,20 @@ export const useLoadView = () => {
60
63
  sort: (currentView.current?.sort ?? []).map(s => ({
61
64
  field: s.field,
62
65
  order: s.order
63
- })),
64
- filters: toExplorerFilters({
65
- filters: toValidFilters(currentView.current?.filters ?? []),
66
- attributesDataById
67
- })
66
+ }))
68
67
  };
69
68
  dispatch({
70
69
  type: ViewSettingsActionTypes.LOAD_VIEW,
71
70
  payload: viewSettings
72
71
  });
72
+ filtersDispatch({
73
+ type: FiltersActionTypes.LOAD_VIEW,
74
+ payload: {
75
+ viewId: currentView.current?.id ?? null,
76
+ filters: [],
77
+ attributesDataById
78
+ }
79
+ });
73
80
  }
74
81
  };
75
82
  };
@@ -1 +1 @@
1
- {"version":3,"file":"useLoadView.js","sourceRoot":"","sources":["../../../src/components/Explorer/useLoadView.tsx"],"names":[],"mappings":"AAAA,oFAAoF;AACpF,sCAAsC;AACtC,sEAAsE;AACtE,OAAO,EAAC,8BAA8B,EAAE,UAAU,EAAC,MAAM,eAAe,CAAC;AACzE,OAAO,EAAC,MAAM,EAAC,MAAM,OAAO,CAAC;AAC7B,OAAO,EAAC,sBAAsB,EAAC,MAAM,mEAAmE,CAAC;AAEzG,OAAO,EAAC,eAAe,EAAE,uBAAuB,EAAC,MAAM,wBAAwB,CAAC;AAChF,OAAO,EAAC,mBAAmB,EAA4B,MAAM,oDAAoD,CAAC;AAClH,OAAO,EAAC,+BAA+B,EAAE,+BAA+B,EAAC,MAAM,cAAc,CAAC;AAG9F,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,EAAE;IAC5B,MAAM,EAAC,IAAI,EAAE,QAAQ,EAAC,GAAG,sBAAsB,EAAE,CAAC;IAClD,MAAM,EAAC,kBAAkB,EAAC,GAAG,eAAe,EAAE,CAAC;IAC/C,MAAM,EAAC,iBAAiB,EAAE,cAAc,EAAC,GAAG,mBAAmB,EAAE,CAAC;IAClE,MAAM,WAAW,GAAG,MAAM,CAAmB,IAAI,CAAC,CAAC;IAEnD,MAAM,CAAC,eAAe,CAAC,GAAG,8BAA8B,CAAC;QACrD,WAAW,EAAE,cAAc;KAC9B,CAAC,CAAC;IAEH,MAAM,EAAC,IAAI,EAAC,GAAG,UAAU,EAAE,CAAC;IAE5B,OAAO;QACH,QAAQ,EAAE,KAAK,EAAE,MAAqB,EAAE,EAAE;YACtC,IAAI,QAA0B,CAAC;YAC/B,IAAI,CAAC,MAAM,EAAE,CAAC;gBACV,QAAQ,GAAG;oBACP,GAAG,IAAI,CAAC,mBAAmB;oBAC3B,EAAE,EAAE,IAAI;oBACR,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,IAAI;oBACrC,OAAO,EAAE,EAAC,IAAI,EAAE,+BAA+B,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAC;oBAC/D,KAAK,EAAE,EAAE;oBACT,MAAM,EAAE,KAAK;oBACb,OAAO,EAAE,IAAI,CAAC,mBAAmB,CAAC,OAAwB;iBAC7D,CAAC;YACN,CAAC;iBAAM,CAAC;gBACJ,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC;YAClE,CAAC;YAED,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACZ,OAAO;YACX,CAAC;YAED,WAAW,CAAC,OAAO,GAAG,QAAQ,CAAC;YAE/B,MAAM,mBAAmB,GAAG;gBACxB,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,QAAQ,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAC,KAAK,EAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;aAC7F,CAAC;YAEF,MAAM,qBAAqB,GAAG,MAAM,eAAe,CAAC;gBAChD,SAAS,EAAE;oBACP,GAAG,EAAE,mBAAmB;iBAC3B;aACJ,CAAC,CAAC;YAEH,kBAAkB,EAAE,CAAC;YAErB,MAAM,kBAAkB,GAAG,CAAC,qBAAqB,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;gBACjG,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC;gBACpB,OAAO,GAAG,CAAC;YACf,CAAC,EAAE,EAAE,CAAC,CAAC;YAEP,MAAM,YAAY,GAAuC;gBACrD,MAAM,EAAE,WAAW,CAAC,OAAO,EAAE,EAAE,IAAI,IAAI;gBACvC,UAAU,EAAE,WAAW,CAAC,OAAO,EAAE,KAAK,IAAI,EAAE;gBAC5C,QAAQ,EAAE,WAAW,CAAC,OAAO,EAAE,OAAO;oBAClC,CAAC,CAAC,+BAA+B,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC;oBACpE,CAAC,CAAC,IAAI,CAAC,QAAQ;gBACnB,aAAa,EAAE,WAAW,CAAC,OAAO,EAAE,UAAU,IAAI,EAAE;gBACpD,IAAI,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;oBAC9C,KAAK,EAAE,CAAC,CAAC,KAAK;oBACd,KAAK,EAAE,CAAC,CAAC,KAAK;iBACjB,CAAC,CAAC;gBACH,OAAO,EAAE,iBAAiB,CAAC;oBACvB,OAAO,EAAE,cAAc,CAAE,WAAW,CAAC,OAAO,EAAE,OAAgC,IAAI,EAAE,CAAC;oBACrF,kBAAkB;iBACrB,CAAC;aACL,CAAC;YAEF,QAAQ,CAAC;gBACL,IAAI,EAAE,uBAAuB,CAAC,SAAS;gBACvC,OAAO,EAAE,YAAY;aACxB,CAAC,CAAC;QACP,CAAC;KACJ,CAAC;AACN,CAAC,CAAC"}
1
+ {"version":3,"file":"useLoadView.js","sourceRoot":"","sources":["../../../src/components/Explorer/useLoadView.tsx"],"names":[],"mappings":"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"}
@@ -5,7 +5,7 @@ import { useEffect, useMemo, useReducer, useState } from 'react';
5
5
  import { useExplorerAttributesQuery, useExplorerLinkAttributeQuery, useGetViewsListQuery, ViewSizes } from '../../_gqlTypes';
6
6
  import { mapViewTypeFromLegacyToExplorer } from './_constants';
7
7
  import { useEditSettings, viewSettingsInitialState, viewSettingsReducer } from './manage-view-settings';
8
- import { isLinkAttributeDetails, useTransformFilters } from './manage-view-settings/_shared/useTransformFilters';
8
+ import { isLinkAttributeDetails, useTransformFilters } from '../../components/Filters/useTransformFilters';
9
9
  const _areDifferents = (object1, object2) => Object.keys(object1).some(key => object1[key] !== object2[key]);
10
10
  export const useViewSettingsReducer = (entrypoint, defaultViewSettings = {}, ignoreViewByDefault) => {
11
11
  /**
@@ -16,7 +16,7 @@ export const useViewSettingsReducer = (entrypoint, defaultViewSettings = {}, ign
16
16
  const [view, dispatch] = useReducer(viewSettingsReducer, viewSettingsInitialState);
17
17
  const { closeSettingsPanel } = useEditSettings();
18
18
  // FIXME: should be two methods taking `lang` as argument
19
- const { toExplorerFilters, toValidFilters } = useTransformFilters();
19
+ const { toValidFilters } = useTransformFilters();
20
20
  /**
21
21
  * We need to check if the `props.entrypoint` has changed to detect a new `props.entrypoint.libraryId`.
22
22
  *
@@ -107,7 +107,6 @@ export const useViewSettingsReducer = (entrypoint, defaultViewSettings = {}, ign
107
107
  * Filters merged from `<Explorer />` props and `view`.
108
108
  * > Could include hidden filters too.
109
109
  */
110
- const allFilters = preparedDefaultFilters.concat(userViewFilters);
111
110
  const defaultSorts = defaultViewSettings?.sort ?? [];
112
111
  const userViewSorts = ignoreViewByDefault ? [] : (userView?.sort ?? []);
113
112
  const defaultAttributesIds = (defaultViewSettings?.attributesIds ?? []).filter(attr => attributesDataById[attr]);
@@ -137,9 +136,7 @@ export const useViewSettingsReducer = (entrypoint, defaultViewSettings = {}, ign
137
136
  field: s.field,
138
137
  order: s.order
139
138
  }))
140
- .filter(s => attributesDataById[s.field]),
141
- filtersOperator: defaultViewSettings?.filtersOperator ?? 'AND',
142
- filters: toExplorerFilters({ filters: allFilters, attributesDataById })
139
+ .filter(s => attributesDataById[s.field])
143
140
  };
144
141
  dispatch({
145
142
  type: 'RESET',
@@ -149,14 +146,12 @@ export const useViewSettingsReducer = (entrypoint, defaultViewSettings = {}, ign
149
146
  viewType: hydratedSettings.viewType,
150
147
  attributesIds: hydratedSettings.attributesIds,
151
148
  sort: hydratedSettings.sort,
152
- pageSize: hydratedSettings.pageSize,
153
- filters: hydratedSettings.filters
149
+ pageSize: hydratedSettings.pageSize
154
150
  },
155
151
  defaultViewSettings: {
156
152
  viewType: defaultViewSettings.viewType ?? 'table',
157
153
  attributesIds: defaultViewSettings.attributesIds ?? [],
158
- sort: defaultViewSettings.sort ?? [],
159
- filters: defaultViewSettings.filters ?? []
154
+ sort: defaultViewSettings.sort ?? []
160
155
  }
161
156
  }
162
157
  });