[incubator-streampark] branch dev updated: [Improve] remove user/types api in UserController (#2709)

[benjobs]

This is an automated email from the ASF dual-hosted git repository.

benjobs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git


The following commit(s) were added to refs/heads/dev by this push:
     new 950196a3d [Improve] remove user/types api in UserController (#2709)
950196a3d is described below

commit 950196a3d467ee6b011902f31a4861aa190f7dc8
Author: zhoulii <zhouli....@foxmail.com>
AuthorDate: Thu Apr 27 23:59:06 2023 +0800

    [Improve] remove user/types api in UserController (#2709)
    
    Co-authored-by: zhoulii <zhoul...@hikvision.com.cn>
---
 .../console/system/controller/UserController.java         |  8 --------
 .../streampark-console-webapp/src/api/system/user.ts      | 12 ------------
 .../src/views/system/user/user.data.ts                    | 15 ++++++++++++---
 3 files changed, 12 insertions(+), 23 deletions(-)

diff --git 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java
 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java
index 92709df51..13fafed17 100644
--- 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java
+++ 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java
@@ -24,7 +24,6 @@ import 
org.apache.streampark.console.base.exception.ApiAlertException;
 import org.apache.streampark.console.core.annotation.PermissionAction;
 import org.apache.streampark.console.core.enums.LoginType;
 import org.apache.streampark.console.core.enums.PermissionType;
-import org.apache.streampark.console.core.enums.UserType;
 import org.apache.streampark.console.core.service.CommonService;
 import org.apache.streampark.console.system.entity.Team;
 import org.apache.streampark.console.system.entity.User;
@@ -131,13 +130,6 @@ public class UserController {
     return RestResponse.success(newPass);
   }
 
-  @Operation(summary = "List user types")
-  @PostMapping("types")
-  @RequiresPermissions("user:types")
-  public RestResponse userTypes() {
-    return RestResponse.success(UserType.values());
-  }
-
   @Operation(summary = "Init the user teams")
   @PostMapping("initTeam")
   public RestResponse initTeam(Long teamId, Long userId) {
diff --git 
a/streampark-console/streampark-console-webapp/src/api/system/user.ts 
b/streampark-console/streampark-console-webapp/src/api/system/user.ts
index f5273a073..b5767df01 100644
--- a/streampark-console/streampark-console-webapp/src/api/system/user.ts
+++ b/streampark-console/streampark-console-webapp/src/api/system/user.ts
@@ -41,7 +41,6 @@ enum Api {
   ResetPassword = '/user/password/reset',
   Password = '/user/password',
   CheckName = '/user/check/name',
-  TYPES = '/user/types',
   SET_TEAM = '/user/setTeam',
   INIT_TEAM = '/user/initTeam',
   APP_OWNERS = '/user/appOwners',
@@ -116,17 +115,6 @@ export function checkUserName(data) {
   });
 }
 
-export function fetchUserTypes() {
-  return defHttp
-    .post({
-      url: Api.TYPES,
-      data: {},
-    })
-    .then((res) => {
-      return res.map((t: string) => ({ label: t, value: t }));
-    });
-}
-
 /**
  * User change password
  * @param data
diff --git 
a/streampark-console/streampark-console-webapp/src/views/system/user/user.data.ts
 
b/streampark-console/streampark-console-webapp/src/views/system/user/user.data.ts
index c62eb8b70..57ab342b1 100644
--- 
a/streampark-console/streampark-console-webapp/src/views/system/user/user.data.ts
+++ 
b/streampark-console/streampark-console-webapp/src/views/system/user/user.data.ts
@@ -17,7 +17,7 @@
 import { BasicColumn, FormSchema } from '/@/components/Table';
 import { h } from 'vue';
 import { Tag } from 'ant-design-vue';
-import { checkUserName, fetchUserTypes } from '/@/api/system/user';
+import { checkUserName } from '/@/api/system/user';
 import { FormTypeEnum } from '/@/enums/formEnum';
 import { useI18n } from '/@/hooks/web/useI18n';
 const { t } = useI18n();
@@ -34,6 +34,12 @@ export const enum GenderEnum {
   Other = '2',
 }
 
+// user type
+export const enum UserTypeEnum {
+  ADMIN = 'ADMIN',
+  USER = 'USER',
+}
+
 export const columns: BasicColumn[] = [
   { title: t('system.user.form.userName'), dataIndex: 'username', sorter: true 
},
   { title: t('system.user.form.nickName'), dataIndex: 'nickName' },
@@ -142,10 +148,13 @@ export const formSchema = (formType: string): 
FormSchema[] => {
     {
       label: t('system.user.form.userType'),
       field: 'userType',
-      component: 'ApiSelect',
+      component: 'Select',
       componentProps: {
         disabled: isView,
-        api: fetchUserTypes,
+        options:  [
+          { label: t('ADMIN'), value: UserTypeEnum.ADMIN },
+          { label: t('USER'), value: UserTypeEnum.USER },
+        ]
       },
       rules: [{ required: true }],
     },