Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

modify: global workflow display based on roles #2695

Merged
merged 2 commits into from
Oct 18, 2024
Merged

modify: global workflow display based on roles #2695

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14b6ffd
modify: global workflow display based on roles
winfredLIN Oct 18, 2024
d9e526d
modify: if filter by create user id, filter from all projects
winfredLIN Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
111 changes: 89 additions & 22 deletions sqle/api/controller/v1/workflow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,36 +571,58 @@ func GetGlobalWorkflowsV1(c echo.Context) error {
return controller.JSONBaseErrorReq(c, err)
}

// 1. 权限控制
// 1.1. 获取用户的所有权限信息
user, err := controller.GetCurrentUser(c, dms.GetUser)
if err != nil {
return controller.JSONBaseErrorReq(c, err)
}
permissions, isAdmin, err := dmsobject.GetUserOpPermission(c.Request().Context(), "", user.GetIDStr(), dms.GetDMSServerAddress())
if err != nil {
return controller.JSONBaseErrorReq(c, err)
}
// 1.2. 获取用户全局待关注清单的可见性
userVisibility := getGlobalDashBoardVisibilityOfUser(isAdmin, permissions)
if req.FilterCurrentStepAssigneeUserId != "" {
// 如果根据当前用户筛选，则筛选出用户在所有项目中的工单
userVisibility = GlobalDashBoardVisibilityGlobal
}
// 1.3. 若用户可见性为多项目，则需要根据项目id筛选
var projectIdsOfProjectAdmin []string
if userVisibility == GlobalDashBoardVisibilityProjects {
for _, permission := range permissions {
if permission.OpPermissionType == dmsV1.OpPermissionTypeProjectAdmin {
projectIdsOfProjectAdmin = append(projectIdsOfProjectAdmin, permission.RangeUids...)
}
}
}

// 2. 组织筛选项
// 2.1. 基本筛选项
limit, offset := controller.GetLimitAndOffset(req.PageIndex, req.PageSize)

data := map[string]interface{}{
"filter_subject": req.FilterSubject,
"filter_create_time_from": req.FilterCreateTimeFrom,
"filter_create_time_to": req.FilterCreateTimeTo,
"filter_create_user_id": req.FilterCreateUserId,
"filter_task_execute_start_time_from": req.FilterTaskExecuteStartTimeFrom,
"filter_task_execute_start_time_to": req.FilterTaskExecuteStartTimeTo,
"filter_status": req.FilterStatus,
"filter_current_step_assignee_user_id": req.FilterCurrentStepAssigneeUserId,
"filter_task_instance_id": req.FilterTaskInstanceId,
"current_user_id": user.GetIDStr(),
"check_user_can_access": user.Name != model.DefaultAdminUser, // dms-todo: 判断是否是超级管理员
"limit": limit,
"offset": offset,
"filter_status_list": req.FilterStatusList, // 根据SQL工单的状态筛选多个状态的工单
"filter_project_id": req.FilterProjectUid, // 根据项目id筛选某些一个项目下的多个工单
"filter_instance_id": req.FilterInstanceId, // 根据工单记录的数据源id，筛选包含该数据源的工单，多数据源情况下，一旦包含该数据源，则被选中
}

