[INLONG-5203][Manager] Refactor the user interface (#5204)

Author: healchow

inlong-dashboard/src/components/StaffSelect/index.tsx

@@ -106,7 +106,7 @@ const StaffSelect: React.FC<StaffSelectProps> = ({
 
   const { data: staffList, loading, run: getStaffList } = useRequest(
     (userName = '') => ({
-      url: '/user/listAllUsers',
+      url: '/user/listAll',
       params: {
         userName,
       },

inlong-dashboard/src/pages/UserManagement/index.tsx

@@ -43,7 +43,7 @@ const Comp: React.FC = () => {
 
   const { data, loading, run: getList } = useRequest(
     {
-      url: '/user/listAllUsers',
+      url: '/user/listAll',
       params: options,
     },
     {

inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/user/UserDetail.java

@@ -17,63 +17,73 @@
 
 package org.apache.inlong.manager.common.pojo.user;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.apache.inlong.manager.common.enums.UserTypeEnum;
-import org.apache.inlong.manager.common.validation.InEnumInt;
 
 import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.util.Date;
+import java.util.Set;
 
 /**
- * User info, including username, password, etc.
+ * User info
  */
 @Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
 @ApiModel("User info")
 public class UserInfo {
 
+    @ApiModelProperty(value = "Primary key")
     private Integer id;
 
-    /**
-     * User type {@link UserTypeEnum}
-     */
-    @NotNull(message = "type cannot be null")
-    @InEnumInt(UserTypeEnum.class)
-    @ApiModelProperty(value = "type: 0 - manager, 1 - operator", required = true)
-    private Integer type;
+    @ApiModelProperty(value = "Username")
+    private String name;
 
-    @NotBlank(message = "username cannot be blank")
-    @ApiModelProperty(value = "username", required = true)
-    private String username;
-
-    @ApiModelProperty(value = "password")
+    @ApiModelProperty(value = "User password")
     private String password;
 
-    @ApiModelProperty(value = "newPassword")
-    private String newPassword;
-
-    @ApiModelProperty("secret key")
+    @ApiModelProperty("Secret key")
     private String secretKey;
 
-    @ApiModelProperty("public key")
+    @ApiModelProperty("Public key")
     private String publicKey;
 
-    @ApiModelProperty("private key")
+    @ApiModelProperty("Private key")
     private String privateKey;
 
+    @ApiModelProperty("Encryption key version")
+    private Integer encryptVersion;
+
+    @ApiModelProperty(value = "Account type: 0 - manager, 1 - operator", required = true)
+    private Integer accountType;
+
     @Min(1)
     @NotNull(message = "validDays cannot be null")
-    @ApiModelProperty(value = "valid days", required = true)
+    @ApiModelProperty(value = "Valid days", required = true)
     private Integer validDays;
 
+    @ApiModelProperty(value = "Name of creator")
+    private String creator;
+
+    @ApiModelProperty(value = "Name of modifier")
+    private String modifier;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date modifyTime;
+
+    @ApiModelProperty(value = "User status, valid or not")
+    private String status;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date dueDate;
+
+    @ApiModelProperty(value = "User roles")
+    private Set<String> roles;
+
     @ApiModelProperty(value = "Version number")
     private Integer version;
 

inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/user/UserDetailListVO.java

@@ -28,7 +28,7 @@
  */
 @Data
 @ApiModel("Login user and password")
-public class LoginUser {
+public class UserLoginRequest {
 
     @NotBlank
     @ApiModelProperty(value = "username", required = true)

inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/user/UserDetailPageRequest.java

@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.inlong.manager.common.pojo.user;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.apache.inlong.manager.common.beans.PageRequest;
+import org.apache.inlong.manager.common.enums.UserTypeEnum;
+import org.apache.inlong.manager.common.validation.InEnumInt;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * User info request
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@ApiModel("User info request")
+public class UserRequest extends PageRequest {
+
+    @ApiModelProperty(value = "Primary key")
+    private Integer id;
+
+    @NotBlank(message = "User name cannot be blank")
+    @ApiModelProperty(value = "User name", required = true)
+    private String name;
+
+    @ApiModelProperty(value = "Keyword, can be user name")
+    private String keyword;
+
+    @ApiModelProperty(value = "User password")
+    private String password;
+
+    @ApiModelProperty(value = "New password, is required if needs updated")
+    private String newPassword;
+
+    @ApiModelProperty("Secret key")
+    private String secretKey;
+
+    @ApiModelProperty("Public key")
+    private String publicKey;
+
+    @ApiModelProperty("Private key")
+    private String privateKey;
+
+    @ApiModelProperty("Encryption key version")
+    private Integer encryptVersion;
+
+    @NotNull(message = "accountType cannot be null")
+    @InEnumInt(UserTypeEnum.class)
+    @ApiModelProperty(value = "Account type: 0 - manager, 1 - operator", required = true)
+    private Integer accountType;
+
+    @Min(1)
+    @NotNull(message = "validDays cannot be null")
+    @ApiModelProperty(value = "Valid days", required = true)
+    private Integer validDays;
+
+    @ApiModelProperty(value = "Version number")
+    private Integer version;
+
+}

inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/user/UserInfo.java

@@ -24,4 +24,5 @@ public class UserRoleCode {
 
     public static final String ADMIN = "ADMIN";
     public static final String OPERATOR = "OPERATE";
+
 }

inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/user/LoginUser.java inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/user/UserLoginRequest.java

@@ -18,7 +18,7 @@
 package org.apache.inlong.manager.common.util;
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.inlong.manager.common.pojo.user.UserDetail;
+import org.apache.inlong.manager.common.pojo.user.UserInfo;
 
 /**
  * User info for login
@@ -29,15 +29,15 @@ public class LoginUserUtils {
     /**
      * ThreadLocal for user info
      */
-    private static final ThreadLocal<UserDetail> LOGIN_USER_DETAIL_TL = new ThreadLocal<>();
+    private static final ThreadLocal<UserInfo> LOGIN_USER_DETAIL_TL = new ThreadLocal<>();
 
-    public static UserDetail getLoginUserDetail() {
+    public static UserInfo getLoginUser() {
         return LOGIN_USER_DETAIL_TL.get();
     }
 
-    public static void setUserLoginInfo(UserDetail userDetail) {
-        log.debug("user login: {}", userDetail.getUsername());
-        LOGIN_USER_DETAIL_TL.set(userDetail);
+    public static void setUserLoginInfo(UserInfo userInfo) {
+        log.debug("user login: {}", userInfo.getName());
+        LOGIN_USER_DETAIL_TL.set(userInfo);
     }
 
     public static void removeUserLoginInfo() {