Merge branch 'develop' of https://github.com/devtron-labs/devtron-fe-common-lib into feat/app-status-modal

Author: AbhishekA1509

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "1.12.0-pre-0",
+    "version": "1.12.0-pre-2",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",

package.json

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { DynamicDataTableCellValidationState } from '@Shared/Components'
+import { DynamicDataTableCellValidationState, KeyValueTableData } from '@Shared/Components'
 
 export interface MaterialType {
     name: string
@@ -158,7 +158,7 @@ export interface PortMapType {
     portOnLocal: number
     portOnContainer: number
 }
-interface ConditionDetails {
+export interface ConditionDetails {
     id: number
     conditionOnVariable: string
     conditionOperator: string
@@ -266,7 +266,7 @@ export enum WORKFLOW_CACHE_CONFIG_ENUM {
 
 export interface FormType {
     name: string
-    args: { key: string; value: string }[]
+    args: KeyValueTableData[]
     materials: MaterialType[]
     gitHost: Githost
     webhookEvents: WebhookEvent[]
@@ -314,23 +314,29 @@ export enum InputOutputVariablesHeaderKeys {
     VALUE = 'val',
 }
 
-export type InputOutputVariablesErrorObj = Record<InputOutputVariablesHeaderKeys, DynamicDataTableCellValidationState>
+export enum ConditionDataTableHeaderKeys {
+    VARIABLE = 'variable',
+    OPERATOR = 'operator',
+    VALUE = 'val',
+}
+
+type InputOutputVariablesErrorObj = Record<InputOutputVariablesHeaderKeys, DynamicDataTableCellValidationState>
+type ConditionDetailsErrorObj = Record<ConditionDataTableHeaderKeys, DynamicDataTableCellValidationState>
+
+interface StepDetailTaskErrorObj {
+    inputVariables?: Record<number, InputOutputVariablesErrorObj>
+    outputVariables?: Record<number, InputOutputVariablesErrorObj>
+    isInputVariablesValid?: boolean
+    isOutputVariablesValid?: boolean
+    conditionDetails?: Record<number, ConditionDetailsErrorObj>
+    isConditionDetailsValid?: boolean
+}
 
 export interface TaskErrorObj {
     isValid: boolean
     name: ErrorObj
-    inlineStepDetail?: {
-        inputVariables?: Record<number, InputOutputVariablesErrorObj>
-        outputVariables?: Record<number, InputOutputVariablesErrorObj>
-        isInputVariablesValid?: boolean
-        isOutputVariablesValid?: boolean
-    }
-    pluginRefStepDetail?: {
-        inputVariables?: Record<number, InputOutputVariablesErrorObj>
-        outputVariables?: Record<number, InputOutputVariablesErrorObj>
-        isInputVariablesValid?: boolean
-        isOutputVariablesValid?: boolean
-    }
+    inlineStepDetail?: StepDetailTaskErrorObj
+    pluginRefStepDetail?: StepDetailTaskErrorObj
 }
 export interface FormErrorObjectType {
     name: ErrorObj

src/Assets/Icon/ic-nav-rocket.svg

@@ -22,11 +22,7 @@ import {
     sanitizeUserApprovalList,
     stringComparatorBySortOrder,
 } from '@Shared/Helpers'
-import {
-    PolicyBlockInfo,
-    RuntimeParamsAPIResponseType,
-    RuntimePluginVariables,
-} from '@Shared/types'
+import { PolicyBlockInfo, RuntimeParamsAPIResponseType, RuntimePluginVariables } from '@Shared/types'
 import { GitProviderType, ROUTES } from './Constants'
 import { getUrlWithSearchParams, sortCallback } from './Helper'
 import {
@@ -49,10 +45,14 @@ import {
     GlobalVariableDTO,
     GlobalVariableOptionType,
     UserRole,
+    EnvAppsMetaDTO,
+    GetAppsInfoForEnvProps,
+    AppMeta,
 } from './Types'
 import { ApiResourceType, STAGE_MAP } from '../Pages'
 import { RefVariableType, VariableTypeFormat } from './CIPipeline.Types'
 import { get, post } from './API'
+import { StatusType } from '@Shared/Components'
 
 export const getTeamListMin = (): Promise<TeamList> => {
     // ignore active field
@@ -264,7 +264,7 @@ export const parseRuntimeParams = (response: RuntimeParamsAPIResponseType): Runt
     const runtimeParams = (response?.runtimePluginVariables ?? []).map<RuntimePluginVariables>((variable) => ({
         ...variable,
         defaultValue: variable.value,
-        stepVariableId: variable.stepVariableId || Math.floor(new Date().valueOf() * Math.random())
+        stepVariableId: variable.stepVariableId || Math.floor(new Date().valueOf() * Math.random()),
     }))
 
     runtimeParams.push(...envVariables)
@@ -515,3 +515,25 @@ export const getGlobalVariables = async ({
         throw err
     }
 }
+
+export const getAppsInfoForEnv = async ({ envId, appIds }: GetAppsInfoForEnvProps): Promise<EnvAppsMetaDTO> => {
+    const url = getUrlWithSearchParams(`${ROUTES.ENV}/${envId}/${ROUTES.APP_METADATA}`, {
+        appIds: appIds?.join(),
+    })
+    const response = await get<EnvAppsMetaDTO>(url)
+
+    return {
+        appCount: response.result?.appCount ?? 0,
+        apps: (response.result?.apps ?? []).reduce<AppMeta[]>((agg, { appId, appName, appStatus }) => {
+            if (!appId) {
+                return agg
+            }
+            agg.push({
+                appId,
+                appName: appName || '',
+                appStatus: appStatus || StatusType.UNKNOWN,
+            })
+            return agg
+        }, []),
+    }
+}

src/Assets/IconV2/ic-hand-pointing.svg

@@ -158,6 +158,8 @@ export const ROUTES = {
     ENVIRONMENT_DATA: 'global/environment-variables',
     DASHBOARD_EVENT: 'dashboard-event',
     LICENSE_DATA: 'license/data',
+    ENV: 'env',
+    APP_METADATA: 'app-metadata',
 } as const
 
 export enum KEY_VALUE {

src/Assets/IconV2/ic-rocket-launch.svg

@@ -27,6 +27,7 @@ import {
     TargetPlatformItemDTO,
     ButtonProps,
     ComponentLayoutType,
+    StatusType,
 } from '../Shared'
 import {
     ACTION_STATE,
@@ -1110,3 +1111,19 @@ export enum ActionTypes {
     EDIT = 'edit',
     APPROVER = 'approver',
 }
+
+export interface GetAppsInfoForEnvProps {
+    envId: number
+    appIds?: number[]
+}
+
+export interface AppMeta {
+    appId: number
+    appStatus: StatusType
+    appName: string
+}
+
+export interface EnvAppsMetaDTO {
+    appCount: number
+    apps: AppMeta[]
+}

src/Common/CIPipeline.Types.ts

@@ -17,11 +17,11 @@
 import { SyntheticEvent, useEffect, useRef, useState } from 'react'
 import { motion } from 'framer-motion'
 
-import { ReactComponent as ICDeploy } from '@Icons/ic-nav-rocket.svg'
 import DeployAudio from '@Sounds/DeployAudio.mp3'
 import { ComponentSizeType } from '@Shared/constants'
 
 import { Button } from '../Button'
+import { Icon } from '../Icon'
 import { AnimatedDeployButtonProps } from './types'
 
 import './animatedDeployButton.scss'
@@ -83,7 +83,7 @@ const AnimatedDeployButton = ({ isVirtualEnvironment, onButtonClick }: AnimatedD
                                 : {}
                         }
                     >
-                        <ICDeploy className="icon-dim-16" />
+                        <Icon name="ic-rocket-launch" color={null} />
                     </motion.div>
                 }
                 size={ComponentSizeType.large}