chore: get flags from external env

Signed-off-by: Frank Flitton <[email protected]>
flyteorg · Jul 25, 2023 · 67e9e27 · 67e9e27
1 parent 679acbb
commit 67e9e27
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/packages/console/src/basics/FeatureFlags/FeatureFlags.tsx b/packages/console/src/basics/FeatureFlags/FeatureFlags.tsx
@@ -77,8 +77,8 @@ export const useFeatureFlagContext = () => useContext(FeatureFlagContext);
 export const FeatureFlagsProvider = (props: FeatureFlagProviderProps) => {
   const [flags, setFlags] = useState<FeatureFlagConfig>({
     ...defaultFlagConfig,
-    ...runtimeConfig,
     ...props.externalFlags,
+    ...runtimeConfig,
   });
 
   const setFeatureFlag = useCallback((flag: FeatureFlag, newValue: boolean) => {

diff --git a/packages/console/src/components/App/App.tsx b/packages/console/src/components/App/App.tsx
@@ -66,7 +66,11 @@ export const AppComponent: React.FC<AppComponentProps> = (
 
   return (
     <FeatureFlagsProvider
-      externalFlags={{ ...props.env, breadcrumbs: breadcrumbsFlag }}
+      externalFlags={{
+        ...props.env,
+        breadcrumbs: breadcrumbsFlag,
+        'horizontal-layout': horizontalLayoutFlag,
+      }}
     >
       <GlobalStyles />
       <LocalCacheProvider>

diff --git a/...ages/console/src/components/Executions/ExecutionDetails/ExecutionDetailsAppBarContent.tsx b/...ages/console/src/components/Executions/ExecutionDetails/ExecutionDetailsAppBarContent.tsx
@@ -137,15 +137,7 @@ export const ExecutionDetailsAppBarContentInner: React.FC<{}> = () => {
   const actionContent = isRunning ? (
     <TerminateExecutionButton />
   ) : isTerminal ? (
-    <Grid
-      container
-      spacing={2}
-      justifyContent="flex-end"
-      style={{
-        flexWrap: isBreadcrumbFlag ? 'wrap' : 'nowrap',
-        width: isBreadcrumbFlag ? '100%' : 'auto',
-      }}
-    >
+    <>
       {isRecoverVisible && (
         <Grid item>
           <Button
@@ -172,7 +164,7 @@ export const ExecutionDetailsAppBarContentInner: React.FC<{}> = () => {
           Relaunch
         </Button>
       </Grid>
-    </Grid>
+    </>
   ) : null;
 
   // For non-terminal executions, add an overflow menu with the ability to clone
@@ -255,8 +247,8 @@ export const ExecutionDetailsAppBarContentInner: React.FC<{}> = () => {
                 View Inputs &amp; Outputs
               </Link>
             </Grid>
-            {actionContent && <Grid item>{actionContent}</Grid>}
-            {moreActionsContent && <Grid item>{moreActionsContent}</Grid>}
+            {actionContent && <>{actionContent}</>}
+            {moreActionsContent && <>{moreActionsContent}</>}
           </Grid>
         </BreadcrumbTitleActions>
       )}