USEFULL/drone
1
0
Fork 0
mirror of https://github.com/harness/drone.git synced 2025-05-31 11:43:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: [code-241]: fix filtering and rbac on pr page

Browse Source
This commit is contained in:
calvin 2023-04-19 17:33:45 -06:00
parent 961cf14fd2
commit 7134529e12
6 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,7 +150,7 @@ export const Changes: React.FC<ChangesProps> = ({
return (
<Container className={cx(css.container, className)} {...(!!loading || !!error ? { flex: true } : {})}>
<LoadingSpinner visible={loading || loadingActivities} />
<LoadingSpinner visible={loading || loadingActivities} withBorder={true} />
<Render when={error}>
<PageError message={getErrorMessage(error || errorActivities)} onClick={voidFn(refetch)} />
</Render>

2
web/src/components/LoadingSpinner/LoadingSpinner.module.scss
View File

@ -9,7 +9,7 @@
align-items: center;
justify-content: center;
z-index: 3;
z-index: 4;
&.withBorder {
background: var(--white) !important;

1
web/src/pages/PullRequest/Conversation/Conversation.tsx
View File

@ -251,6 +251,7 @@ export const Conversation: React.FC<ConversationProps> = ({
className={css.selectButton}
onChange={newState => {
setPrShowState(newState)
refetchActivities()
}}
/>
</Container>

2
web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.module.scss
View File

@ -86,7 +86,7 @@
--background-color-active: var(--grey-100) !important;
}
button {
a, button {
--background-color: var(--green-800) !important;
--background-color-hover: var(--green-900) !important;
--background-color-active: var(--green-900) !important;

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

@ -26,7 +26,9 @@ import type {
} from 'services/code'
import { useStrings } from 'framework/strings'
import { CodeIcon, GitInfoProps, PullRequestFilterOption, PullRequestState } from 'utils/GitUtils'
import { getErrorMessage } from 'utils/Utils'
import { useGetSpaceParam } from 'hooks/useGetSpaceParam'
import { useAppContext } from 'AppContext'
import { getErrorMessage, permissionProps } from 'utils/Utils'
import ReviewSplitButton from 'components/Changes/ReviewSplitButton/ReviewSplitButton'
import css from './PullRequestActionsBox.module.scss'
@ -86,6 +88,18 @@ export const PullRequestActionsBox: React.FC<PullRequestActionsBoxProps> = ({
if (pullRequestMetadata.state === PullRequestFilterOption.MERGED) {
return <MergeInfo pullRequestMetadata={pullRequestMetadata} />
}
const { hooks, standalone } = useAppContext()
const space = useGetSpaceParam()
const permPushResult = hooks?.usePermissionTranslate?.(
{
resource: {
resourceType: 'CODE_REPO'
},
permissions: ['code_repo_push']
},
[space]
)
return (
<Container
@ -174,6 +188,7 @@ export const PullRequestActionsBox: React.FC<PullRequestActionsBoxProps> = ({
position: PopoverPosition.BOTTOM_RIGHT,
transitionDuration: 1000
}}
{...permissionProps(permPushResult, standalone)}
onClick={() => {
if (mergeOption.method !== 'close') {
const payload: OpenapiMergePullReq = { method: mergeOption.method }

16
web/src/pages/PullRequest/PullRequestTabContentWrapper.tsx
View File

@ -16,10 +16,12 @@ export const PullRequestTabContentWrapper: React.FC<PullRequestTabContentWrapper
error,
onRetry,
children
}) => (
<Container className={className} padding="xlarge" {...(!!loading || !!error ? { flex: true } : {})}>
<LoadingSpinner visible={loading} />
{error && <PageError message={getErrorMessage(error)} onClick={onRetry} />}
{!loading && !error && children}
</Container>
)
}) => {
return (
<Container className={className} padding="xlarge">
<LoadingSpinner visible={loading} withBorder={true} />
{error && <PageError message={getErrorMessage(error)} onClick={onRetry} />}
{!error && children}
</Container>
)
}