Merge pull request #2696 from devtron-labs/chore/cleanup-v2

chore: remove dead and unreachable code

Author: arunjaindev

.eslintignore

@@ -329,7 +329,6 @@ src/components/v2/appDetails/ReleaseStatusEmptyState.tsx
 src/components/v2/appDetails/SyncError.component.tsx
 src/components/v2/appDetails/__tests__/index.store.test.ts
 src/components/v2/appDetails/appDetails.api.ts
-src/components/v2/appDetails/appDetails.type.ts
 src/components/v2/appDetails/ea/EAAppDetail.component.tsx
 src/components/v2/appDetails/k8Resource/FilterResource.tsx
 src/components/v2/appDetails/k8Resource/nodeDetail/EphemeralContainerDrawer.tsx
@@ -366,7 +365,6 @@ src/components/v2/devtronStackManager/DevtronStackManager.service.tsx
 src/components/v2/devtronStackManager/DevtronStackManager.tsx
 src/components/v2/devtronStackManager/DevtronStackManager.utils.ts
 src/components/v2/devtronStackManager/SuccessModalComponent.tsx
-src/components/v2/headers/AppHeader.component.tsx
 src/components/v2/headers/ChartHeader.component.tsx
 src/components/v2/headers/EAHeader.component.tsx
 src/components/v2/index.tsx

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.13.0-pre-2",
+        "@devtron-labs/devtron-fe-common-lib": "1.13.0-pre-3",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",

src/Pages/Applications/DevtronApps/Details/AppConfigurations/AppConfig.types.ts

@@ -218,6 +218,7 @@ export interface EnvConfigurationsNavProps extends Required<Pick<AppConfigProps,
     isCMSecretLocked?: boolean
     hideEnvSelector?: boolean
     appOrEnvIdToResourceApprovalConfigurationMap: AppConfigState['envIdToEnvApprovalConfigurationMap']
+    shouldSetEnvInContext?: boolean
 }
 
 export interface EnvConfigRouteParams {

src/Pages/Applications/DevtronApps/Details/AppConfigurations/Navigation/AppNavigation.tsx

@@ -172,6 +172,7 @@ export const AppNavigation = () => {
                         isCMSecretLocked={!isUnlocked.workflowEditor}
                         appOrEnvIdToResourceApprovalConfigurationMap={envIdToEnvApprovalConfigurationMap}
                         isTemplateView={isTemplateView}
+                        shouldSetEnvInContext={!isTemplateView && !isJobView}
                     />
                 )}
             </Route>

src/Pages/Applications/DevtronApps/Details/AppConfigurations/Navigation/EnvConfigurationsNav.tsx

@@ -42,6 +42,7 @@ import { ReactComponent as ICArrowsLeftRight } from '@Icons/ic-arrows-left-right
 import { ReactComponent as ICBack } from '@Icons/ic-caret-left-small.svg'
 import { ReactComponent as ICFileCode } from '@Icons/ic-file-code.svg'
 import { ReactComponent as ICLocked } from '@Icons/ic-locked.svg'
+import { useAppContext } from '@Components/common'
 import { DEPLOYMENT_CONFIGURATION_RESOURCE_TYPE_ROUTE } from '@Config/constants'
 import { URLS } from '@Config/routes'
 import { ResourceConfigState } from '@Pages/Applications/DevtronApps/service.types'
