From 5bd77c600289954e487c3451b5e54fd3d8cb8e49 Mon Sep 17 00:00:00 2001
From: Nastya <55718143+anrusina@users.noreply.github.com>
Date: Tue, 15 Mar 2022 10:55:03 -0700
Subject: [PATCH] feat: enable timeline view (#327)

---
 src/basics/FeatureFlags/defaultConfig.ts             |  6 ++----
 src/basics/LocalCache/defaultConfig.ts               |  5 +----
 .../ExecutionDetails/ExecutionNodeViews.tsx          | 12 ++----------
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/basics/FeatureFlags/defaultConfig.ts b/src/basics/FeatureFlags/defaultConfig.ts
index a3d0fcbbf..21c03c44c 100644
--- a/src/basics/FeatureFlags/defaultConfig.ts
+++ b/src/basics/FeatureFlags/defaultConfig.ts
@@ -8,8 +8,7 @@ export enum FeatureFlag {
   TestFlagTrue = 'test-flag-true',
 
   // Production flags
-  LaunchPlan = 'launch-plan',
-  TimelineView = 'timeline-view'
+  LaunchPlan = 'launch-plan'
 }
 
 export type FeatureFlagConfig = { [k: string]: boolean };
@@ -20,6 +19,5 @@ export const defaultFlagConfig: FeatureFlagConfig = {
 
   // Production - new code should be turned off by default
   // If you need to turn it on locally -> update runtimeConfig in ./index.tsx file
-  'launch-plan': false,
-  'timeline-view': false
+  'launch-plan': false
 };
diff --git a/src/basics/LocalCache/defaultConfig.ts b/src/basics/LocalCache/defaultConfig.ts
index e1dd4b347..c26517bdd 100644
--- a/src/basics/LocalCache/defaultConfig.ts
+++ b/src/basics/LocalCache/defaultConfig.ts
@@ -5,10 +5,7 @@ export enum LocalCacheItem {
   TestObject = 'test-object',
 
   // Production flags
-  ShowWorkflowVersions = 'flyte.show-workflow-versions',
-
-  // Feature flags - for prod testing
-  ffTimelineView = 'ff.timeline-view'
+  ShowWorkflowVersions = 'flyte.show-workflow-versions'
 }
 
 type LocalCacheConfig = { [k: string]: string };
diff --git a/src/components/Executions/ExecutionDetails/ExecutionNodeViews.tsx b/src/components/Executions/ExecutionDetails/ExecutionNodeViews.tsx
index 864b3ece9..3f984c047 100644
--- a/src/components/Executions/ExecutionDetails/ExecutionNodeViews.tsx
+++ b/src/components/Executions/ExecutionDetails/ExecutionNodeViews.tsx
@@ -48,18 +48,10 @@ export const ExecutionNodeViews: React.FC<ExecutionNodeViewsProps> = ({ executio
   const filterState = useNodeExecutionFiltersState();
   const tabState = useTabState(tabs, defaultTab);
 
-  const timelineFlag = useFeatureFlag(FeatureFlag.TimelineView);
-  const [useTimelineFromCache] = useLocalCache(LocalCacheItem.ffTimelineView);
-  const isTimelineEnabled = useTimelineFromCache || timelineFlag;
-
   const {
     closure: { abortMetadata }
   } = execution;
 
-  if (!isTimelineEnabled && tabState.value === tabs.timeline.id) {
-    tabState.onChange(noop, defaultTab);
-  }
-
   /* We want to maintain the filter selection when switching away from the Nodes
     tab and back, but do not want to filter the nodes when viewing the graph. So,
     we will only pass filters to the execution state when on the nodes tab. */
@@ -86,7 +78,7 @@ export const ExecutionNodeViews: React.FC<ExecutionNodeViewsProps> = ({ executio
       <Tabs className={styles.tabs} {...tabState}>
         <Tab value={tabs.nodes.id} label={tabs.nodes.label} />
         <Tab value={tabs.graph.id} label={tabs.graph.label} />
-        {isTimelineEnabled && <Tab value={tabs.timeline.id} label={tabs.timeline.label} />}
+        <Tab value={tabs.timeline.id} label={tabs.timeline.label} />
       </Tabs>
       <NodeExecutionDetailsContextProvider workflowId={execution.closure.workflowId}>
         <div className={styles.nodesContainer}>
@@ -105,7 +97,7 @@ export const ExecutionNodeViews: React.FC<ExecutionNodeViewsProps> = ({ executio
               {renderExecutionLoader}
             </WaitForQuery>
           )}
-          {isTimelineEnabled && tabState.value === tabs.timeline.id && (
+          {tabState.value === tabs.timeline.id && (
             <WaitForQuery errorComponent={DataError} query={nodeExecutionsQuery}>
               {renderExecutionsTimeline}
             </WaitForQuery>