fix jquery + backend

Author: AlisherAmonulloev

Amazon_Backend/AmazonS3_Backend/Program.cs

@@ -36,10 +36,8 @@ public static void Main(string[] args) {
             BucketName = builder.Configuration.GetValue<string>("AWS:Bucket")!;
 
             awsOptions.Credentials = new BasicAWSCredentials(accessKey, secretKey);
-            
             awsOptions.Region = RegionEndpoint.GetBySystemName(region);
 
-
             builder.Services.AddDefaultAWSOptions(awsOptions);
 
             builder.Services.AddAWSService<IAmazonS3>();

Amazon_Backend/AmazonS3_Backend/Providers/AmazonS3Provider.cs

@@ -165,6 +165,7 @@ public async Task MoveItemAsync(string sourceKey, string destinationKey) {
                 throw;
             }
         }
+
         public async Task RenameItemAsync(string key, string? directory, string newName) {
             if (IsDirectory(key)) {
                 throw new NotImplementedException("Renaming directories is not implemented");
@@ -203,6 +204,7 @@ List<FileSystemItem> GetItemsFromS3Objects(List<S3Object> objects) {
             }
             return result;
         }
+
         public string GetDirectoryNameFromKey(string key) {
             if (string.IsNullOrEmpty(key))
                 throw new ArgumentException("Directory name cannot be empty");
@@ -226,20 +228,6 @@ public async Task<List<FileSystemItem>> GetDirectoriesFromCommonPrefixes(List<st
             }
             return result;
         }
-        public async Task<string> GetPresignedUrl(string key, int expirationSeconds) {
-            DateTime expiration = DateTime.UtcNow.AddSeconds(expirationSeconds);
-            
-            GetPreSignedUrlRequest request = new GetPreSignedUrlRequest {
-                BucketName = BucketName,
-                //Key = key,
-                
-                Verb = HttpVerb.PUT,
-                Expires = expiration,
-                
-            };
-
-            return await Client.GetPreSignedURLAsync(request);
-        }
 
         public async Task<bool> HasDirectorySubDirectoriesAsync(string key) {
             try {
@@ -256,6 +244,7 @@ public async Task<bool> HasDirectorySubDirectoriesAsync(string key) {
                 throw;
             }
         }
+
         string GetNewDirectoryName(string? path, string name) {
             if (string.IsNullOrWhiteSpace(name))
                 throw new ArgumentException("Directory name cannot be null or empty");

Amazon_Backend/AmazonS3_Backend/appsettings.json

@@ -7,6 +7,10 @@
   },
   "AllowedHosts": "*",
   "AWS": {
-    "Profile": "default"
+    "Profile": "default",
+    "AccessKey": "",
+    "SecretKey": "",
+    "Region": "us-east-1",
+    "Bucket": ""
   }
 }

jQuery/src/amazon.filesystem.js

@@ -49,7 +49,15 @@ class AmazonFileSystem {
     try {
       return await this.gateway.moveItem(item.key, `${destinationDir.key}${item.name}`);
     } catch (error) {
-      throw new DevExpress.fileManagement.FileSystemError(32767, item.key, error.message);
+      throw new DevExpress.fileManagement.FileSystemError(32767, item, error.message);
+    }
+  }
+
+  async abortFileUpload(fileData, uploadInfo) {
+    try {
+      await this.gateway.abortFileUpload(fileData, uploadInfo);
+    } catch (error) {
+      throw new DevExpress.fileManagement.FileSystemError(32767, item, error.message);
     }
   }
 

jQuery/src/amazon.gateway.js

@@ -34,19 +34,19 @@ class AmazonGateway {
   async getItems(key) {
     const params = { 'path': key };
     const requestParams = { method: 'GET' };
-    return this.makeRequestAsync('getItems', params, requestParams);
+    return this.makeRequest('getItems', params, requestParams);
   }
 
   async renameItem(key, parentPath, name) {
     const params = { 'key': key, 'directory': parentPath, 'newName': name };
     const requestParams = { method: 'PUT' };
-    await this.makeRequestAsync('renameItem', params, requestParams);
+    await this.makeRequest('renameItem', params, requestParams);
   }
 
   async createDirectory(key, name) {
     const params = { 'path': key, 'name': name };
     const requestParams = { method: 'PUT' };
-    await this.makeRequestAsync('createDirectory', params, requestParams);
+    await this.makeRequest('createDirectory', params, requestParams);
   }
 
   async deleteItem(key) {
@@ -58,19 +58,19 @@ class AmazonGateway {
   async copyItem(sourceKey, destinationKey) {
     const params = { 'sourceKey': sourceKey, 'destinationKey': destinationKey };
     const requestParams = { method: 'PUT' };
-    await this.makeRequestAsync('copyItem', params, requestParams);
+    await this.makeRequest('copyItem', params, requestParams);
   }
 
   async moveItem(sourceKey, destinationKey) {
     const params = { 'sourceKey': sourceKey, 'destinationKey': destinationKey };
     const requestParams = { method: 'POST' };
-    await this.makeRequestAsync('moveItem', params, requestParams);
+    await this.makeRequest('moveItem', params, requestParams);
   }
 
   async downloadItems(keys) {
     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 uploadPart(fileData, uploadInfo, destinationDirectory) {
@@ -89,7 +89,7 @@ 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 });
   }
@@ -106,7 +106,7 @@ class AmazonGateway {
       body: JSON.stringify(this.getParts(key)),
     };
 
-    await this.makeRequestAsync('completeUpload', params, requestOptions);
+    await this.makeRequest('completeUpload', params, requestOptions);
     this.removeUploadData(key);
   }
 
@@ -117,21 +117,30 @@ class AmazonGateway {
       headers: this.defaultHeaders,
     };
 
-    const uploadId = await this.makeRequestAsync('initUpload', params, requestOptions);
+    const uploadId = await this.makeRequest('initUpload', params, requestOptions);
     this.initUploadData(params.key, uploadId);
   }
 
+  async abortFileUpload(fileData, uploadInfo, destinationDirectory) {
+    const params = { uploadId: this.getUploadId(fileData.name) };
+    const requestOptions = {
+      method: 'POST',
+      headers: this.defaultHeaders
+    };
+    return this.makeRequest('abortUpload', params, requestOptions);
+  }
+
   /* eslint-disable-next-line spellcheck/spell-checker */
   async getPresignedDownloadUrl(fileName) {
     const params = { key: fileName };
     const requestOptions = {
       method: 'POST',
       headers: this.defaultHeaders,
     };
-    return this.makeRequestAsync('getPresignedDownloadUrl', params, requestOptions);
+    return this.makeRequest('getPresignedDownloadUrl', params, requestOptions);
   }
 
-  async makeRequestAsync(method, queryParams, requestParams) {
+  async makeRequest(method, queryParams, requestParams) {
     const requestUrl = this.getRequestUrl(method);
     const url = new URL(requestUrl);
 

jQuery/src/index.js

@@ -11,19 +11,18 @@ $(() => {
     moveItem,
     uploadFileChunk,
     downloadItems,
+    abortFileUpload,
   });
 
   $('#file-manager').dxFileManager({
     fileSystemProvider: provider,
 
     allowedFileExtensions: [],
     upload: {
-      // maxFileSize: 1048576,
-      chunkSize: 6000000,
+      chunkSize: 5242880,
     },
     permissions: {
       download: true,
-      // uncomment the code below to enable file/directory management
       create: true,
       copy: true,
       move: true,
@@ -58,6 +57,10 @@ function moveItem(item, destinationDirectory) {
   return amazon.moveItem(item, destinationDirectory);
 }
 
+async function abortFileUpload(fileData, uploadInfo) {
+  return amazon.abortFileUpload(fileData, uploadInfo);
+}
+
 async function uploadFileChunk(fileData, uploadInfo, destinationDirectory) {
   await amazon.uploadFileChunk(fileData, uploadInfo, destinationDirectory);
 }