Merge pull request #1172 from culturecreates/develop

Develop
culturecreates · Jun 20, 2024 · 5e55d5b · 5e55d5b
2 parents 91eb7a3 + 0a5d44b
commit 5e55d5b
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 23 deletions.
diff --git a/src/pages/Dashboard/Events/Events.jsx b/src/pages/Dashboard/Events/Events.jsx
@@ -1058,7 +1058,7 @@ function Events() {
         <Row className="events-content">
           <Col flex="832px">
             {isFetching && (
-              <div style={{ height: '400px', display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
+              <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
                 <LoadingIndicator />
               </div>
             )}

diff --git a/src/pages/Dashboard/Organizations/Organizations.jsx b/src/pages/Dashboard/Organizations/Organizations.jsx
@@ -488,7 +488,7 @@ function Organizations() {
                   <NoContent style={{ height: '200px' }} data-cy="empty-organization" />
                 )
               ) : (
-                <div style={{ height: '400px', display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
+                <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
                   <LoadingIndicator data-cy="organizations-listing-loader" />
                 </div>
               )}

diff --git a/src/pages/Dashboard/People/People.jsx b/src/pages/Dashboard/People/People.jsx
@@ -496,7 +496,7 @@ function People() {
                   <NoContent style={{ height: '200px' }} />
                 )
               ) : (
-                <div style={{ height: '400px', display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
+                <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
                   <LoadingIndicator data-cy="loading-indicator-people" />
                 </div>
               )}

diff --git a/src/pages/Dashboard/Places/Places.jsx b/src/pages/Dashboard/Places/Places.jsx
@@ -508,7 +508,7 @@ function Places() {
                   <NoContent style={{ height: '200px' }} />
                 )
               ) : (
-                <div style={{ height: '400px', display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
+                <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
                   <LoadingIndicator data-cy="loading-indicator-place" />
                 </div>
               )}

diff --git a/src/pages/Dashboard/Settings/UserManagement/UserManagement.jsx b/src/pages/Dashboard/Settings/UserManagement/UserManagement.jsx
@@ -38,9 +38,9 @@ const UserManagement = () => {
   const { useBreakpoint } = Grid;
   const [
     // eslint-disable-next-line no-unused-vars
-    currentCalendarData,
-    pageNumber,
-    setPageNumber, // eslint-disable-next-line no-unused-vars
+    currentCalendarData, // eslint-disable-next-line no-unused-vars
+    _pageNumber, // eslint-disable-next-line no-unused-vars
+    _setPageNumber, // eslint-disable-next-line no-unused-vars
     _getCalendar,
     // eslint-disable-next-line no-unused-vars
     setContentBackgroundColor,
@@ -78,6 +78,10 @@ const UserManagement = () => {
   const [userSearchQuery, setUserSearchQuery] = useState(decodeURIComponent(defaultQuery));
   const [selectedItemId, setSelectedItemId] = useState(null);
 
+  const [pageNumber, setPageNumber] = useState(
+    searchParams.get('page') ? searchParams.get('page') : sessionStorage.getItem('usersPage') ?? 1,
+  );
+
   const [getAllUsers, { currentData: userData, isFetching: isUsersLoading }] = useLazyGetAllUsersQuery();
   const [inviteUserMutation] = useInviteUserMutation();
   const [deleteUser] = useDeleteUserMutation();
@@ -109,7 +113,7 @@ const UserManagement = () => {
       ...(userSearchQuery !== '' && { query: userSearchQuery }),
     };
     setSearchParams(createSearchParams(params));
-    sessionStorage.setItem('page', pageNumber);
+    sessionStorage.setItem('usersPage', pageNumber);
     sessionStorage.setItem('queryUserListing', userSearchQuery);
     sessionStorage.setItem('orderUserListing', filter?.order);
     sessionStorage.setItem('sortByUserListing', filter?.sort);
@@ -156,8 +160,8 @@ const UserManagement = () => {
     });
     setUserSearchQuery('');
     setPageNumber(1);
-    sessionStorage.removeItem('page');
-    sessionStorage.removeItem('query');
+    sessionStorage.removeItem('usersPage');
+    sessionStorage.removeItem('queryUserListing');
     sessionStorage.removeItem('orderUserListing');
     sessionStorage.removeItem('sortByUserListing');
     sessionStorage.removeItem('userStatusUserListing');
@@ -655,8 +659,7 @@ const UserManagement = () => {
           </Row>
         </Col>
       ) : (
-        <div
-          style={{ height: '400px', width: '100%', display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
+        <div style={{ width: '50%', display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
           <LoadingIndicator data-cy="loading-indicator-user" />
         </div>
       )}

diff --git a/src/pages/Dashboard/Taxonomy/Taxonomy.jsx b/src/pages/Dashboard/Taxonomy/Taxonomy.jsx
@@ -82,7 +82,10 @@ const Taxonomy = () => {
     query: decodeURIComponent(defaultQuery),
     class: decodeURIComponent(defaultClass)?.split(','),
   });
-  const [pageNumber, setPageNumber] = useState(1);
+
+  const [pageNumber, setPageNumber] = useState(
+    searchParams.get('page') ? searchParams.get('page') : sessionStorage.getItem('pageTaxonomy') ?? 1,
+  );
 
   const handleListCardStyles = () => {
     const listCardStyles = !adminCheckHandler({ calendar, user })
@@ -167,7 +170,7 @@ const Taxonomy = () => {
       query: '',
     });
     setPageNumber(1);
-    sessionStorage.removeItem('page');
+    sessionStorage.removeItem('pageTaxonomy');
     sessionStorage.removeItem('queryTaxonomy');
     sessionStorage.removeItem('orderUserListing');
     sessionStorage.removeItem('orderTaxonomy');
@@ -474,8 +477,7 @@ const Taxonomy = () => {
             </Row>
           </Col>
         ) : (
-          <div
-            style={{ height: '400px', width: '100%', display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
+          <div style={{ width: '50%', display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
             <LoadingIndicator data-cy="loading-indicator-taxonomy-list" />
           </div>
         )}

diff --git a/src/redux/store.js b/src/redux/store.js
@@ -24,6 +24,20 @@ import languageLiteralReducer from './reducer/languageLiteralSlice';
 const persistConfig = {
   key: 'root',
   storage,
+  whitelist: ['user', 'interfaceLanguage', 'selectedCalendar', 'errors', 'languageLiteral'],
+  blacklist: [
+    'eventsApi',
+    'calendarApi',
+    'taxonomyApi',
+    'imageApi',
+    'placesApi',
+    'entitiesApi',
+    'inviteApi',
+    'organizationApi',
+    'peopleApi',
+    'postalAddressApi',
+    'externalSourceApi',
+  ],
 };
 const middlewares = [
   loginApi.middleware,

diff --git a/src/utils/services.js b/src/utils/services.js
@@ -27,13 +27,7 @@ export const baseQueryWithReauth = async (args, api, extraOptions) => {
   if (result.error && result.error.status === 400) {
     //HTTP 400 Bad Request
     //The server cannot or will not process the request due to something that is perceived to be a client error.
-    api.dispatch(
-      setErrorStates({
-        errorCode: '400',
-        isError: true,
-        message: result.error?.data?.error,
-      }),
-    );
+
     notification.info({
       key: '400',
       message: <Translation>{(t) => t('common.server.status.400.message')}</Translation>,