Infrastructure/logto
0
Fork 0
mirror of https://github.com/logto-io/logto.git synced 2024-12-16 20:26:19 -05:00
Code Issues Activity

chore(console): remove dev feature flags for cloud collaboration (#5666)

Browse source
This commit is contained in:
Charles Zhao 2024-04-10 14:24:23 +08:00 committed by GitHub
parent e1d4df4fc3
commit 2a839ec72a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/console/src/cloud/AppRoutes.tsx
View file

@ -1,6 +1,6 @@
import { Route, Routes } from 'react-router-dom'; import { Route, Routes } from 'react-router-dom';
import { isCloud, isDevFeaturesEnabled } from '@/consts/env'; import { isCloud } from '@/consts/env';
import ProtectedRoutes from '@/containers/ProtectedRoutes'; import ProtectedRoutes from '@/containers/ProtectedRoutes';
import { GlobalAnonymousRoute, GlobalRoute } from '@/contexts/TenantsProvider'; import { GlobalAnonymousRoute, GlobalRoute } from '@/contexts/TenantsProvider';
import AcceptInvitation from '@/pages/AcceptInvitation'; import AcceptInvitation from '@/pages/AcceptInvitation';
@ -19,7 +19,7 @@ function AppRoutes() {
<Route path={GlobalAnonymousRoute.Callback} element={<Callback />} /> <Route path={GlobalAnonymousRoute.Callback} element={<Callback />} />
<Route path={GlobalAnonymousRoute.SocialDemoCallback} element={<SocialDemoCallback />} /> <Route path={GlobalAnonymousRoute.SocialDemoCallback} element={<SocialDemoCallback />} />
<Route element={<ProtectedRoutes />}> <Route element={<ProtectedRoutes />}>
{isDevFeaturesEnabled && isCloud && ( {isCloud && (
<Route <Route
path={`${GlobalRoute.AcceptInvitation}/:invitationId`} path={`${GlobalRoute.AcceptInvitation}/:invitationId`}
element={<AcceptInvitation />} element={<AcceptInvitation />}

4
packages/console/src/containers/ConsoleContent/index.tsx
View file

@ -228,9 +228,7 @@ function ConsoleContent() {
} }
/> />
<Route path={TenantSettingsTabs.Settings} element={<TenantBasicSettings />} /> <Route path={TenantSettingsTabs.Settings} element={<TenantBasicSettings />} />
{isDevFeaturesEnabled && ( <Route path={`${TenantSettingsTabs.Members}/*`} element={<TenantMembers />} />
<Route path={`${TenantSettingsTabs.Members}/*`} element={<TenantMembers />} />
)}
<Route path={TenantSettingsTabs.Domains} element={<TenantDomainSettings />} /> <Route path={TenantSettingsTabs.Domains} element={<TenantDomainSettings />} />
{!isDevTenant && canManageTenant && ( {!isDevTenant && canManageTenant && (
<> <>

9
packages/console/src/pages/TenantSettings/index.tsx
View file

@ -2,7 +2,6 @@ import { useContext } from 'react';
import { Outlet } from 'react-router-dom'; import { Outlet } from 'react-router-dom';
import { TenantSettingsTabs } from '@/consts'; import { TenantSettingsTabs } from '@/consts';
import { isDevFeaturesEnabled } from '@/consts/env';
import { TenantsContext } from '@/contexts/TenantsProvider'; import { TenantsContext } from '@/contexts/TenantsProvider';
import CardTitle from '@/ds-components/CardTitle'; import CardTitle from '@/ds-components/CardTitle';
import DynamicT from '@/ds-components/DynamicT'; import DynamicT from '@/ds-components/DynamicT';
@ -29,11 +28,9 @@ function TenantSettings() {
<TabNavItem href={`/tenant-settings/${TenantSettingsTabs.Domains}`}> <TabNavItem href={`/tenant-settings/${TenantSettingsTabs.Domains}`}>
<DynamicT forKey="tenants.tabs.domains" /> <DynamicT forKey="tenants.tabs.domains" />
</TabNavItem> </TabNavItem>
{isDevFeaturesEnabled && ( <TabNavItem href={`/tenant-settings/${TenantSettingsTabs.Members}`}>
<TabNavItem href={`/tenant-settings/${TenantSettingsTabs.Members}`}> <DynamicT forKey="tenants.tabs.members" />
<DynamicT forKey="tenants.tabs.members" /> </TabNavItem>
</TabNavItem>
)}
{!isDevTenant && canManageTenant && ( {!isDevTenant && canManageTenant && (
<> <>
<TabNavItem href={`/tenant-settings/${TenantSettingsTabs.Subscription}`}> <TabNavItem href={`/tenant-settings/${TenantSettingsTabs.Subscription}`}>