[Backport] #1710 - Update calls with catalog_list preset (#1711)

geonode_mapstore_client/apps.py

@@ -102,6 +102,153 @@ def run_setup_hooks(*args, **kwargs):
         "TIMEOUT": 300,
         "OPTIONS": {"MAX_ENTRIES": 10000},
     }
+    settings.REST_API_PRESETS["catalog_list"] = {
+        "exclude[]": ["*"],
+        "include[]": [
+            "advertised",
+            "detail_url",
+            "is_approved",
+            "is_copyable",
+            "is_published",
+            "owner",
+            "perms",
+            "pk",
+            "raw_abstract",
+            "resource_type",
+            "subtype",
+            "title",
+            "executions",
+            "thumbnail_url"
+        ],
+    }
+    settings.REST_API_PRESETS["dataset_list"] = {
+        "exclude[]": ["*"],
+        "include[]": [
+            "advertised",
+            "detail_url",
+            "owner",
+            "perms",
+            "pk",
+            "raw_abstract",
+            "resource_type",
+            "subtype",
+            "title",
+            "data",
+            "executions",
+            "thumbnail_url",
+            "alternate",
+            "links",
+            "featureinfo_custom_template",
+            "has_time",
+            "default_style",
+            "ptype",
+            "extent",
+            "is_approved",
+            "is_published"
+        ],
+    }
+    settings.REST_API_PRESETS["map_list"] = {
+        "exclude[]": ["*"],
+        "include[]": [
+            "advertised",
+            "detail_url",
+            "data",
+            "is_approved",
+            "is_copyable",
+            "is_published",
+            "owner",
+            "perms",
+            "pk",
+            "raw_abstract",
+            "resource_type",
+            "subtype",
+            "title",
+            "executions",
+            "thumbnail_url"
+        ],
+    }
+    settings.REST_API_PRESETS["document_list"] = {
+        "exclude[]": ["*"],
+        "include[]": [
+            "pk",
+            "raw_abstract",
+            "resource_type",
+            "subtype",
+            "title",
+            "data",
+            "executions",
+            "thumbnail_url",
+            "alternate",
+            "attribution",
+            "href"
+        ],
+    }
+    settings.REST_API_PRESETS["viewer_common"] = {
+        "exclude[]": ["*"],
+        "include[]": [
+            "abstract",
+            "advertised",
+            "alternate",
+            "attribution",
+            "category",
+            "created",
+            "date",
+            "date_type",
+            "detail_url",
+            "download_urls",
+            "embed_url",
+            "executions",
+            "extent",
+            "favorite",
+            "group",
+            "is_approved",
+            "is_copyable",
+            "is_published",
+            "keywords",
+            "language",
+            "last_updated",
+            "linked_resources",
+            "links",
+            "owner",
+            "perms",
+            "pk",
+            "poc",
+            "raw_abstract",
+            "regions",
+            "resource_type",
+            "sourcetype",
+            "subtype",
+            "supplemental_information",
+            "temporal_extent_end",
+            "temporal_extent_start",
+            "thumbnail_url",
+            "title",
+            "uuid"
+        ],
+    }
+    settings.REST_API_PRESETS["map_viewer"] = {
+        "include[]": [
+            "data",
+            "maplayers"
+        ]
+    }
+    settings.REST_API_PRESETS["document_viewer"] = {
+        "include[]": [
+            "href",
+            "extension"
+        ]
+    }
+    settings.REST_API_PRESETS["dataset_viewer"] = {
+        "include[]": [
+            "featureinfo_custom_template",            
+            "dataset_ows_url",
+            "default_style",
+            "ptype",
+            "store",
+            "has_time",
+            "attribute_set"
+        ]
+    }
 
 
 def connect_geoserver_style_visual_mode_signal():

geonode_mapstore_client/client/js/api/geonode/v2/index.js

@@ -12,7 +12,8 @@ import {
     getApiToken,
     paramsSerializer,
     getGeoNodeConfig,
-    getGeoNodeLocalConfig
+    getGeoNodeLocalConfig,
+    API_PRESET
 } from '@js/utils/APIUtils';
 import merge from 'lodash/merge';
 import mergeWith from 'lodash/mergeWith';
