Merge branch 'eclipse-xpanse:main' into main

WangLiNaruto · Jun 13, 2024 · 19de32d · 19de32d
2 parents bee931e + 5e8f03e
commit 19de32d
Show file tree

Hide file tree

Showing 19 changed files with 764 additions and 562 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -6,18 +6,18 @@
     "dependencies": {
         "@ant-design/icons": "^5.3.7",
         "@axa-fr/react-oidc": "^7.22.7",
-        "@tanstack/react-query": "^5.40.1",
-        "antd": "^5.18.0",
+        "@tanstack/react-query": "^5.44.0",
+        "antd": "^5.18.1",
         "echarts": "5.5.0",
         "echarts-for-react": "^3.0.2",
         "rc-field-form": "^2.2.1",
         "rc-menu": "^9.14.0",
-        "rc-tabs": "^15.1.0",
+        "rc-tabs": "^15.1.1",
         "react": "^18.2.0",
         "react-dom": "^18.3.1",
         "react-router-dom": "^6.23.1",
         "react-timer-hook": "^3.0.7",
-        "yaml": "^2.4.3",
+        "yaml": "^2.4.5",
         "zustand": "^4.5.2"
     },
     "scripts": {
@@ -102,15 +102,15 @@
         "@axa-fr/oidc-client": "^7.22.5",
         "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
         "@tanstack/eslint-plugin-query": "^5.43.1",
-        "@testing-library/jest-dom": "^6.4.5",
+        "@testing-library/jest-dom": "^6.4.6",
         "@testing-library/react": "^16.0.0",
         "@types/jest": "^29.5.12",
         "@types/node": "^20.14.2",
         "@types/react": "^18.3.3",
         "@types/react-dom": "^18.3.0",
         "@types/uuid": "^9.0.8",
         "@typescript-eslint/eslint-plugin": "^7.13.0",
-        "@typescript-eslint/parser": "^7.12.0",
+        "@typescript-eslint/parser": "^7.13.0",
         "@vitejs/plugin-react": "^4.3.1",
         "env-cmd": "^10.1.0",
         "eslint": "^8.57.0",
@@ -124,9 +124,9 @@
         "identity-obj-proxy": "^3.0.0",
         "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",
-        "knip": "^5.18.2",
+        "knip": "^5.19.0",
         "openapi-typescript-codegen": "^0.29.0",
-        "prettier": "3.3.1",
+        "prettier": "3.3.2",
         "prettier-plugin-organize-imports": "^3.2.4",
         "release-it": "^17.3.0",
         "ts-jest": "^29.1.4",

diff --git a/src/components/content/common/ocl/ContactDetailsText.tsx b/src/components/content/common/ocl/ContactDetailsText.tsx
@@ -34,42 +34,42 @@ export function ContactDetailsText({
 
 function convertRecordToList(serviceProviderContactDetails: ServiceProviderContactDetails): React.JSX.Element {
     const content: React.JSX.Element[] = [];
-    if (serviceProviderContactDetails.email) {
+    if (serviceProviderContactDetails.emails) {
         content.push(
             <React.Fragment key={uuidv4()}>
                 <div className={oclDisplayStyles.oclContactDetailsClass}>
                     <MailOutlined />
-                    {getEmailPropertyValue(serviceProviderContactDetails.email)}
+                    {getEmailPropertyValue(serviceProviderContactDetails.emails)}
                 </div>
             </React.Fragment>
         );
     }
-    if (serviceProviderContactDetails.phone) {
+    if (serviceProviderContactDetails.phones) {
         content.push(
             <React.Fragment key={uuidv4()}>
                 <div className={oclDisplayStyles.oclContactDetailsClass}>
                     <PhoneOutlined />
-                    {getPhonePropertyValue(serviceProviderContactDetails.phone)}
+                    {getPhonePropertyValue(serviceProviderContactDetails.phones)}
                 </div>
             </React.Fragment>
         );
     }
-    if (serviceProviderContactDetails.chat) {
+    if (serviceProviderContactDetails.chats) {
         content.push(
             <React.Fragment key={uuidv4()}>
                 <div className={oclDisplayStyles.oclContactDetailsClass}>
                     <MessageOutlined />
-                    {getPropertyValue(serviceProviderContactDetails.chat)}
+                    {getPropertyValue(serviceProviderContactDetails.chats)}
                 </div>
             </React.Fragment>
         );
     }
-    if (serviceProviderContactDetails.website) {
+    if (serviceProviderContactDetails.websites) {
         content.push(
             <React.Fragment key={uuidv4()}>
                 <div className={oclDisplayStyles.oclContactDetailsClass}>
                     <GlobalOutlined />
-                    {getPropertyValue(serviceProviderContactDetails.website)}
+                    {getPropertyValue(serviceProviderContactDetails.websites)}
                 </div>
             </React.Fragment>
         );

diff --git a/src/components/content/order/formDataHelpers/getAvailabilityZoneRequirementsForAService.ts b/src/components/content/order/formDataHelpers/getAvailabilityZoneRequirementsForAService.ts
@@ -13,7 +13,7 @@ export function getAvailabilityZoneRequirementsForAService(
     if (services) {
         services.forEach((userOrderableServiceVo) => {
             if (userOrderableServiceVo.csp === selectCsp) {
-                availabilityZoneConfigs = userOrderableServiceVo.serviceAvailability ?? [];
+                availabilityZoneConfigs = userOrderableServiceVo.serviceAvailabilityConfigs ?? [];
             }
         });
     }