@leav/ui 0.3.6-e218b23 → 0.3.6-e2f8e65
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.
- package/dist/__mocks__/common/view.js +7 -5
- package/dist/__mocks__/common/view.js.map +1 -1
- package/dist/__mocks__/mockQuery/mockGetLibraryDetailExtendedQuery.js +1 -1
- package/dist/__mocks__/mockQuery/mockGetLibraryDetailExtendedQuery.js.map +1 -1
- package/dist/__mocks__/mockQuery/mockGetViewListQuery.js +2 -1
- package/dist/__mocks__/mockQuery/mockGetViewListQuery.js.map +1 -1
- package/dist/_gqlTypes/index.d.ts +46 -43
- package/dist/_gqlTypes/index.js +25 -20
- package/dist/_gqlTypes/index.js.map +1 -1
- package/dist/_queries/libraries/getLibraryDetailExtendQuery.d.ts +3 -4
- package/dist/_queries/libraries/getLibraryDetailExtendQuery.js +2 -3
- package/dist/_queries/libraries/getLibraryDetailExtendQuery.js.map +1 -1
- package/dist/_queries/views/saveViewMutation.js +1 -1
- package/dist/_queries/views/viewDetailsFragment.js +14 -11
- package/dist/_queries/views/viewDetailsFragment.js.map +1 -1
- package/dist/_utils/index.js +5 -2
- package/dist/_utils/index.js.map +1 -1
- package/dist/components/Explorer/Explorer.js +3 -3
- package/dist/components/Explorer/Explorer.js.map +1 -1
- package/dist/components/Explorer/_constants.d.ts +4 -0
- package/dist/components/Explorer/_constants.js +17 -0
- package/dist/components/Explorer/_constants.js.map +1 -0
- package/dist/components/Explorer/_queries/useExplorerData.d.ts +1 -1
- package/dist/components/Explorer/_queries/useExplorerData.js +8 -2
- package/dist/components/Explorer/_queries/useExplorerData.js.map +1 -1
- package/dist/components/Explorer/display-view-filters/ExplorerToolBar.d.ts +4 -0
- package/dist/components/Explorer/display-view-filters/ExplorerToolBar.js +47 -0
- package/dist/components/Explorer/display-view-filters/ExplorerToolBar.js.map +1 -0
- package/dist/components/Explorer/manage-view-settings/filter-items/FilterItems.js +2 -1
- package/dist/components/Explorer/manage-view-settings/filter-items/FilterItems.js.map +1 -1
- package/dist/components/Explorer/manage-view-settings/open-view-settings/EditSettingsContext.d.ts +1 -0
- package/dist/components/Explorer/manage-view-settings/open-view-settings/EditSettingsContext.js.map +1 -1
- package/dist/components/Explorer/manage-view-settings/open-view-settings/useOpenViewSettings.d.ts +2 -0
- package/dist/components/Explorer/manage-view-settings/open-view-settings/useOpenViewSettings.js +24 -6
- package/dist/components/Explorer/manage-view-settings/open-view-settings/useOpenViewSettings.js.map +1 -1
- package/dist/components/Explorer/manage-view-settings/router-menu/SettingsPanel.d.ts +2 -1
- package/dist/components/Explorer/manage-view-settings/router-menu/SettingsPanel.js +45 -28
- package/dist/components/Explorer/manage-view-settings/router-menu/SettingsPanel.js.map +1 -1
- package/dist/components/Explorer/manage-view-settings/sort-items/SortItems.js +20 -20
- package/dist/components/Explorer/manage-view-settings/sort-items/SortItems.js.map +1 -1
- package/dist/components/Explorer/manage-view-settings/store-view-settings/viewSettingsInitialState.js +7 -1
- package/dist/components/Explorer/manage-view-settings/store-view-settings/viewSettingsInitialState.js.map +1 -1
- package/dist/components/Explorer/manage-view-settings/store-view-settings/viewSettingsReducer.d.ts +11 -6
- package/dist/components/Explorer/manage-view-settings/store-view-settings/viewSettingsReducer.js +23 -28
- package/dist/components/Explorer/manage-view-settings/store-view-settings/viewSettingsReducer.js.map +1 -1
- package/dist/components/Explorer/useViewSettingsReducer.d.ts +1 -1
- package/dist/components/Explorer/useViewSettingsReducer.js +78 -32
- package/dist/components/Explorer/useViewSettingsReducer.js.map +1 -1
- package/dist/components/LibraryItemsList/LibraryItemsListContent/LibraryItemsListContent.js +7 -11
- package/dist/components/LibraryItemsList/LibraryItemsListContent/LibraryItemsListContent.js.map +1 -1
- package/dist/components/LibraryItemsList/LibraryItemsListTable/Header/Header.js +7 -5
- package/dist/components/LibraryItemsList/LibraryItemsListTable/Header/Header.js.map +1 -1
- package/dist/components/LibraryItemsList/MenuView/MenuView.js +4 -9
- package/dist/components/LibraryItemsList/MenuView/MenuView.js.map +1 -1
- package/dist/components/LibraryItemsList/ViewPanel/EditView/EditView.js +2 -3
- package/dist/components/LibraryItemsList/ViewPanel/EditView/EditView.js.map +1 -1
- package/dist/components/LibraryItemsList/ViewPanel/View/View.js +3 -3
- package/dist/components/LibraryItemsList/ViewPanel/View/View.js.map +1 -1
- package/dist/components/LibraryItemsList/helpers/getFieldsFromView.js +4 -9
- package/dist/components/LibraryItemsList/helpers/getFieldsFromView.js.map +1 -1
- package/dist/components/LibraryItemsList/hooks/useLibraryView/useLibraryView.js +7 -5
- package/dist/components/LibraryItemsList/hooks/useLibraryView/useLibraryView.js.map +1 -1
- package/dist/components/LibraryItemsList/hooks/useSearchReducer/_types.d.ts +1 -1
- package/dist/components/LibraryItemsList/hooks/useSearchReducer/searchReducer.d.ts +1 -1
- package/dist/components/LibraryItemsList/hooks/useSearchReducer/searchReducer.js +25 -33
- package/dist/components/LibraryItemsList/hooks/useSearchReducer/searchReducer.js.map +1 -1
- package/dist/components/RecordEdition/EditRecord/EditRecord.d.ts +1 -0
- package/dist/components/RecordEdition/EditRecord/EditRecord.js +8 -16
- package/dist/components/RecordEdition/EditRecord/EditRecord.js.map +1 -1
- package/dist/components/RecordEdition/EditRecordContent/EditRecordContent.js +3 -3
- package/dist/components/RecordEdition/EditRecordContent/EditRecordContent.js.map +1 -1
- package/dist/components/RecordEdition/EditRecordContent/helpers/extractFormElements/extractFormElements.d.ts +3 -1
- package/dist/components/RecordEdition/EditRecordContent/helpers/extractFormElements/extractFormElements.js +8 -2
- package/dist/components/RecordEdition/EditRecordContent/helpers/extractFormElements/extractFormElements.js.map +1 -1
- package/dist/components/RecordEdition/EditRecordContent/uiElements/StandardField/StandardField.js +1 -3
- package/dist/components/RecordEdition/EditRecordContent/uiElements/StandardField/StandardField.js.map +1 -1
- package/dist/components/RecordEdition/EditRecordModal/EditRecordModal.js +10 -4
- package/dist/components/RecordEdition/EditRecordModal/EditRecordModal.js.map +1 -1
- package/dist/components/RecordEdition/EditRecordPage/EditRecordPage.d.ts +2 -0
- package/dist/components/RecordEdition/EditRecordPage/EditRecordPage.js +2 -2
- package/dist/components/RecordEdition/EditRecordPage/EditRecordPage.js.map +1 -1
- package/dist/components/RecordEdition/EditRecordSidebar/EditRecordSidebar.d.ts +4 -1
- package/dist/components/RecordEdition/EditRecordSidebar/EditRecordSidebar.js +31 -3
- package/dist/components/RecordEdition/EditRecordSidebar/EditRecordSidebar.js.map +1 -1
- package/dist/hooks/useExecuteSaveViewMutation/index.d.ts +1 -0
- package/dist/hooks/useExecuteSaveViewMutation/index.js +5 -0
- package/dist/hooks/useExecuteSaveViewMutation/index.js.map +1 -0
- package/dist/hooks/useExecuteSaveViewMutation/useExecuteSaveViewMutation.d.ts +6 -0
- package/dist/hooks/{useExecuteAddViewMutation/useExecuteAddViewMutation.js → useExecuteSaveViewMutation/useExecuteSaveViewMutation.js} +6 -6
- package/dist/hooks/useExecuteSaveViewMutation/useExecuteSaveViewMutation.js.map +1 -0
- package/dist/locales/en/shared.json +5 -3
- package/dist/locales/fr/shared.json +5 -3
- package/dist/types/views.d.ts +4 -4
- package/package.json +1 -1
- package/dist/components/Explorer/display-view-filters/ExplorerFilterBar.d.ts +0 -2
- package/dist/components/Explorer/display-view-filters/ExplorerFilterBar.js +0 -37
- package/dist/components/Explorer/display-view-filters/ExplorerFilterBar.js.map +0 -1
- package/dist/hooks/useExecuteAddViewMutation/useExecuteAddViewMutation.d.ts +0 -6
- package/dist/hooks/useExecuteAddViewMutation/useExecuteAddViewMutation.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SortItems.js","sourceRoot":"","sources":["../../../../../src/components/Explorer/manage-view-settings/sort-items/SortItems.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAC,QAAQ,EAAE,aAAa,EAAC,MAAM,YAAY,CAAC;AACnD,OAAO,MAAM,MAAM,mBAAmB,CAAC;AACvC,OAAO,EAAC,oBAAoB,EAAC,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAC,SAAS,EAAC,MAAM,eAAe,CAAC;AACxC,OAAO,EACH,aAAa,EACb,UAAU,EAEV,cAAc,EACd,aAAa,EACb,SAAS,EACT,UAAU,EACb,MAAM,eAAe,CAAC;AACvB,OAAO,EAAC,eAAe,EAAE,2BAA2B,EAAE,2BAA2B,EAAC,MAAM,mBAAmB,CAAC;AAC5G,OAAO,EAAC,uBAAuB,EAAC,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAC,uBAAuB,EAAC,MAAM,4CAA4C,CAAC;AACnF,OAAO,EAAC,sBAAsB,EAAC,MAAM,+CAA+C,CAAC;AACrF,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAE5C,MAAM,UAAU,GAAG,MAAM,CAAC,EAAE,CAAA;;;;;CAK3B,CAAC;AAEF,MAAM,cAAc,GAAG,MAAM,CAAC,UAAU,CAAC,CAAA;;CAExC,CAAC;AAEF,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;;CAEhC,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAA2C,CAAC,EAAC,SAAS,EAAC,EAAE,EAAE;IAC7E,MAAM,EAAC,CAAC,EAAC,GAAG,oBAAoB,EAAE,CAAC;IACnC,MAAM,
|
|
1
|
+
{"version":3,"file":"SortItems.js","sourceRoot":"","sources":["../../../../../src/components/Explorer/manage-view-settings/sort-items/SortItems.tsx"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,12 @@ export const viewSettingsInitialState = {
|
|
|
8
8
|
pageSize: defaultPageSizeOptions[0],
|
|
9
9
|
filters: [],
|
|
10
10
|
maxFilters: defaultMaxFilters,
|
|
11
|
-
|
|
11
|
+
initialViewSettings: {
|
|
12
|
+
viewType: 'table',
|
|
13
|
+
attributesIds: [],
|
|
14
|
+
sort: [],
|
|
15
|
+
pageSize: defaultPageSizeOptions[0],
|
|
16
|
+
filters: []
|
|
17
|
+
}
|
|
12
18
|
};
|
|
13
19
|
//# sourceMappingURL=viewSettingsInitialState.js.map
|
|
@@ -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,EAAE,GAAG,CAAC,CAAC;AAEpD,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAEnC,MAAM,CAAC,MAAM,wBAAwB,GAAuB;IACxD,QAAQ,EAAE,OAAO;IACjB,aAAa,EAAE,EAAE;IACjB,cAAc,EAAE,EAAE;IAClB,IAAI,EAAE,EAAE;IACR,QAAQ,EAAE,sBAAsB,CAAC,CAAC,CAAC;IACnC,OAAO,EAAE,EAAE;IACX,UAAU,EAAE,iBAAiB;IAC7B,
|
|
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,EAAE,GAAG,CAAC,CAAC;AAEpD,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAEnC,MAAM,CAAC,MAAM,wBAAwB,GAAuB;IACxD,QAAQ,EAAE,OAAO;IACjB,aAAa,EAAE,EAAE;IACjB,cAAc,EAAE,EAAE;IAClB,IAAI,EAAE,EAAE;IACR,QAAQ,EAAE,sBAAsB,CAAC,CAAC,CAAC;IACnC,OAAO,EAAE,EAAE;IACX,UAAU,EAAE,iBAAiB;IAC7B,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;CACJ,CAAC"}
|
package/dist/components/Explorer/manage-view-settings/store-view-settings/viewSettingsReducer.d.ts
CHANGED
|
@@ -20,19 +20,21 @@ export declare const ViewSettingsActionTypes: {
|
|
|
20
20
|
readonly REMOVE_FILTER: "REMOVE_FILTER";
|
|
21
21
|
readonly MOVE_FILTER: "MOVE_FILTER";
|
|
22
22
|
readonly CHANGE_FILTER_CONFIG: "CHANGE_FILTER_CONFIG";
|
|
23
|
+
readonly RESTORE_INITIAL_VIEW_SETTINGS: "RESTORE_INITIAL_VIEW_SETTINGS";
|
|
23
24
|
};
|
|
24
25
|
export interface IViewSettingsState {
|
|
26
|
+
viewId?: string;
|
|
25
27
|
viewType: ViewType;
|
|
26
28
|
attributesIds: string[];
|
|
27
29
|
fulltextSearch: string;
|
|
28
30
|
sort: Array<{
|
|
29
|
-
|
|
31
|
+
field: string;
|
|
30
32
|
order: SortOrder;
|
|
31
33
|
}>;
|
|
32
34
|
pageSize: number;
|
|
33
35
|
filters: IExplorerFilter[];
|
|
34
36
|
maxFilters: number;
|
|
35
|
-
|
|
37
|
+
initialViewSettings: Pick<IViewSettingsState, 'viewType' | 'attributesIds' | 'sort' | 'pageSize' | 'filters'>;
|
|
36
38
|
}
|
|
37
39
|
interface IViewSettingsActionChangePageSize {
|
|
38
40
|
type: typeof ViewSettingsActionTypes.CHANGE_PAGE_SIZE;
|
|
@@ -71,20 +73,20 @@ interface IViewSettingsActionResetAttributes {
|
|
|
71
73
|
interface IViewSettingsActionAddSort {
|
|
72
74
|
type: typeof ViewSettingsActionTypes.ADD_SORT;
|
|
73
75
|
payload: {
|
|
74
|
-
|
|
76
|
+
field: string;
|
|
75
77
|
order: SortOrder;
|
|
76
78
|
};
|
|
77
79
|
}
|
|
78
80
|
interface IViewSettingsActionRemoveSort {
|
|
79
81
|
type: typeof ViewSettingsActionTypes.REMOVE_SORT;
|
|
80
82
|
payload: {
|
|
81
|
-
|
|
83
|
+
field: string;
|
|
82
84
|
};
|
|
83
85
|
}
|
|
84
86
|
interface IViewSettingsActionChangeSortOrder {
|
|
85
87
|
type: typeof ViewSettingsActionTypes.CHANGE_SORT_ORDER;
|
|
86
88
|
payload: {
|
|
87
|
-
|
|
89
|
+
field: string;
|
|
88
90
|
order: SortOrder;
|
|
89
91
|
};
|
|
90
92
|
}
|
|
@@ -131,8 +133,11 @@ interface IViewSettingsActionReset {
|
|
|
131
133
|
type: typeof ViewSettingsActionTypes.RESET;
|
|
132
134
|
payload: IViewSettingsState;
|
|
133
135
|
}
|
|
136
|
+
interface IViewSettingsActionRestoreInitialViewSettings {
|
|
137
|
+
type: typeof ViewSettingsActionTypes.RESTORE_INITIAL_VIEW_SETTINGS;
|
|
138
|
+
}
|
|
134
139
|
type Reducer<PAYLOAD = 'no_payload'> = PAYLOAD extends 'no_payload' ? (state: IViewSettingsState) => IViewSettingsState : (state: IViewSettingsState, payload: PAYLOAD) => IViewSettingsState;
|
|
135
140
|
export declare const clearFulltextSearch: Reducer;
|
|
136
|
-
export type IViewSettingsAction = IViewSettingsActionResetAttributes | IViewSettingsActionAddAttribute | IViewSettingsActionRemoveAttribute | IViewSettingsActionMoveAttribute | IViewSettingsActionChangeViewType | IViewSettingsActionAddSort | IViewSettingsActionRemoveSort | IViewSettingsActionChangeSortOrder | IViewSettingsActionMoveSort | IViewSettingsActionChangePageSize | IViewSettingsActionChangeFulltextSearch | IViewSettingsActionClearFulltextSearch | IViewSettingsActionAddFilter | IViewSettingsActionResetFilter | IViewSettingsActionRemoveFilter | IViewSettingsActionChangeFilterConfig | IViewSettingsActionMoveFilter | IViewSettingsActionReset;
|
|
141
|
+
export type IViewSettingsAction = IViewSettingsActionResetAttributes | IViewSettingsActionAddAttribute | IViewSettingsActionRemoveAttribute | IViewSettingsActionMoveAttribute | IViewSettingsActionChangeViewType | IViewSettingsActionAddSort | IViewSettingsActionRemoveSort | IViewSettingsActionChangeSortOrder | IViewSettingsActionMoveSort | IViewSettingsActionChangePageSize | IViewSettingsActionChangeFulltextSearch | IViewSettingsActionClearFulltextSearch | IViewSettingsActionAddFilter | IViewSettingsActionResetFilter | IViewSettingsActionRemoveFilter | IViewSettingsActionChangeFilterConfig | IViewSettingsActionMoveFilter | IViewSettingsActionReset | IViewSettingsActionRestoreInitialViewSettings;
|
|
137
142
|
export declare const viewSettingsReducer: (state: IViewSettingsState, action: IViewSettingsAction) => IViewSettingsState;
|
|
138
143
|
export {};
|
package/dist/components/Explorer/manage-view-settings/store-view-settings/viewSettingsReducer.js
CHANGED
|
@@ -21,7 +21,8 @@ export const ViewSettingsActionTypes = {
|
|
|
21
21
|
RESET_FILTER: 'RESET_FILTER',
|
|
22
22
|
REMOVE_FILTER: 'REMOVE_FILTER',
|
|
23
23
|
MOVE_FILTER: 'MOVE_FILTER',
|
|
24
|
-
CHANGE_FILTER_CONFIG: 'CHANGE_FILTER_CONFIG'
|
|
24
|
+
CHANGE_FILTER_CONFIG: 'CHANGE_FILTER_CONFIG',
|
|
25
|
+
RESTORE_INITIAL_VIEW_SETTINGS: 'RESTORE_INITIAL_VIEW_SETTINGS'
|
|
25
26
|
};
|
|
26
27
|
const changePageSize = (state, payload) => ({
|
|
27
28
|
...state,
|
|
@@ -55,15 +56,15 @@ const changeViewType = (state, payload) => ({
|
|
|
55
56
|
});
|
|
56
57
|
const addSort = (state, payload) => ({
|
|
57
58
|
...state,
|
|
58
|
-
sort: [...state.sort, {
|
|
59
|
+
sort: [...state.sort, { field: payload.field, order: payload.order }]
|
|
59
60
|
});
|
|
60
61
|
const removeSort = (state, payload) => ({
|
|
61
62
|
...state,
|
|
62
|
-
sort: state.sort.filter(({ attributeId }) => attributeId !== payload.
|
|
63
|
+
sort: state.sort.filter(({ field: attributeId }) => attributeId !== payload.field)
|
|
63
64
|
});
|
|
64
65
|
const changeSortOrder = (state, payload) => ({
|
|
65
66
|
...state,
|
|
66
|
-
sort: state.sort.map(sort => (sort.
|
|
67
|
+
sort: state.sort.map(sort => (sort.field === payload.field ? { ...sort, order: payload.order } : sort))
|
|
67
68
|
});
|
|
68
69
|
const moveSort = (state, payload) => {
|
|
69
70
|
const attributesUsedToSort = [...state.sort];
|
|
@@ -82,41 +83,28 @@ export const clearFulltextSearch = state => ({
|
|
|
82
83
|
...state,
|
|
83
84
|
fulltextSearch: ''
|
|
84
85
|
});
|
|
85
|
-
const addFilter = (state, payload) => {
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
const newFilters = [
|
|
90
|
-
...state.filters,
|
|
91
|
-
{ ...payload, id: uuid(), condition: RecordFilterCondition.EQUAL, value: null }
|
|
92
|
-
];
|
|
93
|
-
return {
|
|
94
|
-
...state,
|
|
95
|
-
filters: newFilters,
|
|
96
|
-
canAddFilter: newFilters.length < state.maxFilters
|
|
97
|
-
};
|
|
98
|
-
};
|
|
86
|
+
const addFilter = (state, payload) => ({
|
|
87
|
+
...state,
|
|
88
|
+
filters: [...state.filters, { ...payload, id: uuid(), condition: RecordFilterCondition.EQUAL, value: null }]
|
|
89
|
+
});
|
|
99
90
|
const resetFilter = (state, payload) => ({
|
|
100
91
|
...state,
|
|
101
92
|
filters: state.filters.map(filter => {
|
|
102
93
|
if (filter.id === payload.id) {
|
|
103
|
-
|
|
94
|
+
const initialViewFilter = state.initialViewSettings.filters.find(({ id }) => id === payload.id);
|
|
95
|
+
return (initialViewFilter ?? {
|
|
104
96
|
...filter,
|
|
105
97
|
condition: RecordFilterCondition.EQUAL,
|
|
106
98
|
value: null
|
|
107
|
-
};
|
|
99
|
+
});
|
|
108
100
|
}
|
|
109
101
|
return filter;
|
|
110
102
|
})
|
|
111
103
|
});
|
|
112
|
-
const removeFilter = (state, payload) => {
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
filters: newFilters,
|
|
117
|
-
canAddFilter: newFilters.length < state.maxFilters
|
|
118
|
-
};
|
|
119
|
-
};
|
|
104
|
+
const removeFilter = (state, payload) => ({
|
|
105
|
+
...state,
|
|
106
|
+
filters: state.filters.filter(({ id }) => id !== payload.id)
|
|
107
|
+
});
|
|
120
108
|
const changeFilterConfig = (state, payload) => ({
|
|
121
109
|
...state,
|
|
122
110
|
filters: state.filters.map(filter => (filter.id === payload.id ? { ...filter, ...payload } : filter))
|
|
@@ -131,6 +119,10 @@ const moveFilter = (state, payload) => {
|
|
|
131
119
|
};
|
|
132
120
|
};
|
|
133
121
|
const reset = (_, payload) => payload;
|
|
122
|
+
const restoreInitialViewSettings = state => ({
|
|
123
|
+
...state,
|
|
124
|
+
...state.initialViewSettings
|
|
125
|
+
});
|
|
134
126
|
export const viewSettingsReducer = (state, action) => {
|
|
135
127
|
switch (action.type) {
|
|
136
128
|
case ViewSettingsActionTypes.CHANGE_PAGE_SIZE: {
|
|
@@ -187,6 +179,9 @@ export const viewSettingsReducer = (state, action) => {
|
|
|
187
179
|
case ViewSettingsActionTypes.RESET: {
|
|
188
180
|
return reset(state, action.payload);
|
|
189
181
|
}
|
|
182
|
+
case ViewSettingsActionTypes.RESTORE_INITIAL_VIEW_SETTINGS: {
|
|
183
|
+
return restoreInitialViewSettings(state);
|
|
184
|
+
}
|
|
190
185
|
default:
|
|
191
186
|
return state;
|
|
192
187
|
}
|
package/dist/components/Explorer/manage-view-settings/store-view-settings/viewSettingsReducer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"viewSettingsReducer.js","sourceRoot":"","sources":["../../../../../src/components/Explorer/manage-view-settings/store-view-settings/viewSettingsReducer.ts"],"names":[],"mappings":"AAAA,oFAAoF;AACpF,sCAAsC;AACtC,sEAAsE;AACtE,OAAO,EAAY,qBAAqB,EAAC,MAAM,eAAe,CAAC;AAE/D,OAAO,EAAC,EAAE,IAAI,IAAI,EAAC,MAAM,MAAM,CAAC;AAIhC,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACnC,KAAK,EAAE,OAAO;IACd,aAAa,EAAE,eAAe;IAC9B,gBAAgB,EAAE,kBAAkB;IACpC,cAAc,EAAE,gBAAgB;IAChC,gBAAgB,EAAE,kBAAkB;IACpC,gBAAgB,EAAE,kBAAkB;IACpC,QAAQ,EAAE,UAAU;IACpB,WAAW,EAAE,aAAa;IAC1B,SAAS,EAAE,WAAW;IACtB,iBAAiB,EAAE,mBAAmB;IACtC,gBAAgB,EAAE,kBAAkB;IACpC,sBAAsB,EAAE,wBAAwB;IAChD,qBAAqB,EAAE,uBAAuB;IAC9C,UAAU,EAAE,YAAY;IACxB,YAAY,EAAE,cAAc;IAC5B,aAAa,EAAE,eAAe;IAC9B,WAAW,EAAE,aAAa;IAC1B,oBAAoB,EAAE,sBAAsB;
|
|
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,5 +1,5 @@
|
|
|
1
1
|
import { DefaultViewSettings } from './_types';
|
|
2
|
-
export declare const useViewSettingsReducer: (defaultViewSettings?: DefaultViewSettings) => {
|
|
2
|
+
export declare const useViewSettingsReducer: (library: string, defaultViewSettings?: DefaultViewSettings) => {
|
|
3
3
|
loading: boolean;
|
|
4
4
|
error: import("@apollo/client").ApolloError;
|
|
5
5
|
view: import("./manage-view-settings").IViewSettingsState;
|
|
@@ -1,57 +1,103 @@
|
|
|
1
1
|
// Copyright LEAV Solutions 2017 until 2023/11/05, Copyright Aristid from 2023/11/06
|
|
2
2
|
// This file is released under LGPL V3
|
|
3
3
|
// License text available at https://www.gnu.org/licenses/lgpl-3.0.txt
|
|
4
|
-
import { useExplorerAttributesQuery } from '../../_gqlTypes';
|
|
4
|
+
import { useExplorerAttributesQuery, useGetViewsListQuery } from '../../_gqlTypes';
|
|
5
5
|
import { localizedTranslation } from '@leav/utils';
|
|
6
6
|
import { useLang } from '../../hooks';
|
|
7
7
|
import { useEffect, useMemo, useReducer } from 'react';
|
|
8
8
|
import { v4 as uuid } from 'uuid';
|
|
9
9
|
import { viewSettingsReducer, viewSettingsInitialState } from './manage-view-settings';
|
|
10
|
-
|
|
10
|
+
import { mapViewTypeFromLegacyToExplorer } from './_constants';
|
|
11
|
+
const _isValidFieldFilter = (filter) => !!filter.field && !!filter.condition;
|
|
12
|
+
export const useViewSettingsReducer = (library, defaultViewSettings = {}) => {
|
|
11
13
|
const { lang } = useLang();
|
|
12
14
|
const [view, dispatch] = useReducer(viewSettingsReducer, viewSettingsInitialState);
|
|
15
|
+
const { data: viewData, loading: viewsLoading, error: viewError } = useGetViewsListQuery({
|
|
16
|
+
variables: {
|
|
17
|
+
libraryId: library
|
|
18
|
+
}
|
|
19
|
+
});
|
|
20
|
+
// Take the last view from the array
|
|
21
|
+
const userView = viewData?.views?.list?.at(-1);
|
|
22
|
+
const userViewFilters = userView?.filters
|
|
23
|
+
?.filter(filter => _isValidFieldFilter(filter))
|
|
24
|
+
.map(filter => ({
|
|
25
|
+
field: filter.field,
|
|
26
|
+
value: filter.value ?? null,
|
|
27
|
+
condition: filter.condition
|
|
28
|
+
})) ?? [];
|
|
13
29
|
const attributesToHydrate = [
|
|
14
|
-
...(
|
|
15
|
-
|
|
30
|
+
...new Set([
|
|
31
|
+
...(defaultViewSettings.filters?.map(filter => filter.field) ?? []),
|
|
32
|
+
...(defaultViewSettings.sort?.map(sort => sort.field) ?? []),
|
|
33
|
+
...userViewFilters.map(filter => String(filter.field)),
|
|
34
|
+
...(userView?.sort?.map(sort => sort.field) ?? [])
|
|
35
|
+
])
|
|
16
36
|
];
|
|
17
|
-
const { data, loading, error } = useExplorerAttributesQuery({
|
|
37
|
+
const { data: attributesData, loading: attributesLoading, error: attributesError } = useExplorerAttributesQuery({
|
|
18
38
|
variables: {
|
|
19
39
|
ids: attributesToHydrate
|
|
20
40
|
},
|
|
21
|
-
skip: !attributesToHydrate.length
|
|
41
|
+
skip: viewsLoading || !attributesToHydrate.length
|
|
22
42
|
});
|
|
23
|
-
const attributesDataById = useMemo(() => (
|
|
43
|
+
const attributesDataById = useMemo(() => (attributesData?.attributes?.list ?? []).reduce((acc, attr) => {
|
|
24
44
|
acc[attr.id] = attr;
|
|
25
45
|
return acc;
|
|
26
|
-
}, {}), [
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
...
|
|
36
|
-
|
|
37
|
-
...
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
46
|
+
}, {}), [attributesData]);
|
|
47
|
+
useEffect(() => {
|
|
48
|
+
if (!attributesLoading && !viewsLoading) {
|
|
49
|
+
const hydratedSettings = {
|
|
50
|
+
...viewSettingsInitialState,
|
|
51
|
+
viewId: userView?.id,
|
|
52
|
+
viewType: userView?.display
|
|
53
|
+
? mapViewTypeFromLegacyToExplorer[userView.display.type]
|
|
54
|
+
: viewSettingsInitialState.viewType,
|
|
55
|
+
...defaultViewSettings,
|
|
56
|
+
attributesIds: [
|
|
57
|
+
...(userView?.attributes ?? []).map(attr => attr.id),
|
|
58
|
+
...(defaultViewSettings?.attributesIds ?? [])
|
|
59
|
+
],
|
|
60
|
+
sort: [...(defaultViewSettings?.sort ?? []), ...(userView?.sort ?? [])].map(s => ({
|
|
61
|
+
field: s.field,
|
|
62
|
+
order: s.order
|
|
63
|
+
})),
|
|
64
|
+
filters: [...(defaultViewSettings?.filters ?? []), ...userViewFilters].reduce((acc, filter) => {
|
|
65
|
+
if (!attributesDataById[filter.field]) {
|
|
66
|
+
console.warn(`Attribute ${filter.field} from defaultViewSettings or user view not found in database.`);
|
|
67
|
+
return acc;
|
|
68
|
+
}
|
|
69
|
+
return [
|
|
70
|
+
...acc,
|
|
71
|
+
{
|
|
72
|
+
...filter,
|
|
73
|
+
value: filter.value ?? null,
|
|
74
|
+
id: uuid(),
|
|
75
|
+
attribute: {
|
|
76
|
+
label: localizedTranslation(attributesDataById[filter.field].label, lang),
|
|
77
|
+
format: attributesDataById[filter.field].format
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
];
|
|
81
|
+
}, [])
|
|
82
|
+
};
|
|
83
|
+
dispatch({
|
|
84
|
+
type: 'RESET',
|
|
85
|
+
payload: {
|
|
86
|
+
...hydratedSettings,
|
|
87
|
+
initialViewSettings: {
|
|
88
|
+
viewType: hydratedSettings.viewType,
|
|
89
|
+
attributesIds: hydratedSettings.attributesIds,
|
|
90
|
+
sort: hydratedSettings.sort,
|
|
91
|
+
pageSize: hydratedSettings.pageSize,
|
|
92
|
+
filters: hydratedSettings.filters
|
|
42
93
|
}
|
|
43
94
|
}
|
|
44
|
-
|
|
45
|
-
}, [])
|
|
46
|
-
}), [defaultViewSettings, attributesDataById, lang]);
|
|
47
|
-
useEffect(() => {
|
|
48
|
-
if (!loading) {
|
|
49
|
-
dispatch({ type: 'RESET', payload: { ...viewSettingsInitialState, ...hydratedSettings } });
|
|
95
|
+
});
|
|
50
96
|
}
|
|
51
|
-
}, [
|
|
97
|
+
}, [attributesLoading, viewsLoading]);
|
|
52
98
|
const res = {
|
|
53
|
-
loading,
|
|
54
|
-
error,
|
|
99
|
+
loading: attributesLoading || viewsLoading,
|
|
100
|
+
error: viewError ?? attributesError,
|
|
55
101
|
view,
|
|
56
102
|
dispatch
|
|
57
103
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useViewSettingsReducer.js","sourceRoot":"","sources":["../../../src/components/Explorer/useViewSettingsReducer.ts"],"names":[],"mappings":"AAAA,oFAAoF;AACpF,sCAAsC;AACtC,sEAAsE;AACtE,OAAO,EAAC,0BAA0B,
|
|
1
|
+
{"version":3,"file":"useViewSettingsReducer.js","sourceRoot":"","sources":["../../../src/components/Explorer/useViewSettingsReducer.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ import { useSaveUserDataMutation } from '../../../_gqlTypes';
|
|
|
14
14
|
import { getRecordsFromLibraryQuery } from '../../../_queries/records/getRecordsFromLibraryQuery';
|
|
15
15
|
import { objectValueVersionToArray } from '../../../_utils';
|
|
16
16
|
import { getRequestFromFilters } from '../../../_utils/getRequestFromFilter';
|
|
17
|
-
import { getSelectedViewKey
|
|
17
|
+
import { getSelectedViewKey } from '../constants';
|
|
18
18
|
import DisplayTypeSelector from '../DisplayTypeSelector';
|
|
19
19
|
import extractAttributesFromLibrary from '../helpers/extractAttributesFromLibrary';
|
|
20
20
|
import getFieldFromKey from '../helpers/getFieldFromKey';
|
|
@@ -61,14 +61,10 @@ const LibraryItemsListContent = ({ selectionMode, library, defaultView, showTran
|
|
|
61
61
|
const { t } = useSharedTranslation();
|
|
62
62
|
const { kitNotification } = useKitNotification();
|
|
63
63
|
const defaultAttributes = extractAttributesFromLibrary(library);
|
|
64
|
-
const _getFieldsFromView = (view) =>
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
const field = getFieldFromKey(fieldKey, library, defaultAttributes, lang);
|
|
69
|
-
return field ? [...acc, field] : acc;
|
|
70
|
-
}, [])
|
|
71
|
-
: [];
|
|
64
|
+
const _getFieldsFromView = (view) => (view.attributes ?? []).reduce((acc, fieldKey) => {
|
|
65
|
+
const field = getFieldFromKey(fieldKey, library, defaultAttributes, lang);
|
|
66
|
+
return field ? [...acc, field] : acc;
|
|
67
|
+
}, []);
|
|
72
68
|
const [searchState, searchDispatch] = useReducer(searchReducer, {
|
|
73
69
|
...initialSearchState,
|
|
74
70
|
library,
|
|
@@ -116,7 +112,7 @@ const LibraryItemsListContent = ({ selectionMode, library, defaultView, showTran
|
|
|
116
112
|
limit: searchState.pagination,
|
|
117
113
|
offset: searchState.offset,
|
|
118
114
|
filters: getRequestFromFilters(searchState.filters),
|
|
119
|
-
sort: searchState.sort,
|
|
115
|
+
sort: searchState.sort?.[0] ?? null,
|
|
120
116
|
fullText: searchState.fullText,
|
|
121
117
|
version: _getVersionForRequest()
|
|
122
118
|
}), []);
|
|
@@ -133,7 +129,7 @@ const LibraryItemsListContent = ({ selectionMode, library, defaultView, showTran
|
|
|
133
129
|
limit: searchState.pagination,
|
|
134
130
|
offset: searchState.offset,
|
|
135
131
|
filters: queryFilters,
|
|
136
|
-
sort: searchState.sort,
|
|
132
|
+
sort: searchState.sort?.[0] ?? null,
|
|
137
133
|
fullText: searchState.fullText,
|
|
138
134
|
version: _getVersionForRequest()
|
|
139
135
|
};
|
package/dist/components/LibraryItemsList/LibraryItemsListContent/LibraryItemsListContent.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LibraryItemsListContent.js","sourceRoot":"","sources":["../../../../src/components/LibraryItemsList/LibraryItemsListContent/LibraryItemsListContent.tsx"],"names":[],"mappings":";AAAA,oFAAoF;AACpF,sCAAsC;AACtC,sEAAsE;AACtE,OAAO,EAAoB,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAoB,SAAS,EAAE,OAAO,EAAE,UAAU,EAAC,MAAM,OAAO,CAAC;AACxE,OAAO,MAAmB,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAC,OAAO,EAAC,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAC,aAAa,EAAC,MAAM,sEAAsE,CAAC;AACnG,OAAO,aAAa,EAAE,EAClB,kBAAkB,EAClB,iBAAiB,EACpB,MAAM,sEAAsE,CAAC;AAE9E,OAAO,EAAC,+BAA+B,EAAE,OAAO,EAAC,MAAM,WAAW,CAAC;AACnE,OAAO,EAAoC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAE/E,OAAO,EAAC,uBAAuB,EAAC,MAAM,eAAe,CAAC;AAEtD,OAAO,EACH,0BAA0B,EAG7B,MAAM,iDAAiD,CAAC;AACzD,OAAO,EAAC,yBAAyB,EAAC,MAAM,YAAY,CAAC;AACrD,OAAO,EAAC,qBAAqB,EAAC,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAC,kBAAkB,
|
|
1
|
+
{"version":3,"file":"LibraryItemsListContent.js","sourceRoot":"","sources":["../../../../src/components/LibraryItemsList/LibraryItemsListContent/LibraryItemsListContent.tsx"],"names":[],"mappings":"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"}
|
|
@@ -76,10 +76,12 @@ const Header = ({ id, children, type }) => {
|
|
|
76
76
|
const newSortField = getSortFieldByAttributeType(attId, attType);
|
|
77
77
|
searchDispatch({
|
|
78
78
|
type: SearchActionTypes.SET_SORT,
|
|
79
|
-
sort:
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
79
|
+
sort: [
|
|
80
|
+
{
|
|
81
|
+
field: newSortField,
|
|
82
|
+
order
|
|
83
|
+
}
|
|
84
|
+
]
|
|
83
85
|
});
|
|
84
86
|
searchDispatch({ type: SearchActionTypes.SET_LOADING, loading: true });
|
|
85
87
|
};
|
|
@@ -134,7 +136,7 @@ const Header = ({ id, children, type }) => {
|
|
|
134
136
|
label: t('items_list.table.header-cell-menu.choose-columns')
|
|
135
137
|
}
|
|
136
138
|
]
|
|
137
|
-
}, children: _jsx(DropdownContent, { children: _jsxs(WrapperArrow, { className: "wrapper-arrow", "data-testid": `wrapper-arrow-${searchState.sort?.order}`, "$filterDirection": searchState.sort?.order, "$filterActive": searchState.sort?.field === id, style: { fontSize: '130%' }, children: [_jsx(CaretUpOutlined, {}), _jsx(CaretDownOutlined, {})] }) }) }), openChangeColumns && (_jsx(ChooseTableColumns, { visible: openChangeColumns, onClose: _handleCloseChooseTableColumns }))] }));
|
|
139
|
+
}, children: _jsx(DropdownContent, { children: _jsxs(WrapperArrow, { className: "wrapper-arrow", "data-testid": `wrapper-arrow-${searchState.sort?.[0]?.order}`, "$filterDirection": searchState.sort?.[0]?.order, "$filterActive": searchState.sort?.[0]?.field === id, style: { fontSize: '130%' }, children: [_jsx(CaretUpOutlined, {}), _jsx(CaretDownOutlined, {})] }) }) }), openChangeColumns && (_jsx(ChooseTableColumns, { visible: openChangeColumns, onClose: _handleCloseChooseTableColumns }))] }));
|
|
138
140
|
};
|
|
139
141
|
export default Header;
|
|
140
142
|
//# sourceMappingURL=Header.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Header.js","sourceRoot":"","sources":["../../../../../src/components/LibraryItemsList/LibraryItemsListTable/Header/Header.tsx"],"names":[],"mappings":";AAAA,oFAAoF;AACpF,sCAAsC;AACtC,sEAAsE;AACtE,OAAO,EAAC,iBAAiB,
|
|
1
|
+
{"version":3,"file":"Header.js","sourceRoot":"","sources":["../../../../../src/components/LibraryItemsList/LibraryItemsListTable/Header/Header.tsx"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ import { VscLayers } from 'react-icons/vsc';
|
|
|
10
10
|
import styled from 'styled-components';
|
|
11
11
|
import useSearchReducer from '../../../components/LibraryItemsList/hooks/useSearchReducer';
|
|
12
12
|
import { SearchActionTypes } from '../../../components/LibraryItemsList/hooks/useSearchReducer/searchReducer';
|
|
13
|
-
import
|
|
13
|
+
import useExecuteSaveViewMutation from '../../../hooks/useExecuteSaveViewMutation/useExecuteSaveViewMutation';
|
|
14
14
|
import useLang from '../../../hooks/useLang';
|
|
15
15
|
import { useSharedTranslation } from '../../../hooks/useSharedTranslation';
|
|
16
16
|
import { SidebarContentType } from '../../../types/search';
|
|
@@ -19,7 +19,7 @@ import { prepareView } from '../../../_utils';
|
|
|
19
19
|
import { getRequestFromFilters } from '../../../_utils/getRequestFromFilter';
|
|
20
20
|
import { PREFIX_USER_VIEWS_ORDER_KEY } from '../../../constants';
|
|
21
21
|
import { useUser } from '../../../hooks/useUser/useUser';
|
|
22
|
-
import { defaultView
|
|
22
|
+
import { defaultView } from '../constants';
|
|
23
23
|
import FiltersDropdown from '../FiltersDropdown';
|
|
24
24
|
import useUpdateViewsOrderMutation from '../hooks/useUpdateViewsOrderMutation';
|
|
25
25
|
import IconViewType from '../IconViewType';
|
|
@@ -40,7 +40,7 @@ function MenuView({ library }) {
|
|
|
40
40
|
const { lang, defaultLang } = useLang();
|
|
41
41
|
const { state: searchState, dispatch: searchDispatch } = useSearchReducer();
|
|
42
42
|
const { userData } = useUser();
|
|
43
|
-
const { addView } =
|
|
43
|
+
const { saveView: addView } = useExecuteSaveViewMutation();
|
|
44
44
|
const { updateViewsOrder } = useUpdateViewsOrderMutation(library.id);
|
|
45
45
|
const _toggleShowView = () => {
|
|
46
46
|
const visible = !searchState.sideBar.visible || searchState.sideBar.type !== SidebarContentType.view;
|
|
@@ -89,12 +89,7 @@ function MenuView({ library }) {
|
|
|
89
89
|
}))
|
|
90
90
|
.filter(v => v.treeId !== null && v.treeNode !== null)
|
|
91
91
|
: null,
|
|
92
|
-
|
|
93
|
-
{
|
|
94
|
-
name: viewSettingsField,
|
|
95
|
-
value: searchState.display.type === ViewTypes.list ? searchState.fields.map(f => f.key) : []
|
|
96
|
-
}
|
|
97
|
-
]
|
|
92
|
+
attributes: searchState.fields?.map(f => f.key) ?? []
|
|
98
93
|
});
|
|
99
94
|
const _saveView = async () => {
|
|
100
95
|
if (searchState.view.current.id !== defaultView.id) {
|