Removing a favorite doesn't update the favorites list and the resourc…

…e cannot be set as favorite again (#496) * fix FavoriteList * update UI with state value * change error chach * fix lint * set favorite with api callback * rm undefined in loading status
GeoNode · Sep 10, 2021 · 6808ba2 · 6808ba2
1 parent ad675a5
commit 6808ba2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/geonode_mapstore_client/client/js/components/ContentsEditable/TextEditable.jsx b/geonode_mapstore_client/client/js/components/ContentsEditable/TextEditable.jsx
@@ -10,7 +10,7 @@ import ContentEditable from 'react-contenteditable';
 
 
 const TextEditable = forwardRef(({
-    text,
+    text = "",
     className = "gn-text-editable",
     tagName,
     disabled,

diff --git a/geonode_mapstore_client/client/js/epics/favorite.js b/geonode_mapstore_client/client/js/epics/favorite.js
@@ -23,34 +23,32 @@ export const gnSaveFavoriteContent = (action$, store) =>
     action$.ofType(SET_FAVORITE_RESOURCE)
         .switchMap((action) => {
             const state = store.getState();
-            const pk = state?.gnresource?.data.pk;
-            const isFavoriteList = (state?.gnsearch?.params?.f === 'favorite') ? true : false;
+            const pk = state?.gnresource?.data?.pk;
+            const isFavoriteList = (state?.gnsearch?.params?.f?.includes('favorite')) ? true : false;
             const resource =  state?.gnresource?.data;
             const favorite =  action.favorite;
             const resources = store.getState().gnsearch?.resources || [];
+            const newResources = isFavoriteList ? ((resources.some(item => item.pk === resource.pk)) ?
+                resources.filter((item) => item.pk !== resource.pk)
+                : [...resources, resource]) : resources;
+
+
             return Observable
                 .defer(() => setFavoriteResource(pk, favorite))
                 .switchMap(() => {
-                    const newResources = (resources.some(item => item.pk === resource.pk)) ?
-                        resources.filter((item) => item.pk !== resource.pk)
-                        : [...resources, resource];
-
                     return Observable.of(
                         updateResourceProperties({
                             'favorite': favorite
                         }),
-                        isFavoriteList && updateResources(newResources, true)
-
+                        updateResources(newResources, true)
                     );
-
                 })
                 .catch((error) => {
                     return Observable.of(resourceError(error.data || error.message));
                 });
 
         });
 
-
 export default {
     gnSaveFavoriteContent
 };