Skip to content

fix: [M3-7831] - Persisting error messages in ACLB delete dialogs #10254

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
bnussman-akamai merged 6 commits into from
Mar 8, 2024
Merged

fix: [M3-7831] - Persisting error messages in ACLB delete dialogs #10254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a04b887
handle clearing errors
bnussman Mar 4, 2024
514cd2b
Added changeset: Persisting error messages in ACLB delete dialogs
bnussman Mar 4, 2024
61090fe
swallow errors so they are not shown in the console or sent to sentry
bnussman Mar 6, 2024
655472b
fix error handling
bnussman Mar 6, 2024
20d7e02
Merge branch 'develop' into M3-7831-fix-aclb-delete-dialog-error-stat…
bnussman Mar 6, 2024
32d1fb9
use `handleClose`
bnussman Mar 8, 2024
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
5 changes: 5 additions & 0 deletions packages/manager/.changeset/pr-10254-fixed-1709590335168.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@linode/manager": Fixed
---

Persisting error messages in ACLB delete dialogs ([#10254](https://github.com/linode/manager/pull/10254))
19 changes: 15 additions & 4 deletions ...er/src/features/LoadBalancers/LoadBalancerDetail/Certificates/DeleteCertificateDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,27 @@ export const DeleteCertificateDialog = (props: Props) => {
error,
isLoading,
mutateAsync,
reset,
} = useLoadBalancerCertificateDeleteMutation(
loadbalancerId,
certificate?.id ?? -1
);

const onDelete = async () => {
await mutateAsync();
const handleClose = () => {
// Clear the error when the dialog closes so that is does not persist
reset();
onClose();
};

const onDelete = async () => {
try {
await mutateAsync();
handleClose();
} catch (error) {
// Swallow error
}
};

return (
<ConfirmationDialog
actions={
Expand All @@ -41,12 +52,12 @@ export const DeleteCertificateDialog = (props: Props) => {
}}
secondaryButtonProps={{
label: 'Cancel',
onClick: onClose,
onClick: handleClose,
}}
/>
}
error={error?.[0]?.reason}
onClose={onClose}
onClose={handleClose}
open={open}
title={`Delete Certificate ${certificate?.label}?`}
>
Expand Down
19 changes: 15 additions & 4 deletions ...rc/features/LoadBalancers/LoadBalancerDetail/Configurations/DeleteConfigurationDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,27 @@ export const DeleteConfigurationDialog = (props: Props) => {
error,
isLoading,
mutateAsync,
reset,
} = useLoadBalancerConfigurationDeleteMutation(
loadbalancerId,
configuration.id
);

const onDelete = async () => {
await mutateAsync();
const handleClose = () => {
// Clear the error when the dialog closes so that is does not persist
reset();
onClose();
};

const onDelete = async () => {
try {
await mutateAsync();
handleClose();
} catch (error) {
// Swallow error
}
};

return (
<ConfirmationDialog
actions={
Expand All @@ -41,12 +52,12 @@ export const DeleteConfigurationDialog = (props: Props) => {
}}
secondaryButtonProps={{
label: 'Cancel',
onClick: onClose,
onClick: handleClose,
}}
/>
}
error={error?.[0]?.reason}
onClose={onClose}
onClose={handleClose}
open={open}
title={`Delete Configuration ${configuration.label}?`}
>
Expand Down
28 changes: 20 additions & 8 deletions packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Routes/DeleteRouteDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,28 @@ interface Props {
export const DeleteRouteDialog = (props: Props) => {
const { loadbalancerId, onClose, open, route } = props;

const { error, isLoading, mutateAsync } = useLoadBalancerRouteDeleteMutation(
loadbalancerId,
route?.id ?? -1
);
const {
error,
isLoading,
mutateAsync,
reset,
} = useLoadBalancerRouteDeleteMutation(loadbalancerId, route?.id ?? -1);

const onDelete = async () => {
await mutateAsync();
const handleClose = () => {
// Clear the error when the dialog closes so that is does not persist
reset();
onClose();
};

const onDelete = async () => {
try {
await mutateAsync();
handleClose();
} catch (error) {
// Swallow error
}
};

return (
<ConfirmationDialog
actions={
Expand All @@ -37,12 +49,12 @@ export const DeleteRouteDialog = (props: Props) => {
}}
secondaryButtonProps={{
label: 'Cancel',
onClick: onClose,
onClick: handleClose,
}}
/>
}
error={error?.[0]?.reason}
onClose={onClose}
onClose={handleClose}
open={open}
title={`Delete Route ${route?.label}?`}
>
Expand Down
36 changes: 24 additions & 12 deletions packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Routes/DeleteRuleDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,18 @@ interface Props {
export const DeleteRuleDialog = (props: Props) => {
const { loadbalancerId, onClose, open, route, ruleIndex } = props;

const { error, isLoading, mutateAsync } = useLoadBalancerRouteUpdateMutation(
loadbalancerId,
route?.id ?? -1
);
const {
error,
isLoading,
mutateAsync,
reset,
} = useLoadBalancerRouteUpdateMutation(loadbalancerId, route?.id ?? -1);

const handleClose = () => {
// Clear the error when the dialog closes so that is does not persist
reset();
onClose();
};

const onDelete = async () => {
if (!route || ruleIndex === undefined) {
Expand All @@ -35,12 +43,16 @@ export const DeleteRuleDialog = (props: Props) => {

const normalizedRules = newRules.map(getNormalizedRulePayload);

await mutateAsync({
label: route.label,
protocol: route.protocol,
rules: normalizedRules,
});
onClose();
try {
await mutateAsync({
label: route.label,
protocol: route.protocol,
rules: normalizedRules,
});
handleClose();
} catch (error) {
// Swallow error
}
};

return (
Expand All @@ -54,12 +66,12 @@ export const DeleteRuleDialog = (props: Props) => {
}}
secondaryButtonProps={{
label: 'Cancel',
onClick: onClose,
onClick: handleClose,
}}
/>
}
error={error?.[0]?.reason}
onClose={onClose}
onClose={handleClose}
open={open}
title="Delete Rule?"
>
Expand Down
19 changes: 15 additions & 4 deletions ...rc/features/LoadBalancers/LoadBalancerDetail/ServiceTargets/DeleteServiceTargetDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,27 @@ export const DeleteServiceTargetDialog = (props: Props) => {
error,
isLoading,
mutateAsync,
reset,
} = useLoadBalancerServiceTargetDeleteMutation(
loadbalancerId,
serviceTarget?.id ?? -1
);

const onDelete = async () => {
await mutateAsync();
const handleClose = () => {
// Clear the error when the dialog closes so that is does not persist
reset();
onClose();
};

const onDelete = async () => {
try {
await mutateAsync();
handleClose();
} catch (error) {
// Swallow error
}
};

return (
<ConfirmationDialog
actions={
Expand All @@ -40,12 +51,12 @@ export const DeleteServiceTargetDialog = (props: Props) => {
}}
secondaryButtonProps={{
label: 'Cancel',
onClick: onClose,
onClick: handleClose,
}}
/>
}
error={error?.[0]?.reason}
onClose={onClose}
onClose={handleClose}
open={open}
title={`Delete Service Target ${serviceTarget?.label}?`}
>
Expand Down