Merge branch 'app_details_env_filter' into env_filter_app_overview_deployment_metrics

Author: vivek-devtron

src/components/ApplicationGroup/AppGroupAppFilter.components.tsx

@@ -16,16 +16,21 @@ import { ConditionalWrap } from '@devtron-labs/devtron-fe-common-lib'
 import Tippy from '@tippyjs/react'
 
 export const ValueContainer = (props): JSX.Element => {
-    const { appListOptions, selectedAppList, selectedFilterTab, selectedGroupFilter, filterParentType }: AppGroupAppFilterContextType =
-        useAppGroupAppFilterContext()
+    const {
+        appListOptions,
+        selectedAppList,
+        selectedFilterTab,
+        selectedGroupFilter,
+        filterParentType,
+    }: AppGroupAppFilterContextType = useAppGroupAppFilterContext()
     let selectorText,
         selectedAppsLength = props.getValue().length
     if (selectedFilterTab === AppFilterTabs.GROUP_FILTER && selectedGroupFilter[0]) {
         selectorText = selectedGroupFilter[0]?.label
     } else {
         selectorText = `${selectedAppList.length > 0 ? selectedAppList.length : appListOptions.length}/${
             appListOptions.length
-        } ${filterParentType===FilterParentType.env? 'Applications': 'Environments'}`
+        } ${filterParentType === FilterParentType.env ? 'Applications' : 'Environments'}`
     }
     return (
         <components.ValueContainer {...props}>
@@ -144,7 +149,7 @@ export const MenuList = (props: any): JSX.Element => {
         openCreateGroup,
         selectedGroupFilter,
         setSelectedGroupFilter,
-        filterParentType
+        filterParentType,
     }: AppGroupAppFilterContextType = useAppGroupAppFilterContext()
     const clearSelection = (): void => {
         setSelectedAppList([])
@@ -153,7 +158,7 @@ export const MenuList = (props: any): JSX.Element => {
     const onTabChange = (e): void => {
         setSelectedFilterTab(e.currentTarget.dataset.selectedTab)
     }
-    const selectedType = filterParentType===FilterParentType.env? 'applications': 'environments'
+    const selectedType = filterParentType === FilterParentType.env ? 'applications' : 'environments'
     return (
         <components.MenuList {...props}>
             <div className="dc__position-sticky dc__top-0 bcn-0">
@@ -208,8 +213,8 @@ export const MenuList = (props: any): JSX.Element => {
                     <InfoIcon className="icon-dim-20 mr-4 mw-18 cursor fcn-6 mb-4" />
                     <div className="fs-13 fw-6 cn-9 mb-4">No saved filters</div>
                     <div className="fs-12 fw-4 cn-7 dc__align-center ">
-                        To save a filter, select some {selectedType} from All {selectedType} and click on ‘Save selection as
-                        filter’
+                        To save a filter, select some {selectedType} from All {selectedType} and click on ‘Save
+                        selection as filter’
                     </div>
                 </div>
             )}

src/components/app/details/cdDetails/CDDetails.tsx

@@ -156,8 +156,8 @@ export default function CDDetails({filteredEnvIds}:{filteredEnvIds: string}) {
               const filteredEnvMap = filteredEnvIds?.split(',').reduce((agg, curr) => agg.set(curr, true), new Map())
               let _selectedEnvironment = (result[0]['value']?.result || [])
                   .filter((env) => {
-                    console.log(filteredEnvMap?.get(env.environmentId))
-                    return !filteredEnvMap || filteredEnvMap.get(env.environmentId)})
+                      return !filteredEnvMap || filteredEnvMap.get(env.environmentId)
+                  })
                   .find((envData) => {
                       return +envId === envData.environmentId
                   })
@@ -185,7 +185,6 @@ export default function CDDetails({filteredEnvIds}:{filteredEnvIds: string}) {
             const filteredEnvMap = filteredEnvIds?.split(',').reduce((agg, curr) => agg.set(+curr, true), new Map())
             const envOptions: CICDSidebarFilterOptionType[] = (result[0]['value']?.result || [])
             .filter((env) => {
-              console.log(filteredEnvMap?.get(env.environmentId))
               return !filteredEnvMap || filteredEnvMap.get(env.environmentId)})
                 .map((envData) => {
                     if (envData.environmentId === +envId) {

src/components/app/details/main.tsx

@@ -94,8 +94,6 @@ export default function AppDetailsPage({ isV2 }: AppDetailsProps) {
         setSelectedAppList([])
         setAppListLoading(true)
         const { result } = await getAppOtherEnvironmentMin(appId)
-        console.log(result)
-        //setAppGroupListData(result)
         if (result?.length) {
             setAppListOptions(
                 result