@@ -141,7 +142,7 @@ export const getResources = ({
         page,
         page_size: pageSize,
         'filter{metadata_only}': false, // exclude resources such as services
-        include: ['executions']
+        api_preset: API_PRESET.CATALOGS
     };
     return axios.get(parseDevHostname(endpoints[RESOURCES]), {
         params: _params,
@@ -178,7 +179,8 @@ export const getMaps = ({
                     }),
                     ...(sort && { sort: isArray(sort) ? sort : [ sort ]}),
                     page,
-                    page_size: pageSize
+                    page_size: pageSize,
+                    api_preset: API_PRESET.MAPS
                 },
                 paramsSerializer
             })
@@ -213,7 +215,8 @@ export const getDatasets = ({
                     }),
                     ...(sort && { sort: isArray(sort) ? sort : [ sort ]}),
                     page,
-                    page_size: pageSize
+                    page_size: pageSize,
+                    api_preset: API_PRESET.DATASETS
                 },
                 paramsSerializer
             })
@@ -249,7 +252,8 @@ export const getDocumentsByDocType = (docType = 'image', {
                     ...(sort && { sort: isArray(sort) ? sort : [ sort ]}),
                     'filter{subtype}': [docType],
                     page,
-                    page_size: pageSize
+                    page_size: pageSize,
+                    api_preset: API_PRESET.DOCUMENTS
                 },
                 paramsSerializer
             })
