Skip to content

chore(aggregations): Refactor aggregations stage toolbar #6572

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
merged 2 commits into from
Dec 18, 2024
Merged

chore(aggregations): Refactor aggregations stage toolbar #6572

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
d2d7ab0
Re-export GlyphName instead of IconGlyph
kraenhansen Dec 17, 2024
dc3c2c5
Use React composition instead of arrays of data
kraenhansen Dec 17, 2024
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
45 changes: 45 additions & 0 deletions packages/compass-aggregations/src/components/stage-toolbar/option-menu-item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
import React from 'react';

import {
css,
Icon,
MenuItem,
palette,
spacing,
type GlyphName,
} from '@mongodb-js/compass-components';

const styles = css({
display: 'flex',
alignItems: 'center',
gap: spacing[2],
});

type OptionMenuItemProps = {
label: string;
icon: GlyphName;
onClick: () => void;
setMenuOpen: (open: boolean) => void;
};

export function OptionMenuItem({
label,
onClick,
setMenuOpen,
icon,
}: OptionMenuItemProps) {
return (
<MenuItem
data-text={label}
onClick={() => {
setMenuOpen(false);
onClick();
}}
>
<div className={styles}>
<Icon color={palette.gray.dark2} glyph={icon} size="small" />
{label}
</div>
</MenuItem>
);
}
106 changes: 33 additions & 73 deletions packages/compass-aggregations/src/components/stage-toolbar/option-menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
import React, { useMemo, useState } from 'react';
import React, { useState } from 'react';
import { connect } from 'react-redux';
import {
Menu,
MenuItem,
css,
IconButton,
Icon,
palette,
spacing,
} from '@mongodb-js/compass-components';
import { Menu, IconButton, Icon } from '@mongodb-js/compass-components';
import {
addStage,
removeStage,
Expand All @@ -17,12 +9,7 @@ import {
} from '../../modules/pipeline-builder/stage-editor';
import type { StoreStage } from '../../modules/pipeline-builder/stage-editor';
import type { RootState } from '../../modules';

const menuItemStyles = css({
display: 'flex',
alignItems: 'center',
gap: spacing[2],
});
import { OptionMenuItem } from './option-menu-item';

export const OptionMenu = ({
index,
Expand All @@ -39,51 +26,6 @@ export const OptionMenu = ({
}) => {
const [menuOpen, setMenuOpen] = useState(false);

const menuItems = useMemo(() => {
return [
{
label: 'Add stage after',
onClick: () => {
onAddStageClick(index);
setMenuOpen(false);
},
icon: 'PlusWithCircle',
},
{
label: 'Add stage before',
onClick: () => {
onAddStageClick(index - 1);
setMenuOpen(false);
},
icon: 'PlusWithCircle',
},
{
label: 'Delete stage',
onClick: () => {
onDeleteStageClick(index);
setMenuOpen(false);
},
icon: 'Trash',
},
{
label: 'Expand documents',
onClick: () => {
onExpand(index);
setMenuOpen(false);
},
icon: 'ChevronDown',
},
{
label: 'Collapse documents',
onClick: () => {
onCollapse(index);
setMenuOpen(false);
},
icon: 'ChevronUp',
},
];
}, [index, onAddStageClick, onDeleteStageClick, onExpand, onCollapse]);

return (
<Menu
open={menuOpen}
Expand All @@ -105,18 +47,36 @@ export const OptionMenu = ({
);
}}
>
{menuItems.map((item) => (
<MenuItem
key={item.label}
data-text={item.label}
onClick={item.onClick}
>
<div className={menuItemStyles}>
<Icon color={palette.gray.dark2} glyph={item.icon} size="small" />
{item.label}
</div>
</MenuItem>
))}
<OptionMenuItem
label="Add stage after"
icon="PlusWithCircle"
onClick={() => onAddStageClick(index)}
setMenuOpen={setMenuOpen}
Comment on lines +53 to +54
Copy link
Collaborator

@mabaasit mabaasit Dec 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What benefit does it have to pass these two here instead of just onClick and then something like:

	onClick={() => {
        onAddStageClick(index);
        setMenuOpen(false);
    }}

Copy link
Collaborator

@mabaasit mabaasit Dec 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not a blocker though.

Copy link
Contributor Author

@kraenhansen kraenhansen Dec 17, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This just ensures that setMenuOpen(false) is always called when onClick is called on any item.. Not making that a choice of the caller.

/>
<OptionMenuItem
label="Add stage before"
icon="PlusWithCircle"
onClick={() => onAddStageClick(index - 1)}
setMenuOpen={setMenuOpen}
/>
<OptionMenuItem
label="Delete stage"
icon="Trash"
onClick={() => onDeleteStageClick(index)}
setMenuOpen={setMenuOpen}
/>
<OptionMenuItem
label="Expand documents"
icon="ChevronDown"
onClick={() => onExpand(index)}
setMenuOpen={setMenuOpen}
/>
<OptionMenuItem
label="Collapse documents"
icon="ChevronUp"
onClick={() => onCollapse(index)}
setMenuOpen={setMenuOpen}
/>
</Menu>
);
};
Expand Down
6 changes: 2 additions & 4 deletions packages/compass-components/src/components/workspace-tabs/tab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { useMemo } from 'react';
import { css, cx } from '@leafygreen-ui/emotion';
import { palette } from '@leafygreen-ui/palette';
import { spacing } from '@leafygreen-ui/tokens';
import type { glyphs } from '@leafygreen-ui/icon';
import type { GlyphName } from '@leafygreen-ui/icon';
import { useSortable } from '@dnd-kit/sortable';
import { CSS as cssDndKit } from '@dnd-kit/utilities';
import { useDarkMode } from '../../hooks/use-theme';
Expand Down Expand Up @@ -180,8 +180,6 @@ const closeButtonStyles = css({
marginRight: spacing[100],
});

type IconGlyph = Extract<keyof typeof glyphs, string>;

type TabProps = {
connectionName?: string;
type: string;
Expand All @@ -190,7 +188,7 @@ type TabProps = {
isDragging: boolean;
onSelect: () => void;
onClose: () => void;
iconGlyph: IconGlyph | 'Logo' | 'Server';
iconGlyph: GlyphName | 'Logo' | 'Server';
tabContentId: string;
tooltip?: [string, string][];
tabTheme?: Partial<TabTheme>;
Expand Down
4 changes: 2 additions & 2 deletions packages/compass-components/src/components/workspace-tabs/workspace-tabs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import React, {
import { css, cx } from '@leafygreen-ui/emotion';
import { palette } from '@leafygreen-ui/palette';
import { spacing } from '@leafygreen-ui/tokens';
import type { glyphs } from '@leafygreen-ui/icon';
import type { GlyphName } from '@leafygreen-ui/icon';
import { rgba } from 'polished';

import {
Expand Down Expand Up @@ -174,7 +174,7 @@ export type TabProps = {
title: string;
tooltip?: [string, string][];
connectionId?: string;
iconGlyph: Extract<keyof typeof glyphs, string> | 'Logo' | 'Server';
iconGlyph: GlyphName | 'Logo' | 'Server';
} & Omit<React.HTMLProps<HTMLDivElement>, 'id' | 'title'>;

export function useRovingTabIndex<T extends HTMLElement = HTMLElement>({
Expand Down
3 changes: 1 addition & 2 deletions packages/compass-components/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,14 +143,13 @@ export {
FadeInPlaceholder,
} from './components/content-with-fallback';
export { InlineDefinition } from './components/inline-definition';
import type { glyphs } from '@leafygreen-ui/icon';
export type { GlyphName } from '@leafygreen-ui/icon';
export { createGlyphComponent, createIconComponent } from '@leafygreen-ui/icon';
export {
SignalPopover,
SignalHooksProvider,
} from './components/signal-popover';
export type { Signal } from './components/signal-popover';
export type IconGlyph = Extract<keyof typeof glyphs, string>;

export { EmptyContent } from './components/empty-content';
export { ErrorBoundary } from './components/error-boundary';
Expand Down
4 changes: 2 additions & 2 deletions packages/compass-editor/src/action-button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { cx } from '@mongodb-js/compass-components';
import { css } from '@mongodb-js/compass-components';
import { Button, Icon, type IconGlyph } from '@mongodb-js/compass-components';
import { Button, Icon, type GlyphName } from '@mongodb-js/compass-components';
import React, { useCallback, useEffect, useState } from 'react';
import type { EditorView } from '@codemirror/view';

export type Action = {
icon: IconGlyph;
icon: GlyphName;
label: string;
action: (editor: EditorView) => boolean | void;
};
Expand Down
4 changes: 2 additions & 2 deletions packages/databases-collections-list/src/namespace-card.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
} from '@mongodb-js/compass-components';
import type {
BadgeVariant,
IconGlyph,
GlyphName,
ItemAction,
SignalPopover,
} from '@mongodb-js/compass-components';
Expand Down Expand Up @@ -107,7 +107,7 @@ export type BadgeProp = {
id: string;
name: string;
variant?: BadgeVariant;
icon?: IconGlyph;
icon?: GlyphName;
hint?: React.ReactNode;
};

Expand Down
Loading