Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Fix onboarding button shrinking and search user picker pills (#83125)

Egor Grushin3b120289c27a
diff --git a/e2e/test/scenarios/search/search-filters.cy.spec.js b/e2e/test/scenarios/search/search-filters.cy.spec.js
index 1222f4f6cfb..3d5fc2ed73a 100644
--- a/e2e/test/scenarios/search/search-filters.cy.spec.js
+++ b/e2e/test/scenarios/search/search-filters.cy.spec.js
@@ -385,7 +385,7 @@ describe("scenarios > search", () => {
H.popover().within(() => {
// remove Robert Tableton from the created_by filter
cy.findByTestId("search-user-select-box")
- .findByText("Robert Tableton")
+ .findByLabelText("Remove Robert Tableton")
.click();
cy.findByText("Apply").click();
});
@@ -619,7 +619,7 @@ describe("scenarios > search", () => {
H.popover().within(() => {
// remove Robert Tableton from the last_edited_by filter
cy.findByTestId("search-user-select-box")
- .findByText("Robert Tableton")
+ .findByLabelText("Remove Robert Tableton")
.click();
cy.findByText("Apply").click();
});
diff --git a/frontend/src/metabase/home/components/Onboarding/Onboarding.tsx b/frontend/src/metabase/home/components/Onboarding/Onboarding.tsx
index f79964cb811..e351997155a 100644
--- a/frontend/src/metabase/home/components/Onboarding/Onboarding.tsx
+++ b/frontend/src/metabase/home/components/Onboarding/Onboarding.tsx
@@ -140,6 +140,7 @@ export const Onboarding = () => {
component={ExternalLink}
href={helpLink.href}
variant="filled"
+ flex="none"
>{t`Get Help`}</Button>
</Box>
)}
diff --git a/frontend/src/metabase/search/components/SearchUserPicker/SearchUserPicker.module.css b/frontend/src/metabase/search/components/SearchUserPicker/SearchUserPicker.module.css
new file mode 100644
index 00000000000..5174dd7bd73
--- /dev/null
+++ b/frontend/src/metabase/search/components/SearchUserPicker/SearchUserPicker.module.css
@@ -0,0 +1,12 @@
+.container {
+ overflow: hidden;
+}
+
+.selectBox {
+ max-height: 30vh;
+ overflow-y: auto;
+}
+
+.content {
+ overflow-y: auto;
+}
diff --git a/frontend/src/metabase/search/components/SearchUserPicker/SearchUserPicker.styled.tsx b/frontend/src/metabase/search/components/SearchUserPicker/SearchUserPicker.styled.tsx
deleted file mode 100644
index 7c0a9c5fca7..00000000000
--- a/frontend/src/metabase/search/components/SearchUserPicker/SearchUserPicker.styled.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import { css } from "@emotion/react";
-// eslint-disable-next-line no-restricted-imports
-import styled from "@emotion/styled";
-import type { HTMLAttributes } from "react";
-
-import type { ButtonProps } from "metabase/ui";
-import { Button, Group, Stack, TextInput } from "metabase/ui";
-
-export const SearchUserPickerContainer = styled(Stack)`
- overflow: hidden;
-`;
-
-export const SearchUserItemContainer = styled(Group)`
- overflow-y: auto;
-`;
-
-export const UserPickerInput = styled(TextInput)`
- flex: 1;
-`;
-
-export const SearchUserPickerContent = styled(Stack)`
- overflow-y: auto;
- flex: 1;
-`;
-
-export const SearchUserSelectBox = styled(Stack)`
- border: 1px solid var(--mb-color-border-neutral);
- border-radius: ${({ theme }) => theme.radius.sm};
-`;
-
-// Unjustified type cast. FIXME
-export const SelectedUserButton = styled(Button)<
- ButtonProps & HTMLAttributes<HTMLButtonElement>
->`
- ${() => {
- return css`
- background-color: var(
- --mb-color-background_surface-brand-subtle
- ) !important;
- border: 0;
-
- &:hover {
- background-color: var(--mb-color-background_surface-hover) !important;
- }
- `;
- }}
-` as unknown as typeof Button;
diff --git a/frontend/src/metabase/search/components/SearchUserPicker/SearchUserPicker.tsx b/frontend/src/metabase/search/components/SearchUserPicker/SearchUserPicker.tsx
index 93bb39230cd..96b585d5f65 100644
--- a/frontend/src/metabase/search/components/SearchUserPicker/SearchUserPicker.tsx
+++ b/frontend/src/metabase/search/components/SearchUserPicker/SearchUserPicker.tsx
@@ -4,23 +4,19 @@ import { without } from "underscore";
import { useListUserRecipientsQuery } from "metabase/api";
import { SearchFilterPopoverWrapper } from "metabase/search/components/SearchFilterPopoverWrapper";
-import {
- SearchUserItemContainer,
- SearchUserPickerContainer,
- SearchUserPickerContent,
- SearchUserSelectBox,
- SelectedUserButton,
- UserPickerInput,
-} from "metabase/search/components/SearchUserPicker/SearchUserPicker.styled";
import { UserListElement } from "metabase/search/components/UserListElement";
-import { Center, Icon, Text } from "metabase/ui";
+import { Center, Pill, PillsInput, Stack, Text } from "metabase/ui";
import type { UserId, UserListResult } from "metabase-types/api";
+import S from "./SearchUserPicker.module.css";
+
export const SearchUserPicker = ({
value,
+ width,
onChange,
}: {
value: UserId[];
+ width?: string;
onChange: (value: UserId[]) => void;
}) => {
const { isLoading, data } = useListUserRecipientsQuery();
@@ -40,10 +36,8 @@ export const SearchUserPicker = ({
);
});
- const removeUser = (user?: UserListResult) => {
- if (user) {
- setSelectedUserIds(without(selectedUserIds, user.id));
- }
+ const removeUser = (user: UserListResult) => {
+ setSelectedUserIds(without(selectedUserIds, user.id));
};
const addUser = (user: UserListResult) => {
@@ -58,6 +52,11 @@ export const SearchUserPicker = ({
}
};
+ const selectedUsers = selectedUserIds.flatMap((userId) => {
+ const user = users.find((user) => user.id === userId);
+ return user ? [user] : [];
+ });
+
const generateUserListElements = (userList: UserListResult[]) => {
return userList.map((user) => (
<UserListElement
@@ -74,47 +73,37 @@ export const SearchUserPicker = ({
isLoading={isLoading}
onApply={() => onChange(selectedUserIds)}
>
- <SearchUserPickerContainer p="sm" gap="xxs">
- <SearchUserSelectBox gap={0}>
- <SearchUserItemContainer
- data-testid="search-user-select-box"
- p="xxs"
- mah="30vh"
- >
- {selectedUserIds.map((userId) => {
- const user = users.find((user) => user.id === userId);
- return (
- <SelectedUserButton
- data-testid="selected-user-button"
- key={userId}
- c="core-brand"
- px="md"
- maw="100%"
- rightSection={<Icon name="close" />}
- onClick={() => removeUser(user)}
- >
- <Text ta="left" w="100%" truncate c="inherit">
- {user?.common_name}
- </Text>
- </SelectedUserButton>
- );
- })}
- <UserPickerInput
- variant="subtle"
- pl="sm"
- size="md"
+ <Stack className={S.container} w={width} p="sm" gap="xxs">
+ <PillsInput
+ data-testid="search-user-select-box"
+ classNames={{ input: S.selectBox }}
+ >
+ <Pill.Group>
+ {selectedUsers.map((user) => (
+ <Pill
+ key={user.id}
+ data-testid="selected-user-button"
+ withRemoveButton
+ removeButtonProps={{
+ "aria-label": t`Remove ${user.common_name}`,
+ "aria-hidden": false,
+ }}
+ onRemove={() => removeUser(user)}
+ >
+ {user.common_name}
+ </Pill>
+ ))}
+ <PillsInput.Field
placeholder={t`Search for someone…`}
value={userFilter}
- tabIndex={0}
onChange={(event) => setUserFilter(event.currentTarget.value)}
- mt="-0.25rem"
- miw="18ch"
/>
- </SearchUserItemContainer>
- </SearchUserSelectBox>
- <SearchUserPickerContent
+ </Pill.Group>
+ </PillsInput>
+ <Stack
+ className={S.content}
data-testid="search-user-list"
- h="100%"
+ flex="1"
gap="xxs"
p="xxs"
>
@@ -125,8 +114,8 @@ export const SearchUserPicker = ({
<Text size="md" fw={700}>{t`No results`}</Text>
</Center>
)}
- </SearchUserPickerContent>
- </SearchUserPickerContainer>
+ </Stack>
+ </Stack>
</SearchFilterPopoverWrapper>
);
};
diff --git a/frontend/src/metabase/search/components/SearchUserPicker/SearchUserPicker.unit.spec.tsx b/frontend/src/metabase/search/components/SearchUserPicker/SearchUserPicker.unit.spec.tsx
index 56efcdacf43..6f103da8c32 100644
--- a/frontend/src/metabase/search/components/SearchUserPicker/SearchUserPicker.unit.spec.tsx
+++ b/frontend/src/metabase/search/components/SearchUserPicker/SearchUserPicker.unit.spec.tsx
@@ -115,11 +115,15 @@ describe("SearchUserPicker", () => {
expect(selectBox.getByText("Alice")).toBeInTheDocument();
expect(selectBox.getByText("Bob")).toBeInTheDocument();
- await userEvent.click(selectBox.getByText("Alice"));
+ await userEvent.click(
+ selectBox.getByRole("button", { name: "Remove Alice" }),
+ );
expect(screen.getByTestId("selected-user-button")).toHaveTextContent("Bob");
expect(searchUserList.getByText("Alice")).toBeInTheDocument();
- await userEvent.click(selectBox.getByText("Bob"));
+ await userEvent.click(
+ selectBox.getByRole("button", { name: "Remove Bob" }),
+ );
// expect the two users are only in the search list now
expect(
@@ -157,9 +161,13 @@ describe("SearchUserPicker", () => {
const { mockOnChange } = await setup({
initialSelectedUsers: TEST_USERS.map((user) => user.id),
});
- const searchUserList = within(screen.getByTestId("search-user-select-box"));
- await userEvent.click(searchUserList.getByText("Alice"));
- await userEvent.click(searchUserList.getByText("Bob"));
+ const selectBox = within(screen.getByTestId("search-user-select-box"));
+ await userEvent.click(
+ selectBox.getByRole("button", { name: "Remove Alice" }),
+ );
+ await userEvent.click(
+ selectBox.getByRole("button", { name: "Remove Bob" }),
+ );
await userEvent.click(screen.getByText("Apply"));
expect(mockOnChange).toHaveBeenCalledWith([]);
diff --git a/frontend/src/metabase/search/components/SearchUserPicker/index.ts b/frontend/src/metabase/search/components/SearchUserPicker/index.ts
index ace4802c368..aebe8d8112e 100644
--- a/frontend/src/metabase/search/components/SearchUserPicker/index.ts
+++ b/frontend/src/metabase/search/components/SearchUserPicker/index.ts
@@ -1,2 +1 @@
export { SearchUserPicker } from "./SearchUserPicker";
-export * from "./SearchUserPicker.styled";
diff --git a/frontend/src/metabase/search/components/filters/CreatedByFilter/CreatedByFilter.tsx b/frontend/src/metabase/search/components/filters/CreatedByFilter/CreatedByFilter.tsx
index c3562bf568a..43f9faa4f94 100644
--- a/frontend/src/metabase/search/components/filters/CreatedByFilter/CreatedByFilter.tsx
+++ b/frontend/src/metabase/search/components/filters/CreatedByFilter/CreatedByFilter.tsx
@@ -5,10 +5,7 @@ import {
parseUserIdArray,
stringifyUserIdArray,
} from "metabase/common/search/user-search-params";
-import {
- SearchUserPicker,
- SearchUserPickerContainer,
-} from "metabase/search/components/SearchUserPicker";
+import { SearchUserPicker } from "metabase/search/components/SearchUserPicker";
import { UserNameDisplay } from "metabase/search/components/UserNameDisplay";
export const CreatedByFilter: SearchFilterDropdown<"created_by"> = {
@@ -19,9 +16,7 @@ export const CreatedByFilter: SearchFilterDropdown<"created_by"> = {
<UserNameDisplay label={CreatedByFilter.label()} userIdList={userIdList} />
),
ContentComponent: ({ value, onChange, width }) => (
- <SearchUserPickerContainer w={width}>
- <SearchUserPicker value={value} onChange={onChange} />
- </SearchUserPickerContainer>
+ <SearchUserPicker value={value} width={width} onChange={onChange} />
),
fromUrl: parseUserIdArray,
toUrl: stringifyUserIdArray,
diff --git a/frontend/src/metabase/search/components/filters/LastEditedByFilter.tsx b/frontend/src/metabase/search/components/filters/LastEditedByFilter.tsx
index c46e5b86fe7..6b366ed0241 100644
--- a/frontend/src/metabase/search/components/filters/LastEditedByFilter.tsx
+++ b/frontend/src/metabase/search/components/filters/LastEditedByFilter.tsx
@@ -3,7 +3,6 @@ import { t } from "ttag";
import { parseUserIdArray, stringifyUserIdArray } from "metabase/common/search";
import type { SearchFilterDropdown } from "metabase/common/search/types";
import { SearchUserPicker } from "metabase/search/components/SearchUserPicker/SearchUserPicker";
-import { SearchUserPickerContainer } from "metabase/search/components/SearchUserPicker/SearchUserPicker.styled";
import { UserNameDisplay } from "metabase/search/components/UserNameDisplay/UserNameDisplay";
export const LastEditedByFilter: SearchFilterDropdown<"last_edited_by"> = {
@@ -17,9 +16,7 @@ export const LastEditedByFilter: SearchFilterDropdown<"last_edited_by"> = {
/>
),
ContentComponent: ({ value, onChange, width }) => (
- <SearchUserPickerContainer w={width}>
- <SearchUserPicker value={value} onChange={onChange} />
- </SearchUserPickerContainer>
+ <SearchUserPicker value={value} width={width} onChange={onChange} />
),
fromUrl: parseUserIdArray,
toUrl: stringifyUserIdArray,