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.

Sign up for GitHub

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

Show correct bucket/object permissions after updating #33

Merged
merged 2 commits into from
Feb 10, 2023
Merged

Show correct bucket/object permissions after updating #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f41b36
Ensure correct bucket perms are shown after updating
kamorel Feb 3, 2023
fb2524c
Ensure correct object perms are shown after updating
kamorel Feb 3, 2023
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
27 changes: 19 additions & 8 deletions frontend/src/store/bucketStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { ref, isProxy, toRaw } from 'vue';
import { defineStore, storeToRefs } from 'pinia';
import { useToast } from 'primevue/usetoast';

import { bucketService, permissionService, userService } from '@/services';
import { useConfigStore, useUserStore } from '@/store';
Expand All @@ -11,14 +12,15 @@ import type { Bucket, IdentityProvider, Permission, User, UserPermissions } from
export const useBucketStore = defineStore('bucket', () => {
const { config } = storeToRefs(useConfigStore());
const { currentUser } = storeToRefs(useUserStore());
const toast = useToast();

// state
// State
const loading: Ref<boolean> = ref(false);
const buckets: Ref<Array<Bucket>> = ref([]);
const permissions: Ref<Array<UserPermissions>> = ref([]);
const selectedBucketPermissionsForUser: Ref<Array<Permission>> = ref([]);

// actions
// Actions
async function load() {
try {
loading.value = true;
Expand Down Expand Up @@ -118,19 +120,27 @@ export const useBucketStore = defineStore('bucket', () => {
async function addBucketPermission(bucketId: string, userId: string, permCode: string) {
try {
loading.value = true;

await permissionService.bucketAddPermissions(bucketId, [{ userId, permCode }]);
} finally {
}
catch (error) {
toast.add({ severity: 'error', summary: 'Error updating permission', detail: error, life: 3000 });
}
finally {
await getBucketPermissions(bucketId);
loading.value = false;
}
}

async function deleteBucketPermission(bucketId: string, userId: string, permCode: string) {
try {
loading.value = true;

await permissionService.bucketDeletePermission(bucketId, { userId, permCode });
} finally {
}
catch (error) {
toast.add({ severity: 'error', summary: 'Error updating permission', detail: error, life: 3000 });
}
finally {
await getBucketPermissions(bucketId);
loading.value = false;
}
}
Expand All @@ -142,9 +152,10 @@ export const useBucketStore = defineStore('bucket', () => {
for (const [, value] of Object.entries(Permissions)) {
await permissionService.bucketDeletePermission(bucketId, { userId, permCode: value });
}

await getBucketPermissions(bucketId);
} catch (error) {
toast.add({ severity: 'error', summary: 'Error removing user permission', detail: error, life: 3000 });
} finally {
await getBucketPermissions(bucketId);
loading.value = false;
}
}
Expand Down
42 changes: 24 additions & 18 deletions frontend/src/store/objectStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { ref, isProxy, toRaw } from 'vue';
import { defineStore, storeToRefs } from 'pinia';
import { useToast } from 'primevue/usetoast';

import { objectService, permissionService, userService } from '@/services';
import { useBucketStore, useConfigStore, useUserStore } from '@/store';
import { Permissions } from '@/utils/constants';
Expand All @@ -13,15 +15,16 @@ export const useObjectStore = defineStore('objectStore', () => {
const { selectedBucketPermissionsForUser } = storeToRefs(useBucketStore());
const { config } = storeToRefs(useConfigStore());
const { currentUser } = storeToRefs(useUserStore());
const toast = useToast();

// state
// State
const loading: Ref<boolean> = ref(false);
const objectList: Ref<Array<COMSObject>> = ref([]);
const selectedObject: Ref<COMSObject | null> = ref(null);
const selectedObjectPermissions: Ref<Array<UserPermissions>> = ref([]);
const multiSelectedObjects: Ref<Array<COMSObject>> = ref([]); // All selected table row items

// actions
// Actions
function getObjectInfo(objectId: string) {
let object = objectList.value.find((x) => x.id === objectId);
if (isProxy(object)) {
Expand Down Expand Up @@ -173,30 +176,30 @@ export const useObjectStore = defineStore('objectStore', () => {
}
}

async function addObjectPermission(
bucketId: string,
userId: string,
permCode: string
) {
async function addObjectPermission(bucketId: string, userId: string, permCode: string) {
try {
loading.value = true;

await objectService.addPermissions(bucketId, [{ userId, permCode }]);
} finally {
}
catch (error) {
toast.add({ severity: 'error', summary: 'Error updating permission', detail: error, life: 3000 });
}
finally {
await getObjectPermissions(bucketId);
loading.value = false;
}
}

async function deleteObjectPermission(
bucketId: string,
userId: string,
permCode: string
) {
async function deleteObjectPermission(bucketId: string, userId: string, permCode: string) {
try {
loading.value = true;

await objectService.deletePermission(bucketId, { userId, permCode });
} finally {
}
catch (error) {
toast.add({ severity: 'error', summary: 'Error updating permission', detail: error, life: 3000 });
}
finally {
await getObjectPermissions(bucketId);
loading.value = false;
}
}
Expand All @@ -211,9 +214,12 @@ export const useObjectStore = defineStore('objectStore', () => {
permCode: value,
});
}

}
catch (error) {
toast.add({ severity: 'error', summary: 'Error updating permission', detail: error, life: 3000 });
}
finally {
await getObjectPermissions(bucketId);
} finally {
loading.value = false;
}
}
Expand Down