github/drone
5
0
Fork 0
mirror of https://github.com/harness/drone.git synced 2025-05-09 22:02:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'code-286-comments' of _OKE5H2PQKOUfzFFDuD4FA/default/CODE/gitness (#105)

Browse Source
This commit is contained in:
Calvin Lee 2023-05-30 22:06:38 +00:00 committed by Harness
commit b6d0a97f19
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web/src/components/CreateTagModal/CreateTagModal.tsx
View File

@ -147,7 +147,6 @@ export function useCreateTagModal({
repoMetadata={repoMetadata} repoMetadata={repoMetadata}
disableBranchCreation disableBranchCreation
disableViewAllBranches disableViewAllBranches
forBranchesOnly
gitRef={sourceBranch} gitRef={sourceBranch}
onSelect={setSourceBranch} onSelect={setSourceBranch}
/> />

2
web/src/pages/RepositoryTags/RepositoryTagsContentHeader/RepositoryTagsContentHeader.tsx
View File

@ -23,11 +23,11 @@ export function RepositoryTagsContentHeader({
const { getString } = useStrings() const { getString } = useStrings()
const [searchTerm, setSearchTerm] = useState('') const [searchTerm, setSearchTerm] = useState('')
return ( return (
<Container className={css.main}> <Container className={css.main}>
<Layout.Horizontal spacing="medium"> <Layout.Horizontal spacing="medium">
<SearchInputWithSpinner <SearchInputWithSpinner
spinnerPosition="right"
loading={loading} loading={loading}
query={searchTerm} query={searchTerm}
setQuery={value => { setQuery={value => {

15
web/src/pages/RepositoryTags/TagsContent/TagsContent.tsx
View File

@ -21,6 +21,7 @@ import type {
OpenapiCalculateCommitDivergenceRequest, OpenapiCalculateCommitDivergenceRequest,
RepoBranch, RepoBranch,
RepoCommitDivergence, RepoCommitDivergence,
RepoCommitTag,
TypesRepository TypesRepository
} from 'services/code' } from 'services/code'
import { formatDate, getErrorMessage, voidFn } from 'utils/Utils' import { formatDate, getErrorMessage, voidFn } from 'utils/Utils'
@ -28,7 +29,7 @@ import { useConfirmAction } from 'hooks/useConfirmAction'
import { OptionsMenuButton } from 'components/OptionsMenuButton/OptionsMenuButton' import { OptionsMenuButton } from 'components/OptionsMenuButton/OptionsMenuButton'
import { useCreateBranchModal } from 'components/CreateBranchModal/CreateBranchModal' import { useCreateBranchModal } from 'components/CreateBranchModal/CreateBranchModal'
import { CommitActions } from 'components/CommitActions/CommitActions' import { CommitActions } from 'components/CommitActions/CommitActions'
import { CodeIcon } from 'utils/GitUtils' import { CodeIcon, REFS_TAGS_PREFIX } from 'utils/GitUtils'
import css from './TagsContent.module.scss' import css from './TagsContent.module.scss'
interface TagsContentProps { interface TagsContentProps {
@ -63,7 +64,7 @@ export function TagsContent({ repoMetadata, searchTerm = '', branches, onDeleteS
} }
}, [getBranchDivergence, branchDivergenceRequestBody]) }, [getBranchDivergence, branchDivergenceRequestBody])
const onSuccess = voidFn(noop) const onSuccess = voidFn(noop)
const openModal = useCreateBranchModal({ repoMetadata, onSuccess }) const openModal = useCreateBranchModal({ repoMetadata, onSuccess,showSuccessMessage: true })
const columns: Column<RepoBranch>[] = useMemo( const columns: Column<RepoBranch>[] = useMemo(
() => [ () => [
@ -110,12 +111,12 @@ export function TagsContent({ repoMetadata, searchTerm = '', branches, onDeleteS
{ {
Header: getString('tagger'), Header: getString('tagger'),
width: '20%', width: '20%',
Cell: ({ row }: CellProps<RepoBranch>) => { Cell: ({ row }: CellProps<RepoCommitTag>) => {
return ( return (
<Text className={css.rowText} color={Color.BLACK} tag="div"> <Text className={css.rowText} color={Color.BLACK} tag="div">
<Avatar hoverCard={false} size="small" name={row.original.commit?.author?.identity?.name || ''} /> <Avatar hoverCard={false} size="small" name={row.original.commit?.author?.identity?.name || ''} />
<span className={css.spacer} /> <span className={css.spacer} />
{row.original.commit?.author?.identity?.name || ''} {row.original.tagger?.identity?.name || ''}
</Text> </Text>
) )
} }
@ -123,11 +124,11 @@ export function TagsContent({ repoMetadata, searchTerm = '', branches, onDeleteS
{ {
Header: getString('creationDate'), Header: getString('creationDate'),
width: '200px', width: '200px',
Cell: ({ row }: CellProps<RepoBranch>) => { Cell: ({ row }: CellProps<RepoCommitTag>) => {
return ( return (
<Text className={css.rowText} color={Color.BLACK} tag="div"> <Text className={css.rowText} color={Color.BLACK} tag="div">
<span className={css.spacer} /> <span className={css.spacer} />
{formatDate(row.original.commit?.author?.when as string)} {formatDate(row.original.tagger?.when as string)}
</Text> </Text>
) )
} }
@ -179,7 +180,7 @@ export function TagsContent({ repoMetadata, searchTerm = '', branches, onDeleteS
history.push( history.push(
routes.toCODERepository({ routes.toCODERepository({
repoPath: repoMetadata.path as string, repoPath: repoMetadata.path as string,
gitRef: row.original?.name gitRef: `${REFS_TAGS_PREFIX}${row.original?.name}`
}) })
) )
} }