diff --git a/libs/pages/clusters/src/lib/ui/page-clusters-create/step-summary/step-summary.tsx b/libs/pages/clusters/src/lib/ui/page-clusters-create/step-summary/step-summary.tsx index 73cf1c1323e..c43ba51b035 100644 --- a/libs/pages/clusters/src/lib/ui/page-clusters-create/step-summary/step-summary.tsx +++ b/libs/pages/clusters/src/lib/ui/page-clusters-create/step-summary/step-summary.tsx @@ -5,7 +5,18 @@ import { ClusterRemoteData, ClusterResourcesData, } from '@qovery/shared/interfaces' -import { Button, ButtonIcon, ButtonIconStyle, ButtonSize, ButtonStyle, Icon, IconAwesomeEnum } from '@qovery/shared/ui' +import { + BannerBox, + BannerBoxEnum, + Button, + ButtonIcon, + ButtonIconStyle, + ButtonSize, + ButtonStyle, + Icon, + IconAwesomeEnum, + Link, +} from '@qovery/shared/ui' import { trimId } from '@qovery/shared/utils' export interface StepSummaryProps { @@ -51,6 +62,25 @@ export function StepSummary(props: StepSummaryProps) {
+ + Use exclusively the Qovery console to update the resources managed by Qovery on your cloud account. +
Do not manually update or upgrade them on the cloud provider console, otherwise you will risk a + drift in the configuration. + + + } + type={BannerBoxEnum.WARNING} + />
({ + __esModule: true, + default: jest.fn(), +})) + describe('PageApplicationLogs', () => { it('should render successfully', () => { const { baseElement } = render() diff --git a/libs/pages/logs/application/src/lib/page-application-logs.tsx b/libs/pages/logs/application/src/lib/page-application-logs.tsx index 6eb715f1873..a84f51f6766 100644 --- a/libs/pages/logs/application/src/lib/page-application-logs.tsx +++ b/libs/pages/logs/application/src/lib/page-application-logs.tsx @@ -82,28 +82,32 @@ export function PageApplicationLogs() { }, }) - useWebSocket(nginxLogsUrl, { - onMessage: (message) => { - const data = { ...JSON.parse(message?.data), pod_name: 'nginx' } + useWebSocket( + nginxLogsUrl, + { + onMessage: (message) => { + const data = { ...JSON.parse(message?.data), pod_name: 'nginx' } - if (pauseStatusLogs) { - setPauseLogs((prev: Log[]) => { - const sortedLogs = [...prev, data].sort( - (a: Log, b: Log) => new Date(a.created_at).valueOf() - new Date(b.created_at).valueOf() - ) - return sortedLogs - }) - } else { - setLogs((prev: Log[]) => { - const sortedLogs = [...prev, ...pauseLogs, data].sort( - (a: Log, b: Log) => new Date(a.created_at).valueOf() - new Date(b.created_at).valueOf() - ) - return sortedLogs - }) - setPauseLogs([]) - } + if (pauseStatusLogs) { + setPauseLogs((prev: Log[]) => { + const sortedLogs = [...prev, data].sort( + (a: Log, b: Log) => new Date(a.created_at).valueOf() - new Date(b.created_at).valueOf() + ) + return sortedLogs + }) + } else { + setLogs((prev: Log[]) => { + const sortedLogs = [...prev, ...pauseLogs, data].sort( + (a: Log, b: Log) => new Date(a.created_at).valueOf() - new Date(b.created_at).valueOf() + ) + return sortedLogs + }) + setPauseLogs([]) + } + }, }, - }) + debugMode + ) useEffect(() => { // reset state when the applicationId change diff --git a/libs/pages/logs/application/src/lib/ui/row/row.tsx b/libs/pages/logs/application/src/lib/ui/row/row.tsx index 305aefe424e..8001747a2b0 100644 --- a/libs/pages/logs/application/src/lib/ui/row/row.tsx +++ b/libs/pages/logs/application/src/lib/ui/row/row.tsx @@ -59,7 +59,7 @@ export const formatVersion = (version: string) => { export interface RowProps { data: Log - filter: TableFilterProps + filter?: TableFilterProps } export function Row(props: RowProps) { diff --git a/libs/pages/settings/src/lib/page-settings.tsx b/libs/pages/settings/src/lib/page-settings.tsx index 338e6ff54ca..37b9b8a4dde 100644 --- a/libs/pages/settings/src/lib/page-settings.tsx +++ b/libs/pages/settings/src/lib/page-settings.tsx @@ -91,16 +91,8 @@ export function PageSettings() { ], })) - const accountLinks = [ - { - title: 'General', - icon: IconAwesomeEnum.WHEEL, - onClick: () => window.open('https://console.qovery.com/platform/organization/user/settings/general'), - }, - ] - return ( - + {ROUTER_SETTINGS.map((route) => ( diff --git a/libs/pages/settings/src/lib/ui/container/container.tsx b/libs/pages/settings/src/lib/ui/container/container.tsx index 4b12d00cf37..16ed61cf904 100644 --- a/libs/pages/settings/src/lib/ui/container/container.tsx +++ b/libs/pages/settings/src/lib/ui/container/container.tsx @@ -6,13 +6,12 @@ import { NavigationLeft, NavigationLeftLinkProps, useModal } from '@qovery/share export interface ContainerProps { organizationLinks: NavigationLeftLinkProps[] projectLinks: NavigationLeftLinkProps[] - accountLinks: NavigationLeftLinkProps[] children: ReactNode } export function Container(props: ContainerProps) { const { organizationId = '' } = useParams() - const { organizationLinks, projectLinks, accountLinks, children } = props + const { organizationLinks, projectLinks, children } = props const { openModal, closeModal } = useModal() return ( @@ -33,11 +32,6 @@ export function Container(props: ContainerProps) { }} className="py-6 border-t border-element-light-lighter-400" /> -
{children}
diff --git a/libs/shared/ui/src/lib/components/banner-box/banner-box.tsx b/libs/shared/ui/src/lib/components/banner-box/banner-box.tsx index 7e0ae63daf6..75523673c3f 100644 --- a/libs/shared/ui/src/lib/components/banner-box/banner-box.tsx +++ b/libs/shared/ui/src/lib/components/banner-box/banner-box.tsx @@ -1,3 +1,4 @@ +import { ReactNode } from 'react' import Icon from '../icon/icon' import { IconAwesomeEnum } from '../icon/icon-awesome.enum' @@ -8,7 +9,7 @@ export enum BannerBoxEnum { } export interface BannerBoxProps { - message: string + message: string | ReactNode icon?: IconAwesomeEnum | string title?: string className?: string