From c375ae445cc40bc3e3e2d350984c7cab2de2abd9 Mon Sep 17 00:00:00 2001
From: WangLiNaruto <122504203+WangLiNaruto@users.noreply.github.com>
Date: Wed, 3 Jul 2024 16:49:04 +0800
Subject: [PATCH] warning in console log on re-registering service (#951)

---
 .../content/catalog/services/delete/DeleteService.tsx | 11 +++--------
 .../catalog/services/details/ServiceProvider.tsx      |  8 +-------
 .../services/re-register/ReRegisterService.tsx        | 11 +++--------
 3 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/src/components/content/catalog/services/delete/DeleteService.tsx b/src/components/content/catalog/services/delete/DeleteService.tsx
index 9b640c6ea..4cf145b3e 100644
--- a/src/components/content/catalog/services/delete/DeleteService.tsx
+++ b/src/components/content/catalog/services/delete/DeleteService.tsx
@@ -8,25 +8,20 @@ import { Button, Popconfirm } from 'antd';
 import React from 'react';
 import catalogStyles from '../../../../../styles/catalog.module.css';
 import { serviceRegistrationState } from '../../../../../xpanse-api/generated';
+import { useGetReRegisterMutationState } from '../re-register/ReRegisterMutation';
 import { useDeleteRequest } from './DeleteServiceMutation';
 
 function DeleteService({
     id,
     setIsViewDisabled,
-    isDeleteDisabled,
-    setIsReRegisterDisabled,
     serviceRegistrationStatus,
 }: {
     id: string;
     setIsViewDisabled: (isViewDisabled: boolean) => void;
-    isDeleteDisabled: boolean;
-    setIsReRegisterDisabled: (isReRegisterDisabled: boolean) => void;
     serviceRegistrationStatus: serviceRegistrationState;
 }): React.JSX.Element {
     const deleteRequest = useDeleteRequest(id);
-    if (deleteRequest.isSuccess) {
-        setIsReRegisterDisabled(true);
-    }
+    const reRegisterState = useGetReRegisterMutationState(id);
 
     const deleteService = () => {
         setIsViewDisabled(true);
@@ -50,7 +45,7 @@ function DeleteService({
                     className={catalogStyles.catalogManageBtnClass}
                     disabled={
                         deleteRequest.isSuccess ||
-                        isDeleteDisabled ||
+                        (reRegisterState.length > 0 && reRegisterState[0].status === 'success') ||
                         serviceRegistrationStatus !== serviceRegistrationState.UNREGISTERED
                     }
                 >
diff --git a/src/components/content/catalog/services/details/ServiceProvider.tsx b/src/components/content/catalog/services/details/ServiceProvider.tsx
index c3ea2f878..e7e4b5782 100644
--- a/src/components/content/catalog/services/details/ServiceProvider.tsx
+++ b/src/components/content/catalog/services/details/ServiceProvider.tsx
@@ -6,7 +6,7 @@
 import { EnvironmentOutlined } from '@ant-design/icons';
 import { Empty, Image, Tabs } from 'antd';
 import { Tab } from 'rc-tabs/lib/interface';
-import React, { useMemo, useState } from 'react';
+import React, { useMemo } from 'react';
 import { createSearchParams, useNavigate, useSearchParams } from 'react-router-dom';
 import catalogStyles from '../../../../../styles/catalog.module.css';
 import { ServiceTemplateDetailVo, category, name, serviceRegistrationState } from '../../../../../xpanse-api/generated';
@@ -51,8 +51,6 @@ function ServiceProvider({
 }): React.JSX.Element {
     const [urlParams] = useSearchParams();
     const navigate = useNavigate();
-    const [isReRegisterDisabled, setIsReRegisterDisabled] = useState<boolean>(false);
-    const [isDeleteDisabled, setIsDeleteDisabled] = useState<boolean>(false);
     const serviceCspInQuery = useMemo(() => {
         const queryInUri = decodeURI(urlParams.get(serviceCspQuery) ?? '');
         if (queryInUri.length > 0) {
@@ -207,8 +205,6 @@ function ServiceProvider({
                                 <ReRegisterService
                                     id={activeServiceDetail.serviceTemplateId}
                                     setIsViewDisabled={setIsViewDisabled}
-                                    isReRegisterDisabled={isReRegisterDisabled}
-                                    setIsDeleteDisabled={setIsDeleteDisabled}
                                     serviceRegistrationStatus={
                                         activeServiceDetail.serviceRegistrationState as serviceRegistrationState
                                     }
@@ -216,8 +212,6 @@ function ServiceProvider({
                                 <DeleteService
                                     id={activeServiceDetail.serviceTemplateId}
                                     setIsViewDisabled={setIsViewDisabled}
-                                    isDeleteDisabled={isDeleteDisabled}
-                                    setIsReRegisterDisabled={setIsReRegisterDisabled}
                                     serviceRegistrationStatus={
                                         activeServiceDetail.serviceRegistrationState as serviceRegistrationState
                                     }
diff --git a/src/components/content/catalog/services/re-register/ReRegisterService.tsx b/src/components/content/catalog/services/re-register/ReRegisterService.tsx
index 60a291985..62d318647 100644
--- a/src/components/content/catalog/services/re-register/ReRegisterService.tsx
+++ b/src/components/content/catalog/services/re-register/ReRegisterService.tsx
@@ -8,25 +8,20 @@ import { Button, Popconfirm } from 'antd';
 import React from 'react';
 import catalogStyles from '../../../../../styles/catalog.module.css';
 import { serviceRegistrationState } from '../../../../../xpanse-api/generated';
+import { useGetDeleteMutationState } from '../delete/DeleteServiceMutation';
 import { useReRegisterRequest } from './ReRegisterMutation';
 
 function ReRegisterService({
     id,
     setIsViewDisabled,
-    isReRegisterDisabled,
-    setIsDeleteDisabled,
     serviceRegistrationStatus,
 }: {
     id: string;
     setIsViewDisabled: (isViewDisabled: boolean) => void;
-    isReRegisterDisabled: boolean;
-    setIsDeleteDisabled: (isDelete: boolean) => void;
     serviceRegistrationStatus: serviceRegistrationState;
 }): React.JSX.Element {
     const reRegisterRequest = useReRegisterRequest(id);
-    if (reRegisterRequest.isSuccess) {
-        setIsDeleteDisabled(true);
-    }
+    const deleteState = useGetDeleteMutationState(id);
     const reRegister = () => {
         setIsViewDisabled(true);
         reRegisterRequest.mutate();
@@ -49,7 +44,7 @@ function ReRegisterService({
                     className={catalogStyles.catalogManageBtnClass}
                     disabled={
                         reRegisterRequest.isSuccess ||
-                        isReRegisterDisabled ||
+                        (deleteState.length > 0 && deleteState[0].status === 'success') ||
                         serviceRegistrationStatus !== serviceRegistrationState.UNREGISTERED
                     }
                 >