Skip to content

Commit

Permalink
Cost API Error (#4035)
Browse files Browse the repository at this point in the history
* E2e test number (#23)

* update

* update changelog

* test

* update

* update

* update changelog

* update

* update
  • Loading branch information
Tim Allen authored Aug 6, 2024
1 parent 4334cbc commit f2c5ef8
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
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>
)
);
}
};

0 comments on commit f2c5ef8

Please sign in to comment.