From e469d5989d6d9b8731645dc42dbed917549c9342 Mon Sep 17 00:00:00 2001 From: Arun Jain Date: Wed, 23 Apr 2025 14:00:10 +0530 Subject: [PATCH 1/8] feat: add other app list api from fe-lib --- src/Common/Common.service.ts | 14 ++++++++++++++ src/Common/Constants.ts | 2 ++ src/Common/Types.ts | 17 +++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/src/Common/Common.service.ts b/src/Common/Common.service.ts index d94cd279c..f804a2ccb 100644 --- a/src/Common/Common.service.ts +++ b/src/Common/Common.service.ts @@ -49,6 +49,8 @@ import { GlobalVariableDTO, GlobalVariableOptionType, UserRole, + EnvAppsMetaDTO, + GetAppsInfoForEnvProps, } from './Types' import { ApiResourceType, STAGE_MAP } from '../Pages' import { RefVariableType, VariableTypeFormat } from './CIPipeline.Types' @@ -515,3 +517,15 @@ export const getGlobalVariables = async ({ throw err } } + +export const getAppsInfoForEnv = async ({ envId, appIds }: GetAppsInfoForEnvProps): Promise => { + const url = getUrlWithSearchParams(`${ROUTES.ENV}/${envId}/${ROUTES.APP_METADATA}`, { + appIds: appIds?.join(), + }) + const response = await get(url) + + return { + appCount: response.result?.appCount ?? 0, + apps: response.result?.apps ?? [], + } +} \ No newline at end of file diff --git a/src/Common/Constants.ts b/src/Common/Constants.ts index db6438898..ad1b89398 100644 --- a/src/Common/Constants.ts +++ b/src/Common/Constants.ts @@ -157,6 +157,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 { diff --git a/src/Common/Types.ts b/src/Common/Types.ts index fd9d9700f..3901e1193 100644 --- a/src/Common/Types.ts +++ b/src/Common/Types.ts @@ -27,6 +27,7 @@ import { TargetPlatformItemDTO, ButtonProps, ComponentLayoutType, + StatusType, } from '../Shared' import { ACTION_STATE, @@ -1109,3 +1110,19 @@ export enum ActionTypes { EDIT = 'edit', APPROVER = 'approver', } + +export interface GetAppsInfoForEnvProps { + envId: number + appIds?: number[] +} + +interface AppMeta { + appId: number + appStatus: StatusType + appName: string +} + +export interface EnvAppsMetaDTO { + appCount: number + apps: AppMeta[] +} \ No newline at end of file From c4da692ca0f838c680772f695aea6fa0c9389ea6 Mon Sep 17 00:00:00 2001 From: Arun Jain Date: Wed, 23 Apr 2025 17:37:26 +0530 Subject: [PATCH 2/8] chore: version bump --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9231170a1..1a687fd5f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.11.0-pre-8", + "version": "1.11.0-pre-8-beta-1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.11.0-pre-8", + "version": "1.11.0-pre-8-beta-1", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index a78037dd4..a27b91e3e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.11.0-pre-8", + "version": "1.11.0-pre-8-beta-1", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", From 2aaaa2bee1618e110aae2baeecd8b7b53b39eaad Mon Sep 17 00:00:00 2001 From: Arun Jain Date: Thu, 24 Apr 2025 16:29:20 +0530 Subject: [PATCH 3/8] feat: filter apps if id isn't recieved --- package-lock.json | 4 ++-- package.json | 2 +- src/Common/Common.service.ts | 12 +++++++++++- src/Common/Types.ts | 2 +- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0cfa0c14f..0792e2708 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.11.0-pre-9-beta-2", + "version": "1.11.0-pre-9-beta-3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.11.0-pre-9-beta-2", + "version": "1.11.0-pre-9-beta-3", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index 58c4e9312..e0dfeb86b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.11.0-pre-9-beta-2", + "version": "1.11.0-pre-9-beta-3", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", diff --git a/src/Common/Common.service.ts b/src/Common/Common.service.ts index f804a2ccb..e79f57c3e 100644 --- a/src/Common/Common.service.ts +++ b/src/Common/Common.service.ts @@ -51,10 +51,12 @@ import { 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 => { // ignore active field @@ -526,6 +528,14 @@ export const getAppsInfoForEnv = async ({ envId, appIds }: GetAppsInfoForEnvProp return { appCount: response.result?.appCount ?? 0, - apps: response.result?.apps ?? [], + apps: (response.result?.apps ?? []).reduce((agg, {appId, appName, appStatus}) => { + if (!appId) { + return agg + } + agg.push({ + appId, appName: appName || '', + appStatus: appStatus || StatusType.UNKNOWN, + }) + }, []), } } \ No newline at end of file diff --git a/src/Common/Types.ts b/src/Common/Types.ts index 3901e1193..e0dae3ba1 100644 --- a/src/Common/Types.ts +++ b/src/Common/Types.ts @@ -1116,7 +1116,7 @@ export interface GetAppsInfoForEnvProps { appIds?: number[] } -interface AppMeta { +export interface AppMeta { appId: number appStatus: StatusType appName: string From 9e4cb636355ff1dd59d576bdbe748b3624feba9b Mon Sep 17 00:00:00 2001 From: Arun Jain Date: Thu, 24 Apr 2025 16:36:45 +0530 Subject: [PATCH 4/8] chore: update rocket icon --- src/Assets/Icon/ic-nav-rocket.svg | 19 ------------------- src/Assets/IconV2/ic-rocket-launch.svg | 3 +++ .../AnimatedDeployButton.tsx | 4 ++-- src/Shared/Components/Icon/Icon.tsx | 2 ++ .../ImageCard/ArtifactInfo/ArtifactInfo.tsx | 6 +++--- 5 files changed, 10 insertions(+), 24 deletions(-) delete mode 100644 src/Assets/Icon/ic-nav-rocket.svg create mode 100644 src/Assets/IconV2/ic-rocket-launch.svg diff --git a/src/Assets/Icon/ic-nav-rocket.svg b/src/Assets/Icon/ic-nav-rocket.svg deleted file mode 100644 index 5ee6b84c4..000000000 --- a/src/Assets/Icon/ic-nav-rocket.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - diff --git a/src/Assets/IconV2/ic-rocket-launch.svg b/src/Assets/IconV2/ic-rocket-launch.svg new file mode 100644 index 000000000..652cd1197 --- /dev/null +++ b/src/Assets/IconV2/ic-rocket-launch.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/Shared/Components/AnimatedDeployButton/AnimatedDeployButton.tsx b/src/Shared/Components/AnimatedDeployButton/AnimatedDeployButton.tsx index f8dea6c50..7294f625e 100644 --- a/src/Shared/Components/AnimatedDeployButton/AnimatedDeployButton.tsx +++ b/src/Shared/Components/AnimatedDeployButton/AnimatedDeployButton.tsx @@ -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 : {} } > - + } size={ComponentSizeType.large} diff --git a/src/Shared/Components/Icon/Icon.tsx b/src/Shared/Components/Icon/Icon.tsx index d7c1afd8f..0cef854e7 100644 --- a/src/Shared/Components/Icon/Icon.tsx +++ b/src/Shared/Components/Icon/Icon.tsx @@ -92,6 +92,7 @@ import { ReactComponent as ICPaperPlaneColor } from '@IconsV2/ic-paper-plane-col import { ReactComponent as ICPencil } from '@IconsV2/ic-pencil.svg' import { ReactComponent as ICQuay } from '@IconsV2/ic-quay.svg' import { ReactComponent as ICQuote } from '@IconsV2/ic-quote.svg' +import { ReactComponent as ICRocketLaunch } from '@IconsV2/ic-rocket-launch.svg' import { ReactComponent as ICShieldCheck } from '@IconsV2/ic-shield-check.svg' import { ReactComponent as ICSlidersVertical } from '@IconsV2/ic-sliders-vertical.svg' import { ReactComponent as ICSortAscending } from '@IconsV2/ic-sort-ascending.svg' @@ -209,6 +210,7 @@ export const iconMap = { 'ic-pencil': ICPencil, 'ic-quay': ICQuay, 'ic-quote': ICQuote, + 'ic-rocket-launch': ICRocketLaunch, 'ic-shield-check': ICShieldCheck, 'ic-sliders-vertical': ICSlidersVertical, 'ic-sort-ascending': ICSortAscending, diff --git a/src/Shared/Components/ImageCard/ArtifactInfo/ArtifactInfo.tsx b/src/Shared/Components/ImageCard/ArtifactInfo/ArtifactInfo.tsx index 35129d8c2..b51de46c8 100644 --- a/src/Shared/Components/ImageCard/ArtifactInfo/ArtifactInfo.tsx +++ b/src/Shared/Components/ImageCard/ArtifactInfo/ArtifactInfo.tsx @@ -16,11 +16,11 @@ import Tippy from '@tippyjs/react' +import { ReactComponent as ICBot } from '@Icons/ic-bot.svg' import { Tooltip } from '@Common/Tooltip' +import { Icon } from '@Shared/Components/Icon' import { RegistryIcon } from '@Shared/Components/RegistryIcon' -import { ReactComponent as ICBot } from '../../../../Assets/Icon/ic-bot.svg' -import { ReactComponent as DeployIcon } from '../../../../Assets/Icon/ic-nav-rocket.svg' import { ConditionalWrap, getRandomColor } from '../../../../Common/Helper' import { DefaultUserKey } from '../../../types' import { ArtifactInfoProps } from '../types' @@ -62,7 +62,7 @@ const ArtifactInfo = ({ return (
- + {deployedTime}
) From 020c41465dba689f95ab0a0372729febc862a206 Mon Sep 17 00:00:00 2001 From: Arun Jain Date: Thu, 24 Apr 2025 17:02:41 +0530 Subject: [PATCH 5/8] chore: formatting --- src/Common/Common.service.ts | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/Common/Common.service.ts b/src/Common/Common.service.ts index e79f57c3e..83703a9cc 100644 --- a/src/Common/Common.service.ts +++ b/src/Common/Common.service.ts @@ -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 { @@ -268,7 +264,7 @@ export const parseRuntimeParams = (response: RuntimeParamsAPIResponseType): Runt const runtimeParams = (response?.runtimePluginVariables ?? []).map((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) @@ -528,14 +524,15 @@ export const getAppsInfoForEnv = async ({ envId, appIds }: GetAppsInfoForEnvProp return { appCount: response.result?.appCount ?? 0, - apps: (response.result?.apps ?? []).reduce((agg, {appId, appName, appStatus}) => { + apps: (response.result?.apps ?? []).reduce((agg, { appId, appName, appStatus }) => { if (!appId) { return agg } agg.push({ - appId, appName: appName || '', + appId, + appName: appName || '', appStatus: appStatus || StatusType.UNKNOWN, }) }, []), } -} \ No newline at end of file +} From 76082f8edc17a2c751032b3b23095964ddd75b18 Mon Sep 17 00:00:00 2001 From: Arun Jain Date: Fri, 25 Apr 2025 16:18:46 +0530 Subject: [PATCH 6/8] fix: return agg --- package-lock.json | 4 ++-- package.json | 2 +- src/Common/Common.service.ts | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0792e2708..033b8c76c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.11.0-pre-9-beta-3", + "version": "1.11.0-pre-9-beta-4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.11.0-pre-9-beta-3", + "version": "1.11.0-pre-9-beta-4", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index e0dfeb86b..6d70dc38d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.11.0-pre-9-beta-3", + "version": "1.11.0-pre-9-beta-4", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", diff --git a/src/Common/Common.service.ts b/src/Common/Common.service.ts index 83703a9cc..c7d1a3f13 100644 --- a/src/Common/Common.service.ts +++ b/src/Common/Common.service.ts @@ -533,6 +533,7 @@ export const getAppsInfoForEnv = async ({ envId, appIds }: GetAppsInfoForEnvProp appName: appName || '', appStatus: appStatus || StatusType.UNKNOWN, }) + return agg }, []), } } From 177da95e45bda08aad7c50085560cbfa6bbb4e73 Mon Sep 17 00:00:00 2001 From: Arun Jain Date: Tue, 29 Apr 2025 12:16:15 +0530 Subject: [PATCH 7/8] chore: version bump --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 571dbef08..f48dbe2db 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.12.0-pre-0-beta-1", + "version": "1.12.0-pre-1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.12.0-pre-0-beta-1", + "version": "1.12.0-pre-1", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index eba338bf0..e28f6c0be 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.12.0-pre-0-beta-1", + "version": "1.12.0-pre-1", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", From 1a36e499b8847f4e8f98ac56c25921020a577ab4 Mon Sep 17 00:00:00 2001 From: Arun Jain Date: Tue, 29 Apr 2025 12:31:59 +0530 Subject: [PATCH 8/8] chore: version bump --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index f48dbe2db..9497b7dab 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.12.0-pre-1", + "version": "1.12.0-pre-2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.12.0-pre-1", + "version": "1.12.0-pre-2", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index e28f6c0be..8dfbd6547 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.12.0-pre-1", + "version": "1.12.0-pre-2", "description": "Supporting common component library", "type": "module", "main": "dist/index.js",