update jquery and backend

Author: AlisherAmonulloev

Amazon_Backend/AmazonS3_Backend/Controllers/AmazonS3Controller.cs

@@ -117,18 +117,18 @@ public async Task<IActionResult> UploadPart([FromForm] IFormFile part, [FromForm
         public async Task<IActionResult> CompleteUpload([FromBody] List<PartETag> parts, string key, string uploadId) {
             try {
                 var response = await provider.CompleteUploadAsync(key, uploadId, parts);
-                // use response if you need to pass ETag or something else when upload is finished
+                // use `response` if you need to pass ETag or something else when upload is finished
                 return Ok(response.ETag);
             } catch (Exception ex) {
                 return StatusCode(500, ex.Message);
             }
         }
 
         [HttpPost("abortUpload")]
-        public async Task<IActionResult> AbortUpload(string uploadId) {
+        public async Task<IActionResult> AbortUpload(string uploadId, string key) {
             try {
-                var response = await provider.AbortUploadAsync(uploadId);
-                // user response if you need to pass something to the client after aborting upload
+                var response = await provider.AbortUploadAsync(uploadId, key);
+                // use `response` if you need to pass something to the client after aborting upload
                 return Ok(response.HttpStatusCode);
             } catch (Exception ex) {
                 return StatusCode(500, ex.Message);

Amazon_Backend/AmazonS3_Backend/Providers/AmazonS3Provider.cs

@@ -223,6 +223,7 @@ public async Task<List<FileSystemItem>> GetDirectoriesFromCommonPrefixes(List<st
                     Key = item,
                     Size = 0,
                     IsDirectory = true,
+                    DateModified = DateTime.UtcNow,
                     HasSubDirectories = await HasDirectorySubDirectoriesAsync(item),
                 });
             }
@@ -313,8 +314,10 @@ public async Task<CompleteMultipartUploadResponse> CompleteUploadAsync(string ke
             return await Client.CompleteMultipartUploadAsync(request);
         }
 
-        public async Task<AbortMultipartUploadResponse> AbortUploadAsync(string uploadId) {
+        public async Task<AbortMultipartUploadResponse> AbortUploadAsync(string uploadId, string key) {
             var request = new AbortMultipartUploadRequest() {
+                BucketName = BucketName,
+                Key = key,
                 UploadId = uploadId
             };
             return await Client.AbortMultipartUploadAsync(request);

jQuery/src/amazon.filesystem.js

@@ -5,75 +5,43 @@ class AmazonFileSystem {
     this.gateway = new AmazonGateway(baseUrl, onRequestExecuted);
   }
 
-  async getItems(path) {
-    try {
-      return await this.gateway.getItems(path);
-    } catch (error) {
-      throw new DevExpress.fileManagement.FileSystemError(32767, path, error.message);
-    }
+  getItems(path) {
+    return this.gateway.getItems(path);
   }
 
-  async createDirectory(key, name) {
-    try {
-      return await this.gateway.createDirectory(key, name);
-    } catch (error) {
-      throw new DevExpress.fileManagement.FileSystemError(32767, name, error.message);
-    }
+  createDirectory(key, name) {
+    return this.gateway.createDirectory(key, name);
   }
 
-  async renameItem(key, parentPath, name) {
-    try {
-      return await this.gateway.renameItem(key, `${parentPath}/`, name);
-    } catch (error) {
-      throw new DevExpress.fileManagement.FileSystemError(32767, key, error.message);
-    }
+  renameItem(key, parentPath, name) {
+    return this.gateway.renameItem(key, `${parentPath}/`, name);
   }
 
-  async deleteItem(key) {
-    try {
-      return await this.gateway.deleteItem(key);
-    } catch (error) {
-      throw new DevExpress.fileManagement.FileSystemError(32767, key, error.message);
-    }
+  deleteItem(key) {
+    return this.gateway.deleteItem(key);
   }
 
-  async copyItem(item, destinationDir) {
-    try {
-      return await this.gateway.copyItem(item.key, `${destinationDir.key}${item.name}`);
-    } catch (error) {
-      throw new DevExpress.fileManagement.FileSystemError(32767, item.key, error.message);
-    }
+  copyItem(item, destinationDir) {
+    return this.gateway.copyItem(item.key, `${destinationDir.key}${item.name}`);
   }
 
-  async moveItem(item, destinationDir) {
-    try {
-      return await this.gateway.moveItem(item.key, `${destinationDir.key}${item.name}`);
-    } catch (error) {
-      throw new DevExpress.fileManagement.FileSystemError(32767, item, error.message);
-    }
+  moveItem(item, destinationDir) {
+    return this.gateway.moveItem(item.key, `${destinationDir.key}${item.name}`);
   }
 
-  async abortFileUpload(fileData, uploadInfo) {
-    try {
-      await this.gateway.abortFileUpload(fileData, uploadInfo);
-    } catch (error) {
-      throw new DevExpress.fileManagement.FileSystemError(32767, item, error.message);
-    }
+  async abortFileUpload(fileData, uploadInfo, destinationDirectory) {
+    await this.gateway.abortFileUpload(fileData, uploadInfo, destinationDirectory);
   }
 
   async uploadFileChunk(fileData, uploadInfo, destinationDirectory) {
-    try {
-      if (uploadInfo.chunkIndex === 0) {
-        await this.gateway.initUpload(fileData, destinationDirectory);
-      }
-
-      await this.gateway.uploadPart(fileData, uploadInfo, destinationDirectory);
+    if (uploadInfo.chunkIndex === 0) {
+      await this.gateway.initUpload(fileData, destinationDirectory);
+    }
+    // upload part even if a chunk is first or last
+    await this.gateway.uploadPart(fileData, uploadInfo, destinationDirectory);
 
-      if (uploadInfo.chunkCount === uploadInfo.chunkIndex + 1) {
-        await this.gateway.completeUpload(fileData, uploadInfo, destinationDirectory);
-      }
-    } catch (error) {
-      throw new DevExpress.fileManagement.FileSystemError(32767, fileData.name, error.message);
+    if (uploadInfo.chunkCount === uploadInfo.chunkIndex + 1) {
+      await this.gateway.completeUpload(fileData, uploadInfo, destinationDirectory);
     }
   }
 
@@ -94,11 +62,7 @@ class AmazonFileSystem {
   async downloadItems(items) {
     const keys = items.map((x) => x.key);
     const fileName = keys.length > 1 ? 'archive.zip' : this.getFileNameFromKey(keys[0]);
-    try {
-      const blob = await this.gateway.downloadItems(keys);
-      saveAs(new Blob([blob], { type: 'application/octet-stream' }), fileName);
-    } catch (error) {
-      throw new DevExpress.fileManagement.FileSystemError(32767, fileName, error.message);
-    }
+    const blob = await this.gateway.downloadItems(keys);
+    saveAs(new Blob([blob], { type: 'application/octet-stream' }), fileName);
   }
 }

jQuery/src/amazon.gateway.js

@@ -31,28 +31,28 @@ class AmazonGateway {
     return this.uploadData[fileName].parts;
   }
 
-  async getItems(key) {
+  getItems(key) {
     const params = { 'path': key };
     const requestParams = { method: 'GET' };
     return this.makeRequest('getItems', params, requestParams);
   }
 
-  async renameItem(key, parentPath, name) {
+  renameItem(key, parentPath, name) {
     const params = { 'key': key, 'directory': parentPath, 'newName': name };
     const requestParams = { method: 'PUT' };
-    await this.makeRequest('renameItem', params, requestParams);
+    return this.makeRequest('renameItem', params, requestParams);
   }
 
-  async createDirectory(key, name) {
+  createDirectory(key, name) {
     const params = { 'path': key, 'name': name };
     const requestParams = { method: 'PUT' };
-    await this.makeRequest('createDirectory', params, requestParams);
+    return this.makeRequest('createDirectory', params, requestParams);
   }
 
   async deleteItem(key) {
     const params = { 'item': key };
     const requestParams = { method: 'POST' };
-    await this.makeRequestAsync('deleteItem', params, requestParams);
+    await this.makeRequest('deleteItem', params, requestParams);
   }
 
   async copyItem(sourceKey, destinationKey) {
@@ -122,10 +122,12 @@ class AmazonGateway {
   }
 
   async abortFileUpload(fileData, uploadInfo, destinationDirectory) {
-    const params = { uploadId: this.getUploadId(fileData.name) };
+    const key = `${destinationDirectory?.key ?? ''}${fileData.name}`;
+    const uploadId = this.getUploadId(fileData.name);
+    const params = { uploadId, key };
     const requestOptions = {
       method: 'POST',
-      headers: this.defaultHeaders
+      headers: this.defaultHeaders,
     };
     return this.makeRequest('abortUpload', params, requestOptions);
   }
@@ -140,36 +142,56 @@ class AmazonGateway {
     return this.makeRequest('getPresignedDownloadUrl', params, requestOptions);
   }
 
-  async makeRequest(method, queryParams, requestParams) {
-    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);
+  logRequest(method, url, requestUrl) {
+    if (!this.onRequestExecuted) {
+      return;
     }
+    const params = {
+      method,
+      urlPath: requestUrl,
+      queryString: url.toString().replace(requestUrl, ''),
+    };
+    this.onRequestExecuted(params);
+  }
 
-    const response = await fetch(url.toString(), requestParams);
-
-    if (!response.ok) {
-      const errorResult = await response.text();
-      throw new Error(errorResult.errorText);
-    }
+  containsAttachment(response) {
     const contentDisposition = response.headers.get('Content-Disposition');
     if (contentDisposition && contentDisposition.includes('attachment')) {
-      // processing downloadItems request
-      return response.blob();
+      return true;
     }
+    return false;
+  }
+
+  containsPlainText(response) {
     const contentType = response.headers.get('Content-Type');
     if (!contentType || contentType.includes('text/plain')) {
-      return response.text();
+      return true;
+    }
+    return false;
+  }
+
+  async makeRequest(method, queryParams, requestParams) {
+    const requestUrl = this.getRequestUrl(method);
+    const url = new URL(requestUrl);
+
+    Object.keys(queryParams).forEach((key) => url.searchParams.append(key, queryParams[key]));
+    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);
+      }
+      if (this.containsAttachment(response)) {
+        return response.blob();
+      }
+      if (this.containsPlainText(response)) {
+        return response.text();
+      }
+      return response.json();
+    } catch (error) {
+      throw new Error(error.message);
     }
-    return response.json();
   }
 }

jQuery/src/index.js

@@ -33,40 +33,76 @@ $(() => {
   });
 });
 
-function getItems(item) {
-  return amazon.getItems(item.key);
+async function getItems(item) {
+  try {
+    return amazon.getItems(item.key);
+  } catch (error) {
+    throw new DevExpress.fileManagement.FileSystemError(32767, item, error.message);
+  }
 }
 
-function createDirectory(parentDirectory, name) {
-  return amazon.createDirectory(parentDirectory.key, name);
+async function createDirectory(parentDirectory, name) {
+  try {
+    await amazon.createDirectory(parentDirectory.key, name);
+  } catch (error) {
+    throw new DevExpress.fileManagement.FileSystemError(32767, item, error.message);
+  }
 }
 
-function renameItem(item, name) {
-  return amazon.renameItem(item.key, item.parentPath, name);
+async function renameItem(item, name) {
+  try {
+    await amazon.renameItem(item.key, item.parentPath, name);
+  } catch (error) {
+    throw new DevExpress.fileManagement.FileSystemError(32767, item, error.message);
+  }
 }
 
-function deleteItem(item) {
-  return amazon.deleteItem(item.key);
+async function deleteItem(item) {
+  try {
+    await amazon.deleteItem(item.key);
+  } catch (error) {
+    throw new DevExpress.fileManagement.FileSystemError(32767, item, error.message);
+  }
 }
 
-function copyItem(item, destinationDirectory) {
-  return amazon.copyItem(item, destinationDirectory);
+async function copyItem(item, destinationDirectory) {
+  try {
+    await amazon.copyItem(item, destinationDirectory);
+  } catch (error) {
+    throw new DevExpress.fileManagement.FileSystemError(32767, item, error.message);
+  }
 }
 
-function moveItem(item, destinationDirectory) {
-  return amazon.moveItem(item, destinationDirectory);
+async function moveItem(item, destinationDirectory) {
+  try {
+    await amazon.moveItem(item, destinationDirectory);
+  } catch (error) {
+    throw new DevExpress.fileManagement.FileSystemError(32767, item, error.message);
+  }
 }
 
-async function abortFileUpload(fileData, uploadInfo) {
-  return amazon.abortFileUpload(fileData, uploadInfo);
+async function abortFileUpload(fileData, uploadInfo, destinationDirectory) {
+  try {
+    await amazon.abortFileUpload(fileData, uploadInfo, destinationDirectory);
+  } catch (error) {
+    throw new Error(error.message);
+  }
 }
 
 async function uploadFileChunk(fileData, uploadInfo, destinationDirectory) {
-  await amazon.uploadFileChunk(fileData, uploadInfo, destinationDirectory);
+  try {
+    await amazon.uploadFileChunk(fileData, uploadInfo, destinationDirectory);
+  } catch (error) {
+    throw new Error(error.message);
+  }
 }
 
-function downloadItems(items) {
-  return amazon.downloadItems(items);
+async function downloadItems(items) {
+  try {
+    await amazon.downloadItems(items);
+  } catch (error) {
+    throw new Error(error.message);
+  }
 }
 
 function onRequestExecuted(e) {