github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(environment): blank environments list page [EE-5615] (#9113)

pull/9012/head
Oscar Zhou 2023-06-22 09:05:58 +12:00 committed by GitHub
parent b12e1aade4
commit cd89487c41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/react/portainer/environments/ListView/columns/url.tsx
View File

@ -33,8 +33,8 @@ function Cell({
return ( return (
<> <>
{environment.URL} {environment.URL}
{environment.StatusMessage.Summary && {environment.StatusMessage?.Summary &&
environment.StatusMessage.Detail && ( environment.StatusMessage?.Detail && (
<div className="ml-2 inline-block"> <div className="ml-2 inline-block">
<span className="text-danger vertical-center inline-flex"> <span className="text-danger vertical-center inline-flex">
<AlertCircle className="lucide" aria-hidden="true" /> <AlertCircle className="lucide" aria-hidden="true" />
@ -79,15 +79,15 @@ function Cell({
const status = ( const status = (
<span className="vertical-center inline-flex text-base"> <span className="vertical-center inline-flex text-base">
<Settings className="lucide animate-spin-slow" /> <Settings className="lucide animate-spin-slow" />
{environment.StatusMessage.Summary} {environment.StatusMessage?.Summary}
</span> </span>
); );
if (!environment.StatusMessage.Detail) { if (!environment.StatusMessage?.Detail) {
return status; return status;
} }
return ( return (
<TooltipWithChildren <TooltipWithChildren
message={environment.StatusMessage.Detail} message={environment.StatusMessage?.Detail}
position="bottom" position="bottom"
> >
{status} {status}

2
app/react/portainer/environments/types.ts
View File

@ -170,7 +170,7 @@ export type Environment = {
/** /**
* A message that describes the status. Should be included for Status Provisioning or Error. * A message that describes the status. Should be included for Status Provisioning or Error.
*/ */
StatusMessage: EnvironmentStatusMessage; StatusMessage?: EnvironmentStatusMessage;
}; };
/** /**