main

Author: luiis716

src/components/instance/InstanceBody.vue

@@ -1,16 +1,16 @@
 <template>
   <v-tabs v-model="tab" background-color="transparent" color="primary" grow>
-    <v-tab v-for="tab in tabs" :key="tab.id" :value="tab.id">
-      <v-icon start>{{ tab.icon }}</v-icon>
-      {{ $t(`instanceTabs.${tab.id}`) }}
+    <v-tab v-for="tabItem in tabs" :key="tabItem.id" :value="tabItem.id">
+      <v-icon start>{{ tabItem.icon }}</v-icon>
+      {{ $t(`instanceTabs.${tabItem.id}`) }}
     </v-tab>
   </v-tabs>
 
   <v-window v-model="tab">
-    <v-window-item v-for="tab in tabs" :key="tab.id" :value="tab.id">
+    <v-window-item v-for="tabItem in tabs" :key="tabItem.id" :value="tabItem.id">
       <div class="d-flex flex-column gap-6">
         <component
-          v-for="component in tab.components"
+          v-for="component in tabItem.components"
           :key="component"
           :is="component"
           :instance="instance"
@@ -38,6 +38,7 @@ import ConnectionAlert from "./profile/ConnectionAlert.vue";
 import BasicInfo from "./profile/BasicInfo.vue";
 import Privacy from "./profile/Privacy.vue";
 import ProfilePhoto from "./profile/ProfilePhoto.vue";
