Merge pull request #142 from weni-ai/fix/crossing-data-bugs

[ENGAGE-1461] - Fix card data crossing bugs
weni-ai · Aug 23, 2024 · dec0dcb · dec0dcb
2 parents 110ee49 + 90e6067
commit dec0dcb
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 9 deletions.
diff --git a/src/components/insights/drawers/DrawerConfigWidgetDynamic.vue b/src/components/insights/drawers/DrawerConfigWidgetDynamic.vue
@@ -20,7 +20,7 @@
  @primary-button-click="updateWidgetConfig"
  @secondary-button-click="internalClose"
  @close="$emit('close')"
- @back="$emit('back')"
+ @back="configType ? $emit('back') : $emit('close')"
  >
  <template #content>
  <section class="drawer-config-widget-dynamic__content">

diff --git a/src/components/insights/drawers/DrawerForms/Card/FormDataCrossing/SubWidget.vue b/src/components/insights/drawers/DrawerForms/Card/FormDataCrossing/SubWidget.vue
@@ -135,7 +135,15 @@ export default defineComponent({
  configLocal: {
  deep: true,
  handler(newConfig) {
- this.$emit('update:config', newConfig);
+ const treatedConfig = {
+ ...newConfig,
+ operation:
+ newConfig.result_type === 'executions'
+ ? 'count'
+ : newConfig.operation,
+ };
+
+ this.$emit('update:config', treatedConfig);
  },
  },
 

diff --git a/src/components/insights/drawers/DrawerForms/Card/FormDataCrossing/index.vue b/src/components/insights/drawers/DrawerForms/Card/FormDataCrossing/index.vue
@@ -54,19 +54,19 @@ export default {
 
  operations: [
  {
- value: 'sum',
+ value: 'multiply',
  label: this.$t('drawers.config_card.radios.multiply'),
  },
  {
- value: 'max',
+ value: 'sum',
  label: this.$t('drawers.config_card.radios.sum'),
  },
  {
- value: 'avg',
+ value: 'sub',
  label: this.$t('drawers.config_card.radios.difference'),
  },
  {
- value: 'min',
+ value: 'percentage',
  label: this.$t('drawers.config_card.radios.percentage'),
  },
  ],
@@ -84,7 +84,7 @@ export default {
  value: 'currency',
  selected: this.config?.currency,
  label: this.$t('drawers.config_card.checkbox.currency'),
- disabled: this.config.operation === 'min',
+ disabled: this.config.operation === 'percentage',
  },
  ];
  },
@@ -109,7 +109,7 @@ export default {
  ...newConfig,
  });
 
- if (newConfig?.operation === 'min') this.config.currency = false;
+ if (newConfig?.operation === 'percentage') this.config.currency = false;
  },
  },
 
@@ -163,7 +163,7 @@ export default {
  this.config = {
  subwidget_1: createSubwidgetConfig(widgetConfig.subwidget_1),
  subwidget_2: createSubwidgetConfig(widgetConfig.subwidget_2),
- operation: widgetConfig.operation || 'min',
+ operation: widgetConfig.operation || 'percentage',
  currency: widgetConfig.currency || false,
  };
 

diff --git a/src/models/WidgetOutgoing.ts b/src/models/WidgetOutgoing.ts
@@ -80,6 +80,7 @@ class OutgoingWidget {
  const additionalConfig = additionalConfigMap[config.type]?.() || config;
 
  return {
+ config_type: config.type === 'data_crossing' ? 'crossing_data' : '',
  type_result: config.type,
  friendly_id: config.friendly_id || '',
  ...additionalConfig,

diff --git a/src/models/types/WidgetOutgoingTypes.ts b/src/models/types/WidgetOutgoingTypes.ts
@@ -50,6 +50,7 @@ export interface OutgoingFlowResultCardConfig extends OutgoingBaseCardConfig {
 }
 export interface OutgoingDataCrossingCardConfig extends OutgoingBaseCardConfig {
  type_result: 'data_crossing';
+ config_type: 'crossing_data';
  operator: string;
  currency: boolean;
  subwidget_1: OutgoingDataCrossingSubwidget;