Merge branch 'eclipse-xpanse:main' into main

WangLiNaruto · May 31, 2024 · b1f467b · b1f467b
2 parents 876bca0 + cbd8c67
commit b1f467b
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 23 deletions.
diff --git 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 /

diff --git a/package-lock.json b/package-lock.json
diff --git 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": {

diff --git 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 (
         <div className={tablesStyle.genericTableContainer}>
             <div className={monitorStyles.monitorServiceSelectTitle}>
@@ -194,12 +184,6 @@ function Monitor(): React.JSX.Element {
                     &nbsp; Operating System Monitor
                 </h3>
             </div>
-            <MonitorTip
-                type={tipType.current}
-                msg={tipMessage.current}
-                description={tipDescription.current}
-                onRemove={onRemove}
-            />
             <Form
                 name='basic'
                 form={form}
@@ -287,6 +271,7 @@ function Monitor(): React.JSX.Element {
                             isAutoRefresh={isAutoRefresh}
                             chartsPerRow={chartsPerRow}
                             setNumberOfChartsAvailable={setNumberOfChartsAvailable}
+                            onReset={onReset}
                         />
                     </Suspense>
                 </div>

diff --git 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 (
         <>
-            <MonitorTip type={tipType} msg={tipMessage} description={tipDescription} onRemove={onRemove} />
+            <MonitorTip
+                type={tipType}
+                msg={tipMessage}
+                description={tipDescription}
+                onRemove={onRemove}
+                retryRequest={retryRequest}
+            />
             {useGetMetricForSpecificTimePeriod.isLoading || useGetLastKnownMetric.isLoading ? (
                 <div className={monitorStyles.monitorSearchLoadingClass}>
                     <Spin

diff --git a/src/components/content/monitor/MonitorTip.tsx b/src/components/content/monitor/MonitorTip.tsx
@@ -3,20 +3,23 @@
  * SPDX-FileCopyrightText: Huawei Inc.
  */
 
-import { Alert } from 'antd';
+import { Alert, Button } from 'antd';
 import React from 'react';
+import errorAlertStyles from '../../../styles/error-alert.module.css';
 import monitorStyles from '../../../styles/monitor.module.css';
 
 export const MonitorTip = ({
     type,
     msg,
     description,
     onRemove,
+    retryRequest,
 }: {
     type: 'error' | 'success' | undefined;
     msg: string;
     description: string;
     onRemove: () => void;
+    retryRequest: () => void;
 }): React.JSX.Element => {
     if (!type) {
         return <></>;
@@ -32,6 +35,17 @@ export const MonitorTip = ({
                 type={type}
                 onClose={onRemove}
                 closable={true}
+                action={
+                    <Button
+                        className={errorAlertStyles.tryAgainBtnInAlertClass}
+                        size='small'
+                        type='primary'
+                        onClick={retryRequest}
+                        danger={true}
+                    >
+                        Retry Request
+                    </Button>
+                }
             />{' '}
         </div>
     );

diff --git 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}
                 >
                     <Flex vertical gap='middle'>
-                        <Radio.Group disabled={true} buttonStyle='solid' value={selectBillMode}>
+                        <Radio.Group disabled={true} buttonStyle='solid'>
                             <Radio.Button key={selectBillMode} value={selectBillMode}>
                                 {selectBillMode}
                             </Radio.Button>