From 5ec126a474f98193f693de2b424b1cc31c1efc3f Mon Sep 17 00:00:00 2001
From: bailongsen1027 <132729499+bailongsen1027@users.noreply.github.com>
Date: Tue, 5 Dec 2023 21:35:56 +0800
Subject: [PATCH] Feature bailongsen (#655)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 自定义菜单渲染

* fix: 调整布局

* fix: 调试分配权限接口

* fix: 调试角色分配用户

* feat: The role assigned to a user is added

* feat:Added a resource configuration role

* [Bug][scaleph-security] fix web resource child routes error (#637)

fix: child routes error

* [Bug][docker] fix scaleph-seatunnel image error (#638)

* feature: add doris operator

* feature: add web-resource and role relation table

* feature: add web-resource and role relation mapper

* feature: add web-resource and role relation mapper

* fix: seatunnel base image

* [Bug][docker] fix scaleph-seatunnel image error (#639)

fix: seatunnel base image

* [Bug][docker] fix scaleph-seatunnel image error (#640)

fix: seatunnel base image

* [Bug][docker] fix scaleph-seatunnel image error (#641)

fix: seatunnel base image

* [Bug][docker] fix scaleph-seatunnel image error (#642)

* fix: seatunnel base image

* fix: seatunnel base image

* [Feature][scaleph-security] add security web resource and role relation api (#644)

* fix: seatunnel base image

* feature: add resource-web and role relation api

* [Feature][scaleph-security] add user and role relation api (#645)

* feature: add user and role relation api

* feature: add user and role relation api

* [Feature][scaleph-engine-doris] add selectdb doris-operator crd (#646)

* feature: doris operator crd definition

* fix: resource-web and role relation error

* [Bug][scaleph-security] fix umi route icon error (#647)

* fix: resource-web and role relation error

* fix: route icon error

* [Feature][scaleph-ui-react] add doris template web under project (#648)

* feature: add doris template mapper

* feature: add doris template service

* feature: add doris template service

* feature: add doris template web route

* feature: add doris template web

* [Feature][scaleph-engine-doris] add doris template steps form (#649)

* feature: upgrade flink kubernetes operator to 1.7.0

* feature: add doris template detail web

* feature: add doris template detail web

* feature: add doris template steps

* feature: add doris template steps

* feature: add doris template steps route

* feature: add doris template component step

* fix: knife4j error

* fix: knife4j error

* fix: knife4j error

* fix: knife4j error

* [Feature][scaleph-engine-doris] add doris template detail web (#650)

* fix: doris template step form item error

* feature: add doris template yaml step

* feature: add doris template yaml step

* feature: add createStatus for doris template

* feature: add yaml step for doris template steps

* feature: add yaml step for doris template steps

* feature: add yaml step for doris template steps

* feature: remove doris template createStatus field

* feature: refactor doris template step model

* feature: add yaml area for doris template detail web

* feature: add yaml area for doris template detail web

* [Feature][scaleph-engine-doris] add doris instance service (#651)

* feature: add doris instance service

* feature: add doris instance controller

* feature: add doris instance controller

* feature: add doris instance web

* feature: add doris instance steps

* feature: add doris instance steps

* feature: add doris instance steps

* fix: system nav bar error

* [Feature][scaleph-engine-doris] add doris instance steps form web (#652)

* fix: user resource

* fix: user resource

* feature: add doris instance steps form

* [Feature][scaleph-engine-doris] add doris instance detail web  (#653)

* feature: add doris instance detail web

* feature: add doris instance detail web

* feature: add doris instance detail web

* [Release] release 2.0.0-SNAPSHOT

* fix: Modify the assignment user prompt text display

---------

Co-authored-by: bailongsen <bailongsen@xinxuan.net>
Co-authored-by: kalencaya <1942460489@qq.com>
---
 .../src/pages/Admin/Role/components/WebAssugnRoles.tsx          | 2 +-
 scaleph-ui-react/src/pages/Admin/User/index.tsx                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scaleph-ui-react/src/pages/Admin/Role/components/WebAssugnRoles.tsx b/scaleph-ui-react/src/pages/Admin/Role/components/WebAssugnRoles.tsx
index 7b34ca1bf..a99b66922 100644
--- a/scaleph-ui-react/src/pages/Admin/Role/components/WebAssugnRoles.tsx
+++ b/scaleph-ui-react/src/pages/Admin/Role/components/WebAssugnRoles.tsx
@@ -148,7 +148,7 @@ const WebResourceForm: React.FC<ModalFormParentProps<SecResourceWeb>> = ({
         >
           <TableTransfer
             containerHeight={containerInfo.height}
-            titles={[intl.formatMessage({ id: 'app.common.operate.new.accreditUser' }), intl.formatMessage({ id: 'app.common.operate.new.notAccreditUser' })]}
+            titles={[intl.formatMessage({ id: 'app.common.operate.new.notAccreditUser' }), intl.formatMessage({ id: 'app.common.operate.new.accreditUser' })]}
             dataSource={roleLists}
             targetKeys={originTargetKeys}
             showSearch={true}
diff --git a/scaleph-ui-react/src/pages/Admin/User/index.tsx b/scaleph-ui-react/src/pages/Admin/User/index.tsx
index 3166099e8..ca7b9b90b 100644
--- a/scaleph-ui-react/src/pages/Admin/User/index.tsx
+++ b/scaleph-ui-react/src/pages/Admin/User/index.tsx
@@ -124,7 +124,7 @@ const User: React.FC = () => {
         <>
           <Space>
             {access.canAccess(PRIVILEGE_CODE.datadevProjectEdit) && (
-              <Tooltip title={intl.formatMessage({ id: 'app.common.operate.new.user' })}>
+              <Tooltip title={intl.formatMessage({ id: 'app.common.operate.new.roles' })}>
                 <Button
                   shape="default"
                   type="link"