From 9f9c52d2d81e464ba9c02075e559215d98a8c7fa Mon Sep 17 00:00:00 2001 From: gulnaz Date: Mon, 17 Mar 2025 11:11:43 +0300 Subject: [PATCH] SUPPORT-9012: fix user management service and page --- .../component/button/UserManagementService.ts | 48 ++---- .../component/enum/AccountAction.ts | 6 - .../component/enum/ApplicationKind.ts | 7 +- .../Обработка заявки на добавление пользователя.page | 150 ++---------------- 4 files changed, 29 insertions(+), 182 deletions(-) delete mode 100644 frontend/src/ts/account_applications/component/enum/AccountAction.ts diff --git a/frontend/src/ts/account_applications/component/button/UserManagementService.ts b/frontend/src/ts/account_applications/component/button/UserManagementService.ts index c261f2ee..ff494144 100644 --- a/frontend/src/ts/account_applications/component/button/UserManagementService.ts +++ b/frontend/src/ts/account_applications/component/button/UserManagementService.ts @@ -4,12 +4,10 @@ import { NotNull, ObjectRef, SaveButton, - TextField, - Visible + TextField } from "@webbpm/base-package"; import {HttpClient} from "@angular/common/http"; import {FormField} from "../field/FormField"; -import {AccountAction} from "../enum/AccountAction"; import {AuthorizationService} from "../../../modules/app/service/authorization.service"; import {ApplicationKind} from "../enum/ApplicationKind"; @@ -17,9 +15,6 @@ import {ApplicationKind} from "../enum/ApplicationKind"; export class UserManagementService extends Behavior { @NotNull() - public action: AccountAction; - @Visible("action == AccountAction.EDIT") - @NotNull("action == AccountAction.EDIT") @ObjectRef() public applicationKind: TextField; @@ -37,46 +32,31 @@ export class UserManagementService extends Behavior { return; } let jsonObj = this.collectData(); + let kind = this.applicationKind.getValue(); - switch (this.action) { - case AccountAction.CREATE: + switch (kind) { + case ApplicationKind.CREATE_USER: this.doRequest("user", jsonObj); break; - case AccountAction.EDIT: - let kind = this.applicationKind.getValue(); - - switch (kind) { - case ApplicationKind.EDIT_USER_MAIN: - this.doRequest("user/person", jsonObj); - break; - case ApplicationKind.EDIT_USER_ACCOUNT: - this.doRequest("user/account", jsonObj); - break; - case ApplicationKind.EDIT_USER_ROLES: - this.doRequest("user/roles", jsonObj); - break; - } + case ApplicationKind.EDIT_USER_MAIN: + this.doRequest("user/person", jsonObj); break; - case AccountAction.DEACTIVATE: + case ApplicationKind.EDIT_USER_ACCOUNT: + this.doRequest("user/account", jsonObj); + break; + case ApplicationKind.EDIT_USER_ROLES: + this.doRequest("user/roles", jsonObj); + break; + case ApplicationKind.BLOCK_USER: this.doRequest("users/deactivation", jsonObj); break; - case AccountAction.RESET_PASSWORD: + case ApplicationKind.RESET_PASSWORD: this.doRequest("user/password/reset", jsonObj); break; } } } - @Visible() - public setAccountAction(actionName: string): void { - try { - this.action = AccountAction[actionName]; - } - catch (error) { - console.error(`Unsupported action name ${actionName}`, error); - } - } - private collectData(): any { let jsonObj = {}; let fields: FormField[] = this.button.form.getScriptsInChildren(FormField); diff --git a/frontend/src/ts/account_applications/component/enum/AccountAction.ts b/frontend/src/ts/account_applications/component/enum/AccountAction.ts deleted file mode 100644 index 9300f182..00000000 --- a/frontend/src/ts/account_applications/component/enum/AccountAction.ts +++ /dev/null @@ -1,6 +0,0 @@ -export enum AccountAction { - CREATE = "CREATE", - EDIT = "EDIT", - DEACTIVATE = "DEACTIVATE", - RESET_PASSWORD="RESET_PASSWORD" -} diff --git a/frontend/src/ts/account_applications/component/enum/ApplicationKind.ts b/frontend/src/ts/account_applications/component/enum/ApplicationKind.ts index c8ab1007..40beac2e 100644 --- a/frontend/src/ts/account_applications/component/enum/ApplicationKind.ts +++ b/frontend/src/ts/account_applications/component/enum/ApplicationKind.ts @@ -1,5 +1,8 @@ export enum ApplicationKind { + CREATE_USER = "CREATE_USER", EDIT_USER_MAIN = "EDIT_USER_MAIN", EDIT_USER_ACCOUNT = "EDIT_USER_ACCOUNT", - EDIT_USER_ROLES = "EDIT_USER_ROLES" -} \ No newline at end of file + EDIT_USER_ROLES = "EDIT_USER_ROLES", + BLOCK_USER = "BLOCK_USER", + RESET_PASSWORD = "RESET_PASSWORD" +} diff --git a/resources/src/main/resources/business-model/Список заявок на пользователя/Обработка заявки на добавление пользователя.page b/resources/src/main/resources/business-model/Список заявок на пользователя/Обработка заявки на добавление пользователя.page index 7c29a4c4..4bd71aec 100644 --- a/resources/src/main/resources/business-model/Список заявок на пользователя/Обработка заявки на добавление пользователя.page +++ b/resources/src/main/resources/business-model/Список заявок на пользователя/Обработка заявки на добавление пользователя.page @@ -307,41 +307,7 @@ - - - - - behavior - - {"objectId":"dd6db966-9599-4483-9eae-12718b7f081b","packageName":"account_applications.component.button","className":"UserManagementService","type":"TS"} - - - - method - - "setAccountAction" - - - - value - - - - staticValue - - - string - - -"CREATE" - - - - - - - - + @@ -790,41 +756,7 @@ - - - - - behavior - - {"objectId":"dd6db966-9599-4483-9eae-12718b7f081b","packageName":"account_applications.component.button","className":"UserManagementService","type":"TS"} - - - - method - - "setAccountAction" - - - - value - - - - staticValue - - - string - - -"EDIT" - - - - - - - - + @@ -987,41 +919,7 @@ - - - - - behavior - - {"objectId":"dd6db966-9599-4483-9eae-12718b7f081b","packageName":"account_applications.component.button","className":"UserManagementService","type":"TS"} - - - - method - - "setAccountAction" - - - - value - - - - staticValue - - - string - - -"DEACTIVATE" - - - - - - - - + @@ -1191,41 +1089,7 @@ - - - - - behavior - - {"objectId":"dd6db966-9599-4483-9eae-12718b7f081b","packageName":"account_applications.component.button","className":"UserManagementService","type":"TS"} - - - - method - - "setAccountAction" - - - - value - - - - staticValue - - - string - - -"RESET_PASSWORD" - - - - - - - - + @@ -9025,6 +8889,12 @@ "CREATE" + + applicationKind + + {"objectId":"9e772048-b43f-42f1-a370-2519dd4f6ad7","packageName":"component.field","className":"TextField","type":"TS"} + +