LPS-195155 Fix ordering in filters and sorts

liferay-frontend · Sep 6, 2023 · bf68a99 · bf68a99
1 parent d116492
commit bf68a99
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 17 deletions.
diff --git a/...frontend-data-set-views-web/src/main/resources/META-INF/resources/js/fds_view/Filters.tsx b/...frontend-data-set-views-web/src/main/resources/META-INF/resources/js/fds_view/Filters.tsx
@@ -652,11 +652,9 @@ function Filters({fdsView, fdsViewsURL, namespace}: IProps) {
 
  let notOrdered: FilterCollection = [];
 
- if (filtersOrdered.length > order.length) {
- notOrdered = filtersOrdered.filter(
- (filter) => !order.includes(String(filter.id))
- );
- }
+ notOrdered = filtersOrdered.filter(
+ (filter) => !order.includes(String(filter.id))
+ );
 
  filtersOrdered = fdsView.fdsFiltersOrder
  .split(',')
@@ -667,7 +665,7 @@ function Filters({fdsView, fdsViewsURL, namespace}: IProps) {
  )
  .filter(Boolean) as FilterCollection;
 
- filtersOrdered = [...filtersOrdered, ...notOrdered];
+ filtersOrdered = [...notOrdered, ...filtersOrdered];
  }
 
  setFilters(filtersOrdered);

diff --git a/...frontend-data-set-views-web/src/main/resources/META-INF/resources/js/fds_view/Sorting.tsx b/...frontend-data-set-views-web/src/main/resources/META-INF/resources/js/fds_view/Sorting.tsx
@@ -376,14 +376,12 @@ const Sorting = ({
  useEffect(() => {
  const getFDSSort = async () => {
  const response = await fetch(
- `${API_URL.FDS_VIEWS}/${fdsView.id}?nestedFields=${OBJECT_RELATIONSHIP.FDS_VIEW_FDS_SORT}`
+ `${API_URL.FDS_SORTS}?filter=(${OBJECT_RELATIONSHIP.FDS_VIEW_FDS_SORT_ID} eq '${fdsView.id}')&nestedFields=${OBJECT_RELATIONSHIP.FDS_VIEW_FDS_SORT}&sort=dateCreated:desc`
  );
 
  const responseJSON = await response.json();
 
- const storedFDSSorts = responseJSON[
- OBJECT_RELATIONSHIP.FDS_VIEW_FDS_SORT
- ] as IFDSSort[];
+ const storedFDSSorts: IFDSSort[] = responseJSON.items;
 
  let ordered = storedFDSSorts;
  let notOrdered: IFDSSort[] = [];
@@ -401,15 +399,12 @@ const Sorting = ({
  )
  .filter(Boolean) as IFDSSort[];
 
- if (storedFDSSorts.length > fdsSortsOrderArray.length) {
- notOrdered = storedFDSSorts.filter(
- (filter) =>
- !fdsSortsOrderArray.includes(String(filter.id))
- );
- }
+ notOrdered = storedFDSSorts.filter(
+ (filter) => !fdsSortsOrderArray.includes(String(filter.id))
+ );
  }
 
- setFDSSorts([...ordered, ...notOrdered]);
+ setFDSSorts([...notOrdered, ...ordered]);
 
  setLoading(false);
  };