Merge branch 'main' into feat/cm-based-default-cluster-show

Author: ritvikmahajan17

src/assets/icons/ic-grid-view-blue.svg

@@ -19,6 +19,7 @@ import {
     CheckPermissionResponse,
     CheckPermissionType,
     ConfigAppListType,
+    EditDescRequestResponse,
     EnvAppType,
     EnvDeploymentStatusType,
     EnvGroupListResponse,
@@ -193,7 +194,7 @@ export const getAppGroupList = (envId: number): Promise<AppGroupList> => {
     return get(`${Routes.APP_LIST_GROUP}/${envId}`)
 }
 
-export const getEnvGroupList = (envId: number, filterParentType?:string): Promise<EnvGroupListResponse> => {
+export const  getEnvGroupList = (envId: number, filterParentType?:string): Promise<EnvGroupListResponse> => {
     let filterParentTypeQuery = ''
     if (filterParentType) {
         filterParentTypeQuery = `?groupType=${filterParentType}`
@@ -223,3 +224,7 @@ export const deleteEnvGroup = (envId: string, groupId: string, filterParentType?
     }
     return trash(`${Routes.ENVIRONMENT}/${envId}/${Routes.GROUP}/${groupId}${filterParentTypeQuery}`)
 }
+
+export const editDescription = (payload): Promise<EditDescRequestResponse> => {
+    return put(Routes.ENVIRONMENT, payload)
+}

src/assets/icons/ic-hibernate-3.svg

@@ -7,7 +7,7 @@ import {
 } from '@devtron-labs/devtron-fe-common-lib'
 import { MultiValue } from 'react-select'
 import { WebhookPayloads, WorkflowNodeType, WorkflowType } from '../app/details/triggerView/types'
-import { OptionType } from '../app/types'
+import { EditDescRequest, OptionType } from '../app/types'
 import { AppFilterTabs, BulkResponseStatus } from './Constants'
 
 interface BulkTriggerAppDetailType {
@@ -205,8 +205,11 @@ export interface AppInfoListType {
     appStatus: string
     deploymentStatus: string
     lastDeployed: string
+    lastDeployedImage?: string
+    lastDeployedBy?: string
     appId: number
     envId: number
+    pipelineId?: number
 }
 
 export interface AppListDataType {
@@ -267,6 +270,9 @@ export interface AppGroupDetailDefaultType {
     appGroupListData?: AppGroupListType
     isVirtualEnv?: boolean
     envName?: string
+    description?: string
+    getAppListData?: () => Promise<void>
+    handleSaveDescription?: (description: string) => Promise<void>
 }
 
 interface CIPipeline {
@@ -323,6 +329,8 @@ export interface ApplistEnvType {
     appName: string
     appStatus: string
     lastDeployedTime: string
+    lastDeployedBy?: string
+    lastDeployedImage?: string
 }
 
 export interface AppGroupListType {
@@ -331,6 +339,11 @@ export interface AppGroupListType {
     clusterName: string
     environmentId: number
     apps: ApplistEnvType[]
+    description?: string
+    environmentType?: 'Non-Production' | 'Production'
+    createdOn?: string
+    createdBy?: string
+    clusterId?: number
 }
 export interface ConfigAppListType extends ResponseType {
     result?: ConfigAppList[]
@@ -388,7 +401,57 @@ export interface SearchBarType {
     setSearchApplied: React.Dispatch<React.SetStateAction<boolean>>
 }
 
+export interface EditDescRequestResponse extends ResponseType {
+    result?: EditDescRequest
+}
+
 export enum FilterParentType {
     app = 'env-group',
     env = 'app-group',
-}
+}
+
+export interface HibernateStatusRowType {
+    rowData: HibernateResponseRowType
+    index: number
+    isHibernateOperation: boolean
+    isVirtualEnv?: boolean
+}
+
+export interface HibernateResponseRowType {
+    id: number
+    appName: string
+    success: boolean
+    authError?: boolean
+    error?: string
+    skipped?: string
+}
+
+export interface BaseModalProps {
+    selectedAppIds: number[]
+    envName: string
+    envId: string
+    setAppStatusResponseList: React.Dispatch<React.SetStateAction<any[]>>
+    setShowHibernateStatusDrawer: React.Dispatch<React.SetStateAction<StatusDrawer>>
+}
+
+export interface HibernateModalProps extends BaseModalProps {
+    setOpenHiberateModal: React.Dispatch<React.SetStateAction<boolean>>
+}
+
+export interface UnhibernateModalProps extends BaseModalProps {
+    setOpenUnhiberateModal: React.Dispatch<React.SetStateAction<boolean>>
+}
+
+export interface StatusDrawer {
+    hibernationOperation: boolean
+    showStatus: boolean
+}
+
+export interface ManageAppsResponse {
+    appName: string
+    id: number
+    success: boolean
+    skipped?: string
+    error?: string
+    authError?: boolean
+}

src/assets/icons/ic-medium-hibernate.svg

@@ -82,6 +82,7 @@ export const Option = (props): JSX.Element => {
     }
 
     const renderOptionIcon = (): JSX.Element => {
+        
         if (selectedFilterTab === AppFilterTabs.APP_FILTER) {
             if (props.isSelected || props.isFocused) {
                 return (
@@ -92,7 +93,9 @@ export const Option = (props): JSX.Element => {
                 )
             }
         } else {
-            if (props.isFocused) {
+            // hide edit and delete icon for predefined filter
+            if (props.isFocused && props.data.value !== props.data.label) {
+                // for predefined filter, value and label are same (done in fe)
                 return (
                     <div className="flex">
                         <Tippy className="default-tt" arrow={false} content="Edit group">

src/assets/icons/ic-medium-unhibernate.svg

@@ -18,7 +18,7 @@ export default function AppGroupAppFilter() {
         groupFilterOptions,
         selectedGroupFilter,
         setSelectedGroupFilter,
-        filterParentType
+        filterParentType,
     }: AppGroupAppFilterContextType = useAppGroupAppFilterContext()
     const [appFilterAppInput, setAppFilterAppInput] = useState('')
     const [appFilterGroupInput, setAppFilterGroupInput] = useState('')

src/assets/icons/ic-unhibernate.svg

@@ -23,7 +23,14 @@ import { EnvSelector } from './EnvSelector'
 import EmptyFolder from '../../assets/img/Empty-folder.png'
 import { AppFilterTabs, EMPTY_LIST_MESSAGING, ENV_APP_GROUP_GA_EVENTS, NO_ACCESS_TOAST_MESSAGE } from './Constants'
 import { ReactComponent as Settings } from '../../assets/icons/ic-settings.svg'
-import { deleteEnvGroup, getAppGroupList, getEnvAppList, getEnvGroupList, appGroupPermission } from './AppGroup.service'
+import {
+    deleteEnvGroup,
+    getAppGroupList,
+    getEnvAppList,
+    getEnvGroupList,
+    appGroupPermission,
+    editDescription,
+} from './AppGroup.service'
 import {
     AppGroupAdminType,
     AppGroupAppFilterContextType,
@@ -36,7 +43,7 @@ import {
     GroupOptionType,
 } from './AppGroup.types'
 import { MultiValue } from 'react-select'
-import { OptionType } from '../app/types'
+import { EditDescRequest, OptionType } from '../app/types'
 import AppGroupAppFilter from './AppGroupAppFilter'
 import EnvCIDetails from './Details/EnvCIDetails/EnvCIDetails'
 import EnvCDDetails from './Details/EnvCDDetails/EnvCDDetails'
@@ -76,6 +83,9 @@ export default function AppGroupDetailsRoute({ isSuperAdmin }: AppGroupAdminType
     const [isVirtualEnv, setIsVirtualEnv] = useState<boolean>(false)
     const [isPopupBox, setIsPopupBox] = useState(false)
     const [mapUnauthorizedApp, setMapUnauthorizedApp] = useState<Map<string, boolean>>(new Map())
+    const [description, setDescription] = useState<string>(
+        appGroupListData?.description ? appGroupListData?.description : '',
+    )
 
     useEffect(() => {
         if (envList?.result) {
@@ -96,19 +106,21 @@ export default function AppGroupDetailsRoute({ isSuperAdmin }: AppGroupAdminType
             setSelectedGroupFilter([])
             setAppListOptions([])
             setAppGroupListData(null)
+            setDescription('')
         }
     }, [envId])
 
     const getSavedFilterData = async (groupId?: number): Promise<void> => {
         setSelectedAppList([])
         setAppListLoading(true)
         const { result } = await getEnvGroupList(+envId)
+
         if (result) {
             const _groupFilterOption = []
             let _selectedGroup
             for (const group of result) {
                 const processedGroupData = {
-                    value: group.id.toString(),
+                    value: group.id ? group.id.toString() : group.name,
                     label: group.name,
                     appIds: group.appIds,
                     description: group.description,
@@ -136,11 +148,32 @@ export default function AppGroupDetailsRoute({ isSuperAdmin }: AppGroupAdminType
         setAppListLoading(false)
     }
 
+    const handleSaveDescription = async (value: string) => {
+        const payload: EditDescRequest = {
+            id: appGroupListData.environmentId,
+            environment_name: appGroupListData.environmentName,
+            cluster_id: appGroupListData.clusterId,
+            namespace: appGroupListData.namespace,
+            active: true,
+            default: !(appGroupListData.environmentType === 'Non-Production'),
+            description: value?.trim(),
+        }
+        try {
+            await editDescription(payload)
+            toast.success('Successfully saved')
+            setDescription(value?.trim())
+        } catch (err) {
+            showError(err)
+            throw err
+        }
+    }
+
     const getAppListData = async (): Promise<void> => {
         setSelectedAppList([])
         setAppListLoading(true)
         const { result } = await getAppGroupList(+envId)
         setAppGroupListData(result)
+        setDescription(result.description)
         if (result.apps?.length) {
             setAppListOptions(
                 result.apps
@@ -322,7 +355,7 @@ export default function AppGroupDetailsRoute({ isSuperAdmin }: AppGroupAdminType
             _appListData.apps = _filteredApps
         }
         return _appListData
-    }, [selectedAppList, appGroupListData?.apps])
+    }, [selectedAppList, appGroupListData?.apps, appGroupListData?.description])
 
     const renderRoute = () => {
         if (loading || appListLoading) {
@@ -344,6 +377,9 @@ export default function AppGroupDetailsRoute({ isSuperAdmin }: AppGroupAdminType
                                     filteredAppIds={_filteredAppsIds}
                                     appGroupListData={filteredAppListData}
                                     isVirtualEnv={isVirtualEnv}
+                                    getAppListData={getAppListData}
+                                    handleSaveDescription={handleSaveDescription}
+                                    description={description}
                                 />
                             </Route>
                             <Route path={`${path}/${URLS.APP_TRIGGER}`}>