Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

warning in console log on re-registering service #951

Merged
merged 1 commit into from
Jul 3, 2024
Merged

warning in console log on re-registering service #951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions src/components/content/catalog/services/delete/DeleteService.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -50,7 +45,7 @@ function DeleteService({
className={catalogStyles.catalogManageBtnClass}
disabled={
deleteRequest.isSuccess ||
isDeleteDisabled ||
(reRegisterState.length > 0 && reRegisterState[0].status === 'success') ||
serviceRegistrationStatus !== serviceRegistrationState.UNREGISTERED
}
>
Expand Down
8 changes: 1 addition & 7 deletions src/components/content/catalog/services/details/ServiceProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -207,17 +205,13 @@ function ServiceProvider({
<ReRegisterService
id={activeServiceDetail.serviceTemplateId}
setIsViewDisabled={setIsViewDisabled}
isReRegisterDisabled={isReRegisterDisabled}
setIsDeleteDisabled={setIsDeleteDisabled}
serviceRegistrationStatus={
activeServiceDetail.serviceRegistrationState as serviceRegistrationState
}
/>
<DeleteService
id={activeServiceDetail.serviceTemplateId}
setIsViewDisabled={setIsViewDisabled}
isDeleteDisabled={isDeleteDisabled}
setIsReRegisterDisabled={setIsReRegisterDisabled}
serviceRegistrationStatus={
activeServiceDetail.serviceRegistrationState as serviceRegistrationState
}
Expand Down
11 changes: 3 additions & 8 deletions src/components/content/catalog/services/re-register/ReRegisterService.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -49,7 +44,7 @@ function ReRegisterService({
className={catalogStyles.catalogManageBtnClass}
disabled={
reRegisterRequest.isSuccess ||
isReRegisterDisabled ||
(deleteState.length > 0 && deleteState[0].status === 'success') ||
serviceRegistrationStatus !== serviceRegistrationState.UNREGISTERED
}
>
Expand Down
Loading