diff --git a/packages/web/app/src/components/layouts/organization-selectors.tsx b/packages/web/app/src/components/layouts/organization-selectors.tsx new file mode 100644 index 000000000..9603d6159 --- /dev/null +++ b/packages/web/app/src/components/layouts/organization-selectors.tsx @@ -0,0 +1,57 @@ +import { Select, SelectContent, SelectItem, SelectTrigger } from '@/components/ui/select'; +import { FragmentType, graphql, useFragment } from '@/gql'; +import { useRouter } from '@tanstack/react-router'; + +const OrganizationSelector_OrganizationConnectionFragment = graphql(` + fragment OrganizationSelector_OrganizationConnectionFragment on OrganizationConnection { + nodes { + id + name + cleanId + } + } +`); + +export function OrganizationSelector(props: { + currentOrganizationCleanId: string; + organizations: FragmentType | null; +}) { + const router = useRouter(); + const organizations = useFragment( + OrganizationSelector_OrganizationConnectionFragment, + props.organizations, + )?.nodes; + + const currentOrganization = organizations?.find( + node => node.cleanId === props.currentOrganizationCleanId, + ); + + return organizations ? ( + + ) : ( +
+ ); +} diff --git a/packages/web/app/src/components/layouts/organization.tsx b/packages/web/app/src/components/layouts/organization.tsx index b134ab350..d364a7e9e 100644 --- a/packages/web/app/src/components/layouts/organization.tsx +++ b/packages/web/app/src/components/layouts/organization.tsx @@ -1,12 +1,12 @@ import { ReactElement, ReactNode } from 'react'; +import { useQuery } from 'urql'; import { Button } from '@/components/ui/button'; -import { Select, SelectContent, SelectItem, SelectTrigger } from '@/components/ui/select'; import { UserMenu } from '@/components/ui/user-menu'; import { HiveLink, Tabs } from '@/components/v2'; import { PlusIcon } from '@/components/v2/icon'; import { CreateProjectModal } from '@/components/v2/modals'; import { env } from '@/env/frontend'; -import { FragmentType, graphql, useFragment } from '@/gql'; +import { graphql, useFragment } from '@/gql'; import { canAccessOrganization, OrganizationAccessScope, @@ -15,9 +15,11 @@ import { import { getIsStripeEnabled } from '@/lib/billing/stripe-public-key'; import { useToggle } from '@/lib/hooks'; import { useLastVisitedOrganizationWriter } from '@/lib/last-visited-org'; -import { Link, useRouter } from '@tanstack/react-router'; +import { Link } from '@tanstack/react-router'; import { ProPlanBilling } from '../organization/billing/ProPlanBillingWarm'; import { RateLimitWarn } from '../organization/billing/RateLimitWarn'; +import { QueryError } from '../ui/query-error'; +import { OrganizationSelector } from './organization-selectors'; export enum Page { Overview = 'overview', @@ -28,35 +30,31 @@ export enum Page { Subscription = 'subscription', } -const OrganizationLayout_CurrentOrganizationFragment = graphql(` - fragment OrganizationLayout_CurrentOrganizationFragment on Organization { +export const OrganizationLayout_OrganizationFragment = graphql(` + fragment OrganizationLayout_OrganizationFragment on Organization { id - name cleanId me { ...CanAccessOrganization_MemberFragment } ...ProPlanBilling_OrganizationFragment ...RateLimitWarn_OrganizationFragment - ...UserMenu_CurrentOrganizationFragment } `); -const OrganizationLayout_MeFragment = graphql(` - fragment OrganizationLayout_MeFragment on User { - id - ...UserMenu_MeFragment - } -`); - -const OrganizationLayout_OrganizationConnectionFragment = graphql(` - fragment OrganizationLayout_OrganizationConnectionFragment on OrganizationConnection { - nodes { +const OrganizationLayoutQuery = graphql(` + query OrganizationLayoutQuery { + me { id - cleanId - name + ...UserMenu_MeFragment + } + organizations { + ...OrganizationSelector_OrganizationConnectionFragment + ...UserMenu_OrganizationConnectionFragment + nodes { + ...OrganizationLayout_OrganizationFragment + } } - ...UserMenu_OrganizationConnectionFragment } `); @@ -68,19 +66,20 @@ export function OrganizationLayout({ }: { page?: Page; className?: string; - me: FragmentType | null; organizationId: string; - currentOrganization: FragmentType | null; - organizations: FragmentType | null; children: ReactNode; }): ReactElement | null { - const router = useRouter(); const [isModalOpen, toggleModalOpen] = useToggle(); + const [query] = useQuery({ + query: OrganizationLayoutQuery, + requestPolicy: 'cache-first', + }); - const currentOrganization = useFragment( - OrganizationLayout_CurrentOrganizationFragment, - props.currentOrganization, + const organizations = useFragment( + OrganizationLayout_OrganizationFragment, + query.data?.organizations.nodes, ); + const currentOrganization = organizations?.find(org => org.cleanId === props.organizationId); useOrganizationAccess({ member: currentOrganization?.me ?? null, @@ -92,12 +91,10 @@ export function OrganizationLayout({ useLastVisitedOrganizationWriter(currentOrganization?.cleanId); const meInCurrentOrg = currentOrganization?.me; - const me = useFragment(OrganizationLayout_MeFragment, props.me); - const organizationConnection = useFragment( - OrganizationLayout_OrganizationConnectionFragment, - props.organizations, - ); - const organizations = organizationConnection?.nodes; + + if (query.error) { + return ; + } return ( <> @@ -105,40 +102,16 @@ export function OrganizationLayout({
- {currentOrganization && organizations ? ( - - ) : ( -
- )} +
diff --git a/packages/web/app/src/components/layouts/project-selector.tsx b/packages/web/app/src/components/layouts/project-selector.tsx new file mode 100644 index 000000000..9cd616be4 --- /dev/null +++ b/packages/web/app/src/components/layouts/project-selector.tsx @@ -0,0 +1,86 @@ +import { Select, SelectContent, SelectItem, SelectTrigger } from '@/components/ui/select'; +import { FragmentType, graphql, useFragment } from '@/gql'; +import { Link, useRouter } from '@tanstack/react-router'; + +const ProjectSelector_OrganizationConnectionFragment = graphql(` + fragment ProjectSelector_OrganizationConnectionFragment on OrganizationConnection { + nodes { + id + name + cleanId + projects { + nodes { + id + name + cleanId + } + } + } + } +`); + +export function ProjectSelector(props: { + currentOrganizationCleanId: string; + currentProjectCleanId: string; + organizations: FragmentType | null; +}) { + const router = useRouter(); + + const organizations = useFragment( + ProjectSelector_OrganizationConnectionFragment, + props.organizations, + )?.nodes; + + const currentOrganization = organizations?.find( + node => node.cleanId === props.currentOrganizationCleanId, + ); + + const projects = currentOrganization?.projects.nodes; + const currentProject = projects?.find(node => node.cleanId === props.currentProjectCleanId); + + return ( + <> + {currentOrganization ? ( + + {currentOrganization.name} + + ) : ( +
+ )} + {projects?.length && currentProject ? ( + <> +
/
+ + + ) : ( +
+ )} + + ); +} diff --git a/packages/web/app/src/components/layouts/project.tsx b/packages/web/app/src/components/layouts/project.tsx index 1a7c26871..78f7e40f9 100644 --- a/packages/web/app/src/components/layouts/project.tsx +++ b/packages/web/app/src/components/layouts/project.tsx @@ -1,16 +1,17 @@ import { ReactElement, ReactNode } from 'react'; +import { useQuery } from 'urql'; import { Button } from '@/components/ui/button'; -import { Select, SelectContent, SelectItem, SelectTrigger } from '@/components/ui/select'; import { UserMenu } from '@/components/ui/user-menu'; import { HiveLink, Tabs } from '@/components/v2'; import { PlusIcon } from '@/components/v2/icon'; import { CreateTargetModal } from '@/components/v2/modals'; -import { FragmentType, graphql, useFragment } from '@/gql'; +import { graphql } from '@/gql'; import { canAccessProject, ProjectAccessScope, useProjectAccess } from '@/lib/access/project'; import { useToggle } from '@/lib/hooks'; import { useLastVisitedOrganizationWriter } from '@/lib/last-visited-org'; -import { Link, useRouter } from '@tanstack/react-router'; +import { Link } from '@tanstack/react-router'; import { ProjectMigrationToast } from '../project/migration-toast'; +import { ProjectSelector } from './project-selector'; export enum Page { Targets = 'targets', @@ -19,54 +20,32 @@ export enum Page { Settings = 'settings', } -const ProjectLayout_CurrentOrganizationFragment = graphql(` - fragment ProjectLayout_CurrentOrganizationFragment on Organization { - id - name - cleanId +const ProjectLayoutQuery = graphql(` + query ProjectLayoutQuery { me { - ...CanAccessProject_MemberFragment - } - ...UserMenu_CurrentOrganizationFragment - projects { - ...ProjectLayout_ProjectConnectionFragment - } - } -`); - -const ProjectLayout_MeFragment = graphql(` - fragment ProjectLayout_MeFragment on User { - id - ...UserMenu_MeFragment - } -`); - -const ProjectLayout_OrganizationConnectionFragment = graphql(` - fragment ProjectLayout_OrganizationConnectionFragment on OrganizationConnection { - nodes { id - cleanId - name + ...UserMenu_MeFragment } - ...UserMenu_OrganizationConnectionFragment - } -`); - -const ProjectLayout_CurrentProjectFragment = graphql(` - fragment ProjectLayout_CurrentProjectFragment on Project { - id - cleanId - name - registryModel - } -`); - -const ProjectLayout_ProjectConnectionFragment = graphql(` - fragment ProjectLayout_ProjectConnectionFragment on ProjectConnection { - nodes { - id - cleanId - name + organizations { + nodes { + id + cleanId + name + me { + id + ...CanAccessProject_MemberFragment + } + projects { + nodes { + id + cleanId + name + registryModel + } + } + } + ...ProjectSelector_OrganizationConnectionFragment + ...UserMenu_OrganizationConnectionFragment } } `); @@ -81,20 +60,21 @@ export function ProjectLayout({ organizationId: string; projectId: string; className?: string; - me: FragmentType | null; - currentOrganization: FragmentType | null; - currentProject: FragmentType | null; - organizations: FragmentType | null; children: ReactNode; }): ReactElement | null { - const router = useRouter(); const [isModalOpen, toggleModalOpen] = useToggle(); + const [query] = useQuery({ + query: ProjectLayoutQuery, + requestPolicy: 'cache-first', + }); - const currentOrganization = useFragment( - ProjectLayout_CurrentOrganizationFragment, - props.currentOrganization, + const me = query.data?.me; + const currentOrganization = query.data?.organizations.nodes.find( + node => node.cleanId === props.organizationId, + ); + const currentProject = currentOrganization?.projects.nodes.find( + node => node.cleanId === props.projectId, ); - const currentProject = useFragment(ProjectLayout_CurrentProjectFragment, props.currentProject); useProjectAccess({ scope: ProjectAccessScope.Read, @@ -106,70 +86,23 @@ export function ProjectLayout({ useLastVisitedOrganizationWriter(currentOrganization?.cleanId); - const me = useFragment(ProjectLayout_MeFragment, props.me); - const organizationConnection = useFragment( - ProjectLayout_OrganizationConnectionFragment, - props.organizations, - ); - const projectConnection = useFragment( - ProjectLayout_ProjectConnectionFragment, - currentOrganization?.projects ?? null, - ); - const projects = projectConnection?.nodes; - return ( <>
- {currentOrganization ? ( - - {currentOrganization.name} - - ) : ( -
- )} - {projects?.length && currentProject ? ( - <> -
/
- - - ) : ( -
- )} +
diff --git a/packages/web/app/src/components/layouts/target-selector.tsx b/packages/web/app/src/components/layouts/target-selector.tsx new file mode 100644 index 000000000..0b6273fd3 --- /dev/null +++ b/packages/web/app/src/components/layouts/target-selector.tsx @@ -0,0 +1,123 @@ +import { Select, SelectContent, SelectItem, SelectTrigger } from '@/components/ui/select'; +import { FragmentType, graphql, useFragment } from '@/gql'; +import { Link, useRouter } from '@tanstack/react-router'; + +const TargetSelector_OrganizationConnectionFragment = graphql(` + fragment TargetSelector_OrganizationConnectionFragment on OrganizationConnection { + nodes { + id + name + cleanId + projects { + nodes { + id + name + cleanId + targets { + nodes { + id + name + cleanId + } + } + } + } + } + } +`); + +export function TargetSelector(props: { + currentOrganizationCleanId: string; + currentProjectCleanId: string; + currentTargetCleanId: string; + organizations: FragmentType | null; +}) { + const router = useRouter(); + + const organizations = useFragment( + TargetSelector_OrganizationConnectionFragment, + props.organizations, + )?.nodes; + + const currentOrganization = organizations?.find( + node => node.cleanId === props.currentOrganizationCleanId, + ); + + const projects = currentOrganization?.projects.nodes; + const currentProject = projects?.find(node => node.cleanId === props.currentProjectCleanId); + + const targets = currentProject?.targets.nodes; + const currentTarget = targets?.find(node => node.cleanId === props.currentTargetCleanId); + + console.log({ + organizations, + props, + currentOrganization, + currentProject, + currentTarget, + }); + + return ( + <> + {currentOrganization ? ( + + {currentOrganization.name} + + ) : ( +
+ )} +
/
+ {currentOrganization && currentProject ? ( + + {currentProject.name} + + ) : ( +
+ )} +
/
+ {targets?.length && currentOrganization && currentProject && currentTarget ? ( + <> + + + ) : ( +
+ )} + + ); +} diff --git a/packages/web/app/src/components/layouts/target.tsx b/packages/web/app/src/components/layouts/target.tsx index 1fc93347f..b903e3646 100644 --- a/packages/web/app/src/components/layouts/target.tsx +++ b/packages/web/app/src/components/layouts/target.tsx @@ -1,17 +1,18 @@ import { ReactElement, ReactNode } from 'react'; import { LinkIcon } from 'lucide-react'; +import { useQuery } from 'urql'; import { Button } from '@/components/ui/button'; -import { Select, SelectContent, SelectItem, SelectTrigger } from '@/components/ui/select'; import { UserMenu } from '@/components/ui/user-menu'; import { HiveLink, Tabs } from '@/components/v2'; import { ConnectSchemaModal } from '@/components/v2/modals'; -import { FragmentType, graphql, useFragment } from '@/gql'; +import { graphql } from '@/gql'; import { canAccessTarget, TargetAccessScope, useTargetAccess } from '@/lib/access/target'; import { useToggle } from '@/lib/hooks'; import { useLastVisitedOrganizationWriter } from '@/lib/last-visited-org'; import { cn } from '@/lib/utils'; -import { Link, useRouter } from '@tanstack/react-router'; +import { Link } from '@tanstack/react-router'; import { ProjectMigrationToast } from '../project/migration-toast'; +import { TargetSelector } from './target-selector'; export enum Page { Schema = 'schema', @@ -23,64 +24,40 @@ export enum Page { Settings = 'settings', } -const TargetLayout_CurrentOrganizationFragment = graphql(` - fragment TargetLayout_CurrentOrganizationFragment on Organization { - id - name - cleanId +const TargetLayoutQuery = graphql(` + query TargetLayoutQuery { me { id - ...CanAccessTarget_MemberFragment + ...UserMenu_MeFragment } - ...UserMenu_CurrentOrganizationFragment - projects { - ...ProjectLayout_ProjectConnectionFragment + organizations { + nodes { + id + cleanId + name + me { + id + ...CanAccessTarget_MemberFragment + } + projects { + nodes { + id + cleanId + name + registryModel + targets { + nodes { + id + cleanId + name + } + } + } + } + } + ...TargetSelector_OrganizationConnectionFragment + ...UserMenu_OrganizationConnectionFragment } - } -`); - -const TargetLayout_MeFragment = graphql(` - fragment TargetLayout_MeFragment on User { - id - ...UserMenu_MeFragment - } -`); - -const TargetLayout_OrganizationConnectionFragment = graphql(` - fragment TargetLayout_OrganizationConnectionFragment on OrganizationConnection { - nodes { - id - cleanId - name - } - ...UserMenu_OrganizationConnectionFragment - } -`); - -const TargetLayout_CurrentProjectFragment = graphql(` - fragment TargetLayout_CurrentProjectFragment on Project { - id - cleanId - name - registryModel - targets { - ...TargetLayout_TargetConnectionFragment - } - } -`); - -const TargetLayout_TargetConnectionFragment = graphql(` - fragment TargetLayout_TargetConnectionFragment on TargetConnection { - total - nodes { - cleanId - name - } - } -`); - -const TargetLayout_IsCDNEnabledFragment = graphql(` - fragment TargetLayout_IsCDNEnabledFragment on Query { isCDNEnabled } `); @@ -99,35 +76,24 @@ export const TargetLayout = ({ className?: string; children: ReactNode; connect?: ReactNode; - me: FragmentType | null; - currentOrganization: FragmentType | null; - currentProject: FragmentType | null; - organizations: FragmentType | null; - isCDNEnabled: FragmentType | null; }): ReactElement | null => { - const router = useRouter(); const [isModalOpen, toggleModalOpen] = useToggle(); + const [query] = useQuery({ + query: TargetLayoutQuery, + requestPolicy: 'cache-first', + }); const { organizationId: orgId, projectId } = props; - const currentOrganization = useFragment( - TargetLayout_CurrentOrganizationFragment, - props.currentOrganization, + const me = query.data?.me; + const currentOrganization = query.data?.organizations.nodes.find( + node => node.cleanId === props.organizationId, ); - const currentProject = useFragment(TargetLayout_CurrentProjectFragment, props.currentProject); - - const me = useFragment(TargetLayout_MeFragment, props.me); - const organizationConnection = useFragment( - TargetLayout_OrganizationConnectionFragment, - props.organizations, + const currentProject = currentOrganization?.projects.nodes.find( + node => node.cleanId === props.projectId, ); - const targetConnection = useFragment( - TargetLayout_TargetConnectionFragment, - currentProject?.targets, - ); - const targets = targetConnection?.nodes; - const currentTarget = targets?.find(target => target.cleanId === props.targetId); - const isCDNEnabled = useFragment(TargetLayout_IsCDNEnabledFragment, props.isCDNEnabled); + const currentTarget = currentProject?.targets.nodes.find(node => node.cleanId === props.targetId); + const isCDNEnabled = query.data?.isCDNEnabled === true; useTargetAccess({ scope: TargetAccessScope.Read, @@ -155,71 +121,18 @@ export const TargetLayout = ({
- {currentOrganization ? ( - - {currentOrganization.name} - - ) : ( -
- )} -
/
- {currentOrganization && currentProject ? ( - - {currentProject.name} - - ) : ( -
- )} -
/
- {targets?.length && currentOrganization && currentProject && currentTarget ? ( - <> - - - ) : ( -
- )} +
@@ -240,9 +153,9 @@ export const TargetLayout = ({ Schema @@ -252,9 +165,9 @@ export const TargetLayout = ({ Checks @@ -264,9 +177,9 @@ export const TargetLayout = ({ Explorer @@ -288,9 +201,9 @@ export const TargetLayout = ({ Insights @@ -300,9 +213,9 @@ export const TargetLayout = ({ Laboratory @@ -315,9 +228,9 @@ export const TargetLayout = ({ Settings @@ -336,7 +249,7 @@ export const TargetLayout = ({ {currentTarget ? ( connect != null ? ( connect - ) : isCDNEnabled?.isCDNEnabled ? ( + ) : isCDNEnabled ? ( <> -
+ {currentOrganization ? ( +
+ +
+ ) : null}
- + {currentOrganization && billingPlans ? ( + + ) : null}
diff --git a/packages/web/app/src/pages/organization-subscription.tsx b/packages/web/app/src/pages/organization-subscription.tsx index fc078acdf..abba75645 100644 --- a/packages/web/app/src/pages/organization-subscription.tsx +++ b/packages/web/app/src/pages/organization-subscription.tsx @@ -32,6 +32,8 @@ const numberFormatter = Intl.NumberFormat('en-US'); const SubscriptionPage_OrganizationFragment = graphql(` fragment SubscriptionPage_OrganizationFragment on Organization { + id + cleanId me { ...CanAccessOrganization_MemberFragment } @@ -65,17 +67,10 @@ const SubscriptionPageQuery = graphql(` organization(selector: $selector) { organization { cleanId - ...OrganizationLayout_CurrentOrganizationFragment ...SubscriptionPage_OrganizationFragment } } ...SubscriptionPage_QueryFragment - organizations { - ...OrganizationLayout_OrganizationConnectionFragment - } - me { - ...OrganizationLayout_MeFragment - } monthlyUsage(selector: $selector) { date total @@ -93,9 +88,7 @@ function SubscriptionPageContent(props: { organizationId: string }) { }, }); - const me = query.data?.me; const currentOrganization = query.data?.organization?.organization; - const organizationConnection = query.data?.organizations; const organization = useFragment(SubscriptionPage_OrganizationFragment, currentOrganization); const queryForBilling = useFragment(SubscriptionPage_QueryFragment, query.data); @@ -121,7 +114,7 @@ function SubscriptionPageContent(props: { organizationId: string }) { return null; } - if (!currentOrganization || !me || !organizationConnection || !organization || !queryForBilling) { + if (!currentOrganization || !organization || !queryForBilling) { return null; } @@ -138,9 +131,6 @@ function SubscriptionPageContent(props: { organizationId: string }) { page={Page.Subscription} organizationId={props.organizationId} className="flex flex-col gap-y-10" - currentOrganization={currentOrganization} - organizations={organizationConnection} - me={me} >
diff --git a/packages/web/app/src/pages/organization-support-ticket.tsx b/packages/web/app/src/pages/organization-support-ticket.tsx index 2cda2c10d..fc1ab651f 100644 --- a/packages/web/app/src/pages/organization-support-ticket.tsx +++ b/packages/web/app/src/pages/organization-support-ticket.tsx @@ -271,6 +271,7 @@ function SupportTicket(props: { const SupportTicket_OrganizationFragment = graphql(` fragment SupportTicket_OrganizationFragment on Organization { + id cleanId name me { @@ -284,19 +285,12 @@ const SupportTicketPageQuery = graphql(` query SupportTicketPageQuery($selector: OrganizationSelectorInput!, $ticketId: ID!) { organization(selector: $selector) { organization { - ...OrganizationLayout_CurrentOrganizationFragment ...SupportTicket_OrganizationFragment supportTicket(id: $ticketId) { ...SupportTicket_SupportTicketFragment } } } - organizations { - ...OrganizationLayout_OrganizationConnectionFragment - } - me { - ...OrganizationLayout_MeFragment - } } `); @@ -321,9 +315,7 @@ function SupportTicketPageContent(props: { ticketId: string; organizationId: str return ; } - const me = query.data?.me; const currentOrganization = query.data?.organization?.organization; - const organizationConnection = query.data?.organizations; const ticket = query.data?.organization?.organization.supportTicket; return ( @@ -331,9 +323,6 @@ function SupportTicketPageContent(props: { ticketId: string; organizationId: str page={Page.Support} organizationId={props.organizationId} className="flex flex-col gap-y-10" - currentOrganization={currentOrganization ?? null} - organizations={organizationConnection ?? null} - me={me ?? null} > {currentOrganization ? ( ticket ? ( diff --git a/packages/web/app/src/pages/organization-support.tsx b/packages/web/app/src/pages/organization-support.tsx index efd0c1f02..5ef0d034d 100644 --- a/packages/web/app/src/pages/organization-support.tsx +++ b/packages/web/app/src/pages/organization-support.tsx @@ -292,6 +292,7 @@ function SupportTicketRow(props: { const Support_OrganizationFragment = graphql(` fragment Support_OrganizationFragment on Organization { + id cleanId name me { @@ -390,16 +391,9 @@ const SupportPageQuery = graphql(` query SupportPageQuery($selector: OrganizationSelectorInput!) { organization(selector: $selector) { organization { - ...OrganizationLayout_CurrentOrganizationFragment ...Support_OrganizationFragment } } - organizations { - ...OrganizationLayout_OrganizationConnectionFragment - } - me { - ...OrganizationLayout_MeFragment - } } `); @@ -422,18 +416,13 @@ function SupportPageContent(props: { organizationId: string }) { return ; } - const me = query.data?.me; const currentOrganization = query.data?.organization?.organization; - const organizationConnection = query.data?.organizations; return ( {currentOrganization ? ( diff --git a/packages/web/app/src/pages/organization.tsx b/packages/web/app/src/pages/organization.tsx index 88171e610..bc2516c61 100644 --- a/packages/web/app/src/pages/organization.tsx +++ b/packages/web/app/src/pages/organization.tsx @@ -223,7 +223,6 @@ const OrganizationProjectsPageQuery = graphql(` ) { organization(selector: { organization: $organizationId }) { organization { - ...OrganizationLayout_CurrentOrganizationFragment id cleanId } @@ -242,12 +241,6 @@ const OrganizationProjectsPageQuery = graphql(` schemaVersionsCount(period: $period) } } - organizations { - ...OrganizationLayout_OrganizationConnectionFragment - } - me { - ...OrganizationLayout_MeFragment - } } `); @@ -273,11 +266,10 @@ function OrganizationPageContent(props: { organizationId: string }) { chartResolution: days, // 14 days = 14 data points period: period.current, }, + requestPolicy: 'cache-and-network', }); - const me = query.data?.me; const currentOrganization = query.data?.organization?.organization; - const organizationConnection = query.data?.organizations; const projects = query.data?.projects; const highestNumberOfRequests = useMemo(() => { @@ -305,9 +297,6 @@ function OrganizationPageContent(props: { organizationId: string }) { page={Page.Overview} organizationId={props.organizationId} className="flex justify-between gap-12" - currentOrganization={currentOrganization ?? null} - organizations={organizationConnection ?? null} - me={me ?? null} > <>
diff --git a/packages/web/app/src/pages/project-alerts.tsx b/packages/web/app/src/pages/project-alerts.tsx index b588c508d..d03a10a26 100644 --- a/packages/web/app/src/pages/project-alerts.tsx +++ b/packages/web/app/src/pages/project-alerts.tsx @@ -178,12 +178,11 @@ const ProjectAlertsPageQuery = graphql(` query ProjectAlertsPageQuery($organizationId: ID!, $projectId: ID!) { organization(selector: { organization: $organizationId }) { organization { - ...ProjectLayout_CurrentOrganizationFragment ...ProjectAlertsPage_OrganizationFragment } } project(selector: { organization: $organizationId, project: $projectId }) { - ...ProjectLayout_CurrentProjectFragment + id targets { nodes { ...CreateAlertModal_TargetFragment @@ -197,13 +196,6 @@ const ProjectAlertsPageQuery = graphql(` ...CreateAlertModal_AlertChannelFragment } } - organizations { - ...ProjectLayout_OrganizationConnectionFragment - } - me { - id - ...ProjectLayout_MeFragment - } } `); @@ -217,10 +209,8 @@ function AlertsPageContent(props: { organizationId: string; projectId: string }) requestPolicy: 'cache-and-network', }); - const me = query.data?.me; const currentOrganization = query.data?.organization?.organization; const currentProject = query.data?.project; - const organizationConnection = query.data?.organizations; const organizationForAlerts = useFragment( ProjectAlertsPage_OrganizationFragment, currentOrganization, @@ -246,10 +236,6 @@ function AlertsPageContent(props: { organizationId: string; projectId: string }) diff --git a/packages/web/app/src/pages/project-policy.tsx b/packages/web/app/src/pages/project-policy.tsx index 579ab68b8..a44e2e11e 100644 --- a/packages/web/app/src/pages/project-policy.tsx +++ b/packages/web/app/src/pages/project-policy.tsx @@ -20,12 +20,10 @@ const ProjectPolicyPageQuery = graphql(` id ...CanAccessProject_MemberFragment } - ...ProjectLayout_CurrentOrganizationFragment } } project(selector: { organization: $organizationId, project: $projectId }) { id - ...ProjectLayout_CurrentProjectFragment registryModel schemaPolicy { id @@ -43,13 +41,6 @@ const ProjectPolicyPageQuery = graphql(` } } } - organizations { - ...ProjectLayout_OrganizationConnectionFragment - } - me { - id - ...ProjectLayout_MeFragment - } } `); @@ -65,7 +56,6 @@ const UpdateSchemaPolicyForProject = graphql(` ok { project { id - ...ProjectLayout_CurrentProjectFragment schemaPolicy { id updatedAt @@ -89,10 +79,8 @@ function ProjectPolicyContent(props: { organizationId: string; projectId: string }); const { toast } = useToast(); - const me = query.data?.me; const currentOrganization = query.data?.organization?.organization; const currentProject = query.data?.project; - const organizationConnection = query.data?.organizations; const hasAccess = useProjectAccess({ scope: ProjectAccessScope.Settings, @@ -112,10 +100,6 @@ function ProjectPolicyContent(props: { organizationId: string; projectId: string diff --git a/packages/web/app/src/pages/project-settings.tsx b/packages/web/app/src/pages/project-settings.tsx index 01b5ddc83..c30ed7395 100644 --- a/packages/web/app/src/pages/project-settings.tsx +++ b/packages/web/app/src/pages/project-settings.tsx @@ -218,20 +218,11 @@ const ProjectSettingsPageQuery = graphql(` organization(selector: { organization: $organizationId }) { organization { ...ProjectSettingsPage_OrganizationFragment - ...ProjectLayout_CurrentOrganizationFragment } } project(selector: { organization: $organizationId, project: $projectId }) { - ...ProjectLayout_CurrentProjectFragment ...ProjectSettingsPage_ProjectFragment } - organizations { - ...ProjectLayout_OrganizationConnectionFragment - } - me { - id - ...ProjectLayout_MeFragment - } isGitHubIntegrationFeatureEnabled } `); @@ -248,10 +239,8 @@ function ProjectSettingsContent(props: { organizationId: string; projectId: stri requestPolicy: 'cache-and-network', }); - const me = query.data?.me; const currentOrganization = query.data?.organization?.organization; const currentProject = query.data?.project; - const organizationConnection = query.data?.organizations; const organization = useFragment(ProjectSettingsPage_OrganizationFragment, currentOrganization); const project = useFragment(ProjectSettingsPage_ProjectFragment, currentProject); @@ -316,10 +305,6 @@ function ProjectSettingsContent(props: { organizationId: string; projectId: stri diff --git a/packages/web/app/src/pages/project.tsx b/packages/web/app/src/pages/project.tsx index 811b8e696..dddb02df2 100644 --- a/packages/web/app/src/pages/project.tsx +++ b/packages/web/app/src/pages/project.tsx @@ -225,12 +225,9 @@ const ProjectsPageContent = (props: { organizationId: string; projectId: string chartResolution: days, // 14 days = 14 data points period: period.current, }, + requestPolicy: 'cache-and-network', }); - const me = query.data?.me; - const currentOrganization = query.data?.organization?.organization; - const currentProject = query.data?.project; - const organizationConnection = query.data?.organizations; const targetConnection = query.data?.targets; const targets = targetConnection?.nodes; @@ -257,10 +254,6 @@ const ProjectsPageContent = (props: { organizationId: string; projectId: string organizationId={props.organizationId} projectId={props.projectId} className="flex justify-between gap-12" - currentOrganization={currentOrganization ?? null} - currentProject={currentProject ?? null} - me={me ?? null} - organizations={organizationConnection ?? null} >
@@ -338,17 +331,6 @@ const ProjectOverviewPageQuery = graphql(` $chartResolution: Int! $period: DateRangeInput! ) { - organization(selector: { organization: $organizationId }) { - organization { - ...ProjectLayout_CurrentOrganizationFragment - } - } - project(selector: { organization: $organizationId, project: $projectId }) { - ...ProjectLayout_CurrentProjectFragment - } - organizations { - ...ProjectLayout_OrganizationConnectionFragment - } targets(selector: { organization: $organizationId, project: $projectId }) { total nodes { @@ -363,10 +345,6 @@ const ProjectOverviewPageQuery = graphql(` schemaVersionsCount(period: $period) } } - me { - id - ...ProjectLayout_MeFragment - } } `); diff --git a/packages/web/app/src/pages/target-checks.tsx b/packages/web/app/src/pages/target-checks.tsx index a2aa91827..9708970e1 100644 --- a/packages/web/app/src/pages/target-checks.tsx +++ b/packages/web/app/src/pages/target-checks.tsx @@ -171,20 +171,14 @@ const ChecksPageQuery = graphql(` $targetId: ID! $filters: SchemaChecksFilter ) { - organizations { - ...TargetLayout_OrganizationConnectionFragment - } organization(selector: { organization: $organizationId }) { organization { - ...TargetLayout_CurrentOrganizationFragment + id rateLimit { retentionInDays } } } - project(selector: { organization: $organizationId, project: $projectId }) { - ...TargetLayout_CurrentProjectFragment - } target(selector: { organization: $organizationId, project: $projectId, target: $targetId }) { id schemaChecks(first: 1) { @@ -202,10 +196,6 @@ const ChecksPageQuery = graphql(` } } } - me { - ...TargetLayout_MeFragment - } - ...TargetLayout_IsCDNEnabledFragment } `); @@ -247,11 +237,6 @@ function ChecksPageContent(props: { organizationId: string; projectId: string; t return ; } - const me = query.data?.me; - const currentOrganization = query.data?.organization?.organization; - const currentProject = query.data?.project; - const organizationConnection = query.data?.organizations; - const isCDNEnabled = query.data; const hasSchemaChecks = !!query.data?.target?.schemaChecks?.edges?.length; const hasFilteredSchemaChecks = !!query.data?.target?.filteredSchemaChecks?.edges?.length; const hasActiveSchemaCheck = !!schemaCheckId; @@ -295,11 +280,6 @@ function ChecksPageContent(props: { organizationId: string; projectId: string; t targetId={props.targetId} page={Page.Checks} className="h-full" - currentOrganization={currentOrganization ?? null} - currentProject={currentProject ?? null} - me={me ?? null} - organizations={organizationConnection ?? null} - isCDNEnabled={isCDNEnabled ?? null} >
; } - const me = query.data?.me; const currentOrganization = query.data?.organization?.organization; - const currentProject = query.data?.project; - const organizationConnection = query.data?.organizations; - const isCDNEnabled = query.data; const hasCollectedOperations = query.data?.hasCollectedOperations === true; return ( @@ -352,11 +337,6 @@ function ExplorerDeprecatedSchemaPageContent(props: { projectId={props.projectId} targetId={props.targetId} page={Page.Explorer} - currentOrganization={currentOrganization ?? null} - currentProject={currentProject ?? null} - me={me ?? null} - organizations={organizationConnection ?? null} - isCDNEnabled={isCDNEnabled ?? null} > {currentOrganization ? ( hasCollectedOperations ? ( diff --git a/packages/web/app/src/pages/target-explorer-type.tsx b/packages/web/app/src/pages/target-explorer-type.tsx index 73a5c067e..c83a325a2 100644 --- a/packages/web/app/src/pages/target-explorer-type.tsx +++ b/packages/web/app/src/pages/target-explorer-type.tsx @@ -129,22 +129,16 @@ const TargetExplorerTypenamePageQuery = graphql(` $period: DateRangeInput! $typename: String! ) { - organizations { - ...TargetLayout_OrganizationConnectionFragment - } organization(selector: { organization: $organizationId }) { organization { - ...TargetLayout_CurrentOrganizationFragment + id + name cleanId rateLimit { retentionInDays } } } - project(selector: { organization: $organizationId, project: $projectId }) { - ...TargetLayout_CurrentProjectFragment - cleanId - } target(selector: { organization: $organizationId, project: $projectId, target: $targetId }) { id cleanId @@ -169,10 +163,6 @@ const TargetExplorerTypenamePageQuery = graphql(` ) { totalRequests } - me { - ...TargetLayout_MeFragment - } - ...TargetLayout_IsCDNEnabledFragment } `); @@ -208,11 +198,7 @@ function TypeExplorerPageContent(props: { return ; } - const me = query.data?.me; - const currentProject = query.data?.project; const currentTarget = query.data?.target; - const organizationConnection = query.data?.organizations; - const isCDNEnabled = query.data; const type = currentTarget?.latestSchemaVersion?.explorer?.type; const latestSchemaVersion = currentTarget?.latestSchemaVersion; @@ -222,11 +208,6 @@ function TypeExplorerPageContent(props: { projectId={props.projectId} targetId={props.targetId} page={Page.Explorer} - currentOrganization={currentOrganization ?? null} - currentProject={currentProject ?? null} - me={me ?? null} - organizations={organizationConnection ?? null} - isCDNEnabled={isCDNEnabled ?? null} >
diff --git a/packages/web/app/src/pages/target-explorer-unused.tsx b/packages/web/app/src/pages/target-explorer-unused.tsx index ce62452e0..57179752f 100644 --- a/packages/web/app/src/pages/target-explorer-unused.tsx +++ b/packages/web/app/src/pages/target-explorer-unused.tsx @@ -289,29 +289,18 @@ function UnusedSchemaExplorer(props: { const TargetExplorerUnusedSchemaPageQuery = graphql(` query TargetExplorerUnusedSchemaPageQuery($organizationId: ID!, $projectId: ID!, $targetId: ID!) { - organizations { - ...TargetLayout_OrganizationConnectionFragment - } organization(selector: { organization: $organizationId }) { organization { - ...TargetLayout_CurrentOrganizationFragment + id rateLimit { retentionInDays } cleanId } } - project(selector: { organization: $organizationId, project: $projectId }) { - ...TargetLayout_CurrentProjectFragment - cleanId - } hasCollectedOperations( selector: { organization: $organizationId, project: $projectId, target: $targetId } ) - me { - ...TargetLayout_MeFragment - } - ...TargetLayout_IsCDNEnabledFragment } `); @@ -333,11 +322,7 @@ function ExplorerUnusedSchemaPageContent(props: { return ; } - const me = query.data?.me; const currentOrganization = query.data?.organization?.organization; - const currentProject = query.data?.project; - const organizationConnection = query.data?.organizations; - const isCDNEnabled = query.data; const hasCollectedOperations = query.data?.hasCollectedOperations === true; return ( @@ -346,11 +331,6 @@ function ExplorerUnusedSchemaPageContent(props: { projectId={props.projectId} targetId={props.targetId} page={Page.Explorer} - currentOrganization={currentOrganization ?? null} - currentProject={currentProject ?? null} - me={me ?? null} - organizations={organizationConnection ?? null} - isCDNEnabled={isCDNEnabled ?? null} > {currentOrganization ? ( hasCollectedOperations ? ( diff --git a/packages/web/app/src/pages/target-explorer.tsx b/packages/web/app/src/pages/target-explorer.tsx index 04b998b6a..afebac170 100644 --- a/packages/web/app/src/pages/target-explorer.tsx +++ b/packages/web/app/src/pages/target-explorer.tsx @@ -101,22 +101,15 @@ const TargetExplorerPageQuery = graphql(` $targetId: ID! $period: DateRangeInput! ) { - organizations { - ...TargetLayout_OrganizationConnectionFragment - } organization(selector: { organization: $organizationId }) { organization { - ...TargetLayout_CurrentOrganizationFragment + id rateLimit { retentionInDays } cleanId } } - project(selector: { organization: $organizationId, project: $projectId }) { - ...TargetLayout_CurrentProjectFragment - cleanId - } target(selector: { organization: $organizationId, project: $projectId, target: $targetId }) { id cleanId @@ -142,10 +135,6 @@ const TargetExplorerPageQuery = graphql(` ) { totalRequests } - me { - ...TargetLayout_MeFragment - } - ...TargetLayout_IsCDNEnabledFragment } `); @@ -182,11 +171,7 @@ function ExplorerPageContent(props: { return ; } - const me = query.data?.me; - const currentProject = query.data?.project; const currentTarget = query.data?.target; - const organizationConnection = query.data?.organizations; - const isCDNEnabled = query.data; const latestSchemaVersion = currentTarget?.latestSchemaVersion; const latestValidSchemaVersion = currentTarget?.latestValidSchemaVersion; @@ -200,11 +185,6 @@ function ExplorerPageContent(props: { projectId={props.projectId} targetId={props.targetId} page={Page.Explorer} - currentOrganization={currentOrganization ?? null} - currentProject={currentProject ?? null} - me={me ?? null} - organizations={organizationConnection ?? null} - isCDNEnabled={isCDNEnabled ?? null} >
diff --git a/packages/web/app/src/pages/target-history.tsx b/packages/web/app/src/pages/target-history.tsx index a35743066..08713d2ab 100644 --- a/packages/web/app/src/pages/target-history.tsx +++ b/packages/web/app/src/pages/target-history.tsx @@ -157,30 +157,12 @@ function ListPage(props: { const TargetHistoryPageQuery = graphql(` query TargetHistoryPageQuery($organizationId: ID!, $projectId: ID!, $targetId: ID!) { - organizations { - ...TargetLayout_OrganizationConnectionFragment - } - organization(selector: { organization: $organizationId }) { - organization { - id - ...TargetLayout_CurrentOrganizationFragment - } - } - project(selector: { organization: $organizationId, project: $projectId }) { - id - ...TargetLayout_CurrentProjectFragment - } target(selector: { organization: $organizationId, project: $projectId, target: $targetId }) { id latestSchemaVersion { id } } - me { - id - ...TargetLayout_MeFragment - } - ...TargetLayout_IsCDNEnabledFragment } `); @@ -199,12 +181,7 @@ function HistoryPageContent(props: { }, }); const [pageVariables, setPageVariables] = useState([{ first: 10, after: null as string | null }]); - const me = query.data?.me; - const currentOrganization = query.data?.organization?.organization; - const currentProject = query.data?.project; const currentTarget = query.data?.target; - const organizationConnection = query.data?.organizations; - const isCDNEnabled = query.data; const hasVersions = !!currentTarget?.latestSchemaVersion?.id; const { versionId } = useParams({ @@ -236,11 +213,6 @@ function HistoryPageContent(props: { targetId={props.targetId} page={Page.History} className="h-full" - currentOrganization={currentOrganization ?? null} - currentProject={currentProject ?? null} - me={me ?? null} - organizations={organizationConnection ?? null} - isCDNEnabled={isCDNEnabled ?? null} > {hasVersions ? (
diff --git a/packages/web/app/src/pages/target-insights-client.tsx b/packages/web/app/src/pages/target-insights-client.tsx index 5568a0123..281485ebc 100644 --- a/packages/web/app/src/pages/target-insights-client.tsx +++ b/packages/web/app/src/pages/target-insights-client.tsx @@ -334,33 +334,18 @@ function ClientView(props: { const ClientInsightsPageQuery = graphql(` query ClientInsightsPageQuery($organizationId: ID!, $projectId: ID!, $targetId: ID!) { - organizations { - ...TargetLayout_OrganizationConnectionFragment - } organization(selector: { organization: $organizationId }) { organization { - ...TargetLayout_CurrentOrganizationFragment + id cleanId rateLimit { retentionInDays } } } - project(selector: { organization: $organizationId, project: $projectId }) { - ...TargetLayout_CurrentProjectFragment - cleanId - } - target(selector: { organization: $organizationId, project: $projectId, target: $targetId }) { - id - cleanId - } hasCollectedOperations( selector: { organization: $organizationId, project: $projectId, target: $targetId } ) - me { - ...TargetLayout_MeFragment - } - ...TargetLayout_IsCDNEnabledFragment } `); @@ -383,12 +368,7 @@ function ClientInsightsPageContent(props: { return ; } - const me = query.data?.me; const currentOrganization = query.data?.organization?.organization; - const currentProject = query.data?.project; - const currentTarget = query.data?.target; - const organizationConnection = query.data?.organizations; - const isCDNEnabled = query.data; const hasCollectedOperations = query.data?.hasCollectedOperations === true; return ( @@ -397,13 +377,8 @@ function ClientInsightsPageContent(props: { projectId={props.projectId} targetId={props.targetId} page={Page.Insights} - currentOrganization={currentOrganization ?? null} - currentProject={currentProject ?? null} - me={me ?? null} - organizations={organizationConnection ?? null} - isCDNEnabled={isCDNEnabled ?? null} > - {currentOrganization && currentProject && currentTarget ? ( + {currentOrganization ? ( hasCollectedOperations ? ( ; } - const me = query.data?.me; const currentOrganization = query.data?.organization?.organization; - const currentProject = query.data?.project; - const currentTarget = query.data?.target; - const organizationConnection = query.data?.organizations; - const isCDNEnabled = query.data; const hasCollectedOperations = query.data?.hasCollectedOperations === true; return ( @@ -450,13 +429,8 @@ function TargetSchemaCoordinatePageContent(props: { projectId={props.projectId} targetId={props.targetId} page={Page.Insights} - currentOrganization={currentOrganization ?? null} - currentProject={currentProject ?? null} - me={me ?? null} - organizations={organizationConnection ?? null} - isCDNEnabled={isCDNEnabled ?? null} > - {currentOrganization && currentProject && currentTarget ? ( + {currentOrganization ? ( hasCollectedOperations ? ( ; } - const me = query.data?.me; const currentOrganization = query.data?.organization?.organization; - const currentProject = query.data?.project; - const currentTarget = query.data?.target; - const organizationConnection = query.data?.organizations; - const isCDNEnabled = query.data; const hasCollectedOperations = query.data?.hasCollectedOperations === true; return ( @@ -218,18 +198,13 @@ function OperationInsightsContent(props: { projectId={props.projectId} targetId={props.targetId} page={Page.Insights} - currentOrganization={currentOrganization ?? null} - currentProject={currentProject ?? null} - me={me ?? null} - organizations={organizationConnection ?? null} - isCDNEnabled={isCDNEnabled ?? null} > - {currentOrganization && currentProject && currentTarget ? ( + {currentOrganization ? ( hasCollectedOperations ? ( ; } - const me = query.data?.me; const currentOrganization = query.data?.organization?.organization; - const currentProject = query.data?.project; - const currentTarget = query.data?.target; - const organizationConnection = query.data?.organizations; - const isCDNEnabled = query.data; const hasCollectedOperations = query.data?.hasCollectedOperations === true; return ( @@ -160,18 +140,13 @@ function TargetOperationsPageContent(props: { projectId={props.projectId} targetId={props.targetId} page={Page.Insights} - currentOrganization={currentOrganization ?? null} - currentProject={currentProject ?? null} - me={me ?? null} - organizations={organizationConnection ?? null} - isCDNEnabled={isCDNEnabled ?? null} > - {currentOrganization && currentProject && currentTarget ? ( + {currentOrganization ? ( hasCollectedOperations ? ( ) : ( diff --git a/packages/web/app/src/pages/target-laboratory.tsx b/packages/web/app/src/pages/target-laboratory.tsx index ea652f499..d7e137f2a 100644 --- a/packages/web/app/src/pages/target-laboratory.tsx +++ b/packages/web/app/src/pages/target-laboratory.tsx @@ -822,21 +822,15 @@ function Save(props: { const TargetLaboratoryPageQuery = graphql(` query TargetLaboratoryPageQuery($organizationId: ID!, $projectId: ID!, $targetId: ID!) { - organizations { - ...TargetLayout_OrganizationConnectionFragment - } organization(selector: { organization: $organizationId }) { organization { - ...TargetLayout_CurrentOrganizationFragment + id me { id ...CanAccessTarget_MemberFragment } } } - project(selector: { organization: $organizationId, project: $projectId }) { - ...TargetLayout_CurrentProjectFragment - } target(selector: { organization: $organizationId, project: $projectId, target: $targetId }) { id graphqlEndpointUrl @@ -845,11 +839,6 @@ const TargetLaboratoryPageQuery = graphql(` sdl } } - me { - id - ...TargetLayout_MeFragment - } - ...TargetLayout_IsCDNEnabledFragment ...Laboratory_IsCDNEnabledFragment } `); @@ -870,11 +859,7 @@ function LaboratoryPageContent(props: { const router = useRouter(); const [isConnectLabModalOpen, toggleConnectLabModal] = useToggle(); - const me = query.data?.me; const currentOrganization = query.data?.organization?.organization; - const currentProject = query.data?.project; - const organizationConnection = query.data?.organizations; - const isCDNEnabled = query.data; const operationCollectionsPlugin = useOperationCollectionsPlugin({ canEdit: canAccessTarget(TargetAccessScope.Settings, currentOrganization?.me ?? null), @@ -959,11 +944,6 @@ function LaboratoryPageContent(props: { projectId={props.projectId} targetId={props.targetId} page={Page.Laboratory} - currentOrganization={currentOrganization ?? null} - currentProject={currentProject ?? null} - me={me ?? null} - organizations={organizationConnection ?? null} - isCDNEnabled={isCDNEnabled ?? null} >
diff --git a/packages/web/app/src/pages/target-settings.tsx b/packages/web/app/src/pages/target-settings.tsx index 4b7f470e8..1802b49c6 100644 --- a/packages/web/app/src/pages/target-settings.tsx +++ b/packages/web/app/src/pages/target-settings.tsx @@ -1027,14 +1027,10 @@ function TargetDelete(props: { organizationId: string; projectId: string; target const TargetSettingsPageQuery = graphql(` query TargetSettingsPageQuery($organizationId: ID!, $projectId: ID!, $targetId: ID!) { - organizations { - ...TargetLayout_OrganizationConnectionFragment - } organization(selector: { organization: $organizationId }) { organization { id cleanId - ...TargetLayout_CurrentOrganizationFragment ...TargetSettingsPage_OrganizationFragment me { ...CDNAccessTokens_MeFragment @@ -1045,7 +1041,6 @@ const TargetSettingsPageQuery = graphql(` id cleanId type - ...TargetLayout_CurrentProjectFragment } target(selector: { organization: $organizationId, project: $projectId, target: $targetId }) { id @@ -1054,10 +1049,6 @@ const TargetSettingsPageQuery = graphql(` graphqlEndpointUrl ...TargetSettingsPage_TargetFragment } - me { - ...TargetLayout_MeFragment - } - ...TargetLayout_IsCDNEnabledFragment } `); @@ -1075,12 +1066,9 @@ function TargetSettingsContent(props: { }, }); - const me = query.data?.me; const currentOrganization = query.data?.organization?.organization; const currentProject = query.data?.project; const currentTarget = query.data?.target; - const organizationConnection = query.data?.organizations; - const isCDNEnabled = query.data; const organizationForSettings = useFragment( TargetSettingsPage_OrganizationFragment, currentOrganization, @@ -1103,11 +1091,6 @@ function TargetSettingsContent(props: { projectId={props.projectId} organizationId={props.organizationId} page={Page.Settings} - currentOrganization={currentOrganization ?? null} - currentProject={currentProject ?? null} - me={me ?? null} - organizations={organizationConnection ?? null} - isCDNEnabled={isCDNEnabled ?? null} >
Settings diff --git a/packages/web/app/src/pages/target.tsx b/packages/web/app/src/pages/target.tsx index bf2d2ce3d..5b82fe75d 100644 --- a/packages/web/app/src/pages/target.tsx +++ b/packages/web/app/src/pages/target.tsx @@ -61,6 +61,7 @@ function SchemaBlock({ schema, scrollToMe }: { schema: CompositeSchema; scrollTo const Schemas_ProjectFragment = graphql(` fragment Schemas_ProjectFragment on Project { + id type } `); @@ -128,6 +129,7 @@ function Schemas({ const SchemaView_OrganizationFragment = graphql(` fragment SchemaView_OrganizationFragment on Organization { + id cleanId me { ...CanAccessTarget_MemberFragment @@ -137,6 +139,7 @@ const SchemaView_OrganizationFragment = graphql(` const SchemaView_ProjectFragment = graphql(` fragment SchemaView_ProjectFragment on Project { + id cleanId type registryModel @@ -268,26 +271,17 @@ function SchemaView(props: { const TargetSchemaPageQuery = graphql(` query TargetSchemaPageQuery($organizationId: ID!, $projectId: ID!, $targetId: ID!) { - organizations { - ...TargetLayout_OrganizationConnectionFragment - } organization(selector: { organization: $organizationId }) { organization { - ...TargetLayout_CurrentOrganizationFragment ...SchemaView_OrganizationFragment } } project(selector: { organization: $organizationId, project: $projectId }) { - ...TargetLayout_CurrentProjectFragment ...SchemaView_ProjectFragment } target(selector: { organization: $organizationId, project: $projectId, target: $targetId }) { ...SchemaView_TargetFragment } - me { - ...TargetLayout_MeFragment - } - ...TargetLayout_IsCDNEnabledFragment } `); @@ -306,12 +300,9 @@ function TargetSchemaPage(props: { organizationId: string; projectId: string; ta return ; } - const me = query.data?.me; const currentOrganization = query.data?.organization?.organization; const currentProject = query.data?.project; - const organizationConnection = query.data?.organizations; const target = query.data?.target; - const isCDNEnabled = query.data; // TODO(router) check if it works const serviceNameFromHash = router.latestLocation.hash?.replace('service-', '') ?? null; @@ -322,11 +313,6 @@ function TargetSchemaPage(props: { organizationId: string; projectId: string; ta projectId={props.projectId} organizationId={props.organizationId} page={Page.Schema} - currentOrganization={currentOrganization ?? null} - currentProject={currentProject ?? null} - me={me ?? null} - organizations={organizationConnection ?? null} - isCDNEnabled={isCDNEnabled ?? null} >