[Fixes 1169] (#1175) (#1182)

GeoNode · Sep 9, 2022 · 266520f · 266520f
1 parent da24952
commit 266520f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/geonode_mapstore_client/client/js/actions/gnsearch.js b/geonode_mapstore_client/client/js/actions/gnsearch.js
@@ -15,6 +15,7 @@ export const UPDATE_RESOURCES_METADATA = 'GEONODE_SEARCH:UPDATE_RESOURCES_METADA
 export const SET_FEATURED_RESOURCES = 'GEONODE:SET_FEATURED_RESOURCES';
 export const UPDATE_FEATURED_RESOURCES = 'GEONODE_SEARCH:UPDATE_FEATURED_RESOURCES';
 export const REDUCE_TOTAL_COUNT = 'GEONODE_REDUCE_TOTAL_COUNT';
+export const INCREASE_TOTAL_COUNT = 'GEONODE_INCREASE_TOTAL_COUNT';
 
 /**
 * Actions for GeoNode resource featured items
@@ -90,6 +91,15 @@ export function reduceTotalCount() {
     };
 }
 
+/**
+ * Increase total count of resouces after deletion
+ */
+export function increaseTotalCount() {
+    return {
+        type: INCREASE_TOTAL_COUNT
+    };
+}
+
 
 export default {
     SEARCH_RESOURCES,

diff --git a/geonode_mapstore_client/client/js/epics/favorite.js b/geonode_mapstore_client/client/js/epics/favorite.js
@@ -12,7 +12,9 @@ import {
     SET_FAVORITE_RESOURCE
 } from '@js/actions/gnresource';
 import {
-    updateResources
+    updateResources,
+    reduceTotalCount,
+    increaseTotalCount
 } from '@js/actions/gnsearch';
 import {
     setFavoriteResource
@@ -40,7 +42,9 @@ export const gnSaveFavoriteContent = (action$, store) =>
                 Observable.defer(() => setFavoriteResource(pk, favorite))
                     .switchMap(() => {
                         return Observable.of(
-                            updateResources(newResources, true)
+                            updateResources(newResources, true),
+                            // if on favorites filter page, we must adjust total count appropriately
+                            ...((state?.gnsearch?.params?.f?.includes('favorite') && !action.favorite) ? [reduceTotalCount()] : [increaseTotalCount()])
                         );
                     })
                     .catch((error) => {

diff --git a/geonode_mapstore_client/client/js/reducers/gnsearch.js b/geonode_mapstore_client/client/js/reducers/gnsearch.js
@@ -14,7 +14,8 @@ import {
     LOADING_RESOURCES,
     UPDATE_RESOURCES_METADATA,
     SET_FEATURED_RESOURCES,
-    REDUCE_TOTAL_COUNT
+    REDUCE_TOTAL_COUNT,
+    INCREASE_TOTAL_COUNT
 } from '@js/actions/gnsearch';
 
 import { UPDATE_SINGLE_RESOURCE } from '@js/actions/gnresource';
@@ -104,6 +105,12 @@ function gnsearch(state = defaultState, action) {
             total: state.total - 1
         };
     }
+    case INCREASE_TOTAL_COUNT: {
+        return {
+            ...state,
+            total: state.total + 1
+        };
+    }
     default:
         return state;
     }