Merge pull request #1407 from culturecreates/develop

Develop
culturecreates · Oct 17, 2024 · 60dffbc · 60dffbc
2 parents 417d762 + 6024671
commit 60dffbc
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 20 deletions.
diff --git a/src/components/Sort/Sort.jsx b/src/components/Sort/Sort.jsx
@@ -2,10 +2,10 @@ import React from 'react';
 import { sortByOptionsOrgsPlacesPerson, sortOrder } from '../../constants/sortByOptions';
 import { useTranslation } from 'react-i18next';
 import { Button, Dropdown, Space } from 'antd';
-import { SortAscendingOutlined, SortDescendingOutlined, DownOutlined, CloseCircleOutlined } from '@ant-design/icons';
+import { SortAscendingOutlined, SortDescendingOutlined, DownOutlined } from '@ant-design/icons';
 
 function Sort(props) {
-  const { filter, setFilter, setPageNumber, filterClearHandler } = props;
+  const { filter, setFilter, setPageNumber } = props;
   const { t } = useTranslation();
   const onSortOrderChange = () => {
     if (filter?.order == sortOrder?.ASC)
@@ -43,6 +43,7 @@ function Sort(props) {
         menu={{
           items: sortByOptionsOrgsPlacesPerson,
           selectable: true,
+          selectedKeys: [filter?.sort],
           defaultSelectedKeys: [filter?.sort],
           onSelect: onSortSelect,
         }}
@@ -79,17 +80,6 @@ function Sort(props) {
         size={'large'}
         data-cy="button-sort-order"
       />
-      {(filter?.order === sortOrder?.DESC || filter?.sort != sortByOptionsOrgsPlacesPerson[0]?.key) && (
-        <Button
-          size="large"
-          className="filter-buttons"
-          style={{ color: '#1B3DE6' }}
-          onClick={filterClearHandler}
-          data-cy="button-filter-clear">
-          {t('dashboard.events.filter.clear')}&nbsp;
-          <CloseCircleOutlined style={{ color: '#1B3DE6', fontSize: '16px' }} />
-        </Button>
-      )}
     </div>
   );
 }

diff --git a/src/constants/sortByOptions.js b/src/constants/sortByOptions.js
@@ -9,6 +9,10 @@ export const sortByOptions = [
     label: <Translation>{(t) => t('dashboard.events.filter.sort.createdDate')}</Translation>,
     key: 'metadata.createdAt',
   },
+  {
+    label: <Translation>{(t) => t('dashboard.events.filter.sort.dateModified')}</Translation>,
+    key: 'metadata.modifiedAt',
+  },
   {
     label: <Translation>{(t) => t('dashboard.events.filter.sort.eventDate')}</Translation>,
     key: 'upcomingEventDate',
@@ -31,6 +35,11 @@ export const sortByOptionsOrgsPlacesPerson = [
     key: 'metadata.createdAt',
     ['data-cy']: 'createdDate',
   },
+  {
+    label: <Translation>{(t) => t('dashboard.events.filter.sort.dateModified')}</Translation>,
+    key: 'metadata.modifiedAt',
+    ['data-cy']: 'modifiedAt',
+  },
 ];
 
 export const sortByOptionsUsers = [
@@ -61,4 +70,8 @@ export const sortByOptionsTaxonomy = [
     label: <Translation>{(t) => t('dashboard.taxonomy.listing.sort.createdDate')}</Translation>,
     key: 'metadata.createdAt',
   },
+  {
+    label: <Translation>{(t) => t('dashboard.events.filter.sort.dateModified')}</Translation>,
+    key: 'metadata.modifiedAt',
+  },
 ];
diff --git a/src/locales/en/translationEn.json b/src/locales/en/translationEn.json
@@ -105,7 +105,8 @@
           "sortBy": "Sort by",
           "name": "Name",
           "createdDate": "Date created",
-          "eventDate": "Event date"
+          "eventDate": "Event date",
+          "dateModified": "Date modified"
         },
         "dates": {
           "dates": "Dates",

diff --git a/src/locales/fr/transalationFr.json b/src/locales/fr/transalationFr.json
@@ -105,6 +105,7 @@
           "sortBy": "Trier par",
           "name": "Nom",
           "createdDate": "Date de création",
+          "dateModified": "Date de modification",
           "eventDate": "Date d’événement"
         },
         "dates": {

diff --git a/src/pages/Dashboard/Events/Events.jsx b/src/pages/Dashboard/Events/Events.jsx
@@ -107,7 +107,7 @@ function Events() {
       : [],
     sort: searchParams.get('sortBy')
       ? searchParams.get('sortBy')
-      : sessionStorage.getItem('sortBy') ?? sortByOptions[2]?.key,
+      : sessionStorage.getItem('sortBy') ?? sortByOptions[3]?.key,
     order: searchParams.get('order') ? searchParams.get('order') : sessionStorage.getItem('order') ?? sortOrder?.ASC,
     dates:
       (searchParams.get('startDateRange') || sessionStorage.getItem('startDateRange')) &&
@@ -358,7 +358,7 @@ function Events() {
   const filterClearHandler = () => {
     setFilter({
       publication: [],
-      sort: sortByOptions[2]?.key,
+      sort: sortByOptions[3]?.key,
       order: sortOrder?.ASC,
       dates: [],
     });
@@ -1034,7 +1034,7 @@ function Events() {
                   filter?.publication?.length > 0 ||
                   filter?.dates?.length > 0 ||
                   filter?.order === sortOrder?.DESC ||
-                  filter?.sort != sortByOptions[2]?.key ||
+                  filter?.sort != sortByOptions[3]?.key ||
                   organizerFilter?.length > 0 ||
                   Object.keys(taxonomyFilter)?.length > 0 ||
                   Object.keys(standardTaxonomyFilter)?.length > 0) && (

diff --git a/src/pages/Dashboard/Organizations/Organizations.jsx b/src/pages/Dashboard/Organizations/Organizations.jsx
@@ -403,7 +403,9 @@ function Organizations() {
                     );
                 })}
               <Col>
-                {(filter?.order === sortOrder?.DESC || Object.keys(taxonomyFilter)?.length > 0) && (
+                {(filter?.order === sortOrder?.DESC ||
+                  Object.keys(taxonomyFilter)?.length > 0 ||
+                  filter?.sort != sortByOptionsOrgsPlacesPerson[0]?.key) && (
                   <Button
                     size="large"
                     className="filter-buttons"

diff --git a/src/pages/Dashboard/People/People.jsx b/src/pages/Dashboard/People/People.jsx
@@ -416,7 +416,8 @@ function People() {
               <Col>
                 {(filter?.order === sortOrder?.DESC ||
                   Object.keys(taxonomyFilter)?.length > 0 ||
-                  Object.keys(standardTaxonomyFilter)?.length > 0) && (
+                  Object.keys(standardTaxonomyFilter)?.length > 0 ||
+                  filter?.sort != sortByOptionsOrgsPlacesPerson[0]?.key) && (
                   <Button
                     size="large"
                     className="filter-buttons"

diff --git a/src/pages/Dashboard/Places/Places.jsx b/src/pages/Dashboard/Places/Places.jsx
@@ -427,7 +427,8 @@ function Places() {
               <Col>
                 {(filter?.order === sortOrder?.DESC ||
                   Object.keys(taxonomyFilter)?.length > 0 ||
-                  Object.keys(standardTaxonomyFilter)?.length > 0) && (
+                  Object.keys(standardTaxonomyFilter)?.length > 0 ||
+                  filter?.sort != sortByOptionsOrgsPlacesPerson[0]?.key) && (
                   <Button
                     size="large"
                     className="filter-buttons"