yujunjun/datahub
2
0
Fork 0
mirror of https://github.com/datahub-project/datahub.git synced 2026-01-08 07:46:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1080 from theseyi/whitelist-CR

Browse Source 
integrates new api CR for JitAclAccessWhitelist list. minor styling m…
This commit is contained in:
Seyi Adebajo 2018-04-05 11:26:57 -07:00 committed by GitHub
commit 36ffc0bcfe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
wherehows-web/app/controllers/datasets/dataset.js
View File

@ -118,6 +118,12 @@ export default class extends Controller.extend({
*/
compliancePolicyHasDrift;
/**
* Contains a list of whitelisted dataset platforms for JIT ACL access
* @type {Array<DatasetPlatform>}
*/
jitAclAccessWhitelist;
/**
* Flag indicating the dataset policy is derived from an upstream source
* @type {boolean}
@ -145,6 +151,17 @@ export default class extends Controller.extend({
return encodeUrn(uri);
});
/**
* Checks if the current platform exists in the supported list of JIT ACL whitelisted platforms
* @type {ComputedProperty<boolean>}
*/
isJitAclAccessEnabled = computed('jitAclAccessWhitelist', function() {
const jitAclAccessWhitelist = getWithDefault(this, 'jitAclAccessWhitelist', []);
const { platform } = get(this, 'model');
return jitAclAccessWhitelist.includes(platform);
});
constructor() {
super(...arguments);
this.tabSelected || (this.tabSelected = Tabs.Ownership);

2
wherehows-web/app/routes/datasets/dataset.js
View File

@ -80,7 +80,7 @@ export default Route.extend({
set(controller, 'model', model);
setProperties(controller, {
isInternal: await get(this, 'configurator').getConfig('isInternal'),
isJitAclAccessEnabled: await get(this, 'configurator').getConfig('isJitAclAccessEnabled')
jitAclAccessWhitelist: await get(this, 'configurator').getConfig('JitAclAccessWhitelist')
});
}
});

7
wherehows-web/app/styles/components/avatar/_avatars-detail.scss
View File

@ -4,7 +4,7 @@
border-radius: 2px;
background-color: white;
max-height: calc(100vh - 64px);
min-height: item-spacing(7);
min-height: item-spacing(9) * 2;
width: 520px;
display: flex;
flex-direction: column;
@ -65,7 +65,8 @@
align-items: center;
&__entity {
flex-grow: 1;
margin-right: item-spacing(2);
width: 48px;
}
&__meta {
@ -74,9 +75,11 @@
flex-grow: 10;
border-bottom: 1px solid rgba(0, 0, 0, 0.15);
max-width: 100%;
padding: item-spacing(1 0);
}
&:last-of-type {
padding-bottom: item-spacing(5);
.avatar-detail__meta {
border: 0;
}