binarybeach/bb-plane-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[WEB-310] regression: generate file url function (#5811)

Browse source 
* fix: generate file url function

* chore: remove unused imports

* chore: replace indexOf logix with startsWith
This commit is contained in:
Aaryan Khandelwal 2024-10-12 23:39:50 +05:30 • committed by GitHub
parent 7cc86ad4c0
commit e404450e1a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
admin/helpers/file.helper.ts
View file

@ -1,6 +1,5 @@
// helpers // helpers
import { API_BASE_URL } from "@/helpers/common.helper"; import { API_BASE_URL } from "@/helpers/common.helper";
import { checkURLValidity } from "@/helpers/string.helper";
/** /**
* @description combine the file path with the base URL * @description combine the file path with the base URL
@ -9,7 +8,7 @@ import { checkURLValidity } from "@/helpers/string.helper";
*/ */
export const getFileURL = (path: string): string | undefined => { export const getFileURL = (path: string): string | undefined => {
if (!path) return undefined; if (!path) return undefined;
const isValidURL = checkURLValidity(path); const isValidURL = path.startsWith("http");
if (isValidURL) return path; if (isValidURL) return path;
return `${API_BASE_URL}${path}`; return `${API_BASE_URL}${path}`;
}; };

3
space/helpers/file.helper.ts
View file

@ -2,7 +2,6 @@
import { TFileMetaDataLite, TFileSignedURLResponse } from "@plane/types"; import { TFileMetaDataLite, TFileSignedURLResponse } from "@plane/types";
// helpers // helpers
import { API_BASE_URL } from "@/helpers/common.helper"; import { API_BASE_URL } from "@/helpers/common.helper";
import { checkURLValidity } from "@/helpers/string.helper";
/** /**
* @description from the provided signed URL response, generate a payload to be used to upload the file * @description from the provided signed URL response, generate a payload to be used to upload the file
@ -24,7 +23,7 @@ export const generateFileUploadPayload = (signedURLResponse: TFileSignedURLRespo
*/ */
export const getFileURL = (path: string): string | undefined => { export const getFileURL = (path: string): string | undefined => {
if (!path) return undefined; if (!path) return undefined;
const isValidURL = checkURLValidity(path); const isValidURL = path.startsWith("http");
if (isValidURL) return path; if (isValidURL) return path;
return `${API_BASE_URL}${path}`; return `${API_BASE_URL}${path}`;
}; };

3
web/helpers/file.helper.ts
View file

@ -2,7 +2,6 @@
import { TFileMetaDataLite, TFileSignedURLResponse } from "@plane/types"; import { TFileMetaDataLite, TFileSignedURLResponse } from "@plane/types";
// helpers // helpers
import { API_BASE_URL } from "@/helpers/common.helper"; import { API_BASE_URL } from "@/helpers/common.helper";
import { checkURLValidity } from "@/helpers/string.helper";
/** /**
* @description from the provided signed URL response, generate a payload to be used to upload the file * @description from the provided signed URL response, generate a payload to be used to upload the file
@ -24,7 +23,7 @@ export const generateFileUploadPayload = (signedURLResponse: TFileSignedURLRespo
*/ */
export const getFileURL = (path: string): string | undefined => { export const getFileURL = (path: string): string | undefined => {
if (!path) return undefined; if (!path) return undefined;
const isValidURL = checkURLValidity(path); const isValidURL = path.startsWith("http");
if (isValidURL) return path; if (isValidURL) return path;
return `${API_BASE_URL}${path}`; return `${API_BASE_URL}${path}`;
}; };