Merge branch 'master' of github.com:GeoNode/geonode-mapstore-client into feat_geotag_photo

Author: Anup Dahal

.github/workflows/static.yml

@@ -1,5 +1,5 @@
 # Simple workflow for deploying static content to GitHub Pages
-name: Deploy static content to Pages
+name: Deploy static master branch content to Pages
 
 on:
   # Runs on pushes targeting the default branch
@@ -21,54 +21,46 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  # Single deploy job since we're just deploying
+
   deploy:
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
     runs-on: ubuntu-latest
     steps:
+
       - name: Checkout master
         uses: actions/checkout@v4
         with:
            ref: master
 
-      ###########
-      # SET UP
-      #########
       - name: "Setting up npm"
         uses: actions/setup-node@v4
         with:
             node-version: 20
 
-      ############
-      # CACHING
-      ##########
-      - name: "Cache node modules"
-        uses: actions/cache@v4
-        env:
-          cache-name: cache-node-modules
-        with:
-          path: ~/.npm # npm cache files are stored in `~/.npm` on Linux/macOS
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-
       - name: Install build dependencies
         run: |
-          mkdir ../gh-pages
           npm install [email protected] -g
           npm install @jsdoc/[email protected] -g
 
+      - name: Restore previous github-pages artifact
+        run: |
+          wget https://geonode.org/geonode-mapstore-client/artifact.zip
+          unzip artifact.zip
+          mv gh-pages/ ../gh-pages
+
       - name: Build master documentation
         run: |
           cd ./geonode_mapstore_client/client/
           npm run docs
           cd ../../
           cp -a ./geonode_mapstore_client/static/fonts/. ./docs/fonts/
+          rm -rf ../gh-pages/master
           mv ./docs ../gh-pages/master
+          cd ../
+          zip -r artifact.zip gh-pages/
+          mv artifact.zip gh-pages/artifact.zip
 
       - name: Setup Pages
         uses: actions/configure-pages@v2
@@ -77,6 +69,7 @@ jobs:
         uses: actions/upload-pages-artifact@v3
         with:
           # Upload entire repository
+          name: github-pages
           path: '../gh-pages'
 
       - name: Deploy to GitHub Pages

CHANGELOG.md

@@ -12,7 +12,8 @@ import {
     paramsSerializer,
     getGeoNodeConfig,
     getGeoNodeLocalConfig,
-    API_PRESET
+    API_PRESET,
+    getResourcesSearchIndex
 } from '@js/utils/APIUtils';
 import merge from 'lodash/merge';
 import mergeWith from 'lodash/mergeWith';
