Merge branch 'develop' into chore/sync-packet-17

Author: eshankvaish

src/Common/Api.ts

@@ -263,4 +263,4 @@ export const abortPreviousRequests = <T>(
  */
 export const getIsRequestAborted = (error) =>
     // The 0 code is common for aborted and blocked requests
-    error && error.code === 0 && error.message.search('abort\|aborted')
+    error && error.code === 0 && error.message.search('abort|aborted')

src/Common/AppStatus/index.ts

@@ -15,4 +15,4 @@
  */
 
 export { default as AppStatus } from './AppStatus'
-export * from './utils'
+export * from './utils'

src/Common/ClipboardButton/ClipboardButton.tsx

@@ -42,12 +42,14 @@ export default function ClipboardButton({
     const [copied, setCopied] = useState<boolean>(false)
     const [enableTippy, setEnableTippy] = useState<boolean>(false)
 
-    const handleTextCopied = () => {setCopied(true)}
+    const handleTextCopied = () => {
+        setCopied(true)
+    }
     const handleEnableTippy = () => setEnableTippy(true)
     const handleDisableTippy = () => setEnableTippy(false)
     const handleCopyContent = useCallback(
         (e?) => {
-           if(e) stopPropagation(e)
+            if (e) stopPropagation(e)
             copyToClipboard(content, handleTextCopied)
         },
         [content],

src/Common/Common.service.ts

@@ -80,7 +80,13 @@ export function setImageTags(request, pipelineId: number, artifactId: number) {
     return post(`${ROUTES.IMAGE_TAGGING}/${pipelineId}/${artifactId}`, request)
 }
 
-const cdMaterialListModal = (artifacts: any[], offset: number, artifactId?: number, artifactStatus?: string, disableDefaultSelection?: boolean) => {
+const cdMaterialListModal = (
+    artifacts: any[],
+    offset: number,
+    artifactId?: number,
+    artifactStatus?: string,
+    disableDefaultSelection?: boolean,
+) => {
     if (!artifacts || !artifacts.length) return []
 
     const markFirstSelected = offset === 0
@@ -346,9 +352,7 @@ export function fetchChartTemplateVersions() {
     return get(`${ROUTES.DEPLOYMENT_TEMPLATE_LIST}?appId=-1&envId=-1`)
 }
 
-export const getDefaultConfig = (): Promise<ResponseType> => {
-    return get(`${ROUTES.NOTIFIER}/channel/config`)
-}
+export const getDefaultConfig = (): Promise<ResponseType> => get(`${ROUTES.NOTIFIER}/channel/config`)
 
 export function getEnvironmentListMinPublic(includeAllowedDeploymentTypes?: boolean) {
     return get(
@@ -361,13 +365,12 @@ export function getClusterListMin() {
     return get(URL)
 }
 
-export const getResourceGroupListRaw = (clusterId: string): Promise<ResponseType<ApiResourceType>> => {
-    return get(`${ROUTES.API_RESOURCE}/${ROUTES.GVK}/${clusterId}`)
-}
+export const getResourceGroupListRaw = (clusterId: string): Promise<ResponseType<ApiResourceType>> =>
+    get(`${ROUTES.API_RESOURCE}/${ROUTES.GVK}/${clusterId}`)
 
 export function getNamespaceListMin(clusterIdsCsv: string): Promise<EnvironmentListHelmResponse> {
-  const URL = `${ROUTES.NAMESPACE}/autocomplete?ids=${clusterIdsCsv}`
-  return get(URL)
+    const URL = `${ROUTES.NAMESPACE}/autocomplete?ids=${clusterIdsCsv}`
+    return get(URL)
 }
 export function getWebhookEventsForEventId(eventId: string | number) {
     const URL = `${ROUTES.GIT_HOST_EVENT}/${eventId}`

src/Common/CustomInput/CustomInput.tsx

@@ -135,9 +135,9 @@ export const CustomInput = ({
 
             {getInputError()}
             {helperText && (
-                 <div className="flex left top dc__gap-4 fs-11 lh-16 cn-7 mt-4">
-                 <Info className="icon-dim-16" />
-                 <div>{helperText}</div>
+                <div className="flex left top dc__gap-4 fs-11 lh-16 cn-7 mt-4">
+                    <Info className="icon-dim-16" />
+                    <div>{helperText}</div>
                 </div>
             )}
         </div>

src/Common/DraggableWrapper/DraggableWrapper.tsx

@@ -34,7 +34,7 @@ export default function DraggableWrapper({
     parentRef,
     boundaryGap = 16,
     childDivProps = {},
-    layoutFixDelta = 0
+    layoutFixDelta = 0,
 }: DraggableWrapperProps) {
     const windowSize = useWindowSize()
     const nodeRef = useRef<HTMLDivElement>(null)

src/Common/EmptyState/GenericEmptyState.tsx

@@ -84,11 +84,7 @@ const GenericEmptyState = ({
             >
                 <div className="flex column dc__gap-8">
                     <h4 className="title fw-6 cn-9 mt-0 mb-0 lh-24 dc__align-center">{title}</h4>
-                    {subTitle && (
-                        <p className={`subtitle ${isRowLayout ? 'subtitle--text-start' : ''}`}>
-                            {subTitle}
-                        </p>
-                    )}
+                    {subTitle && <p className={`subtitle ${isRowLayout ? 'subtitle--text-start' : ''}`}>{subTitle}</p>}
                 </div>
                 {isButtonAvailable && renderButton()}
                 {children}

src/Common/ErrorPage.tsx

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { useHistory } from 'react-router'
+import { useHistory } from 'react-router-dom'
 import { ERROR_STATUS_CODE, ERROR_EMPTY_SCREEN, ROUTES } from './Constants'
 import GenericEmptyState from './EmptyState/GenericEmptyState'
 import { ErrorPageType } from './Types'

src/Common/Helper.tsx

@@ -27,8 +27,7 @@ import { ERROR_EMPTY_SCREEN, SortingOrder, EXCLUDED_FALSY_VALUES, DISCORD_LINK,
 import { ServerErrors } from './ServerError'
 import { toastAccessDenied } from './ToastBody'
 import { AsyncOptions, AsyncState, UseSearchString } from './Types'
-import { scrollableInterface } from '../Shared'
-import { DATE_TIME_FORMAT_STRING } from '../Shared'
+import { scrollableInterface, DATE_TIME_FORMAT_STRING } from '../Shared'
 import { ReactComponent as ArrowDown } from '../Assets/Icon/ic-chevron-down.svg'
 
 toast.configure({
@@ -730,8 +729,7 @@ export const powerSetOfSubstringsFromStart = (strings: string[], regex: RegExp)
         return _keys
     })
 
-export const convertJSONPointerToJSONPath = (pointer: string) =>
-    pointer.replace(/\//g, '.').replace(/\./, '$.')
+export const convertJSONPointerToJSONPath = (pointer: string) => pointer.replace(/\//g, '.').replace(/\./, '$.')
 
 export const flatMapOfJSONPaths = (
     paths: string[],
@@ -775,15 +773,16 @@ export const handleRelativeDateSorting = (dateStringA, dateStringB, sortOrder) =
 
     if (isNaN(dateA) && isNaN(dateB)) {
         return 0 // Both dates are invalid, consider them equal
-    } else if (isNaN(dateA)) {
+    }
+    if (isNaN(dateA)) {
         // dateA is invalid, move it to the end if sorting ASC, otherwise to the beginning
         return sortOrder === SortingOrder.ASC ? 1 : -1
-    } else if (isNaN(dateB)) {
+    }
+    if (isNaN(dateB)) {
         // dateB is invalid, move it to the end if sorting ASC, otherwise to the beginning
         return sortOrder === SortingOrder.ASC ? -1 : 1
-    } else {
-        return sortOrder === SortingOrder.ASC ? dateB - dateA : dateA - dateB
     }
+    return sortOrder === SortingOrder.ASC ? dateB - dateA : dateA - dateB
 }
 
 /**
@@ -1027,13 +1026,11 @@ export function useKeyDown() {
     return keys
 }
 
-export const DropdownIndicator = (props) => {
-    return (
-        <components.DropdownIndicator {...props}>
-            <ArrowDown className="icon-dim-20 icon-n6" />
-        </components.DropdownIndicator>
-    )
-}
+export const DropdownIndicator = (props) => (
+    <components.DropdownIndicator {...props}>
+        <ArrowDown className="icon-dim-20 icon-n6" />
+    </components.DropdownIndicator>
+)
 
 export function mapByKey<T = Map<any, any>>(arr: any[], id: string): T {
     if (!Array.isArray(arr)) {

src/Common/ImageTags.tsx

@@ -280,14 +280,12 @@ export const ImageTagsContainer = ({
         <div className="h-250 fs-13 dc__overflow-scroll p-12">
             <div>Image labels allow you to tag container images with readable and relatable labels eg. v1.0.</div>
             <ul className="pl-20 mt-8">
-                <li>
-                    A label can only be added if a workflow has CD pipelines deploying to Production environments.
-                </li>
+                <li>A label can only be added if a workflow has CD pipelines deploying to Production environments.</li>
                 <li>Multiple labels can be added to an image.</li>
                 <li>Multiple images in an application cannot have the same label.</li>
                 <li>
-                    Labels cannot be deleted once saved. Although, you can soft delete a label if an unwanted label has been
-                    added.
+                    Labels cannot be deleted once saved. Although, you can soft delete a label if an unwanted label has
+                    been added.
                 </li>
             </ul>
         </div>