Infrastructure/logto
0
Fork 0
mirror of https://github.com/logto-io/logto.git synced 2024-12-16 20:26:19 -05:00
Code Issues Activity

refactor(console): increase custom ui assets upload timeout to 5 mins (#6319)

Browse source 
refactor(console): increase custom ui assets upload timeout to 5mins
This commit is contained in:
Charles Zhao 2024-07-25 17:59:48 +08:00 committed by GitHub
parent 6477c6deef
commit e76d4e6e53
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
packages/console/src/components/CustomUiAssetsUploader/index.tsx
View file

@ -13,6 +13,8 @@ import FileIcon from '../FileIcon';
import styles from './index.module.scss';
const requestTimeout = 300_000; // 5 minutes
type Props = {
// eslint-disable-next-line react/boolean-prop-naming
readonly disabled?: boolean;
@ -51,6 +53,7 @@ function CustomUiAssetsUploader({ disabled, value, onChange }: Props) {
if (showUploader) {
return (
<FileUploader<{ customUiAssetId: string }>
defaultApiInstanceTimeout={requestTimeout}
disabled={disabled}
allowedMimeTypes={allowedMimeTypes}
maxSize={maxUploadFileSize}

9
packages/console/src/ds-components/Uploader/FileUploader/index.tsx
View file

@ -18,6 +18,11 @@ export type Props<T extends Record<string, unknown> = UserAssets> = {
// eslint-disable-next-line react/boolean-prop-naming
readonly disabled?: boolean;
readonly maxSize: number; // In bytes
/**
* The timeout for the default api instance, in milliseconds.
* Will not be applied if a custom API instance is provided.
*/
readonly defaultApiInstanceTimeout?: number;
readonly allowedMimeTypes: AllowedUploadMimeType[];
readonly actionDescription?: string;
readonly onCompleted: (response: T) => void;
@ -25,6 +30,7 @@ export type Props<T extends Record<string, unknown> = UserAssets> = {
readonly className?: string;
/**
* Specify which API instance to use for the upload request. For example, you can use admin tenant API instead.
* The `timeout` prop will not be applied to this instance.
* Defaults to the return value of `useApi()`.
*/
readonly apiInstance?: KyInstance;
@ -37,6 +43,7 @@ export type Props<T extends Record<string, unknown> = UserAssets> = {
function FileUploader<T extends Record<string, unknown> = UserAssets>({
disabled,
maxSize,
defaultApiInstanceTimeout,
allowedMimeTypes,
actionDescription,
onCompleted,
@ -57,7 +64,7 @@ function FileUploader<T extends Record<string, unknown> = UserAssets>({
};
}, [onUploadErrorChange, uploadError]);
const api = useApi();
const api = useApi({ timeout: defaultApiInstanceTimeout });
const onDrop = useCallback(
async (acceptedFiles: File[] = [], fileRejection: FileRejection[] = []) => {

5
packages/console/src/hooks/use-api.ts
View file

@ -40,6 +40,7 @@ export type StaticApiProps = {
prefixUrl?: URL;
hideErrorToast?: boolean | LogtoErrorCode[];
resourceIndicator: string;
timeout?: number;
};
const useGlobalRequestErrorHandler = (toastDisabledErrorCodes?: LogtoErrorCode[]) => {
@ -110,6 +111,7 @@ export const useStaticApi = ({
prefixUrl,
hideErrorToast,
resourceIndicator,
timeout = requestTimeout,
}: StaticApiProps): KyInstance => {
const { isAuthenticated, getAccessToken, getOrganizationToken } = useLogto();
const { i18n } = useTranslation(undefined, { keyPrefix: 'admin_console' });
@ -125,7 +127,7 @@ export const useStaticApi = ({
() =>
ky.create({
prefixUrl,
timeout: requestTimeout,
timeout,
hooks: {
beforeError: conditionalArray(
!disableGlobalErrorHandling &&
@ -156,6 +158,7 @@ export const useStaticApi = ({
getOrganizationToken,
getAccessToken,
i18n.language,
timeout,
]
);