From bad1c41900eb73770363921f3748658d7f5a4156 Mon Sep 17 00:00:00 2001
From: Rhys Howell <rhysh@live.com>
Date: Tue, 14 Mar 2023 18:49:22 -0400
Subject: [PATCH 1/2] remove focus mode feature flag, always show

---
 .../src/components/stage-toolbar/index.tsx    | 19 ++++++++-----------
 .../src/components/stage.tsx                  |  7 ++-----
 .../src/preferences.ts                        | 17 -----------------
 3 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/packages/compass-aggregations/src/components/stage-toolbar/index.tsx b/packages/compass-aggregations/src/components/stage-toolbar/index.tsx
index 656e1822a5e..a93e71ab735 100644
--- a/packages/compass-aggregations/src/components/stage-toolbar/index.tsx
+++ b/packages/compass-aggregations/src/components/stage-toolbar/index.tsx
@@ -110,7 +110,6 @@ export function StageToolbar({
   editorRef,
 }: StageToolbarProps) {
   const darkMode = useDarkMode();
-  const showFocusMode = usePreference('showFocusMode', React);
 
   return (
     <div
@@ -135,16 +134,14 @@ export function StageToolbar({
         {isDisabled ? DISABLED_TEXT : isCollapsed ? COLLAPSED_TEXT : null}
       </div>
       <div className={rightStyles}>
-        {showFocusMode && (
-          <IconButton
-            onClick={onOpenFocusMode}
-            aria-label="Open stage in focus mode"
-            data-testid="focus-mode-button"
-            data-guide-cue-ref="focus-mode-button"
-          >
-            <Icon glyph="FullScreenEnter" size="small"></Icon>
-          </IconButton>
-        )}
+        <IconButton
+          onClick={onOpenFocusMode}
+          aria-label="Open stage in focus mode"
+          data-testid="focus-mode-button"
+          data-guide-cue-ref="focus-mode-button"
+        >
+          <Icon glyph="FullScreenEnter" size="small"></Icon>
+        </IconButton>
         <OptionMenu index={index} />
       </div>
     </div>
diff --git a/packages/compass-aggregations/src/components/stage.tsx b/packages/compass-aggregations/src/components/stage.tsx
index 97f0495be0d..a4861606969 100644
--- a/packages/compass-aggregations/src/components/stage.tsx
+++ b/packages/compass-aggregations/src/components/stage.tsx
@@ -154,15 +154,12 @@ const useFocusModeGuideCue = (stageIndex: number) => {
   const [setGuideCueIntersectingRef, isIntersecting] = useInView({
     threshold: 0.5,
   });
-  const showFocusMode = usePreference('showFocusMode', React);
 
   useEffect(() => {
     if (!hasSeenFocusModeGuideCue()) {
-      setIsGuideCueVisible(
-        Boolean(stageIndex === 0 && showFocusMode && isIntersecting)
-      );
+      setIsGuideCueVisible(Boolean(stageIndex === 0 && isIntersecting));
     }
-  }, [setIsGuideCueVisible, showFocusMode, stageIndex, isIntersecting]);
+  }, [setIsGuideCueVisible, stageIndex, isIntersecting]);
 
   const setGuideCueVisited = () => {
     setIsGuideCueVisible(false);
diff --git a/packages/compass-preferences-model/src/preferences.ts b/packages/compass-preferences-model/src/preferences.ts
index c1a651c621d..9d875f5591c 100644
--- a/packages/compass-preferences-model/src/preferences.ts
+++ b/packages/compass-preferences-model/src/preferences.ts
@@ -17,7 +17,6 @@ export type FeatureFlags = {
   showDevFeatureFlags?: boolean;
   lgDarkmode?: boolean;
   debugUseCsfleSchemaMap?: boolean;
-  showFocusMode?: boolean;
   useNewExportBackend?: boolean;
 };
 
@@ -255,22 +254,6 @@ const featureFlagsProps: Required<{
     },
   },
 
-  /**
-   * Feature flag for the focus mode in aggregation pipeline builder.
-   */
-  showFocusMode: {
-    type: 'boolean',
-    required: false,
-    default: true,
-    ui: true,
-    cli: true,
-    global: true,
-    description: {
-      short: 'Focus Mode in Stage Editor',
-      long: 'Use focus mode to compose aggregation pipeline stage.',
-    },
-  },
-
   /**
    * Feature flag for enabling the use of the new backend api for
    * exporting documents. Epic: COMPASS-5576

From 8277361a030bc8de27e385448cbb42d5cbb9996a Mon Sep 17 00:00:00 2001
From: Rhys Howell <rhysh@live.com>
Date: Tue, 14 Mar 2023 20:39:57 -0400
Subject: [PATCH 2/2] lint

---
 .../compass-aggregations/src/components/stage-toolbar/index.tsx  | 1 -
 packages/compass-aggregations/src/components/stage.tsx           | 1 -
 2 files changed, 2 deletions(-)

diff --git a/packages/compass-aggregations/src/components/stage-toolbar/index.tsx b/packages/compass-aggregations/src/components/stage-toolbar/index.tsx
index a93e71ab735..47b38f262db 100644
--- a/packages/compass-aggregations/src/components/stage-toolbar/index.tsx
+++ b/packages/compass-aggregations/src/components/stage-toolbar/index.tsx
@@ -16,7 +16,6 @@ import ToggleStage from './toggle-stage';
 import StageCollapser from './stage-collapser';
 import StageOperatorSelect from './stage-operator-select';
 import { hasSyntaxError } from '../../utils/stage';
-import { usePreference } from 'compass-preferences-model';
 import { enableFocusMode } from '../../modules/focus-mode';
 import OptionMenu from './option-menu';
 
diff --git a/packages/compass-aggregations/src/components/stage.tsx b/packages/compass-aggregations/src/components/stage.tsx
index a4861606969..d9a442b6d20 100644
--- a/packages/compass-aggregations/src/components/stage.tsx
+++ b/packages/compass-aggregations/src/components/stage.tsx
@@ -11,7 +11,6 @@ import {
   GuideCue,
 } from '@mongodb-js/compass-components';
 import { type AceEditor } from '@mongodb-js/compass-editor';
-import { usePreference } from 'compass-preferences-model';
 
 import { useSortable } from '@dnd-kit/sortable';
 import { CSS as cssDndKit } from '@dnd-kit/utilities';