Merge branch 'eclipse-xpanse:main' into main

WangLiNaruto · Jun 6, 2024 · 5a95f02 · 5a95f02
2 parents ce48e8a + 00cceed
commit 5a95f02
Show file tree

Hide file tree

Showing 49 changed files with 647 additions and 594 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -105,7 +105,7 @@
         "@testing-library/jest-dom": "^6.4.5",
         "@testing-library/react": "^16.0.0",
         "@types/jest": "^29.5.12",
-        "@types/node": "^20.14.1",
+        "@types/node": "^20.14.2",
         "@types/react": "^18.3.3",
         "@types/react-dom": "^18.3.0",
         "@types/uuid": "^9.0.8",
@@ -126,7 +126,7 @@
         "jest-environment-jsdom": "^29.7.0",
         "knip": "^5.17.4",
         "openapi-typescript-codegen": "^0.29.0",
-        "prettier": "3.3.0",
+        "prettier": "3.3.1",
         "prettier-plugin-organize-imports": "^3.2.4",
         "release-it": "^17.3.0",
         "ts-jest": "^29.1.4",

diff --git a/src/components/content/catalog/services/details/ServiceDetail.tsx b/src/components/content/catalog/services/details/ServiceDetail.tsx
@@ -45,6 +45,9 @@ function ServiceDetail({ serviceDetails }: { serviceDetails: ServiceTemplateDeta
                 <Descriptions.Item label='Service' labelStyle={{ width: '230px' }}>
                     <ShowIcon serviceDetails={serviceDetails} />
                 </Descriptions.Item>
+                <Descriptions.Item label='ServiceTemplateId' labelStyle={{ width: '230px' }}>
+                    {serviceDetails.id}
+                </Descriptions.Item>
                 <Descriptions.Item label='Description' labelStyle={{ width: '230px' }}>
                     {serviceDetails.description}
                 </Descriptions.Item>
@@ -69,7 +72,7 @@ function ServiceDetail({ serviceDetails }: { serviceDetails: ServiceTemplateDeta
                     <BillingText billing={serviceDetails.billing} />
                 </Descriptions.Item>
                 <Descriptions.Item label={'Service API'}>
-                    <ApiDoc id={serviceDetails.id} styleClass={appStyles.serviceApiDocLink} />
+                    <ApiDoc id={serviceDetails.serviceTemplateId} styleClass={appStyles.serviceApiDocLink} />
                 </Descriptions.Item>
                 <Descriptions.Item label='Contact Details'>
                     <ContactDetailsText

diff --git a/src/components/content/catalog/services/details/ServiceProvider.tsx b/src/components/content/catalog/services/details/ServiceProvider.tsx
@@ -186,9 +186,9 @@ function ServiceProvider({
                 <>
                     {activeServiceDetail ? (
                         <>
-                            <UnregisterResult id={activeServiceDetail.id} category={category} />
-                            <ReRegisterResult id={activeServiceDetail.id} category={category} />
-                            <DeleteResult id={activeServiceDetail.id} category={category} />
+                            <UnregisterResult id={activeServiceDetail.serviceTemplateId} category={category} />
+                            <ReRegisterResult id={activeServiceDetail.serviceTemplateId} category={category} />
+                            <DeleteResult id={activeServiceDetail.serviceTemplateId} category={category} />
                             <Tabs
                                 items={items}
                                 onChange={onChangeCsp}
@@ -197,24 +197,24 @@ function ServiceProvider({
                             />
                             <div className={catalogStyles.updateUnregisterBtnClass}>
                                 <UpdateService
-                                    id={activeServiceDetail.id}
+                                    id={activeServiceDetail.serviceTemplateId}
                                     category={category}
                                     isViewDisabled={isViewDisabled}
                                 />
                                 <UnregisterService
-                                    id={activeServiceDetail.id}
+                                    id={activeServiceDetail.serviceTemplateId}
                                     setIsViewDisabled={setIsViewDisabled}
                                     serviceRegistrationState={activeServiceDetail.serviceRegistrationState}
                                 />
                                 <ReRegisterService
-                                    id={activeServiceDetail.id}
+                                    id={activeServiceDetail.serviceTemplateId}
                                     setIsViewDisabled={setIsViewDisabled}
                                     isReRegisterDisabled={isReRegisterDisabled}
                                     setIsDeleteDisabled={setIsDeleteDisabled}
                                     serviceRegistrationState={activeServiceDetail.serviceRegistrationState}
                                 />
                                 <DeleteService
-                                    id={activeServiceDetail.id}
+                                    id={activeServiceDetail.serviceTemplateId}
                                     setIsViewDisabled={setIsViewDisabled}
                                     isDeleteDisabled={isDeleteDisabled}
                                     setIsReRegisterDisabled={setIsReRegisterDisabled}
@@ -233,7 +233,7 @@ function ServiceProvider({
                             />
                             <ServiceDetail serviceDetails={activeServiceDetail} />
                             <ServicePolicies
-                                key={activeServiceDetail.id}
+                                key={activeServiceDetail.serviceTemplateId}
                                 serviceDetails={activeServiceDetail}
                                 isViewDisabled={isViewDisabled}
                             />

diff --git a/src/components/content/catalog/services/policies/AddOrUpdateServicePolicy.tsx b/src/components/content/catalog/services/policies/AddOrUpdateServicePolicy.tsx
@@ -61,7 +61,7 @@ export const AddOrUpdateServicePolicy = ({
             };
             setCreatePolicyRequest(policyCreateRequest);
             createServicePoliciesRequest.mutate(policyCreateRequest);
-        } else if (currentServicePolicy.id.length > 0) {
+        } else if (currentServicePolicy.servicePolicyId.length > 0) {
             // Check whether the modified data has changed
             if (comparePolicyUpdateRequestResult(policyRequest, currentServicePolicy)) {
                 setIsUpdated(comparePolicyUpdateRequestResult(policyRequest, currentServicePolicy));
@@ -75,7 +75,7 @@ export const AddOrUpdateServicePolicy = ({
             };
             setUpdatePolicyRequest(policyUpdateRequest);
             updatePoliciesManagementServiceRequest.mutate({
-                id: currentServicePolicy.id,
+                id: currentServicePolicy.servicePolicyId,
                 policyUpdateRequest: policyUpdateRequest,
             });
         }
@@ -214,12 +214,12 @@ export const AddOrUpdateServicePolicy = ({
                 initialValues={{
                     remember: true,
                     enabled:
-                        currentServicePolicy !== undefined && currentServicePolicy.id.length > 0
+                        currentServicePolicy !== undefined && currentServicePolicy.servicePolicyId.length > 0
                             ? currentServicePolicy.enabled
                             : false,
                     flavors:
                         currentServicePolicy !== undefined &&
-                        currentServicePolicy.id.length > 0 &&
+                        currentServicePolicy.servicePolicyId.length > 0 &&
                         currentServicePolicy.flavorNameList
                             ? currentServicePolicy.flavorNameList
                             : [],

diff --git a/src/components/content/catalog/services/policies/ServicePolicies.tsx b/src/components/content/catalog/services/policies/ServicePolicies.tsx
@@ -28,7 +28,7 @@ export const ServicePolicies = ({
     const [currentServicePolicy, setCurrentServicePolicy] = useState<ServicePolicy | undefined>(undefined);
     const [isOpenAddOrUpdatePolicyModal, setIsOpenAddOrUpdatePolicyModal] = useState<boolean>(false);
 
-    const servicePolicyListQuery = useGetServicePolicyList(serviceDetails.id);
+    const servicePolicyListQuery = useGetServicePolicyList(serviceDetails.serviceTemplateId);
     const deleteServicePolicyRequest = useDeleteServicePolicy();
 
     const refreshServicePoliciesList = () => {
@@ -52,7 +52,7 @@ export const ServicePolicies = ({
     const columns: ColumnsType<ServicePolicy> = [
         {
             title: 'Policy ID',
-            dataIndex: 'id',
+            dataIndex: 'servicePolicyId',
         },
         {
             title: 'Content',
@@ -134,7 +134,7 @@ export const ServicePolicies = ({
                                     type='primary'
                                     icon={<CloseCircleOutlined />}
                                     loading={
-                                        record.id === currentPolicyId &&
+                                        record.servicePolicyId === currentPolicyId &&
                                         !deleteServicePolicyRequest.isSuccess &&
                                         deleteServicePolicyRequest.isError
                                     }
@@ -156,8 +156,8 @@ export const ServicePolicies = ({
     ];
 
     const deleteCurrentServicePolicy = (record: ServicePolicy) => {
-        setCurrentPolicyId(record.id);
-        deleteServicePolicyRequest.mutate(record.id);
+        setCurrentPolicyId(record.servicePolicyId);
+        deleteServicePolicyRequest.mutate(record.servicePolicyId);
     };
 
     const addServicePolicies = () => {
@@ -250,7 +250,7 @@ export const ServicePolicies = ({
                 onCancel={closeAddOrUpdateServicePolicyModal}
             >
                 <AddOrUpdateServicePolicy
-                    serviceTemplateId={serviceDetails.id}
+                    serviceTemplateId={serviceDetails.serviceTemplateId}
                     currentServicePolicy={currentServicePolicy}
                     getCancelUpdateStatus={getCancelUpdateStatus}
                     serviceDetails={serviceDetails}

diff --git a/...omponents/content/catalog/services/policies/addPolicy/ServicePolicyCreateResultStatus.tsx b/...omponents/content/catalog/services/policies/addPolicy/ServicePolicyCreateResultStatus.tsx
@@ -62,7 +62,7 @@ export default function ServicePolicyCreateResultStatus({
                     description={
                         <ServicePolicySubmitResult
                             msg={'Policy created successfully'}
-                            uuid={currentServicePolicy === undefined ? '' : currentServicePolicy.id}
+                            uuid={currentServicePolicy === undefined ? '' : currentServicePolicy.servicePolicyId}
                         />
                     }
                     showIcon

diff --git a/...onents/content/catalog/services/policies/updatePolicy/ServicePolicyUpdateResultStatus.tsx b/...onents/content/catalog/services/policies/updatePolicy/ServicePolicyUpdateResultStatus.tsx
@@ -62,7 +62,7 @@ export default function ServicePolicyUpdateResultStatus({
                     description={
                         <ServicePolicySubmitResult
                             msg={'Policy updated successfully'}
-                            uuid={currentServicePolicy === undefined ? '' : currentServicePolicy.id}
+                            uuid={currentServicePolicy === undefined ? '' : currentServicePolicy.servicePolicyId}
                         />
                     }
                     showIcon

diff --git a/src/components/content/catalog/services/update/UpdateService.tsx b/src/components/content/catalog/services/update/UpdateService.tsx
@@ -49,7 +49,7 @@ function UpdateService({
         },
         onSuccess: (serviceTemplateVo: ServiceTemplateDetailVo) => {
             files.current[0].status = 'done';
-            updateResult.current = [`ID - ${serviceTemplateVo.id}`];
+            updateResult.current = [`ID - ${serviceTemplateVo.serviceTemplateId}`];
         },
         onError: (error: Error) => {
             files.current[0].status = 'error';

diff --git a/src/components/content/deployedServices/myServices/MyServiceHistory.tsx b/src/components/content/deployedServices/myServices/MyServiceHistory.tsx
@@ -24,7 +24,7 @@ export const MyServiceHistory = ({
     deployedService: DeployedServiceDetails | VendorHostedDeployedServiceDetails;
 }): React.JSX.Element => {
     let serviceModificationAuditHistoryList: ServiceModificationAuditDetails[] = [];
-    const listServiceModifyHistoryQuery = useListServiceModifyHistoryQuery(deployedService.id);
+    const listServiceModifyHistoryQuery = useListServiceModifyHistoryQuery(deployedService.serviceId);
 
     if (listServiceModifyHistoryQuery.isSuccess && listServiceModifyHistoryQuery.data.length > 0) {
         serviceModificationAuditHistoryList = listServiceModifyHistoryQuery.data;
@@ -33,7 +33,7 @@ export const MyServiceHistory = ({
     const columns: ColumnsType<ServiceModificationAuditDetails> = [
         {
             title: 'ModifyId',
-            dataIndex: 'id',
+            dataIndex: 'serviceModificationRequestId',
             align: 'center',
             width: 100,
             className: serviceModifyStyles.modifyHistoryValue,