From 20fd8a4ffdd8909383726d6a4ee7eb287501a3bc Mon Sep 17 00:00:00 2001
From: Matheus Cristian <mathues@email.com>
Date: Thu, 10 Oct 2024 17:57:22 -0300
Subject: [PATCH 1/8] release(1.1.0)

---
 CHANGELOG.md | 21 ++++++++++++++++++++-
 package.json |  2 +-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index faa1ef2..e0519a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # 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.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 +32,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
diff --git a/package.json b/package.json
index 1b0f40e..7518dc4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "commerce-webapp",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "author": "Weni <contato@weni.ai>",
   "private": true,
   "type": "module",

From 999cb39744ef183783bd2b9addcaff556ecad5e3 Mon Sep 17 00:00:00 2001
From: acnormun <anaclara.noronha@weni.ai>
Date: Fri, 11 Oct 2024 14:04:44 -0300
Subject: [PATCH 2/8] feat: solutions versions

---
 env.d.ts                                    |   6 +
 src/components/solutions/DrawerSolution.vue | 134 +++++++++++++-------
 2 files changed, 94 insertions(+), 46 deletions(-)

diff --git a/env.d.ts b/env.d.ts
index aecb771..d9bad08 100644
--- a/env.d.ts
+++ b/env.d.ts
@@ -2,6 +2,7 @@
 
 declare global {
   type Solution = {
+    version: string;
     uuid: string;
     title: string;
     description: string;
@@ -10,6 +11,11 @@ declare global {
     flows: { uuid: string; name: string }[];
     globals: { [key: string]: { value: string } };
     sectors: { [key: string]: { value: string[] } };
+    versions: {
+      version: string;
+      globals: { [key: string]: { value: string } };
+      sectors: { [key: string]: { value: string[] } };
+    }[];
   };
 }
 
diff --git a/src/components/solutions/DrawerSolution.vue b/src/components/solutions/DrawerSolution.vue
index b43e2ec..a71e613 100644
--- a/src/components/solutions/DrawerSolution.vue
+++ b/src/components/solutions/DrawerSolution.vue
@@ -30,9 +30,9 @@
       </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)"
           >
@@ -100,6 +100,36 @@ const props = defineProps<{
   solution?: Solution;
 }>();
 
+const solutionMock = {
+  version: '1.0',
+  feature_uuid: '4d983f31-065b-45c8-84fd-276469750c38',
+  name: 'Carrinho Abandonado',
+  description:
+    'Recupere vendas lembrando clientes de itens esquecidos no carrinho.',
+  disclaimer:
+    'Com essa solução, é possível aumentar suas chances de conversão, mantendo seu cliente próximo e incentivando a conclusão do pedido.',
+  documentation_url: null,
+  globals: [{ nome_loja: 'loja_roupa' }],
+  sectors: [],
+  versions: [
+    {
+      version: '1.0',
+      globals: ['nome_loja'],
+      sectors: [],
+    },
+    {
+      version: '2.0',
+      globals: ['loja'],
+      sectors: [
+        {
+          name: 'teste',
+          tags: '',
+        },
+      ],
+    },
+  ],
+};
+
 const { t } = useI18n();
 
 const router = useRouter();
@@ -116,48 +146,60 @@ const formData = reactive<{
   };
 }>({});
 
