From 309f94086ad46f008b844ddfebcdcd81b6527b52 Mon Sep 17 00:00:00 2001
From: omar-bear <omar@bearstudio.fr>
Date: Mon, 22 Apr 2024 14:12:18 +0100
Subject: [PATCH 1/2] fix charging mailings user page

---
 .../ui/components/mailings/admin-table.vue    |  2 +-
 packages/ui/routes/users/_userId.vue          | 36 ++++++++++++++-----
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/packages/ui/components/mailings/admin-table.vue b/packages/ui/components/mailings/admin-table.vue
index 03f09347..130336fd 100644
--- a/packages/ui/components/mailings/admin-table.vue
+++ b/packages/ui/components/mailings/admin-table.vue
@@ -25,7 +25,7 @@ export default {
 </script>
 
 <template>
-  <v-data-table :headers="tablesHeaders" :items="mailings">
+  <v-data-table :headers="tablesHeaders" :items="mailings" :loading="loading">
     <template #item.name="{ item }">
       <!-- mailings live outside the nuxt application -->
       <a :href="`/editor/${item.id}`">{{ item.name }}</a>
diff --git a/packages/ui/routes/users/_userId.vue b/packages/ui/routes/users/_userId.vue
index 2a8a0291..696e25f9 100644
--- a/packages/ui/routes/users/_userId.vue
+++ b/packages/ui/routes/users/_userId.vue
@@ -20,11 +20,8 @@ export default {
   async asyncData(nuxtContext) {
     const { $axios, params } = nuxtContext;
     try {
-      const [userResponse, mailingsResponse] = await Promise.all([
-        $axios.$get(apiRoutes.usersItem(params)),
-        $axios.$get(apiRoutes.usersItemMailings(params)),
-      ]);
-      return { user: userResponse, mailings: mailingsResponse.items };
+      const userResponse = await $axios.$get(apiRoutes.usersItem(params));
+      return { user: userResponse };
     } catch (error) {
       console.log(error);
     }
@@ -34,6 +31,7 @@ export default {
       user: {},
       mailings: [],
       loading: false,
+      isLoadingMailings: false,
     };
   },
   head() {
@@ -44,13 +42,34 @@ export default {
       return `${this.$tc('global.user', 1)} – ${this.user.name}`;
     },
   },
+  mounted() {
+    this.loadMailings();
+  },
   methods: {
     ...mapMutations(PAGE, { showSnackbar: SHOW_SNACKBAR }),
+    async loadMailings() {
+      this.isLoadingMailings = true;
+      try {
+        const {
+          $axios,
+          $route: { params },
+        } = this;
+
+        const mailingsResponse = await $axios.$get(
+          apiRoutes.usersItemMailings(params)
+        );
+        this.mailings = mailingsResponse.items;
+      } catch (error) {
+        console.log(error);
+      } finally {
+        this.isLoadingMailings = false;
+      }
+    },
     async updateUser() {
-      const { $axios, $route } = this;
-      const { params } = $route;
+      this.loading = true;
       try {
-        this.loading = true;
+        const { $axios, $route } = this;
+        const { params } = $route;
         await $axios.$put(apiRoutes.usersItem(params), this.user);
         this.showSnackbar({
           text: this.$t('snackbars.updated'),
@@ -115,6 +134,7 @@ export default {
         <bs-mailings-admin-table
           :mailings="mailings"
           :hidden-cols="[`userName`]"
+          :loading="isLoadingMailings"
         />
       </v-card-text>
     </v-card>

From 5b73f374d959a6fe1b6fcc38e35c3c72fef1a821 Mon Sep 17 00:00:00 2001
From: Omar borji <80390318+omar-bear@users.noreply.github.com>
Date: Tue, 23 Apr 2024 15:20:43 +0100
Subject: [PATCH 2/2] Update packages/ui/routes/users/_userId.vue

---
 packages/ui/routes/users/_userId.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ui/routes/users/_userId.vue b/packages/ui/routes/users/_userId.vue
index 696e25f9..e6b40637 100644
--- a/packages/ui/routes/users/_userId.vue
+++ b/packages/ui/routes/users/_userId.vue
@@ -60,7 +60,7 @@ export default {
         );
         this.mailings = mailingsResponse.items;
       } catch (error) {
-        console.log(error);
+        console.error(error);
       } finally {
         this.isLoadingMailings = false;
       }