update angular

Author: AlisherAmonulloev

Angular/src/app/app.component.html

@@ -4,7 +4,7 @@
     [fileSystemProvider]="fileSystemProvider"
     [allowedFileExtensions]="allowedFileExtensions"
   >
-    <dxo-upload [chunkSize]="6000000"></dxo-upload>
+    <dxo-upload [chunkSize]="5242880"></dxo-upload>
     <dxo-permissions
       [create]="true"
       [copy]="true"

Angular/src/app/services/amazon.filesystem.ts

@@ -12,7 +12,7 @@ export class AmazonFileSystem {
   }
 
   async getItems(key: string): Promise<FileSystemItem[]> {
-    return await this.gateway.getItems(key) as Promise<FileSystemItem[]>;
+    return this.gateway.getItems(key) as Promise<FileSystemItem[]>;
   }
 
   async createDirectory(key: string, name: string): Promise<any> {
@@ -48,6 +48,10 @@ export class AmazonFileSystem {
     }
   }
 
+  async getPresignedDownloadUrl(fileName: string): Promise<any> {
+    return this.gateway.getPresignedDownloadUrl(fileName);
+  }
+
   getFileNameFromKey(key: string): string {
     const index = key.lastIndexOf('/');
     if (index === -1) {
@@ -56,6 +60,10 @@ export class AmazonFileSystem {
     return key.substring(index + 1);
   }
 
+  async abortFileUpload(fileData: File, uploadInfo: UploadInfo, destinationDirectory: FileSystemItem): Promise<any> {
+    await this.gateway.abortFileUpload(fileData, uploadInfo, destinationDirectory);
+  }
+
   async uploadFileChunk(fileData: File, uploadInfo: UploadInfo, destinationDirectory: FileSystemItem): Promise<any> {
     try {
       if (uploadInfo.chunkIndex === 0) {

Angular/src/app/services/amazon.gateway.ts

@@ -21,6 +21,18 @@ export class AmazonGateway {
     return `${this.endpointUrl}/${methodName}`;
   }
 
+  logRequest(method: string, url: URL, requestUrl: string): void {
+    if (!this.onRequestExecuted) {
+      return;
+    }
+    const params = {
+      method,
+      urlPath: requestUrl,
+      queryString: url.toString().replace(requestUrl, ''),
+    };
+    this.onRequestExecuted(params);
+  }
+
   removeUploadData(fileName: string): void {
     const index = this.uploadData.findIndex((data) => data.key === fileName);
     if (index !== -1) {
@@ -47,43 +59,63 @@ export class AmazonGateway {
   async getItems(path: string): Promise<any> {
     const params = { path };
     const requestParams = { method: 'GET' };
-    return this.makeRequestAsync('getItems', params, requestParams);
+    return this.makeRequest('getItems', params, requestParams);
   }
 
   async createDirectory(path: string, name: string): Promise<void> {
     const params = { path, name };
     const requestParams = { method: 'PUT' };
-    await this.makeRequestAsync('createDirectory', params, requestParams);
+    await this.makeRequest('createDirectory', params, requestParams);
   }
 
   async renameItem(key: string, parentPath: string, name: string): Promise<any> {
     const params = { key, directory: parentPath, newName: name };
     const requestParams = { method: 'PUT' };
-    await this.makeRequestAsync('renameItem', params, requestParams);
+    await this.makeRequest('renameItem', params, requestParams);
   }
 
   async deleteItem(key: string): Promise<any> {
     const params = { item: key };
     const requestParams = { method: 'POST' };
-    await this.makeRequestAsync('deleteItem', params, requestParams);
+    await this.makeRequest('deleteItem', params, requestParams);
   }
 
   async copyItem(sourceKey: string, destinationKey: string): Promise<any> {
     const params = { sourceKey, destinationKey };
     const requestParams = { method: 'PUT' };
-    await this.makeRequestAsync('copyItem', params, requestParams);
+    await this.makeRequest('copyItem', params, requestParams);
   }
 
   async moveItem(sourceKey: string, destinationKey: string): Promise<any> {
     const params = { sourceKey, destinationKey };
     const requestParams = { method: 'POST' };
-    await this.makeRequestAsync('moveItem', params, requestParams);
+    await this.makeRequest('moveItem', params, requestParams);
   }
 
   async downloadItems(keys: string[]): Promise<any> {
     const params = {};
     const requestParams = { method: 'POST', body: JSON.stringify(keys), headers: this.defaultHeaders };
-    return this.makeRequestAsync('downloadItems', params, requestParams);
+    return this.makeRequest('downloadItems', params, requestParams);
+  }
+
+  async getPresignedDownloadUrl(fileName: string): Promise<any> {
+    const params = { key: fileName };
+    const requestOptions = {
+      method: 'POST',
+      headers: this.defaultHeaders,
+    };
+    return this.makeRequest('getPresignedDownloadUrl', params, requestOptions);
+  }
+
+  async initUpload(fileData: File, destinationDirectory: FileSystemItem): Promise<any> {
+    const params = { key: `${destinationDirectory.key}${fileData.name}` };
+    const requestOptions = {
+      method: 'POST',
+      headers: this.defaultHeaders,
+    };
+
+    const uploadId = await this.makeRequest('initUpload', params, requestOptions);
+    this.initUploadData(params.key, uploadId);
   }
 
   async uploadPart(fileData: File, uploadInfo: UploadInfo, destinationDirectory: FileSystemItem): Promise<any> {
@@ -102,7 +134,7 @@ export class AmazonGateway {
       body: data,
     };
 
-    const etag = await this.makeRequestAsync('uploadPart', params, requestOptions);
+    const etag = await this.makeRequest('uploadPart', params, requestOptions);
     // partNumber must be > 0
     this.addPartToUploadData(key, { PartNumber: uploadInfo.chunkIndex + 1, ETag: etag });
   }
@@ -119,49 +151,63 @@ export class AmazonGateway {
       body: JSON.stringify(this.getParts(key)),
     };
 
-    await this.makeRequestAsync('completeUpload', params, requestOptions);
+    await this.makeRequest('completeUpload', params, requestOptions);
     this.removeUploadData(key);
   }
 
-  async initUpload(fileData: File, destinationDirectory: FileSystemItem): Promise<any> {
-    const params = { key: `${destinationDirectory.key}${fileData.name}` };
+  async abortFileUpload(fileData: File, uploadInfo: UploadInfo, destinationDirectory: FileSystemItem): Promise<any> {
+    const key = `${destinationDirectory?.key ?? ''}${fileData.name}`;
+    const uploadId = this.getUploadId(fileData.name);
+    const params = { uploadId, key };
     const requestOptions = {
       method: 'POST',
       headers: this.defaultHeaders,
     };
-
-    const uploadId = await this.makeRequestAsync('initUpload', params, requestOptions);
-    this.initUploadData(params.key, uploadId);
+    return this.makeRequest('abortUpload', params, requestOptions);
   }
 
-  async makeRequestAsync(method: string, queryParams: any, requestParams: RequestInit): Promise<any> {
+  async makeRequest(method: string, queryParams: any, requestParams: RequestInit): Promise<any> {
     const requestUrl = this.getRequestUrl(method);
     const url = new URL(requestUrl);
     Object.keys(queryParams).forEach((key) => url.searchParams.append(key, queryParams[key]));
 
-    if (this.onRequestExecuted) {
-      const params = {
-        method,
-        urlPath: requestUrl,
-        queryString: url.toString().replace(requestUrl, ''),
-      };
-      this.onRequestExecuted(params);
+    this.logRequest(method, url, requestUrl);
+    try {
+      const response = await fetch(url.toString(), requestParams);
+      if (!response.ok) {
+        const errorMessage = await response.text();
+        throw new Error(errorMessage);
+      }
+      /* eslint-disable-next-line @typescript-eslint/no-unsafe-return */
+      return await this.getResponseData(response);
+    } catch (error: any) {
+      throw new Error(error);
     }
-    const response = await fetch(url.toString(), requestParams);
+  }
 
-    if (!response.ok) {
-      const errorMessage = await response.text();
-      throw new Error(errorMessage);
+  getResponseData(response: Response): Promise<any | Blob | string> {
+    if (this.containsAttachment(response)) {
+      return response.blob();
+    }
+    if (this.containsPlainText(response)) {
+      return response.text();
     }
+    return response.json();
+  }
+
+  containsAttachment(response: Response): boolean {
     const contentDisposition = response.headers.get('Content-Disposition');
     if (contentDisposition?.includes('attachment')) {
-      // processing downloadItems request
-      return response.blob();
+      return true;
     }
+    return false;
+  }
+
+  containsPlainText(response: Response): boolean {
     const contentType = response.headers.get('Content-Type');
     if (!contentType || contentType.includes('text/plain')) {
-      return response.text();
+      return true;
     }
-    return response.json();
+    return false;
   }
 }

Angular/src/app/services/app.service.ts

@@ -28,6 +28,7 @@ export class FileManagerService {
       moveItem: this.moveItem,
       uploadFileChunk: this.uploadFileChunk,
       downloadItems: this.downloadItems,
+      abortFileUpload: this.abortFileUpload,
     };
     this.fileSystemProvider = new CustomFileSystemProvider(options);
   }
@@ -90,12 +91,20 @@ export class FileManagerService {
 
   downloadItems = async (items: FileSystemItem[]): Promise<void> => {
     try {
-      return await this.amazon.downloadItems(items);
+      await this.amazon.downloadItems(items);
     } catch (error: any) {
       const item = items.length > 1 ? undefined : items[0];
       throw new FileSystemError(32767, item, error.message);
     }
   };
+
+  abortFileUpload = async (fileData: File, uploadInfo: UploadInfo, destinationDirectory: FileSystemItem): Promise<void> => {
+    try {
+      await this.amazon.abortFileUpload(fileData, uploadInfo, destinationDirectory);
+    } catch (error: any) {
+      throw new Error(error.message);
+    }
+  };
 }
 
 @Injectable()