From 055874cbcd7a7c5419342c93229989314e721346 Mon Sep 17 00:00:00 2001
From: Monika Radaviciute <monika.radaviciute@csc.fi>
Date: Fri, 11 Aug 2023 16:40:00 +0300
Subject: [PATCH 1/7] Disable upload button in shared cont without manage
 rights

---
 .../src/components/BrowserSecondaryNavbar.vue | 56 +++++++++++++++----
 1 file changed, 45 insertions(+), 11 deletions(-)

diff --git a/swift_browser_ui_frontend/src/components/BrowserSecondaryNavbar.vue b/swift_browser_ui_frontend/src/components/BrowserSecondaryNavbar.vue
index 908d8b7c2..783146467 100644
--- a/swift_browser_ui_frontend/src/components/BrowserSecondaryNavbar.vue
+++ b/swift_browser_ui_frontend/src/components/BrowserSecondaryNavbar.vue
@@ -83,7 +83,7 @@
         <c-button
           outlined
           data-testid="create-folder"
-          :disabled="inContainer"
+          :disabled="container"
           @click="toggleCreateFolderModal(false)"
           @keyup.enter="toggleCreateFolderModal(true)"
         >
@@ -92,7 +92,7 @@
       </div>
       <div class="nav-item">
         <c-button
-          :disabled="isUploading"
+          :disabled="isUploading || !canUpload"
           data-testid="upload-file"
           @click="toggleUploadModal(false)"
           @keyup.enter="toggleUploadModal(true)"
@@ -105,7 +105,10 @@
 </template>
 
 <script>
-import { toggleCreateFolderModal } from "@/common/globalFunctions";
+import {
+  toggleCreateFolderModal,
+  getAccessDetails,
+} from "@/common/globalFunctions";
 import { setPrevActiveElement } from "@/common/keyboardNavigation";
 import { mdiInformationOutline } from "@mdi/js";
 
