diff --git a/e2e-tests/cypress/tests/integration/channels/system_console/connected_workspaces_management_spec.ts b/e2e-tests/cypress/tests/integration/channels/system_console/connected_workspaces_management_spec.ts index 84f9df7007..60fee558a5 100644 --- a/e2e-tests/cypress/tests/integration/channels/system_console/connected_workspaces_management_spec.ts +++ b/e2e-tests/cypress/tests/integration/channels/system_console/connected_workspaces_management_spec.ts @@ -51,7 +51,7 @@ describe('Connected Workspaces', () => { it('empty state', () => { cy.visit('/admin_console'); - cy.get("a[id='environment/secure_connections']").click(); + cy.get("a[id='site_config/secure_connections']").click(); cy.findByTestId('secureConnectionsSection').within(() => { cy.findByRole('heading', {name: 'Connected Workspaces'}); @@ -64,7 +64,7 @@ describe('Connected Workspaces', () => { const orgDisplayName = 'Testing Org Name ' + getRandomId(); before(() => { - cy.visit('/admin_console/environment/secure_connections'); + cy.visit('/admin_console/site_config/secure_connections'); }); it('accept - bad codes', () => { @@ -123,7 +123,7 @@ describe('Connected Workspaces', () => { const orgDisplayName2 = 'new display name here ' + getRandomId(); before(() => { - cy.visit('/admin_console/environment/secure_connections'); + cy.visit('/admin_console/site_config/secure_connections'); }); it('create', () => { diff --git a/webapp/channels/src/components/admin_console/admin_definition.tsx b/webapp/channels/src/components/admin_console/admin_definition.tsx index 5e2b607118..b782e7dd78 100644 --- a/webapp/channels/src/components/admin_console/admin_definition.tsx +++ b/webapp/channels/src/components/admin_console/admin_definition.tsx @@ -1885,44 +1885,6 @@ const AdminDefinition: AdminDefinitionType = { ], }, }, - - secure_connection_detail: { - url: `environment/secure_connections/:connection_id(create|${ID_PATH_PATTERN})`, - isHidden: it.any( - it.configIsTrue('ExperimentalSettings', 'RestrictSystemAdmin'), - it.configIsFalse('ConnectedWorkspacesSettings', 'EnableSharedChannels'), - it.configIsFalse('ConnectedWorkspacesSettings', 'EnableRemoteClusterService'), - it.not(it.any( - it.licensedForFeature('SharedChannels'), - it.licensedForSku(LicenseSkus.Enterprise), - it.licensedForSku(LicenseSkus.Professional), - )), - ), - schema: { - id: 'SecureConnectionDetail', - component: SecureConnectionDetail, - }, - }, - - secure_connections: { - url: 'environment/secure_connections', - title: defineMessage({id: 'admin.sidebar.secureConnections', defaultMessage: 'Connected Workspaces (Beta)'}), - searchableStrings: secureConnectionsSearchableStrings, - isHidden: it.any( - it.configIsTrue('ExperimentalSettings', 'RestrictSystemAdmin'), - it.configIsFalse('ConnectedWorkspacesSettings', 'EnableSharedChannels'), - it.configIsFalse('ConnectedWorkspacesSettings', 'EnableRemoteClusterService'), - it.not(it.any( - it.licensedForFeature('SharedChannels'), - it.licensedForSku(LicenseSkus.Enterprise), - it.licensedForSku(LicenseSkus.Professional), - )), - ), - schema: { - id: 'SecureConnections', - component: SecureConnections, - }, - }, }, }, site: { @@ -3069,6 +3031,32 @@ const AdminDefinition: AdminDefinitionType = { component: IPFiltering, }, }, + secure_connection_detail: { + url: `site_config/secure_connections/:connection_id(create|${ID_PATH_PATTERN})`, + isHidden: it.not(it.all( + it.configIsTrue('ConnectedWorkspacesSettings', 'EnableSharedChannels'), + it.configIsTrue('ConnectedWorkspacesSettings', 'EnableRemoteClusterService'), + it.licensedForFeature('SharedChannels'), + )), + schema: { + id: 'SecureConnectionDetail', + component: SecureConnectionDetail, + }, + }, + secure_connections: { + url: 'site_config/secure_connections', + title: defineMessage({id: 'admin.sidebar.secureConnections', defaultMessage: 'Connected Workspaces (Beta)'}), + searchableStrings: secureConnectionsSearchableStrings, + isHidden: it.not(it.all( + it.configIsTrue('ConnectedWorkspacesSettings', 'EnableSharedChannels'), + it.configIsTrue('ConnectedWorkspacesSettings', 'EnableRemoteClusterService'), + it.licensedForFeature('SharedChannels'), + )), + schema: { + id: 'SecureConnections', + component: SecureConnections, + }, + }, }, }, authentication: { diff --git a/webapp/channels/src/components/admin_console/secure_connections/secure_connection_detail.tsx b/webapp/channels/src/components/admin_console/secure_connections/secure_connection_detail.tsx index 5b475eacad..84407fbb9b 100644 --- a/webapp/channels/src/components/admin_console/secure_connections/secure_connection_detail.tsx +++ b/webapp/channels/src/components/admin_console/secure_connections/secure_connection_detail.tsx @@ -108,7 +108,7 @@ export default function SecureConnectionDetail(props: Props) {
{ }; export const getEditLocation = (rc: RemoteCluster): LocationDescriptor => { - return {pathname: `/admin_console/environment/secure_connections/${rc.remote_id}`, state: rc}; + return {pathname: `/admin_console/site_config/secure_connections/${rc.remote_id}`, state: rc}; }; export const getCreateLocation = (): LocationDescriptor => { - return {pathname: '/admin_console/environment/secure_connections/create'}; + return {pathname: '/admin_console/site_config/secure_connections/create'}; }; const SiteURLPendingPrefix = 'pending_';