@@ -306,15 +307,23 @@ export const EnvConfigurationsNav = ({
     compareWithURL,
     appOrEnvIdToResourceApprovalConfigurationMap,
     isTemplateView,
+    shouldSetEnvInContext = false,
 }: EnvConfigurationsNavProps) => {
     const history = useHistory()
     const { isSuperAdmin } = useMainContext()
+    const { setEnvironmentId } = useAppContext()
     const { pathname } = useLocation()
     const { path, params } = useRouteMatch<EnvConfigRouteParams>()
 
     const { envId, resourceType } = params
     const parsedResourceId = +params[paramToCheck]
 
+    useEffect(() => {
+        if (shouldSetEnvInContext && envId && !Number.isNaN(+envId)) {
+            setEnvironmentId(+envId)
+        }
+    }, [envId, shouldSetEnvInContext])
+
     const { isLoading } = envConfig
     const resourceData =
         resourceList.find((resource) => resource.id === parsedResourceId) ||

src/components/ApplicationGroup/AppGroup.types.ts

@@ -29,9 +29,10 @@ import {
     CommonNodeAttr,
     ApprovalConfigDataType,
     RuntimePluginVariables,
+    OptionType,
 } from '@devtron-labs/devtron-fe-common-lib'
 import { CDMaterialProps, RuntimeParamsErrorState } from '../app/details/triggerView/types'
-import { EditDescRequest, NodeType, Nodes, OptionType } from '../app/types'
+import { EditDescRequest, NodeType, Nodes } from '../app/types'
 import { MultiValue } from 'react-select'
 import { AppFilterTabs, BulkResponseStatus } from './Constants'
 import { WorkloadCheckType } from '../v2/appDetails/sourceInfo/scaleWorkloads/scaleWorkloadsModal.type'

src/components/ApplicationGroup/AppGroupDetailsRoute.tsx

@@ -41,6 +41,7 @@ import {
     URLS as CommonURLS,
     DeleteConfirmationModal,
     useMainContext,
+    OptionType,
 } from '@devtron-labs/devtron-fe-common-lib'
 import ReactGA from 'react-ga4'
 import { MultiValue } from 'react-select'
@@ -78,7 +79,7 @@ import {
     FilterParentType,
     GroupOptionType,
 } from './AppGroup.types'
-import { EditDescRequest, OptionType } from '../app/types'
+import { EditDescRequest } from '../app/types'
 import AppGroupAppFilter from './AppGroupAppFilter'
 import EnvCIDetails from './Details/EnvCIDetails/EnvCIDetails'
 import EnvCDDetails from './Details/EnvCDDetails/EnvCDDetails'

src/components/ApplicationGroup/Details/EnvironmentOverview/__mock__/EnvironmentOverview.mock.ts

@@ -16,7 +16,8 @@
 
 import { MultiValue } from 'react-select'
 
-import { OptionType } from '../../../../app/types'
+import { OptionType } from '@devtron-labs/devtron-fe-common-lib'
+
 import { AppGroupListType, EnvDeploymentStatus, EnvDeploymentStatusType } from '../../../AppGroup.types'
 
 const result = (): EnvDeploymentStatus[] => [

src/components/CIPipelineN/AdvancedConfigOptions.tsx

@@ -15,15 +15,14 @@
  */
 
 import { useContext, useEffect, useState } from 'react'
-import { CIBuildConfigType, CIBuildType, KeyValueTableProps, noop } from '@devtron-labs/devtron-fe-common-lib'
+import { CIBuildConfigType, CIBuildType, KeyValueTableProps, noop, OptionType } from '@devtron-labs/devtron-fe-common-lib'
 import CIConfig from '../ciConfig/CIConfig'
 import DockerArgs from './DockerArgs'
 import CustomImageTags from './CustomImageTags'
 import TargetPlatformSelector from '../ciConfig/TargetPlatformSelector'
 import { ComponentStates } from '../../Pages/Shared/EnvironmentOverride/EnvironmentOverrides.types'
 import { AdvancedConfigOptionsProps, CIConfigParentState } from '../ciConfig/types'
 import { DockerConfigOverrideKeys } from '../ciPipeline/types'
-import { OptionType } from '../app/types'
 import { getTargetPlatformMap } from '../ciConfig/CIConfig.utils'
 import { pipelineContext } from '../workflowEditor/workflowEditor'
 import '../ciConfig/CIConfig.scss'

src/components/CIPipelineN/TaskTypeDetailComponent.tsx

@@ -26,6 +26,7 @@ import {
     CustomInput,
     ClipboardButton,
     SelectPicker,
+    OptionType,
 } from '@devtron-labs/devtron-fe-common-lib'
 import { components } from 'react-select'
 import { TaskFieldDescription, TaskFieldLabel } from '../ciPipeline/types'
@@ -36,7 +37,6 @@ import MountFromHost from './MountFromHost'
 import CustomScript from './CustomScript'
 import { ReactComponent as AlertTriangle } from '../../assets/icons/ic-alert-triangle.svg'
 import { getCustomOptionSelectionStyle } from '../v2/common/ReactSelect.utils'
-import { OptionType } from '../app/types'
 import { ValidationRules } from '../ciPipeline/validationRules'
 import { ReactComponent as Info } from '../../assets/icons/ic-info-filled.svg'
 import { pipelineContext } from '../workflowEditor/workflowEditor'