diff --git a/app/jenkins-for-jira-ui/src/App.tsx b/app/jenkins-for-jira-ui/src/App.tsx index 18498822..1894db79 100644 --- a/app/jenkins-for-jira-ui/src/App.tsx +++ b/app/jenkins-for-jira-ui/src/App.tsx @@ -8,7 +8,6 @@ import styled from '@emotion/styled'; import { view } from '@forge/bridge'; import { token, setGlobalTheme } from '@atlaskit/tokens'; import { InstallJenkins } from './components/ConnectJenkins/InstallJenkins/InstallJenkins'; -import { JenkinsServerList } from './components/JenkinsServerList/JenkinsServerList'; import { ConnectJenkins } from './components/ConnectJenkins/ConnectJenkins/ConnectJenkins'; import { ManageConnection } from './components/ManageConnection/ManageConnection'; import { spinnerHeight } from './common/styles/spinner.styles'; @@ -39,7 +38,6 @@ const GlobalContainer = styled.div` const App: React.FC = () => { const [history, setHistory] = useState(null); const [isFetchingFlag, setIsFetchingFlag] = useState(false); - const [renovateConfigFlag, setRenovateConfigFlag] = useState(false); const [moduleKey, setModuleKey] = useState(''); const [checkUserPermissionsFlag, setCheckUserPermissionsFlag] = useState(false); @@ -55,10 +53,6 @@ const App: React.FC = () => { setIsFetchingFlag(true); try { - const renovatedJenkinsFeatureFlag = await fetchFeatureFlagFromBackend( - FeatureFlags.RENOVATED_JENKINS_FOR_JIRA_CONFIG_FLOW - ); - const checkUserPermissions = await fetchFeatureFlagFromBackend( FeatureFlags.CHECK_USER_PERMISSIONS ); @@ -66,7 +60,6 @@ const App: React.FC = () => { getModuleKey(); if (isMounted) { - setRenovateConfigFlag(renovatedJenkinsFeatureFlag); setCheckUserPermissionsFlag(checkUserPermissions); setIsFetchingFlag(false); } @@ -118,10 +111,7 @@ const App: React.FC = () => { - {renovateConfigFlag - ? - : - } + {/* TODO - delete routes for old version post renovate rollout */} diff --git a/app/jenkins-for-jira-ui/src/common/featureFlags.ts b/app/jenkins-for-jira-ui/src/common/featureFlags.ts index 752ae48b..c5d6910e 100644 --- a/app/jenkins-for-jira-ui/src/common/featureFlags.ts +++ b/app/jenkins-for-jira-ui/src/common/featureFlags.ts @@ -1,4 +1,3 @@ export enum FeatureFlags { - RENOVATED_JENKINS_FOR_JIRA_CONFIG_FLOW = 'renovated_jenkins_for_jira_config_flow', CHECK_USER_PERMISSIONS = 'check_user_permissions' } diff --git a/app/jenkins-for-jira-ui/src/components/SharePage/SharePage.test.tsx b/app/jenkins-for-jira-ui/src/components/SharePage/SharePage.test.tsx index c087d27b..1de0a347 100644 --- a/app/jenkins-for-jira-ui/src/components/SharePage/SharePage.test.tsx +++ b/app/jenkins-for-jira-ui/src/components/SharePage/SharePage.test.tsx @@ -38,7 +38,9 @@ describe('SharePage Component', () => { jest.spyOn(getAllJenkinsServersModule, 'getAllJenkinsServers').mockResolvedValueOnce([testJenkinsServer]); jest.spyOn(fetchGlobalPageUrlModule, 'fetchGlobalPageUrl').mockResolvedValueOnce('https://somesite.atlassian.net/blah'); - await waitFor(() => render()); + await waitFor(() => render()); await waitFor(() => fireEvent.click(screen.getByText('Share page'))); await waitFor(() => fireEvent.click(screen.getByText('Copy to clipboard'))); await waitFor(() => screen.getByText('Copied to clipboard')); @@ -49,7 +51,9 @@ describe('SharePage Component', () => { jest.spyOn(getAllJenkinsServersModule, 'getAllJenkinsServers').mockResolvedValueOnce([testJenkinsServer]); jest.spyOn(fetchGlobalPageUrlModule, 'fetchGlobalPageUrl').mockResolvedValueOnce('https://somesite.atlassian.net/blah'); - await waitFor(() => render()); + await waitFor(() => render()); await waitFor(() => fireEvent.click(screen.getByText('Share page'))); expect(screen.getByText('Copy to clipboard')).toBeInTheDocument();