Fix #10626 adding possibilities for better updating store

web/client/actions/__tests__/catalog-test.js

@@ -72,7 +72,9 @@ import {
     SET_FORMAT_OPTIONS,
     setSupportedFormats, addLayerAndDescribe, ADD_LAYER_AND_DESCRIBE,
     INIT_PLUGIN,
-    initPlugin
+    initPlugin,
+    updateCatalogServices,
+    UPDATE_CATALOG_SERVICES
 } from '../catalog';
 
 import { SHOW_NOTIFICATION } from '../notifications';
@@ -254,6 +256,14 @@ describe('Test correctness of the catalog actions', () => {
         expect(retval.type).toBe(ADD_CATALOG_SERVICE);
         expect(retval.service).toBe(service);
     });
+    it('updateCatalogServices', () => {
+        const services = [{}];
+        var retval = updateCatalogServices(services);
+
+        expect(retval).toExist();
+        expect(retval.type).toBe(UPDATE_CATALOG_SERVICES);
+        expect(retval.services).toEqual(services);
+    });
     it('resetCatalog', () => {
         var retval = resetCatalog();
         expect(retval).toExist();

web/client/actions/__tests__/layers-test.js

@@ -20,6 +20,8 @@ import {
     ADD_LAYER,
     REMOVE_LAYER,
     SHOW_SETTINGS,
+    updateAllLayers,
+    UPDATE_ALL_LAYERS,
     HIDE_SETTINGS,
     UPDATE_SETTINGS,
     REFRESH_LAYERS,
@@ -240,6 +242,14 @@ describe('Test correctness of the layers actions', () => {
         expect(action.options).toEqual({opacity: 0.5});
     });
 
+    it('updateAllLayers', () => {
+        const layers = [{}];
+        const action = updateAllLayers(layers);
+        expect(action).toExist();
+        expect(action.type).toBe(UPDATE_ALL_LAYERS);
+        expect(action.layers).toEqual(layers);
+    });
+
     it('hide settings', () => {
         const action = hideSettings();
         expect(action).toExist();

web/client/actions/catalog.js

@@ -38,6 +38,7 @@ export const CHANGE_SERVICE_FORMAT = 'CATALOG:CHANGE_SERVICE_FORMAT';
 export const FOCUS_SERVICES_LIST = 'CATALOG:FOCUS_SERVICES_LIST';
 export const CHANGE_URL = 'CATALOG:CHANGE_URL';
 export const ADD_CATALOG_SERVICE = 'CATALOG:ADD_CATALOG_SERVICE';
+export const UPDATE_CATALOG_SERVICES = 'CATALOG:UPDATE_CATALOG_SERVICES';
 export const DELETE_CATALOG_SERVICE = 'CATALOG:DELETE_CATALOG_SERVICE';
 export const ADD_SERVICE = 'CATALOG:ADD_SERVICE';
 export const DELETE_SERVICE = 'CATALOG:DELETE_SERVICE';
@@ -184,6 +185,17 @@ export function addCatalogService(service) {
         service
     };
 }
+/**
+ *
+ * @param {object[]} services list of services to full replace catalog ones
+ * @returns
+ */
+export function updateCatalogServices(services) {
+    return {
+        type: UPDATE_CATALOG_SERVICES,
+        services
+    };
+}
 export function deleteCatalogService(service) {
     return {
         type: DELETE_CATALOG_SERVICE,

web/client/actions/layers.js

@@ -36,7 +36,19 @@ export const FILTER_LAYERS = 'LAYERS:FILTER_LAYERS';
 export const SHOW_LAYER_METADATA = 'LAYERS:SHOW_LAYER_METADATA';
 export const HIDE_LAYER_METADATA = 'LAYERS:HIDE_LAYER_METADATA';
 export const UPDATE_SETTINGS_PARAMS = 'LAYERS:UPDATE_SETTINGS_PARAMS';
+export const UPDATE_ALL_LAYERS = 'LAYERS:UPDATE_ALL_LAYERS';
 
+/**
+ * full replacement of layers in layers state
+ * @param {object[]} layers the new layers to replace in the state
+ * @returns
+ */
+export function updateAllLayers(layers) {
+    return {
+        type: UPDATE_ALL_LAYERS,
+        layers
+    };
+}
 export function showSettings(node, nodeType, options) {
     return {
         type: SHOW_SETTINGS,

web/client/reducers/catalog.js

@@ -22,6 +22,7 @@ import {
     CHANGE_SERVICE_FORMAT,
     FOCUS_SERVICES_LIST,
     ADD_CATALOG_SERVICE,
+    UPDATE_CATALOG_SERVICES,
     DELETE_CATALOG_SERVICE,
     SAVING_SERVICE,
     CHANGE_METADATA_TEMPLATE,
@@ -171,6 +172,11 @@ function catalog(state = {
             layerError: null
         });
     }
+    case UPDATE_CATALOG_SERVICES: {
+        return {...state,
+            services: action.services
+        };
+    }
     case CHANGE_SELECTED_SERVICE: {
         if (action.service !== state.selectedService) {
             return assign({}, state, {

web/client/reducers/layers.js

@@ -31,7 +31,8 @@ import {
     SELECT_NODE,
     FILTER_LAYERS,
     SHOW_LAYER_METADATA,
-    HIDE_LAYER_METADATA
+    HIDE_LAYER_METADATA,
+    UPDATE_ALL_LAYERS
 } from '../actions/layers';
 
 import { TOGGLE_CONTROL } from '../actions/controls';
@@ -174,6 +175,12 @@ function layers(state = { flat: [] }, action) {
         }
         return state;
     }
+    case UPDATE_ALL_LAYERS: {
+        return {
+            ...state,
+            layers: action.layers
+        };
+    }
     case UPDATE_NODE: {
         const updatedNode = changeNodeConfiguration({
             layers: state.flat,