Revert "GitHub Deployments: Fix routing problems (#87860)" (#87862)

This reverts commit 79fff71.
Automattic · Apr 22, 2024 · 6898452 · 6898452
1 parent 558247d
commit 6898452
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 59 deletions.
diff --git a/client/my-sites/github-deployments/components/repositories/browse-repositories.tsx b/client/my-sites/github-deployments/components/repositories/browse-repositories.tsx
@@ -71,7 +71,7 @@ export const GitHubBrowseRepositories = ( {
 					onChange={ setInstallation }
 				/>
 				<SearchRepos value={ query } onChange={ handleQueryChange } />
-				<Button onClick={ handleCreateRepository } css={ { height: '100%', marginLeft: 'auto' } }>
+				<Button onClick={ handleCreateRepository } css={ { marginLeft: 'auto' } }>
 					{ __( 'Create new repository' ) }
 				</Button>
 			</div>

diff --git a/...ate-repository/create-repository-form.tsx → ...ate-repository/create-repository-form.tsx b/...ate-repository/create-repository-form.tsx → ...ate-repository/create-repository-form.tsx
@@ -7,15 +7,12 @@ import FormSettingExplanation from 'calypso/components/forms/form-setting-explan
 import FormTextInput from 'calypso/components/forms/form-text-input';
 import { GitHubInstallationsDropdown } from 'calypso/my-sites/github-deployments/components/installations-dropdown';
 import { useLiveInstallations } from 'calypso/my-sites/github-deployments/components/installations-dropdown/use-live-installations';
-import {
-	FormRadioWithTemplateSelect,
-	ProjectType,
-} from '../components/form-radio-with-template-select';
+import { MutationVariables as CreateDeploymentMutationVariables } from '../../../deployment-creation/use-create-code-deployment';
+import { FormRadioWithTemplateSelect, ProjectType } from '../../form-radio-with-template-select';
 import {
 	RepositoryTemplate,
 	repositoryTemplates,
-} from '../components/form-radio-with-template-select/templates';
-import { MutationVariables as CreateDeploymentMutationVariables } from '../deployment-creation/use-create-code-deployment';
+} from '../../form-radio-with-template-select/templates';
 import { DeploymentStyleDescription } from './deployment-style-description';
 import { MutationVariables as CreateRepositoryMutationVariables } from './use-create-repository';
 

diff --git a/...ry/deployment-style-description/index.tsx → ...ry/deployment-style-description/index.tsx b/...ry/deployment-style-description/index.tsx → ...ry/deployment-style-description/index.tsx
@@ -1,7 +1,7 @@
 import { Spinner } from '@automattic/components';
 import { useI18n } from '@wordpress/react-i18n';
-import { CodeHighlighter } from '../../components/code-highlighter';
-import { useGetWorkflowContents } from '../../components/deployment-style/use-get-workflow-contents-query';
+import { CodeHighlighter } from '../../../code-highlighter';
+import { useGetWorkflowContents } from '../../../deployment-style/use-get-workflow-contents-query';
 
 import './style.scss';
 

diff --git a/...y/deployment-style-description/style.scss → ...y/deployment-style-description/style.scss b/...y/deployment-style-description/style.scss → ...y/deployment-style-description/style.scss
diff --git a/...b-deployments/create-repository/index.tsx → .../repositories/create-repository/index.tsx b/...b-deployments/create-repository/index.tsx → .../repositories/create-repository/index.tsx
@@ -4,12 +4,12 @@ import { useI18n } from '@wordpress/react-i18n';
 import ActionPanel from 'calypso/components/action-panel';
 import ActionPanelBody from 'calypso/components/action-panel/body';
 import HeaderCake from 'calypso/components/header-cake';
-import { createDeploymentPage, indexPage } from 'calypso/my-sites/github-deployments/routes';
+import { indexPage } from 'calypso/my-sites/github-deployments/routes';
 import { useDispatch, useSelector } from 'calypso/state/index';
 import { errorNotice, successNotice } from 'calypso/state/notices/actions';
 import { getSelectedSiteId, getSelectedSiteSlug } from 'calypso/state/ui/selectors/index';
-import { PageShell } from '../components/page-shell';
-import { useCreateCodeDeployment } from '../deployment-creation/use-create-code-deployment';
+import { useCreateCodeDeployment } from '../../../deployment-creation/use-create-code-deployment';
+import { PageShell } from '../../page-shell';
 import { CreateRepositoryForm, OnRepositoryCreatedParams } from './create-repository-form';
 import { useCreateRepository } from './use-create-repository';
 
@@ -77,7 +77,7 @@ export const CreateRepository = () => {
 
 	return (
 		<PageShell pageTitle={ __( 'Create repository' ) }>
-			<HeaderCake onClick={ () => page( createDeploymentPage( siteSlug! ) ) } isCompact>
+			<HeaderCake onClick={ () => history.back() } isCompact>
 				<h1>{ __( 'Create repository' ) }</h1>
 			</HeaderCake>
 			<ActionPanel>

diff --git a/...-deployments/create-repository/style.scss → ...repositories/create-repository/style.scss b/...-deployments/create-repository/style.scss → ...repositories/create-repository/style.scss
diff --git a/...reate-repository/use-create-repository.ts → ...reate-repository/use-create-repository.ts b/...reate-repository/use-create-repository.ts → ...reate-repository/use-create-repository.ts
diff --git a/client/my-sites/github-deployments/components/repositories/repository-list-item.tsx b/client/my-sites/github-deployments/components/repositories/repository-list-item.tsx
@@ -15,21 +15,11 @@ export const GitHubRepositoryListItem = ( {
 	onSelect,
 }: GitHubRepositoryListItemProps ) => {
 	const locale = useLocale();
-
-	const repoUrl = `https://github.com/${ repository.owner }/${ repository.name }`;
-
 	return (
 		<tr>
 			<td>
 				<span css={ { fontWeight: 500 } }>
-					<a
-						className="github-deployments-repository-list-table__repo-name"
-						href={ repoUrl }
-						target="_blank"
-						rel="noopener noreferrer"
-					>
-						{ repository.name }
-					</a>{ ' ' }
+					{ repository.name }{ ' ' }
 					{ repository.private && (
 						<Icon icon={ lock } size={ 16 } css={ { verticalAlign: 'middle' } } />
 					) }

diff --git a/client/my-sites/github-deployments/components/repositories/style.scss b/client/my-sites/github-deployments/components/repositories/style.scss
@@ -84,12 +84,4 @@
 	tr td:last-child {
 		text-align: right;
 	}
-
-	&__repo-name {
-		color: inherit !important;
-
-		&:hover {
-			text-decoration: underline;
-		}
-	}
 }
diff --git a/client/my-sites/github-deployments/controller.tsx b/client/my-sites/github-deployments/controller.tsx
@@ -1,13 +1,13 @@
 import { __ } from '@wordpress/i18n';
 import { PageViewTracker } from 'calypso/lib/analytics/page-view-tracker';
+import { CreateRepository } from 'calypso/my-sites/github-deployments/components/repositories/create-repository/index';
+import { DeploymentRunsLogs } from 'calypso/my-sites/github-deployments/deployment-run-logs/index';
 import { errorNotice } from 'calypso/state/notices/actions';
 import { isJetpackSite } from 'calypso/state/sites/selectors';
 import { getSelectedSiteId, getSelectedSiteSlug } from 'calypso/state/ui/selectors';
 import { canCurrentUser } from '../../state/selectors/can-current-user';
-import { CreateRepository } from './create-repository';
 import { GitHubDeploymentCreation } from './deployment-creation';
 import { GitHubDeploymentManagement } from './deployment-management';
-import { DeploymentRunsLogs } from './deployment-run-logs';
 import { GitHubDeployments } from './deployments';
 import { indexPage } from './routes';
 import {

diff --git a/client/my-sites/github-deployments/deployment-creation/deployment-creation-form.tsx b/client/my-sites/github-deployments/deployment-creation/deployment-creation-form.tsx
@@ -73,7 +73,7 @@ export const GitHubDeploymentCreationForm = ( {
 			installation={ installation }
 			repository={ repository }
 			changeRepository={ () => {
-				page( createDeploymentPage( siteSlug!, { installationId } ) );
+				page.replace( createDeploymentPage( siteSlug!, { installationId } ) );
 			} }
 			onSubmit={ ( {
 				externalRepositoryId,

diff --git a/client/my-sites/github-deployments/deployment-creation/index.tsx b/client/my-sites/github-deployments/deployment-creation/index.tsx
@@ -1,12 +1,11 @@
 import page from '@automattic/calypso-router';
 import { __ } from '@wordpress/i18n';
 import { useSelector } from 'calypso/state';
-import { getSelectedSiteId, getSelectedSiteSlug } from 'calypso/state/ui/selectors';
+import { getSelectedSiteSlug } from 'calypso/state/ui/selectors';
 import ActionPanel from '../../../components/action-panel';
 import HeaderCake from '../../../components/header-cake';
 import { PageShell } from '../components/page-shell';
 import { GitHubBrowseRepositories } from '../components/repositories/browse-repositories';
-import { useCodeDeploymentsQuery } from '../deployments/use-code-deployments-query';
 import { createDeploymentPage, indexPage } from '../routes';
 import { GitHubDeploymentCreationForm } from './deployment-creation-form';
 
@@ -19,28 +18,10 @@ export const GitHubDeploymentCreation = ( {
 	installationId,
 	repositoryId,
 }: GitHubConnectedProps ) => {
-	const siteId = useSelector( getSelectedSiteId );
 	const siteSlug = useSelector( getSelectedSiteSlug );
 
-	const { data } = useCodeDeploymentsQuery( siteId! );
-
-	const goToDeployments = () => page( indexPage( siteSlug! ) );
-
-	const goToRepositorySelection = () =>
-		page(
-			createDeploymentPage( siteSlug!, {
-				installationId: installationId,
-			} )
-		);
-
-	const getBackButton = () => {
-		if ( installationId && repositoryId ) {
-			return goToRepositorySelection;
-		}
-
-		if ( data?.length ) {
-			return goToDeployments;
-		}
+	const goToDeployments = () => {
+		page( indexPage( siteSlug! ) );
 	};
 
 	const renderContent = () => {
@@ -56,7 +37,7 @@ export const GitHubDeploymentCreation = ( {
 					<GitHubBrowseRepositories
 						initialInstallationId={ installationId }
 						onSelectRepository={ ( installation, repository ) => {
-							page(
+							page.replace(
 								createDeploymentPage( siteSlug!, {
 									installationId: installation.external_id,
 									repositoryId: repository.id,
@@ -71,7 +52,7 @@ export const GitHubDeploymentCreation = ( {
 
 	return (
 		<PageShell pageTitle={ __( 'Connect GitHub repository' ) }>
-			<HeaderCake onClick={ getBackButton() } isCompact>
+			<HeaderCake onClick={ goToDeployments } isCompact>
 				<h1>{ __( 'Connect repository' ) }</h1>
 			</HeaderCake>
 			<ActionPanel>{ renderContent() }</ActionPanel>