Merge branch 'feat/solutionversions' of https://github.com/weni-ai/co…

…mmerce-webapp into staging

CHANGELOG.md

@@ -1,5 +1,33 @@
 # Changelog
-<!-- documentation: https://keepachangelog.com/en/1.1.0/ -->
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [1.1.1] - 2024-10-11
+
+Release of the internally named version 1.0, integrating with the real API.
+
+
+### Added
+
+- Solutions modal images.
+
+
+## [1.1.0] - 2024-10-10
+
+Release of the internally named version 1.0, integrating with the real API.
+
+
+### Added
+
+- [Sentry](https://sentry.io/) integration.
+- Unit tests for: `utils/index.ts`, `TreatUnhandledRejection.ts` and `HomeView.vue`
+
+### Fixed
+
+- Error when trying to integrate or edit a solution integration when the globals were empty.
 
 ## [1.0.0] - 2024-10-04
 
@@ -14,3 +42,4 @@ Release of the internally named version 1.0, integrating with the real API.
 - [APIPhantom](https://github.com/weni-ai/APIPhantom) support.
 
 [1.0.0]: https://github.com/weni-ai/commerce-webapp/compare/0.1.3...1.0.0
+[1.1.0]: https://github.com/weni-ai/commerce-webapp/compare/1.0.0...1.1.0

env.d.ts

@@ -5,13 +5,19 @@ declare global {
   declare const __APP_VERSION__: string;
 
   type Solution = {
+    version: string;
     uuid: string;
     title: string;
     description: string;
     documentation: string;
     tip: string;
     globals: { [key: string]: { value: string } };
     sectors: { [key: string]: { value: string[] } };
+    versions: {
+      version: string;
+      globals: { [key: string]: { value: string } };
+      sectors: { [key: string]: { value: string[] } };
+    }[];
   };
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "commerce-webapp",
-  "version": "1.0.0",
+  "version": "1.1.1",
   "author": "Weni <[email protected]>",
   "private": true,
   "type": "module",

src/api/solutions.ts

@@ -10,24 +10,31 @@ export default {
     }: {
       data: {
         results: {
+          version?: string;
           feature_uuid: string;
           description: string;
           disclaimer: string;
           documentation_url: string;
           globals?: string[];
-          initial_flow: {
+          initial_flow?: {
             name: string;
             uuid: string;
           }[];
           name: string;
           sectors: string[];
+          versions?: {
+            version: string;
+            globals: string[];
+            sectors: string[];
+          }[];
         }[];
       };
     } = await request.$http.get(
       `/v2/feature/${authStore.projectUuid}/?category=${category}`,
     );
 
     return data.results.map((solution) => ({
+      version: solution.version || '',
       uuid: solution.feature_uuid,
       title: solution.name,
       description: solution.description,
@@ -49,6 +56,27 @@ export default {
         }),
         {},
       ),
+      versions:
+        solution.versions &&
+        solution.versions.map((version) => ({
+          version: version.version,
+          globals: (version.globals || []).reduce(
+            (previous, current) => ({
+              ...previous,
+              [current]: { value: '' },
+            }),
+            {},
+          ),
+          sectors: version.sectors.reduce(
+            (previous, sectorName) => ({
+              ...previous,
+              [sectorName]: {
+                value: [],
+              },
+            }),
+            {},
+          ),
+        })),
     }));
   },
 

src/components/solutions/DrawerSolution.vue

@@ -30,33 +30,33 @@
       </section>
 
       <section class="form-elements">
-        <template v-if="solution?.globals">
+        <template v-if="currentVersion.globals">
           <UnnnicFormElement
-            v-for="(field, index) in Object.keys(solution.globals)"
+            v-for="(field, index) in Object.keys(currentVersion.globals)"
             :key="index"
             :label="fieldLabel(field)"
           >
             <UnnnicInput
               v-if="fieldType(field) === 'text'"
               size="sm"
               :data-test="field"
-              :modelValue="currentValueField(field).value"
+              :modelValue="currentValueField(field)?.value"
               @update:model-value="
                 ($event: string) => updateField(field, $event)
               "
             />
           </UnnnicFormElement>
         </template>
 
-        <template v-if="solution?.sectors">
+        <template v-if="currentVersion.sectors">
           <UnnnicFormElement
-            v-for="(sector, index) in Object.keys(solution.sectors)"
+            v-for="(sector, index) in Object.keys(currentVersion.sectors)"
             :key="index"
             :label="`Tags do ${sector}`"
           >
             <InputTags
               :data-test="sector"
-              :modelValue="currentValueField(`tags:sector-${sector}`).value"
+              :modelValue="currentValueField(`tags:sector-${sector}`)?.value"
               @update:model-value="updateField(`tags:sector-${sector}`, $event)"
             />
           </UnnnicFormElement>
@@ -100,6 +100,8 @@ const props = defineProps<{
   solution?: Solution;
 }>();
 
+const currentVersion = ref<any>({});
+
 const { t } = useI18n();
 
 const router = useRouter();
@@ -121,43 +123,51 @@ function close() {
 }
 
 async function save() {
-  const sectors = Object.keys(props.solution.sectors)
-    .map((sectorName) => ({
-      key: sectorName,
-      props: {
-        value: currentValueField(`tags:sector-${sectorName}`)?.value,
-      },
-    }))
-    .reduce((previous, { key, props }) => ({ ...previous, [key]: props }), {});
-
-  const globals = Object.keys(props.solution.globals)
-    .map((globalName) => ({
-      key: globalName,
-      props: {
-        value: currentValueField(globalName)?.value,
-      },
-    }))
-    .reduce((previous, { key, props }) => ({ ...previous, [key]: props }), {});
-
-  try {
-    isSaving.value = true;
-
-    await solutionsStore.integrateOrUpdate({
-      uuid: props.solution.uuid,
-      sectors,
-      globals,
-    });
-
-    close();
-
-    alertStore.add({
-      type: 'success',
-      text: t('solutions.integrate.status.created'),
-    });
-
-    router.push({ name: 'integrated-solutions' });
-  } finally {
-    isSaving.value = false;
+  if (props.solution) {
+    const sectors = Object.keys(props.solution.sectors)
+      .map((sectorName) => ({
+        key: sectorName,
+        props: {
+          value: currentValueField(`tags:sector-${sectorName}`)?.value,
+        },
+      }))
+      .reduce(
+        (previous, { key, props }) => ({ ...previous, [key]: props }),
+        {},
+      );
+
+    const globals = Object.keys(props.solution.globals)
+      .map((globalName) => ({
+        key: globalName,
+        props: {
+          value: currentValueField(globalName)?.value,
+        },
+      }))
+      .reduce(
+        (previous, { key, props }) => ({ ...previous, [key]: props }),
+        {},
+      );
+
+    try {
+      isSaving.value = true;
+
+      await solutionsStore.integrateOrUpdate({
+        uuid: props.solution.uuid,
+        sectors,
+        globals,
+      });
+
+      close();
+
+      alertStore.add({
+        type: 'success',
+        text: t('solutions.integrate.status.created'),
+      });
+
+      router.push({ name: 'integrated-solutions' });
+    } finally {
+      isSaving.value = false;
+    }
   }
 }
 
@@ -166,16 +176,16 @@ const types = ['tags'];
 watch(
   isOpen,
   (isOpen) => {
-    if (isOpen && props.solution) {
-      Object.keys(props.solution.sectors).forEach((sectorName) => {
+    if (isOpen && currentVersion) {
+      Object.keys(currentVersion.value.sectors).forEach((sectorName) => {
         updateField(
           `tags:sector-${sectorName}`,
-          clone(props.solution.sectors[sectorName].value),
+          clone(currentVersion.value.sectors[sectorName].value),
         );
       });
 
-      Object.keys(props.solution.globals).forEach((globalName) => {
-        updateField(globalName, props.solution.globals[globalName].value);
+      Object.keys(currentVersion.value.globals).forEach((globalName) => {
+        updateField(globalName, currentVersion.value.globals[globalName].value);
       });
     } else if (isOpen) {
       nextTick(close);
@@ -184,6 +194,20 @@ watch(
   { immediate: true },
 );
 
+watch(
+  () => props.solution,
+  (newSolution) => {
+    if (newSolution) {
+      console.log('new solution', newSolution);
+      currentVersion.value =
+        newSolution.versions.find(
+          (item) => item.version === newSolution.version,
+        ) || {};
+    }
+  },
+  { immediate: true },
+);
+
 function currentValueField(field: string) {
   const type = fieldType(field);
   const label = fieldLabel(field);

src/components/solutions/SolutionsGroup.vue

@@ -75,6 +75,11 @@ const solutionToIntegrate = reactive<{
     title: string;
     description: string;
     tip: string;
+    versions?: {
+      version?: string;
+      globals?: string[];
+      sectors?: string[];
+    }[];
   };
 }>({
   isOpen: false,
@@ -126,7 +131,7 @@ function openIntegrateSolutionModal(solution: Solution) {
 function openDrawer(solution, values = {}) {
   drawerSolution.isOpen = true;
   drawerSolution.solution = solution;
-  drawerSolution.solution.values = values;
+  // drawerSolution.solution.values = values;
 }
 </script>