+
 export default {
   components: {
     Options,
@@ -56,44 +57,46 @@ export default {
     Privacy,
     ProfilePhoto,
   },
-  data: () => ({
-    tab: "settings",
-    tabs: [
-      {
-        id: "settings",
-        icon: "mdi-cog",
-        components: [
-          "Options",
-          "Webhook",
-          "Websocket",
-          "Rabbitmq",
-          "Chatwoot",
-          "Typebot",
-        ],
-      },
-      {
-        id: "message",
-        icon: "mdi-message",
-        components: [
-          "OpenSendMessage",
-          "HasWhatsapp",
-          "MyContacts",
-          "MyGroups",
-          "MyChats",
-        ],
-      },
-      {
-        id: "profile",
-        icon: "mdi-account",
-        components: [
-          "ConnectionAlert",
-          "BasicInfo",
-          "ProfilePhoto",
-          "Privacy",
-        ],
-      },
-    ],
-  }),
+  data() {
+    return {
+      tab: "settings",
+      tabs: [
+        {
+          id: "settings",
+          icon: "mdi-cog",
+          components: [
+            "Options",
+            "Webhook",
+            "Websocket",
+            "Rabbitmq",
+            "Chatwoot",
+            "Typebot",
+          ],
+        },
+        {
+          id: "message",
+          icon: "mdi-message",
+          components: [
+            "OpenSendMessage",
+            "HasWhatsapp",
+            "MyContacts",
+            "MyGroups",
+            "MyChats",
+          ],
+        },
+        {
+          id: "profile",
+          icon: "mdi-account",
+          components: [
+            "ConnectionAlert",
+            "BasicInfo",
+            "ProfilePhoto",
+            "Privacy",
+          ],
+        },
+      ],
+    };
+  },
   props: {
     instance: {
       type: Object,
@@ -103,4 +106,6 @@ export default {
 };
 </script>
 
-<style></style>
+<style scoped>
+/* Add any necessary scoped styles here */
+</style>

src/components/instance/InstanceHeader.vue

@@ -7,37 +7,37 @@
     <v-avatar size="100" rounded="xl">
       <v-icon
         v-if="
-          (instance.instance.status != 'open' ||
-            instance.instance.profilePictureUrl == null) &&
-          statusMapper[instance.instance.status].icon
+          (instance.connectionStatus != 'open' ||
+            instance.profilePicUrl == null) &&
+          statusMapper[instance.connectionStatus].icon
         "
         size="70"
       >
-        {{ statusMapper[instance.instance.status].icon }}
+        {{ statusMapper[instance.connectionStatus].icon }}
       </v-icon>
-      <v-img v-else :src="instance.instance.profilePictureUrl" />
+      <v-img v-else :src="instance.profilePicUrl" />
     </v-avatar>
     <div class="d-flex flex-column">
       <span class="text-overline" style="line-height: 1em">
         {{ owner }}
       </span>
       <h2 class="mb-0">
-        {{ instance.instance.instanceName }}
+        {{ instance.name }}
         <v-chip
-          v-if="instance?.instance?.apikey"
+          v-if="instance?.token"
           color="info"
           class="ml-2"
           size="x-small"
           @click="copyApikey"
         >
           <v-icon start size="small">mdi-key</v-icon>
-          {{ (instance.instance?.apikey || "").slice(0, 10) }}...
+          {{ (instance.token || "").slice(0, 10) }}...
           <v-icon end size="small">
             {{ copied ? "mdi-check" : "mdi-content-copy" }}
           </v-icon>
         </v-chip>
       </h2>
-      <small>{{ instance.instance.profileStatus }}</small>
+      <small>{{ instance.profileStatus }}</small>
     </div>
     <v-spacer></v-spacer>
     <div class="d-flex gap-2 flex-wrap justify-end">
@@ -68,7 +68,7 @@
       <v-btn
         @click="disconnectInstance"
         :disabled="
-          instance.instance.status === 'close' || restart.loading || reload
+          instance.connectionStatus === 'close' || restart.loading || reload
         "
         :loading="disconnect.loading"
         variant="tonal"
@@ -102,7 +102,7 @@ export default {
     copyApikey() {
       if (this.copied) return;
 
-      copyToClipboard(this.instance.instance.apikey);
+      copyToClipboard(this.instance.token);
 
       this.copied = true;
       setTimeout(() => {
@@ -123,7 +123,7 @@ export default {
     async restartInstance() {
       this.restart.loading = true;
       try {
-        await instanceController.restart(this.instance.instance.instanceName);
+        await instanceController.restart(this.instance.name);
         this.restart.success = true;
 
         setTimeout(() => {
@@ -144,7 +144,7 @@ export default {
       this.disconnect.loading = true;
       try {
         this.disconnect.confirm = false;
-        await instanceController.logout(this.instance.instance.instanceName);
+        await instanceController.logout(this.instance.name);
         await this.AppStore.reconnect();
       } catch (e) {
         console.log(e);
@@ -156,10 +156,10 @@ export default {
   },
   computed: {
     owner() {
-      if (!this.instance?.instance?.owner)
-        return this.$t(`status.${this.instance.instance.status}`) || this.$t("unknown");
+      if (!this.instance?.ownerJid)
+        return this.$t(`status.${this.instance.connectionStatus}`) || this.$t("unknown");
 
-      return (this.instance?.instance?.owner || "").split("@")[0];
+      return (this.instance?.ownerJid || "").split("@")[0];
     },
   },
   props: {
@@ -171,4 +171,6 @@ export default {
 };
 </script>
 
-<style></style>
+<style scoped>
+/* Add your styles here if needed */
+</style>

src/components/instance/message/MyChats.vue

@@ -125,7 +125,7 @@ export default {
         this.loading = true;
         this.error = false;
         const chats = await instanceController.chat.getAll(
-          this.instance.instance.instanceName
+          this.instance.name
         );
 
         this.chats = chats;

src/components/instance/message/MyContacts.vue

@@ -141,7 +141,7 @@ export default {
         this.loading = true;
         this.error = false;
         const contacts = await instanceController.chat.getContacts(
-          this.instance.instance.instanceName
+          this.instance.instance.name
         );
 
         this.contacts = contacts.filter((c) => !c.id.includes("@g.us"));

src/components/instance/message/MyGroups.vue

@@ -139,7 +139,7 @@ export default {
         this.loading = true;
         this.error = false;
         const groups = await instanceController.group.getAll(
-          this.instance.instance.instanceName
+          this.instance.name
         );
 
         this.groups = groups;

src/components/instance/profile/BasicInfo.vue

@@ -30,7 +30,7 @@
         <v-text-field
           class="flex-grow-1 flex-shrink-0"
           v-model="data.name"
-          :disabled=" loading"
+          :disabled="loading"
           :label="$t('profile.name')"
           counter
           maxlength="25"
@@ -86,7 +86,6 @@ export default {
   },
   data: () => ({
     AppStore: useAppStore(),
-
     expanded: false,
     loading: false,
     error: false,
@@ -115,13 +114,13 @@ export default {
 
         if (this.data.name !== this.defaultData.name)
           await instanceController.profile.updateName(
-            this.instance.instance.instanceName,
+            this.instance.name,
             this.data.name
           );
 
         if (this.data.status !== this.defaultData.status)
           await instanceController.profile.updateStatus(
-            this.instance.instance.instanceName,
+            this.instance.name,
             this.data.status
           );
 
@@ -138,11 +137,11 @@ export default {
       try {
         this.loading = true;
         this.error = false;
-        const instance = this.instance.instance;
+        const instance = this.instance;
         const { isOpen } = this;
-        var data = {
-          name: isOpen ? instance.profileName.replace("not loaded", "") || "" : "",
-          status: isOpen ? instance.profileStatus || "" : "",
+        const data = {
+          name: isOpen ? instance.name : "",
+          status: isOpen ? instance.Setting.profileStatus || "" : "",
         };
 
         this.data = Object.assign({}, data);
@@ -157,7 +156,7 @@ export default {
 
   computed: {
     isOpen() {
-      return this.instance.instance.status === "open";
+      return this.instance.connectionStatus === "open";
     },
   },
   watch: {

src/components/instance/profile/Privacy.vue

@@ -120,13 +120,13 @@ import instanceController from "@/services/instanceController";
 import { useAppStore } from "@/store/app";
 
 const defaultObj = () => ({
-  enabled: false,
-  url: "",
-  account_id: "",
-  token: "",
-  sign_msg: true,
-  reopen_conversation: true,
-  conversation_pending: false,
+  readreceipts: "all",
+  profile: "all",
+  status: "all",
+  online: "all",
+  last: "all",
+  groupadd: "all",
+  calladd: "all",
 });
 
 export default {
@@ -165,24 +165,8 @@ export default {
         { value: "none", title: this.$t("privacy.options.none") },
       ],
 
-      privacyData: {
-        readreceipts: "all",
-        profile: "all",
-        status: "all",
-        online: "all",
-        last: "all",
-        groupadd: "all",
-        calladd: "all",
-      },
-      defaultChatwootData: {
-        readreceipts: "all",
-        profile: "all",
-        status: "all",
-        online: "all",
-        last: "all",
-        groupadd: "all",
-        calladd: "all",
-      },
+      privacyData: defaultObj(),
+      defaultPrivacyData: defaultObj(),
     };
   },
   methods: {
@@ -198,7 +182,7 @@ export default {
         this.loading = true;
         this.error = false;
         await instanceController.profile.updatePrivacy(
-          this.instance.instance.instanceName,
+          this.instance.name,
           this.privacyData
         );
         this.defaultPrivacyData = Object.assign({}, this.privacyData);
@@ -214,7 +198,7 @@ export default {
         this.loading = true;
         this.error = false;
         const privacyData = await instanceController.profile.getPrivacy(
-          this.instance.instance.instanceName
+          this.instance.name
         );
         this.privacyData = Object.assign(defaultObj(), privacyData || {});
         this.defaultPrivacyData = Object.assign(
@@ -230,7 +214,7 @@ export default {
   },
   computed: {
     isOpen() {
-      return this.instance.instance.status === "open";
+      return this.instance.connectionStatus === "open";
     },
   },
   watch: {