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

feat: add user filter to templates page to filter by template author#19561

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
rafrdz merged 10 commits intomainfromrafrdz/template-author
Aug 28, 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
2 changes: 2 additions & 0 deletionssite/src/components/Filter/UserFilter.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@ import { useAuthenticated } from "hooks";
import type { FC } from "react";
import { type UseFilterMenuOptions, useFilterMenu } from "./menu";

export const DEFAULT_USER_FILTER_WIDTH = 175;

export const useUserFilterMenu = ({
value,
onChange,
Expand Down
9 changes: 6 additions & 3 deletionssite/src/pages/AuditPage/AuditFilter.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,11 @@ import {
SelectFilter,
type SelectFilterOption,
} from "components/Filter/SelectFilter";
import { type UserFilterMenu, UserMenu } from "components/Filter/UserFilter";
import {
DEFAULT_USER_FILTER_WIDTH,
type UserFilterMenu,
UserMenu,
} from "components/Filter/UserFilter";
import capitalize from "lodash/capitalize";
import {
type OrganizationsFilterMenu,
Expand DownExpand Up@@ -47,8 +51,7 @@ interface AuditFilterProps {
}

export const AuditFilter: FC<AuditFilterProps> = ({ filter, error, menus }) => {
const width = menus.organization ? 175 : undefined;

const width = menus.organization ? DEFAULT_USER_FILTER_WIDTH : undefined;
return (
<Filter
learnMoreLink={docs("/admin/security/audit-logs#filtering-logs")}
Expand Down
9 changes: 6 additions & 3 deletionssite/src/pages/ConnectionLogPage/ConnectionLogFilter.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,11 @@ import {
SelectFilter,
type SelectFilterOption,
} from "components/Filter/SelectFilter";
import { type UserFilterMenu, UserMenu } from "components/Filter/UserFilter";
import {
DEFAULT_USER_FILTER_WIDTH,
type UserFilterMenu,
UserMenu,
} from "components/Filter/UserFilter";
import capitalize from "lodash/capitalize";
import {
type OrganizationsFilterMenu,
Expand DownExpand Up@@ -42,8 +46,7 @@ export const ConnectionLogFilter: FC<ConnectionLogFilterProps> = ({
error,
menus,
}) => {
const width = menus.organization ? 175 : undefined;

const width = menus.organization ? DEFAULT_USER_FILTER_WIDTH : undefined;
return (
<Filter
learnMoreLink={docs(
Expand Down
43 changes: 33 additions & 10 deletionssite/src/pages/TemplatesPage/TemplatesFilter.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,38 @@
import { API } from "api/api";
import type { Organization } from "api/typesGenerated";
import { Avatar } from "components/Avatar/Avatar";
import { Filter, MenuSkeleton, type useFilter } from "components/Filter/Filter";
import {
Filter,
MenuSkeleton,
type UseFilterResult,
} from "components/Filter/Filter";
import { useFilterMenu } from "components/Filter/menu";
import {
SelectFilter,
type SelectFilterOption,
} from "components/Filter/SelectFilter";
import { useDashboard } from "modules/dashboard/useDashboard";
import type { FC } from "react";
import {
DEFAULT_USER_FILTER_WIDTH,
type UserFilterMenu,
UserMenu,
} from "../../components/Filter/UserFilter";

interface TemplatesFilterProps {
filter:ReturnType<typeof useFilter>;
filter:UseFilterResult;
Copy link
Member

Choose a reason for hiding this comment

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

Much better. Thank you!

rafrdz reacted with hooray emoji
error?: unknown;

userMenu?: UserFilterMenu;
}

export const TemplatesFilter: FC<TemplatesFilterProps> = ({
filter,
error,
userMenu,
}) => {
const { showOrganizations } = useDashboard();
const width = showOrganizations ? DEFAULT_USER_FILTER_WIDTH : undefined;
const organizationMenu = useFilterMenu({
onChange: (option) =>
filter.update({ ...filter.values, organization: option?.value }),
Expand DownExpand Up@@ -50,15 +65,23 @@ export const TemplatesFilter: FC<TemplatesFilterProps> = ({
filter={filter}
error={error}
options={
<SelectFilter
placeholder="All organizations"
label="Select an organization"
options={organizationMenu.searchOptions}
selectedOption={organizationMenu.selectedOption ?? undefined}
onSelect={organizationMenu.selectOption}
/>
<>
{userMenu && <UserMenu width={width} menu={userMenu} />}
<SelectFilter
placeholder="All organizations"
label="Select an organization"
options={organizationMenu.searchOptions}
selectedOption={organizationMenu.selectedOption ?? undefined}
onSelect={organizationMenu.selectOption}
/>
</>
}
optionsSkeleton={
<>
{userMenu && <MenuSkeleton />}
<MenuSkeleton />
</>
}
optionsSkeleton={<MenuSkeleton />}
/>
);
};
Expand Down
50 changes: 44 additions & 6 deletionssite/src/pages/TemplatesPage/TemplatesPage.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import { workspacePermissionsByOrganization } from "api/queries/organizations";
import { templateExamples, templates } from "api/queries/templates";
import { useFilter } from "components/Filter/Filter";
import { type UseFilterResult, useFilter } from "components/Filter/Filter";
import { useUserFilterMenu } from "components/Filter/UserFilter";
import { useAuthenticated } from "hooks";
import { useDashboard } from "modules/dashboard/useDashboard";
import type { FC } from "react";
Expand All@@ -15,14 +16,12 @@ const TemplatesPage: FC = () => {
const { showOrganizations } = useDashboard();

const [searchParams, setSearchParams] = useSearchParams();
const filter = useFilter({
fallbackFilter: "deprecated:false",
const filterState = useTemplatesFilter({
searchParams,
onSearchParamsChange: setSearchParams,
onUpdate: () => {}, // reset pagination
});

const templatesQuery = useQuery(templates({ q: filter.query }));
const templatesQuery = useQuery(templates({ q:filterState.filter.query }));
const examplesQuery = useQuery({
...templateExamples(),
enabled: permissions.createTemplates,
Expand All@@ -47,7 +46,7 @@ const TemplatesPage: FC = () => {
</Helmet>
<TemplatesPageView
error={error}
filter={filter}
filterState={filterState}
showOrganizations={showOrganizations}
canCreateTemplates={permissions.createTemplates}
examples={examplesQuery.data}
Expand All@@ -59,3 +58,42 @@ const TemplatesPage: FC = () => {
};

export default TemplatesPage;

export type TemplateFilterState = {
filter: UseFilterResult;
menus: {
user?: ReturnType<typeof useUserFilterMenu>;
};
};

type UseTemplatesFilterOptions = {
searchParams: URLSearchParams;
onSearchParamsChange: (params: URLSearchParams) => void;
};

const useTemplatesFilter = ({
searchParams,
onSearchParamsChange,
}: UseTemplatesFilterOptions): TemplateFilterState => {
const filter = useFilter({
fallbackFilter: "deprecated:false",
searchParams,
onSearchParamsChange,
});

const { permissions } = useAuthenticated();
const canFilterByUser = permissions.viewAllUsers;
const userMenu = useUserFilterMenu({
value: filter.values.author,
onChange: (option) =>
filter.update({ ...filter.values, author: option?.value }),
enabled: canFilterByUser,
});

return {
filter,
menus: {
user: canFilterByUser ? userMenu : undefined,
},
};
};
55 changes: 43 additions & 12 deletionssite/src/pages/TemplatesPage/TemplatesPageView.stories.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,24 +3,35 @@ import {
MockTemplate,
MockTemplateExample,
MockTemplateExample2,
MockUserOwner,
mockApiError,
} from "testHelpers/entities";
import { withDashboardProvider } from "testHelpers/storybook";
import type { Meta, StoryObj } from "@storybook/react-vite";
import { getDefaultFilterProps } from "components/Filter/storyHelpers";
import {
getDefaultFilterProps,
MockMenu,
} from "components/Filter/storyHelpers";
import type { TemplateFilterState } from "./TemplatesPage";
import { TemplatesPageView } from "./TemplatesPageView";

const defaultFilterProps = getDefaultFilterProps<TemplateFilterState>({
query: "deprecated:false",
menus: {
organizations: MockMenu,
},
values: {
author: MockUserOwner.username,
},
});

const meta: Meta<typeof TemplatesPageView> = {
title: "pages/TemplatesPage",
decorators: [withDashboardProvider],
parameters: { chromatic: chromaticWithTablet },
component: TemplatesPageView,
args: {
...getDefaultFilterProps({
query: "deprecated:false",
menus: {},
values: {},
}),
filterState: defaultFilterProps,
},
};

Expand DownExpand Up@@ -104,12 +115,32 @@ export const WithFilteredAllTemplates: Story = {
args: {
...WithTemplates.args,
templates: [],
...getDefaultFilterProps({
query: "deprecated:false searchnotfound",
menus: {},
values: {},
used: true,
}),
filterState: {
filter: {
...defaultFilterProps.filter,
query: "deprecated:false searchnotfound",
values: {},
used: true,
},
menus: defaultFilterProps.menus,
},
},
};

export const WithUserDropdown: Story = {
args: {
...WithTemplates.args,
filterState: {
...defaultFilterProps,
menus: {
user: MockMenu,
},
filter: {
...defaultFilterProps.filter,
query: "author:me",
values: { author: "me" },
},
},
},
};

Expand Down
14 changes: 9 additions & 5 deletionssite/src/pages/TemplatesPage/TemplatesPageView.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@ import { AvatarData } from "components/Avatar/AvatarData";
import { AvatarDataSkeleton } from "components/Avatar/AvatarDataSkeleton";
import { DeprecatedBadge } from "components/Badges/Badges";
import { Button } from "components/Button/Button";
import type { useFilter } from "components/Filter/Filter";
import {
HelpTooltip,
HelpTooltipContent,
Expand DownExpand Up@@ -52,6 +51,7 @@ import {
} from "utils/templates";
import { EmptyTemplates } from "./EmptyTemplates";
import { TemplatesFilter } from "./TemplatesFilter";
import type { TemplateFilterState } from "./TemplatesPage";

const Language = {
developerCount: (activeCount: number): string => {
Expand DownExpand Up@@ -184,7 +184,7 @@ const TemplateRow: FC<TemplateRowProps> = ({

interface TemplatesPageViewProps {
error?: unknown;
filter: ReturnType<typeof useFilter>;
filterState: TemplateFilterState;
showOrganizations: boolean;
canCreateTemplates: boolean;
examples: TemplateExample[] | undefined;
Expand All@@ -194,7 +194,7 @@ interface TemplatesPageViewProps {

export const TemplatesPageView: FC<TemplatesPageViewProps> = ({
error,
filter,
filterState,
showOrganizations,
canCreateTemplates,
examples,
Expand DownExpand Up@@ -229,7 +229,11 @@ export const TemplatesPageView: FC<TemplatesPageViewProps> = ({
</PageHeaderSubtitle>
</PageHeader>

<TemplatesFilter filter={filter} error={error} />
<TemplatesFilter
filter={filterState.filter}
error={error}
userMenu={filterState.menus.user}
/>
{/* Validation errors are shown on the filter, other errors are an alert box. */}
{hasError(error) && !isApiValidationError(error) && (
<ErrorAlert error={error} />
Expand All@@ -256,7 +260,7 @@ export const TemplatesPageView: FC<TemplatesPageViewProps> = ({
<EmptyTemplates
canCreateTemplates={canCreateTemplates}
examples={examples ?? []}
isUsingFilter={filter.used}
isUsingFilter={filterState.filter.used}
/>
) : (
templates?.map((template) => (
Expand Down
8 changes: 6 additions & 2 deletionssite/src/pages/WorkspacesPage/filter/WorkspacesFilter.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,11 @@ import {
MenuSkeleton,
type UseFilterResult,
} from "components/Filter/Filter";
import { type UserFilterMenu, UserMenu } from "components/Filter/UserFilter";
import {
DEFAULT_USER_FILTER_WIDTH,
type UserFilterMenu,
UserMenu,
} from "components/Filter/UserFilter";
import { useDashboard } from "modules/dashboard/useDashboard";
import {
type OrganizationsFilterMenu,
Expand DownExpand Up@@ -96,7 +100,7 @@ export const WorkspacesFilter: FC<WorkspaceFilterProps> = ({
organizationsMenu,
}) => {
const { entitlements, showOrganizations } = useDashboard();
const width = showOrganizations ?175 : undefined;
const width = showOrganizations ?DEFAULT_USER_FILTER_WIDTH : undefined;
const presets = entitlements.features.advanced_template_scheduling.enabled
? PRESETS_WITH_DORMANT
: PRESET_FILTERS;
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp