refactor: code refactor/review fixes

Author: RohitRaj011

src/Shared/Components/DeploymentConfigDiff/DeploymentConfigDiff.utils.tsx

@@ -300,22 +300,20 @@ const getDiffHeading = <DeploymentTemplate extends boolean>(
     let isDraft = false
     let isApprovalPending = false
 
-    if (deploymentTemplate) {
+    if (!data) {
+        doesNotExist = true
+    } else if (deploymentTemplate) {
         const _data = data as DeploymentTemplateDTO
-        if (!_data) {
-            doesNotExist = true
-        } else if (_data?.deploymentDraftData?.configData[0].draftMetadata.draftState === DraftState.Init) {
+        if (_data.deploymentDraftData?.configData[0].draftMetadata.draftState === DraftState.Init) {
             isDraft = true
-        } else if (_data?.deploymentDraftData?.configData[0].draftMetadata.draftState === DraftState.AwaitApproval) {
+        } else if (_data.deploymentDraftData?.configData[0].draftMetadata.draftState === DraftState.AwaitApproval) {
             isApprovalPending = true
         }
     } else {
         const _data = data as ConfigMapSecretDataConfigDatumDTO
-        if (!_data) {
-            doesNotExist = true
-        } else if (_data?.draftMetadata?.draftState === DraftState.Init) {
+        if (_data.draftMetadata?.draftState === DraftState.Init) {
             isDraft = true
-        } else if (_data?.draftMetadata?.draftState === DraftState.AwaitApproval) {
+        } else if (_data.draftMetadata?.draftState === DraftState.AwaitApproval) {
             isApprovalPending = true
         }
     }

src/Shared/Components/SelectPicker/index.ts

@@ -1,2 +1,3 @@
 export { default as SelectPicker } from './SelectPicker.component'
 export * from './type'
+export { getSelectPickerOptionByValue } from './utils'

src/Shared/Components/SelectPicker/utils.ts

@@ -1,5 +1,5 @@
 import { ComponentSizeType } from '@Shared/constants'
-import { StylesConfig } from 'react-select'
+import { GroupBase, OptionsOrGroups, StylesConfig } from 'react-select'
 import { SelectPickerOptionType, SelectPickerProps, SelectPickerVariantType } from './type'
 
 const getMenuWidthFromSize = (menuSize: SelectPickerProps['menuSize']): string => {
@@ -179,3 +179,39 @@ export const getCommonSelectStyle = ({
         ...(getVariantOverrides(variant)?.singleValue(base, state) || {}),
     }),
 })
+
+/**
+ * Retrieves an option from the options list based on the provided value.
+ *
+ * @param optionsList - The list of options or groups of options.
+ * @param value - The value to compare against the options' values.
+ * @param defaultOption - The default option to return if no match is found.
+ * @returns The matched option or the default option if no match is found.
+ */
+export const getSelectPickerOptionByValue = (
+    optionsList: OptionsOrGroups<SelectPickerOptionType, GroupBase<SelectPickerOptionType>>,
+    value: string | number,
+    defaultOption: SelectPickerOptionType = { label: '', value: '' },
+): SelectPickerOptionType => {
+    const foundOption = optionsList.reduce(
+        (acc, curr) => {
+            if (!acc.notFound) return acc
+
+            if ('value' in curr && curr.value === value) {
+                return { data: curr, notFound: false }
+            }
+
+            if ('options' in curr) {
+                const nestedOption = curr.options.find(({ value: _value }) => _value === value)
+                if (nestedOption) {
+                    return { data: nestedOption, notFound: false }
+                }
+            }
+
+            return acc
+        },
+        { notFound: true, data: defaultOption },
+    ).data
+
+    return foundOption
+}

src/Shared/Helpers.tsx

@@ -18,7 +18,6 @@
 import { useEffect, useRef, useState, ReactElement } from 'react'
 import Tippy from '@tippyjs/react'
 import { Pair } from 'yaml'
-import { GroupBase, OptionsOrGroups } from 'react-select'
 import { handleUTCTime, mapByKey, MaterialInfo, shallowEqual, SortingOrder } from '../Common'
 import {
     AggregationKeys,
@@ -37,7 +36,6 @@ import {
     DeploymentStatusDetailsBreakdownDataType,
     DeploymentStatusDetailsType,
     PodMetadatum,
-    SelectPickerOptionType,
 } from './Components'
 import { getAggregator } from '../Pages'
 
@@ -734,39 +732,3 @@ export const getFileNameFromHeaders = (headers: Headers) =>
         ?.find((n) => n.includes('filename='))
         ?.replace('filename=', '')
         .trim()
-
-/**
- * Retrieves an option from the options list based on the provided value.
- *
- * @param optionsList - The list of options or groups of options.
- * @param value - The value to compare against the options' values.
- * @param defaultOption - The default option to return if no match is found.
- * @returns The matched option or the default option if no match is found.
- */
-export const getSelectPickerOptionByValue = (
-    optionsList: OptionsOrGroups<SelectPickerOptionType, GroupBase<SelectPickerOptionType>>,
-    value: string | number,
-    defaultOption: SelectPickerOptionType = { label: '', value: '' },
-): SelectPickerOptionType => {
-    const foundOption = optionsList.reduce(
-        (acc, curr) => {
-            if (!acc.notFound) return acc
-
-            if ('value' in curr && curr.value === value) {
-                return { data: curr, notFound: false }
-            }
-
-            if (!('value' in curr)) {
-                const nestedOption = curr.options.find(({ value: _value }) => _value === value)
-                if (nestedOption) {
-                    return { data: nestedOption, notFound: false }
-                }
-            }
-
-            return acc
-        },
-        { notFound: true, data: defaultOption },
-    ).data
-
-    return foundOption
-}