chore(cms): fix categories/tags pagination

soyombo-baterdene · soyombo-baterdene · commit 69e01fb674d7 · 2025-11-04T11:53:34.000+08:00
diff --git a/packages/plugin-cms-api/src/graphql/resolvers/queries/category.ts b/packages/plugin-cms-api/src/graphql/resolvers/queries/category.ts
@@ -58,7 +58,8 @@ const queries = {
     const categoriesWithTranslations = categories.map((category) => {
       const translation = translationsMap[category._id.toString()];
       category.name = translation?.title || category.name;
-      category.description = translation?.excerpt || translation?.content || category.description;
+      category.description =
+        translation?.excerpt || translation?.content || category.description;
       return category;
     });
 
@@ -92,10 +93,35 @@ const queries = {
     }).lean();
 
     category.name = translation?.title || category.name;
-    category.description = translation?.excerpt || translation?.content || category.description;
+    category.description =
+      translation?.excerpt || translation?.content || category.description;
 
     return category;
   },
+
+  async cmsCategoriesCount(
+    _parent: any,
+    args: any,
+    context: IContext
+  ): Promise<number> {
+    const { models } = context;
+    const { searchValue, status } = args;
+    const clientPortalId = args.clientPortalId || context.clientPortalId;
+
+    const query: any = { clientPortalId };
+    if (status) query.status = status;
+
+    if (searchValue) {
+      query.$or = [
+        { name: { $regex: searchValue, $options: 'i' } },
+        { slug: { $regex: searchValue, $options: 'i' } },
+      ];
+    }
+
+    // ✅ Await the query result before returning
+    const count = await models.Categories.countDocuments(query);
+    return count;
+  },
 };
 
 export default queries;
diff --git a/packages/plugin-cms-api/src/graphql/resolvers/queries/tag.ts b/packages/plugin-cms-api/src/graphql/resolvers/queries/tag.ts
@@ -102,6 +102,26 @@ const queries = {
 
     return tag;
   },
+
+  cmsTagsCount(_parent: any, args: any, context: IContext): Promise<number> {
+    const { models } = context;
+    const { searchValue, status } = args;
+    const clientPortalId = args.clientPortalId || context.clientPortalId;
+
+    const query: any = { clientPortalId };
+    if (status) query.status = status;
+
+    if (searchValue) {
+      query.$or = [
+        { name: { $regex: searchValue, $options: 'i' } },
+        { slug: { $regex: searchValue, $options: 'i' } },
+      ];
+    }
+
+    // ✅ Await the query result before returning
+    const count = models.PostTags.countDocuments(query);
+    return count;
+  },
 };
 
 export default queries;
diff --git a/packages/plugin-cms-api/src/graphql/schemas/category.ts b/packages/plugin-cms-api/src/graphql/schemas/category.ts
@@ -38,6 +38,7 @@ export const inputs = `
 
 export const queries = `
     cmsCategories(clientPortalId: String, searchValue: String, status: CategoryStatus, page: Int, perPage: Int, sortField: String, sortDirection: String, language: String): [PostCategory]
+    cmsCategoriesCount(clientPortalId: String, searchValue: String, status: CategoryStatus): Int
     cmsCategory(_id: String, slug: String, language: String): PostCategory
 `;
 
diff --git a/packages/plugin-cms-api/src/graphql/schemas/tag.ts b/packages/plugin-cms-api/src/graphql/schemas/tag.ts
@@ -11,7 +11,6 @@ export const types = `
 `;
 
 export const inputs = `
-
     input PostTagInput {
         name: String
         slug: String
@@ -23,6 +22,7 @@ export const inputs = `
 
 export const queries = `
     cmsTags(clientPortalId: String, searchValue: String, page: Int, perPage: Int, sortField: String, sortDirection: String, language: String): [PostTag]
+    cmsTagsCount(clientPortalId: String, searchValue: String): Int
     cmsTag(_id: String, slug: String, language: String): PostTag
 `;
 
diff --git a/packages/plugin-cms-ui/src/modules/categories/containers/List.tsx b/packages/plugin-cms-ui/src/modules/categories/containers/List.tsx
@@ -56,6 +56,14 @@ export default function ListContainer(props: Props) {
     fetchPolicy: 'network-only',
   });
 
+  const { data: countData, loading: countLoading } = useQuery(queries.GET_CATEGORIES_COUNT, {
+    variables: {
+      clientPortalId: cpId,
+      ...router.generatePaginationParams(props.queryParams || {}),
+    },
+    fetchPolicy: 'network-only',
+  });
+
   const [removeMutation] = useMutation(mutations.CATEGORY_REMOVE);
 
   if (loading) {
@@ -87,7 +95,7 @@ export default function ListContainer(props: Props) {
     clientPortalId: cpId,
     loading,
     categoryTree,
-    totalCount: data?.cmsCategories?.length || 0,
+    totalCount: countData?.cmsCategoriesCount || 0,
     refetch,
     remove,
   };
diff --git a/packages/plugin-cms-ui/src/modules/categories/graphql/queries.ts b/packages/plugin-cms-ui/src/modules/categories/graphql/queries.ts
@@ -39,6 +39,13 @@ const GET_CATEGORIES = gql`
   }
 `;
 
+const GET_CATEGORIES_COUNT = gql`
+query cmsCategoriesCount($clientPortalId: String, $searchValue: String, $status: CategoryStatus) {
+  cmsCategoriesCount(clientPortalId: $clientPortalId, searchValue: $searchValue, status: $status)
+}
+`;
+
 export default {
   GET_CATEGORIES,
+  GET_CATEGORIES_COUNT,
 };
diff --git a/packages/plugin-cms-ui/src/modules/tags/containers/List.tsx b/packages/plugin-cms-ui/src/modules/tags/containers/List.tsx
@@ -30,6 +30,14 @@ export default function ListContainer(props: Props) {
     fetchPolicy: 'network-only',
   });
 
+  const { data: countData, loading: countLoading } = useQuery(queries.GET_TAGS_COUNT, {
+    variables: {
+      clientPortalId: cpId,
+      searchValue: props.queryParams?.searchValue,
+    },
+    fetchPolicy: 'network-only',
+  });
+
   const [removeMutation] = useMutation(mutations.TAG_REMOVE);
 
   if (loading) {
@@ -60,7 +68,7 @@ export default function ListContainer(props: Props) {
     clientPortalId: cpId,
     loading,
     tags: data?.cmsTags || [],
-    totalCount: data?.cmsTags?.length || 0,
+    totalCount: countData?.cmsTagsCount || 0,
     refetch,
     remove,
   };
diff --git a/packages/plugin-cms-ui/src/modules/tags/graphql/queries.ts b/packages/plugin-cms-ui/src/modules/tags/graphql/queries.ts
@@ -28,6 +28,13 @@ const GET_TAGS = gql`
   }
 `;
 
+const GET_TAGS_COUNT = gql`
+query cmsTagsCount($clientPortalId: String, $searchValue: String) {
+  cmsTagsCount(clientPortalId: $clientPortalId, searchValue: $searchValue)
+}
+`;
+
 export default {
   GET_TAGS,
+  GET_TAGS_COUNT,
 };
