Skip to content

Commit ef334c5

Browse files
cabella-dotcabella-dot
authored
Revert "Revamp header for the Pull Request Details page (#246)" (#276)
* Revert "Revamp header for the Pull Request Details page (#246)" This reverts commit d39f011. revert * fix * Revert "Revamp header for the Pull Request Details page (#246)" This reverts commit d39f011. revert * fixes
1 parent b909a5e commit ef334c5

25 files changed

+1714
-4835
lines changed

‎package-lock.json

Lines changed: 1261 additions & 3683 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1490,34 +1490,27 @@
14901490
},
14911491
"dependencies": {
14921492
"@atlaskit/analytics-next": "^8.3.0",
1493-
"@atlaskit/avatar": "^20.5.10",
1493+
"@atlaskit/avatar": "^20.5.1",
14941494
"@atlaskit/avatar-group": "^8.5.4",
1495-
"@atlaskit/breadcrumbs": "^11.10.7",
1495+
"@atlaskit/breadcrumbs": "^11.5.0",
14961496
"@atlaskit/button": "^16.1.3",
14971497
"@atlaskit/checkbox": "^12.3.4",
14981498
"@atlaskit/comment": "^10.3.0",
14991499
"@atlaskit/datetime-picker": "^11.1.1",
15001500
"@atlaskit/feature-gate-js-client": "^4.20.0",
15011501
"@atlaskit/form": "^8.4.4",
1502-
"@atlaskit/heading": "^4.3.1",
1503-
"@atlaskit/icon": "^21.12.8",
1502+
"@atlaskit/icon": "^21.9.3",
15041503
"@atlaskit/inline-dialog": "^13.1.8",
1505-
"@atlaskit/inline-edit": "^14.3.1",
1506-
"@atlaskit/link": "^2.2.0",
1507-
"@atlaskit/lozenge": "^11.14.0",
1508-
"@atlaskit/modal-dialog": "^12.20.8",
1504+
"@atlaskit/lozenge": "^11.1.3",
1505+
"@atlaskit/modal-dialog": "^12.1.0",
15091506
"@atlaskit/page": "^12.0.7",
1510-
"@atlaskit/page-header": "^10.9.6",
1507+
"@atlaskit/page-header": "^10.2.2",
15111508
"@atlaskit/panel": "^0.4.7",
1512-
"@atlaskit/primitives": "^13.6.0",
15131509
"@atlaskit/radio": "^5.3.3",
15141510
"@atlaskit/section-message": "^6.8.2",
15151511
"@atlaskit/select": "^15.2.4",
15161512
"@atlaskit/spinner": "^15.1.3",
15171513
"@atlaskit/table-tree": "^9.0.12",
1518-
"@atlaskit/textfield": "^7.0.0",
1519-
"@atlaskit/theme": "^16.0.0",
1520-
"@atlaskit/tokens": "^3.3.2",
15211514
"@atlaskit/tooltip": "^17.5.1",
15221515
"@atlaskit/width-detector": "^3.0.6",
15231516
"@atlassianlabs/guipi-core-components": "^0.1.2",
@@ -1589,7 +1582,6 @@
15891582
"react-editext": "3.6.1",
15901583
"react-hook-form": "^4.9.8",
15911584
"react-uid": "^2.2.0",
1592-
"sanitize-html": "^2.15.0",
15931585
"scheduler": "^0.19.0",
15941586
"semver": "^7.6.3",
15951587
"slash": "^3.0.0",
@@ -1622,7 +1614,6 @@
16221614
"@types/react": "^16.9.34",
16231615
"@types/react-dom": "^16.9.6",
16241616
"@types/react-tabs": "^2.3.1",
1625-
"@types/sanitize-html": "^2.13.0",
16261617
"@types/scheduler": "^0.16.1",
16271618
"@types/semver": "^7.1.0",
16281619
"@types/terser-webpack-plugin": "^2.2.0",
@@ -1685,4 +1676,4 @@
16851676
"webpack-node-externals": "^3.0.0"
16861677
},
16871678
"packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
1688-
}
1679+
}

‎src/bitbucket/bitbucket-cloud/pullRequests.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -889,7 +889,6 @@ export class CloudPullRequestApi implements PullRequestApi {
889889
state: pr.state!,
890890
closeSourceBranch: !!pr.close_source_branch,
891891
taskCount: pr.task_count || 0,
892-
draft: pr.draft!,
893892
},
894893
};
895894
}

‎src/bitbucket/bitbucket-server/pullRequests.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1018,7 +1018,6 @@ export class ServerPullRequestApi implements PullRequestApi {
10181018
closeSourceBranch: false,
10191019
taskCount: taskCount,
10201020
buildStatuses: [],
1021-
draft: data.draft,
10221021
},
10231022
};
10241023
}

