From 89f999d55cff3e77bf46934593ca680b132ec454 Mon Sep 17 00:00:00 2001 From: Bryan Frimin Date: Fri, 17 Jul 2026 12:29:28 +0200 Subject: [PATCH] Restore TrustCenter reference hooks in console Keep GraphQL-aligned TrustCenterReferenceGraph naming, drop the unused domain redirect route, and tighten related compliance page UI review nits around magic-link navigation and links. Signed-off-by: Bryan Frimin --- .../src/components/TopBar/TopBar.tsx | 8 ++-- .../CompliancePageReferenceDialog.tsx | 10 ++-- .../DeleteCompliancePageReferenceDialog.tsx | 8 ++-- ...eGraph.ts => TrustCenterReferenceGraph.ts} | 48 +++++++++---------- .../iam/auth/MagicLinkAlreadyUsedPage.tsx | 4 +- .../pages/iam/auth/MagicLinkExpiredPage.tsx | 4 +- .../CompliancePageCustomLinkDialog.tsx | 2 +- .../CompliancePageCustomLinkList.tsx | 2 +- .../CompliancePageDomainsSection.tsx | 10 +--- .../_components/CompliancePageDomainCard.tsx | 4 +- .../DeleteCompliancePageDomainDialog.tsx | 1 - .../NewCompliancePageDomainDialog.tsx | 3 +- .../CompliancePageReferenceList.tsx | 4 +- .../organizations/compliance-page/routes.ts | 7 --- 14 files changed, 49 insertions(+), 66 deletions(-) rename apps/console/src/hooks/graph/{CompliancePageReferenceGraph.ts => TrustCenterReferenceGraph.ts} (62%) diff --git a/apps/compliance-portal/src/components/TopBar/TopBar.tsx b/apps/compliance-portal/src/components/TopBar/TopBar.tsx index f8dd7f19f..0e3ceea01 100644 --- a/apps/compliance-portal/src/components/TopBar/TopBar.tsx +++ b/apps/compliance-portal/src/components/TopBar/TopBar.tsx @@ -27,8 +27,6 @@ import { useTranslation } from "react-i18next"; import { graphql, useFragment } from "react-relay"; import { Link as RouterLink, useLocation } from "react-router"; -import { buildRequestAllContinueUrl } from "#/lib/auth/continueUrl"; - import type { TopBar_query$key } from "./__generated__/TopBar_query.graphql"; import { TOP_BAR_NAV_ITEMS } from "./navItems"; import { TopBarMobileNav } from "./TopBarMobileNav"; @@ -59,7 +57,9 @@ function isActive(pathname: string, to: string): boolean { export function TopBar({ queryKey }: TopBarProps) { const { t } = useTranslation(); const data = useFragment(topBarFragment, queryKey); - const { pathname } = useLocation(); + const location = useLocation(); + const { pathname } = location; + const { currentTrustCenter } = data; const title = currentTrustCenter.title; const logoUrl = currentTrustCenter.themedLogoUrl ?? undefined; @@ -116,7 +116,7 @@ export function TopBar({ queryKey }: TopBarProps) { ); initiateURL.searchParams.set( "continue", - buildRequestAllContinueUrl(), + location.pathname + location.search + location.hash, ); window.location.href = initiateURL.toString(); }} diff --git a/apps/console/src/components/compliancePage/CompliancePageReferenceDialog.tsx b/apps/console/src/components/compliancePage/CompliancePageReferenceDialog.tsx index d2f106821..73044fe67 100644 --- a/apps/console/src/components/compliancePage/CompliancePageReferenceDialog.tsx +++ b/apps/console/src/components/compliancePage/CompliancePageReferenceDialog.tsx @@ -36,9 +36,9 @@ import { z } from "zod"; import type { CompliancePageReferenceListItemFragment$data } from "#/__generated__/core/CompliancePageReferenceListItemFragment.graphql"; import { - useCreateCompliancePageReferenceMutation, - useUpdateCompliancePageReferenceMutation, -} from "#/hooks/graph/CompliancePageReferenceGraph"; + useCreateTrustCenterReferenceMutation, + useUpdateTrustCenterReferenceMutation, +} from "#/hooks/graph/TrustCenterReferenceGraph"; import { useFormWithSchema } from "#/hooks/useFormWithSchema"; const referenceSchema = z.object({ @@ -65,8 +65,8 @@ export const CompliancePageReferenceDialog = forwardRef(null); const [uploadedFile, setUploadedFile] = useState(null); - const [createReference, isCreating] = useCreateCompliancePageReferenceMutation(); - const [updateReference, isUpdating] = useUpdateCompliancePageReferenceMutation(); + const [createReference, isCreating] = useCreateTrustCenterReferenceMutation(); + const [updateReference, isUpdating] = useUpdateTrustCenterReferenceMutation(); const { register, handleSubmit, formState: { errors }, reset } = useFormWithSchema( referenceSchema, diff --git a/apps/console/src/components/compliancePage/DeleteCompliancePageReferenceDialog.tsx b/apps/console/src/components/compliancePage/DeleteCompliancePageReferenceDialog.tsx index 5941a70da..f9545460e 100644 --- a/apps/console/src/components/compliancePage/DeleteCompliancePageReferenceDialog.tsx +++ b/apps/console/src/components/compliancePage/DeleteCompliancePageReferenceDialog.tsx @@ -30,8 +30,8 @@ import { useDialogRef, } from "@probo/ui"; -import type { CompliancePageReferenceGraphDeleteMutation } from "#/__generated__/core/CompliancePageReferenceGraphDeleteMutation.graphql"; -import { deleteCompliancePageReferenceMutation } from "#/hooks/graph/CompliancePageReferenceGraph"; +import type { TrustCenterReferenceGraphDeleteMutation } from "#/__generated__/core/TrustCenterReferenceGraphDeleteMutation.graphql"; +import { deleteTrustCenterReferenceMutation } from "#/hooks/graph/TrustCenterReferenceGraph"; import { useMutation } from "#/lib/relay/useMutation"; type Props = { @@ -52,8 +52,8 @@ export function DeleteCompliancePageReferenceDialog({ const { __ } = useTranslate(); const ref = useDialogRef(); - const [mutate, isDeleting] = useMutation( - deleteCompliancePageReferenceMutation, + const [mutate, isDeleting] = useMutation( + deleteTrustCenterReferenceMutation, { successMessage: __("Reference deleted successfully"), errorToast: __("Failed to delete reference"), diff --git a/apps/console/src/hooks/graph/CompliancePageReferenceGraph.ts b/apps/console/src/hooks/graph/TrustCenterReferenceGraph.ts similarity index 62% rename from apps/console/src/hooks/graph/CompliancePageReferenceGraph.ts rename to apps/console/src/hooks/graph/TrustCenterReferenceGraph.ts index 2d5716588..518d12ce4 100644 --- a/apps/console/src/hooks/graph/CompliancePageReferenceGraph.ts +++ b/apps/console/src/hooks/graph/TrustCenterReferenceGraph.ts @@ -14,14 +14,14 @@ import { graphql } from "react-relay"; -import type { CompliancePageReferenceGraphCreateMutation } from "#/__generated__/core/CompliancePageReferenceGraphCreateMutation.graphql"; -import type { CompliancePageReferenceGraphDeleteMutation } from "#/__generated__/core/CompliancePageReferenceGraphDeleteMutation.graphql"; -import type { CompliancePageReferenceGraphUpdateMutation } from "#/__generated__/core/CompliancePageReferenceGraphUpdateMutation.graphql"; -import type { CompliancePageReferenceGraphUpdateRankMutation } from "#/__generated__/core/CompliancePageReferenceGraphUpdateRankMutation.graphql"; +import type { TrustCenterReferenceGraphCreateMutation } from "#/__generated__/core/TrustCenterReferenceGraphCreateMutation.graphql"; +import type { TrustCenterReferenceGraphDeleteMutation } from "#/__generated__/core/TrustCenterReferenceGraphDeleteMutation.graphql"; +import type { TrustCenterReferenceGraphUpdateMutation } from "#/__generated__/core/TrustCenterReferenceGraphUpdateMutation.graphql"; +import type { TrustCenterReferenceGraphUpdateRankMutation } from "#/__generated__/core/TrustCenterReferenceGraphUpdateRankMutation.graphql"; import { useMutation } from "#/lib/relay/useMutation"; -export const createCompliancePageReferenceMutation = graphql` - mutation CompliancePageReferenceGraphCreateMutation( +export const createTrustCenterReferenceMutation = graphql` + mutation TrustCenterReferenceGraphCreateMutation( $input: CreateTrustCenterReferenceInput! $connections: [ID!]! ) { @@ -47,8 +47,8 @@ export const createCompliancePageReferenceMutation = graphql` } `; -export const updateCompliancePageReferenceMutation = graphql` - mutation CompliancePageReferenceGraphUpdateMutation( +export const updateTrustCenterReferenceMutation = graphql` + mutation TrustCenterReferenceGraphUpdateMutation( $input: UpdateTrustCenterReferenceInput! ) { updateTrustCenterReference(input: $input) { @@ -70,8 +70,8 @@ export const updateCompliancePageReferenceMutation = graphql` } `; -export const deleteCompliancePageReferenceMutation = graphql` - mutation CompliancePageReferenceGraphDeleteMutation( +export const deleteTrustCenterReferenceMutation = graphql` + mutation TrustCenterReferenceGraphDeleteMutation( $input: DeleteTrustCenterReferenceInput! $connections: [ID!]! ) { @@ -81,9 +81,9 @@ export const deleteCompliancePageReferenceMutation = graphql` } `; -export function useCreateCompliancePageReferenceMutation() { - return useMutation( - createCompliancePageReferenceMutation, +export function useCreateTrustCenterReferenceMutation() { + return useMutation( + createTrustCenterReferenceMutation, { successMessage: "Reference created successfully", errorToast: "Failed to create reference", @@ -91,9 +91,9 @@ export function useCreateCompliancePageReferenceMutation() { ); } -export function useUpdateCompliancePageReferenceMutation() { - return useMutation( - updateCompliancePageReferenceMutation, +export function useUpdateTrustCenterReferenceMutation() { + return useMutation( + updateTrustCenterReferenceMutation, { successMessage: "Reference updated successfully", errorToast: "Failed to update reference", @@ -101,8 +101,8 @@ export function useUpdateCompliancePageReferenceMutation() { ); } -export const updateCompliancePageReferenceRankMutation = graphql` - mutation CompliancePageReferenceGraphUpdateRankMutation( +export const updateTrustCenterReferenceRankMutation = graphql` + mutation TrustCenterReferenceGraphUpdateRankMutation( $input: UpdateTrustCenterReferenceInput! ) { updateTrustCenterReference(input: $input) { @@ -114,9 +114,9 @@ export const updateCompliancePageReferenceRankMutation = graphql` } `; -export function useUpdateCompliancePageReferenceRankMutation() { - return useMutation( - updateCompliancePageReferenceRankMutation, +export function useUpdateTrustCenterReferenceRankMutation() { + return useMutation( + updateTrustCenterReferenceRankMutation, { successMessage: "Order updated successfully", errorToast: "Failed to update order", @@ -124,9 +124,9 @@ export function useUpdateCompliancePageReferenceRankMutation() { ); } -export function useDeleteCompliancePageReferenceMutation() { - return useMutation( - deleteCompliancePageReferenceMutation, +export function useDeleteTrustCenterReferenceMutation() { + return useMutation( + deleteTrustCenterReferenceMutation, { successMessage: "Reference deleted successfully", errorToast: "Failed to delete reference", diff --git a/apps/console/src/pages/iam/auth/MagicLinkAlreadyUsedPage.tsx b/apps/console/src/pages/iam/auth/MagicLinkAlreadyUsedPage.tsx index d75ce396b..9dd57c8e5 100644 --- a/apps/console/src/pages/iam/auth/MagicLinkAlreadyUsedPage.tsx +++ b/apps/console/src/pages/iam/auth/MagicLinkAlreadyUsedPage.tsx @@ -35,9 +35,9 @@ export default function MagicLinkAlreadyUsedPage() { ); diff --git a/apps/console/src/pages/iam/auth/MagicLinkExpiredPage.tsx b/apps/console/src/pages/iam/auth/MagicLinkExpiredPage.tsx index 36230c4c7..9d5b37cef 100644 --- a/apps/console/src/pages/iam/auth/MagicLinkExpiredPage.tsx +++ b/apps/console/src/pages/iam/auth/MagicLinkExpiredPage.tsx @@ -35,9 +35,9 @@ export default function MagicLinkExpiredPage() { ); diff --git a/apps/console/src/pages/organizations/compliance-page/brand/_components/CompliancePageCustomLinkDialog.tsx b/apps/console/src/pages/organizations/compliance-page/brand/_components/CompliancePageCustomLinkDialog.tsx index 08960099d..b584b67ee 100644 --- a/apps/console/src/pages/organizations/compliance-page/brand/_components/CompliancePageCustomLinkDialog.tsx +++ b/apps/console/src/pages/organizations/compliance-page/brand/_components/CompliancePageCustomLinkDialog.tsx @@ -181,7 +181,7 @@ export const CompliancePageCustomLinkDialog = forwardRef setNameAutoDetected(false) })} label={__("Name")} type="text" required diff --git a/apps/console/src/pages/organizations/compliance-page/brand/_components/CompliancePageCustomLinkList.tsx b/apps/console/src/pages/organizations/compliance-page/brand/_components/CompliancePageCustomLinkList.tsx index ffe84c0c1..1a0eb515f 100644 --- a/apps/console/src/pages/organizations/compliance-page/brand/_components/CompliancePageCustomLinkList.tsx +++ b/apps/console/src/pages/organizations/compliance-page/brand/_components/CompliancePageCustomLinkList.tsx @@ -30,7 +30,7 @@ const compliancePageFragment = graphql` fragment CompliancePageCustomLinkList_compliancePageFragment on TrustCenter @refetchable(queryName: "CompliancePageCustomLinkList_compliancePageRefetchQuery") @argumentDefinitions( - first: { type: Int, defaultValue: 100 } + first: { type: Int, defaultValue: 500 } after: { type: CursorKey, defaultValue: null } order: { type: ComplianceCustomLinkOrder, defaultValue: { field: RANK, direction: ASC } } ) { diff --git a/apps/console/src/pages/organizations/compliance-page/brand/_components/CompliancePageDomainsSection.tsx b/apps/console/src/pages/organizations/compliance-page/brand/_components/CompliancePageDomainsSection.tsx index 7f37aed51..44b9973de 100644 --- a/apps/console/src/pages/organizations/compliance-page/brand/_components/CompliancePageDomainsSection.tsx +++ b/apps/console/src/pages/organizations/compliance-page/brand/_components/CompliancePageDomainsSection.tsx @@ -62,18 +62,12 @@ export function CompliancePageDomainsSection(props: {
{defaultDomain && ( - + )} {customDomain ? ( - + ) : organization.canCreateCustomDomain && (
diff --git a/apps/console/src/pages/organizations/compliance-page/domain/_components/CompliancePageDomainCard.tsx b/apps/console/src/pages/organizations/compliance-page/domain/_components/CompliancePageDomainCard.tsx index 9cd503a73..ef6dbc5a7 100644 --- a/apps/console/src/pages/organizations/compliance-page/domain/_components/CompliancePageDomainCard.tsx +++ b/apps/console/src/pages/organizations/compliance-page/domain/_components/CompliancePageDomainCard.tsx @@ -46,9 +46,8 @@ const fragment = graphql` export function CompliancePageDomainCard(props: { fKey: CompliancePageDomainCardFragment$key; - compliancePageId: string; }) { - const { fKey, compliancePageId } = props; + const { fKey } = props; const { __ } = useTranslate(); @@ -85,7 +84,6 @@ export function CompliancePageDomainCard(props: { diff --git a/apps/console/src/pages/organizations/compliance-page/domain/_components/DeleteCompliancePageDomainDialog.tsx b/apps/console/src/pages/organizations/compliance-page/domain/_components/DeleteCompliancePageDomainDialog.tsx index dd45bdcf0..87a804566 100644 --- a/apps/console/src/pages/organizations/compliance-page/domain/_components/DeleteCompliancePageDomainDialog.tsx +++ b/apps/console/src/pages/organizations/compliance-page/domain/_components/DeleteCompliancePageDomainDialog.tsx @@ -46,7 +46,6 @@ const deleteCustomDomainMutation = graphql` type DeleteCompliancePageDomainDialogProps = PropsWithChildren<{ domain: string; customDomainId: string; - compliancePageId: string; }>; export function DeleteCompliancePageDomainDialog(props: DeleteCompliancePageDomainDialogProps) { diff --git a/apps/console/src/pages/organizations/compliance-page/domain/_components/NewCompliancePageDomainDialog.tsx b/apps/console/src/pages/organizations/compliance-page/domain/_components/NewCompliancePageDomainDialog.tsx index 81fbd107e..29301e01d 100644 --- a/apps/console/src/pages/organizations/compliance-page/domain/_components/NewCompliancePageDomainDialog.tsx +++ b/apps/console/src/pages/organizations/compliance-page/domain/_components/NewCompliancePageDomainDialog.tsx @@ -42,7 +42,6 @@ const createCustomDomainMutation = graphql` customDomain { id domain - managed sslStatus dnsRecords { type @@ -156,7 +155,7 @@ export function NewCompliancePageDomainDialog(props: PropsWithChildren<{ complia {__("Examples:")} {" "} compliance.example.com, - compliance.example.com + trust.example.com

diff --git a/apps/console/src/pages/organizations/compliance-page/references/_components/CompliancePageReferenceList.tsx b/apps/console/src/pages/organizations/compliance-page/references/_components/CompliancePageReferenceList.tsx index 463a77c27..1146b0fbf 100644 --- a/apps/console/src/pages/organizations/compliance-page/references/_components/CompliancePageReferenceList.tsx +++ b/apps/console/src/pages/organizations/compliance-page/references/_components/CompliancePageReferenceList.tsx @@ -27,7 +27,7 @@ import { graphql } from "relay-runtime"; import type { CompliancePageReferenceListFragment$key } from "#/__generated__/core/CompliancePageReferenceListFragment.graphql"; import type { CompliancePageReferenceListItemFragment$data } from "#/__generated__/core/CompliancePageReferenceListItemFragment.graphql"; import type { CompliancePageReferenceListQuery } from "#/__generated__/core/CompliancePageReferenceListQuery.graphql"; -import { useUpdateCompliancePageReferenceRankMutation } from "#/hooks/graph/CompliancePageReferenceGraph"; +import { useUpdateTrustCenterReferenceRankMutation } from "#/hooks/graph/TrustCenterReferenceGraph"; import { CompliancePageReferenceListItem } from "./CompliancePageReferenceListItem"; @@ -65,7 +65,7 @@ export function CompliancePageReferenceList(props: { CompliancePageReferenceListQuery, CompliancePageReferenceListFragment$key >(fragment, fragmentRef); - const [updateRank] = useUpdateCompliancePageReferenceRankMutation(); + const [updateRank] = useUpdateTrustCenterReferenceRankMutation(); const [draggedIndex, setDraggedIndex] = useState(null); const [dragOverIndex, setDragOverIndex] = useState(null); diff --git a/apps/console/src/pages/organizations/compliance-page/routes.ts b/apps/console/src/pages/organizations/compliance-page/routes.ts index 22ae59931..5aa5ea9fc 100644 --- a/apps/console/src/pages/organizations/compliance-page/routes.ts +++ b/apps/console/src/pages/organizations/compliance-page/routes.ts @@ -19,7 +19,6 @@ // SOFTWARE. import { lazy } from "@probo/react-lazy"; -import { redirect } from "react-router"; import { LinkCardSkeleton } from "#/components/skeletons/LinkCardSkeleton"; import { PageSkeleton } from "#/components/skeletons/PageSkeleton"; @@ -35,12 +34,6 @@ export const compliancePageRoutes = [ Fallback: LinkCardSkeleton, Component: lazy(() => import("#/pages/organizations/compliance-page/overview/CompliancePageOverviewPageLoader")), }, - { - path: "domain", - loader: () => { - throw redirect("brand"); - }, - }, { path: "brand", Fallback: LinkCardSkeleton,