Merge pull request #1262 from makeplane/develop

promote: develop to stage-relaease

apps/app/components/core/image-upload-modal.tsx

@@ -9,6 +9,8 @@ import { useDropzone } from "react-dropzone";
 import { Transition, Dialog } from "@headlessui/react";
 // services
 import fileServices from "services/file.service";
+// hooks
+import useWorkspaceDetails from "hooks/use-workspace-details";
 // ui
 import { PrimaryButton, SecondaryButton } from "components/ui";
 // icons
@@ -35,6 +37,8 @@ export const ImageUploadModal: React.FC<Props> = ({
   const router = useRouter();
   const { workspaceSlug } = router.query;
 
+  const { workspaceDetails } = useWorkspaceDetails();
+
   const onDrop = useCallback((acceptedFiles: File[]) => {
     setImage(acceptedFiles[0]);
   }, []);
@@ -62,12 +66,7 @@ export const ImageUploadModal: React.FC<Props> = ({
           setIsImageUploading(false);
           setImage(null);
 
-          if (value) {
+          if (value) fileServices.deleteUserFile(value);
-            const index = value.indexOf(".com");
-            const asset = value.substring(index + 5);
-
-            fileServices.deleteUserFile(asset);
-          }
         })
         .catch((err) => {
           console.error(err);
@@ -81,12 +80,7 @@ export const ImageUploadModal: React.FC<Props> = ({
           setIsImageUploading(false);
           setImage(null);
 
-          if (value) {
+          if (value && workspaceDetails) fileServices.deleteFile(workspaceDetails.id, value);
-            const index = value.indexOf(".com");
-            const asset = value.substring(index + 5);
-
-            fileServices.deleteFile(asset);
-          }
         })
         .catch((err) => {
           console.error(err);

apps/app/pages/[workspaceSlug]/me/profile/index.tsx

@@ -90,10 +90,7 @@ const Profile: NextPage = () => {
 
     setIsRemoving(true);
 
-    const index = url.indexOf(".com");
+    fileService.deleteUserFile(url).then(() => {
-    const asset = url.substring(index + 5);
-
-    fileService.deleteUserFile(asset).then(() => {
       if (updateUser)
         userService
           .updateUser({ avatar: "" })

apps/app/pages/[workspaceSlug]/settings/index.tsx

@@ -111,10 +111,7 @@ const WorkspaceSettings: NextPage = () => {
 
     setIsImageRemoving(true);
 
-    const index = url.indexOf(".com");
+    fileService.deleteFile(activeWorkspace.id, url).then(() => {
-    const asset = url.substring(index + 5);
-
-    fileService.deleteFile(asset).then(() => {
       workspaceService
         .updateWorkspace(activeWorkspace.slug, { logo: "" }, user)
         .then((res) => {

apps/app/services/file.service.ts

@@ -40,8 +40,11 @@ class FileServices extends APIService {
       });
   }
 
-  async deleteFile(asset: string): Promise<any> {
+  async deleteFile(workspaceId: string, assetUrl: string): Promise<any> {
-    return this.delete(`/api/workspaces/file-assets/${asset}/`)
+    const lastIndex = assetUrl.lastIndexOf("/");
+    const assetId = assetUrl.substring(lastIndex + 1);
+
+    return this.delete(`/api/workspaces/file-assets/${workspaceId}/${assetId}/`)
       .then((response) => response?.data)
       .catch((error) => {
         throw error?.response?.data;
@@ -56,8 +59,11 @@ class FileServices extends APIService {
       });
   }
 
-  async deleteUserFile(asset: string): Promise<any> {
+  async deleteUserFile(assetUrl: string): Promise<any> {
-    return this.delete(`/api/users/file-assets/${asset}`)
+    const lastIndex = assetUrl.lastIndexOf("/");
+    const assetId = assetUrl.substring(lastIndex + 1);
+
+    return this.delete(`/api/users/file-assets/${assetId}`)
       .then((response) => response?.data)
       .catch((error) => {
         throw error?.response?.data;