Minor fix around env override redirection and deployment metrics

Author: vivek-devtron

src/components/EnvironmentOverride/EnvironmentOverride.tsx

@@ -19,7 +19,7 @@ export default function EnvironmentOverride({
 }: EnvironmentOverrideComponentProps) {
     const params = useParams<{ appId: string; envId: string }>()
     const [viewState, setViewState] = useState<ComponentStates>(null)
-    const { path } = useRouteMatch()
+    const { path, url } = useRouteMatch()
     const { push } = useHistory()
     const location = useLocation()
     const { environmentId, setEnvironmentId } = useAppContext()
@@ -69,6 +69,14 @@ export default function EnvironmentOverride({
         )
     }
 
+    if (params.envId && !environmentsMap.has(+params.envId) && environments.length) {
+        const newUrl = url.replace(
+            `${URLS.APP_ENV_OVERRIDE_CONFIG}/${params.envId}`,
+            `${URLS.APP_ENV_OVERRIDE_CONFIG}/${environments[0].environmentId}`,
+        )
+        push(newUrl)
+    }
+
     const getParentName = (): string => {
         if (appList?.length) {
             return appMap.get(+params.appId).name

src/components/app/details/appConfig/EnvironmentOverrideRouter.tsx

@@ -69,9 +69,7 @@ const EnvOverrideRoute = ({
     const [deletePipeline, setDeletePipeline] = useState()
 
     useEffect(() => {
-        if (!location.pathname.includes(`${LINK}/`) && !collapsed) {
-            toggleCollapsed(true)
-        }
+        toggleCollapsed(!location.pathname.includes(`${LINK}/`))
     }, [location.pathname])
 
     const handleNavItemClick = () => {

src/components/app/details/metrics/DeploymentMetrics.tsx

@@ -147,24 +147,26 @@ export default class DeploymentMetrics extends Component<DeploymentMetricsProps,
                             value: env.environmentId,
                             deploymentAppDeleteRequest: env.deploymentAppDeleteRequest,
                         }
-                    })
-                allEnv = allEnv || []
-                let callAPIOnEnvOfPrevApp = prevEnvId && allEnv.find((e) => Number(e.value) === Number(prevEnvId))
-                this.setState({
-                    environments: allEnv,
-                    filteredEnvironment: allEnv.filter((_env) => !_env.deploymentAppDeleteRequest),
-                    view: this.props.match.params.envId || callAPIOnEnvOfPrevApp ? ViewType.LOADING : ViewType.FORM,
-                })
-                if (prevEnvId) {
-                    const isEnvExist = allEnv.find((e) => Number(e.value) === Number(prevEnvId))
-                    let url = generatePath(this.props.match.path, {
-                        appId: this.props.match.params.appId,
-                        envId: isEnvExist ? prevEnvId : allEnv[0].value,
-                    })
-                    this.props.history.push(url)
-                } else if (this.props.match.params.envId) {
-                    this.callGetDeploymentMetricsAPI(this.props.match.params.appId, this.props.match.params.envId)
+                    }) || []
+                let hideLoader = true
+                if (allEnv.length) {
+                    if (prevEnvId && prevEnvId !== this.props.match.params.envId) {
+                        const isEnvExist = allEnv.find((e) => Number(e.value) === Number(prevEnvId))
+                        let url = generatePath(this.props.match.path, {
+                            appId: this.props.match.params.appId,
+                            envId: isEnvExist ? prevEnvId : allEnv[0].value,
+                        })
+                        this.props.history.push(url)
+                    } else if (this.props.match.params.envId) {
+                        hideLoader = false
+                        this.callGetDeploymentMetricsAPI(this.props.match.params.appId, this.props.match.params.envId)
+                    }
                 }
+                this.setState({
+                  environments: allEnv,
+                  filteredEnvironment: allEnv.filter((_env) => !_env.deploymentAppDeleteRequest),
+                  view: hideLoader ? ViewType.FORM: ViewType.LOADING,
+              })
             })
             .catch((error) => {
                 showError(error)