Skip to content

feat(compass-aggregations): remove focus mode feature flag, always show COMPASS-6474 #4152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Anemy merged 2 commits into from
Mar 15, 2023
Merged

feat(compass-aggregations): remove focus mode feature flag, always show COMPASS-6474 #4152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bad1c41
remove focus mode feature flag, always show
Anemy Mar 14, 2023
8277361
lint
Anemy Mar 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions packages/compass-aggregations/src/components/stage-toolbar/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -110,7 +109,6 @@ export function StageToolbar({
editorRef,
}: StageToolbarProps) {
const darkMode = useDarkMode();
const showFocusMode = usePreference('showFocusMode', React);

return (
<div
Expand All @@ -135,16 +133,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>
Expand Down
8 changes: 2 additions & 6 deletions packages/compass-aggregations/src/components/stage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -154,15 +153,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);
Expand Down
17 changes: 0 additions & 17 deletions packages/compass-preferences-model/src/preferences.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ export type FeatureFlags = {
showDevFeatureFlags?: boolean;
lgDarkmode?: boolean;
debugUseCsfleSchemaMap?: boolean;
showFocusMode?: boolean;
useNewExportBackend?: boolean;
};

Expand Down Expand Up @@ -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
Expand Down