Merge pull request #272 from atlassian/ARC-2807-admin-check-part-3

Arc-2807 admin check part 3
atlassian · Feb 7, 2024 · eabbe48 · eabbe48
2 parents a78ca00 + 3b536cd
commit eabbe48
Show file tree

Hide file tree

Showing 16 changed files with 236 additions and 62 deletions.
diff --git a/app/jenkins-for-jira-ui/src/App.tsx b/app/jenkins-for-jira-ui/src/App.tsx
@@ -42,6 +42,7 @@ const App: React.FC = () => {
 	const [isFetchingFlag, setIsFetchingFlag] = useState<boolean>(false);
 	const [renovateConfigFlag, setRenovateConfigFlag] = useState<boolean>(false);
 	const [moduleKey, setModuleKey] = useState<string>('');
+	const [checkUserPermissionsFlag, setCheckUserPermissionsFlag] = useState<boolean>(false);
 
 	const getModuleKey = async () => {
 		const currentModuleKey = await fetchModuleKey();
@@ -59,14 +60,20 @@ const App: React.FC = () => {
 					FeatureFlags.RENOVATED_JENKINS_FOR_JIRA_CONFIG_FLOW
 				);
 
+				const checkUserPermissions = await fetchFeatureFlagFromBackend(
+					FeatureFlags.CHECK_USER_PERMISSIONS
+				);
+
 				getModuleKey();
 
 				if (isMounted) {
 					setRenovateConfigFlag(renovatedJenkinsFeatureFlag);
+					setCheckUserPermissionsFlag(checkUserPermissions);
 					setIsFetchingFlag(false);
 				}
 			} catch (error) {
 				console.error('Error fetching data:', error);
+				setIsFetchingFlag(false);
 			}
 		};
 
