Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update GoToOpenPullReqesut button to be button Group to include the Multi Repos #2566

Merged
merged 26 commits into from
Apr 6, 2023
Merged

Update GoToOpenPullReqesut button to be button Group to include the Multi Repos #2566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
c56a361
init groupbutton
Mar 16, 2023
95ff3b0
add gitrepos btn group
Mar 19, 2023
273a031
remove unused code
Mar 19, 2023
92c7512
Merge branch 'main' into UI-2466-AddBtnGrouptoOpenPull
ahussein3 Mar 19, 2023
103d543
remove uneeded import
Mar 19, 2023
fbf88bf
enhance btn text
Mar 19, 2023
63430c3
omit protocol so that all links can be open
Mar 20, 2023
0b51bc0
refactor typo
Mar 20, 2023
71c1ed8
add open pull request btn to add app view
Mar 20, 2023
7351717
make sure btn are disabled while there is no options
Mar 20, 2023
2281ff1
update gitrepos to be sent to the component
Mar 22, 2023
f56ac60
Merge remote-tracking branch 'origin/main' into UI-2466-AddBtnGroupto…
foot Mar 28, 2023
eb7fcbe
wip
foot Mar 28, 2023
4bc697e
Merge remote-tracking branch 'origin/main' into UI-2466-AddBtnGroupto…
foot Apr 3, 2023
1b38243
add a little hook
foot Apr 3, 2023
964ef13
fix issue were URIJS getting wrong domain value
Apr 4, 2023
5d5bdc4
update bitbucket provider condition
Apr 5, 2023
b884f64
add handle for case azure ssh devops
Apr 5, 2023
b28d636
Merge branch 'main' into UI-2466-AddBtnGrouptoOpenPull
ahussein3 Apr 5, 2023
6b08a54
strip out port from url
Apr 5, 2023
a1078c6
Rollback changes to getInitialGitRepo, don't consider managementClust…
foot Apr 6, 2023
e2b5916
update test and add icon to pull request btn
Apr 6, 2023
7145042
remove unused improts
Apr 6, 2023
466851d
update failing test case
Apr 6, 2023
4b77735
update failing test case
Apr 6, 2023
0223793
Merge branch 'main' into UI-2466-AddBtnGrouptoOpenPull
ahussein3 Apr 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ui-cra/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"@types/react-router-dom": "^5.1.7",
"@types/react-syntax-highlighter": "^13.5.2",
"@types/styled-components": "^5.1.9",
"@types/urijs": "^1.19.19",
"@weaveworks/progressive-delivery": "0.0.0-rc13",
"@weaveworks/weave-gitops": "npm:@weaveworks/[email protected]",
"@weaveworks/weave-gitops-main": "0.20.0-12-gccf5178b",
Expand Down Expand Up @@ -53,6 +54,7 @@
"remark-gfm": "^3.0.1",
"styled-components": "^5.3.0",
"typescript": "^4.1.2",
"urijs": "^1.19.11",
"web-vitals": "^1.0.1",
"yaml": "^2.2.1"
},
Expand Down
87 changes: 20 additions & 67 deletions ui-cra/src/components/Applications/__tests__/__snapshots__/index.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,31 +374,9 @@ exports[`Applications index test snapshots loading 1`] = `
ADD AN APPLICATION
</span>
</button>
<button
class="MuiButtonBase-root MuiButton-root MuiButton-outlined c12 MuiButton-outlinedPrimary MuiButton-disableElevation"
tabindex="0"
type="button"
>
<span
class="MuiButton-label"
>
<div
class="c8 c13 makeStyles-externalIcon-17"
>
<svg
aria-hidden="true"
class="MuiSvgIcon-root"
focusable="false"
viewBox="0 0 24 24"
>
<path
d="M19 19H5V5h7V3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"
/>
</svg>
</div>
GO TO OPEN PULL REQUESTS
</span>
</button>
<div>
Loading...
</div>
</div>
</div>
<div
Expand Down Expand Up @@ -1160,11 +1138,11 @@ exports[`Applications index test snapshots success 1`] = `
class="c3 c4 test-id-breadcrumbs"
>
<div
class="makeStyles-path-34"
class="makeStyles-path-35"
style="align-items: center;"
>
<span
class="c5 makeStyles-labelLink-38"
class="c5 makeStyles-labelLink-39"
title="Applications"
>
Applications
Expand Down Expand Up @@ -1251,34 +1229,9 @@ exports[`Applications index test snapshots success 1`] = `
class="MuiTouchRipple-root"
/>
</button>
<button
class="MuiButtonBase-root MuiButton-root MuiButton-outlined c12 MuiButton-outlinedPrimary MuiButton-disableElevation"
tabindex="0"
type="button"
>
<span
class="MuiButton-label"
>
<div
class="c8 c13 makeStyles-externalIcon-33"
>
<svg
aria-hidden="true"
class="MuiSvgIcon-root"
focusable="false"
viewBox="0 0 24 24"
>
<path
d="M19 19H5V5h7V3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"
/>
</svg>
</div>
GO TO OPEN PULL REQUESTS
</span>
<span
class="MuiTouchRipple-root"
/>
</button>
<div>
Git Repos not found
</div>
</div>
</div>
<div
Expand Down Expand Up @@ -1536,14 +1489,14 @@ exports[`Applications index test snapshots success 1`] = `
>
<span
aria-disabled="false"
class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-45 MuiCheckbox-root MuiCheckbox-colorPrimary PrivateSwitchBase-checked-46 Mui-checked MuiIconButton-colorPrimary"
class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-48 MuiCheckbox-root MuiCheckbox-colorPrimary PrivateSwitchBase-checked-49 Mui-checked MuiIconButton-colorPrimary"
>
<span
class="MuiIconButton-label"
>
<input
checked=""
class="PrivateSwitchBase-input-48"
class="PrivateSwitchBase-input-51"
data-indeterminate="false"
type="checkbox"
value=""
Expand Down Expand Up @@ -1990,14 +1943,14 @@ exports[`Applications index test snapshots success 1`] = `
>
<span
aria-disabled="true"
class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-45 MuiCheckbox-root MuiCheckbox-colorSecondary PrivateSwitchBase-disabled-47 Mui-disabled MuiIconButton-colorSecondary Mui-disabled Mui-disabled"
class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-48 MuiCheckbox-root MuiCheckbox-colorSecondary PrivateSwitchBase-disabled-50 Mui-disabled MuiIconButton-colorSecondary Mui-disabled Mui-disabled"
tabindex="-1"
>
<span
class="MuiIconButton-label"
>
<input
class="PrivateSwitchBase-input-48"
class="PrivateSwitchBase-input-51"
data-indeterminate="false"
disabled=""
id="clusterName"
Expand Down Expand Up @@ -2040,14 +1993,14 @@ exports[`Applications index test snapshots success 1`] = `
>
<span
aria-disabled="true"
class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-45 MuiCheckbox-root MuiCheckbox-colorSecondary PrivateSwitchBase-disabled-47 Mui-disabled MuiIconButton-colorSecondary Mui-disabled Mui-disabled"
class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-48 MuiCheckbox-root MuiCheckbox-colorSecondary PrivateSwitchBase-disabled-50 Mui-disabled MuiIconButton-colorSecondary Mui-disabled Mui-disabled"
tabindex="-1"
>
<span
class="MuiIconButton-label"
>
<input
class="PrivateSwitchBase-input-48"
class="PrivateSwitchBase-input-51"
data-indeterminate="false"
disabled=""
id="namespace"
Expand Down Expand Up @@ -2090,14 +2043,14 @@ exports[`Applications index test snapshots success 1`] = `
>
<span
aria-disabled="true"
class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-45 MuiCheckbox-root MuiCheckbox-colorSecondary PrivateSwitchBase-disabled-47 Mui-disabled MuiIconButton-colorSecondary Mui-disabled Mui-disabled"
class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-48 MuiCheckbox-root MuiCheckbox-colorSecondary PrivateSwitchBase-disabled-50 Mui-disabled MuiIconButton-colorSecondary Mui-disabled Mui-disabled"
tabindex="-1"
>
<span
class="MuiIconButton-label"
>
<input
class="PrivateSwitchBase-input-48"
class="PrivateSwitchBase-input-51"
data-indeterminate="false"
disabled=""
id="status"
Expand Down Expand Up @@ -2140,14 +2093,14 @@ exports[`Applications index test snapshots success 1`] = `
>
<span
aria-disabled="true"
class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-45 MuiCheckbox-root MuiCheckbox-colorSecondary PrivateSwitchBase-disabled-47 Mui-disabled MuiIconButton-colorSecondary Mui-disabled Mui-disabled"
class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-48 MuiCheckbox-root MuiCheckbox-colorSecondary PrivateSwitchBase-disabled-50 Mui-disabled MuiIconButton-colorSecondary Mui-disabled Mui-disabled"
tabindex="-1"
>
<span
class="MuiIconButton-label"
>
<input
class="PrivateSwitchBase-input-48"
class="PrivateSwitchBase-input-51"
data-indeterminate="false"
disabled=""
id="tenant"
Expand Down Expand Up @@ -2190,14 +2143,14 @@ exports[`Applications index test snapshots success 1`] = `
>
<span
aria-disabled="true"
class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-45 MuiCheckbox-root MuiCheckbox-colorSecondary PrivateSwitchBase-disabled-47 Mui-disabled MuiIconButton-colorSecondary Mui-disabled Mui-disabled"
class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-48 MuiCheckbox-root MuiCheckbox-colorSecondary PrivateSwitchBase-disabled-50 Mui-disabled MuiIconButton-colorSecondary Mui-disabled Mui-disabled"
tabindex="-1"
>
<span
class="MuiIconButton-label"
>
<input
class="PrivateSwitchBase-input-48"
class="PrivateSwitchBase-input-51"
data-indeterminate="false"
disabled=""
id="type"
Expand Down
25 changes: 2 additions & 23 deletions ui-cra/src/components/Applications/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,12 @@ import {
IconType,
LoadingPage,
useListAutomations,
theme,
Flex,
} from '@weaveworks/weave-gitops';
import styled from 'styled-components';
import { useHistory } from 'react-router-dom';
import { makeStyles, createStyles } from '@material-ui/core';
import { openLinkHandler } from '../../utils/link-checker';
import { Routes } from '../../utils/nav';
import { useListConfigContext } from '../../contexts/ListConfig';
import OpenedPullRequest from '../Clusters/OpenedPullRequest';

interface Size {
size?: 'small';
Expand All @@ -27,20 +24,9 @@ const ActionsWrapper = styled(Flex)<Size>`
}
`;

const useStyles = makeStyles(() =>
createStyles({
externalIcon: {
marginRight: theme.spacing.small,
},
}),
);

const WGApplicationsDashboard: FC = () => {
const { data: automations, isLoading } = useListAutomations();
const history = useHistory();
const listConfigContext = useListConfigContext();
const repoLink = listConfigContext?.repoLink || '';
const classes = useStyles();

const handleAddApplication = () => history.push(Routes.AddApplication);

Expand Down Expand Up @@ -70,14 +56,7 @@ const WGApplicationsDashboard: FC = () => {
>
ADD AN APPLICATION
</Button>
<Button onClick={openLinkHandler(repoLink)}>
<Icon
className={classes.externalIcon}
type={IconType.ExternalTab}
size="base"
/>
GO TO OPEN PULL REQUESTS
</Button>
<OpenedPullRequest />
</ActionsWrapper>
</div>
{isLoading ? (
Expand Down
Loading