Skip to content

feat(app): move policy page into settings #7107

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 3 commits into from
Oct 16, 2025
Merged

feat(app): move policy page into settings #7107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
000effc
feat(app): apply subpage layout in project settings
XiNiHa Oct 13, 2025
376589e
feat(app): apply subpage layout in org settings
XiNiHa Oct 13, 2025
59fac6f
feat(app): move policy page into settings
XiNiHa Oct 13, 2025
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
19 changes: 3 additions & 16 deletions packages/web/app/src/components/layouts/organization.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ export enum Page {
Overview = 'overview',
Members = 'members',
Settings = 'settings',
Policy = 'policy',
Support = 'support',
Subscription = 'subscription',
}
Expand All @@ -54,11 +53,9 @@ const OrganizationLayout_OrganizationFragment = graphql(`
fragment OrganizationLayout_OrganizationFragment on Organization {
id
slug
viewerCanModifySchemaPolicy
viewerCanCreateProject
viewerCanManageSupportTickets
viewerCanDescribeBilling
viewerCanAccessSettings
viewerCanSeeMembers
...ProPlanBilling_OrganizationFragment
...RateLimitWarn_OrganizationFragment
Expand Down Expand Up @@ -156,24 +153,14 @@ export function OrganizationLayout({
</Link>
</TabsTrigger>
)}
<TabsTrigger variant="menu" value={Page.Policy} asChild>
<TabsTrigger variant="menu" value={Page.Settings} asChild>
<Link
to="/$organizationSlug/view/policy"
to="/$organizationSlug/view/settings"
params={{ organizationSlug: currentOrganization.slug }}
>
Policy
Settings
</Link>
</TabsTrigger>
{currentOrganization.viewerCanAccessSettings && (
<TabsTrigger variant="menu" value={Page.Settings} asChild>
<Link
to="/$organizationSlug/view/settings"
params={{ organizationSlug: currentOrganization.slug }}
>
Settings
</Link>
</TabsTrigger>
)}
{currentOrganization.viewerCanManageSupportTickets && (
<TabsTrigger variant="menu" value={Page.Support} asChild>
<Link
Expand Down
21 changes: 3 additions & 18 deletions packages/web/app/src/components/layouts/project.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import { ProjectSelector } from './project-selector';
export enum Page {
Targets = 'targets',
Alerts = 'alerts',
Policy = 'policy',
Settings = 'settings',
}

Expand All @@ -52,7 +51,6 @@ const ProjectLayoutQuery = graphql(`
viewerCanModifySchemaPolicy
viewerCanCreateTarget
viewerCanModifyAlerts
viewerCanModifySettings
}
}
}
Expand Down Expand Up @@ -142,30 +140,17 @@ export function ProjectLayout({
</Link>
</TabsTrigger>
)}
<TabsTrigger variant="menu" value={Page.Policy} asChild>
<TabsTrigger variant="menu" value={Page.Settings} asChild>
<Link
to="/$organizationSlug/$projectSlug/view/policy"
to="/$organizationSlug/$projectSlug/view/settings"
params={{
organizationSlug: props.organizationSlug,
projectSlug: props.projectSlug,
}}
>
Policy
Settings
</Link>
</TabsTrigger>
{currentProject.viewerCanModifySettings && (
<TabsTrigger variant="menu" value={Page.Settings} asChild>
<Link
to="/$organizationSlug/$projectSlug/view/settings"
params={{
organizationSlug: props.organizationSlug,
projectSlug: props.projectSlug,
}}
>
Settings
</Link>
</TabsTrigger>
)}
</TabsList>
</Tabs>
) : (
Expand Down
21 changes: 10 additions & 11 deletions packages/web/app/src/components/project/settings/composition.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { useState } from 'react';
import { useMutation, useQuery } from 'urql';
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
import { CardDescription } from '@/components/ui/card';
import { CheckIcon } from '@/components/ui/icon';
import { SubPageLayout, SubPageLayoutHeader } from '@/components/ui/page-content-layout';
import { Spinner } from '@/components/ui/spinner';
import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
import { FragmentType, graphql, useFragment } from '@/gql';
Expand Down Expand Up @@ -90,14 +91,12 @@ export const CompositionSettings = (props: {
};

return (
<Card>
<CardHeader>
<CardTitle>
<a id="composition">Schema Composition</a>
</CardTitle>
<CardDescription>Configure how your schemas are composed.</CardDescription>
</CardHeader>
<CardContent>
<SubPageLayout>
<SubPageLayoutHeader
subPageTitle={<a id="composition">Schema Composition</a>}
description={<CardDescription>Configure how your schemas are composed.</CardDescription>}
/>
<div>
{projectQuery.fetching ? (
<Spinner />
) : (
Expand Down Expand Up @@ -149,7 +148,7 @@ export const CompositionSettings = (props: {
</TabsContent>
</Tabs>
)}
</CardContent>
</Card>
</div>
</SubPageLayout>
);
};
178 changes: 0 additions & 178 deletions packages/web/app/src/pages/organization-policy.tsx
View file
Open in desktop

This file was deleted.

Loading
Loading