‎src/bitbucket/model.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,13 +247,12 @@ export type PullRequestData = {
247247
title: string;
248248
htmlSummary: string;
249249
rawSummary: string;
250-
ts: string | number;
251-
updatedTs: string | number;
250+
ts: string;
251+
updatedTs: string;
252252
state: 'MERGED' | 'SUPERSEDED' | 'OPEN' | 'DECLINED';
253253
closeSourceBranch: boolean;
254254
taskCount: number;
255255
buildStatuses?: BuildStatus[];
256-
draft: boolean;
257256
};
258257

259258
export interface PullRequest {
@@ -289,7 +288,6 @@ const emptyPullRequestData: PullRequestData = {
289288
state: 'OPEN',
290289
closeSourceBranch: false,
291290
taskCount: 0,
292-
draft: false,
293291
};
294292
export const emptyPullRequest: PullRequest = {
295293
site: emptyBitbucketSite,

‎src/react/atlascode/common/AtlGlobalStyles.tsx

Lines changed: 0 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -6,86 +6,6 @@ const useStyles = makeStyles(
66
(theme: Theme) =>
77
({
88
'@global': {
9-
// Using Atlassian specific tokens
10-
'.vscode-dark': {
11-
'--ds-icon-success': '#2ABB7F',
12-
'--ds-icon-warning': '#F5CD47',
13-
},
14-
'.vscode-light': {
15-
'--ds-icon-success': '#22A06B',
16-
'--ds-icon-warning': '#E56910',
17-
},
18-
':root': {
19-
/* Spacing tokens: Using Atlassian defaults */
20-
'--ds-space-0': '0rem',
21-
'--ds-space-025': '0.125rem',
22-
'--ds-space-050': '0.25rem',
23-
'--ds-space-075': '0.375rem',
24-
'--ds-space-100': '0.5rem',
25-
'--ds-space-150': '0.75rem',
26-
'--ds-space-200': '1rem',
27-
'--ds-space-250': '1.25rem',
28-
'--ds-space-300': '1.5rem',
29-
'--ds-space-400': '2rem',
30-
'--ds-space-500': '2.5rem',
31-
'--ds-space-600': '3rem',
32-
'--ds-space-800': '4rem',
33-
'--ds-space-1000': '5rem',
34-
'--ds-space-negative-025': '-0.125rem',
35-
'--ds-space-negative-050': '-0.25rem',
36-
'--ds-space-negative-075': '-0.375rem',
37-
'--ds-space-negative-100': '-0.5rem',
38-
'--ds-space-negative-150': '-0.75rem',
39-
'--ds-space-negative-200': '-1rem',
40-
'--ds-space-negative-250': '-1.25rem',
41-
'--ds-space-negative-300': '-1.5rem',
42-
'--ds-space-negative-400': '-2rem',
43-
/* Color Tokens: Text: Mapping to VSCode Tokens */
44-
'--ds-text-inverse': 'var(--vscode-button-foreground)',
45-
'--ds-text': 'var(--vscode-foreground)',
46-
'--ds-text-input': 'var(--vscode-input-foreground)',
47-
'--ds-text-selected': 'var(--vscode-list-activeSelectionForeground)',
48-
/* Color Tokens: Borders: Mapping to VSCode Tokens */
49-
'--ds-border': 'var(--vscode-input-border)',
50-
'--ds-border-disabled': 'var(--vscode-radio-inactiveBorder)',
51-
'--ds-border-focused': 'var(--vscode-inputOption-activeBorder)',
52-
'--ds-border-input': 'var(--vscode-input-border)',
53-
'--ds-border-inverse': 'var(--vscode-input-border)',
54-
'--ds-border-selected': 'var(--vscode-inputOption-activeBorder)',
55-
'--ds-border-danger': 'var(--vscode-inputValidation-errorBorder)',
56-
'--ds-border-warning': 'var(--vscode-inputValidation-warningBorder)',
57-
'--ds-border-success': 'var(--vscode-inputValidation-infoBorder)',
58-
'--ds-border-discovery': 'var(--vscode-inputValidation-infoBorder)',
59-
'--ds-border-information': 'var(--vscode-inputValidation-infoBorder)',
60-
'--ds-border-bold': 'var(--vscode-input-border)',
61-
/* Color Tokens: Backgrounds: Mapping to VSCode Tokens */
62-
'--ds-background-brand-bold': 'var(--vscode-button-background)',
63-
'--ds-background-input': 'var(--vscode-input-background)',
64-
'--ds-background-input-hovered': 'var(--vscode-inputOption-hoverBackground)',
65-
'--ds-background-input-pressed': 'var(--vscode-input-background)',
66-
'--ds-background-selected': 'var(--vscode-list-activeSelectionBackground)',
67-
'--ds-background-neutral': 'var(--vscode-input-background)',
68-
'--ds-background-neutral-hovered': 'var(--vscode-inputOption-hoverBackground)',
69-
'--ds-background-neutral-pressed': 'var(--vscode-inputOption-activeBackground)',
70-
'--ds-background-neutral-subtle': 'var(--vscode-input-background)',
71-
'--ds-background-neutral-subtle-hovered': 'var(--vscode-inputOption-hoverBackground)',
72-
'--ds-background-neutral-subtle-pressed': 'var(--vscode-inputOption-activeBackground)',
73-
/* Color Tokens: Overlays: Mapping to VSCode Tokens */
74-
'--ds-surface-overlay': 'var(--vscode-menu-background)',
75-
'--ds-surface-overlay-hovered': 'var(--vscode-menu-selectionBackground)',
76-
/* Shape tokens: Using Atlassian defaults */
77-
'--ds-border-radius-050': '0.125rem',
78-
'--ds-border-radius': '0.25rem',
79-
'--ds-border-radius-100': '0.25rem',
80-
'--ds-border-radius-200': '0.5rem',
81-
'--ds-border-radius-300': '0.75rem',
82-
'--ds-border-radius-400': '1rem',
83-
'--ds-border-radius-circle': '2002rem',
84-
'--ds-border-width': '0.0625rem',
85-
'--ds-border-width-0': '0rem',
86-
'--ds-border-width-indicator': '0.1875rem',
87-
'--ds-border-width-outline': '0.125rem',
88-
},
899
p: {
9010
margin: 0,
9111
},

‎src/react/atlascode/pipelines/PipelineSummaryPage.tsx

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
import AccessTimeIcon from '@material-ui/icons/AccessTime';
1717
import CalendarTodayIcon from '@material-ui/icons/CalendarToday';
1818
import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
19-
import { format, parseISO } from 'date-fns';
19+
import { format, formatDistanceToNow, parseISO } from 'date-fns';
2020
import React, { useCallback, useMemo } from 'react';
2121
import { emptyPipeline } from '../../../lib/ipc/models/pipelineSummary';
2222
import {
@@ -39,7 +39,6 @@ import SuccessIcon from '../icons/SuccessIcon';
3939
import { PipelineSummaryControllerContext, usePipelineSummaryController } from './pipelineSummaryController';
4040
import { AtlascodeErrorBoundary } from '../common/ErrorBoundary';
4141
import { AnalyticsView } from 'src/analyticsTypes';
42-
import { formatTime } from '../util/date-fns';
4342

4443
const failureRed = 'rgb(255, 86, 48)';
4544
const successGreen = 'rgb(54, 178, 126)';
@@ -217,6 +216,19 @@ function dateString(completed_on?: string): string {
217216
return format(parseISO(completed_on), 'MMM do yyyy, h:mm:ss aaa');
218217
}
219218

219+
function formatTime(dateString: string | undefined): string {
220+
if (!dateString) {
221+
return '';
222+
}
223+
224+
const date = parseISO(dateString);
225+
226+
if (!date) {
227+
return '';
228+
}
229+
return `${formatDistanceToNow(date)} ago`;
230+
}
231+
220232
function isPaused(step: PipelineStep) {
221233
return step.state?.stage?.name === 'PAUSED';
222234
}

‎src/react/atlascode/pullrequest/ApproveButton.tsx

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,31 @@
1+
import { Box, Button, Typography } from '@material-ui/core';
2+
import CheckCircleIcon from '@material-ui/icons/CheckCircle';
13
import React, { useCallback } from 'react';
24
import { ApprovalStatus } from '../../../bitbucket/model';
3-
import CheckCircleIcon from '@atlaskit/icon/glyph/check-circle';
4-
import { ReviewerActionButton } from './ReviewActionButton';
5-
import { token } from '@atlaskit/tokens';
65

76
type ApproveButtonProps = {
7+
hidden?: boolean;
88
status: ApprovalStatus;
99
onApprove: (status: ApprovalStatus) => void;
10-
isDisabled: boolean;
1110
};
1211

13-
export const ApproveButton: React.FunctionComponent<ApproveButtonProps> = ({ status, onApprove, isDisabled }) => {
12+
export const ApproveButton: React.FunctionComponent<ApproveButtonProps> = ({ hidden, status, onApprove }) => {
1413
const handleOnApprove = useCallback(() => {
1514
onApprove(status === 'APPROVED' ? 'UNAPPROVED' : 'APPROVED');
1615
}, [onApprove, status]);
1716

1817
return (
19-
<ReviewerActionButton
20-
mainIcon={
21-
<CheckCircleIcon
22-
primaryColor={status === 'APPROVED' ? token('color.icon.success') : 'default'}
23-
label=""
24-
size="small"
25-
/>
26-
}
27-
label={status === 'APPROVED' ? 'Approved' : 'Approve'}
28-
isSelected={status === 'APPROVED'}
29-
onClick={handleOnApprove}
30-
isLoading={false}
31-
isDisabled={isDisabled}
32-
isError={false}
33-
/>
18+
<Box hidden={hidden}>
19+
<Button
20+
startIcon={<CheckCircleIcon htmlColor={'#07b82b'} />}
21+
color={'primary'}
22+
variant={'contained'}
23+
onClick={handleOnApprove}
24+
>
25+
<Typography variant={'button'} noWrap>
26+
{status === 'APPROVED' ? 'Unapprove' : 'Approve'}
27+
</Typography>
28+
</Button>
29+
</Box>
3430
);
3531
};

‎src/react/atlascode/pullrequest/BranchTag.tsx

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)