From cd5fe7c4181e185e8baa3921c485f69c17854562 Mon Sep 17 00:00:00 2001 From: Calvin Lee Date: Wed, 5 Jul 2023 19:26:07 +0000 Subject: [PATCH] Revert "feat: [code-566]: fix routing for commit list and diff page (#177)" This reverts commit 8cddf04706866d1681150ed96587318da3ebcb8d. --- web/config/moduleFederation.config.js | 3 +- web/src/RouteDefinitions.ts | 2 - .../CodeCommentStatusSelect.tsx | 6 +- .../components/CommitsView/CommitsView.tsx | 2 +- .../components/LatestCommit/LatestCommit.tsx | 4 +- .../PullRequestSideBar/PullRequestSideBar.tsx | 3 +- .../FolderContent/FolderContent.tsx | 2 +- .../BranchesContentHeader.tsx | 4 +- .../RepositoryCommit.module.scss | 18 ---- .../RepositoryCommit.module.scss.d.ts | 9 -- .../RepositoryCommit/RepositoryCommit.tsx | 87 ------------------- .../RepositoryCommits/RepositoryCommits.tsx | 40 ++++++++- .../TagsContent/TagsContent.tsx | 2 +- 13 files changed, 48 insertions(+), 134 deletions(-) delete mode 100644 web/src/pages/RepositoryCommit/RepositoryCommit.module.scss delete mode 100644 web/src/pages/RepositoryCommit/RepositoryCommit.module.scss.d.ts delete mode 100644 web/src/pages/RepositoryCommit/RepositoryCommit.tsx diff --git a/web/config/moduleFederation.config.js b/web/config/moduleFederation.config.js index 384ba5d64..dc095223e 100644 --- a/web/config/moduleFederation.config.js +++ b/web/config/moduleFederation.config.js @@ -28,10 +28,9 @@ module.exports = { './Repository': './src/pages/Repository/Repository.tsx', './FileEdit': './src/pages/RepositoryFileEdit/RepositoryFileEdit.tsx', './Commits': './src/pages/RepositoryCommits/RepositoryCommits.tsx', - './Commit': './src/pages/RepositoryCommit/RepositoryCommit.tsx', './Branches': './src/pages/RepositoryBranches/RepositoryBranches.tsx', './PullRequests': './src/pages/PullRequests/PullRequests.tsx', - './Tags': './src/pages/RepositoryTags/RepositoryTags.tsx', + './Tags':'./src/pages/RepositoryTags/RepositoryTags.tsx', './PullRequest': './src/pages/PullRequest/PullRequest.tsx', './Compare': './src/pages/Compare/Compare.tsx', './Settings': './src/pages/RepositorySettings/RepositorySettings.tsx', diff --git a/web/src/RouteDefinitions.ts b/web/src/RouteDefinitions.ts index cf0caa6a5..d1cd6c4ae 100644 --- a/web/src/RouteDefinitions.ts +++ b/web/src/RouteDefinitions.ts @@ -36,7 +36,6 @@ export interface CODERoutes { toCODERepository: (args: RequiredField, 'repoPath'>) => string toCODEFileEdit: (args: Required>) => string toCODECommits: (args: Required>) => string - toCODECommit: (args: Required>) => string toCODEPullRequests: (args: Required>) => string toCODEPullRequest: ( args: RequiredField< @@ -62,7 +61,6 @@ export const routes: CODERoutes = { `/${repoPath}/${gitRef ? '/' + gitRef : ''}${resourcePath ? '/~/' + resourcePath : ''}`, toCODEFileEdit: ({ repoPath, gitRef, resourcePath }) => `/${repoPath}/edit/${gitRef}/~/${resourcePath}`, toCODECommits: ({ repoPath, commitRef }) => `/${repoPath}/commits/${commitRef}`, - toCODECommit: ({ repoPath, commitRef }) => `/${repoPath}/commit/${commitRef}`, toCODEPullRequests: ({ repoPath }) => `/${repoPath}/pulls`, toCODEPullRequest: ({ repoPath, pullRequestId, pullRequestSection }) => `/${repoPath}/pulls/${pullRequestId}${pullRequestSection ? '/' + pullRequestSection : ''}`, diff --git a/web/src/components/CodeCommentStatusSelect/CodeCommentStatusSelect.tsx b/web/src/components/CodeCommentStatusSelect/CodeCommentStatusSelect.tsx index edd7a95be..fd75e0b6a 100644 --- a/web/src/components/CodeCommentStatusSelect/CodeCommentStatusSelect.tsx +++ b/web/src/components/CodeCommentStatusSelect/CodeCommentStatusSelect.tsx @@ -13,7 +13,7 @@ interface CodeCommentStatusSelectProps extends Pick[] onCommentUpdate: () => void - refetchActivities?: () => void + refetchActivities: () => void } export const CodeCommentStatusSelect: React.FC = ({ @@ -77,9 +77,7 @@ export const CodeCommentStatusSelect: React.FC = ( commentItems[0].payload.resolved = Date.now() } } - if (refetchActivities) { - refetchActivities() - } + refetchActivities() }) .catch(_exception => { showError(getErrorMessage(_exception), 0, getString('pr.failedToUpdateCommentStatus')) diff --git a/web/src/components/CommitsView/CommitsView.tsx b/web/src/components/CommitsView/CommitsView.tsx index dde8ba5a5..2b9870f95 100644 --- a/web/src/components/CommitsView/CommitsView.tsx +++ b/web/src/components/CommitsView/CommitsView.tsx @@ -87,7 +87,7 @@ export function CommitsView({ return ( { export function LatestCommitForFolder({ repoMetadata, latestCommit, standaloneStyle }: LatestCommitProps) { const { routes } = useAppContext() - const commitURL = routes.toCODECommit({ + const commitURL = routes.toCODECommits({ repoPath: repoMetadata.path as string, commitRef: latestCommit?.sha as string }) @@ -49,7 +49,7 @@ export function LatestCommitForFolder({ repoMetadata, latestCommit, standaloneSt export function LatestCommitForFile({ repoMetadata, latestCommit, standaloneStyle, size }: LatestCommitProps) { const { routes } = useAppContext() - const commitURL = routes.toCODECommit({ + const commitURL = routes.toCODECommits({ repoPath: repoMetadata.path as string, commitRef: latestCommit?.sha as string }) diff --git a/web/src/pages/PullRequest/Conversation/PullRequestSideBar/PullRequestSideBar.tsx b/web/src/pages/PullRequest/Conversation/PullRequestSideBar/PullRequestSideBar.tsx index 3f25fa813..37339d546 100644 --- a/web/src/pages/PullRequest/Conversation/PullRequestSideBar/PullRequestSideBar.tsx +++ b/web/src/pages/PullRequest/Conversation/PullRequestSideBar/PullRequestSideBar.tsx @@ -1,3 +1,4 @@ +import { noop } from 'lodash-es' import React from 'react' import { Container, @@ -11,8 +12,8 @@ import { IconName, useToaster } from '@harness/uicore' -import { useMutate } from 'restful-react' import { OptionsMenuButton } from 'components/OptionsMenuButton/OptionsMenuButton' +import { useMutate } from 'restful-react' import { useStrings } from 'framework/strings' import type { TypesPullReq, TypesRepository } from 'services/code' import { getErrorMessage } from 'utils/Utils' diff --git a/web/src/pages/Repository/RepositoryContent/FolderContent/FolderContent.tsx b/web/src/pages/Repository/RepositoryContent/FolderContent/FolderContent.tsx index 2bda8ada9..f565c0f70 100644 --- a/web/src/pages/Repository/RepositoryContent/FolderContent/FolderContent.tsx +++ b/web/src/pages/Repository/RepositoryContent/FolderContent/FolderContent.tsx @@ -50,7 +50,7 @@ export function FolderContent({ className={css.rowText} onClick={() => { history.push( - routes.toCODECommit({ + routes.toCODECommits({ repoPath: repoMetadata.path as string, commitRef: row.original.latest_commit?.sha as string }) diff --git a/web/src/pages/RepositoryBranches/RepositoryBranchesContent/BranchesContentHeader/BranchesContentHeader.tsx b/web/src/pages/RepositoryBranches/RepositoryBranchesContent/BranchesContentHeader/BranchesContentHeader.tsx index 44b3f0dc3..f0224f3e6 100644 --- a/web/src/pages/RepositoryBranches/RepositoryBranchesContent/BranchesContentHeader/BranchesContentHeader.tsx +++ b/web/src/pages/RepositoryBranches/RepositoryBranchesContent/BranchesContentHeader/BranchesContentHeader.tsx @@ -1,5 +1,5 @@ -import React, { useState } from 'react' -import { Container, Layout, FlexExpander, ButtonVariation } from '@harness/uicore' +import React, { useMemo, useState } from 'react' +import { Container, Layout, FlexExpander, DropDown, ButtonVariation } from '@harness/uicore' import { useStrings } from 'framework/strings' import { GitBranchType, CodeIcon, GitInfoProps } from 'utils/GitUtils' import { SearchInputWithSpinner } from 'components/SearchInputWithSpinner/SearchInputWithSpinner' diff --git a/web/src/pages/RepositoryCommit/RepositoryCommit.module.scss b/web/src/pages/RepositoryCommit/RepositoryCommit.module.scss deleted file mode 100644 index 19844121c..000000000 --- a/web/src/pages/RepositoryCommit/RepositoryCommit.module.scss +++ /dev/null @@ -1,18 +0,0 @@ -.main { - min-height: var(--page-min-height, 100%); - background-color: var(--primary-bg) !important; -} - -.resourceContent { - background-color: var(--primary-bg); -} - -.contentHeader { - > div { - align-items: center; - } -} - -.changesContainer { - padding: 0 0 var(--spacing-xlarge) 0 !important; -} diff --git a/web/src/pages/RepositoryCommit/RepositoryCommit.module.scss.d.ts b/web/src/pages/RepositoryCommit/RepositoryCommit.module.scss.d.ts deleted file mode 100644 index 181c271c5..000000000 --- a/web/src/pages/RepositoryCommit/RepositoryCommit.module.scss.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -/* eslint-disable */ -// this is an auto-generated file -declare const styles: { - readonly main: string - readonly resourceContent: string - readonly contentHeader: string - readonly changesContainer: string -} -export default styles diff --git a/web/src/pages/RepositoryCommit/RepositoryCommit.tsx b/web/src/pages/RepositoryCommit/RepositoryCommit.tsx deleted file mode 100644 index 43751fd50..000000000 --- a/web/src/pages/RepositoryCommit/RepositoryCommit.tsx +++ /dev/null @@ -1,87 +0,0 @@ -import React, { useMemo } from 'react' -import { Container, FlexExpander, Layout, PageBody } from '@harness/uicore' -import { useGet } from 'restful-react' -import { noop } from 'lodash-es' -import { useGetRepositoryMetadata } from 'hooks/useGetRepositoryMetadata' -import { useAppContext } from 'AppContext' -import type { TypesCommit } from 'services/code' -import { voidFn, getErrorMessage, LIST_FETCHING_LIMIT } from 'utils/Utils' -import { useStrings } from 'framework/strings' -import { RepositoryPageHeader } from 'components/RepositoryPageHeader/RepositoryPageHeader' -import { LoadingSpinner } from 'components/LoadingSpinner/LoadingSpinner' -import { Changes } from 'components/Changes/Changes' -import CommitInfo from 'components/CommitInfo/CommitInfo' -import css from './RepositoryCommit.module.scss' - -export default function RepositoryCommits() { - const { repoMetadata, error, loading, commitRef, refetch } = useGetRepositoryMetadata() - const { routes } = useAppContext() - const { getString } = useStrings() - - const { - data: commits, - error: errorCommits, - loading: loadingCommits - } = useGet<{ commits: TypesCommit[] }>({ - path: `/api/v1/repos/${repoMetadata?.path}/+/commits`, - queryParams: { - limit: LIST_FETCHING_LIMIT, - git_ref: commitRef || repoMetadata?.default_branch - }, - lazy: !repoMetadata - }) - - const ChangesTab = useMemo(() => { - if (repoMetadata) { - return ( - - - - ) - } - }, [repoMetadata, commitRef, getString]) - - return ( - - - - - - {(repoMetadata && commitRef && !!commits?.commits?.length && ( - - - - - - - - {ChangesTab} - - )) || - null} - - - ) -} diff --git a/web/src/pages/RepositoryCommits/RepositoryCommits.tsx b/web/src/pages/RepositoryCommits/RepositoryCommits.tsx index 2c88242f8..ffec0d9f4 100644 --- a/web/src/pages/RepositoryCommits/RepositoryCommits.tsx +++ b/web/src/pages/RepositoryCommits/RepositoryCommits.tsx @@ -1,7 +1,8 @@ -import React, { useEffect } from 'react' +import React, { useEffect, useMemo } from 'react' import { Container, FlexExpander, Layout, PageBody } from '@harness/uicore' import { useHistory } from 'react-router-dom' import { useGet } from 'restful-react' +import { noop } from 'lodash-es' import { useGetRepositoryMetadata } from 'hooks/useGetRepositoryMetadata' import { useAppContext } from 'AppContext' import { usePageIndex } from 'hooks/usePageIndex' @@ -15,6 +16,8 @@ import { LoadingSpinner } from 'components/LoadingSpinner/LoadingSpinner' import { ResourceListingPagination } from 'components/ResourceListingPagination/ResourceListingPagination' import { BranchTagSelect } from 'components/BranchTagSelect/BranchTagSelect' import { CommitsView } from 'components/CommitsView/CommitsView' +import { Changes } from 'components/Changes/Changes' +import CommitInfo from 'components/CommitInfo/CommitInfo' import css from './RepositoryCommits.module.scss' export default function RepositoryCommits() { @@ -49,6 +52,24 @@ export default function RepositoryCommits() { } }, [setPage]) // eslint-disable-line react-hooks/exhaustive-deps + const ChangesTab = useMemo(() => { + if (repoMetadata) { + return ( + + + + ) + } + }, [repoMetadata, commitRef, getString, response]) + return ( - - {(repoMetadata && !!commits?.commits?.length && ( + {(repoMetadata && commitRef && !pageBrowser.page && !!commits?.commits?.length && ( + + + + + + + + {ChangesTab} + + )) || + null} + {(repoMetadata && (!commitRef || pageBrowser.page) && !!commits?.commits?.length && ( @@ -84,7 +116,7 @@ export default function RepositoryCommits() { history.push( routes.toCODECommits({ repoPath: repoMetadata.path as string, - commitRef: `${ref}` + commitRef: `${ref}?page=1` }) ) }} diff --git a/web/src/pages/RepositoryTags/TagsContent/TagsContent.tsx b/web/src/pages/RepositoryTags/TagsContent/TagsContent.tsx index f0f22bcf8..25d30513d 100644 --- a/web/src/pages/RepositoryTags/TagsContent/TagsContent.tsx +++ b/web/src/pages/RepositoryTags/TagsContent/TagsContent.tsx @@ -78,7 +78,7 @@ export function TagsContent({ repoMetadata, searchTerm = '', branches, onDeleteS return (