diff --git a/web/satellite/src/store/modules/objectBrowserStore.ts b/web/satellite/src/store/modules/objectBrowserStore.ts index d3e6ec7cf..f61708730 100644 --- a/web/satellite/src/store/modules/objectBrowserStore.ts +++ b/web/satellite/src/store/modules/objectBrowserStore.ts @@ -363,6 +363,7 @@ export const useObjectBrowserStore = defineStore('objectBrowser', () => { Prefix: string; }): BrowserObject => ({ Key: Prefix.slice(path.length, -1), + path: path, LastModified: new Date(), Size: 0, type: 'folder', @@ -371,6 +372,7 @@ export const useObjectBrowserStore = defineStore('objectBrowser', () => { const makeFileRelative = (file) => ({ ...file, Key: file.Key.slice(path.length), + path: path, type: 'file', }); @@ -804,7 +806,7 @@ export const useObjectBrowserStore = defineStore('objectBrowser', () => { function removeFileFromToBeDeleted(file): void { state.filesToBeDeleted = state.filesToBeDeleted.filter( - singleFile => singleFile.Key !== file.Key, + singleFile => !(singleFile.Key === file.Key && singleFile.path === file.path), ); } diff --git a/web/satellite/vuetify-poc/src/components/BrowserRowActions.vue b/web/satellite/vuetify-poc/src/components/BrowserRowActions.vue index b4eed2945..2a2125b1a 100644 --- a/web/satellite/vuetify-poc/src/components/BrowserRowActions.vue +++ b/web/satellite/vuetify-poc/src/components/BrowserRowActions.vue @@ -70,7 +70,7 @@ - + @@ -82,10 +82,24 @@ + + +
+ +

Deleting...

+
+
diff --git a/web/satellite/vuetify-poc/src/components/dialogs/CreateAccessDialog.vue b/web/satellite/vuetify-poc/src/components/dialogs/CreateAccessDialog.vue index 85ef297f0..bc0e7b232 100644 --- a/web/satellite/vuetify-poc/src/components/dialogs/CreateAccessDialog.vue +++ b/web/satellite/vuetify-poc/src/components/dialogs/CreateAccessDialog.vue @@ -10,7 +10,7 @@ :persistent="isCreating" > - + @@ -582,20 +582,13 @@ watch(innerContent, async (comp: Component): Promise => { diff --git a/web/satellite/vuetify-poc/src/components/dialogs/DeleteFolderDialog.vue b/web/satellite/vuetify-poc/src/components/dialogs/DeleteFolderDialog.vue new file mode 100644 index 000000000..31c7abb3b --- /dev/null +++ b/web/satellite/vuetify-poc/src/components/dialogs/DeleteFolderDialog.vue @@ -0,0 +1,123 @@ +// Copyright (C) 2023 Storj Labs, Inc. +// See LICENSE for copying information. + + + + diff --git a/web/satellite/vuetify-poc/src/components/dialogs/ShareDialog.vue b/web/satellite/vuetify-poc/src/components/dialogs/ShareDialog.vue index 4762827ac..1b28740dc 100644 --- a/web/satellite/vuetify-poc/src/components/dialogs/ShareDialog.vue +++ b/web/satellite/vuetify-poc/src/components/dialogs/ShareDialog.vue @@ -9,7 +9,7 @@ :persistent="isLoading" > -