github/drone
5
0
Fork 0
mirror of https://github.com/harness/drone.git synced 2025-05-13 15:40:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'code-213-part2' of _OKE5H2PQKOUfzFFDuD4FA/default/CODE/gitness (#41)

Browse Source
This commit is contained in:
Calvin Lee 2023-04-24 22:14:00 +00:00 committed by Harness
commit 9c995d87a0
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/components/Changes/Changes.tsx
View File

@ -14,6 +14,7 @@ import { Match, Case, Render } from 'react-jsx-match'
import * as Diff2Html from 'diff2html' import * as Diff2Html from 'diff2html'
import cx from 'classnames' import cx from 'classnames'
import { useGet } from 'restful-react' import { useGet } from 'restful-react'
import { noop } from 'lodash-es'
import { useStrings } from 'framework/strings' import { useStrings } from 'framework/strings'
import type { GitInfoProps } from 'utils/GitUtils' import type { GitInfoProps } from 'utils/GitUtils'
import { formatNumber, getErrorMessage, voidFn } from 'utils/Utils' import { formatNumber, getErrorMessage, voidFn } from 'utils/Utils'
@ -214,6 +215,7 @@ export const Changes: React.FC<ChangesProps> = ({
shouldHide={readOnly || pullRequestMetadata?.state === 'merged'} shouldHide={readOnly || pullRequestMetadata?.state === 'merged'}
repoMetadata={repoMetadata} repoMetadata={repoMetadata}
pullRequestMetadata={pullRequestMetadata} pullRequestMetadata={pullRequestMetadata}
refreshPr={voidFn(noop)}
/> />
{/* <ReviewDecisionButton {/* <ReviewDecisionButton
repoMetadata={repoMetadata} repoMetadata={repoMetadata}

2
web/src/components/CloneCredentialDialog/CloneCredentialDialog.tsx
View File

@ -10,13 +10,13 @@ import {
Text, Text,
useToaster useToaster
} from '@harness/uicore' } from '@harness/uicore'
import { useHistory } from 'react-router-dom'
import { useStrings } from 'framework/strings' import { useStrings } from 'framework/strings'
import { CopyButton } from 'components/CopyButton/CopyButton' import { CopyButton } from 'components/CopyButton/CopyButton'
import { CodeIcon } from 'utils/GitUtils' import { CodeIcon } from 'utils/GitUtils'
import { useAppContext } from 'AppContext' import { useAppContext } from 'AppContext'
import { generateAlphaNumericHash } from 'utils/Utils' import { generateAlphaNumericHash } from 'utils/Utils'
import css from './CloneCredentialDialog.module.scss' import css from './CloneCredentialDialog.module.scss'
import { useHistory } from 'react-router-dom'
interface CloneCredentialDialogProps { interface CloneCredentialDialogProps {
setFlag: (val: boolean) => void setFlag: (val: boolean) => void

4
web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx
View File

@ -50,6 +50,8 @@ export const PullRequestActionsBox: React.FC<PullRequestActionsBoxProps> = ({
}) => { }) => {
const { getString } = useStrings() const { getString } = useStrings()
const { showError } = useToaster() const { showError } = useToaster()
const { hooks, standalone } = useAppContext()
const space = useGetSpaceParam()
const { mutate: mergePR, loading } = useMutate({ const { mutate: mergePR, loading } = useMutate({
verb: 'POST', verb: 'POST',
path: `/api/v1/repos/${repoMetadata.path}/+/pullreq/${pullRequestMetadata.number}/merge` path: `/api/v1/repos/${repoMetadata.path}/+/pullreq/${pullRequestMetadata.number}/merge`
@ -88,8 +90,6 @@ export const PullRequestActionsBox: React.FC<PullRequestActionsBoxProps> = ({
if (pullRequestMetadata.state === PullRequestFilterOption.MERGED) { if (pullRequestMetadata.state === PullRequestFilterOption.MERGED) {
return <MergeInfo pullRequestMetadata={pullRequestMetadata} /> return <MergeInfo pullRequestMetadata={pullRequestMetadata} />
} }
const { hooks, standalone } = useAppContext()
const space = useGetSpaceParam()
const permPushResult = hooks?.usePermissionTranslate?.( const permPushResult = hooks?.usePermissionTranslate?.(
{ {

4
web/src/pages/Repository/Repository.tsx
View File

@ -24,12 +24,12 @@ import { CodeIcon, GitInfoProps } from 'utils/GitUtils'
import { useDisableCodeMainLinks } from 'hooks/useDisableCodeMainLinks' import { useDisableCodeMainLinks } from 'hooks/useDisableCodeMainLinks'
import { useGetSpaceParam } from 'hooks/useGetSpaceParam' import { useGetSpaceParam } from 'hooks/useGetSpaceParam'
import { Images } from 'images' import { Images } from 'images'
import { CopyButton } from 'components/CopyButton/CopyButton'
import CloneCredentialDialog from 'components/CloneCredentialDialog/CloneCredentialDialog'
import { RepositoryContent } from './RepositoryContent/RepositoryContent' import { RepositoryContent } from './RepositoryContent/RepositoryContent'
import { RepositoryHeader } from './RepositoryHeader/RepositoryHeader' import { RepositoryHeader } from './RepositoryHeader/RepositoryHeader'
import { ContentHeader } from './RepositoryContent/ContentHeader/ContentHeader' import { ContentHeader } from './RepositoryContent/ContentHeader/ContentHeader'
import css from './Repository.module.scss' import css from './Repository.module.scss'
import { CopyButton } from 'components/CopyButton/CopyButton'
import CloneCredentialDialog from 'components/CloneCredentialDialog/CloneCredentialDialog'
export default function Repository() { export default function Repository() {
const { gitRef, resourcePath, repoMetadata, error, loading, refetch } = useGetRepositoryMetadata() const { gitRef, resourcePath, repoMetadata, error, loading, refetch } = useGetRepositoryMetadata()