@@ -102,7 +109,7 @@ const App: React.FC = () => {
 					<Router history={history}>
 						<Switch>
 							<Route path="/">
-								<GlobalPage />
+								<GlobalPage checkUserPermissionsFlag={checkUserPermissionsFlag} />
 							</Route>
 						</Switch>
 					</Router>
@@ -134,19 +141,19 @@ const App: React.FC = () => {
 							<Route path="/pending/:id">
 								<PendingDeploymentState />
 							</Route>
-							<Route path="/create-server">
+							<Route path="/create-server/:path">
 								<ServerNameForm />
 							</Route>
-							<Route path="/update-server-name/:id">
+							<Route path="/update-server-name/:id/:path">
 								<ServerNameForm />
 							</Route>
-							<Route path="/setup/:id/:settings">
+							<Route path="/setup/:id/:settings/:path">
 								<JenkinsSetup />
 							</Route>
-							<Route path="/connection-complete/:id/:admin">
+							<Route path="/connection-complete/:id/:admin/:path">
 								<ConnectionComplete />
 							</Route>
-							<Route path="/connection-info">
+							<Route path="/connection-info/:path">
 								<ConnectionWizard />
 							</Route>
 						</Switch>

diff --git a/...ctionComplete/CompleteConnection.test.tsx → ...ctionComplete/ConnectionComplete.test.tsx b/...ctionComplete/CompleteConnection.test.tsx → ...ctionComplete/ConnectionComplete.test.tsx
@@ -5,8 +5,10 @@ import {
 import { useParams } from 'react-router';
 import { ConnectionComplete } from './ConnectionComplete';
 import * as getJenkinsServerWithSecretModule from '../../api/getJenkinsServerWithSecret';
+import * as fetchGlobalPageUrlModule from '../../api/fetchGlobalPageUrl';
 
 jest.mock('../../api/getJenkinsServerWithSecret');
+jest.mock('../../api/fetchGlobalPageUrl');
 
 jest.mock('react-router', () => ({
 	...jest.requireActual('react-router'),
@@ -55,6 +57,7 @@ describe('ConnectionComplete Component', () => {
 	});
 
 	it('should render server name and connection confirmation for non Jenkins admin', async () => {
+		jest.spyOn(fetchGlobalPageUrlModule, 'fetchGlobalPageUrl').mockResolvedValueOnce('https://somesite.atlassian.net/blah');
 		const mockParams = { id: '12345678', admin: 'requires-jenkins-admin' };
 		(useParams as jest.Mock).mockReturnValue(mockParams);
 

diff --git a/app/jenkins-for-jira-ui/src/components/ConnectionComplete/ConnectionComplete.tsx b/app/jenkins-for-jira-ui/src/components/ConnectionComplete/ConnectionComplete.tsx
@@ -3,6 +3,7 @@ import { useHistory, useParams } from 'react-router';
 import { cx } from '@emotion/css';
 import Spinner from '@atlaskit/spinner';
 import Button from '@atlaskit/button/standard-button';
+import { router } from '@forge/bridge';
 import { connectionFlowContainer, connectionFlowInnerContainer } from '../../GlobalStyles.styles';
 import { ConnectionFlowHeader, ConnectionFlowServerNameSubHeader } from '../ConnectionWizard/ConnectionFlowHeader';
 import { getJenkinsServerWithSecret } from '../../api/getJenkinsServerWithSecret';
@@ -11,14 +12,17 @@ import { serverNameFormOuterContainer } from '../ServerNameForm/ServerNameForm.s
 import { connectionCompleteConfirmation, connectionCompleteContent } from './ConnectionComplete.styles';
 import { AnalyticsEventTypes, AnalyticsScreenEventsEnum } from '../../common/analytics/analytics-events';
 import { AnalyticsClient } from '../../common/analytics/analytics-client';
+import { fetchGlobalPageUrl } from '../../api/fetchGlobalPageUrl';
 import { ParamTypes } from '../../common/types';
 
 const analyticsClient = new AnalyticsClient();
 
 const ConnectionComplete = () => {
 	const history = useHistory();
+	const { path } = useParams<ParamTypes>();
 	const { admin: isJenkinsAdmin, id: uuid } = useParams<ParamTypes>();
 	const [serverName, setServerName] = useState('');
+	const [globalPageUrl, setGlobalPageUrl] = useState<string>('');
 
 	const getServer = useCallback(async () => {
 		try {
@@ -37,7 +41,9 @@ const ConnectionComplete = () => {
 
 		const fetchData = async () => {
 			try {
-				getServer();
+				const url = await fetchGlobalPageUrl();
+				setGlobalPageUrl(url);
+				await getServer();
 			} catch (error) {
 				console.error('Error fetching data:', error);
 			}
@@ -48,6 +54,12 @@ const ConnectionComplete = () => {
 
 	const handleNavigateToConnectionServerManagementScreen = (e: React.MouseEvent) => {
 		e.preventDefault();
+		console.log('path', path);
+
+		if (path === 'global') {
+			router.navigate(globalPageUrl);
+		}
+
 		history.push('/');
 	};
 

diff --git a/app/jenkins-for-jira-ui/src/components/ConnectionPanel/ConnectionPanel.tsx b/app/jenkins-for-jira-ui/src/components/ConnectionPanel/ConnectionPanel.tsx
@@ -62,7 +62,8 @@ type ConnectionPanelProps = {
 	isUpdatingServer: boolean,
 	uuidOfRefreshServer: string,
 	handleRefreshUpdateServer(uuid: string): void,
-	moduleKey: string
+	moduleKey: string,
+	userIsAdmin?: boolean
 };
 
 const ConnectionPanel = ({
@@ -72,7 +73,8 @@ const ConnectionPanel = ({
 	isUpdatingServer,
 	uuidOfRefreshServer,
 	handleRefreshUpdateServer,
-	moduleKey
+	moduleKey,
+	userIsAdmin
 }: ConnectionPanelProps): JSX.Element => {
 	const handleServerRefresh = (serverToRemove: JenkinsServer) => {
 		const refreshedServers = jenkinsServers.filter(
@@ -114,6 +116,7 @@ const ConnectionPanel = ({
 								updatedServer={updatedServer}
 								isUpdatingServer={isUpdatingServer}
 								moduleKey={moduleKey}
+								userIsAdmin={userIsAdmin}
 							/>
 							<ConnectionPanelMain
 								jenkinsServer={server}
@@ -123,6 +126,7 @@ const ConnectionPanel = ({
 								isUpdatingServer={isUpdatingServer}
 								uuidOfRefreshServer={uuidOfRefreshServer}
 								moduleKey={moduleKey}
+								userIsAdmin={userIsAdmin}
 							/>
 						</div>
 					);

diff --git a/app/jenkins-for-jira-ui/src/components/ConnectionPanel/ConnectionPanelMain.tsx b/app/jenkins-for-jira-ui/src/components/ConnectionPanel/ConnectionPanelMain.tsx
@@ -63,7 +63,8 @@ type ConnectionPanelMainProps = {
 	updatedServer?: JenkinsServer,
 	isUpdatingServer: boolean,
 	uuidOfRefreshServer: string,
-	moduleKey: string
+	moduleKey: string,
+	userIsAdmin?: boolean
 };
 
 const SET_UP_GUIDE_TAB = 1;
@@ -75,7 +76,8 @@ const ConnectionPanelMain = ({
 	updatedServer,
 	isUpdatingServer,
 	uuidOfRefreshServer,
-	moduleKey
+	moduleKey,
+	userIsAdmin
 }: ConnectionPanelMainProps): JSX.Element => {
 	const connectedState = jenkinsServer.connectedState || ConnectedState.PENDING;
 	const [selectedTabIndex, setSelectedTabIndex] = useState(0);
@@ -185,6 +187,7 @@ const ConnectionPanelMain = ({
 						refreshServersAfterDelete={refreshServers}
 						refreshServersAfterUpdate={handleRefreshUpdateServer}
 						moduleKey={moduleKey}
+						userIsAdmin={userIsAdmin}
 					/>
 					: <Tabs id="connection-panel-tabs" selected={selectedTabIndex} onChange={handleTabSelect}>
 						<TabList>
@@ -229,6 +232,7 @@ const ConnectionPanelMain = ({
 											uuidOfRefreshServer={uuidOfRefreshServer}
 											isUpdatingServer={isUpdatingServer}
 											moduleKey={moduleKey}
+											userIsAdmin={userIsAdmin}
 										/>
 									</Panel>
 							}

diff --git a/app/jenkins-for-jira-ui/src/components/ConnectionPanel/ConnectionPanelTop.tsx b/app/jenkins-for-jira-ui/src/components/ConnectionPanel/ConnectionPanelTop.tsx
@@ -1,9 +1,10 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { useHistory } from 'react-router';
 import { cx } from '@emotion/css';
 import Button from '@atlaskit/button/standard-button';
 import MoreIcon from '@atlaskit/icon/glyph/more';
 import DropdownMenu, { DropdownItem, DropdownItemGroup } from '@atlaskit/dropdown-menu';
+import { router } from '@forge/bridge';
 import {
 	connectionPanelHeaderContainer,
 	connectionPanelHeaderContentContainer,
@@ -22,6 +23,7 @@ import {
 	AnalyticsUiEventsEnum
 } from '../../common/analytics/analytics-events';
 import { AnalyticsClient } from '../../common/analytics/analytics-client';
+import { fetchAdminPath } from '../../api/fetchGlobalPageUrl';
 
 const analyticsClient = new AnalyticsClient();
 
@@ -37,12 +39,15 @@ type ConnectionPanelTopProps = {
 	refreshServers(serverToRemove: JenkinsServer): void,
 	updatedServer?: JenkinsServer,
 	isUpdatingServer: boolean,
-	moduleKey: string
+	moduleKey: string,
+	userIsAdmin?: boolean
 };
+
 const ConnectionPanelTop = ({
 	server,
 	refreshServers,
-	moduleKey
+	moduleKey,
+	userIsAdmin
 }: ConnectionPanelTopProps): JSX.Element => {
 	const history = useHistory();
 	const connectedState = server.connectedState || ConnectedState.PENDING;
@@ -51,8 +56,26 @@ const ConnectionPanelTop = ({
 	const [showConfirmServerDisconnect, setShowConfirmServerDisconnect] = useState(false);
 	const [isLoading, setIsLoading] = useState(false);
 	const [disconnectError, setDisconnectError] = useState<boolean>(false);
+	const [adminPageUrl, setAdminPageUrl] = useState<string>('');
+	const isAdminPage = moduleKey === CONFIG_PAGE;
+
+	useEffect(() => {
+		const fetchData = async () => {
+			try {
+				const url = await fetchAdminPath();
+				setAdminPageUrl(url);
+			} catch (error) {
+				console.error('Error fetching data:', error);
+			}
+		};
+
+		fetchData();
+	}, []);
 
 	const onClickDisconnect = async (serverToDelete: JenkinsServer) => {
+		setServerToDisconnect(serverToDelete);
+		setShowConfirmServerDisconnect(true);
+
 		await analyticsClient.sendAnalytics(
 			AnalyticsEventTypes.UiEvent,
 			AnalyticsUiEventsEnum.DisconnectServerName,
@@ -61,9 +84,6 @@ const ConnectionPanelTop = ({
 				actionSubject: 'button'
 			}
 		);
-
-		setServerToDisconnect(serverToDelete);
-		setShowConfirmServerDisconnect(true);
 	};
 
 	const onClickConnectionSettings = async (serverToOpen: JenkinsServer) => {
@@ -76,7 +96,13 @@ const ConnectionPanelTop = ({
 			}
 		);
 
-		history.push(`/setup/${serverToOpen.uuid}/connection-settings`);
+		const connectionSettingsPath = `/setup/${serverToOpen.uuid}/connection-settings`;
+
+		if (isAdminPage) {
+			history.push(`${connectionSettingsPath}/admin`);
+		} else {
+			router.navigate(`${adminPageUrl}${connectionSettingsPath}/global`);
+		}
 	};
 
 	const onClickRename = async (serverToRename: JenkinsServer) => {
@@ -89,7 +115,13 @@ const ConnectionPanelTop = ({
 			}
 		);
 
-		history.push(`/update-server-name/${serverToRename.uuid}`);
+		const updateServerNamePath = `/update-server-name/${serverToRename.uuid}`;
+
+		if (isAdminPage) {
+			history.push(`${updateServerNamePath}/admin`);
+		} else {
+			router.navigate(`${adminPageUrl}${updateServerNamePath}/global`);
+		}
 	};
 
 	const disconnectJenkinsServerHandler = async (
@@ -134,8 +166,6 @@ const ConnectionPanelTop = ({
 	};
 
 	const serverIsNotDuplicate = server.connectedState !== ConnectedState.DUPLICATE;
-	const isConfigPage = moduleKey && moduleKey === CONFIG_PAGE;
-
 	const buttonAndIconAppearance = disconnectError ? 'danger' : 'warning';
 	const modalTitleMessage =
 		disconnectError ? 'An error occurred while deleting your server' : 'Disconnect this Jenkins server?';
@@ -165,7 +195,7 @@ const ConnectionPanelTop = ({
 				</div>
 			</div>
 
-			{serverIsNotDuplicate && isConfigPage &&
+			{serverIsNotDuplicate && (userIsAdmin || CONFIG_PAGE) &&
 				<DropdownMenu
 					trigger={({ triggerRef, ...props }) => (
 						<Button

diff --git a/app/jenkins-for-jira-ui/src/components/ConnectionPanel/NotConnectedState.test.tsx b/app/jenkins-for-jira-ui/src/components/ConnectionPanel/NotConnectedState.test.tsx
@@ -31,7 +31,9 @@ describe('NotConnectedState', () => {
 			refreshServersAfterDelete={refreshServers}
 			refreshServersAfterUpdate={handleRefreshAfterUpdate}
 			moduleKey={CONFIG_PAGE}
+			userIsAdmin={true}
 		/>);
+
 		expect(screen.getByText('Duplicate server')).toBeInTheDocument();
 		expect(screen.getByText('Delete')).toBeInTheDocument();
 	});
@@ -56,6 +58,7 @@ describe('NotConnectedState', () => {
 			refreshServersAfterDelete={refreshServers}
 			refreshServersAfterUpdate={handleRefreshAfterUpdate}
 			moduleKey={CONFIG_PAGE}
+			userIsAdmin={true}
 		/>);
 
 		fireEvent.click(screen.getByText('Delete'));

diff --git a/app/jenkins-for-jira-ui/src/components/ConnectionPanel/NotConnectedState.tsx b/app/jenkins-for-jira-ui/src/components/ConnectionPanel/NotConnectedState.tsx
@@ -9,7 +9,7 @@ import {
 import { JenkinsServer } from '../../../../src/common/types';
 import { disconnectJenkinsServer } from '../../api/disconnectJenkinsServer';
 import { ConnectionPanelContent } from './ConnectionPanelContent';
-import { DELETE_MODAL_TEST_ID, GLOBAL_PAGE } from '../../common/constants';
+import { CONFIG_PAGE, DELETE_MODAL_TEST_ID } from '../../common/constants';
 import { JenkinsModal } from '../JenkinsServerList/ConnectedServer/JenkinsModal';
 import { AnalyticsEventTypes, AnalyticsTrackEventsEnum } from '../../common/analytics/analytics-events';
 import { AnalyticsClient } from '../../common/analytics/analytics-client';
@@ -23,7 +23,8 @@ type NotConnectedStateProps = {
 	refreshServersAfterUpdate(serverUuidToUpdate: string): void,
 	uuidOfRefreshServer?: string,
 	isUpdatingServer?: boolean,
-	moduleKey: string
+	moduleKey: string,
+	userIsAdmin?: boolean
 };
 
 const NotConnectedState = ({
@@ -33,7 +34,8 @@ const NotConnectedState = ({
 	refreshServersAfterUpdate,
 	uuidOfRefreshServer,
 	isUpdatingServer,
-	moduleKey
+	moduleKey,
+	userIsAdmin
 }: NotConnectedStateProps): JSX.Element => {
 	const [serverToDeleteUuid, setServerToDeleteUuid] = useState<string>('');
 	const [isDeletingServer, setIsDeletingServer] = useState<boolean>(false);
@@ -79,9 +81,9 @@ const NotConnectedState = ({
 
 	let firstButtonLabel;
 
-	if (connectedState === ConnectedState.DUPLICATE && moduleKey !== GLOBAL_PAGE) {
+	if (connectedState === ConnectedState.DUPLICATE && (userIsAdmin || moduleKey === CONFIG_PAGE)) {
 		firstButtonLabel = 'Delete';
-	} else if (connectedState === ConnectedState.DUPLICATE && moduleKey === GLOBAL_PAGE) {
+	} else if (connectedState === ConnectedState.DUPLICATE && !userIsAdmin) {
 		firstButtonLabel = undefined;
 	} else {
 		firstButtonLabel = 'Refresh';