@@ -62,7 +63,7 @@ export const getResources = ({
         ...getQueryParams({...params, f}, customFilters),
         ...(q && {
             search: q,
-            search_fields: ['title', 'abstract']
+            search_index: getResourcesSearchIndex()
         }),
         ...(sort && { sort: isArray(sort) ? sort : [ sort ]}),
         page,
@@ -102,7 +103,7 @@ export const getMaps = ({
                     ...params,
                     ...(q && {
                         search: q,
-                        search_fields: ['title', 'abstract']
+                        search_index: getResourcesSearchIndex()
                     }),
                     ...(sort && { sort: isArray(sort) ? sort : [ sort ]}),
                     page,
@@ -138,7 +139,7 @@ export const getDatasets = ({
                     'filter{metadata_only}': false,
                     ...(q && {
                         search: q,
-                        search_fields: ['title', 'abstract']
+                        search_index: getResourcesSearchIndex()
                     }),
                     ...(sort && { sort: isArray(sort) ? sort : [ sort ]}),
                     page,
@@ -211,7 +212,7 @@ export const getDocumentsByDocType = (docType = 'image', {
                     ...params,
                     ...(q && {
                         search: q,
-                        search_fields: ['title', 'abstract']
+                        search_index: getResourcesSearchIndex()
                     }),
                     ...(sort && { sort: isArray(sort) ? sort : [ sort ]}),
                     'filter{subtype}': [docType],
@@ -375,7 +376,7 @@ export const getGeoApps = ({
                     ...params,
                     ...(q && {
                         search: q,
-                        search_fields: ['title', 'abstract']
+                        search_index: getResourcesSearchIndex()
                     }),
                     ...(sort && { sort: isArray(sort) ? sort : [ sort ]}),
                     page,

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,
@@ -320,9 +323,10 @@ const resourceTypes = {
         newResourceObservable: (options) =>
             Observable.defer(() => getNewGeoStoryConfig())
                 .switchMap((gnGeoStory) => {
+                    const currentStory = options.data || {...gnGeoStory, sections: [{...gnGeoStory.sections[0], id: uuid(),
+                        contents: [{...gnGeoStory.sections[0].contents[0], id: uuid()}]}]};
                     return Observable.of(
-                        setCurrentStory(options.data || {...gnGeoStory, sections: [{...gnGeoStory.sections[0], id: uuid(),
-                            contents: [{...gnGeoStory.sections[0].contents[0], id: uuid()}]}]}),
+                        setCurrentStory({...currentStory, defaultGeoStoryConfig: {...currentStory}}),
                         setEditing(true),
                         setGeoStoryResource({
                             canEdit: true
@@ -358,7 +362,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 +380,7 @@ const resourceTypes = {
                             canDelete: true,
                             canEdit: true
                         },
-                        convertDependenciesMappingForCompatibility(options.data)
+                        updateDependenciesForMultiViewCompatibility(convertDependenciesMappingForCompatibility(options.data))
                     )
                 ] : []),
                 dashboardLoading(false)

geonode_mapstore_client/client/js/api/geonode/v2/index.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 }) => {

geonode_mapstore_client/client/js/epics/gnresource.js

@@ -43,6 +43,7 @@ import { getEndpointUrl, EXECUTION_REQUEST } from '@js/api/geonode/v2/constants'
  * @param {Object} props - The component props
  * @param {Function} props.onError - The function to handle errors
  * @param {number} props.refreshTime - The time in milliseconds to refresh the execution status
+ * @ignore
  */
 const CreateDataset = ({
     onError = () => {},

geonode_mapstore_client/client/js/observables/persistence/index.js

@@ -11,11 +11,14 @@ import React, { Suspense, lazy } from 'react';
 import { createPlugin } from "@mapstore/framework/utils/PluginsUtils";
 const CreateDataset = lazy(() => import('./containers/CreateDataset'));
 
+/**
+* @module CreateDataset
+*/
+
 /**
  * Create new datasets with custom attributes and restrictions.
  * Also supports manual attribute creation or loading from JSON schema files.
  * @name CreateDataset
- * @memberof plugins
  * @example
  * // Sample JSON schema that can be loaded:
  * {

geonode_mapstore_client/client/js/plugins/CreateDataset/containers/CreateDataset.jsx

@@ -41,6 +41,7 @@ export const DEFAULT_ATTRIBUTE = {
  * Parse a number string to a number
  * @param {string} value - The value to parse
  * @returns {number} The parsed number
+ * @ignore
  */
 export const parseNumber = (value) => {
     if (value === '') {
@@ -54,13 +55,15 @@ export const parseNumber = (value) => {
  * @param {Object} data - The data to get the attribute control id from
  * @param {string} suffix - The suffix to add to the attribute control id
  * @returns {string} The attribute control id
+ * @ignore
  */
 export const getAttributeControlId = (data, suffix) =>
     `attribute-${data?.id ?? ''}-${suffix}`;
 
 /**
  * The JSON schema for the dataset
  * @type {Object}
+ * @ignore
  */
 export const validateSchema = {
     "type": "object",
@@ -260,6 +263,7 @@ export const validateSchema = {
  * Validate attribute data including range values and unique names
  * @param {Object} data - The data to validate
  * @returns {Array} The array of errors
+ * @ignore
  */
 export const validateAttributes = (data = {}) => {
     const errors = [];
@@ -308,6 +312,7 @@ export const validateAttributes = (data = {}) => {
  * @param {string} path - The path to the error
  * @param {Array} allErrors - The array of errors
  * @returns {string} The error message
+ * @ignore
  */
 export const getErrorByPath = (path, allErrors) => {
     const error = allErrors?.find(err => err.instancePath === path);
@@ -339,6 +344,7 @@ const JSON_SCHEMA_TYPE_TO_ATTRIBUTE_TYPE = {
  * Parse JSON Schema and convert it to dataset attributes
  * @param {Object} schema - The JSON Schema object
  * @returns {Object} - Parsed result with dataset data and any errors
+ * @ignore
  */
 export const parseJSONSchema = (schema) => {
     const errors = [];

geonode_mapstore_client/client/js/plugins/CreateDataset/index.jsx

@@ -22,6 +22,7 @@ import { castArray } from 'lodash';
  * @prop {function} onSearch trigger a refresh request after changing the favorite association
  * @prop {number} delayTime delay time to complete the request
  * @prop {string} renderType define the component type (eg. menuItem)
+ * @ignore
  */
 function Favorites({
     user,