Merge branch 'fix/#52/ui-filter-content-not-updated' into 'develop'

[Issue #52] UI Filter content not updated

See merge request canopsis/canopsis-pro!371

community/sources/webcore/src/canopsis-next/src/components/modals/view/create-view.vue

@@ -37,7 +37,7 @@ import { submittableMixin } from '@/mixins/submittable';
 import { confirmableModalMixin } from '@/mixins/confirmable-modal';
 import entitiesViewMixin from '@/mixins/entities/view';
 import { entitiesViewGroupMixin } from '@/mixins/entities/view/group';
-import entitiesUserPreferenceMixin from '@/mixins/entities/user-preference';
+import { entitiesUserPreferenceMixin } from '@/mixins/entities/user-preference';
 import { permissionsTechnicalViewMixin } from '@/mixins/permissions/technical/view';
 
 import ViewForm from '@/components/other/view/view-form.vue';

community/sources/webcore/src/canopsis-next/src/components/other/filter/filter-selector.vue

@@ -225,7 +225,7 @@ export default {
 
       const newValue = this.isMultiple ? selectedFilters : selectedFilters[0];
 
-      return this.$emit('update:filters', filters.map(removeSelectedProperty), newValue);
+      this.$emit('update:filters', filters.map(removeSelectedProperty), newValue);
     },
 
     isFilterEqual(firstFilter, secondFilter) {

community/sources/webcore/src/canopsis-next/src/components/other/filter/form/filters-form.vue

@@ -21,7 +21,6 @@
         @delete="showDeleteFilterModal(index)"
       )
     v-btn.ml-0(
-      data-test="addFilter",
       v-if="hasAccessToAddFilter",
       color="primary",
       outline,
@@ -102,7 +101,7 @@ export default {
           title: this.$t('modals.filter.edit.title'),
           entitiesType: this.entitiesType,
           existingTitles: this.existingTitles,
-          action: newFilter => this.updateItemInArray(index, newFilter),
+          action: newFilter => this.updateItemInArray(index, { ...filter, ...newFilter }),
         },
       });
     },

community/sources/webcore/src/canopsis-next/src/components/other/view/buttons/clone-tab-btn.vue

@@ -18,7 +18,7 @@ import { generateCopyOfViewTab, getViewsTabsWidgetsIdsMappings } from '@/helpers
 import { viewToRequest } from '@/helpers/forms/view';
 
 import { authMixin } from '@/mixins/auth';
-import entitiesUserPreferenceMixin from '@/mixins/entities/user-preference';
+import { entitiesUserPreferenceMixin } from '@/mixins/entities/user-preference';
 
 const { mapGetters: viewMapGetters, mapActions: viewMapActions } = createNamespacedHelpers('view');
 

community/sources/webcore/src/canopsis-next/src/components/side-bars/settings/alarm.vue

@@ -34,7 +34,7 @@
             with-color-indicator
           )
           v-divider
-          field-default-elements-per-page(v-model="settings.widget_preferences.itemsPerPage")
+          field-default-elements-per-page(v-model="settings.userPreferenceContent.itemsPerPage")
           v-divider
           field-opened-resolved-filter(v-model="settings.widget.parameters.opened")
           v-divider
