diff --git a/discovery-frontend/src/app/data-storage/component/set-workspace-published/set-workspace-published.component.html b/discovery-frontend/src/app/data-storage/component/set-workspace-published/set-workspace-published.component.html index 1c7d4f6983..71c9dfab5e 100644 --- a/discovery-frontend/src/app/data-storage/component/set-workspace-published/set-workspace-published.component.html +++ b/discovery-frontend/src/app/data-storage/component/set-workspace-published/set-workspace-published.component.html @@ -12,7 +12,7 @@ ~ limitations under the License. --> -
+
@@ -34,7 +34,7 @@
-
+
    @@ -76,7 +76,7 @@ - + @@ -92,7 +92,7 @@ - {{'msg.storage.th.owner' | translate}} + {{'msg.storage.th.owner' | translate}} ({{'msg.storage.ui.username' | translate}}) @@ -107,12 +107,14 @@ - + + + {{'msg.comm.ui.no.rslt' | translate}} +
    @@ -127,7 +129,8 @@
    - {{workspace.owner.fullName}} + {{workspace.owner.fullName}} + ({{workspace.owner.username}}) @@ -174,9 +177,9 @@ - - - + + + @@ -198,7 +201,7 @@ {{'msg.storage.th.group' | translate}} - {{'msg.storage.th.owner' | translate}} + {{'msg.storage.th.owner' | translate}} ({{'msg.storage.ui.username' | translate}}) @@ -213,13 +216,15 @@ - - - + + + + + {{'msg.comm.ui.no.rslt' | translate}} +
    @@ -240,7 +245,8 @@ {{workspace.countByMemberType.group}} - {{workspace.owner.fullName}} + {{workspace.owner.fullName}} + ({{workspace.owner.username}}) diff --git a/discovery-frontend/src/assets/css/metatron/component/component.table.css b/discovery-frontend/src/assets/css/metatron/component/component.table.css index b20beba3dd..719a9a9484 100644 --- a/discovery-frontend/src/assets/css/metatron/component/component.table.css +++ b/discovery-frontend/src/assets/css/metatron/component/component.table.css @@ -95,6 +95,7 @@ table.ddp-table-form tbody tr td .ddp-link-delete:hover em.ddp-icon-delete {back .ddp-ui-grid .ddp-ui-empty {padding:20px; color:#b7b9c3; font-size:12px;} .ddp-ui-gridbody {position:absolute; top:28px; left:0; right:0; bottom:0; overflow-y:scroll;} .ddp-box-viewtable .ddp-ui-gridhead {height:33px;border-top:none;} +.ddp-box-viewtable .ddp-ui-gridhead table {padding-right:18px;} .ddp-box-viewtable .ddp-ui-gridhead tr th {height:33px; box-sizing:border-box;} .ddp-box-viewtable .ddp-ui-gridbody {top:34px;} @@ -202,7 +203,7 @@ table.ddp-table-select tbody tr.ddp-selected td:last-of-type {border-right:1px s table.ddp-table-select tbody tr td .ddp-box-tag {position:relative; top:2px;} table.ddp-table-type2.ddp-table-select tbody tr.ddp-selected > td {padding:12px 10px 13px 10px} table.ddp-table-type2.ddp-table-select tbody tr.ddp-selected > td:first-of-type {padding-left:9px;} -table.ddp-table-type2.ddp-table-select tbody tr.ddp-selected > td:last-of-type {padding-right:29px;} +table.ddp-table-select tbody tr td:last-of-type {padding-right:29px !important;} table.ddp-table-select tr td:last-of-type {padding-right:35px;} table.ddp-table-select tbody tr.ddp-selected td:first-child:before {border-left:1px solid #666eb2;} diff --git a/discovery-frontend/src/assets/css/polaris.v2.page.css b/discovery-frontend/src/assets/css/polaris.v2.page.css index fd0eab5b35..c45b6bc8cd 100644 --- a/discovery-frontend/src/assets/css/polaris.v2.page.css +++ b/discovery-frontend/src/assets/css/polaris.v2.page.css @@ -7227,10 +7227,14 @@ ul.ddp-ui-tab li em.ddp-icon-user-s2, ul.ddp-ui-tab li em.ddp-icon-group-s2 {margin-right:8px;} ul.ddp-ui-tab li.ddp-selected em.ddp-icon-user-s2, ul.ddp-ui-tab li.ddp-selected em.ddp-icon-group-s2 {opacity:1;} +.ddp-wrap-permission.ddp-type {padding-top:0;} +.ddp-wrap-permission.ddp-type .ddp-wrap-viewtable {top:98px;} .ddp-wrap-permission {position:relative; padding-top:42px; height:100%; box-sizing:border-box;} .ddp-wrap-permission .ddp-type-check {display:inline-block; position:absolute; top:0;} .ddp-wrap-permission .ddp-wrap-viewtable{position:absolute; top:140px; left:0; right:0; bottom:68px;} .ddp-wrap-permission .ddp-wrap-switch .ddp-form-search {width:270px;} +.ddp-wrap-permission table.ddp-table-type2 tbody tr > td .ddp-data-owner {float:left; color:#b7b9c2;} +.ddp-wrap-permission table.ddp-table-type2 tbody tr > td .ddp-txt-data {float:left; padding-right:4px;} .ddp-box-popupcontents2.ddp-setting-source {width:666px;} .ddp-box-popupcontents2.ddp-setting-source > .ddp-wrap-edit2:first-of-type {margin-top:0;} diff --git a/discovery-frontend/src/assets/i18n/en.json b/discovery-frontend/src/assets/i18n/en.json index fd6a5a7da6..ecc0451ec2 100644 --- a/discovery-frontend/src/assets/i18n/en.json +++ b/discovery-frontend/src/assets/i18n/en.json @@ -2030,7 +2030,7 @@ "msg.storage.ui.conn.url.ph" : "Please enter URL", "msg.storage.ui.conn.sid.ph" : "Please enter SID", "msg.storage.ui.conn.catalog.ph" : "Please enter Catalog", - "msg.storage.ui.spaces.search.ph" : "Search by workspace", + "msg.storage.ui.spaces.search.ph" : "Search by workspace or owner name", "msg.storage.ui.action.delete" : "Do you want to delete?", "msg.storage.ui.action.data.detail" : "Data detail", "msg.storage.ui.server" : "Server", @@ -2145,6 +2145,7 @@ "msg.storage.ui.file.result.FV004": "Column names are allowed up to 50 characters.", "msg.storage.ui.file.result.FV005": "Empty column name is not allowed.", "msg.storage.ui.timezone": "Time zone", + "msg.storage.ui.username": "Username", "msg.storage.ui.timezone.country.zimbabwe": "Zimbabwe", "msg.storage.ui.timezone.country.zambia": "Zambia", diff --git a/discovery-frontend/src/assets/i18n/ko.json b/discovery-frontend/src/assets/i18n/ko.json index f5421620b5..a03f63234b 100644 --- a/discovery-frontend/src/assets/i18n/ko.json +++ b/discovery-frontend/src/assets/i18n/ko.json @@ -2029,7 +2029,7 @@ "msg.storage.ui.conn.url.ph" : "URL을 입력해 주세요", "msg.storage.ui.conn.sid.ph" : "SID를 입력해 주세요", "msg.storage.ui.conn.catalog.ph" : "Catalog를 입력해 주세요", - "msg.storage.ui.spaces.search.ph" : "워크스페이스 검색", + "msg.storage.ui.spaces.search.ph" : "워크스페이스 또는 소유자 검색", "msg.storage.ui.action.delete" : "삭제합니까?", "msg.storage.ui.action.data.detail" : "데이터 상세", "msg.storage.ui.server" : "서버", @@ -2143,6 +2143,7 @@ "msg.storage.ui.file.result.FV004": "1자~50자 이내의 컬럼명으로 작성해주세요.", "msg.storage.ui.file.result.FV005": "빈 컬럼명은 허용되지 않습니다.", "msg.storage.ui.timezone": "타임존", + "msg.storage.ui.username": "사용자이름", "msg.storage.ui.timezone.country.zimbabwe": "짐바브웨", "msg.storage.ui.timezone.country.zambia": "잠비아",