feat: use fetch api params from api options

Author: arunjaindev

src/Common/API/CoreAPI.ts

@@ -49,6 +49,12 @@ class CoreAPI {
 
                 if (isLicenseInvalid && !preventLicenseRedirect) {
                     this.handleRedirectToLicenseActivation()
+
+                    return new Promise((resolve) => {
+                        setTimeout(() => {
+                            resolve({ code: API_STATUS_CODES.UNAUTHORIZED, status: 'Unauthorized', result: [] })
+                        }, 1000)
+                    })
                 }
 
                 const contentType = response.headers.get('Content-Type')

src/Common/API/types.ts

@@ -21,14 +21,8 @@ export interface FetchInTimeParamsType<Data = object> {
     isMultipartRequest?: boolean
 }
 
-export interface FetchAPIParamsType<Data = object> extends Omit<FetchInTimeParamsType<Data>, 'options'> {
+export interface FetchAPIParamsType<Data = object>
+    extends Omit<FetchInTimeParamsType<Data>, 'options'>,
+        Pick<APIOptions, 'preventAutoLogout' | 'preventLicenseRedirect'> {
     signal: AbortSignal
-    /**
-     * @default false
-     */
-    preventAutoLogout?: boolean
-    /**
-     * @default false
-     */
-    preventLicenseRedirect?: boolean
 }

src/Common/Helper.tsx

@@ -1077,3 +1077,6 @@ export const getHashedValue = async (value: string): Promise<string | null> => {
         return null
     }
 }
+
+export const getTTLInHumanReadableFormat = (ttl: number): string =>
+    moment.duration(Math.abs(ttl), 'seconds').humanize(false)

src/Common/Types.ts

@@ -65,6 +65,9 @@ export interface APIOptions {
      */
     signal?: AbortSignal
     abortControllerRef?: MutableRefObject<AbortController>
+    /**
+     * @default false
+     */
     preventAutoLogout?: boolean
     /**
      * @default false

src/Shared/Components/DevtronLicenseCard/DevtronLicenseCard.tsx

@@ -1,9 +1,9 @@
-import { ClipboardButton } from '@Common/index'
+import { ClipboardButton, getTTLInHumanReadableFormat } from '@Common/index'
 import { ReactComponent as ICChatSupport } from '@IconsV2/ic-chat-circle-dots.svg'
 import { DevtronLicenseCardProps, ENTERPRISE_SUPPORT_LINK, LicenseStatus } from '@Shared/index'
 import { Button, ButtonVariantType } from '../Button'
 import { Icon } from '../Icon'
-import { getLicenseColorsAccordingToStatus, getTTLInHumanReadableFormat } from './utils'
+import { getLicenseColorsAccordingToStatus } from './utils'
 import './licenseCard.scss'
 
 export const DevtronLicenseCard = ({

src/Shared/Components/DevtronLicenseCard/index.tsx

@@ -1,2 +1 @@
 export { default as DevtronLicenseCard } from './DevtronLicenseCard'
-export { getTTLInHumanReadableFormat } from './utils'

src/Shared/Components/DevtronLicenseCard/utils.tsx

@@ -1,5 +1,4 @@
 import { LicenseStatus } from '@Shared/index'
-import moment from 'moment'
 
 export const getLicenseColorsAccordingToStatus = (
     licenseStatus: LicenseStatus,
@@ -13,6 +12,3 @@ export const getLicenseColorsAccordingToStatus = (
             return { bgColor: 'var(--R100)', textColor: 'var(--R500)' }
     }
 }
-
-export const getTTLInHumanReadableFormat = (ttl: number): string =>
-    moment.duration(Math.abs(ttl), 'seconds').humanize(false)