Merge branch 'eclipse-xpanse:main' into main

WangLiNaruto · Apr 25, 2024 · 6b8411b · 6b8411b
2 parents 4d4c437 + de19c26
commit 6b8411b
Show file tree

Hide file tree

Showing 43 changed files with 1,878 additions and 2,835 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -5,17 +5,17 @@
     "type": "module",
     "dependencies": {
         "@ant-design/icons": "^5.3.6",
-        "@axa-fr/react-oidc": "^7.22.3",
-        "@tanstack/react-query": "^5.29.2",
-        "antd": "^5.16.2",
+        "@axa-fr/react-oidc": "^7.22.4",
+        "@tanstack/react-query": "^5.31.0",
+        "antd": "^5.16.4",
         "echarts": "5.5.0",
         "echarts-for-react": "^3.0.2",
         "rc-field-form": "^2.0.0",
         "rc-menu": "^9.12.2",
         "rc-tabs": "^15.0.0",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
-        "react-router-dom": "^6.22.3",
+        "react-router-dom": "^6.23.0",
         "react-timer-hook": "^3.0.7",
         "yaml": "^2.4.1",
         "zustand": "^4.5.2"
@@ -53,7 +53,8 @@
             "no-undef": "off",
             "@typescript-eslint/no-inferrable-types": "off",
             "@tanstack/query/exhaustive-deps": "error",
-            "no-console": "error"
+            "no-console": "error",
+            "@typescript-eslint/no-dynamic-delete": "off"
         },
         "ignorePatterns": [
             "src/xpanse-api/**",
@@ -82,18 +83,18 @@
         ]
     },
     "devDependencies": {
-        "@axa-fr/oidc-client": "^7.22.2",
+        "@axa-fr/oidc-client": "^7.22.4",
         "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
         "@tanstack/eslint-plugin-query": "^5.28.11",
         "@testing-library/jest-dom": "^6.4.2",
-        "@testing-library/react": "^15.0.2",
+        "@testing-library/react": "^15.0.4",
         "@types/jest": "^29.5.12",
         "@types/node": "^20.12.7",
         "@types/react": "^18.2.79",
         "@types/react-dom": "^18.2.25",
         "@types/uuid": "^9.0.8",
-        "@typescript-eslint/eslint-plugin": "^7.7.0",
-        "@typescript-eslint/parser": "^7.7.0",
+        "@typescript-eslint/eslint-plugin": "^7.7.1",
+        "@typescript-eslint/parser": "^7.7.1",
         "env-cmd": "^10.1.0",
         "eslint": "^8.57.0",
         "eslint-config-prettier": "^9.0.0",
@@ -105,7 +106,7 @@
         "identity-obj-proxy": "^3.0.0",
         "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",
-        "knip": "^5.9.4",
+        "knip": "^5.10.0",
         "openapi-typescript-codegen": "^0.29.0",
         "prettier": "3.2.5",
         "react-scripts": "5.0.1",

diff --git a/src/components/content/catalog/services/policies/AddOrUpdateServicePolicy.tsx b/src/components/content/catalog/services/policies/AddOrUpdateServicePolicy.tsx
@@ -68,13 +68,15 @@ export const AddOrUpdateServicePolicy = ({
             }
 
             const policyUpdateRequest: ServicePolicyUpdateRequest = {
-                id: currentServicePolicy.id,
                 enabled: policyRequest.enabled,
                 policy: policyRequest.policy,
                 flavorNameList: policyRequest.flavors,
             };
             setUpdatePolicyRequest(policyUpdateRequest);
-            updatePoliciesManagementServiceRequest.mutate(policyUpdateRequest);
+            updatePoliciesManagementServiceRequest.mutate({
+                id: currentServicePolicy.id,
+                policyUpdateRequest: policyUpdateRequest,
+            });
         }
     };
 
@@ -187,7 +189,7 @@ export const AddOrUpdateServicePolicy = ({
                     currentServicePolicy={createServicePoliciesRequest.data}
                 />
             ) : null}
-            {updatePolicyRequest !== undefined && updatePolicyRequest.id.length > 0 ? (
+            {updatePolicyRequest !== undefined ? (
                 <ServicePolicyUpdateResultStatus
                     isError={updatePoliciesManagementServiceRequest.isError}
                     isSuccess={updatePoliciesManagementServiceRequest.isSuccess}

diff --git a/src/components/content/catalog/services/policies/updatePolicy/useUpdateServicePolicy.tsx b/src/components/content/catalog/services/policies/updatePolicy/useUpdateServicePolicy.tsx
@@ -8,8 +8,8 @@ import { ServicePoliciesManagementService, ServicePolicyUpdateRequest } from '..
 
 export const useUpdateServicePolicy = () => {
     return useMutation({
-        mutationFn: (policyUpdateRequest: ServicePolicyUpdateRequest) => {
-            return ServicePoliciesManagementService.updateServicePolicy(policyUpdateRequest);
+        mutationFn: ({ id, policyUpdateRequest }: { id: string; policyUpdateRequest: ServicePolicyUpdateRequest }) => {
+            return ServicePoliciesManagementService.updateServicePolicy(id, policyUpdateRequest);
         },
     });
 };
diff --git a/src/components/content/deployedServices/common/DeployedServicesStatus.tsx b/src/components/content/deployedServices/common/DeployedServicesStatus.tsx
@@ -19,6 +19,7 @@ export function DeployedServicesStatus(
 ): React.JSX.Element {
     switch (serviceDeploymentState) {
         case DeployedService.serviceDeploymentState.DEPLOYING:
+        case DeployedService.serviceDeploymentState.MODIFYING:
         case DeployedService.serviceDeploymentState.DESTROYING:
             return (
                 <Tag
@@ -36,6 +37,12 @@ export function DeployedServicesStatus(
                     {serviceDeploymentState.valueOf()}
                 </Tag>
             );
+        case DeployedService.serviceDeploymentState.MODIFICATION_FAILED:
+            return (
+                <Tag bordered={false} icon={<CloseCircleOutlined />} color='error' className={'my-service-status-size'}>
+                    {serviceDeploymentState.valueOf()}
+                </Tag>
+            );
         case DeployedService.serviceDeploymentState.DESTROY_FAILED:
             return (
                 <Tag
@@ -64,6 +71,17 @@ export function DeployedServicesStatus(
                     {serviceDeploymentState.valueOf()}
                 </Tag>
             );
+        case DeployedService.serviceDeploymentState.MODIFICATION_SUCCESSFUL:
+            return (
+                <Tag
+                    bordered={false}
+                    icon={<CheckCircleOutlined />}
+                    color='success'
+                    className={'my-service-status-size'}
+                >
+                    {serviceDeploymentState.valueOf()}
+                </Tag>
+            );
         default:
             return (
                 <Tag