PATCH debugger

enable i81n for catalog list

multilang layers

refact title i18n and add test

Author: stefanocudini

geonode_mapstore_client/apps.py

@@ -119,6 +119,7 @@ def run_setup_hooks(*args, **kwargs):
     settings.REST_API_PRESETS["catalog_list"] = {
         "exclude[]": ["*"],
         "include[]": [
+            "include_i18n",
             "advertised",
             "detail_url",
             "is_approved",

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

@@ -566,7 +566,7 @@ export const getResourceTypes = () => {
 };
 
 export const getDatasetByName = name => {
-    const url = getEndpointUrl(DATASETS, `/?filter{alternate}=${name}`);
+    const url = getEndpointUrl(DATASETS, `/?filter{alternate}=${name}&include_i18n=true`);
     return axios.get(url, {
         params: {
             exclude: ['*'],

geonode_mapstore_client/client/js/epics/__tests__/gnsave-test.js

@@ -257,6 +257,26 @@ describe('gnsave epics', () => {
         {layers: {flat: [{name: "testLayer", id: "test_id", perms: ['download_resourcebase']}], selected: ["test_id"]}});
     });
 
+    it('test gnSetDatasetsPermissions trigger updateNode for ADD_LAYER and set title in multilanguage', (done) => {
+        mockAxios.onGet().reply(() => [200,
+            {datasets: [{title: 'testLayer Default', title_en: 'testLayer EN', title_it: 'testLayerIT'}]}]);
+        const NUM_ACTIONS = 1;
+        testEpic(gnSetDatasetsPermissions, NUM_ACTIONS, addLayer({name: "testLayer", pk: "1", extendedParams: {pk: "1"}}), (actions) => {
+            try {
+                expect(actions.map(({type}) => type)).toEqual(["UPDATE_NODE"]);
+                expect(actions[0].options.title).toEqual({
+                    default: 'testLayer Default',
+                    'en-US': 'testLayer EN',
+                    'it-IT': 'testLayerIT'
+                });
+                done();
+            } catch (error) {
+                done(error);
+            }
+        },
+        {layers: {flat: [{name: "testLayer", id: "test_id", perms: ['download_resourcebase']}], selected: ["test_id"]}});
+    });
+
     it('should trigger saveResource (gnSaveDirectContent)', (done) => {
         const NUM_ACTIONS = 3;
         const pk = 1;

geonode_mapstore_client/client/js/epics/index.js

@@ -28,9 +28,23 @@ import { UPDATE_RESOURCES } from "@mapstore/framework/plugins/ResourcesCatalog/a
 import { startAsyncProcess, STOP_ASYNC_PROCESS } from "@js/actions/resourceservice";
 import { error as errorNotification } from "@mapstore/framework/actions/notifications";
 import { getProcessErrorInfo } from "@js/utils/ErrorUtils";
+import axios from '@mapstore/framework/libs/ajax';
+import { getSupportedLocales } from '@mapstore/framework/utils/LocaleUtils';
 
 // We need to include missing epics. The plugins that normally include this epic is not used.
 
+function localeCodeToBCP47(iso2) {
+    const supportedLocales = getSupportedLocales();
+    supportedLocales['hy'] = {
+        code: 'hy-AM',
+        description: 'Armenian'
+    };
+    supportedLocales['ru'] = {
+        code: 'ru-RU',
+        description: 'Russian'
+    };
+    return supportedLocales[iso2] ? supportedLocales[iso2].code : iso2;
+}
 /**
 * @module epics/index
 */
@@ -97,7 +111,7 @@ export const gnFetchMissingLayerData = (action$, { getState } = {}) =>
 
 /**
  * Checks the permissions for layers when a map is loaded and when a new layer is added
- * to a map
+ * to a map and update layer in multi-language support for layer title in TOC
  */
 export const gnSetDatasetsPermissions = (actions$, { getState = () => {}} = {}) =>
     actions$.ofType(MAP_CONFIG_LOADED, ADD_LAYER)
@@ -122,11 +136,27 @@ export const gnSetDatasetsPermissions = (actions$, { getState = () => {}} = {})
             // skip layers of non-geonode origin
             if (!action.layer?.extendedParams?.pk) return Rx.Observable.empty();
 
-            return Rx.Observable.defer(() => getDatasetByName(action.layer?.name))
-                .switchMap((layer = {}) => {
-                    const layerId = layersSelector(getState())?.find((la) => la.name === layer.alternate)?.id;
-                    return Rx.Observable.of(updateNode(layerId, 'layer', {perms: layer.perms}));
-                });
+            if (action.type === ADD_LAYER) {
+
+                return Rx.Observable.defer(() => getDatasetByName(action.layer?.name))
+                    .switchMap((layer = {}) => {
+                        const layerId = layersSelector(getState())?.find((la) => la.name === layer.alternate)?.id;
+                        const layerPk = layer?.pk;
+
+                        /*
+                         * Multilang support for only layer title in TOC
+                         */
+                        const title = Object.keys(layer)
+                            .filter(key => key.startsWith('title_'))
+                            .reduce((acc, key) => {
+                                const code = localeCodeToBCP47(key.replace('title_', ''));
+                                acc[code] = layer[key];
+                                return acc;
+                            }, {default: layer.title}) || layer.title;
+                        
+                        return Rx.Observable.of(updateNode(layerId, 'layer', {perms: layer.perms, title}));
+                    });
+            }
         });
 
 export const updateMapLayoutEpic = msUpdateMapLayoutEpic;

geonode_mapstore_client/client/js/utils/AppUtils.js

@@ -321,14 +321,16 @@ export function setupConfiguration({
             settings: localConfig.geoNodeSettings,
             MapStoreAPI: window.MapStoreAPI,
             onStoreInit: (store) => {
-                store.addActionListener((action) => {
-                    const act = action.type === 'PERFORM_ACTION' && action.action || action; // Needed to works also in debug
-                    (actionListeners[act.type] || [])
-                        .concat(actionListeners['*'] || [])
-                        .forEach((listener) => {
-                            listener.call(null, act);
-                        });
-                });
+                if (store.addActionListener) {
+                    store.addActionListener((action) => {
+                        const act = action.type === 'PERFORM_ACTION' && action.action || action; // Needed to works also in debug
+                        (actionListeners[act.type] || [])
+                            .concat(actionListeners['*'] || [])
+                            .forEach((listener) => {
+                                listener.call(null, act);
+                            });
+                    });
+                }
             },
             configEpics: {
                 gnMapStoreApiEpic: actionTrigger.epic