diff --git a/web/src/components/Changes/Changes.tsx b/web/src/components/Changes/Changes.tsx index 7effd863d..2cd56501a 100644 --- a/web/src/components/Changes/Changes.tsx +++ b/web/src/components/Changes/Changes.tsx @@ -14,6 +14,7 @@ import { Match, Case, Render } from 'react-jsx-match' import * as Diff2Html from 'diff2html' import cx from 'classnames' import { useGet } from 'restful-react' +import { noop } from 'lodash-es' import { useStrings } from 'framework/strings' import type { GitInfoProps } from 'utils/GitUtils' import { formatNumber, getErrorMessage, voidFn } from 'utils/Utils' @@ -214,6 +215,7 @@ export const Changes: React.FC = ({ shouldHide={readOnly || pullRequestMetadata?.state === 'merged'} repoMetadata={repoMetadata} pullRequestMetadata={pullRequestMetadata} + refreshPr={voidFn(noop)} /> {/* void diff --git a/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx b/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx index 528bedf61..fb338f2ff 100644 --- a/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx +++ b/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx @@ -50,6 +50,8 @@ export const PullRequestActionsBox: React.FC = ({ }) => { const { getString } = useStrings() const { showError } = useToaster() + const { hooks, standalone } = useAppContext() + const space = useGetSpaceParam() const { mutate: mergePR, loading } = useMutate({ verb: 'POST', path: `/api/v1/repos/${repoMetadata.path}/+/pullreq/${pullRequestMetadata.number}/merge` @@ -88,8 +90,6 @@ export const PullRequestActionsBox: React.FC = ({ if (pullRequestMetadata.state === PullRequestFilterOption.MERGED) { return } - const { hooks, standalone } = useAppContext() - const space = useGetSpaceParam() const permPushResult = hooks?.usePermissionTranslate?.( { diff --git a/web/src/pages/Repository/Repository.tsx b/web/src/pages/Repository/Repository.tsx index 8aeae99ff..d7527f7ea 100644 --- a/web/src/pages/Repository/Repository.tsx +++ b/web/src/pages/Repository/Repository.tsx @@ -24,12 +24,12 @@ import { CodeIcon, GitInfoProps } from 'utils/GitUtils' import { useDisableCodeMainLinks } from 'hooks/useDisableCodeMainLinks' import { useGetSpaceParam } from 'hooks/useGetSpaceParam' import { Images } from 'images' +import { CopyButton } from 'components/CopyButton/CopyButton' +import CloneCredentialDialog from 'components/CloneCredentialDialog/CloneCredentialDialog' import { RepositoryContent } from './RepositoryContent/RepositoryContent' import { RepositoryHeader } from './RepositoryHeader/RepositoryHeader' import { ContentHeader } from './RepositoryContent/ContentHeader/ContentHeader' import css from './Repository.module.scss' -import { CopyButton } from 'components/CopyButton/CopyButton' -import CloneCredentialDialog from 'components/CloneCredentialDialog/CloneCredentialDialog' export default function Repository() { const { gitRef, resourcePath, repoMetadata, error, loading, refetch } = useGetRepositoryMetadata()