JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

web/satellite: fix download in object browser

Browse Source 
Fixed download objects in object browser.

Context:
aws-sdk v3 getSignedURL method now returns a Promise<string> instead of regular string. So we have to await for promise to resolve

Issue:
https://github.com/storj/storj/issues/5956

Change-Id: I2431095e7e8cd1bbc4e866c6958a2c03898c4b4d
This commit is contained in:
Vitalii 2023-06-09 16:44:46 +03:00 committed by Vitalii Shpital
parent 61933bc6f0
commit 8c1f07b73e
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/satellite/src/components/browser/FileEntry.vue
View File

@ -440,9 +440,9 @@ function openDropdown(): void {
/** /**
* Download the current file. * Download the current file.
*/ */
function download(): void { async function download(): Promise<void> {
try { try {
obStore.download(props.file); await obStore.download(props.file);
notify.warning('Do not share download link with other people. If you want to share this data better use "Share" option.'); notify.warning('Do not share download link with other people. If you want to share this data better use "Share" option.');
} catch (error) { } catch (error) {
notify.error('Can not download your file', AnalyticsErrorEventSource.FILE_BROWSER_ENTRY); notify.error('Can not download your file', AnalyticsErrorEventSource.FILE_BROWSER_ENTRY);

4
web/satellite/src/components/browser/galleryView/GalleryView.vue
View File

@ -279,9 +279,9 @@ async function onDelete(): Promise<void> {
/** /**
* Download the current opened file. * Download the current opened file.
*/ */
function download(): void { async function download(): Promise<void> {
try { try {
obStore.download(file.value); await obStore.download(file.value);
notify.warning('Do not share download link with other people. If you want to share this data better use "Share" option.'); notify.warning('Do not share download link with other people. If you want to share this data better use "Share" option.');
} catch (error) { } catch (error) {
notify.error('Can not download your file', AnalyticsErrorEventSource.OBJECT_DETAILS_MODAL); notify.error('Can not download your file', AnalyticsErrorEventSource.OBJECT_DETAILS_MODAL);

4
web/satellite/src/components/modals/ObjectDetailsModal.vue
View File

@ -261,9 +261,9 @@ async function fetchPreviewAndMapUrl(): Promise<void> {
/** /**
* Download the current opened file. * Download the current opened file.
*/ */
function download(): void { async function download(): Promise<void> {
try { try {
obStore.download(file.value); await obStore.download(file.value);
notify.warning('Do not share download link with other people. If you want to share this data better use "Share" option.'); notify.warning('Do not share download link with other people. If you want to share this data better use "Share" option.');
} catch (error) { } catch (error) {
notify.error('Can not download your file', AnalyticsErrorEventSource.OBJECT_DETAILS_MODAL); notify.error('Can not download your file', AnalyticsErrorEventSource.OBJECT_DETAILS_MODAL);

6
web/satellite/src/store/modules/objectBrowserStore.ts
View File

@ -689,14 +689,14 @@ export const useObjectBrowserStore = defineStore('objectBrowser', () => {
clearAllSelectedFiles(); clearAllSelectedFiles();
} }
function download(file): void { async function download(file): Promise<void> {
assertIsInitialized(state); assertIsInitialized(state);
const url = getSignedUrl(state.s3, new GetObjectCommand({ const url = await getSignedUrl(state.s3, new GetObjectCommand({
Bucket: state.bucket, Bucket: state.bucket,
Key: state.path + file.Key, Key: state.path + file.Key,
})); }));
const downloadURL = function(data, fileName) { const downloadURL = function(data: string, fileName: string) {
const a = document.createElement('a'); const a = document.createElement('a');
a.href = data; a.href = data;
a.download = fileName; a.download = fileName;