@@ -284,7 +288,7 @@ export const setFavoriteResource = (pk, favorite) => {
 export const getResourceByPk = (pk) => {
     return axios.get(parseDevHostname(`${endpoints[RESOURCES]}/${pk}`), {
         params: {
-            include: ['executions']
+            api_preset: API_PRESET.VIEWER_COMMON
         }
     })
         .then(({ data }) => data.resource);
@@ -321,22 +325,29 @@ export const removeLinkedResourcesByPk = (sourcePk, targetPks) => {
 export const getResourceByUuid = (uuid) => {
     return axios.get(parseDevHostname(`${endpoints[RESOURCES]}`), {
         params: {
-            'filter{uuid}': uuid
+            'filter{uuid}': uuid,
+            api_preset: API_PRESET.VIEWER_COMMON
         }
     })
         .then(({ data }) => data?.resources?.[0]);
 };
 
 export const getDatasetByPk = (pk) => {
-    return axios.get(parseDevHostname(`${endpoints[DATASETS]}/${pk}`))
+    return axios.get(parseDevHostname(`${endpoints[DATASETS]}/${pk}`), {
+        params: {
+            api_preset: [API_PRESET.VIEWER_COMMON, API_PRESET.DATASET]
+        },
+        paramsSerializer
+    })
         .then(({ data }) => data.dataset);
 };
 
 export const getDocumentByPk = (pk) => {
     return axios.get(parseDevHostname(`${endpoints[DOCUMENTS]}/${pk}`), {
         params: {
-            include: ['executions']
-        }
+            api_preset: [API_PRESET.VIEWER_COMMON, API_PRESET.DOCUMENT]
+        },
+        paramsSerializer
     })
         .then(({ data }) => data.document);
 };
@@ -346,7 +357,8 @@ export const getDocumentsByPk = (pk) => {
     return axios.get(parseDevHostname(`${endpoints[DOCUMENTS]}/`), {
         params: {
             'filter{pk.in}': pks,
-            page_size: pks.length
+            page_size: pks.length,
+            api_preset: [API_PRESET.VIEWER_COMMON, API_PRESET.DOCUMENT]
         },
         paramsSerializer
     })
@@ -362,11 +374,12 @@ export const createGeoApp = (body) => {
         .then(({ data }) => data.geoapp);
 };
 
-export const getGeoAppByPk = (pk, includes = []) => {
+export const getGeoAppByPk = (pk) => {
     return axios.get(parseDevHostname(`${endpoints[GEOAPPS]}/${pk}`), {
         params: {
             full: true,
-            include: ['data', ...includes]
+            api_preset: API_PRESET.VIEWER_COMMON,
+            include: ['data']
         }
     })
         .then(({ data }) => data.geoapp);
@@ -565,7 +578,12 @@ export const getResourceTypes = () => {
 
 export const getDatasetByName = name => {
     const url = parseDevHostname(`${endpoints[DATASETS]}/?filter{alternate}=${name}`);
-    return axios.get(url)
+    return axios.get(url, {
+        params: {
+            exclude: ['*'],
+            include: ['pk', 'perms', 'alternate']
+        }
+    })
         .then(({data}) => data?.datasets[0]);
 };
 
@@ -574,7 +592,9 @@ export const getDatasetsByName = names => {
     return axios.get(url, {
         params: {
             page_size: names.length,
-            'filter{alternate.in}': names
+            'filter{alternate.in}': names,
+            exclude: ['*'],
+            include: ['pk', 'perms', 'alternate']
         }
     })
         .then(({data}) => data?.datasets);
@@ -635,12 +655,13 @@ export const updateMap = (id, body = {}) => {
 * @param {string[]} includes property to be included in the response
 * @return {promise} it returns an object with the success map object response
 */
-export const getMapByPk = (pk, includes = []) => {
+export const getMapByPk = (pk) => {
     return axios.get(parseDevHostname(`${endpoints[MAPS]}/${pk}/`),
         {
             params: {
-                include: ['data', ...includes]
-            }
+                api_preset: [API_PRESET.VIEWER_COMMON, API_PRESET.MAP]
+            },
+            paramsSerializer
         })
         .then(({ data }) => data?.map);
 };
@@ -650,9 +671,9 @@ export const getMapsByPk = (pk) => {
     return axios.get(parseDevHostname(`${endpoints[MAPS]}/`),
         {
             params: {
-                include: ['data'],
                 'filter{pk.in}': pks,
-                page_size: pks.length
+                page_size: pks.length,
+                api_preset: API_PRESET.MAPS
             },
             paramsSerializer
         })
@@ -664,7 +685,8 @@ export const getFeaturedResources = (page = 1, page_size =  4) => {
         params: {
             page_size,
             page,
-            'filter{featured}': true
+            'filter{featured}': true,
+            api_preset: API_PRESET.CATALOGS
         }
     }).then(({data}) => data);
 };

geonode_mapstore_client/client/js/components/MediaViewer/Media.jsx

@@ -29,6 +29,7 @@ const mediaMap = {
     pdf: PdfViewer,
     gltf: Scene3DViewer,
     ifc: Scene3DViewer,
+    audio: MediaComponent,
     unsupported: UnsupportedViewer
 };
 

geonode_mapstore_client/client/js/epics/gnresource.js

@@ -204,13 +204,13 @@ const resourceTypes = {
         resourceObservable: (pk, options) =>
             Observable.defer(() =>  axios.all([
                 getNewMapConfiguration(),
-                getMapByPk(pk, ['linked_resources'])
+                getMapByPk(pk)
                     .then((_resource) => {
                         const resource = getResourceWithLinkedResources(_resource);
                         const mapViewers = get(resource, 'linkedResources.linkedTo', [])
                             .find(({ resource_type: type } = {}) => type === ResourceTypes.VIEWER);
                         return mapViewers?.pk
-                            ? axios.all([{...resource}, getGeoAppByPk(mapViewers?.pk, ['linked_resources'])])
+                            ? axios.all([{...resource}, getGeoAppByPk(mapViewers?.pk)])
                             : Promise.resolve([{...resource}]);
                     })
                     .catch(() => null)

geonode_mapstore_client/client/js/epics/index.js

@@ -62,7 +62,10 @@ export const gnSetDatasetsPermissions = (actions$, { getState = () => {}} = {})
     actions$.ofType(MAP_CONFIG_LOADED, ADD_LAYER)
         .switchMap((action) => {
             if (action.type === MAP_CONFIG_LOADED) {
-                const layerNames = action.config?.map?.layers?.filter((l) => l?.group !== "background").map((l) => l.name);
+                const layerNames = action.config?.map?.layers?.filter((l) => l?.group !== "background")?.map((l) => l.name) ?? [];
+                if (layerNames.length === 0) {
+                    return Rx.Observable.empty();
+                }
                 return Rx.Observable.defer(() => getDatasetsByName(layerNames))
                     .switchMap((layers = []) => {
                         const stateLayers = layers.map((l) => ({

geonode_mapstore_client/client/js/utils/APIUtils.js

@@ -126,6 +126,17 @@ export const paramsSerializer = (params) => {
     return queryParams;
 };
 
+export const API_PRESET = {
+    CATALOGS: 'catalog_list',
+    DATASETS: 'dataset_list',
+    DOCUMENTS: 'document_list',
+    MAPS: 'map_list',
+    VIEWER_COMMON: 'viewer_common',
+    DATASET: 'dataset_viewer',
+    DOCUMENT: 'document_viewer',
+    MAP: 'map_viewer'
+};
+
 export default {
     parseDevHostname,
     paramsSerializer