From 2a839ec72a31a3d1002fc429052d679102a9e7e6 Mon Sep 17 00:00:00 2001
From: Charles Zhao <charleszhao@silverhand.io>
Date: Wed, 10 Apr 2024 14:24:23 +0800
Subject: [PATCH] chore(console): remove dev feature flags for cloud
 collaboration (#5666)

---
 packages/console/src/cloud/AppRoutes.tsx                 | 4 ++--
 packages/console/src/containers/ConsoleContent/index.tsx | 4 +---
 packages/console/src/pages/TenantSettings/index.tsx      | 9 +++------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/packages/console/src/cloud/AppRoutes.tsx b/packages/console/src/cloud/AppRoutes.tsx
index dca40a83d..3230e90cc 100644
--- a/packages/console/src/cloud/AppRoutes.tsx
+++ b/packages/console/src/cloud/AppRoutes.tsx
@@ -1,6 +1,6 @@
 import { Route, Routes } from 'react-router-dom';
 
-import { isCloud, isDevFeaturesEnabled } from '@/consts/env';
+import { isCloud } from '@/consts/env';
 import ProtectedRoutes from '@/containers/ProtectedRoutes';
 import { GlobalAnonymousRoute, GlobalRoute } from '@/contexts/TenantsProvider';
 import AcceptInvitation from '@/pages/AcceptInvitation';
@@ -19,7 +19,7 @@ function AppRoutes() {
         <Route path={GlobalAnonymousRoute.Callback} element={<Callback />} />
         <Route path={GlobalAnonymousRoute.SocialDemoCallback} element={<SocialDemoCallback />} />
         <Route element={<ProtectedRoutes />}>
-          {isDevFeaturesEnabled && isCloud && (
+          {isCloud && (
             <Route
               path={`${GlobalRoute.AcceptInvitation}/:invitationId`}
               element={<AcceptInvitation />}
diff --git a/packages/console/src/containers/ConsoleContent/index.tsx b/packages/console/src/containers/ConsoleContent/index.tsx
index 34ed53bff..f61e28011 100644
--- a/packages/console/src/containers/ConsoleContent/index.tsx
+++ b/packages/console/src/containers/ConsoleContent/index.tsx
@@ -228,9 +228,7 @@ function ConsoleContent() {
                   }
                 />
                 <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 />} />
                 {!isDevTenant && canManageTenant && (
                   <>
diff --git a/packages/console/src/pages/TenantSettings/index.tsx b/packages/console/src/pages/TenantSettings/index.tsx
index c65d6c0e1..e1daa7c82 100644
--- a/packages/console/src/pages/TenantSettings/index.tsx
+++ b/packages/console/src/pages/TenantSettings/index.tsx
@@ -2,7 +2,6 @@ import { useContext } from 'react';
 import { Outlet } from 'react-router-dom';
 
 import { TenantSettingsTabs } from '@/consts';
-import { isDevFeaturesEnabled } from '@/consts/env';
 import { TenantsContext } from '@/contexts/TenantsProvider';
 import CardTitle from '@/ds-components/CardTitle';
 import DynamicT from '@/ds-components/DynamicT';
@@ -29,11 +28,9 @@ function TenantSettings() {
         <TabNavItem href={`/tenant-settings/${TenantSettingsTabs.Domains}`}>
           <DynamicT forKey="tenants.tabs.domains" />
         </TabNavItem>
-        {isDevFeaturesEnabled && (
-          <TabNavItem href={`/tenant-settings/${TenantSettingsTabs.Members}`}>
-            <DynamicT forKey="tenants.tabs.members" />
-          </TabNavItem>
-        )}
+        <TabNavItem href={`/tenant-settings/${TenantSettingsTabs.Members}`}>
+          <DynamicT forKey="tenants.tabs.members" />
+        </TabNavItem>
         {!isDevTenant && canManageTenant && (
           <>
             <TabNavItem href={`/tenant-settings/${TenantSettingsTabs.Subscription}`}>