Merge branch 'bugfix/swapping-between-sharing-permissions' into 'devel'

Bugfix/swapping between sharing permissions

Closes #1140

See merge request sds-dev/sd-connect/swift-browser-ui!178

Author: Hang Le

CHANGELOG.md

@@ -184,7 +184,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - (GL #1066) Fix for sharing/permissions not removed correctly
 - (GL #1078) Fix overwriting existing files with upload
 - (GL #1108) Fix deleting large amount of objects (~100 items) with long names
-- (GL #1125) Remove shared containers if the owner container is deleted
+- (GL #1140) Fix Sharing permissions swapping between options after sharing
 
 ### Removed
 

swift_browser_ui/common/vault_client.py

@@ -319,7 +319,7 @@ async def get_project_whitelist(
         """
         resp = await self._request(
             "GET",
-            f"c4ghransit/sharing/{project}/{container}",
+            f"c4ghtransit/sharing/{project}/{container}",
             params={"id": receiver},
         )
         return resp

swift_browser_ui_frontend/src/common/conv.js

@@ -113,10 +113,9 @@ export async function syncContainerACLs(store) {
         // Check if the shared access only concerns view rights
         let tmpid = await client.projectCheckIDs(share);
 
-        let whitelistUrl = new URL(
+        let whitelistUrl = new URL(store.state.uploadEndpoint.concat(
           `/check/${store.state.active.name}/${container}/${tmpid.name}`,
-          store.state.uploadEndpoint,
-        );
+        ));
         let signatureUrl = new URL("/sign/3600", document.location.origin);
         signatureUrl.searchParams.append(
           "path",

swift_browser_ui_frontend/src/components/ContainerTable.vue

@@ -74,6 +74,8 @@ export default {
   data() {
     return {
       containers: [],
+      sharingContainers: [],
+      sharedContainers: [],
       direction: "asc",
       footerOptions: {
         itemsPerPageOptions: [5, 10, 25, 50, 100],
@@ -106,7 +108,8 @@ export default {
       this.getPage();
     },
     conts() {
-      this.getPage();
+      Promise.all([this.getSharingContainers(), this.getSharedContainers()])
+        .then(() => this.getPage());
     },
     showTimestamp() {
       this.getPage();
@@ -119,7 +122,7 @@ export default {
     openShareModal: function () {
       if(!this.openShareModal) {
         setTimeout(() => {
-          this.getPage();
+          this.getSharingContainers().then(() => this.getPage());
         }, 3000);
       }
     },
@@ -135,6 +138,14 @@ export default {
     this.abortController.abort();
   },
   methods: {
+    async getSharingContainers () {
+      this.sharingContainers =
+        await getSharingContainers(this.active.id, this.abortController.signal);
+    },
+    async getSharedContainers () {
+      this.sharedContainers =
+        await getSharedContainers(this.active.id, this.abortController.signal);
+    },
     async getPage () {
       let offset = 0;
       let limit = this.conts?.length;
@@ -148,15 +159,10 @@ export default {
         limit = this.paginationOptions.itemsPerPage;
       }
 
-      const sharingContainers =
-        await getSharingContainers(this.active.id, this.abortController.signal);
-      const sharedContainers =
-        await getSharedContainers(this.active.id, this.abortController.signal);
-
       const getSharedStatus = (folderName) => {
-        if (sharingContainers.indexOf(folderName) > -1) {
+        if (this.sharingContainers.indexOf(folderName) > -1) {
           return this.$t("message.table.sharing");
-        } else if (sharedContainers.findIndex(
+        } else if (this.sharedContainers.findIndex(
           cont => cont.container === folderName) > -1) {
           return this.$t("message.table.shared");
         }
@@ -373,21 +379,11 @@ export default {
       this.sortDirection = event.detail.direction;
 
       if (this.sortBy === "sharing") {
-        const sharingContainers =
-          await getSharingContainers(
-            this.active.id,
-            this.abortController.signal,
-          );
-        const sharedContainers =
-          await getSharedContainers(
-            this.active.id,
-            this.abortController.signal,
-          );
-
-        let allSharing = this.conts.map(x => sharingContainers.includes(x.name)
-          ? this.$t("message.table.sharing") : "");
+        let allSharing = this.conts.map(x =>
+          this.sharingContainers.includes(x.name)
+            ? this.$t("message.table.sharing") : "");
         let allShared = this.conts.map(x =>
-          sharedContainers.some(cont => cont.container === x.name)
+          this.sharedContainers.some(cont => cont.container === x.name)
             ? this.$t("message.table.shared") : "");
 
         let combined = allSharing.map((value, idx) =>

swift_browser_ui_frontend/src/components/ShareModal.vue

@@ -178,6 +178,7 @@ export default {
     return {
       tags: [],
       openShareGuide: false,
+      view: false,
       read: false,
       write: false,
       loading: false,
@@ -406,10 +407,11 @@ export default {
       signatureUrl.searchParams.append("path", `/cryptic/${this.$store.state.active.name}/${folder}`);
       let signed = await GET(signatureUrl);
       signed = await signed.json();
-      let whitelistUrl = new URL(
+
+      let whitelistUrl = new URL(this.$store.state.uploadEndpoint.concat(
         `/cryptic/${this.$store.state.active.name}/${folder}`,
-        this.$store.state.uploadEndpoint,
-      );
+      ));
+
       whitelistUrl.searchParams.append(
         "valid",
         signed.valid,

swift_browser_ui_frontend/src/components/ShareModalTable.vue

@@ -164,6 +164,13 @@ export default {
         rights,
       );
 
+      await this.$store.state.client.shareEditAccess(
+        this.projectId,
+        `${this.folderName}_segments`,
+        [sharedProjectId],
+        rights,
+      );
+
       let projectIDs = await this.$store.state.client.projectCheckIDs(
         sharedProjectId,
       );
@@ -172,10 +179,10 @@ export default {
       signatureUrl.searchParams.append("path", `/cryptic/${this.$store.state.active.name}/${this.folderName}`);
       let signed = await GET(signatureUrl);
       signed = await signed.json();
-      let whitelistUrl = new URL(
+
+      let whitelistUrl = new URL(this.$store.state.uploadEndpoint.concat(
         `/cryptic/${this.$store.state.active.name}/${this.folderName}`,
-        this.$store.state.uploadEndpoint,
-      );
+      ));
       whitelistUrl.searchParams.append(
         "valid",
         signed.valid,
@@ -239,10 +246,10 @@ export default {
       signatureUrl.searchParams.append("path", `/cryptic/${this.$store.state.active.name}/${this.folderName}`);
       let signed = await GET(signatureUrl);
       signed = await signed.json();
-      let whitelistUrl = new URL(
+
+      let whitelistUrl = new URL(this.$store.state.uploadEndpoint.concat(
         `/cryptic/${this.$store.state.active.name}/${this.folderName}`,
-        this.$store.state.uploadEndpoint,
-      );
+      ));
       whitelistUrl.searchParams.append(
         "valid",
         signed.valid,