Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

fix: sort orgs alphabetically in dropdown#16583

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.

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

Already on GitHub?Sign in to your account

Merged
Kira-Pilot merged 8 commits intomainfromorg-sort/kira-pilot
Feb 19, 2025
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
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
117 changes: 116 additions & 1 deletionsite/src/modules/management/OrganizationSidebarView.stories.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
import type { Meta, StoryObj } from "@storybook/react";
import { expect, userEvent, waitFor, within } from "@storybook/test";
import type { AuthorizationResponse } from "api/typesGenerated";
import {
MockNoPermissions,
MockOrganization,
MockOrganization2,
MockPermissions,
} from "testHelpers/entities";
import { withDashboardProvider } from "testHelpers/storybook";
import { OrganizationSidebarView } from "./OrganizationSidebarView";
import {
OrganizationSidebarView,
type OrganizationWithPermissions,
} from "./OrganizationSidebarView";

const meta: Meta<typeof OrganizationSidebarView> = {
title: "modules/management/OrganizationSidebarView",
Expand DownExpand Up@@ -286,3 +290,114 @@ export const OrgsDisabled: Story = {
showOrganizations: false,
},
};

const commonPerms: AuthorizationResponse = {
editOrganization: true,
editMembers: true,
editGroups: true,
auditOrganization: true,
};

const activeOrganization: OrganizationWithPermissions = {
...MockOrganization,
display_name: "Omega org",
name: "omega",
id: "1",
permissions: {
...commonPerms,
},
};

export const OrgsSortedAlphabetically: Story = {
args: {
activeOrganization,
permissions: {
...MockPermissions,
createOrganization: true,
},
organizations: [
{
...MockOrganization,
display_name: "Zeta Org",
id: "2",
name: "zeta",
permissions: commonPerms,
},
{
...MockOrganization,
display_name: "alpha Org",
id: "3",
name: "alpha",
permissions: commonPerms,
},
activeOrganization,
],
},
play: async ({ canvasElement }) => {
const canvas = within(canvasElement);
await userEvent.click(canvas.getByRole("button", { name: /Omega org/i }));

// dropdown is not in #storybook-root so must query full document
const globalScreen = within(document.body);

await waitFor(() => {
expect(globalScreen.queryByText("alpha Org")).toBeInTheDocument();
expect(globalScreen.queryByText("Zeta Org")).toBeInTheDocument();
});

const orgElements = globalScreen.getAllByRole("option");
// filter out Create btn
const filteredElems = orgElements.slice(0, 3);

const orgNames = filteredElems.map(
// handling fuzzy matching
(el) => el.textContent?.replace(/^[A-Z]/, "").trim() || "",
);

// active name first
expect(orgNames).toEqual(["Omega org", "alpha Org", "Zeta Org"]);
},
};

export const SearchForOrg: Story = {
args: {
activeOrganization,
permissions: MockPermissions,
organizations: [
{
...MockOrganization,
display_name: "Zeta Org",
id: "2",
name: "zeta",
permissions: commonPerms,
},
{
...MockOrganization,
display_name: "alpha Org",
id: "3",
name: "fish",
permissions: commonPerms,
},
activeOrganization,
],
},
play: async ({ canvasElement }) => {
const canvas = within(canvasElement);
await userEvent.click(canvas.getByRole("button", { name: /Omega org/i }));

// dropdown is not in #storybook-root so must query full document
const globalScreen = within(document.body);
const searchInput =
await globalScreen.getByPlaceholderText("Find organization");

await userEvent.type(searchInput, "ALPHA");

const filteredResult = await globalScreen.findByText("alpha Org");
expect(filteredResult).toBeInTheDocument();

// Omega org remains visible as the default org
await waitFor(() => {
expect(globalScreen.queryByText("Zeta Org")).not.toBeInTheDocument();
});
},
};
37 changes: 23 additions & 14 deletionssite/src/modules/management/OrganizationSidebarView.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,12 @@ import { Avatar } from "components/Avatar/Avatar";
import { Button } from "components/Button/Button";
import {
Command,
CommandEmpty,
CommandGroup,
CommandInput,
CommandItem,
CommandList,
CommandSeparator,
} from "components/Command/Command";
import { Loader } from "components/Loader/Loader";
import {
Expand DownExpand Up@@ -88,11 +91,15 @@ const OrganizationsSettingsNavigation: FC<
return <Loader />;
}

// Sort organizations to put active organization first
const sortedOrganizations = [
activeOrganization,
...organizations.filter((org) => org.id !== activeOrganization.id),
];
const sortedOrganizations = [...organizations].sort((a, b) => {
// active org first
if (a.id === activeOrganization.id) return -1;
if (b.id === activeOrganization.id) return 1;

return a.display_name
.toLowerCase()
.localeCompare(b.display_name.toLowerCase());
});

const [isPopoverOpen, setIsPopoverOpen] = useState(false);
const navigate = useNavigate();
Expand DownExpand Up@@ -123,14 +130,16 @@ const OrganizationsSettingsNavigation: FC<
</PopoverTrigger>
<PopoverContent align="start" className="w-60">
<Command loop>
<CommandInput placeholder="Find organization" />
<CommandList>
<CommandEmpty>No organization found.</CommandEmpty>
<CommandGroup className="pb-2">
{sortedOrganizations.length > 1 && (
<div className="flex flex-col max-h-[260px] overflow-y-auto">
{sortedOrganizations.map((organization) => (
<CommandItem
key={organization.id}
value={organization.name}
value={`${organization.display_name} ${organization.name}`}
onSelect={() => {
setIsPopoverOpen(false);
navigate(urlForSubpage(organization.name));
Expand DownExpand Up@@ -158,11 +167,11 @@ const OrganizationsSettingsNavigation: FC<
))}
</div>
)}
{permissions.createOrganization && (
<>
{organizations.length > 1 && (
<hr className="h-px my-2 border-none bg-border -mx-2" />
)}
</CommandGroup>
{permissions.createOrganization && (
<>
{organizations.length > 1 && <CommandSeparator />}
<CommandGroup>
<CommandItem
className="flex justify-center data-[selected=true]:bg-transparent"
onSelect={() => {
Expand All@@ -174,9 +183,9 @@ const OrganizationsSettingsNavigation: FC<
>
<Plus /> Create Organization
</CommandItem>
</>
)}
</CommandGroup>
</CommandGroup>
</>
)}
</CommandList>
</Command>
</PopoverContent>
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp