From da3edaaecf4863347eea42c003160e2cde39ba85 Mon Sep 17 00:00:00 2001 From: Arun Devtron Date: Tue, 8 Oct 2024 19:32:52 +0530 Subject: [PATCH 01/12] feat: add key for drift in Node --- src/Shared/types.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Shared/types.ts b/src/Shared/types.ts index 513ec54da..01adbefbd 100644 --- a/src/Shared/types.ts +++ b/src/Shared/types.ts @@ -140,6 +140,7 @@ export interface Node { port: number canBeHibernated: boolean isHibernated: boolean + hasDrift?: boolean } // eslint-disable-next-line no-use-before-define From 02b55426e0128424006a1d071dcc7640feda5bbf Mon Sep 17 00:00:00 2001 From: Arun Devtron Date: Wed, 9 Oct 2024 12:07:25 +0530 Subject: [PATCH 02/12] feat: add filter for drifted nodes in status filter button --- src/Common/Constants.ts | 1 + .../CICDHistory/AppStatusDetailsChart.tsx | 40 +++++++++++++++++-- .../StatusFilterButtonComponent.tsx | 12 ++++-- src/Shared/Components/CICDHistory/types.tsx | 6 +++ src/Shared/Store/IndexStore.tsx | 5 +++ 5 files changed, 58 insertions(+), 6 deletions(-) diff --git a/src/Common/Constants.ts b/src/Common/Constants.ts index ebb957440..68f80f5c7 100644 --- a/src/Common/Constants.ts +++ b/src/Common/Constants.ts @@ -65,6 +65,7 @@ export const URLS = { GLOBAL_CONFIG_SCOPED_VARIABLES: '/global-config/scoped-variables', GLOBAL_CONFIG_DEPLOYMENT_CHARTS_LIST: '/global-config/deployment-charts', NETWORK_STATUS_INTERFACE: '/network-status-interface', + CONFIG_DRIFT: 'config-drift', } export const ROUTES = { diff --git a/src/Shared/Components/CICDHistory/AppStatusDetailsChart.tsx b/src/Shared/Components/CICDHistory/AppStatusDetailsChart.tsx index b704befad..6df226e19 100644 --- a/src/Shared/Components/CICDHistory/AppStatusDetailsChart.tsx +++ b/src/Shared/Components/CICDHistory/AppStatusDetailsChart.tsx @@ -16,18 +16,34 @@ import { useMemo, useState } from 'react' import Tippy from '@tippyjs/react' +import { useHistory } from 'react-router' +import { URLS } from '@Common/Constants' import { ReactComponent as InfoIcon } from '../../../Assets/Icon/ic-info-filled.svg' import { ReactComponent as Chat } from '../../../Assets/Icon/ic-chat-circle-dots.svg' import { AppStatusDetailsChartType, AggregatedNodes, STATUS_SORTING_ORDER } from './types' import { StatusFilterButtonComponent } from './StatusFilterButtonComponent' -import { DEPLOYMENT_STATUS, APP_STATUS_HEADERS } from '../../constants' +import { DEPLOYMENT_STATUS, APP_STATUS_HEADERS, ComponentSizeType } from '../../constants' import { IndexStore } from '../../Store' import { aggregateNodes } from '../../Helpers' +import { Button, ButtonStyleType, ButtonVariantType } from '../Button' -const AppStatusDetailsChart = ({ filterRemoveHealth = false, showFooter }: AppStatusDetailsChartType) => { +const AppStatusDetailsChart = ({ + filterRemoveHealth = false, + showFooter, + showConfigDriftInfo = false, + onClose, +}: AppStatusDetailsChartType) => { + const history = useHistory() const _appDetails = IndexStore.getAppDetails() const [currentFilter, setCurrentFilter] = useState('') + const { appId, environmentId: envId } = _appDetails + + const handleCompareDesiredManifest = () => { + onClose() + history.push(`${URLS.APP}/${appId}${URLS.DETAILS}/${envId}/${URLS.APP_DETAILS_K8}/${URLS.CONFIG_DRIFT}`) + } + const nodes: AggregatedNodes = useMemo( () => aggregateNodes(_appDetails.resourceTree?.nodes || [], _appDetails.resourceTree?.podMetadata || []), [_appDetails], @@ -100,6 +116,7 @@ const AppStatusDetailsChart = ({ filterRemoveHealth = false, showFooter }: AppSt .filter( (nodeDetails) => currentFilter === 'all' || + (currentFilter === 'drifted' && nodeDetails.hasDrift) || nodeDetails.health.status?.toLowerCase() === currentFilter, ) .map((nodeDetails) => ( @@ -123,7 +140,24 @@ const AppStatusDetailsChart = ({ filterRemoveHealth = false, showFooter }: AppSt > {nodeDetails.status ? nodeDetails.status : nodeDetails.health.status} -
{getNodeMessage(nodeDetails.kind, nodeDetails.name)}
+
+ {showConfigDriftInfo && nodeDetails.hasDrift && ( +
+ Config drift detected + {onClose && appId && envId && ( +
+ )} +
{getNodeMessage(nodeDetails.kind, nodeDetails.name)}
+
)) ) : ( diff --git a/src/Shared/Components/CICDHistory/StatusFilterButtonComponent.tsx b/src/Shared/Components/CICDHistory/StatusFilterButtonComponent.tsx index 0ece827ea..126122070 100644 --- a/src/Shared/Components/CICDHistory/StatusFilterButtonComponent.tsx +++ b/src/Shared/Components/CICDHistory/StatusFilterButtonComponent.tsx @@ -18,9 +18,8 @@ import { useEffect, useState } from 'react' import { ReactComponent as ICCaretDown } from '@Icons/ic-caret-down.svg' import { PopupMenu, StyledRadioGroup as RadioGroup } from '../../../Common' -import { NodeStatus, StatusFilterButtonType } from './types' +import { NodeFilters, NodeStatus, StatusFilterButtonType } from './types' import { IndexStore } from '../../Store' - import './StatusFilterButtonComponent.scss' export const StatusFilterButtonComponent = ({ nodes, handleFilterClick }: StatusFilterButtonType) => { @@ -32,10 +31,15 @@ export const StatusFilterButtonComponent = ({ nodes, handleFilterClick }: Status let progressingNodeCount: number = 0 let failedNodeCount: number = 0 let missingNodeCount: number = 0 + let driftedNodeCount: number = 0 nodes?.forEach((_node) => { const _nodeHealth = _node.health?.status + if (_node.hasDrift) { + driftedNodeCount += 1 + } + if (_nodeHealth?.toLowerCase() === NodeStatus.Healthy) { healthyNodeCount += 1 } else if (_nodeHealth?.toLowerCase() === NodeStatus.Degraded) { @@ -58,6 +62,7 @@ export const StatusFilterButtonComponent = ({ nodes, handleFilterClick }: Status isSelected: NodeStatus.Progressing == selectedTab, }, { status: NodeStatus.Healthy, count: healthyNodeCount, isSelected: NodeStatus.Healthy == selectedTab }, + { status: NodeFilters.Drifted, count: driftedNodeCount, isSelected: selectedTab === NodeFilters.Drifted }, ] const validFilterOptions = filterOptions.filter(({ count }) => count > 0) const displayedInlineFilters = validFilterOptions.slice( @@ -72,7 +77,8 @@ export const StatusFilterButtonComponent = ({ nodes, handleFilterClick }: Status (selectedTab === NodeStatus.Healthy && healthyNodeCount === 0) || (selectedTab === NodeStatus.Degraded && failedNodeCount === 0) || (selectedTab === NodeStatus.Progressing && progressingNodeCount === 0) || - (selectedTab === NodeStatus.Missing && missingNodeCount === 0) + (selectedTab === NodeStatus.Missing && missingNodeCount === 0) || + (selectedTab === NodeFilters.Drifted && driftedNodeCount === 0) ) { setSelectedTab('all') } else if (handleFilterClick) { diff --git a/src/Shared/Components/CICDHistory/types.tsx b/src/Shared/Components/CICDHistory/types.tsx index 4ef8ce948..bdbf9000e 100644 --- a/src/Shared/Components/CICDHistory/types.tsx +++ b/src/Shared/Components/CICDHistory/types.tsx @@ -517,6 +517,8 @@ export interface DeploymentHistorySidebarType { export interface AppStatusDetailsChartType { filterRemoveHealth?: boolean showFooter: boolean + showConfigDriftInfo?: boolean + onClose?: () => void } export interface StatusFilterButtonType { @@ -533,6 +535,10 @@ export enum NodeStatus { Unknown = 'unknown', } +export enum NodeFilters { + Drifted = 'drifted', +} + type NodesMap = { [key in NodeType]?: Map } diff --git a/src/Shared/Store/IndexStore.tsx b/src/Shared/Store/IndexStore.tsx index 8a46e59a9..5a42342df 100644 --- a/src/Shared/Store/IndexStore.tsx +++ b/src/Shared/Store/IndexStore.tsx @@ -17,6 +17,7 @@ /* eslint-disable eqeqeq */ /* eslint-disable array-callback-return */ import { BehaviorSubject } from 'rxjs' +import { NodeFilters } from '@Shared/Components' import { AppDetails, AppType, EnvDetails, EnvType, Node, Nodes, PodMetaData, iNode } from '../types' const _appDetailsSubject: BehaviorSubject = new BehaviorSubject({} as AppDetails) @@ -43,6 +44,10 @@ const publishFilteredNodes = () => { return true } + if (_nodeFilter.filterType.toLowerCase() === NodeFilters.Drifted && _node.hasDrift) { + return true + } + return false }) From df994f699272256866751e11adfbff6ff9b8a41c Mon Sep 17 00:00:00 2001 From: Arun Devtron Date: Wed, 9 Oct 2024 12:33:01 +0530 Subject: [PATCH 03/12] chore: use enum for drifted node --- src/Shared/Components/CICDHistory/AppStatusDetailsChart.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Shared/Components/CICDHistory/AppStatusDetailsChart.tsx b/src/Shared/Components/CICDHistory/AppStatusDetailsChart.tsx index 6df226e19..e966d6df4 100644 --- a/src/Shared/Components/CICDHistory/AppStatusDetailsChart.tsx +++ b/src/Shared/Components/CICDHistory/AppStatusDetailsChart.tsx @@ -20,7 +20,7 @@ import { useHistory } from 'react-router' import { URLS } from '@Common/Constants' import { ReactComponent as InfoIcon } from '../../../Assets/Icon/ic-info-filled.svg' import { ReactComponent as Chat } from '../../../Assets/Icon/ic-chat-circle-dots.svg' -import { AppStatusDetailsChartType, AggregatedNodes, STATUS_SORTING_ORDER } from './types' +import { AppStatusDetailsChartType, AggregatedNodes, STATUS_SORTING_ORDER, NodeFilters } from './types' import { StatusFilterButtonComponent } from './StatusFilterButtonComponent' import { DEPLOYMENT_STATUS, APP_STATUS_HEADERS, ComponentSizeType } from '../../constants' import { IndexStore } from '../../Store' @@ -116,7 +116,7 @@ const AppStatusDetailsChart = ({ .filter( (nodeDetails) => currentFilter === 'all' || - (currentFilter === 'drifted' && nodeDetails.hasDrift) || + (currentFilter === NodeFilters.Drifted && nodeDetails.hasDrift) || nodeDetails.health.status?.toLowerCase() === currentFilter, ) .map((nodeDetails) => ( From 9551c44ccbe551da85dc5ec6b7cffd3232ce88ef Mon Sep 17 00:00:00 2001 From: Arun Devtron Date: Wed, 9 Oct 2024 13:01:49 +0530 Subject: [PATCH 04/12] 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 04f57b8a4..d6bf241fb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "4.0.2", + "version": "0.4.5-beta-1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "4.0.2", + "version": "0.4.5-beta-1", "license": "ISC", "dependencies": { "@types/react-dates": "^21.8.6", diff --git a/package.json b/package.json index 74d4e34cd..e2df83f6d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "4.0.2", + "version": "0.4.5-beta-1", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", From 858e2595795c59118e02eb9f02124938e96fa90f Mon Sep 17 00:00:00 2001 From: Arun Devtron Date: Wed, 9 Oct 2024 15:06:38 +0530 Subject: [PATCH 05/12] 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 d6bf241fb..4fc0b7c7a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "0.4.5-beta-1", + "version": "0.4.5-beta-2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "0.4.5-beta-1", + "version": "0.4.5-beta-2", "license": "ISC", "dependencies": { "@types/react-dates": "^21.8.6", diff --git a/package.json b/package.json index e2df83f6d..2f0e3c7e6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "0.4.5-beta-1", + "version": "0.4.5-beta-2", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", From 3ddb76c0ba67523450cb6b39f321ab15140fa99a Mon Sep 17 00:00:00 2001 From: Arun Devtron Date: Wed, 9 Oct 2024 15:32:50 +0530 Subject: [PATCH 06/12] chore: version bump --- package-lock.json | 5 ++--- package.json | 3 +-- src/Shared/Components/CICDHistory/AppStatusDetailsChart.tsx | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4fc0b7c7a..c835400eb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "0.4.5-beta-2", + "version": "0.4.5-beta-4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "0.4.5-beta-2", + "version": "0.4.5-beta-4", "license": "ISC", "dependencies": { "@types/react-dates": "^21.8.6", @@ -71,7 +71,6 @@ "react-ga4": "^1.4.1", "react-keybind": "^0.9.4", "react-mde": "^11.5.0", - "react-router": "^5.3.0", "react-router-dom": "^5.3.0", "react-select": "5.8.0", "rxjs": "^7.8.1", diff --git a/package.json b/package.json index 2f0e3c7e6..b48da4822 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "0.4.5-beta-2", + "version": "0.4.5-beta-4", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", @@ -85,7 +85,6 @@ "react-ga4": "^1.4.1", "react-keybind": "^0.9.4", "react-mde": "^11.5.0", - "react-router": "^5.3.0", "react-router-dom": "^5.3.0", "react-select": "5.8.0", "rxjs": "^7.8.1", diff --git a/src/Shared/Components/CICDHistory/AppStatusDetailsChart.tsx b/src/Shared/Components/CICDHistory/AppStatusDetailsChart.tsx index e966d6df4..95876751e 100644 --- a/src/Shared/Components/CICDHistory/AppStatusDetailsChart.tsx +++ b/src/Shared/Components/CICDHistory/AppStatusDetailsChart.tsx @@ -16,7 +16,7 @@ import { useMemo, useState } from 'react' import Tippy from '@tippyjs/react' -import { useHistory } from 'react-router' +import { useHistory } from 'react-router-dom' import { URLS } from '@Common/Constants' import { ReactComponent as InfoIcon } from '../../../Assets/Icon/ic-info-filled.svg' import { ReactComponent as Chat } from '../../../Assets/Icon/ic-chat-circle-dots.svg' From 3e119eedf4e0dcee1321d336070e7c5be582686f Mon Sep 17 00:00:00 2001 From: Arun Devtron Date: Thu, 10 Oct 2024 12:30:15 +0530 Subject: [PATCH 07/12] chore: rename Drifted filter to drifted --- src/Shared/Components/CICDHistory/AppStatusDetailsChart.tsx | 2 +- .../Components/CICDHistory/StatusFilterButtonComponent.tsx | 4 ++-- src/Shared/Components/CICDHistory/types.tsx | 2 +- src/Shared/Store/IndexStore.tsx | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Shared/Components/CICDHistory/AppStatusDetailsChart.tsx b/src/Shared/Components/CICDHistory/AppStatusDetailsChart.tsx index 95876751e..c8f797bef 100644 --- a/src/Shared/Components/CICDHistory/AppStatusDetailsChart.tsx +++ b/src/Shared/Components/CICDHistory/AppStatusDetailsChart.tsx @@ -116,7 +116,7 @@ const AppStatusDetailsChart = ({ .filter( (nodeDetails) => currentFilter === 'all' || - (currentFilter === NodeFilters.Drifted && nodeDetails.hasDrift) || + (currentFilter === NodeFilters.drifted && nodeDetails.hasDrift) || nodeDetails.health.status?.toLowerCase() === currentFilter, ) .map((nodeDetails) => ( diff --git a/src/Shared/Components/CICDHistory/StatusFilterButtonComponent.tsx b/src/Shared/Components/CICDHistory/StatusFilterButtonComponent.tsx index 126122070..66c9b0586 100644 --- a/src/Shared/Components/CICDHistory/StatusFilterButtonComponent.tsx +++ b/src/Shared/Components/CICDHistory/StatusFilterButtonComponent.tsx @@ -62,7 +62,7 @@ export const StatusFilterButtonComponent = ({ nodes, handleFilterClick }: Status isSelected: NodeStatus.Progressing == selectedTab, }, { status: NodeStatus.Healthy, count: healthyNodeCount, isSelected: NodeStatus.Healthy == selectedTab }, - { status: NodeFilters.Drifted, count: driftedNodeCount, isSelected: selectedTab === NodeFilters.Drifted }, + { status: NodeFilters.drifted, count: driftedNodeCount, isSelected: selectedTab === NodeFilters.drifted }, ] const validFilterOptions = filterOptions.filter(({ count }) => count > 0) const displayedInlineFilters = validFilterOptions.slice( @@ -78,7 +78,7 @@ export const StatusFilterButtonComponent = ({ nodes, handleFilterClick }: Status (selectedTab === NodeStatus.Degraded && failedNodeCount === 0) || (selectedTab === NodeStatus.Progressing && progressingNodeCount === 0) || (selectedTab === NodeStatus.Missing && missingNodeCount === 0) || - (selectedTab === NodeFilters.Drifted && driftedNodeCount === 0) + (selectedTab === NodeFilters.drifted && driftedNodeCount === 0) ) { setSelectedTab('all') } else if (handleFilterClick) { diff --git a/src/Shared/Components/CICDHistory/types.tsx b/src/Shared/Components/CICDHistory/types.tsx index bdbf9000e..2539145de 100644 --- a/src/Shared/Components/CICDHistory/types.tsx +++ b/src/Shared/Components/CICDHistory/types.tsx @@ -536,7 +536,7 @@ export enum NodeStatus { } export enum NodeFilters { - Drifted = 'drifted', + drifted = 'drifted', } type NodesMap = { diff --git a/src/Shared/Store/IndexStore.tsx b/src/Shared/Store/IndexStore.tsx index 5a42342df..376345129 100644 --- a/src/Shared/Store/IndexStore.tsx +++ b/src/Shared/Store/IndexStore.tsx @@ -44,7 +44,7 @@ const publishFilteredNodes = () => { return true } - if (_nodeFilter.filterType.toLowerCase() === NodeFilters.Drifted && _node.hasDrift) { + if (_nodeFilter.filterType.toLowerCase() === NodeFilters.drifted && _node.hasDrift) { return true } From 69cab58e5d08dc9a3fd4e90864f78ff74c73f082 Mon Sep 17 00:00:00 2001 From: Arun Devtron Date: Thu, 10 Oct 2024 12:51:50 +0530 Subject: [PATCH 08/12] 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 c835400eb..6ddb9775d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "0.4.5-beta-4", + "version": "0.4.5-beta-5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "0.4.5-beta-4", + "version": "0.4.5-beta-5", "license": "ISC", "dependencies": { "@types/react-dates": "^21.8.6", diff --git a/package.json b/package.json index b48da4822..5f734d960 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "0.4.5-beta-4", + "version": "0.4.5-beta-5", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", From 3ec13ae845f74fafc06f5265fbd44059f84f3c02 Mon Sep 17 00:00:00 2001 From: Arun Jain Date: Thu, 17 Oct 2024 15:07:54 +0530 Subject: [PATCH 09/12] feat: add flag for config drift feature --- src/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/index.ts b/src/index.ts index 57d0183d5..63ee96403 100644 --- a/src/index.ts +++ b/src/index.ts @@ -76,6 +76,7 @@ export interface customEnv { SYSTEM_CONTROLLER_LISTING_TIMEOUT?: number FEATURE_STEP_WISE_LOGS_ENABLE?: boolean FEATURE_IMAGE_PROMOTION_ENABLE?: boolean + FEATURE_CONFIG_DRIFT_ENABLE: boolean } declare global { interface Window { From 4a6ca3d5abee5c497aad5d7af9ced8d8aeb0212a Mon Sep 17 00:00:00 2001 From: Arun Jain Date: Thu, 17 Oct 2024 18:25:41 +0530 Subject: [PATCH 10/12] 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 80c9b0bdc..c6177118a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "0.5.2", + "version": "0.5.2-beta-2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "0.5.2", + "version": "0.5.2-beta-2", "license": "ISC", "dependencies": { "@types/react-dates": "^21.8.6", diff --git a/package.json b/package.json index 81349e1b5..ec12cf4ad 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "0.5.2", + "version": "0.5.2-beta-2", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", From 2e4f15833fc283d6e5c90e9015fa6d7730782e46 Mon Sep 17 00:00:00 2001 From: Arun Jain Date: Thu, 17 Oct 2024 18:26:42 +0530 Subject: [PATCH 11/12] 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 c6177118a..ad9cc138c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "0.5.2-beta-2", + "version": "0.5.2-beta-3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "0.5.2-beta-2", + "version": "0.5.2-beta-3", "license": "ISC", "dependencies": { "@types/react-dates": "^21.8.6", diff --git a/package.json b/package.json index ec12cf4ad..134ea9864 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "0.5.2-beta-2", + "version": "0.5.2-beta-3", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", From 387d6e4314b0cc2c12f457eb8ecc9fbd0910bdfb Mon Sep 17 00:00:00 2001 From: Arun Jain Date: Fri, 18 Oct 2024 12:10:02 +0530 Subject: [PATCH 12/12] fix: hide drift filter when flag is off --- package-lock.json | 4 ++-- package.json | 2 +- .../Components/CICDHistory/StatusFilterButtonComponent.tsx | 6 +++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index ad9cc138c..d9559aab0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "0.5.2-beta-3", + "version": "0.5.2-beta-4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "0.5.2-beta-3", + "version": "0.5.2-beta-4", "license": "ISC", "dependencies": { "@types/react-dates": "^21.8.6", diff --git a/package.json b/package.json index 134ea9864..7b0a2dae3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "0.5.2-beta-3", + "version": "0.5.2-beta-4", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", diff --git a/src/Shared/Components/CICDHistory/StatusFilterButtonComponent.tsx b/src/Shared/Components/CICDHistory/StatusFilterButtonComponent.tsx index 66c9b0586..06f2d77a0 100644 --- a/src/Shared/Components/CICDHistory/StatusFilterButtonComponent.tsx +++ b/src/Shared/Components/CICDHistory/StatusFilterButtonComponent.tsx @@ -62,7 +62,11 @@ export const StatusFilterButtonComponent = ({ nodes, handleFilterClick }: Status isSelected: NodeStatus.Progressing == selectedTab, }, { status: NodeStatus.Healthy, count: healthyNodeCount, isSelected: NodeStatus.Healthy == selectedTab }, - { status: NodeFilters.drifted, count: driftedNodeCount, isSelected: selectedTab === NodeFilters.drifted }, + window._env_.FEATURE_CONFIG_DRIFT_ENABLE && { + status: NodeFilters.drifted, + count: driftedNodeCount, + isSelected: selectedTab === NodeFilters.drifted, + }, ] const validFilterOptions = filterOptions.filter(({ count }) => count > 0) const displayedInlineFilters = validFilterOptions.slice(