Update the functionality for the multi-tabbed dashboard view (#2223)

Author: subashtiwari1010

geonode_mapstore_client/client/MapStore2

@@ -113,7 +113,10 @@ import {
     success as successNotification,
     warning as warningNotification
 } from '@mapstore/framework/actions/notifications';
-import { convertDependenciesMappingForCompatibility } from '@mapstore/framework/utils/WidgetsUtils';
+import {
+    convertDependenciesMappingForCompatibility,
+    updateDependenciesForMultiViewCompatibility
+} from '@mapstore/framework/utils/WidgetsUtils';
 import {
     setResource as setContextCreatorResource,
     enableMandatoryPlugins,
@@ -358,7 +361,9 @@ const resourceTypes = {
                                 lastUpdate: resource.last_updated,
                                 name: resource.title
                             },
-                            options.data ? convertDependenciesMappingForCompatibility(options.data) : convertDependenciesMappingForCompatibility(resource.data)
+                            options.data
+                                ? updateDependenciesForMultiViewCompatibility(convertDependenciesMappingForCompatibility(options.data))
+                                : updateDependenciesForMultiViewCompatibility(convertDependenciesMappingForCompatibility(resource.data))
                         ),
                         setResource(resource),
                         setResourceId(pk)
@@ -374,7 +379,7 @@ const resourceTypes = {
                             canDelete: true,
                             canEdit: true
                         },
-                        convertDependenciesMappingForCompatibility(options.data)
+                        updateDependenciesForMultiViewCompatibility(convertDependenciesMappingForCompatibility(options.data))
                     )
                 ] : []),
                 dashboardLoading(false)

geonode_mapstore_client/client/js/epics/gnresource.js

@@ -8,31 +8,36 @@
 
 import { Observable } from 'rxjs';
 import { addApi, setApi } from '@mapstore/framework/api/persistence';
-import { getMaps, getMapByPk, getResources as gnGetResources } from '@js/api/geonode/v2';
+import { getMaps, getMapByPk, getGeoAppByPk, getResources as gnGetResources } from '@js/api/geonode/v2';
 import { getFacetItems } from '@js/api/geonode/v2/facets';
-import { parseCatalogResource } from '@js/utils/ResourceUtils';
+import { parseCatalogResource, ResourceTypes } from '@js/utils/ResourceUtils';
 import { getCustomMenuFilters } from '@js/selectors/config';
 
-const getResource = (pk) => {
-    return Observable.defer(() => {
-        return getMapByPk(pk)
-            .then((resource) => {
-                return {
-                    ...resource,
-                    data: {
-                        ...resource?.data,
-                        map: {
-                            ...resource?.data?.map,
-                            extraParams: {
-                                ...resource?.data?.map?.extraParams,
-                                // add the original pk to keep track in future synchronizations
-                                pk: resource?.pk
+const getResource = (pk, category) => {
+    return Observable.defer(() =>
+        category === ResourceTypes.DASHBOARD
+            ? getGeoAppByPk(pk)
+                .then((resource) => {
+                    return resource;
+                })
+            : getMapByPk(pk)
+                .then((resource) => {
+                    return {
+                        ...resource,
+                        data: {
+                            ...resource?.data,
+                            map: {
+                                ...resource?.data?.map,
+                                extraParams: {
+                                    ...resource?.data?.map?.extraParams,
+                                    // add the original pk to keep track in future synchronizations
+                                    pk: resource?.pk
+                                }
                             }
                         }
-                    }
-                };
-            });
-    });
+                    };
+                })
+    );
 };
 
 const getResources = ({ category, options, query }) => {