Merge pull request #812 from Badsender-com/revert-808-disable-tags

Revert "Disable tags call and filter in mailings-filters.vue component"
Badsender-com · Jul 17, 2024 · e18a77a · e18a77a
2 parents d5565cd + e020d2c
commit e18a77a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/packages/server/mailing/mailing.controller.js b/packages/server/mailing/mailing.controller.js
@@ -459,10 +459,12 @@ async function bulkUpdate(req, res) {
     return mailing.save();
   });
   await Promise.all(updateQueries);
-  const mailings = await Mailings.findForApi(mailingQuery);
-
+  const [mailings, tags] = await Promise.all([
+    Mailings.findForApi(mailingQuery),
+    Mailings.findTags(modelsUtils.addStrictGroupFilter(req.user, {})),
+  ]);
   res.json({
-    meta: { tags: [] },
+    meta: { tags },
     items: mailings,
   });
 }

diff --git a/packages/server/mailing/mailing.service.js b/packages/server/mailing/mailing.service.js
@@ -121,8 +121,10 @@ async function listMailingForWorkspaceOrFolder({
     });
   }
 
+  const tags = await findTags({ user });
+
   return {
-    meta: { tags: [] },
+    meta: { tags },
     items: mailings,
   };
 }

diff --git a/packages/ui/routes/mailings/__partials/mailings-filters.vue b/packages/ui/routes/mailings/__partials/mailings-filters.vue
@@ -84,13 +84,13 @@ export default {
             multiple
             @input="(value) => handleFilterChange('templates', value)"
           />
-          <!-- <v-select
+          <v-select
             :value="filters.tags"
             :label="$t(`global.tags`)"
             :items="tags"
             multiple
             @input="(value) => handleFilterChange('tags', value)"
-          /> -->
+          />
           <div class="bs-mailings-filters__date-picker">
             <v-menu
               v-model="pickerCreatedStart"