projectMap := make(map[string] /* project uid */ *dmsV1.ListProject)
// 若根据项目优先级筛选，则先请求dms，获取优先级对应的项目信息
// "filter_subject": req.FilterSubject,
// "filter_create_time_from": req.FilterCreateTimeFrom,
// "filter_create_time_to": req.FilterCreateTimeTo,
LordofAvernus marked this conversation as resolved.
Show resolved Hide resolved
// "filter_task_execute_start_time_from": req.FilterTaskExecuteStartTimeFrom,
// "filter_task_execute_start_time_to": req.FilterTaskExecuteStartTimeTo,
// "filter_status": req.FilterStatus,
// "filter_current_step_assignee_user_id": req.FilterCurrentStepAssigneeUserId,
// "filter_task_instance_id": req.FilterTaskInstanceId,
// "current_user_id": user.GetIDStr(),
// "check_user_can_access": canViewGlobal,
"filter_create_user_id": req.FilterCreateUserId,
"limit": limit,
"offset": offset,
"filter_status_list": req.FilterStatusList, // 根据SQL工单的状态筛选多个状态的工单
"filter_project_id": req.FilterProjectUid, // 根据项目id筛选某些一个项目下的多个工单
"filter_instance_id": req.FilterInstanceId, // 根据工单记录的数据源id，筛选包含该数据源的工单，多数据源情况下，一旦包含该数据源，则被选中
}
// 2.2 页面筛选项：如果根据项目优先级筛选，则先筛选出对应优先级下的项目
var projectIdsByPriority []string
var projectMap map[string]*dmsV1.ListProject
if req.FilterProjectPriority != "" {
data["filter_project_id_list"], projectMap, err = loadProjectsByPriority(c.Request().Context(), req.FilterProjectPriority)
projectIdsByPriority, projectMap, err = loadProjectsByPriority(c.Request().Context(), req.FilterProjectPriority)
if err != nil {
return controller.JSONBaseErrorReq(c, err)
}
Expand All @@ -612,7 +634,26 @@ func GetGlobalWorkflowsV1(c echo.Context) error {
})
}
}
if req.FilterProjectPriority != "" {
// 2.2.1 若根据项目优先级筛选，则根据优先级对应的项目筛选
data["filter_project_id_list"] = projectIdsByPriority
}

if req.FilterProjectPriority != "" && userVisibility == GlobalDashBoardVisibilityProjects {
// 2.2.2 若根据项目优先级筛选，且可以查看多项目待关注SQL，则将可查看的项目和项目优先级筛选后的项目的集合取交集
data["filter_project_id_list"] = utils.IntersectionStringSlice(projectIdsByPriority, projectIdsOfProjectAdmin)
}
// 2.3 若不根据项目优先级筛选
if req.FilterProjectPriority == "" && userVisibility == GlobalDashBoardVisibilityProjects {
// 2.3.1 若可以查看多项目待关注SQL，则通过用户的有权限的项目进行筛选
data["filter_project_id_list"] = projectIdsOfProjectAdmin
}
// 2.4. 若用户可见性为受让人，则可以查看在SQL管控中分配给他的SQL
if userVisibility == GlobalDashBoardVisibilityAssignee {
winfredLIN marked this conversation as resolved.
Show resolved Hide resolved
data["filter_current_step_assignee_user_id"] = user.GetIDStr()
}

// 3. 根据筛选项筛选SQL管控的SQL信息
s := model.GetStorage()
workflows, count, err := s.GetWorkflowsByReq(data)
if err != nil {
Expand Down Expand Up @@ -670,6 +711,32 @@ func GetGlobalWorkflowsV1(c echo.Context) error {
})
}

type GlobalDashBoardVisibility string

const GlobalDashBoardVisibilityGlobal GlobalDashBoardVisibility = "global"
const GlobalDashBoardVisibilityProjects GlobalDashBoardVisibility = "projects"
const GlobalDashBoardVisibilityAssignee GlobalDashBoardVisibility = "assignee"

func getGlobalDashBoardVisibilityOfUser(isAdmin bool, permissions []dmsV1.OpPermissionItem) GlobalDashBoardVisibility {
// 角色：全局管理员，全局可查看者
if isAdmin {
return GlobalDashBoardVisibilityGlobal
}
for _, permission := range permissions {
if permission.OpPermissionType == dmsV1.OpPermissionTypeGlobalView || permission.OpPermissionType == dmsV1.OpPermissionTypeGlobalManagement {
return GlobalDashBoardVisibilityGlobal
}
}
// 角色：多项目管理者
for _, permission := range permissions {
if permission.OpPermissionType == dmsV1.OpPermissionTypeProjectAdmin {
return GlobalDashBoardVisibilityProjects
}
}
// 角色：受让人，事件处理者
return GlobalDashBoardVisibilityAssignee
}

// 根据项目优先级从 dms 系统中获取相应的项目列表，并返回项目ID列表和项目映射
func loadProjectsByPriority(ctx context.Context, priority dmsV1.ProjectPriority) (projectIds []string, projectMap map[string] /* project uid */ *dmsV1.ListProject, err error) {
projectMap = make(map[string]*dmsV1.ListProject)
Expand Down
Loading