This is an automated email from the ASF dual-hosted git repository.
lidongdai pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new d0ac87a [Feature-4428][dao、UI] It is recommended to add an owner in
the data source center and the Resource Center to make it easier to manage
(#4442)
d0ac87a is described below
commit d0ac87a6389c2ff8766f477acaf3e236e11de7b1
Author: qiubo <[email protected]>
AuthorDate: Thu Jan 14 17:10:14 2021 +0800
[Feature-4428][dao、UI] It is recommended to add an owner in the data source
center and the Resource Center to make it easier to manage (#4442)
* add owner to datasource list and resource list
* add owner to datasource list and resource list
Co-authored-by: bobqiu <[email protected]>
---
.../dolphinscheduler/dao/mapper/DataSourceMapper.xml | 9 ++++++---
.../apache/dolphinscheduler/dao/mapper/ResourceMapper.xml | 15 +++++++++------
.../home/pages/datasource/pages/list/_source/list.vue | 1 +
.../pages/resource/pages/file/pages/list/_source/list.vue | 1 +
dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js | 4 +++-
dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js | 4 +++-
6 files changed, 23 insertions(+), 11 deletions(-)
diff --git
a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/DataSourceMapper.xml
b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/DataSourceMapper.xml
index b4606db..337c41e 100644
---
a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/DataSourceMapper.xml
+++
b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/DataSourceMapper.xml
@@ -40,11 +40,14 @@
<select id="selectPaging"
resultType="org.apache.dolphinscheduler.dao.entity.DataSource">
select
- <include refid="baseSql"/>
- from t_ds_datasource
+ d.id, d.name, d.note, d.type, d.user_id, connection_params,
d.create_time, d.update_time
+ ,
+ u.user_name as user_name
+ from t_ds_datasource d
+ join t_ds_user u on d.user_id = u.id
where 1 =1
<if test="userId != 0">
- and id in
+ and d.id in
(select datasource_id
from t_ds_relation_datasource_user
where user_id=#{userId}
diff --git
a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
index 6ad3508..6f53979 100644
---
a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
+++
b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
@@ -60,17 +60,20 @@
</select>
<select id="queryResourcePaging"
resultType="org.apache.dolphinscheduler.dao.entity.Resource">
select
- <include refid="baseSql"/>
- from t_ds_resources
- where type=#{type} and pid=#{id}
+ d.id, d.alias, d.file_name, d.description, d.user_id, d.type, d.size,
d.create_time, d.update_time,
+ d.pid, d.full_name, d.is_directory,
+ u.user_name as user_name
+ from t_ds_resources d
+ join t_ds_user u on d.user_id = u.id
+ where d.type=#{type} and d.pid=#{id}
<if test="userId != 0">
- and id in (select resources_id from t_ds_relation_resources_user
where user_id=#{userId}
+ and d.id in (select resources_id from t_ds_relation_resources_user
where user_id=#{userId}
union select id as resources_id from t_ds_resources where
user_id=#{userId})
</if>
<if test="searchVal != null and searchVal != ''">
- and alias like concat('%', #{searchVal}, '%')
+ and d.alias like concat('%', #{searchVal}, '%')
</if>
- order by update_time desc
+ order by d.update_time desc
</select>
<select id="queryAuthorizedResourceList"
resultType="org.apache.dolphinscheduler.dao.entity.Resource">
select
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue
index 76725a6..5a557c1 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue
@@ -20,6 +20,7 @@
<el-table :data="list" size="mini" style="width: 100%">
<el-table-column type="index" :label="$t('#')"
width="50"></el-table-column>
<el-table-column prop="name" :label="$t('Datasource
Name')"></el-table-column>
+ <el-table-column prop="userName" :label="$t('Datasource
userName')"></el-table-column>
<el-table-column prop="type" :label="$t('Datasource
Type')"></el-table-column>
<el-table-column :label="$t('Datasource Parameter')">
<template slot-scope="scope">
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue
index f85c576..e019070 100755
---
a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue
@@ -29,6 +29,7 @@
</el-popover>
</template>
</el-table-column>
+ <el-table-column prop="userName" :label="$t('Resource
userName')"></el-table-column>
<el-table-column :label="$t('Whether directory')" width="100">
<template slot-scope="scope">
{{scope.row.directory? $t('Yes') : $t('No')}}
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
index bfe27fd..9bbd27c 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -665,5 +665,7 @@ export default {
'Max Memory': 'Max Memory',
'Min Memory': 'Min Memory',
'The workflow canvas is abnormal and cannot be saved, please recreate': 'The
workflow canvas is abnormal and cannot be saved, please recreate',
- Info: 'Info'
+ Info: 'Info',
+ 'Datasource userName': 'owner',
+ 'Resource userName': 'owner'
}
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
index dc68d82..cbc27b2 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -664,5 +664,7 @@ export default {
'Max Memory': '最大内存',
'Min Memory': '最小内存',
'The workflow canvas is abnormal and cannot be saved, please recreate':
'该工作流画布异常，无法保存，请重新创建',
- Info: '提示'
+ Info: '提示',
+ 'Datasource userName': '所属用户',
+ 'Resource userName': '所属用户'
}
