github/plane
0
0
Fork 1
mirror of https://github.com/makeplane/plane synced 2024-06-14 14:31:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1262 from makeplane/develop

Browse Source 
promote: develop to stage-relaease
This commit is contained in:
guru_sainath 2023-06-09 16:23:23 +05:30 committed by GitHub
commit 9529ddb393
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/app/components/core/image-upload-modal.tsx
View File

@ -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) {
const index = value.indexOf(".com");
const asset = value.substring(index + 5);
fileServices.deleteUserFile(asset);
}
if (value) fileServices.deleteUserFile(value);
})
.catch((err) => {
console.error(err);
@ -81,12 +80,7 @@ export const ImageUploadModal: React.FC<Props> = ({
setIsImageUploading(false);
setImage(null);
if (value) {
const index = value.indexOf(".com");
const asset = value.substring(index + 5);
fileServices.deleteFile(asset);
}
if (value && workspaceDetails) fileServices.deleteFile(workspaceDetails.id, value);
})
.catch((err) => {
console.error(err);

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

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

5
apps/app/pages/[workspaceSlug]/settings/index.tsx
View File

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

14
apps/app/services/file.service.ts
View File

@ -40,8 +40,11 @@ class FileServices extends APIService {
});
}
async deleteFile(asset: string): Promise<any> {
return this.delete(`/api/workspaces/file-assets/${asset}/`)
async deleteFile(workspaceId: string, assetUrl: string): Promise<any> {
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> {
return this.delete(`/api/users/file-assets/${asset}`)
async deleteUserFile(assetUrl: string): Promise<any> {
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;