fix: chatwoot screen

DavidsonGomes · DavidsonGomes · commit 80ae86b29868 · 2024-09-09T10:12:10.000-03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@
 * Fixed use chatwoot with evolution channel
 * Fix chatwoot reply quote with Cloud API
 * Use exchange name from .env on RabbitMQ
+* Fixed chatwoot screen
 
 # 2.1.0 (2024-08-26 15:33)
 
diff --git a/manager/dist/assets/index-DOHK1pp9.js b/manager/dist/assets/index-DOHK1pp9.js
diff --git a/manager/dist/index.html b/manager/dist/index.html
@@ -5,7 +5,7 @@
     <link rel="icon" type="image/png" href="/assets/images/evolution-logo.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Evolution Manager</title>
-    <script type="module" crossorigin src="/assets/index-B-Bdu2zN.js"></script>
+    <script type="module" crossorigin src="/assets/index-DOHK1pp9.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-DNOCacL_.css">
   </head>
   <body>
diff --git a/src/api/controllers/instance.controller.ts b/src/api/controllers/instance.controller.ts
@@ -46,6 +46,10 @@ export class InstanceController {
         providerFiles: this.providerFiles,
       });
 
+      if (!instance) {
+        throw new BadRequestException('Invalid integration');
+      }
+
       const instanceId = v4();
 
       instanceData.instanceId = instanceId;
@@ -62,6 +66,7 @@ export class InstanceController {
         hash,
         number: instanceData.number,
         businessId: instanceData.businessId,
+        status: instanceData.status,
       });
 
       instance.setInstance({
@@ -146,7 +151,7 @@ export class InstanceController {
             integration: instanceData.integration,
             webhookWaBusiness,
             accessTokenWaBusiness,
-            status: 'created',
+            status: instance.connectionStatus.state,
           },
           hash,
           webhook: {
@@ -233,7 +238,7 @@ export class InstanceController {
           integration: instanceData.integration,
           webhookWaBusiness,
           accessTokenWaBusiness,
-          status: 'created',
+          status: instance.connectionStatus.state,
         },
         hash,
         webhook: {
diff --git a/src/api/dto/instance.dto.ts b/src/api/dto/instance.dto.ts
@@ -9,6 +9,7 @@ export class InstanceDto extends IntegrationDto {
   number?: string;
   integration?: string;
   token?: string;
+  status?: string;
   // settings
   rejectCall?: boolean;
   msgCall?: string;
diff --git a/src/api/integrations/channel/channel.controller.ts b/src/api/integrations/channel/channel.controller.ts
@@ -80,14 +80,18 @@ export class ChannelController {
       );
     }
 
-    return new BaileysStartupService(
-      data.configService,
-      data.eventEmitter,
-      data.prismaRepository,
-      data.cache,
-      data.chatwootCache,
-      data.baileysCache,
-      data.providerFiles,
-    );
+    if (instanceData.integration === Integration.WHATSAPP_BAILEYS) {
+      return new BaileysStartupService(
+        data.configService,
+        data.eventEmitter,
+        data.prismaRepository,
+        data.cache,
+        data.chatwootCache,
+        data.baileysCache,
+        data.providerFiles,
+      );
+    }
+
+    return null;
   }
 }
diff --git a/src/api/services/monitor.service.ts b/src/api/services/monitor.service.ts
@@ -118,13 +118,17 @@ export class WAMonitoringService {
   public async cleaningUp(instanceName: string) {
     let instanceDbId: string;
     if (this.db.SAVE_DATA.INSTANCE) {
+      const findInstance = await this.prismaRepository.instance.findFirst({
+        where: { name: instanceName },
+      });
+
+      if (!findInstance) this.logger.error('Instance not found');
+
       const instance = await this.prismaRepository.instance.update({
         where: { name: instanceName },
         data: { connectionStatus: 'close' },
       });
 
-      if (!instance) this.logger.error('Instance not found');
-
       rmSync(join(INSTANCE_DIR, instance.id), { recursive: true, force: true });
 
       instanceDbId = instance.id;
@@ -150,6 +154,8 @@ export class WAMonitoringService {
       where: { name: instanceName },
     });
 
+    if (!instance) return;
+
     rmSync(join(INSTANCE_DIR, instance.id), { recursive: true, force: true });
 
     await this.prismaRepository.session.deleteMany({ where: { sessionId: instance.id } });
@@ -194,7 +200,8 @@ export class WAMonitoringService {
         data: {
           id: data.instanceId,
           name: data.instanceName,
-          connectionStatus: data.integration && data.integration === Integration.WHATSAPP_BAILEYS ? 'close' : 'open',
+          connectionStatus:
+            data.integration && data.integration === Integration.WHATSAPP_BAILEYS ? 'close' : data.status ?? 'open',
           number: data.number,
           integration: data.integration || Integration.WHATSAPP_BAILEYS,
           token: data.hash,
@@ -226,6 +233,8 @@ export class WAMonitoringService {
       providerFiles: this.providerFiles,
     });
 
+    if (!instance) return;
+
     instance.setInstance({
       instanceId: instanceData.instanceId,
       instanceName: instanceData.instanceName,
