Skip to content

Avoid duplication on AlertListError component #1287

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

Merged
merged 9 commits into from
Aug 15, 2022
Merged

Avoid duplication on AlertListError component #1287

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
29f4b1b
Avoid duplication on AlertListError component
TheGostKasper Aug 14, 2022
89443ec
remove test errors
TheGostKasper Aug 14, 2022
ae9f0f3
update default error message
TheGostKasper Aug 15, 2022
0319dc9
Merge branch 'main' of https://github.com/weaveworks/weave-gitops-ent…
TheGostKasper Aug 15, 2022
dad7ba5
Merge branch 'main' of https://github.com/weaveworks/weave-gitops-ent…
TheGostKasper Aug 15, 2022
ca9b490
Merge branch 'main' of https://github.com/weaveworks/weave-gitops-ent…
TheGostKasper Aug 15, 2022
3262855
use class instead of inlineStyle
TheGostKasper Aug 15, 2022
1e78791
update snap
TheGostKasper Aug 15, 2022
f09bad3
Merge branch 'main' into 1278-avoid-duplicate-errors
TheGostKasper Aug 15, 2022
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: 1 addition & 1 deletion ui-cra/src/components/Applications/HelmRelease.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const WGApplicationsHelmRelease: FC<Props> = props => {
return (
<div style={{ width: '100%' }}>
<PolicyViolationsList
req={{ clusterName, namespace }}
req={{ clusterName, namespace, application: name }}
tableType={FieldsType.application}
/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ui-cra/src/components/Applications/Kustomization.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const WGApplicationsKustomization: FC<Props> = ({
return (
<div style={{ width: '100%' }}>
<PolicyViolationsList
req={{ clusterName, namespace }}
req={{ clusterName, namespace, application: name }}
tableType={FieldsType.application}
/>
</div>
Expand Down
24 changes: 12 additions & 12 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 @@ -164,15 +164,15 @@ exports[`Applications index test snapshots loading 1`] = `
class="c2"
>
<div
class="makeStyles-path-12"
class="makeStyles-path-13"
style="align-items: center;"
>
<div
class="c3"
role="heading"
>
<a
class="makeStyles-link-14"
class="makeStyles-link-15"
href="/applications"
>
Applications
Expand Down Expand Up @@ -814,15 +814,15 @@ exports[`Applications index test snapshots success 1`] = `
class="c2"
>
<div
class="makeStyles-path-23"
class="makeStyles-path-25"
style="align-items: center;"
>
<div
class="c3"
role="heading"
>
<a
class="makeStyles-link-25"
class="makeStyles-link-27"
href="/applications"
>
Applications
Expand Down Expand Up @@ -1385,14 +1385,14 @@ exports[`Applications index test snapshots success 1`] = `
>
<span
aria-disabled="true"
class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-30 MuiCheckbox-root MuiCheckbox-colorSecondary PrivateSwitchBase-disabled-32 Mui-disabled MuiIconButton-colorSecondary Mui-disabled Mui-disabled"
class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-33 MuiCheckbox-root MuiCheckbox-colorSecondary PrivateSwitchBase-disabled-35 Mui-disabled MuiIconButton-colorSecondary Mui-disabled Mui-disabled"
tabindex="-1"
>
<span
class="MuiIconButton-label"
>
<input
class="PrivateSwitchBase-input-33"
class="PrivateSwitchBase-input-36"
data-indeterminate="false"
disabled=""
id="clusterName"
Expand Down Expand Up @@ -1435,14 +1435,14 @@ exports[`Applications index test snapshots success 1`] = `
>
<span
aria-disabled="true"
class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-30 MuiCheckbox-root MuiCheckbox-colorSecondary PrivateSwitchBase-disabled-32 Mui-disabled MuiIconButton-colorSecondary Mui-disabled Mui-disabled"
class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-33 MuiCheckbox-root MuiCheckbox-colorSecondary PrivateSwitchBase-disabled-35 Mui-disabled MuiIconButton-colorSecondary Mui-disabled Mui-disabled"
tabindex="-1"
>
<span
class="MuiIconButton-label"
>
<input
class="PrivateSwitchBase-input-33"
class="PrivateSwitchBase-input-36"
data-indeterminate="false"
disabled=""
id="namespace"
Expand Down Expand Up @@ -1485,14 +1485,14 @@ exports[`Applications index test snapshots success 1`] = `
>
<span
aria-disabled="true"
class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-30 MuiCheckbox-root MuiCheckbox-colorSecondary PrivateSwitchBase-disabled-32 Mui-disabled MuiIconButton-colorSecondary Mui-disabled Mui-disabled"
class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-33 MuiCheckbox-root MuiCheckbox-colorSecondary PrivateSwitchBase-disabled-35 Mui-disabled MuiIconButton-colorSecondary Mui-disabled Mui-disabled"
tabindex="-1"
>
<span
class="MuiIconButton-label"
>
<input
class="PrivateSwitchBase-input-33"
class="PrivateSwitchBase-input-36"
data-indeterminate="false"
disabled=""
id="status"
Expand Down Expand Up @@ -1535,14 +1535,14 @@ exports[`Applications index test snapshots success 1`] = `
>
<span
aria-disabled="true"
class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-30 MuiCheckbox-root MuiCheckbox-colorSecondary PrivateSwitchBase-disabled-32 Mui-disabled MuiIconButton-colorSecondary Mui-disabled Mui-disabled"
class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-33 MuiCheckbox-root MuiCheckbox-colorSecondary PrivateSwitchBase-disabled-35 Mui-disabled MuiIconButton-colorSecondary Mui-disabled Mui-disabled"
tabindex="-1"
>
<span
class="MuiIconButton-label"
>
<input
class="PrivateSwitchBase-input-33"
class="PrivateSwitchBase-input-36"
data-indeterminate="false"
disabled=""
id="type"
Expand Down
6 changes: 2 additions & 4 deletions ui-cra/src/components/Applications/utils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import { useListAutomations, useListSources } from '@weaveworks/weave-gitops';

export const useApplicationsCount = (): number => {
const { data: automations } = useListAutomations();

const { data: automations } = useListAutomations(undefined, {});
return automations?.result?.length || 0;
};

export const useSourcesCount = (): number => {
const { data: sources } = useListSources();

const { data: sources } = useListSources(undefined,undefined, {});
return sources?.result?.length || 0;
};
25 changes: 14 additions & 11 deletions ui-cra/src/components/Layout/AlertListErrors.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,24 @@ import { theme } from '@weaveworks/weave-gitops';
import Alert from '@material-ui/lab/Alert';
import AlertTitle from '@material-ui/lab/AlertTitle';
import { createStyles, makeStyles } from '@material-ui/styles';
import { ListItem } from '@material-ui/core';
import { ListItem, ListItemText } from '@material-ui/core';
import { MultiRequestError } from '@weaveworks/weave-gitops/ui/lib/types';
import _ from 'lodash';
import { uniqBy } from 'lodash';

const useStyles = makeStyles(() =>
createStyles({
alertWrapper: {
marginTop: theme.spacing.medium,
marginRight: theme.spacing.small,
marginBottom: 0,
marginLeft: theme.spacing.small,
margin: `${theme.spacing.medium} ${theme.spacing.small} 0 ${theme.spacing.small} `,
paddingRight: theme.spacing.medium,
paddingLeft: theme.spacing.medium,
borderRadius: theme.spacing.xs,
},
warning: {
backgroundColor: theme.colors.feedbackLight,
},
listItems: {
display: 'list-item',
},
}),
);

Expand All @@ -31,18 +31,21 @@ export const AlertListErrors: FC<{ errors?: ListError[] }> = ({ errors }) => {
if (!errors || !errors.length) {
return null;
}
const filteredErrors = _.uniqBy(errors, error => {
const filteredErrors = uniqBy(errors, error => {
[error.clusterName, error.message].join();
}) as MultiRequestError[];

return (
<>
<Alert className={classes.alertWrapper} severity="error">
<AlertTitle>There were errors while listing some resources:</AlertTitle>
{filteredErrors?.map((item: ListError) => (
<ListItem key={item.clusterName}>
• error='{item.message}' cluster='{item.clusterName}' namespace='
{item.namespace}'
{filteredErrors?.map((item: ListError, index: number) => (
<ListItem key={index} dense={true}>
<ListItemText
className={classes.listItems}
primary={item.message}
secondary={`Cluster: ${item.clusterName} , Namespace: ${item.namespace}`}
/>
</ListItem>
))}
</Alert>
Expand Down
1 change: 0 additions & 1 deletion ui-cra/src/components/ProgressiveDelivery/CanaryDetails/CanaryDetailsSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ function CanaryDetailsSection({
}) {
const classes = useCanaryStyle();
const path = `/applications/delivery/${canary.targetDeployment?.uid}`;

return (
<>
<TitleWrapper>{canary.name}</TitleWrapper>
Expand Down