Infrastructure/logto
0
Fork 0
mirror of https://github.com/logto-io/logto.git synced 2025-01-27 21:39:16 -05:00
Code Issues Activity

refactor(console): remove redundant domain status guard (#3999)

Browse source
This commit is contained in:
Xiao Yijun 2023-06-08 11:39:46 +08:00 • committed by GitHub
parent 62d3acfc7b
commit 2bc880e204
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
packages/console/src/pages/TenantSettings/tabs/TenantDomainSettings/components/CustomDomain/components/ActivationProcess/index.tsx
View file

@ -1,11 +1,4 @@
import {
DomainStatus,
type Domain,
type DomainDnsRecords,
type DomainDnsRecord,
} from '@logto/schemas';
import { isDomainStatus } from '../../utils';
import { type Domain, type DomainDnsRecords, type DomainDnsRecord } from '@logto/schemas';
import DnsRecordsTable from './components/DnsRecordsTable';
import Step from './components/Step';
@ -19,10 +12,7 @@ const isSetupSslDnsRecord = ({ type, name }: DomainDnsRecord) =>
type.toUpperCase() === 'TXT' && name.includes('_acme-challenge');
function ActivationProcess({ customDomain }: Props) {
const { dnsRecords, status } = customDomain;
// TODO @xiaoyijun Remove this type assertion when the LOG-6276 issue is done by @wangsijie
const typedDomainStatus = isDomainStatus(status) ? status : DomainStatus.Error;
const { dnsRecords, status: domainStatus } = customDomain;
const { verifyDomainDnsRecord, setupSslDnsRecord } = dnsRecords.reduce<{
verifyDomainDnsRecord: DomainDnsRecords;
@ -50,7 +40,7 @@ function ActivationProcess({ customDomain }: Props) {
step={1}
title="domain.custom.verify_domain"
tip="domain.custom.checking_dns_tip"
domainStatus={typedDomainStatus}
domainStatus={domainStatus}
>
<DnsRecordsTable records={verifyDomainDnsRecord} />
</Step>
@ -58,7 +48,7 @@ function ActivationProcess({ customDomain }: Props) {
step={2}
title="domain.custom.enable_ssl"
tip="domain.custom.checking_dns_tip"
domainStatus={typedDomainStatus}
domainStatus={domainStatus}
>
<DnsRecordsTable records={setupSslDnsRecord} />
</Step>

5
packages/console/src/pages/TenantSettings/tabs/TenantDomainSettings/components/CustomDomain/components/CustomDomainHeader/index.tsx
View file

@ -13,8 +13,6 @@ import type { Props as TagProps } from '@/components/Tag';
import useApi from '@/hooks/use-api';
import { useConfirmModal } from '@/hooks/use-confirm-modal';
import { isDomainStatus } from '../../utils';
import * as styles from './index.module.scss';
type Props = {
@ -34,8 +32,7 @@ const domainStatusToTag: Record<
function CustomDomainHeader({ customDomain: { id, domain, status }, onDeleteCustomDomain }: Props) {
const { t } = useTranslation(undefined, { keyPrefix: 'admin_console' });
// TODO @xiaoyijun Remove this type assertion when the LOG-6276 issue is done by @wangsijie
const tag = domainStatusToTag[isDomainStatus(status) ? status : DomainStatus.Error];
const tag = domainStatusToTag[status];
const { show } = useConfirmModal();
const api = useApi();

6
packages/console/src/pages/TenantSettings/tabs/TenantDomainSettings/components/CustomDomain/utils.ts
View file

@ -1,6 +0,0 @@
import { DomainStatus } from '@logto/schemas';
import { z } from 'zod';
// TODO @xiaoyijun Remove this type assertion when the LOG-6276 issue is done by @wangsijie
export const isDomainStatus = (value: string): value is DomainStatus =>
z.nativeEnum(DomainStatus).safeParse(value).success;