diff --git a/web/src/components/SpaceSelector/SpaceSelector.tsx b/web/src/components/SpaceSelector/SpaceSelector.tsx index 325fb1fb7..f72b8df2a 100644 --- a/web/src/components/SpaceSelector/SpaceSelector.tsx +++ b/web/src/components/SpaceSelector/SpaceSelector.tsx @@ -187,9 +187,9 @@ export const SpaceSelector: React.FC = ({ onSelect }) => { className={css.table} columns={columns} data={spaces || []} - onRowClick={data => { + onRowClick={spaceData => { setOpened(false) - selectSpace({ uid: data?.space?.uid, path: data?.space?.path }, true) + selectSpace({ uid: spaceData?.space?.uid, path: spaceData?.space?.path }, true) }} getRowClassName={row => cx(css.row, !row.original.space.description && css.noDesc)} /> diff --git a/web/src/pages/PullRequest/Conversation/Conversation.module.scss b/web/src/pages/PullRequest/Conversation/Conversation.module.scss index f0e02c162..4075168b4 100644 --- a/web/src/pages/PullRequest/Conversation/Conversation.module.scss +++ b/web/src/pages/PullRequest/Conversation/Conversation.module.scss @@ -182,3 +182,8 @@ color: var(--orange-300); } } + +.commitLink { + text-decoration: underline; + color: var(--primary-7) !important; +} diff --git a/web/src/pages/PullRequest/Conversation/Conversation.module.scss.d.ts b/web/src/pages/PullRequest/Conversation/Conversation.module.scss.d.ts index cc4255f4d..d9b0f55c4 100644 --- a/web/src/pages/PullRequest/Conversation/Conversation.module.scss.d.ts +++ b/web/src/pages/PullRequest/Conversation/Conversation.module.scss.d.ts @@ -24,5 +24,6 @@ declare const styles: { readonly bp3Icon: string readonly repeatBtn: string readonly bp3ButtonText: string + readonly commitLink: string } export default styles diff --git a/web/src/pages/PullRequest/Conversation/Conversation.tsx b/web/src/pages/PullRequest/Conversation/Conversation.tsx index 8602c2f1f..e5430e869 100644 --- a/web/src/pages/PullRequest/Conversation/Conversation.tsx +++ b/web/src/pages/PullRequest/Conversation/Conversation.tsx @@ -202,6 +202,7 @@ export const Conversation: React.FC = ({ key={`system-${threadId}`} pullRequestMetadata={pullRequestMetadata} commentItems={commentItems} + repoMetadataPath={repoMetadata.path} /> }> ) diff --git a/web/src/pages/PullRequest/Conversation/SystemComment.tsx b/web/src/pages/PullRequest/Conversation/SystemComment.tsx index 7abe57d13..95654339a 100644 --- a/web/src/pages/PullRequest/Conversation/SystemComment.tsx +++ b/web/src/pages/PullRequest/Conversation/SystemComment.tsx @@ -12,6 +12,7 @@ import { } from '@harness/uicore' import ReactTimeago from 'react-timeago' import { Render } from 'react-jsx-match' +import { Link } from 'react-router-dom' import { CodeIcon, GitInfoProps } from 'utils/GitUtils' import { MarkdownViewer } from 'components/MarkdownViewer/MarkdownViewer' import { useStrings } from 'framework/strings' @@ -19,16 +20,23 @@ import type { TypesPullReqActivity } from 'services/code' import type { CommentItem } from 'components/CommentBox/CommentBox' import { formatDate, formatTime } from 'utils/Utils' import { CommentType } from 'components/DiffViewer/DiffViewerUtils' +import { useAppContext } from 'AppContext' import css from './Conversation.module.scss' interface SystemCommentProps extends Pick { commentItems: CommentItem[] + repoMetadataPath?: string } -export const SystemComment: React.FC = ({ pullRequestMetadata, commentItems }) => { +export const SystemComment: React.FC = ({ + pullRequestMetadata, + commentItems, + repoMetadataPath +}) => { const { getString } = useStrings() const payload = commentItems[0].payload const type = payload?.type + const { routes } = useAppContext() switch (type) { case CommentType.MERGE: { @@ -92,7 +100,16 @@ export const SystemComment: React.FC = ({ pullRequestMetadat str={getString('pr.prBranchPushInfo')} vars={{ user: {payload?.author?.display_name}, - commit: {(payload?.payload as Unknown)?.new} + commit: ( + + {(payload?.payload as Unknown)?.new.substring(0, 6)} + + ) }} /> diff --git a/web/src/pages/SignUp/SignUp.tsx b/web/src/pages/SignUp/SignUp.tsx index 480566b93..d29b32f8b 100644 --- a/web/src/pages/SignUp/SignUp.tsx +++ b/web/src/pages/SignUp/SignUp.tsx @@ -52,7 +52,7 @@ export const SignUp: React.FC = () => { showError(getErrorMessage(error)) }) }, - [mutate, setToken, showSuccess, showError, history, getString] + [mutate, setToken, showSuccess, showError, getString] ) const handleSubmit = (data: RegisterForm): void => {