feat

canyon-project · Feb 23, 2024 · e4f004d · e4f004d
1 parent d66f22a
commit e4f004d
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 7 deletions.
diff --git a/packages/canyon-backend/schema.gql b/packages/canyon-backend/schema.gql
@@ -33,6 +33,7 @@ type Project {
 
 type BuOption {
   bu: String!
+  count: Float!
 }
 
 type ProjectPagesModel {

diff --git a/packages/canyon-backend/src/project/project.model.ts b/packages/canyon-backend/src/project/project.model.ts
@@ -36,4 +36,6 @@ export class Project {
 export class BuOption {
   @Field(() => String)
   bu: string;
+  @Field(() => Number)
+  count: number;
 }
diff --git a/packages/canyon-backend/src/project/services/get-projects.service.ts b/packages/canyon-backend/src/project/services/get-projects.service.ts
@@ -148,6 +148,7 @@ export class GetProjectsService {
         return {
           id: id,
           bu: project.bu,
+          description: project.description,
           lastReportTime:
             summarys.length > 0
               ? summarys[0].createdAt

diff --git a/packages/canyon-backend/src/project/services/project.service.ts b/packages/canyon-backend/src/project/services/project.service.ts
@@ -101,8 +101,18 @@ export class ProjectService {
   }
 
   async getProjectsBuOptions() {
-    return this.prisma.project.groupBy({
-      by: ['bu'],
-    });
+    return this.prisma.project
+      .groupBy({
+        by: ['bu'],
+        _count: true,
+      })
+      .then((res) => {
+        return res.map((item) => {
+          return {
+            bu: item.bu,
+            count: item._count,
+          };
+        });
+      });
   }
 }
diff --git a/packages/canyon-platform/src/helpers/backend/gql/queries/GetProjects.graphql b/packages/canyon-platform/src/helpers/backend/gql/queries/GetProjects.graphql
@@ -4,6 +4,7 @@ query GetProjects($current: Int!, $pageSize: Int!, $keyword: String!,$bu: [Strin
     data {
       id
       pathWithNamespace
+      description
       bu
       reportTimes
       lastReportTime

diff --git a/packages/canyon-platform/src/helpers/backend/gql/queries/GetProjectsBuOptions.graphql b/packages/canyon-platform/src/helpers/backend/gql/queries/GetProjectsBuOptions.graphql
@@ -1,5 +1,6 @@
 query GetProjectsBuOptions {
   getProjectsBuOptions {
-    bu
+    bu,
+    count
   }
 }
diff --git a/packages/canyon-platform/src/pages/index/projects/index.tsx b/packages/canyon-platform/src/pages/index/projects/index.tsx
@@ -16,7 +16,7 @@ import {
   Project,
 } from '../../../helpers/backend/gen/graphql.ts';
 
-const { Title } = Typography;
+const { Title, Text } = Typography;
 
 const { useToken } = theme;
 const ProjectPage = () => {
@@ -33,6 +33,16 @@ const ProjectPage = () => {
       title: t('projects.name'),
       dataIndex: 'pathWithNamespace',
       key: 'pathWithNamespace',
+      render: (text, record) => {
+        return (
+          <div className={'flex flex-col'}>
+            {text}
+            <Text type={'secondary'} style={{ fontSize: '12px' }}>
+              {record.description}
+            </Text>
+          </div>
+        );
+      },
     },
     {
       title: 'Bu',
@@ -172,8 +182,8 @@ const ProjectPage = () => {
               }}
               placeholder={'Bu'}
               className={'w-[200px] mr-2'}
-              options={(projectsBuOptionsData?.getProjectsBuOptions || []).map(({ bu }) => ({
-                label: bu,
+              options={(projectsBuOptionsData?.getProjectsBuOptions || []).map(({ bu, count }) => ({
+                label: bu + ` ${count}`,
                 value: bu,
               }))}
             />
@@ -206,6 +216,7 @@ const ProjectPage = () => {
             }}
             bordered={false}
             dataSource={projectsData?.getProjects?.data || []}
+            // @ts-ignore
             columns={columns}
             onChange={(val, _, _sorter: any) => {
               setSorter({