Skip to content

Commit 8a48c62

Browse files
committed
Fix for Copy Modal conflicting errors
1 parent 0acf609 commit 8a48c62

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

swift_browser_ui_frontend/src/components/CopyFolderModal.vue

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
v-model="folderName"
2424
name="foldername"
2525
custom-class="has-text-dark"
26+
:loading="loadingFoldername"
2627
/>
2728
</b-field>
2829
<b-field
@@ -81,6 +82,7 @@ export default {
8182
return {
8283
folderExists: false,
8384
folderName: "",
85+
loadingFoldername: true,
8486
tags: [],
8587
taginputConfirmKeys,
8688
folders: [],
@@ -103,7 +105,9 @@ export default {
103105
selectedFolderName: function () {
104106
if (this.selectedFolderName && this.selectedFolderName.length > 0) {
105107
this.fetchFolders().then(() => {
106-
this.getCopyFolder(this.selectedFolderName);
108+
if(this.folders && this.folders.length > 0) {
109+
this.getCopyFolder(this.selectedFolderName);
110+
}
107111
});
108112
}
109113
},
@@ -133,7 +137,7 @@ export default {
133137
});
134138
},
135139
getCopyFolder: function (origFolderName) {
136-
if (this.folders.value) {
140+
if (this.folders) {
137141
// Check if current folder is a copy
138142
const reg = new RegExp("\\b(copy)\\s(\\d+)\\b$", "i");
139143
const isCopied = origFolderName.match(reg);
@@ -147,7 +151,7 @@ export default {
147151
}
148152
149153
const existingCopiedFolders = [];
150-
for (let folder of this.folders.value) {
154+
for (let folder of this.folders) {
151155
// Check if folder is one of the copy versions
152156
// which ends in the form 'copy + number'
153157
const copiedReg = new RegExp(`\\b${copiedFolder}\\s(\\d+)\\b$`, "gi");
@@ -162,7 +166,10 @@ export default {
162166
const latestVer= existingCopiedFolders[
163167
existingCopiedFolders.length-1].match(reg);
164168
this.folderName = !isCopied ? `${copiedFolder} ${+latestVer[2] + 1}` : origFolderName.replace(/\d+$/, +latestVer[2]+1);
169+
} else {
170+
this.folderName = `${copiedFolder} 1`;
165171
}
172+
this.loadingFoldername = false;
166173
}
167174
},
168175
checkSelectedFolder: function () {

0 commit comments

Comments
 (0)