Merge branch 'xp-reload-debug' into 'master'

Xp reload debug

See merge request !48

www/src/components/Cards/ImportExportDropDownTools.vue.js

@@ -5,7 +5,8 @@ import Vue from "vue";
 import { mapState } from 'vuex';
 import { BaseLogger as logger } from '@cern/base-vue';
 import { assign, cloneDeep, difference, first, forEach, get, groupBy, has, indexOf,
-  intersection, isNil, keys, mapValues, merge, omit, set, toNumber, transform } from 'lodash';
+  intersection, isNil, keys, mapValues, merge, omit, set, toNumber,
+  transform } from 'lodash';
 import { ChannelParamsMap, ZSPMode } from '../../interfaces/daq';
 import { AreaListDnsMap } from '../../Consts';
 import { parseValue } from '../../interfaces';
@@ -41,9 +42,7 @@ const component = /** @type {V.Constructor<any, Refs>} */ (Vue).extend({
   },
   computed: {
     ...mapState([ 'dns' ]),
-    ...mapState('eacs', [ 'daq' ]),
-    ...mapState('eacs', [ 'daqList' ]),
-    ...mapState('eacs', [ 'cardList' ])
+    ...mapState('eacs', [ 'daq', 'daqList', 'cardList' ])
   },
   methods: {
 
@@ -54,10 +53,11 @@ const component = /** @type {V.Constructor<any, Refs>} */ (Vue).extend({
     /** @this {Instance} */
     generateJSON() {
       const dataObj = {};
-      forEach(this.daq, (daqConf, daqName) => {
+      forEach(mapValues(this.daqList, (/** @type{any} */ d) => this.daq[d.name]),
+        (daqConf, daqName) => {
         // We remove edit object used in edit mode
-        set(dataObj, daqName, omit(daqConf, [ 'edit', 'zsp.edit' ]));
-      });
+          set(dataObj, daqName, omit(daqConf, [ 'edit', 'zsp.edit' ]));
+        });
       return dataObj;
     },
     /** @this {Instance} */

www/test/karma_init.js

@@ -25,5 +25,6 @@ before(function() {
   Area.EAR1.dns = 'ear1-fake-url.cern.ch';
   Area.EAR2.dns = 'ear2-fake-url.cern.ch';
 
+  logger.autoReload = false; // do not reload browser on network error
   logger.on('error', (error) => debug('error:', error));
 });