Infrastructure/logto
0
Fork 0
mirror of https://github.com/logto-io/logto.git synced 2025-03-10 22:22:45 -05:00
Code Issues Activity

Merge pull request #5930 from logto-io/gao-show-region-in-settings

Browse source 
refactor(console): show dynamic region info in tenant settings
This commit is contained in:
Gao Sun 2024-05-28 22:13:34 +08:00 • committed by GitHub
commit 0cba01104f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
packages/console/src/pages/TenantSettings/TenantBasicSettings/ProfileForm/TenantRegion/index.tsx
View file

@ -1,25 +1,32 @@
import { useContext } from 'react';
import { Trans, useTranslation } from 'react-i18next';
import Region, { RegionName } from '@/components/Region';
import Region from '@/components/Region';
import { trustAndSecurityLink } from '@/consts';
import { TenantsContext } from '@/contexts/TenantsProvider';
import TextLink from '@/ds-components/TextLink';
import * as styles from './index.module.scss';
function TenantRegion() {
const { t } = useTranslation(undefined, { keyPrefix: 'admin_console' });
const { currentTenant } = useContext(TenantsContext);
const regionName = currentTenant?.regionName;
if (!regionName) {
return null;
}
return (
<div className={styles.container}>
{/* TODO: Read the value from the tenant */}
<Region className={styles.region} regionName={RegionName.EU} />
<Region className={styles.region} regionName={regionName} />
<div className={styles.regionTip}>
<Trans
components={{
a: <TextLink targetBlank="noopener" href={trustAndSecurityLink} />,
}}
>
{t('tenants.settings.tenant_region_tip', { region: 'EU' })}
{t('tenants.settings.tenant_region_tip', { region: regionName })}
</Trans>
</div>
</div>

13
packages/console/src/pages/TenantSettings/TenantBasicSettings/index.tsx
View file

@ -1,4 +1,4 @@
import { ReservedPlanId, TenantTag } from '@logto/schemas';
import { ReservedPlanId, type TenantTag } from '@logto/schemas';
import classNames from 'classnames';
import { useContext, useEffect, useState } from 'react';
import { FormProvider, useForm } from 'react-hook-form';
@ -6,7 +6,6 @@ import { toast } from 'react-hot-toast';
import { useTranslation } from 'react-i18next';
import { useCloudApi } from '@/cloud/hooks/use-cloud-api';
import { type TenantResponse } from '@/cloud/types/router';
import PageMeta from '@/components/PageMeta';
import SubmitFormChangesActionBar from '@/components/SubmitFormChangesActionBar';
import UnsavedChangesAlertModal from '@/components/UnsavedChangesAlertModal';
@ -22,12 +21,6 @@ import ProfileForm from './ProfileForm';
import * as styles from './index.module.scss';
import { type TenantSettingsForm } from './types.js';
const tenantProfileToForm = (tenant?: TenantResponse): TenantSettingsForm => {
return {
profile: { name: tenant?.name ?? 'My project', tag: tenant?.tag ?? TenantTag.Development },
};
};
function TenantBasicSettings() {
const { t } = useTranslation(undefined, { keyPrefix: 'admin_console' });
const {
@ -47,7 +40,7 @@ function TenantBasicSettings() {
const { show: showModal } = useConfirmModal();
const methods = useForm<TenantSettingsForm>({
defaultValues: tenantProfileToForm(currentTenant),
defaultValues: { profile: currentTenant },
});
const {
watch,
@ -57,7 +50,7 @@ function TenantBasicSettings() {
} = methods;
useEffect(() => {
reset(tenantProfileToForm(currentTenant));
reset({ profile: currentTenant });
}, [currentTenant, reset]);
const saveData = async (data: { name?: string; tag?: TenantTag }) => {

6
packages/console/src/pages/TenantSettings/TenantBasicSettings/types.ts
View file

@ -1,5 +1,9 @@
import { type TenantModel } from '@logto/schemas/models';
import { type RegionName } from '@/components/Region';
export type TenantSettingsForm = {
profile: Pick<TenantModel, 'name' | 'tag'>;
profile: Pick<TenantModel, 'name' | 'tag'> & {
regionName: RegionName;
};
};