From a84bfb028a1ea8cf3148894e12222a7031269bfe Mon Sep 17 00:00:00 2001 From: mozzie Date: Fri, 1 Sep 2023 16:36:58 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=8A=E4=BC=A0=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E5=BD=B1=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/cert/core/domain/Rbac/RbacService.ts | 2 +- .../src/modules/User/List/CreateUserForm.tsx | 2 +- apps/cert/src/modules/User/List/UserTable.tsx | 1 - apps/dmp/core/domain/User/UserRepository.ts | 4 ++ apps/dmp/core/domain/User/UserService.ts | 7 +++ apps/dmp/core/domain/User/entities/User.ts | 1 + apps/dmp/core/infra/api/index.ts | 8 ++- apps/dmp/src/components/Layout/Menu/index.tsx | 2 +- .../Admin/Dicom/List/TaskTable/index.tsx | 7 +++ .../Admin/Dicom/Upload/AssignModal.tsx | 7 ++- .../src/modules/Admin/Dicom/Upload/index.tsx | 10 +-- .../src/modules/Annotator/Archive/columns.tsx | 14 +++++ .../src/modules/Annotator/Archive/index.tsx | 63 +++++++++++++++++++ apps/dmp/src/modules/Annotator/List/index.tsx | 7 --- apps/dmp/src/modules/Annotator/index.tsx | 4 +- apps/dmp/src/router/roleRoutes.tsx | 8 +-- apps/services/cert/authorize/package.json | 3 +- .../dmp/archive/src/app.controller.ts | 5 ++ apps/services/dmp/archive/src/app.service.ts | 8 ++- .../archive/src/entity/archiveTask.entity.ts | 4 +- apps/services/dmp/archive/tsconfig.json | 2 +- .../dmp/gateway/src/admin/admin.controller.ts | 6 +- .../src/annotator/annotator.controller.ts | 25 ++++++++ .../gateway/src/annotator/annotator.module.ts | 22 +++++++ apps/services/dmp/gateway/src/app.module.ts | 2 + pnpm-lock.yaml | 31 ++++++--- 26 files changed, 213 insertions(+), 42 deletions(-) create mode 100644 apps/dmp/src/modules/Admin/Dicom/List/TaskTable/index.tsx create mode 100644 apps/dmp/src/modules/Annotator/Archive/columns.tsx create mode 100644 apps/dmp/src/modules/Annotator/Archive/index.tsx delete mode 100644 apps/dmp/src/modules/Annotator/List/index.tsx create mode 100644 apps/services/dmp/gateway/src/annotator/annotator.controller.ts create mode 100644 apps/services/dmp/gateway/src/annotator/annotator.module.ts diff --git a/apps/cert/core/domain/Rbac/RbacService.ts b/apps/cert/core/domain/Rbac/RbacService.ts index 99e0a94..58a72d7 100644 --- a/apps/cert/core/domain/Rbac/RbacService.ts +++ b/apps/cert/core/domain/Rbac/RbacService.ts @@ -108,7 +108,7 @@ export class RbacService { name: r.name, })); const user = { - id: Math.max(...this.userList.map((u) => u.id!)), + id: Date.now(), roles: roleMapping.filter((r) => roleIds?.includes(r.id!)), isEnabled: true, username, diff --git a/apps/cert/src/modules/User/List/CreateUserForm.tsx b/apps/cert/src/modules/User/List/CreateUserForm.tsx index 3694a1b..d1bedae 100644 --- a/apps/cert/src/modules/User/List/CreateUserForm.tsx +++ b/apps/cert/src/modules/User/List/CreateUserForm.tsx @@ -49,7 +49,7 @@ export const CreateUserForm = (props: CreateUserFormProps) => { - +