+const currentVersion = solutionMock.versions.find(
+  (item) => item.version === solutionMock.version,
+);
+
 function close() {
   isOpen.value = false;
 }
 
 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 && currentVersion) {
+    const sectors = Object.keys(currentVersion.sectors)
+      .map((sectorName) => ({
+        key: sectorName,
+        props: {
+          value: currentValueField(`tags:sector-${sectorName}`)?.value,
+        },
+      }))
+      .reduce(
+        (previous, { key, props }) => ({ ...previous, [key]: props }),
+        {},
+      );
+
+    const globals = Object.keys(currentVersion.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 +208,16 @@ const types = ['tags'];
 watch(
   isOpen,
   (isOpen) => {
-    if (isOpen && props.solution) {
-      Object.keys(props.solution.sectors).forEach((sectorName) => {
+    if (isOpen && currentVersion) {
+      Object.keys(currentVersion.sectors).forEach((sectorName) => {
         updateField(
           `tags:sector-${sectorName}`,
-          clone(props.solution.sectors[sectorName].value),
+          clone(currentVersion.sectors[sectorName].value),
         );
       });
 
       Object.keys(props.solution.globals).forEach((globalName) => {
-        updateField(globalName, props.solution.globals[globalName].value);
+        updateField(globalName, currentVersion.globals[globalName].value);
       });
     } else if (isOpen) {
       nextTick(close);
@@ -188,11 +230,11 @@ function currentValueField(field: string) {
   const type = fieldType(field);
   const label = fieldLabel(field);
 
-  if (type === 'text') {
-    return formData[label];
-  } else if (type === 'tags') {
+  if (type === 'text' || type === 'tags') {
     return formData[label];
   }
+
+  return { value: null };
 }
 
 function updateField(field: string, value: string | boolean | string[]) {

From c7930b86a97ace0238ee30f0f8590b6460d9127e Mon Sep 17 00:00:00 2001
From: acnormun <anaclara.noronha@weni.ai>
Date: Fri, 11 Oct 2024 15:28:29 -0300
Subject: [PATCH 3/8] fix: select current version

---
 src/api/solutions.ts                        | 26 +++++++++++
 src/components/solutions/DrawerSolution.vue | 48 +++++----------------
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/api/solutions.ts b/src/api/solutions.ts
index a3288a1..34e410c 100644
--- a/src/api/solutions.ts
+++ b/src/api/solutions.ts
@@ -10,6 +10,7 @@ export default {
     }: {
       data: {
         results: {
+          version?: string;
           feature_uuid: string;
           description: string;
           disclaimer: string;
@@ -21,6 +22,11 @@ export default {
           }[];
           name: string;
           sectors: string[];
+          versions?: {
+            version: string;
+            globals: { [key: string]: { value: string } };
+            sectors: { [key: string]: { value: string[] } };
+          }[];
         }[];
       };
     } = await request.$http.get(
@@ -28,6 +34,7 @@ export default {
     );
 
     return data.results.map((solution) => ({
+      version: solution.version || '',
       uuid: solution.feature_uuid,
       title: solution.name,
       description: solution.description,
@@ -50,6 +57,25 @@ export default {
         }),
         {},
       ),
+      versions:
+        solution.versions &&
+        solution.versions.map((version) => ({
+          version: version.version,
+          globals: Object.keys(version.globals).reduce(
+            (previous, key) => ({
+              ...previous,
+              [key]: { value: version.globals[key].value },
+            }),
+            {},
+          ),
+          sectors: Object.keys(version.sectors).reduce(
+            (previous, key) => ({
+              ...previous,
+              [key]: { value: version.sectors[key].value },
+            }),
+            {},
+          ),
+        })),
     }));
   },
 
diff --git a/src/components/solutions/DrawerSolution.vue b/src/components/solutions/DrawerSolution.vue
index a71e613..23ffe02 100644
--- a/src/components/solutions/DrawerSolution.vue
+++ b/src/components/solutions/DrawerSolution.vue
@@ -100,36 +100,6 @@ const props = defineProps<{
   solution?: Solution;
 }>();
 
-const solutionMock = {
-  version: '1.0',
-  feature_uuid: '4d983f31-065b-45c8-84fd-276469750c38',
-  name: 'Carrinho Abandonado',
-  description:
-    'Recupere vendas lembrando clientes de itens esquecidos no carrinho.',
-  disclaimer:
-    'Com essa solução, é possível aumentar suas chances de conversão, mantendo seu cliente próximo e incentivando a conclusão do pedido.',
-  documentation_url: null,
-  globals: [{ nome_loja: 'loja_roupa' }],
-  sectors: [],
-  versions: [
-    {
-      version: '1.0',
-      globals: ['nome_loja'],
-      sectors: [],
-    },
-    {
-      version: '2.0',
-      globals: ['loja'],
-      sectors: [
-        {
-          name: 'teste',
-          tags: '',
-        },
-      ],
-    },
-  ],
-};
-
 const { t } = useI18n();
 
 const router = useRouter();
@@ -146,9 +116,11 @@ const formData = reactive<{
   };
 }>({});
 
-const currentVersion = solutionMock.versions.find(
-  (item) => item.version === solutionMock.version,
-);
+const currentVersion =
+  props.solution &&
+  props.solution.versions.find(
+    (item) => props.solution && item.version === props.solution.version,
+  );
 
 function close() {
   isOpen.value = false;
@@ -216,7 +188,7 @@ watch(
         );
       });
 
-      Object.keys(props.solution.globals).forEach((globalName) => {
+      Object.keys(currentVersion.globals).forEach((globalName) => {
         updateField(globalName, currentVersion.globals[globalName].value);
       });
     } else if (isOpen) {
@@ -230,11 +202,13 @@ function currentValueField(field: string) {
   const type = fieldType(field);
   const label = fieldLabel(field);
 
-  if (type === 'text' || type === 'tags') {
+  console.log('❤️', type, label, JSON.stringify(formData));
+
+  if (type === 'text') {
+    return formData[label];
+  } else if (type === 'tags') {
     return formData[label];
   }
-
-  return { value: null };
 }
 
 function updateField(field: string, value: string | boolean | string[]) {

From 0aedce1a6744fabf48ab4383d0927bd795ee3e3d Mon Sep 17 00:00:00 2001
From: acnormun <anaclara.noronha@weni.ai>
Date: Fri, 11 Oct 2024 17:20:27 -0300
Subject: [PATCH 4/8] fix: solution group

---
 src/api/solutions.ts                        | 114 +++++++++++++++++++-
 src/components/solutions/DrawerSolution.vue |  21 ++--
 src/components/solutions/SolutionsGroup.vue |   6 ++
 3 files changed, 123 insertions(+), 18 deletions(-)

diff --git a/src/api/solutions.ts b/src/api/solutions.ts
index 34e410c..b396fd8 100644
--- a/src/api/solutions.ts
+++ b/src/api/solutions.ts
@@ -16,7 +16,7 @@ export default {
           disclaimer: string;
           documentation_url: string;
           globals?: string[];
-          initial_flow: {
+          initial_flow?: {
             name: string;
             uuid: string;
           }[];
@@ -24,8 +24,8 @@ export default {
           sectors: string[];
           versions?: {
             version: string;
-            globals: { [key: string]: { value: string } };
-            sectors: { [key: string]: { value: string[] } };
+            globals: string[];
+            sectors: string[];
           }[];
         }[];
       };
@@ -33,14 +33,118 @@ export default {
       `/v2/feature/${authStore.projectUuid}/?category=${category}`,
     );
 
-    return data.results.map((solution) => ({
+    const mockResult = {
+      results: [
+        {
+          name: 'feature 0001 implantation',
+          description: 'implantation',
+          disclaimer: 'vamo',
+          documentation_url: 'weni.by.vtex',
+          feature_uuid: '29c71115-c2fc-4a63-9f58-1893a73a7857',
+          globals: [
+            {
+              nome_loje: '013 cbjr 013',
+              nome_atendente: 'jackson choris',
+            },
+          ],
+          sectors: [
+            {
+              name: 'loja',
+              tags: ['vender'],
+            },
+            {
+              name: 'atendimento loja',
+              tags: ['SAF'],
+            },
+          ],
+          version: '1.0',
+          versions: [
+            {
+              version: '1.0',
+              globals: [
+                {
+                  nome_loje: '013 cbjr 013',
+                  nome_atendente: 'jackson choris',
+                },
+              ],
+              sectors: [
+                {
+                  name: 'loja',
+                  tags: [''],
+                },
+                {
+                  name: 'atendimento loja',
+                  tags: [''],
+                },
+              ],
+            },
+            {
+              version: '2.0',
+              globals: ['nome_fulana', 'nome_ciclana'],
+              sectors: [
+                {
+                  name: 'fulana',
+                  tags: [''],
+                },
+                {
+                  name: 'ciclana',
+                  tags: [''],
+                },
+              ],
+            },
+          ],
+        },
+        {
+          name: 'feature 0003',
+          description: 'feature',
+          disclaimer: 'disclama',
+          documentation_url: 'google.com',
+          feature_uuid: '27e3434e-8c8d-4a10-a653-2a44ace5585e',
+          globals: [],
+          sectors: [],
+          version: '1.0',
+          versions: [
+            {
+              version: '1.0',
+              globals: [
+                'url_api_vtex',
+                'x_vtex_api_appkey',
+                'x_vtex_api_apptoken',
+                'utm_compras_no_chatbot',
+                'base_url_site',
+                'bloqueio_para_testes',
+                'chatgpt_token',
+                'razao_social',
+              ],
+              sectors: [],
+            },
+            {
+              version: '2.0',
+              globals: ['telefone', 'email'],
+              sectors: [
+                {
+                  name: 'inscrição',
+                  tags: [''],
+                },
+                {
+                  name: 'viagem',
+                  tags: [''],
+                },
+              ],
+            },
+          ],
+        },
+      ],
+    };
+
+    return mockResult.results.map((solution) => ({
       version: solution.version || '',
       uuid: solution.feature_uuid,
       title: solution.name,
       description: solution.description,
       tip: solution.disclaimer,
       documentation: solution.documentation_url,
-      flows: solution.initial_flow,
+      flows: solution?.initial_flow || [],
       globals: (solution.globals || []).reduce(
         (previous, current) => ({
           ...previous,
diff --git a/src/components/solutions/DrawerSolution.vue b/src/components/solutions/DrawerSolution.vue
index 23ffe02..1bfd0e6 100644
--- a/src/components/solutions/DrawerSolution.vue
+++ b/src/components/solutions/DrawerSolution.vue
@@ -116,19 +116,14 @@ const formData = reactive<{
   };
 }>({});
 
-const currentVersion =
-  props.solution &&
-  props.solution.versions.find(
-    (item) => props.solution && item.version === props.solution.version,
-  );
 
 function close() {
   isOpen.value = false;
 }
 
 async function save() {
-  if (props.solution && currentVersion) {
-    const sectors = Object.keys(currentVersion.sectors)
+  if (props.solution) {
+    const sectors = Object.keys(props.solution.sectors)
       .map((sectorName) => ({
         key: sectorName,
         props: {
@@ -140,7 +135,7 @@ async function save() {
         {},
       );
 
-    const globals = Object.keys(currentVersion.globals)
+    const globals = Object.keys(props.solution.globals)
       .map((globalName) => ({
         key: globalName,
         props: {
@@ -180,16 +175,16 @@ const types = ['tags'];
 watch(
   isOpen,
   (isOpen) => {
-    if (isOpen && currentVersion) {
-      Object.keys(currentVersion.sectors).forEach((sectorName) => {
+    if (isOpen && props.solution) {
+      Object.keys(props.solution.sectors).forEach((sectorName) => {
         updateField(
           `tags:sector-${sectorName}`,
-          clone(currentVersion.sectors[sectorName].value),
+          clone(props.solution.sectors[sectorName].value),
         );
       });
 
-      Object.keys(currentVersion.globals).forEach((globalName) => {
-        updateField(globalName, currentVersion.globals[globalName].value);
+      Object.keys(props.solution.globals).forEach((globalName) => {
+        updateField(globalName, props.solution.globals[globalName].value);
       });
     } else if (isOpen) {
       nextTick(close);
diff --git a/src/components/solutions/SolutionsGroup.vue b/src/components/solutions/SolutionsGroup.vue
index 98f42f1..aeb8605 100644
--- a/src/components/solutions/SolutionsGroup.vue
+++ b/src/components/solutions/SolutionsGroup.vue
@@ -17,6 +17,7 @@
       />
     </section>
 
+    {{ solutionToIntegrate }}
     <ModalIntegrate
       v-if="solutionToIntegrate.solution"
       v-model="solutionToIntegrate.isOpen"
@@ -75,6 +76,11 @@ const solutionToIntegrate = reactive<{
     title: string;
     description: string;
     tip: string;
+    versions?: {
+      version?: string;
+      globals?: string[];
+      sectors?: string[];
+    }[];
   };
 }>({
   isOpen: false,

From f53d021c4916f93b3d2421f10cee72ff56c02352 Mon Sep 17 00:00:00 2001
From: acnormun <anaclara.noronha@weni.ai>
Date: Fri, 11 Oct 2024 17:59:52 -0300
Subject: [PATCH 5/8] chore: bump version

---
 CHANGELOG.md | 10 ++++++++++
 package.json |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e0519a7..d1ee101 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,16 @@ 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.
diff --git a/package.json b/package.json
index 7518dc4..2e04b85 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "commerce-webapp",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "author": "Weni <contato@weni.ai>",
   "private": true,
   "type": "module",

From 66024030ed7bb6ba2b65a5af439ea467a39564d9 Mon Sep 17 00:00:00 2001
From: acnormun <anaclara.noronha@weni.ai>
Date: Mon, 14 Oct 2024 11:49:48 -0300
Subject: [PATCH 6/8] fix: mocksolutions

---
 src/api/solutions.ts | 69 ++++++++++----------------------------------
 1 file changed, 16 insertions(+), 53 deletions(-)

diff --git a/src/api/solutions.ts b/src/api/solutions.ts
index 874d2ec..e8cf25e 100644
--- a/src/api/solutions.ts
+++ b/src/api/solutions.ts
@@ -41,56 +41,19 @@ export default {
           disclaimer: 'vamo',
           documentation_url: 'weni.by.vtex',
           feature_uuid: '29c71115-c2fc-4a63-9f58-1893a73a7857',
-          globals: [
-            {
-              nome_loje: '013 cbjr 013',
-              nome_atendente: 'jackson choris',
-            },
-          ],
-          sectors: [
-            {
-              name: 'loja',
-              tags: ['vender'],
-            },
-            {
-              name: 'atendimento loja',
-              tags: ['SAF'],
-            },
-          ],
+          globals: [],
+          sectors: [],
           version: '1.0',
           versions: [
             {
               version: '1.0',
-              globals: [
-                {
-                  nome_loje: '013 cbjr 013',
-                  nome_atendente: 'jackson choris',
-                },
-              ],
-              sectors: [
-                {
-                  name: 'loja',
-                  tags: [''],
-                },
-                {
-                  name: 'atendimento loja',
-                  tags: [''],
-                },
-              ],
+              globals: [],
+              sectors: [],
             },
             {
               version: '2.0',
               globals: ['nome_fulana', 'nome_ciclana'],
-              sectors: [
-                {
-                  name: 'fulana',
-                  tags: [''],
-                },
-                {
-                  name: 'ciclana',
-                  tags: [''],
-                },
-              ],
+              sectors: ['fulana', 'ciclana'],
             },
           ],
         },
@@ -100,7 +63,16 @@ export default {
           disclaimer: 'disclama',
           documentation_url: 'google.com',
           feature_uuid: '27e3434e-8c8d-4a10-a653-2a44ace5585e',
-          globals: [],
+          globals: [
+            'url_api_vtex',
+            'x_vtex_api_appkey',
+            'x_vtex_api_apptoken',
+            'utm_compras_no_chatbot',
+            'base_url_site',
+            'bloqueio_para_testes',
+            'chatgpt_token',
+            'razao_social',
+          ],
           sectors: [],
           version: '1.0',
           versions: [
@@ -121,16 +93,7 @@ export default {
             {
               version: '2.0',
               globals: ['telefone', 'email'],
-              sectors: [
-                {
-                  name: 'inscrição',
-                  tags: [''],
-                },
-                {
-                  name: 'viagem',
-                  tags: [''],
-                },
-              ],
+              sectors: ['alooo'],
             },
           ],
         },

From 17a7ba2cf294e1db0de2d491478987b8d954fbad Mon Sep 17 00:00:00 2001
From: acnormun <anaclara.noronha@weni.ai>
Date: Mon, 14 Oct 2024 15:47:22 -0300
Subject: [PATCH 7/8] fix: mocked solutions

---
 src/api/solutions.ts                        | 20 ++++-----
 src/components/solutions/DrawerSolution.vue | 45 +++++++++++++++------
 src/components/solutions/SolutionsGroup.vue |  3 +-
 3 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/src/api/solutions.ts b/src/api/solutions.ts
index e8cf25e..9cb4de4 100644
--- a/src/api/solutions.ts
+++ b/src/api/solutions.ts
@@ -43,11 +43,11 @@ export default {
           feature_uuid: '29c71115-c2fc-4a63-9f58-1893a73a7857',
           globals: [],
           sectors: [],
-          version: '1.0',
+          version: '2.0',
           versions: [
             {
               version: '1.0',
-              globals: [],
+              globals: ['oieee', 'alooo'],
               sectors: [],
             },
             {
@@ -74,7 +74,7 @@ export default {
             'razao_social',
           ],
           sectors: [],
-          version: '1.0',
+          version: '2.0',
           versions: [
             {
               version: '1.0',
@@ -127,17 +127,19 @@ export default {
         solution.versions &&
         solution.versions.map((version) => ({
           version: version.version,
-          globals: Object.keys(version.globals).reduce(
-            (previous, key) => ({
+          globals: (solution.globals || []).reduce(
+            (previous, current) => ({
               ...previous,
-              [key]: { value: version.globals[key].value },
+              [current]: { value: '' },
             }),
             {},
           ),
-          sectors: Object.keys(version.sectors).reduce(
-            (previous, key) => ({
+          sectors: solution.sectors.reduce(
+            (previous, sectorName) => ({
               ...previous,
-              [key]: { value: version.sectors[key].value },
+              [sectorName]: {
+                value: [],
+              },
             }),
             {},
           ),
diff --git a/src/components/solutions/DrawerSolution.vue b/src/components/solutions/DrawerSolution.vue
index 1bfd0e6..66202f4 100644
--- a/src/components/solutions/DrawerSolution.vue
+++ b/src/components/solutions/DrawerSolution.vue
@@ -30,7 +30,7 @@
       </section>
 
       <section class="form-elements">
-        <template v-if="currentVersion?.globals">
+        <template v-if="currentVersion.globals">
           <UnnnicFormElement
             v-for="(field, index) in Object.keys(currentVersion.globals)"
             :key="index"
@@ -40,7 +40,7 @@
               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)
               "
@@ -56,7 +56,7 @@
           >
             <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>
@@ -87,12 +87,13 @@
 <script setup lang="ts">
 import Drawer from '@/components/Drawer.vue';
 import InputTags from '@/components/InputTags.vue';
-import { nextTick, reactive, ref, watch } from 'vue';
+import { nextTick, onMounted, reactive, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useAlertStore } from '@/stores/Alert';
 import { useSolutionsStore } from '@/stores/Solutions';
 import { useRouter } from 'vue-router';
 import { clone } from 'lodash';
+import { idText } from 'typescript';
 
 const isOpen = defineModel<boolean>('isOpen', { required: true });
 
@@ -100,6 +101,15 @@ const props = defineProps<{
   solution?: Solution;
 }>();
 
+const currentVersion = ref<any>({});
+
+onMounted(() => {
+  console.log('aquii', props.solution);
+  currentVersion.value = props.solution?.versions.find(
+    (item) => item.version === props.solution?.version,
+  ) || { value: 'djehwdh' };
+});
+
 const { t } = useI18n();
 
 const router = useRouter();
@@ -116,7 +126,6 @@ const formData = reactive<{
   };
 }>({});
 
-
 function close() {
   isOpen.value = false;
 }
@@ -175,16 +184,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);
@@ -193,12 +202,24 @@ 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);
 
-  console.log('❤️', type, label, JSON.stringify(formData));
-
   if (type === 'text') {
     return formData[label];
   } else if (type === 'tags') {
diff --git a/src/components/solutions/SolutionsGroup.vue b/src/components/solutions/SolutionsGroup.vue
index aeb8605..d6cb024 100644
--- a/src/components/solutions/SolutionsGroup.vue
+++ b/src/components/solutions/SolutionsGroup.vue
@@ -17,7 +17,6 @@
       />
     </section>
 
-    {{ solutionToIntegrate }}
     <ModalIntegrate
       v-if="solutionToIntegrate.solution"
       v-model="solutionToIntegrate.isOpen"
@@ -132,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>
 

From ccc7dc54c5c3015e28c2b4db409cca4636c2fabf Mon Sep 17 00:00:00 2001
From: acnormun <anaclara.noronha@weni.ai>
Date: Mon, 14 Oct 2024 15:54:43 -0300
Subject: [PATCH 8/8] fix: mockedSolutions api

---
 src/api/solutions.ts                        | 73 +--------------------
 src/components/solutions/DrawerSolution.vue | 14 +---
 2 files changed, 6 insertions(+), 81 deletions(-)

diff --git a/src/api/solutions.ts b/src/api/solutions.ts
index 9cb4de4..272ccb3 100644
--- a/src/api/solutions.ts
+++ b/src/api/solutions.ts
@@ -33,74 +33,7 @@ export default {
       `/v2/feature/${authStore.projectUuid}/?category=${category}`,
     );
 
-    const mockResult = {
-      results: [
-        {
-          name: 'feature 0001 implantation',
-          description: 'implantation',
-          disclaimer: 'vamo',
-          documentation_url: 'weni.by.vtex',
-          feature_uuid: '29c71115-c2fc-4a63-9f58-1893a73a7857',
-          globals: [],
-          sectors: [],
-          version: '2.0',
-          versions: [
-            {
-              version: '1.0',
-              globals: ['oieee', 'alooo'],
-              sectors: [],
-            },
-            {
-              version: '2.0',
-              globals: ['nome_fulana', 'nome_ciclana'],
-              sectors: ['fulana', 'ciclana'],
-            },
-          ],
-        },
-        {
-          name: 'feature 0003',
-          description: 'feature',
-          disclaimer: 'disclama',
-          documentation_url: 'google.com',
-          feature_uuid: '27e3434e-8c8d-4a10-a653-2a44ace5585e',
-          globals: [
-            'url_api_vtex',
-            'x_vtex_api_appkey',
-            'x_vtex_api_apptoken',
-            'utm_compras_no_chatbot',
-            'base_url_site',
-            'bloqueio_para_testes',
-            'chatgpt_token',
-            'razao_social',
-          ],
-          sectors: [],
-          version: '2.0',
-          versions: [
-            {
-              version: '1.0',
-              globals: [
-                'url_api_vtex',
-                'x_vtex_api_appkey',
-                'x_vtex_api_apptoken',
-                'utm_compras_no_chatbot',
-                'base_url_site',
-                'bloqueio_para_testes',
-                'chatgpt_token',
-                'razao_social',
-              ],
-              sectors: [],
-            },
-            {
-              version: '2.0',
-              globals: ['telefone', 'email'],
-              sectors: ['alooo'],
-            },
-          ],
-        },
-      ],
-    };
-
-    return mockResult.results.map((solution) => ({
+    return data.results.map((solution) => ({
       version: solution.version || '',
       uuid: solution.feature_uuid,
       title: solution.name,
@@ -127,14 +60,14 @@ export default {
         solution.versions &&
         solution.versions.map((version) => ({
           version: version.version,
-          globals: (solution.globals || []).reduce(
+          globals: (version.globals || []).reduce(
             (previous, current) => ({
               ...previous,
               [current]: { value: '' },
             }),
             {},
           ),
-          sectors: solution.sectors.reduce(
+          sectors: version.sectors.reduce(
             (previous, sectorName) => ({
               ...previous,
               [sectorName]: {
diff --git a/src/components/solutions/DrawerSolution.vue b/src/components/solutions/DrawerSolution.vue
index 66202f4..3ff9a35 100644
--- a/src/components/solutions/DrawerSolution.vue
+++ b/src/components/solutions/DrawerSolution.vue
@@ -48,9 +48,9 @@
           </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}`"
           >
@@ -87,13 +87,12 @@
 <script setup lang="ts">
 import Drawer from '@/components/Drawer.vue';
 import InputTags from '@/components/InputTags.vue';
-import { nextTick, onMounted, reactive, ref, watch } from 'vue';
+import { nextTick, reactive, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useAlertStore } from '@/stores/Alert';
 import { useSolutionsStore } from '@/stores/Solutions';
 import { useRouter } from 'vue-router';
 import { clone } from 'lodash';
-import { idText } from 'typescript';
 
 const isOpen = defineModel<boolean>('isOpen', { required: true });
 
@@ -103,13 +102,6 @@ const props = defineProps<{
 
 const currentVersion = ref<any>({});
 
-onMounted(() => {
-  console.log('aquii', props.solution);
-  currentVersion.value = props.solution?.versions.find(
-    (item) => item.version === props.solution?.version,
-  ) || { value: 'djehwdh' };
-});
-
 const { t } = useI18n();
 
 const router = useRouter();