Fix file deletion, sort by date in dashboard

xirreal-plugins · Jan 3, 2025 · 95a7b8b · 95a7b8b
1 parent 908494b
commit 95a7b8b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/plugins/externalUpload/index.jsx b/plugins/externalUpload/index.jsx
@@ -81,7 +81,7 @@ export const settings = () => (
   "CORSRules": [
     {
       "AllowedHeaders": ["*"],
-      "AllowedMethods": ["GET", "PUT"],
+      "AllowedMethods": ["GET", "PUT", "DELETE"],
       "AllowedOrigins": ["*"],
       "ExposeHeaders": ["ETag"]
     }

diff --git a/plugins/externalUpload/modal.jsx b/plugins/externalUpload/modal.jsx
@@ -1,5 +1,5 @@
 import styles from "./modal.jsx.scss";
-import { formatFileSize, getAllFiles, getFilePreview, uploadFiles, formatDate, getUrl } from "./utils";
+import { formatFileSize, getAllFiles, getFilePreview, uploadFiles, formatDate, getUrl, deleteFile } from "./utils";
 
 const {
    ui: {
@@ -132,7 +132,7 @@ export function UploadModal(closeModal) {
    };
 
    const handleDeleteFile = async (file) => {
-      console.log("Deleting file:", file);
+      await deleteFile(file.Key);
       await fetchDashboardFiles();
    };
 
@@ -289,7 +289,7 @@ export function UploadModal(closeModal) {
                   <Button
                      disabled={isUploading() || files().length === 0}
                      size={ButtonSizes.MEDIUM}
-                     color={ButtonColors.BRANDED}
+                     color={ButtonColors.BRAND}
                      onClick={handleConfirm}
                   >
                      {isUploading() ? "Uploading..." : "Upload"}

diff --git a/plugins/externalUpload/utils.js b/plugins/externalUpload/utils.js
@@ -1,4 +1,4 @@
-import { S3Client, ListObjectsV2Command } from "@aws-sdk/client-s3";
+import { S3Client, ListObjectsV2Command, DeleteObjectCommand } from "@aws-sdk/client-s3";
 import { Upload } from "@aws-sdk/lib-storage";
 import xxhash from "xxhash-wasm";
 
@@ -125,7 +125,16 @@ export async function getAllFiles() {
       }),
    );
 
-   return response.Contents;
+   return response.Contents.sort((a, b) => b.LastModified - a.LastModified);
+}
+
+export async function deleteFile(key) {
+   await s3Client.send(
+      new DeleteObjectCommand({
+         Bucket: BUCKET_NAME,
+         Key: key,
+      }),
+   );
 }
 
 export function formatDate(date) {