From 4a2ff35ace9a34ea412ffe77e85eccee353032a3 Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Thu, 24 Oct 2024 12:22:36 +0530 Subject: [PATCH 01/38] feat: add support for other strategies in OverrideStrategyTippyContent --- .../AppConfigurations/OverrideStrategyTippyContent.tsx | 6 +++++- .../DevtronApps/Details/AppConfigurations/types.ts | 7 +++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/Pages/Applications/DevtronApps/Details/AppConfigurations/OverrideStrategyTippyContent.tsx b/src/Pages/Applications/DevtronApps/Details/AppConfigurations/OverrideStrategyTippyContent.tsx index d0a00e7bc..efdc78954 100644 --- a/src/Pages/Applications/DevtronApps/Details/AppConfigurations/OverrideStrategyTippyContent.tsx +++ b/src/Pages/Applications/DevtronApps/Details/AppConfigurations/OverrideStrategyTippyContent.tsx @@ -1,4 +1,6 @@ -const OverrideStrategyTippyContent = () => ( +import { OverrideStrategyTippyContentProps } from './types' + +const OverrideStrategyTippyContent = ({ children }: OverrideStrategyTippyContentProps) => (

Merge strategy determines how environment configurations are combined with inherited configurations @@ -6,6 +8,8 @@ const OverrideStrategyTippyContent = () => (