fix: show archived product categories

erxes · Mar 13, 2024 · ade8d51 · ade8d51
1 parent a5ddd7f
commit ade8d51
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/packages/plugin-products-api/src/dataloaders/resolvers/queries/products.ts b/packages/plugin-products-api/src/dataloaders/resolvers/queries/products.ts
@@ -64,15 +64,15 @@ const generateFilter = async (
   }
 
   if (categoryId) {
-    const category = await models.ProductCategories.getProductCategory({
-      _id: categoryId,
-      status: { $in: [null, 'active'] },
-    });
+    const category = await models.ProductCategories.findOne({
+      _id: categoryId
+    }).lean();
 
-    const productCategoryIds = await models.ProductCategories.find(
+    const productCategoryIds = category ? await models.ProductCategories.find(
       { order: { $regex: new RegExp(`^${escapeRegExp(category.order)}`) } },
       { _id: 1 },
-    );
+    ) : [];
+
     filter.categoryId = { $in: productCategoryIds };
   } else {
     const notActiveCategories = await models.ProductCategories.find({
@@ -327,7 +327,7 @@ const productQueries = {
           (similarityGroups[cm].rules || [])
             .map((sg) => sg.fieldId)
             .filter((sgf) => customFieldIds.includes(sgf)).length ===
-            (similarityGroups[cm].rules || []).length,
+          (similarityGroups[cm].rules || []).length,
       );
 
       if (!matchedMasks.length) {

diff --git a/packages/plugin-products-ui/src/components/product/filters/CategoryStatusFilter.tsx b/packages/plugin-products-ui/src/components/product/filters/CategoryStatusFilter.tsx
@@ -2,7 +2,6 @@ import React from 'react';
 import { withRouter } from 'react-router-dom';
 
 import Box from '@erxes/ui/src/components/Box';
-import Icon from '@erxes/ui/src/components/Icon';
 import { IRouterProps } from '@erxes/ui/src/types';
 import { __, router } from '@erxes/ui/src/utils';
 import { FieldStyle, SidebarList } from '@erxes/ui/src/layout/styles';
@@ -20,7 +19,7 @@ class CategoryStatusFilter extends React.Component<IProps> {
 
     const onClick = (key, value) => {
       router.setParams(history, { [key]: value });
-      router.setParams(history, { categoryId: null });
+      router.removeParams(history, 'categoryId');
     };
 
     return (

diff --git a/packages/plugin-products-ui/src/components/productCategory/CategoryList.tsx b/packages/plugin-products-ui/src/components/productCategory/CategoryList.tsx
@@ -93,7 +93,7 @@ class List extends React.Component<IProps> {
   };
 
   renderContent() {
-    const { productCategories, loading, queryParams } = this.props;
+    const { productCategories, loading, queryParams, history } = this.props;
 
     return (
       <CollapsibleList
@@ -104,7 +104,7 @@ class List extends React.Component<IProps> {
         loading={loading}
         onClick={this.onClick}
         queryParams={queryParams}
-        treeView={true}
+        treeView={!['disabled', 'archived'].includes(router.getParam(history, ['status']))}
         keyCount="productCount"
       />
     );