From b2392f51c4916e62d0880013255429e0bef4bc3d Mon Sep 17 00:00:00 2001 From: Bryan Frimin Date: Mon, 13 Oct 2025 22:17:36 +0200 Subject: [PATCH] Remove verifiedAt field from CustomDomain Signed-off-by: Bryan Frimin --- .../CreateCustomDomainDialog.tsx | 1 - .../customDomains/CustomDomainManager.tsx | 5 +- .../customDomains/DomainDetailsDialog.tsx | 7 --- ...reateCustomDomainDialogMutation.graphql.ts | 16 ++---- .../OrganizationGraph_ViewQuery.graphql.ts | 13 +---- .../src/pages/organizations/SettingsPage.tsx | 1 - .../SettingsPageFragment.graphql.ts | 12 +--- pkg/server/api/console/v1/schema.graphql | 1 - pkg/server/api/console/v1/schema/schema.go | 56 ------------------- pkg/server/api/console/v1/types/types.go | 1 - 10 files changed, 11 insertions(+), 102 deletions(-) diff --git a/apps/console/src/components/customDomains/CreateCustomDomainDialog.tsx b/apps/console/src/components/customDomains/CreateCustomDomainDialog.tsx index 600b3e1b1..14a97cb90 100644 --- a/apps/console/src/components/customDomains/CreateCustomDomainDialog.tsx +++ b/apps/console/src/components/customDomains/CreateCustomDomainDialog.tsx @@ -31,7 +31,6 @@ const createCustomDomainMutation = graphql` } createdAt updatedAt - verifiedAt sslExpiresAt } } diff --git a/apps/console/src/components/customDomains/CustomDomainManager.tsx b/apps/console/src/components/customDomains/CustomDomainManager.tsx index 179df8e6e..6b7b47a12 100644 --- a/apps/console/src/components/customDomains/CustomDomainManager.tsx +++ b/apps/console/src/components/customDomains/CustomDomainManager.tsx @@ -33,7 +33,6 @@ interface CustomDomainManagerProps { | null; readonly createdAt?: string | null; readonly updatedAt?: string | null; - readonly verifiedAt?: string | null; readonly sslExpiresAt?: string | null; } | null @@ -124,8 +123,8 @@ export function CustomDomainManager({
{domain.domain}
- {domain.verifiedAt - ? `${__("Verified")} ${new Date(domain.verifiedAt).toLocaleDateString()}` + {domain.sslStatus === "ACTIVE" + ? __("Verified") : __("Pending verification")}
diff --git a/apps/console/src/components/customDomains/DomainDetailsDialog.tsx b/apps/console/src/components/customDomains/DomainDetailsDialog.tsx index 79ea3c68b..06f7c3bd0 100644 --- a/apps/console/src/components/customDomains/DomainDetailsDialog.tsx +++ b/apps/console/src/components/customDomains/DomainDetailsDialog.tsx @@ -24,7 +24,6 @@ interface DomainDetailsDialogProps { readonly purpose: string; }[] | null; - readonly verifiedAt?: string | null; readonly sslExpiresAt?: string | null; }; } @@ -80,12 +79,6 @@ export function DomainDetailsDialog({ } > - {domain.verifiedAt && ( -

- {__("Verified")} {new Date(domain.verifiedAt).toLocaleDateString()} -

- )} - {domain.sslStatus === "ACTIVE" ? (
diff --git a/apps/console/src/components/customDomains/__generated__/CreateCustomDomainDialogMutation.graphql.ts b/apps/console/src/components/customDomains/__generated__/CreateCustomDomainDialogMutation.graphql.ts index 7c178b089..07894e530 100644 --- a/apps/console/src/components/customDomains/__generated__/CreateCustomDomainDialogMutation.graphql.ts +++ b/apps/console/src/components/customDomains/__generated__/CreateCustomDomainDialogMutation.graphql.ts @@ -1,5 +1,5 @@ /** - * @generated SignedSource<> + * @generated SignedSource<> * @lightSyntaxTransform * @nogrep */ @@ -33,7 +33,6 @@ export type CreateCustomDomainDialogMutation$data = { readonly sslExpiresAt: any | null | undefined; readonly sslStatus: SSLStatus; readonly updatedAt: any; - readonly verifiedAt: any | null | undefined; }; }; }; @@ -154,13 +153,6 @@ v1 = [ "name": "updatedAt", "storageKey": null }, - { - "alias": null, - "args": null, - "kind": "ScalarField", - "name": "verifiedAt", - "storageKey": null - }, { "alias": null, "args": null, @@ -193,16 +185,16 @@ return { "selections": (v1/*: any*/) }, "params": { - "cacheID": "9a6fad6d53811f74048b3ff0b64e0afe", + "cacheID": "5e5bf90d17b1dc5129d6a0fc5d68d46c", "id": null, "metadata": {}, "name": "CreateCustomDomainDialogMutation", "operationKind": "mutation", - "text": "mutation CreateCustomDomainDialogMutation(\n $input: CreateCustomDomainInput!\n) {\n createCustomDomain(input: $input) {\n customDomain {\n id\n domain\n sslStatus\n dnsRecords {\n type\n name\n value\n ttl\n purpose\n }\n createdAt\n updatedAt\n verifiedAt\n sslExpiresAt\n }\n }\n}\n" + "text": "mutation CreateCustomDomainDialogMutation(\n $input: CreateCustomDomainInput!\n) {\n createCustomDomain(input: $input) {\n customDomain {\n id\n domain\n sslStatus\n dnsRecords {\n type\n name\n value\n ttl\n purpose\n }\n createdAt\n updatedAt\n sslExpiresAt\n }\n }\n}\n" } }; })(); -(node as any).hash = "312e66e894a78da19c28c7f03d03fe96"; +(node as any).hash = "fb3bede811b12db54f54af3dd375e335"; export default node; diff --git a/apps/console/src/hooks/graph/__generated__/OrganizationGraph_ViewQuery.graphql.ts b/apps/console/src/hooks/graph/__generated__/OrganizationGraph_ViewQuery.graphql.ts index ff33fcefb..5cdac9448 100644 --- a/apps/console/src/hooks/graph/__generated__/OrganizationGraph_ViewQuery.graphql.ts +++ b/apps/console/src/hooks/graph/__generated__/OrganizationGraph_ViewQuery.graphql.ts @@ -1,5 +1,5 @@ /** - * @generated SignedSource<<7493102ba1f19bb7721e444d0e372629>> + * @generated SignedSource<<267b2fc05603188ad26c38ce1485887b>> * @lightSyntaxTransform * @nogrep */ @@ -238,13 +238,6 @@ return { "name": "updatedAt", "storageKey": null }, - { - "alias": null, - "args": null, - "kind": "ScalarField", - "name": "verifiedAt", - "storageKey": null - }, { "alias": null, "args": null, @@ -345,12 +338,12 @@ return { ] }, "params": { - "cacheID": "793d8f1eb4118deebe64f3025d3e8c31", + "cacheID": "5118b2778835b232009a9d5ef5647aba", "id": null, "metadata": {}, "name": "OrganizationGraph_ViewQuery", "operationKind": "query", - "text": "query OrganizationGraph_ViewQuery(\n $organizationId: ID!\n) {\n node(id: $organizationId) {\n __typename\n ... on Organization {\n id\n name\n ...SettingsPageFragment\n }\n id\n }\n}\n\nfragment SettingsPageFragment on Organization {\n id\n name\n logoUrl\n description\n websiteUrl\n email\n headquarterAddress\n customDomain {\n id\n domain\n sslStatus\n dnsRecords {\n type\n name\n value\n ttl\n purpose\n }\n createdAt\n updatedAt\n verifiedAt\n sslExpiresAt\n }\n users(first: 100) {\n edges {\n node {\n id\n fullName\n email\n createdAt\n }\n }\n }\n connectors(first: 100) {\n edges {\n node {\n id\n name\n type\n createdAt\n }\n }\n }\n}\n" + "text": "query OrganizationGraph_ViewQuery(\n $organizationId: ID!\n) {\n node(id: $organizationId) {\n __typename\n ... on Organization {\n id\n name\n ...SettingsPageFragment\n }\n id\n }\n}\n\nfragment SettingsPageFragment on Organization {\n id\n name\n logoUrl\n description\n websiteUrl\n email\n headquarterAddress\n customDomain {\n id\n domain\n sslStatus\n dnsRecords {\n type\n name\n value\n ttl\n purpose\n }\n createdAt\n updatedAt\n sslExpiresAt\n }\n users(first: 100) {\n edges {\n node {\n id\n fullName\n email\n createdAt\n }\n }\n }\n connectors(first: 100) {\n edges {\n node {\n id\n name\n type\n createdAt\n }\n }\n }\n}\n" } }; })(); diff --git a/apps/console/src/pages/organizations/SettingsPage.tsx b/apps/console/src/pages/organizations/SettingsPage.tsx index 19e1c9470..28ceb34ee 100644 --- a/apps/console/src/pages/organizations/SettingsPage.tsx +++ b/apps/console/src/pages/organizations/SettingsPage.tsx @@ -75,7 +75,6 @@ const organizationFragment = graphql` } createdAt updatedAt - verifiedAt sslExpiresAt } users(first: 100) { diff --git a/apps/console/src/pages/organizations/__generated__/SettingsPageFragment.graphql.ts b/apps/console/src/pages/organizations/__generated__/SettingsPageFragment.graphql.ts index 5673d2b70..0ac7b3fd8 100644 --- a/apps/console/src/pages/organizations/__generated__/SettingsPageFragment.graphql.ts +++ b/apps/console/src/pages/organizations/__generated__/SettingsPageFragment.graphql.ts @@ -1,5 +1,5 @@ /** - * @generated SignedSource<<75e8a41e9d070472ff42d71e17c47fa6>> + * @generated SignedSource<> * @lightSyntaxTransform * @nogrep */ @@ -36,7 +36,6 @@ export type SettingsPageFragment$data = { readonly sslExpiresAt: any | null | undefined; readonly sslStatus: SSLStatus; readonly updatedAt: any; - readonly verifiedAt: any | null | undefined; } | null | undefined; readonly description: string | null | undefined; readonly email: string | null | undefined; @@ -207,13 +206,6 @@ return { "name": "updatedAt", "storageKey": null }, - { - "alias": null, - "args": null, - "kind": "ScalarField", - "name": "verifiedAt", - "storageKey": null - }, { "alias": null, "args": null, @@ -310,6 +302,6 @@ return { }; })(); -(node as any).hash = "9786965352e1978c1171509fcce34b56"; +(node as any).hash = "1f76d60a35b4b5116821419432ec4aed"; export default node; diff --git a/pkg/server/api/console/v1/schema.graphql b/pkg/server/api/console/v1/schema.graphql index ebd1bb814..79c20eb69 100644 --- a/pkg/server/api/console/v1/schema.graphql +++ b/pkg/server/api/console/v1/schema.graphql @@ -4440,7 +4440,6 @@ type CustomDomain implements Node { dnsRecords: [DNSRecordInstruction!]! createdAt: Datetime! updatedAt: Datetime! - verifiedAt: Datetime } type DNSRecordInstruction { diff --git a/pkg/server/api/console/v1/schema/schema.go b/pkg/server/api/console/v1/schema/schema.go index 420b2fff8..7c361fa7d 100644 --- a/pkg/server/api/console/v1/schema/schema.go +++ b/pkg/server/api/console/v1/schema/schema.go @@ -407,7 +407,6 @@ type ComplexityRoot struct { SslExpiresAt func(childComplexity int) int SslStatus func(childComplexity int) int UpdatedAt func(childComplexity int) int - VerifiedAt func(childComplexity int) int } DNSRecordInstruction struct { @@ -2948,13 +2947,6 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.complexity.CustomDomain.UpdatedAt(childComplexity), true - case "CustomDomain.verifiedAt": - if e.complexity.CustomDomain.VerifiedAt == nil { - break - } - - return e.complexity.CustomDomain.VerifiedAt(childComplexity), true - case "DNSRecordInstruction.name": if e.complexity.DNSRecordInstruction.Name == nil { break @@ -13148,7 +13140,6 @@ type CustomDomain implements Node { dnsRecords: [DNSRecordInstruction!]! createdAt: Datetime! updatedAt: Datetime! - verifiedAt: Datetime } type DNSRecordInstruction { @@ -26165,8 +26156,6 @@ func (ec *executionContext) fieldContext_CreateCustomDomainPayload_customDomain( return ec.fieldContext_CustomDomain_createdAt(ctx, field) case "updatedAt": return ec.fieldContext_CustomDomain_updatedAt(ctx, field) - case "verifiedAt": - return ec.fieldContext_CustomDomain_verifiedAt(ctx, field) } return nil, fmt.Errorf("no field named %q was found under type CustomDomain", field.Name) }, @@ -27945,47 +27934,6 @@ func (ec *executionContext) fieldContext_CustomDomain_updatedAt(_ context.Contex return fc, nil } -func (ec *executionContext) _CustomDomain_verifiedAt(ctx context.Context, field graphql.CollectedField, obj *types.CustomDomain) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_CustomDomain_verifiedAt(ctx, field) - if err != nil { - return graphql.Null - } - ctx = graphql.WithFieldContext(ctx, fc) - defer func() { - if r := recover(); r != nil { - ec.Error(ctx, ec.Recover(ctx, r)) - ret = graphql.Null - } - }() - resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (any, error) { - ctx = rctx // use context from middleware stack in children - return obj.VerifiedAt, nil - }) - if err != nil { - ec.Error(ctx, err) - return graphql.Null - } - if resTmp == nil { - return graphql.Null - } - res := resTmp.(*time.Time) - fc.Result = res - return ec.marshalODatetime2ᚖtimeᚐTime(ctx, field.Selections, res) -} - -func (ec *executionContext) fieldContext_CustomDomain_verifiedAt(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { - fc = &graphql.FieldContext{ - Object: "CustomDomain", - Field: field, - IsMethod: false, - IsResolver: false, - Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return nil, errors.New("field of type Datetime does not have child fields") - }, - } - return fc, nil -} - func (ec *executionContext) _DNSRecordInstruction_type(ctx context.Context, field graphql.CollectedField, obj *types.DNSRecordInstruction) (ret graphql.Marshaler) { fc, err := ec.fieldContext_DNSRecordInstruction_type(ctx, field) if err != nil { @@ -46634,8 +46582,6 @@ func (ec *executionContext) fieldContext_Organization_customDomain(_ context.Con return ec.fieldContext_CustomDomain_createdAt(ctx, field) case "updatedAt": return ec.fieldContext_CustomDomain_updatedAt(ctx, field) - case "verifiedAt": - return ec.fieldContext_CustomDomain_verifiedAt(ctx, field) } return nil, fmt.Errorf("no field named %q was found under type CustomDomain", field.Name) }, @@ -75843,8 +75789,6 @@ func (ec *executionContext) _CustomDomain(ctx context.Context, sel ast.Selection if out.Values[i] == graphql.Null { out.Invalids++ } - case "verifiedAt": - out.Values[i] = ec._CustomDomain_verifiedAt(ctx, field, obj) default: panic("unknown field " + strconv.Quote(field.Name)) } diff --git a/pkg/server/api/console/v1/types/types.go b/pkg/server/api/console/v1/types/types.go index d7df8c989..045d686c0 100644 --- a/pkg/server/api/console/v1/types/types.go +++ b/pkg/server/api/console/v1/types/types.go @@ -642,7 +642,6 @@ type CustomDomain struct { DNSRecords []*DNSRecordInstruction `json:"dnsRecords"` CreatedAt time.Time `json:"createdAt"` UpdatedAt time.Time `json:"updatedAt"` - VerifiedAt *time.Time `json:"verifiedAt,omitempty"` } func (CustomDomain) IsNode() {}