@@ -180,17 +180,15 @@ export default {
     return {
       settings: {
         widget: alarmListWidgetToForm(widget),
-        widget_preferences: {
-          itemsPerPage: PAGINATION_LIMIT,
-        },
+        userPreferenceContent: { itemsPerPage: PAGINATION_LIMIT },
       },
     };
   },
   mounted() {
-    const { widget_preferences: widgetPreference } = this.userPreference;
+    const { content } = this.userPreference;
 
-    this.settings.widget_preferences = {
-      itemsPerPage: get(widgetPreference, 'itemsPerPage', PAGINATION_LIMIT),
+    this.settings.userPreferenceContent = {
+      itemsPerPage: get(content, 'itemsPerPage', PAGINATION_LIMIT),
     };
   },
   methods: {

community/sources/webcore/src/canopsis-next/src/components/side-bars/settings/fields/common/filters.vue

@@ -20,8 +20,6 @@
 </template>
 
 <script>
-import { isUndefined } from 'lodash';
-
 import { FILTER_DEFAULT_VALUES, ENTITIES_TYPES } from '@/constants';
 
 import { authMixin } from '@/mixins/auth';
@@ -63,12 +61,8 @@ export default {
     },
   },
   methods: {
-    updateFilters(filters, value) {
+    updateFilters(filters) {
       this.$emit('update:filters', filters);
-
-      if (!isUndefined(value)) {
-        this.$emit('input', value);
-      }
     },
   },
 };

community/sources/webcore/src/canopsis-next/src/components/widgets/alarm/alarms-list.vue

@@ -213,9 +213,7 @@ export default {
     },
 
     updateCorrelation(correlation) {
-      this.updateWidgetPreferencesInUserPreference({
-        ...this.userPreference.widget_preferences,
-
+      this.updateContentInUserPreference({
         isCorrelationEnabled: correlation,
       });
 
@@ -229,9 +227,7 @@ export default {
     updateCategory(category) {
       const categoryId = category && category._id;
 
-      this.updateWidgetPreferencesInUserPreference({
-        ...this.userPreference.widget_preferences,
-
+      this.updateContentInUserPreference({
         category: categoryId,
       });
 
@@ -243,9 +239,7 @@ export default {
     },
 
     updateRecordsPerPage(limit) {
-      this.updateWidgetPreferencesInUserPreference({
-        ...this.userPreference.widget_preferences,
-
+      this.updateContentInUserPreference({
         itemsPerPage: limit,
       });
 

community/sources/webcore/src/canopsis-next/src/components/widgets/context/entities-list.vue

@@ -191,9 +191,7 @@ export default {
   },
   methods: {
     updateNoEvents(noEvents) {
-      this.updateWidgetPreferencesInUserPreference({
-        ...this.userPreference.widget_preferences,
-
+      this.updateContentInUserPreference({
         noEvents,
       });
 
@@ -207,9 +205,7 @@ export default {
     updateCategory(category) {
       const categoryId = category && category._id;
 
-      this.updateWidgetPreferencesInUserPreference({
-        ...this.userPreference.widget_preferences,
-
+      this.updateContentInUserPreference({
         category: categoryId,
       });
 

community/sources/webcore/src/canopsis-next/src/components/widgets/service-weather/service-weather.vue

@@ -84,9 +84,7 @@ export default {
     updateCategory(category) {
       const categoryId = category && category._id;
 
-      this.updateWidgetPreferencesInUserPreference({
-        ...this.userPreference.widget_preferences,
-
+      this.updateContentInUserPreference({
         category: categoryId,
       });
 

community/sources/webcore/src/canopsis-next/src/components/widgets/stats/curves/stats-curves.vue

@@ -15,7 +15,6 @@ import { STATS_DEFAULT_COLOR, STATS_CURVES_POINTS_STYLES } from '@/constants';
 
 import entitiesStatsMixin from '@/mixins/entities/stats';
 import { widgetFetchQueryMixin } from '@/mixins/widget/fetch-query';
-import entitiesUserPreferenceMixin from '@/mixins/entities/user-preference';
 import widgetStatsWrapperMixin from '@/mixins/widget/stats/stats-wrapper';
 import widgetStatsChartWrapperMixin from '@/mixins/widget/stats/stats-chart-wrapper';
 
@@ -28,7 +27,6 @@ export default {
   mixins: [
     entitiesStatsMixin,
     widgetFetchQueryMixin,
-    entitiesUserPreferenceMixin,
     widgetStatsWrapperMixin,
     widgetStatsChartWrapperMixin,
   ],

community/sources/webcore/src/canopsis-next/src/components/widgets/stats/histogram/stats-histogram.vue

@@ -15,7 +15,6 @@ import { STATS_DEFAULT_COLOR } from '@/constants';
 
 import entitiesStatsMixin from '@/mixins/entities/stats';
 import { widgetFetchQueryMixin } from '@/mixins/widget/fetch-query';
-import entitiesUserPreferenceMixin from '@/mixins/entities/user-preference';
 import widgetStatsWrapperMixin from '@/mixins/widget/stats/stats-wrapper';
 import widgetStatsChartWrapperMixin from '@/mixins/widget/stats/stats-chart-wrapper';
 
@@ -28,7 +27,6 @@ export default {
   mixins: [
     entitiesStatsMixin,
     widgetFetchQueryMixin,
-    entitiesUserPreferenceMixin,
     widgetStatsWrapperMixin,
     widgetStatsChartWrapperMixin,
   ],

community/sources/webcore/src/canopsis-next/src/components/widgets/stats/stats-number.vue

@@ -37,7 +37,6 @@ import { STATS_DISPLAY_MODE, STATS_CRITICITY, SORT_ORDERS } from '@/constants';
 
 import entitiesStatsMixin from '@/mixins/entities/stats';
 import { widgetFetchQueryMixin } from '@/mixins/widget/fetch-query';
-import entitiesUserPreferenceMixin from '@/mixins/entities/user-preference';
 import widgetStatsQueryMixin from '@/mixins/widget/stats/stats-query';
 import widgetStatsWrapperMixin from '@/mixins/widget/stats/stats-wrapper';
 import widgetStatsTableWrapperMixin from '@/mixins/widget/stats/stats-table-wrapper';
@@ -46,7 +45,6 @@ export default {
   mixins: [
     entitiesStatsMixin,
     widgetFetchQueryMixin,
-    entitiesUserPreferenceMixin,
     widgetStatsQueryMixin,
     widgetStatsWrapperMixin,
     widgetStatsTableWrapperMixin,

community/sources/webcore/src/canopsis-next/src/components/widgets/stats/stats-table.vue

@@ -40,7 +40,6 @@ import { dataTableCustomSortWithNullIgnoring } from '@/helpers/sort';
 
 import entitiesStatsMixin from '@/mixins/entities/stats';
 import { widgetFetchQueryMixin } from '@/mixins/widget/fetch-query';
-import entitiesUserPreferenceMixin from '@/mixins/entities/user-preference';
 import widgetStatsQueryMixin from '@/mixins/widget/stats/stats-query';
 import widgetStatsWrapperMixin from '@/mixins/widget/stats/stats-wrapper';
 import widgetStatsTableWrapperMixin from '@/mixins/widget/stats/stats-table-wrapper';
@@ -54,7 +53,6 @@ export default {
   mixins: [
     entitiesStatsMixin,
     widgetFetchQueryMixin,
-    entitiesUserPreferenceMixin,
     widgetStatsQueryMixin,
     widgetStatsWrapperMixin,
     widgetStatsTableWrapperMixin,

community/sources/webcore/src/canopsis-next/src/config.js

@@ -89,7 +89,7 @@ export const API_ROUTES = {
   contextExport: '/api/v4/entity-export',
   actions: '/api/v2/actions',
   event: '/api/v4/event',
-  userPreferences: '/rest/userpreferences/userpreferences',
+  userPreferences: '/api/v4/user-preferences',
   view: '/api/v4/views',
   bulkView: '/api/v4/bulk/views',
   viewPosition: '/api/v4/view-positions',

community/sources/webcore/src/canopsis-next/src/helpers/entities.js

@@ -324,24 +324,6 @@ export function generateViewTab(title = '') {
   };
 }
 
-/**
- * Generate user preference by widget and user objects
- *
- * @param {Object} widget
- * @param {Object} user
- * @returns {Object}
- */
-export function generateUserPreferenceByWidgetAndUser(widget, user) {
-  return {
-    _id: `${widget._id}_${user._id}`,
-    widget_preferences: {},
-    name: user._id,
-    widget_id: widget._id,
-    widgetXtype: widget.type,
-    crecord_type: 'userpreferences',
-  };
-}
-
 /**
  * Generate copy of view tab
  *

community/sources/webcore/src/canopsis-next/src/helpers/filter/index.js

@@ -46,7 +46,7 @@ export function getMainFilterAndCondition(widget, userPreference) {
     mainFilter: userMainFilter,
     mainFilterCondition: userMainFilterCondition = FILTER_MONGO_OPERATORS.and,
     mainFilterUpdatedAt: userMainFilterUpdatedAt = 0,
-  } = userPreference.widget_preferences;
+  } = userPreference.content;
 
   const {
     mainFilter: widgetMainFilter,
@@ -57,7 +57,7 @@ export function getMainFilterAndCondition(widget, userPreference) {
   let mainFilter = userMainFilter;
   let condition = userMainFilterCondition;
 
-  if (isEmpty(mainFilter) && !isEmpty(widgetMainFilter) && widgetMainFilterUpdatedAt >= userMainFilterUpdatedAt) {
+  if (!isEmpty(widgetMainFilter) && widgetMainFilterUpdatedAt >= userMainFilterUpdatedAt) {
     mainFilter = widgetMainFilter;
     condition = widgetMainFilterCondition;
   }

community/sources/webcore/src/canopsis-next/src/helpers/filter/remediation-instructions-filter.js

@@ -86,7 +86,7 @@ export function getRemediationInstructionsFilters(widget, userPreference) {
   const {
     disabledWidgetRemediationInstructionsFilters: disabledWidgetFilters = [],
     remediationInstructionsFilters: filters = [],
-  } = userPreference.widget_preferences;
+  } = userPreference.content;
 
   const preparedWidgetFilters = widgetFilters
     .filter(filter => !disabledWidgetFilters.includes(filter._id));

community/sources/webcore/src/canopsis-next/src/helpers/forms/view.js

@@ -4,7 +4,7 @@ import { DEFAULT_PERIODIC_REFRESH } from '@/constants';
 
 import uuid from '../uuid';
 import { durationWithEnabledToForm, formToDurationWithEnabled } from '../date/duration';
-import { generateViewTab } from '../entities';
+import { generateCopyOfViewTab, generateViewTab } from '../entities';
 
 import { enabledToForm } from './shared/common';
 
@@ -277,6 +277,15 @@ export const getExportedGroupsWrappers = (groups = []) =>
     return acc;
   }, []);
 
+/**
+ * Prepare imported view tabs
+ *
+ * @param {ViewTab[]} tabs
+ * @return {ViewTab[]}
+ */
+export const prepareImportedViewTabs = (tabs = []) =>
+  tabs.map(tab => generateCopyOfViewTab(tab));
+
 /**
  * Prepare imported views
  *
@@ -285,7 +294,12 @@ export const getExportedGroupsWrappers = (groups = []) =>
  * @return {View[]}
  */
 export const prepareImportedViews = (views, group) =>
-  views.map(view => ({ ...view, _id: uuid(), group: group || view.group }));
+  views.map(view => ({
+    ...view,
+    _id: uuid(),
+    group: group || view.group,
+    tabs: prepareImportedViewTabs(view.tabs),
+  }));
 
 /**
  * Prepare imported groups

community/sources/webcore/src/canopsis-next/src/helpers/query.js

@@ -265,12 +265,12 @@ export function convertCounterWidgetToQuery(widget) {
  * @param {Object} userPreference
  * @returns {{}}
  */
-export function convertAlarmUserPreferenceToQuery({ widget_preferences: widgetPreferences }) {
+export function convertAlarmUserPreferenceToQuery({ content }) {
   const {
     itemsPerPage,
     category,
     isCorrelationEnabled = false,
-  } = widgetPreferences;
+  } = content;
 
   const query = {
     correlation: isCorrelationEnabled,
@@ -290,8 +290,8 @@ export function convertAlarmUserPreferenceToQuery({ widget_preferences: widgetPr
  * @param {Object} userPreference
  * @returns {{ category: string }}
  */
-export function convertWeatherUserPreferenceToQuery({ widget_preferences: widgetPreferences }) {
-  const { category } = widgetPreferences;
+export function convertWeatherUserPreferenceToQuery({ content }) {
+  const { category } = content;
 
   return { category };
 }
@@ -302,8 +302,8 @@ export function convertWeatherUserPreferenceToQuery({ widget_preferences: widget
  * @param {Object} userPreference
  * @returns {{ category: string }}
  */
-export function convertContextUserPreferenceToQuery({ widget_preferences: widgetPreferences }) {
-  const { category, noEvents } = widgetPreferences;
+export function convertContextUserPreferenceToQuery({ content }) {
+  const { category, noEvents } = content;
 
   return {
     category,
@@ -319,10 +319,11 @@ export function convertContextUserPreferenceToQuery({ widget_preferences: widget
  * This function converts userPreference to query Object
  *
  * @param {Object} userPreference
- * @returns {{}}
+ * @param {WidgetType} widgetType
+ * @returns {Object}
  */
-export function convertUserPreferenceToQuery(userPreference) {
-  switch (userPreference.widgetXtype) {
+export function convertUserPreferenceToQuery(userPreference, widgetType) {
+  switch (widgetType) {
     case WIDGET_TYPES.alarmList:
       return convertAlarmUserPreferenceToQuery(userPreference);
     case WIDGET_TYPES.context:
@@ -375,7 +376,7 @@ export function convertWidgetToQuery(widget) {
  */
 export function prepareQuery(widget, userPreference) {
   const widgetQuery = convertWidgetToQuery(widget);
-  const userPreferenceQuery = convertUserPreferenceToQuery(userPreference);
+  const userPreferenceQuery = convertUserPreferenceToQuery(userPreference, widget.type);
   let query = {
     ...widgetQuery,
     ...userPreferenceQuery,

community/sources/webcore/src/canopsis-next/src/mixins/entities/broadcast-message.js

@@ -2,7 +2,7 @@ import { createNamespacedHelpers } from 'vuex';
 
 const { mapActions, mapGetters } = createNamespacedHelpers('broadcastMessage');
 
-export const entitiesBroadcastMessagesMixin = {
+export const entitiesBroadcastMessageMixin = {
   computed: {
     ...mapGetters({
       broadcastMessages: 'items',