review changes

allyoucanmap · allyoucanmap · commit dfe202280857 · 2025-09-16T10:46:18.000+02:00
diff --git a/web/client/plugins/ResourcesCatalog/DeleteResource.jsx b/web/client/plugins/ResourcesCatalog/DeleteResource.jsx
@@ -16,6 +16,7 @@ import { searchResources } from './actions/resources';
 import { getPendingChanges } from './selectors/save';
 import { push } from 'connected-react-router';
 import useIsMounted from '../../hooks/useIsMounted';
+import { userSelector } from '../../selectors/security';
 
 /**
  * Plugin to delete a resource
@@ -26,6 +27,7 @@ import useIsMounted from '../../hooks/useIsMounted';
  * @prop {string} cfg.redirectTo optional redirect path after delete completion
  */
 function DeleteResource({
+    user,
     resource,
     component,
     onRefresh,
@@ -65,7 +67,7 @@ function DeleteResource({
                 }));
         }
     }
-    if (!(resource?.id && resource?.canDelete)) {
+    if (!(user && resource?.id && resource?.canDelete)) {
         return null;
     }
     return (
@@ -101,7 +103,8 @@ const deleteResourcesConnect = connect(
             }
             const pendingChanges = getPendingChanges(state, { resourceType: 'MAP', ...props });
             return pendingChanges?.resource;
-        }
+        },
+        user: userSelector
     }),
     {
         onRefresh: searchResources.bind(null, { refresh: true }),
diff --git a/web/client/plugins/ResourcesCatalog/actions/resources.js b/web/client/plugins/ResourcesCatalog/actions/resources.js
@@ -53,7 +53,6 @@ export function loadingResources(loading, id) {
     };
 }
 
-// TODO PR
 export function unloadResources() {
     return {
         type: UNLOAD_RESOURCES
diff --git a/web/client/plugins/ResourcesCatalog/epics/__tests__/resources-test.js b/web/client/plugins/ResourcesCatalog/epics/__tests__/resources-test.js
@@ -7,21 +7,40 @@
  */
 import expect from 'expect';
 
+import { SET_SHOW_DETAILS, UNLOAD_RESOURCES } from '../../actions/resources';
 
-import { UNLOAD_RESOURCES } from '../../actions/resources';
-import { LOGOUT } from '../../../../actions/security';
-
-import {unloadCatalogResourcesOnLogout} from '../resources';
+import { unloadCatalogResourcesOnAuthentication } from '../resources';
 
 import { testEpic } from '../../../../epics/__tests__/epicTestUtils';
+import { loginSuccess, logout } from '../../../../actions/security';
 
 describe('resources Epics', () => {
-    it('unloadResources epic', (done) => {
-        const action = { type: LOGOUT };
-        testEpic(unloadCatalogResourcesOnLogout, 1, action, ([update]) => {
-            expect(update).toExist();
-            expect(update.type).toBe(UNLOAD_RESOURCES);
-            done();
+    it('unloadResources on logout epic', (done) => {
+        testEpic(unloadCatalogResourcesOnAuthentication, 2, logout(), ([showDetailsAction, unloadResourcesAction]) => {
+            try {
+                expect(showDetailsAction).toBeTruthy();
+                expect(showDetailsAction.type).toBe(SET_SHOW_DETAILS);
+                expect(showDetailsAction.show).toBe(false);
+                expect(unloadResourcesAction).toBeTruthy();
+                expect(unloadResourcesAction.type).toBe(UNLOAD_RESOURCES);
+                done();
+            } catch (e) {
+                done(e);
+            }
+        }, {});
+    });
+    it('unloadResources on login success epic', (done) => {
+        testEpic(unloadCatalogResourcesOnAuthentication, 2, loginSuccess(), ([showDetailsAction, unloadResourcesAction]) => {
+            try {
+                expect(showDetailsAction).toBeTruthy();
+                expect(showDetailsAction.type).toBe(SET_SHOW_DETAILS);
+                expect(showDetailsAction.show).toBe(false);
+                expect(unloadResourcesAction).toBeTruthy();
+                expect(unloadResourcesAction.type).toBe(UNLOAD_RESOURCES);
+                done();
+            } catch (e) {
+                done(e);
+            }
         }, {});
     });
 });
diff --git a/web/client/plugins/ResourcesCatalog/epics/resources.js b/web/client/plugins/ResourcesCatalog/epics/resources.js
@@ -1,22 +1,23 @@
 /*
- * Copyright 2017, GeoSolutions Sas.
+ * Copyright 2025, GeoSolutions Sas.
  * All rights reserved.
  *
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree.
  */
 import Rx from 'rxjs';
 
-import { LOGOUT } from '../../../actions/security';
+import { LOGOUT, LOGIN_SUCCESS } from '../../../actions/security';
 
-import { unloadResources } from '../actions/resources';
+import { setShowDetails, unloadResources } from '../actions/resources';
 
-export const unloadCatalogResourcesOnLogout = (actions$) =>
-    actions$.ofType(LOGOUT)
+export const unloadCatalogResourcesOnAuthentication = (actions$) =>
+    actions$.ofType(LOGOUT, LOGIN_SUCCESS)
         .switchMap(() => {
             return Rx.Observable.of(
+                setShowDetails(false),
                 unloadResources()
             );
         });
 
-export default { unloadCatalogResourcesOnLogout };
+export default { unloadCatalogResourcesOnAuthentication };

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,6 @@ export function loadingResources(loading, id) {`
`53`	`53`	`};`
`54`	`54`	`}`
`55`	`55`
`56`		`-// TODO PR`
`57`	`56`	`export function unloadResources() {`
`58`	`57`	`return {`
`59`	`58`	`type: UNLOAD_RESOURCES`