From 03b212fb545a8520a4dc3f04271d9f14912472fc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 May 2024 09:52:39 +0200 Subject: [PATCH 1/4] Bump nginx from 1.26.0-alpine to 1.27.0-alpine in /docker (#837) Bumps nginx from 1.26.0-alpine to 1.27.0-alpine. --- updated-dependencies: - dependency-name: nginx dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 569b92273..f0a169ae8 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # SPDX-FileCopyrightText: Huawei Inc. # -FROM nginx:1.26.0-alpine +FROM nginx:1.27.0-alpine WORKDIR /usr/share/nginx/html RUN apk add --no-cache bash envsubst COPY docker/nginx-entrypoint.sh / From 273746287f1f5fec95126a04fb3949c4f5f240cd Mon Sep 17 00:00:00 2001 From: WangLiNaruto <122504203+WangLiNaruto@users.noreply.github.com> Date: Fri, 31 May 2024 15:53:13 +0800 Subject: [PATCH 2/4] BillingMode shown in different color in the Migration final page (#840) --- .../content/order/common/MigrateServiceSubmitBillingMode.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/content/order/common/MigrateServiceSubmitBillingMode.tsx b/src/components/content/order/common/MigrateServiceSubmitBillingMode.tsx index 51b6d53c3..ab1b60926 100644 --- a/src/components/content/order/common/MigrateServiceSubmitBillingMode.tsx +++ b/src/components/content/order/common/MigrateServiceSubmitBillingMode.tsx @@ -19,7 +19,7 @@ export const MigrateServiceSubmitBillingMode = ({ selectBillMode }: { selectBill required={true} > - + {selectBillMode} From fc53307739c381fd7963ce618d7e2b44cd4c1ba5 Mon Sep 17 00:00:00 2001 From: WangLiNaruto <122504203+WangLiNaruto@users.noreply.github.com> Date: Fri, 31 May 2024 15:54:10 +0800 Subject: [PATCH 3/4] add retry to monitor failure alert (#839) --- src/components/content/monitor/Monitor.tsx | 17 +---------------- src/components/content/monitor/MonitorChart.tsx | 14 +++++++++++++- src/components/content/monitor/MonitorTip.tsx | 16 +++++++++++++++- 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/src/components/content/monitor/Monitor.tsx b/src/components/content/monitor/Monitor.tsx index 5097f0acd..55b6a90af 100644 --- a/src/components/content/monitor/Monitor.tsx +++ b/src/components/content/monitor/Monitor.tsx @@ -14,7 +14,6 @@ import { ApiError, DeployedService, Response } from '../../../xpanse-api/generat import { MetricAutoRefreshSwitch } from './MetricAutoRefreshSwitch'; import { MetricChartsPerRowDropDown } from './MetricChartsPerRowDropDown'; import { MetricTimePeriodRadioButton } from './MetricTimePeriodRadioButton'; -import { MonitorTip } from './MonitorTip'; import { chartsPerRowWithTwo, lastMinuteRadioButtonKeyId } from './metricProps'; import { useDeployedServicesByUserQuery } from './useDeployedServicesByUserQuery'; @@ -177,15 +176,6 @@ function Monitor(): React.JSX.Element { setServiceId(''); }; - const onRemove = () => { - setServiceId(''); - form.resetFields(); - tipType.current = undefined; - tipMessage.current = ''; - tipDescription.current = ''; - void deployedServiceQuery.refetch(); - }; - return (
@@ -194,12 +184,6 @@ function Monitor(): React.JSX.Element {   Operating System Monitor
-
diff --git a/src/components/content/monitor/MonitorChart.tsx b/src/components/content/monitor/MonitorChart.tsx index fd2a85c9e..eb4e30d88 100644 --- a/src/components/content/monitor/MonitorChart.tsx +++ b/src/components/content/monitor/MonitorChart.tsx @@ -32,12 +32,14 @@ export default function MonitorChart({ isAutoRefresh, chartsPerRow, setNumberOfChartsAvailable, + onReset, }: { serviceId: string; timePeriod: number; isAutoRefresh: boolean; chartsPerRow: string; setNumberOfChartsAvailable: (chartCount: number) => void; + onReset: () => void; }): React.JSX.Element { let tipType: 'error' | 'success' | undefined = undefined; let tipMessage: string = ''; @@ -235,6 +237,10 @@ export default function MonitorChart({ tipType = undefined; tipMessage = ''; tipDescription = ''; + onReset(); + }; + + const retryRequest = () => { if (timePeriod === lastMinuteRadioButtonKeyId) { void useGetLastKnownMetric.refetch(); } else { @@ -244,7 +250,13 @@ export default function MonitorChart({ return ( <> - + {useGetMetricForSpecificTimePeriod.isLoading || useGetLastKnownMetric.isLoading ? (
void; + retryRequest: () => void; }): React.JSX.Element => { if (!type) { return <>; @@ -32,6 +35,17 @@ export const MonitorTip = ({ type={type} onClose={onRemove} closable={true} + action={ + + } />{' '}
); From cbd8c677c8350e22f4c48e70d38267a3eaa4d9f3 Mon Sep 17 00:00:00 2001 From: eclipse-xpanse-bot Date: Fri, 31 May 2024 08:08:28 +0000 Subject: [PATCH 4/4] Release 1.0.12 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index fa52c68a8..405cb68c0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "xpanse-ui", - "version": "1.0.11", + "version": "1.0.12", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "xpanse-ui", - "version": "1.0.11", + "version": "1.0.12", "dependencies": { "@ant-design/icons": "^5.3.7", "@axa-fr/react-oidc": "^7.22.6", diff --git a/package.json b/package.json index 1652b8ba3..68f30dd72 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xpanse-ui", - "version": "1.0.11", + "version": "1.0.12", "private": true, "type": "module", "dependencies": {