Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-09 07:45:22 +02:00
Code Issues Releases Activity

fix(microk8s): PO ui fixes [EE-5900] (#10031)

Browse source 
Co-authored-by: testa113 <testa113>
This commit is contained in:
Ali 2023-08-14 12:34:58 +12:00 • committed by GitHub
parent c472fe9c18
commit 2a7a96f498
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 48 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

38
app/react/portainer/environments/ListView/columns/url.tsx
View file

@ -1,5 +1,5 @@
import { CellContext } from '@tanstack/react-table';
import { AlertCircle, HelpCircle, Settings } from 'lucide-react';
import { AlertCircle, HelpCircle, Loader2 } from 'lucide-react';
import {
EnvironmentStatus,
@ -10,6 +10,8 @@ import { notifySuccess } from '@/portainer/services/notifications';
import { TooltipWithChildren } from '@@/Tip/TooltipWithChildren';
import { Button } from '@@/buttons';
import { Icon } from '@@/Icon';
import { Tooltip } from '@@/Tip/Tooltip';
import { EnvironmentListItem } from '../types';
import { useUpdateEnvironmentMutation } from '../../queries/useUpdateEnvironmentMutation';
@ -33,17 +35,17 @@ function Cell({
return (
<>
{environment.URL}
{environment.StatusMessage?.Summary &&
environment.StatusMessage?.Detail && (
{environment.StatusMessage?.summary &&
environment.StatusMessage?.detail && (
<div className="ml-2 inline-block">
<span className="text-danger vertical-center inline-flex">
<AlertCircle className="lucide" aria-hidden="true" />
<span>{environment.StatusMessage.Summary}</span>
<span>{environment.StatusMessage.summary}</span>
</span>
<TooltipWithChildren
message={
<div>
{environment.StatusMessage.Detail}
{environment.StatusMessage.detail}
{environment.URL && (
<div className="mt-2 text-right">
<Button
@ -71,27 +73,19 @@ function Cell({
);
}
if (environment.Type === 4) {
if (environment.Type === EnvironmentType.EdgeAgentOnDocker) {
return <>-</>;
}
if (environment.Status === 3) {
const status = (
<span className="vertical-center inline-flex text-base">
<Settings className="lucide animate-spin-slow" />
{environment.StatusMessage?.Summary}
</span>
);
if (!environment.StatusMessage?.Detail) {
return status;
}
if (environment.Status === EnvironmentStatus.Provisioning) {
return (
<TooltipWithChildren
message={environment.StatusMessage?.Detail}
position="bottom"
>
{status}
</TooltipWithChildren>
<div className="inline-flex items-center text-base">
<Icon icon={Loader2} className="!mr-1 animate-spin-slow" />
{environment.StatusMessage?.summary}
{environment.StatusMessage?.detail && (
<Tooltip message={environment.StatusMessage?.detail} />
)}
</div>
);
}

4
app/react/portainer/environments/types.ts
View file

@ -133,8 +133,8 @@ interface EndpointChangeWindow {
EndTime: string;
}
export interface EnvironmentStatusMessage {
Summary: string;
Detail: string;
summary: string;
detail: string;
}
export type Environment = {