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.

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

Add read permissions #3

Merged
merged 12 commits into from
Feb 12, 2024
Merged
Changes from 1 commit
Commits
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
Next Next commit
simple change to test adding the ability to see read permissions alon…
…gside of write permissions
rkboyce committed Mar 21, 2023
commit 15404e36fe46c70f3a949c91292a0f27c9b302f6
18 changes: 15 additions & 3 deletions js/components/security/access/configure-access-modal.html
Original file line number Diff line number Diff line change
@@ -31,12 +31,24 @@
</span>
</div>
<div data-bind="css: classes('access-list')">
<label data-bind="css: classes('access-list-label'), text: ko.i18n('common.configureAccessModal.rolesWithWriteAccess', 'Roles with write access:')"></label>
<label data-bind="css: classes('access-list-label'), text: ko.i18n('common.configureAccessModal.rolesWithWriteAccess', 'Roles with WRITE access:')"></label>
<div>
<table data-bind="
css: classes({ element: 'access-table', extra: ['table', 'table-bordered', 'table-hover'] }),
dataTable:{
data: accessList,
data: writeAccessList,
options: {columns: columns, language: ko.i18n('datatable.language')},
}
"/>
</div>
</div>
<div data-bind="css: classes('access-list')">
<label data-bind="css: classes('access-list-label'), text: ko.i18n('common.configureAccessModal.rolesWithReadAccess', 'Roles with READ access:')"></label>
<div>
<table data-bind="
css: classes({ element: 'access-table', extra: ['table', 'table-bordered', 'table-hover'] }),
dataTable:{
data: readAccessList,
options: {columns: columns, language: ko.i18n('datatable.language')},
}
"/>
@@ -45,4 +57,4 @@
</div>
</div>
</div>
</atlas-modal>
</atlas-modal>
20 changes: 14 additions & 6 deletions js/components/security/access/configure-access-modal.js
Original file line number Diff line number Diff line change
@@ -19,7 +19,8 @@ define([

this.isModalShown = params.isModalShown;
this.isLoading = ko.observable(false);
this.accessList = ko.observable([]);
this.readAccessList = ko.observable([]);
this.writeAccessList = ko.observable([]);
this.roleName = ko.observable();

this.roleSuggestions = ko.observable([]);
@@ -54,10 +55,16 @@ define([
this.isModalShown.subscribe(open => !!open && this.loadAccessList());
}

async _loadAccessList() {
let accessList = await this.loadAccessListFn();
async _loadReadAccessList() {
let accessList = await this.loadAccessListFn('READ');
accessList = accessList.map(a => ({ ...a, revoke: () => this.revokeRoleAccess(a.id) }));
this.accessList(accessList);
this.readAccessList(accessList);
}

async _loadWriteAccessList() {
let accessList = await this.loadAccessListFn('WRITE');
accessList = accessList.map(a => ({ ...a, revoke: () => this.revokeRoleAccess(a.id) }));
this.writeAccessList(accessList);
}

async loadRoleSuggestions() {
@@ -66,9 +73,10 @@ define([
}

async loadAccessList() {
this.isLoading(false);
this.isLoading(true);
try {
await this._loadAccessList();
await this._loadReadAccessList();
await this._loadWriteAccessList();
} catch (ex) {
console.log(ex);
}
20 changes: 20 additions & 0 deletions js/config-local.js~
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
define([], function () {
var configLocal = {};

configLocal.userAuthenticationEnabled = true;

configLocal.api = {
name: 'USAI Atlas [synthetic data]',
url: 'http://ec2-54-167-42-73.compute-1.amazonaws.com/WebAPI/' /* 'http://localhost:8080/WebAPI/' */
};

configLocal.authProviders = [{
"name": "Local Security Test DB",
"url": "user/login/db",
"ajax": true,
"icon": "fa fa-database",
"isUseCredentialsForm": true
}];

return configLocal;
});
8 changes: 4 additions & 4 deletions js/services/Permission.js
Original file line number Diff line number Diff line change
@@ -10,8 +10,8 @@ define(function (require, exports) {
return res.data;
}

async function loadEntityAccessList(entityType, entityId) {
const res = await httpService.doGet(config.webAPIRoot + `permission/access/${entityType}/${entityId}`);
async function loadEntityAccessList(entityType, entityId, role = 'WRITE') {
const res = await httpService.doGet(config.webAPIRoot + `permission/access/${entityType}/${entityId}/${role}`);
return res.data;
}

@@ -43,8 +43,8 @@ define(function (require, exports) {

component.isOwner = ko.computed(() => config.userAuthenticationEnabled && component.isOwnerFn(authApi.subject()));

component.loadAccessList = () => {
return loadEntityAccessList(entityTypeGetter(), entityIdGetter());
component.loadAccessList = (role='WRITE') => {
return loadEntityAccessList(entityTypeGetter(), entityIdGetter(), role);
};

component.grantAccess = (roleId) => {