@@ -116,6 +119,7 @@ export default {
     return {
       copy: false,
       path: mdiInformationOutline,
+      canUpload: false,
     };
   },
   computed: {
@@ -134,8 +138,22 @@ export default {
     isUploading() {
       return this.$store.state.isUploading;
     },
-    inContainer() {
-      return this.$route.params.container !== undefined;
+    owner() {
+      return this.$route.params.owner;
+    },
+    container() {
+      return this.$route.params.container;
+    },
+    client() {
+      return this.$store.state.client;
+    },
+  },
+  watch: {
+    container() {
+      this.checkIfCanReadWrite();
+    },
+    client() {
+      this.checkIfCanReadWrite();
     },
   },
   methods: {
@@ -171,12 +189,28 @@ export default {
       this.$store.commit("setFilesAdded", true);
       this.$store.commit("toggleUploadModal", true);
       if (keypress) setPrevActiveElement();
-      setTimeout(() => {
-        const uploadFolderInput = document
-          .querySelector("#upload-folder-input")
-          .shadowRoot.querySelector("input");
-        uploadFolderInput.focus();
-      }, 300);
+      if (!this.container) {
+        setTimeout(() => {
+          const uploadFolderInput = document
+            .querySelector("#upload-folder-input")
+            .shadowRoot.querySelector("input"); //TODO
+          uploadFolderInput.focus();
+        }, 300);
+      }
+    },
+    checkIfCanReadWrite: async function () {
+      //disable upload if user doesn't have rw perms
+      //in shared folder
+      if (!this.owner) this.canUpload = true;
+      else {
+        const share = await getAccessDetails(
+          this.active.id,
+          this.container,
+          this.owner,
+        );
+        if (!share.access) this.canUpload = false;
+        else this.canUpload = share.access.length === 2;
+      }
     },
     copyProjectId: function () {
       const toastMessage = {

From a7142dbf5f5e27badb929d29d5ee8879efb52b62 Mon Sep 17 00:00:00 2001
From: Monika Radaviciute <monika.radaviciute@csc.fi>
Date: Mon, 14 Aug 2023 13:44:23 +0300
Subject: [PATCH 2/7] Change upload modal to upload to current container or
 create new in root. Add toasts

---
 .../src/components/BrowserSecondaryNavbar.vue |   3 +-
 .../src/components/UploadModal.vue            | 271 +++++++++---------
 2 files changed, 132 insertions(+), 142 deletions(-)

diff --git a/swift_browser_ui_frontend/src/components/BrowserSecondaryNavbar.vue b/swift_browser_ui_frontend/src/components/BrowserSecondaryNavbar.vue
index 783146467..618d9c43f 100644
--- a/swift_browser_ui_frontend/src/components/BrowserSecondaryNavbar.vue
+++ b/swift_browser_ui_frontend/src/components/BrowserSecondaryNavbar.vue
@@ -192,8 +192,7 @@ export default {
       if (!this.container) {
         setTimeout(() => {
           const uploadFolderInput = document
-            .querySelector("#upload-folder-input")
-            .shadowRoot.querySelector("input"); //TODO
+            .querySelector("#upload-folder-input input");
           uploadFolderInput.focus();
         }, 300);
       }
diff --git a/swift_browser_ui_frontend/src/components/UploadModal.vue b/swift_browser_ui_frontend/src/components/UploadModal.vue
index 02c987537..e8530d48c 100644
--- a/swift_browser_ui_frontend/src/components/UploadModal.vue
+++ b/swift_browser_ui_frontend/src/components/UploadModal.vue
@@ -8,33 +8,47 @@
       id="upload-modal-content"
       class="modal-content-wrapper"
     >
+      <c-toasts
+        id="uploadModal-toasts"
+        data-testid="uploadModal-toasts"
+        vertical="bottom"
+        absolute
+      />
       <h2 class="title is-4">
         {{ $t("message.encrypt.uploadFiles") }}
       </h2>
       <c-card-content>
-        <h3 class="title is-6">
-          1. {{ $t("message.encrypt.upload_step1") }}
-        </h3>
-        <p class="info-text is-size-6">
-          {{ $t("message.container_ops.norename") }}
-        </p>
-        <c-autocomplete
-          id="upload-folder-input"
-          v-csc-control
-          :items.prop="filteredItems"
-          :label="$t('message.container_ops.folderName')"
-          :query="inputFolder"
-          aria-required="true"
-          required
-          :valid="errorMsg.length === 0"
-          :validation="errorMsg"
-          validate-on-blur
-          @changeQuery="onQueryChange"
-          @changeValue="onSelectValue"
-        />
-        <h3 class="title is-6">
-          2. {{ $t("message.encrypt.upload_step2") }}
-        </h3>
+        <div
+          v-if="!currentFolder"
+          id="upload-to-root"
+        >
+          <h3 class="title is-6">
+            1. {{ $t("message.encrypt.upload_step1") }}
+          </h3>
+          <p class="info-text is-size-6">
+            {{ $t("message.container_ops.norename") }}
+          </p>
+          <c-text-field
+            id="upload-folder-input"
+            v-model="inputFolder"
+            v-csc-control
+            :label="$t('message.container_ops.folderName')"
+            aria-required="true"
+            required
+            :valid="errorMsg.length === 0"
+            :validation="errorMsg"
+            @changeValue="interacted = true"
+          />
+          <h3 class="title is-6">
+            2. {{ $t("message.encrypt.upload_step2") }}
+          </h3>
+        </div>
+        <div v-else>
+          <p>
+            <b>{{ $t("message.encrypt.uploadDestination") }}</b>
+            {{ currentFolder }}
+          </p>
+        </div>
         <div
           class="dropArea"
           @dragover="dragHandler"
@@ -86,7 +100,10 @@
           @click="checkPage($event,false)"
         />
         <!-- eslint-enable-->
-        <p class="info-text is-size-6">
+        <p
+          v-if="!owner"
+          class="info-text is-size-6"
+        >
           {{ $t("message.encrypt.uploadedFiles") }}
           <b>{{ active.name }}</b>.
           <c-link
@@ -98,6 +115,23 @@
             <i class="mdi mdi-open-in-new" />
           </c-link>
         </p>
+        <p
+          v-else
+          class="info-text is-size-6"
+        >
+          {{ $t("message.encrypt.uploadedFiles") }}
+          <b>{{ active.name }}</b> (
+          <c-link
+            :href="projectInfoLink"
+            underline
+            target="_blank"
+          >
+            {{ $t("message.container_ops.viewProjectMembers") }}
+            <i class="mdi mdi-open-in-new" />
+          </c-link>
+          )
+          {{ $t("message.encrypt.uploadedToShared") }}
+        </p>
         <c-accordion
           id="accordion"
           value="advancedOptions"
@@ -157,12 +191,10 @@
       </c-button>
       <c-button
         size="large"
-        :disabled="noUpload
-          || addingFiles
-          || buttonAddingFiles
-          || errorMsg.length"
-        @click="beginEncryptedUpload"
-        @keyup.enter="beginEncryptedUpload"
+        :loading="addingFiles || buttonAddingFiles"
+        :disabled="errorMsg.length"
+        @click="onUploadClick"
+        @keyup.enter="onUploadClick"
       >
         {{ $t("message.encrypt.normup") }}
       </c-button>
@@ -181,8 +213,6 @@ import { getDB } from "@/common/db";
 
 import {
   getProjectNumber,
-  getSharedContainers,
-  getAccessDetails,
   validateFolderName,
   checkIfItemIsLastOnPage,
 } from "@/common/globalFunctions";
@@ -193,7 +223,7 @@ import {
 } from "@/common/keyboardNavigation";
 import CUploadButton from "@/components/CUploadButton.vue";
 
-import delay from "lodash/delay";
+import { delay, debounce } from "lodash";
 
 export default {
   name: "UploadModal",
@@ -206,28 +236,24 @@ export default {
   data() {
     return {
       inputFolder: "",
-      filteredItems: [],
       addRecvkey: "",
       recvkeys: [],
       recvHashedKeys: [],
-      noUpload: true,
       CUploadButton,
       projectInfoLink: "",
       toastVisible: false,
       duplicateFile: false,
       addingFiles: false,
       buttonAddingFiles: false,
-      noUploadContainers: [],
       interacted: false,
       currentPage: 1,
       currentKeyPage:1,
       errorMsg: "",
+      toastMsg : "",
+      containers: [],
     };
   },
   computed: {
-    containers() {
-      return getDB().containers;
-    },
     res() {
       return this.$store.state.resumableClient;
     },
@@ -237,15 +263,15 @@ export default {
     pubkey() {
       return this.$store.state.pubkey;
     },
-    currentUpload() {
-      return this.$store.state.uploadState;
-    },
     currentFolder() {
       return this.$route.params.container;
     },
     modalVisible() {
       return this.$store.state.openUploadModal;
     },
+    owner() {
+      return this.$route.params.owner;
+    },
     fileHeaders() {
       return [
         {
@@ -400,45 +426,27 @@ export default {
     addFiles() {
       return this.$store.state.addUploadFiles;
     },
-    canUpload () {
-      //used to disable upload button
-      //in case disallowed folder name is typed in
-      if (this.noUploadContainers.find(
-        item => item.container === this.inputFolder) === undefined) {
-        return true;
-      }
-      return false;
-    },
     prevActiveEl() {
       return this.$store.state.prevActiveEl;
     },
   },
   watch: {
-    modalVisible: function() {
+    modalVisible: async function() {
       if (this.modalVisible) {
         //inputFolder not cleared when modal toggled,
         //in case there's a delay in upload start
         //reset when modal visible
         this.recvkeys = [];
-        if(!this.noUploadContainers.length) {
-          this.getNoUploadContainers();
-        } else this.setInputFolder();
+        this.inputFolder = "";
+        this.containers = await getDB().containers
+          .where({ projectID: this.active.id })
+          .toArray();
       }
     },
     inputFolder: function() {
-      this.interacted ?
-        this.errorMsg = validateFolderName(this.inputFolder, this.$t) :
-        this.errorMsg = "";
-      this.refreshNoUpload();
-    },
-    dropFiles: function () {
-      this.refreshNoUpload();
-    },
-    recvkeys: function () {
-      this.refreshNoUpload();
-    },
-    currentUpload: function () {
-      this.refreshNoUpload();
+      if (this.inputFolder && this.interacted) {
+        this.checkFolderName();
+      }
     },
     active: function () {
       this.projectInfoLink = this.$t("message.dashboard.projectInfoBaseLink")
@@ -462,8 +470,8 @@ export default {
     },
   },
   methods: {
-    checkPage  (event, isKey){
-      var page = checkIfItemIsLastOnPage(
+    checkPage(event, isKey) {
+      const page = checkIfItemIsLastOnPage(
         {
           currentPage: event.target.pagination.currentPage ,
           itemsPerPage: event.target.pagination.itemsPerPage,
@@ -492,55 +500,21 @@ export default {
         }
       }
     },
-    getNoUploadContainers: async function () {
-      const sharedContainers = await getSharedContainers(this.active.id);
-      if (sharedContainers != []) {
-        for (const item of sharedContainers) {
-          const share = await getAccessDetails(
-            this.active.id,
-            item.container,
-            item.owner,
-          );
-          if (share.access.length < 2) {
-            this.noUploadContainers.push(item);
+    checkFolderName: debounce(function () {
+      const error = validateFolderName(this.inputFolder, this.$t);
+      if (error.length === 0) {
+        if (this.containers) {
+          let found = this.containers.find(
+            cont => cont.name === this.inputFolder);
+          if (found) {
+            this.errorMsg = this.$t("message.error.inUse");
+            return;
           }
         }
+        this.errorMsg = "";
       }
-      this.setInputFolder();
-    },
-    setInputFolder() {
-      if (this.currentFolder) {
-        //only show current container as upload destination
-        //if user has the right to upload to it
-        if (this.noUploadContainers
-          .find(item => item.container === this.currentFolder)
-          === undefined) {
-          this.inputFolder = this.currentFolder;
-          return;
-        }
-      }
-      this.inputFolder = "";
-    },
-    onSelectValue: function (e) {
-      if (e.detail) this.inputFolder = e.detail.name;
-    },
-    onQueryChange: async function (event) {
-      this.interacted = true; //user typed
-      this.inputFolder = event.detail;
-      //filter out containers where user has no upload right
-      const result = await this.containers
-        .filter(cont => cont.projectID === this.active.id)
-        .filter(cont => {
-          return !this.noUploadContainers
-            .some(c => c.container === cont.container);
-        })
-        .filter(cont => cont.name.toLowerCase()
-          .includes(event.detail.toLowerCase()))
-        .filter(cont => !cont.name.endsWith("_segments"))
-        .limit(1000)
-        .toArray();
-      this.filteredItems = result;
-    },
+      else this.errorMsg = error;
+    }, 300),
     setFile: function (item, path) {
       let entry = undefined;
       if (item.isFile) {
@@ -648,15 +622,6 @@ export default {
       }
       this.addRecvkey = "";
     },
-    refreshNoUpload() {
-      this.noUpload = (
-        (!this.pubkey.length && !this.recvkeys.length)
-        || !this.inputFolder
-        || !this.dropFiles.length
-        || (this.currentUpload != undefined)
-        || !this.canUpload
-      );
-    },
     cancelUpload() {
       this.$store.commit("setFilesAdded", false);
       this.$store.commit("eraseDropFiles");
@@ -668,6 +633,7 @@ export default {
     },
     toggleUploadModal() {
       this.resetAccordionVal();
+      document.querySelector("#uploadModal-toasts").removeToast("upload-toast");
       this.$store.commit("toggleUploadModal", false);
       this.addingFiles = false;
       this.tags = [];
@@ -677,9 +643,38 @@ export default {
       this.addRecvkey = "";
       this.recvHashedKeys = [];
       this.errorMsg = "";
+      this.toastMsg = "";
 
       moveFocusOutOfModal(this.prevActiveEl);
     },
+    checkIfCanUpload() {
+      if (this.dropFiles.length === 0) {
+        return this.$t("message.upload.addFiles");
+      }
+      else if (!this.pubkey.length || !this.recvkeys.length) {
+        return this.$t("message.upload.error");
+      }
+      else return "";
+    },
+    onUploadClick() {
+      this.toastMsg = this.checkIfCanUpload();
+      //In case user does not interact with input field before click
+      this.errorMsg = validateFolderName(this.inputFolder, this.$t);
+      if (this.errorMsg) return;
+      else if (this.toastMsg) {
+        document.querySelector("#uploadModal-toasts").addToast(
+          {
+            id: "upload-toast",
+            type: "error",
+            duration: 4000,
+            progress: false,
+            message: this.toastMsg,
+          },
+        );
+        return;
+      }
+      else this.beginEncryptedUpload();
+    },
     beginEncryptedUpload() {
       if (this.pubkey.length > 0) {
         this.recvkeys = this.recvkeys.concat(this.pubkey);
@@ -688,17 +683,19 @@ export default {
       this.$store.commit("abortCurrentUpload");
       this.$store.commit("eraseCurrentUpload");
 
-      this.$store.commit("setFolderName", this.inputFolder);
+      this.currentFolder ?
+        this.$store.commit("setFolderName", this.currentFolder) :
+        this.$store.commit("setFolderName", this.inputFolder);
 
       // Create a fresh session from scratch
       this.$store.commit("createCurrentUploadAbort");
       let upload = new EncryptedUploadSession(
         this.active,
-        this.$route.params.owner ? this.$route.params.owner : this.active.id,
+        this.owner ? this.owner : this.active.id,
         this.$store.state.dropFiles,
         this.recvkeys,
         null,
-        this.inputFolder,
+        this.currentFolder ? this.currentFolder : this.inputFolder,
         "",
         null,
         true,
@@ -730,7 +727,7 @@ export default {
     },
     handleKeyDown: function (e) {
       const focusableList = this.$refs.uploadContainer.querySelectorAll(
-        "c-link, c-button, textarea, c-autocomplete, c-data-table",
+        "c-link, c-button, textarea, c-text-field, c-data-table",
       );
       const { first, last } = getFocusableElements(focusableList);
       keyboardNavigationInsideModal(e, first, last, true);
@@ -770,17 +767,12 @@ export default {
  }
 
 c-card-content {
-  padding: 1.5rem 0 0 0;
+  padding: 1rem 0 0 0;
   color: var(--csc-dark);
 }
 
-c-autocomplete {
-  margin-top: -0.5rem;
-  width: 70%;
-}
-
-.taginput {
-  width: 60%;
+c-card-actions {
+  padding: 0;
 }
 
 .title.is-6 {
@@ -806,9 +798,8 @@ c-data-table.files-table {
   margin-top: -24px;
 }
 
-c-card-actions {
-  padding: 1rem 0 0 0;
-  border-top: 1px solid var(--csc-primary);
+#upload-to-root p {
+  padding: 1rem 0 1rem 0;
 }
 
 c-data-table.publickey-table {

From 719f316d65b4a3a51540a25c853f227ef40d7749 Mon Sep 17 00:00:00 2001
From: Monika Radaviciute <monika.radaviciute@csc.fi>
Date: Mon, 14 Aug 2023 16:06:32 +0300
Subject: [PATCH 3/7] Change UI text. Fix validation

---
 swift_browser_ui_frontend/src/common/lang.js     | 16 ++++++++++++++--
 .../src/components/UploadModal.vue               | 13 ++++++++-----
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/swift_browser_ui_frontend/src/common/lang.js b/swift_browser_ui_frontend/src/common/lang.js
index 5087823ef..ac90b4e4d 100644
--- a/swift_browser_ui_frontend/src/common/lang.js
+++ b/swift_browser_ui_frontend/src/common/lang.js
@@ -209,6 +209,8 @@ let default_translations = {
         complete: "Uploading completed",
         cancelled: "Uploading cancelled",
         uploadedItems: "Uploaded items will be displayed soon",
+        addFiles: "Please add files to upload.",
+        error: "Upload couldn't start. Please try again later.",
       },
       close: "Close",
       copy: " Copy",
@@ -278,7 +280,8 @@ let default_translations = {
       },
       encrypt: {
         uploadFiles: "Upload files",
-        upload_step1: "Create a new folder or use existing ones.",
+        uploadDestination: "Destination folder: ",
+        upload_step1: "Create a new folder",
         upload_step2: "Files to be uploaded",
         multipleReceivers: "Additional encryption keys (public keys only)",
         pubkey: "Paste public key",
@@ -298,6 +301,9 @@ let default_translations = {
         },
         uploadedFiles:
           "Uploaded files will be shared with all project members in ",
+        uploadedToShared:
+          "and all members in other projects which " +
+          "have access to this shared folder.",
         advancedOptions: "Advanced encryption options",
         enReady:
           "Encryption engine is ready. Refresh the " +
@@ -582,6 +588,8 @@ let default_translations = {
         complete: "Lähetys on valmis",
         cancelled: "Lähetys peruutettu",
         uploadedItems: "Lähetetyt tiedostot näytetään pian",
+        addFiles: "Lisää ladattavat tiedostot.",
+        error: "Lataus ei alkanut. Yritä myöhemmin uudelleen.",
       },
       close: "Sulje",
       copy: " Kopioi",
@@ -653,7 +661,8 @@ let default_translations = {
       },
       encrypt: {
         uploadFiles: "Lataa tiedostoja",
-        upload_step1: "Luo uusi kansio tai käytä olemassa olevia.",
+        uploadDestination: "Kohdekansio: ",
+        upload_step1: "Luo uusi kansio",
         upload_step2: "Ladattavat tiedostot",
         multipleReceivers: "Lisää salausavaimia (vain julkiset avaimet)",
         addkey: "Lisää avain",
@@ -673,6 +682,9 @@ let default_translations = {
         },
         uploadedFiles:
           "Lähetetyt tiedostot jaetaan kaikille jäsenille projektissa ",
+        uploadedToShared:
+          "ja myös kaikille jäsenille muissa projekteissa, " +
+          "joilla on pääsy tähän jaettuun kansioon.",
         advancedOptions: "Edistyneitä salausvaihtoehtoja",
         enReady:
           "Salausohjelma on valmiina. Päivitä " +
diff --git a/swift_browser_ui_frontend/src/components/UploadModal.vue b/swift_browser_ui_frontend/src/components/UploadModal.vue
index e8530d48c..4959bc61f 100644
--- a/swift_browser_ui_frontend/src/components/UploadModal.vue
+++ b/swift_browser_ui_frontend/src/components/UploadModal.vue
@@ -192,7 +192,6 @@
       <c-button
         size="large"
         :loading="addingFiles || buttonAddingFiles"
-        :disabled="errorMsg.length"
         @click="onUploadClick"
         @keyup.enter="onUploadClick"
       >
@@ -651,16 +650,20 @@ export default {
       if (this.dropFiles.length === 0) {
         return this.$t("message.upload.addFiles");
       }
-      else if (!this.pubkey.length || !this.recvkeys.length) {
+      else if (!this.pubkey.length && !this.recvkeys.length) {
         return this.$t("message.upload.error");
       }
       else return "";
     },
     onUploadClick() {
       this.toastMsg = this.checkIfCanUpload();
-      //In case user does not interact with input field before click
-      this.errorMsg = validateFolderName(this.inputFolder, this.$t);
-      if (this.errorMsg) return;
+      if (!this.currentFolder) {
+        //In case user does not interact with input field before click
+        this.errorMsg = validateFolderName(this.inputFolder, this.$t);
+      }
+      if (this.errorMsg) {
+        return;
+      }
       else if (this.toastMsg) {
         document.querySelector("#uploadModal-toasts").addToast(
           {

From ebdfc5c664ffc24b2a1ee7b0cc1a46586d43fb6d Mon Sep 17 00:00:00 2001
From: Monika Radaviciute <monika.radaviciute@csc.fi>
Date: Mon, 14 Aug 2023 16:09:41 +0300
Subject: [PATCH 4/7] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5f434a1f..5a9e26d99 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -102,6 +102,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - (GL #1083) Disabled `create folder` when inside containers to avoid user confusion that they can create subfolders
 - (GL #1069) Forbid special characters in container names
 - (GL #1074) Updated `/api/{project}` endpoint to check for `last_modified` values before returning the container list
+- (GL #1105) Upload modal restricted to uploading to current container, or creating a new one in main container view
 
 ### Fixed
 

From 88977024fe98ab57c32ff7207f8285502b2408ce Mon Sep 17 00:00:00 2001
From: Monika Radaviciute <monika.radaviciute@csc.fi>
Date: Mon, 14 Aug 2023 16:50:21 +0300
Subject: [PATCH 5/7] Add new words to FIN vocabulary

---
 .github/config/.finnishwords.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/config/.finnishwords.txt b/.github/config/.finnishwords.txt
index 8910c54be..d6c2314cc 100644
--- a/.github/config/.finnishwords.txt
+++ b/.github/config/.finnishwords.txt
@@ -5,6 +5,7 @@ alaviiva
 alikansio
 alikansion
 alikansiot
+alkanut
 alla
 aloitettiin
 aloitettu
@@ -275,6 +276,7 @@ minuutin
 minuutteja
 mitätöi
 muiden
+muissa
 muita
 mukaan
 muokata
@@ -288,6 +290,7 @@ muutamia
 muutettiin
 muuttaa
 muuttaaksesi
+myöhemmin
 myös
 määrä
 määrästä
@@ -393,6 +396,7 @@ poudan
 profiili
 projekteihin
 projekteille
+projekteissa
 projekteja
 projekti
 projektia

From 30feff3e04e514f30a854e7aa9c77910c2a2e65a Mon Sep 17 00:00:00 2001
From: Monika Radaviciute <monika.radaviciute@csc.fi>
Date: Tue, 15 Aug 2023 17:22:27 +0300
Subject: [PATCH 6/7] Don't allow uploading to existing container from prj root

---
 swift_browser_ui_frontend/src/components/UploadModal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/swift_browser_ui_frontend/src/components/UploadModal.vue b/swift_browser_ui_frontend/src/components/UploadModal.vue
index 4959bc61f..b1c68cf9e 100644
--- a/swift_browser_ui_frontend/src/components/UploadModal.vue
+++ b/swift_browser_ui_frontend/src/components/UploadModal.vue
@@ -657,7 +657,7 @@ export default {
     },
     onUploadClick() {
       this.toastMsg = this.checkIfCanUpload();
-      if (!this.currentFolder) {
+      if (!this.currentFolder && !this.inputFolder) {
         //In case user does not interact with input field before click
         this.errorMsg = validateFolderName(this.inputFolder, this.$t);
       }

From 4ffa00a5aade2694e5099b0f9de301262c091bdb Mon Sep 17 00:00:00 2001
From: Monika Radaviciute <monika.radaviciute@csc.fi>
Date: Wed, 16 Aug 2023 13:21:04 +0300
Subject: [PATCH 7/7] Refactor paragraph

---
 .../src/components/UploadModal.vue            | 22 +++----------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/swift_browser_ui_frontend/src/components/UploadModal.vue b/swift_browser_ui_frontend/src/components/UploadModal.vue
index b1c68cf9e..bbe2d5143 100644
--- a/swift_browser_ui_frontend/src/components/UploadModal.vue
+++ b/swift_browser_ui_frontend/src/components/UploadModal.vue
@@ -101,11 +101,10 @@
         />
         <!-- eslint-enable-->
         <p
-          v-if="!owner"
           class="info-text is-size-6"
         >
           {{ $t("message.encrypt.uploadedFiles") }}
-          <b>{{ active.name }}</b>.
+          <b>{{ active.name }}</b>{{ !owner ? "." : " (" }}
           <c-link
             :href="projectInfoLink"
             underline
@@ -114,23 +113,8 @@
             {{ $t("message.container_ops.viewProjectMembers") }}
             <i class="mdi mdi-open-in-new" />
           </c-link>
-        </p>
-        <p
-          v-else
-          class="info-text is-size-6"
-        >
-          {{ $t("message.encrypt.uploadedFiles") }}
-          <b>{{ active.name }}</b> (
-          <c-link
-            :href="projectInfoLink"
-            underline
-            target="_blank"
-          >
-            {{ $t("message.container_ops.viewProjectMembers") }}
-            <i class="mdi mdi-open-in-new" />
-          </c-link>
-          )
-          {{ $t("message.encrypt.uploadedToShared") }}
+          {{ !owner ? "" :
+            ") " + $t("message.encrypt.uploadedToShared") }}
         </p>
         <c-accordion
           id="accordion"