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.

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

Cost API Error #4035

Merged
merged 12 commits into from
Aug 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ ENHANCEMENTS:
* Remove AppServiceFileAuditLogs diagnostic setting ([#4033](https://github.com/microsoft/AzureTRE/issues/4033))

BUG FIXES:
* Removed 429 Error (Costs API) form presenting in UI ([#3929](https://github.com/microsoft/AzureTRE/issues/3929))
* Fix numbering issue within `bug_report.md` template ([#4028](https://github.com/microsoft/AzureTRE/pull/4028))
* Disable public network access to the API App Service ([#3986](https://github.com/microsoft/AzureTRE/issues/3986))
* Delete of in-progress container is triggered twice ([#3795](https://github.com/microsoft/AzureTRE/issues/3795))
Expand Down
2 changes: 1 addition & 1 deletion ui/app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tre-ui",
"version": "0.5.26",
"version": "0.5.27",
"private": true,
"dependencies": {
"@azure/msal-browser": "^2.35.0",
Expand Down
11 changes: 9 additions & 2 deletions ui/app/src/components/shared/ExceptionLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ interface ExceptionLayoutProps {

export const ExceptionLayout: React.FunctionComponent<ExceptionLayoutProps> = (props: ExceptionLayoutProps) => {
const [showDetails, setShowDetails] = useState(false);
const [showMessageBar, setShowMessageBar] = useState(true);

switch (props.e.status) {
case 403:
Expand All @@ -22,11 +23,17 @@ export const ExceptionLayout: React.FunctionComponent<ExceptionLayoutProps> = (p
<p>Attempted resource: {props.e.endpoint}</p>
</MessageBar>
);
case 429:
return (<></>);
default:
if (!showMessageBar) return null;
return (
<MessageBar
showMessageBar &&
<MessageBar
messageBarType={MessageBarType.error}
isMultiline={true}
onDismiss={()=> setShowMessageBar(false)}
dismissButtonAriaLabel="Close"
>
<h3>{props.e.userMessage}</h3>
<p>{props.e.message}</p><br />
Expand Down Expand Up @@ -65,6 +72,6 @@ export const ExceptionLayout: React.FunctionComponent<ExceptionLayoutProps> = (p
}

</MessageBar>
)
);
}
};
Loading