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

refactor service template review modal #681

Merged
merged 1 commit into from
Apr 5, 2024
Merged

refactor service template review modal #681

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
2 changes: 1 addition & 1 deletion src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import { SessionLost } from './components/content/login/SessionLost';
import Policies from './components/content/policies/Policies';
import Reports from './components/content/deployedServices/reports/Reports';
import Workflows from './components/content/workflows/Workflows';
import { ServiceReviews } from './components/content/serviceReviews/ServiceReviews';
import { ServiceReviews } from './components/content/review/ServiceReviews';

const queryClient = new QueryClient();

Expand Down
4 changes: 2 additions & 2 deletions src/components/content/register/RegisterResult.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function RegisterResult({
type={'success'}
message={
<>
Service <b>{ocl.name}</b> Registered Successfully
Service <b>{ocl.name}</b> registration request submitted successfully
</>
}
closable={true}
Expand All @@ -42,7 +42,7 @@ function RegisterResult({
type={'error'}
closable={true}
showIcon={true}
message={`Service Registration Failed`}
message={`Service registration request failed`}
description={convertStringArrayToUnorderedList(registerResult)}
onClose={onRemove}
className={'result'}
Expand Down
9 changes: 4 additions & 5 deletions ...eviews/ApproveOrRejectServiceTemplate.tsx → ...review/ApproveOrRejectServiceTemplate.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ export const ApproveOrRejectServiceTemplate = ({
handleModalClose,
setAlertTipCloseStatus,
}: {
currentServiceTemplateVo: ServiceTemplateDetailVo | undefined;
currentServiceTemplateVo: ServiceTemplateDetailVo;
isApproved: boolean | undefined;
isModalOpen: boolean;
handleModalClose: (arg: boolean) => void;
setAlertTipCloseStatus: (arg: boolean) => void;
}): React.JSX.Element => {
const { TextArea } = Input;
const [comments, setComments] = useState<string>('');
const approveOrRejectRequest = useApproveOrRejectRequest();
const approveOrRejectRequest = useApproveOrRejectRequest(currentServiceTemplateVo.id);
const handleOk = () => {
if (currentServiceTemplateVo && isApproved !== undefined) {
if (isApproved !== undefined) {
const request: ApproveOrRejectRequestParams = {
id: currentServiceTemplateVo.id,
reviewRegistrationRequest: {
Expand All @@ -42,7 +42,6 @@ export const ApproveOrRejectServiceTemplate = ({
};

const handleCancel = () => {
setComments('');
handleModalClose(true);
};

Expand Down Expand Up @@ -85,7 +84,7 @@ export const ApproveOrRejectServiceTemplate = ({
<div className={'approve-reject-alert-class'}>
<Alert
message={'Processing Status'}
description={'Register service review successfully.'}
description={'Service template reviewed successfully.'}
showIcon
closable={true}
onClose={onClose}
Expand Down
0 ...eReviews/GetServiceTemplatesListError.tsx → ...t/review/GetServiceTemplatesListError.tsx
View file
Open in desktop
File renamed without changes.
44 changes: 18 additions & 26 deletions ...content/serviceReviews/ServiceReviews.tsx → ...ponents/content/review/ServiceReviews.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import React, { useState } from 'react';
import useListAllServiceTemplatesQuery from './query/useListAllServiceTemplatesQuery';
import { Deployment, ServiceTemplateDetailVo } from '../../../xpanse-api/generated';
import { Button, Input, Modal, Row, Space, Table, Tag } from 'antd';
import { CheckCircleOutlined, InfoCircleOutlined, SearchOutlined, SyncOutlined } from '@ant-design/icons';
import { InfoCircleOutlined, SearchOutlined, SyncOutlined } from '@ant-design/icons';
import { ColumnsType } from 'antd/es/table';
import { ColumnFilterItem, FilterDropdownProps } from 'antd/es/table/interface';
import { ServiceReviewsDetails } from './ServiceReviewsDetails';
Expand Down Expand Up @@ -246,21 +246,11 @@ export const ServiceReviews = (): React.JSX.Element => {
align: 'left',
render: (deployment: Deployment) =>
deployment.kind === Deployment.kind.TERRAFORM ? (
<Tag
bordered={false}
icon={<CheckCircleOutlined />}
color='success'
className={'my-service-status-size'}
>
<Tag bordered={false} color='success' className={'my-service-status-size'}>
{'Terraform'}
</Tag>
) : (
<Tag
bordered={false}
icon={<CheckCircleOutlined />}
color='success'
className={'my-service-status-size'}
>
<Tag bordered={false} color='success' className={'my-service-status-size'}>
{'Opentofu'}
</Tag>
),
Expand Down Expand Up @@ -317,19 +307,21 @@ export const ServiceReviews = (): React.JSX.Element => {

return (
<div className={'generic-table-container'}>
<Modal
title={'Service Details'}
width={1000}
footer={null}
destroyOnClose={true}
open={currentServiceTemplateVo && isServiceTemplateDetailsModalOpen}
onCancel={handleServiceTemplateDetailsModalClose}
>
<ServiceReviewsDetails
currentServiceTemplateVo={currentServiceTemplateVo}
setAlertTipCloseStatus={setAlertTipCloseStatus}
/>
</Modal>
{currentServiceTemplateVo ? (
<Modal
title={'Service Details'}
width={1000}
footer={null}
destroyOnClose={true}
open={isServiceTemplateDetailsModalOpen}
onCancel={handleServiceTemplateDetailsModalClose}
>
<ServiceReviewsDetails
currentServiceTemplateVo={currentServiceTemplateVo}
setAlertTipCloseStatus={setAlertTipCloseStatus}
/>
</Modal>
) : null}

<div>
<Button
Expand Down
38 changes: 20 additions & 18 deletions .../serviceReviews/ServiceReviewsDetails.tsx → .../content/review/ServiceReviewsDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,33 +15,32 @@ import { CloudServiceProvider, ServiceTemplateDetailVo } from '../../../xpanse-a
import { ApproveOrRejectServiceTemplate } from './ApproveOrRejectServiceTemplate';
import '../../../styles/service_review.css';
import useGetRegistrationDetails from './query/useGetRegistrationDetails';
import { useApproveOrRejectMutationState } from './query/useApproveOrRejectRequest';

export const ServiceReviewsDetails = ({
currentServiceTemplateVo,
setAlertTipCloseStatus,
}: {
currentServiceTemplateVo: ServiceTemplateDetailVo | undefined;
currentServiceTemplateVo: ServiceTemplateDetailVo;
setAlertTipCloseStatus: (arg: boolean) => void;
}): React.JSX.Element => {
const PLACE_HOLDER_UNKNOWN_VALUE: string = 'NOT PROVIDED';
const [isModalOpen, setIsModalOpen] = useState<boolean>(false);
const [isReviewCommentsModalOpen, setIsReviewCommentsModalOpen] = useState<boolean>(false);
const [isApproved, setIsApproved] = useState<boolean | undefined>(undefined);
const getRegistrationDetailsQuery = useGetRegistrationDetails(currentServiceTemplateVo?.id);
const getRegistrationDetailsQuery = useGetRegistrationDetails(currentServiceTemplateVo.id);
const useReviewRequestState = useApproveOrRejectMutationState(currentServiceTemplateVo.id);

if (!currentServiceTemplateVo) {
return <></>;
}
const onClickApprove = () => {
setIsApproved(true);
setIsModalOpen(true);
setIsReviewCommentsModalOpen(true);
};
const onClickReject = () => {
setIsApproved(false);
setIsModalOpen(true);
setIsReviewCommentsModalOpen(true);
};
const handleModalClose = (isClose: boolean) => {
const handleReviewCommentsModalClose = (isClose: boolean) => {
if (isClose) {
setIsModalOpen(false);
setIsReviewCommentsModalOpen(false);
}
};
return (
Expand All @@ -51,9 +50,10 @@ export const ServiceReviewsDetails = ({
type='primary'
onClick={onClickApprove}
disabled={
getRegistrationDetailsQuery.isSuccess &&
getRegistrationDetailsQuery.data.serviceRegistrationState !==
ServiceTemplateDetailVo.serviceRegistrationState.APPROVAL_PENDING
useReviewRequestState[0]?.status === 'success' ||
(getRegistrationDetailsQuery.isSuccess &&
getRegistrationDetailsQuery.data.serviceRegistrationState !==
ServiceTemplateDetailVo.serviceRegistrationState.APPROVAL_PENDING)
}
>
Approve
Expand All @@ -63,18 +63,20 @@ export const ServiceReviewsDetails = ({
onClick={onClickReject}
className={'reject-btn-class'}
disabled={
getRegistrationDetailsQuery.isSuccess &&
getRegistrationDetailsQuery.data.serviceRegistrationState !==
ServiceTemplateDetailVo.serviceRegistrationState.APPROVAL_PENDING
useReviewRequestState[0]?.status === 'success' ||
(getRegistrationDetailsQuery.isSuccess &&
getRegistrationDetailsQuery.data.serviceRegistrationState !==
ServiceTemplateDetailVo.serviceRegistrationState.APPROVAL_PENDING)
}
>
Reject
</Button>
<ApproveOrRejectServiceTemplate
key={currentServiceTemplateVo.id}
currentServiceTemplateVo={currentServiceTemplateVo}
isApproved={isApproved}
isModalOpen={isModalOpen}
handleModalClose={handleModalClose}
isModalOpen={isReviewCommentsModalOpen}
handleModalClose={handleReviewCommentsModalClose}
setAlertTipCloseStatus={setAlertTipCloseStatus}
/>
<div className={'ocl-data-display'}>
Expand Down
2 changes: 1 addition & 1 deletion ...Reviews/ServiceTemplateRegisterStatus.tsx → .../review/ServiceTemplateRegisterStatus.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export function ServiceTemplateRegisterStatus(
return (
<Tag
bordered={false}
icon={<SyncOutlined spin />}
icon={<SyncOutlined spin={false} />}
color='processing'
className={'my-service-status-size'}
>
Expand Down
14 changes: 12 additions & 2 deletions ...eviews/query/useApproveOrRejectRequest.ts → ...review/query/useApproveOrRejectRequest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,19 @@
* SPDX-FileCopyrightText: Huawei Inc.
*/

import { useMutation } from '@tanstack/react-query';
import { useMutation, useMutationState } from '@tanstack/react-query';
import { CloudServiceProviderService, ReviewRegistrationRequest } from '../../../../xpanse-api/generated';

const reviewKey: string = 'review';

export interface ApproveOrRejectRequestParams {
id: string;
reviewRegistrationRequest: ReviewRegistrationRequest;
}

export default function useApproveOrRejectRequest() {
export default function useApproveOrRejectRequest(id: string) {
return useMutation({
mutationKey: [id, reviewKey],
mutationFn: (requestParams: ApproveOrRejectRequestParams) => {
return CloudServiceProviderService.reviewRegistration(
requestParams.id,
Expand All @@ -21,3 +24,10 @@ export default function useApproveOrRejectRequest() {
},
});
}

export function useApproveOrRejectMutationState(id: string) {
return useMutationState({
filters: { mutationKey: [id, reviewKey], exact: true },
select: (mutation) => mutation.state,
});
}
0 ...eviews/query/useGetRegistrationDetails.ts → ...review/query/useGetRegistrationDetails.ts
View file
Open in desktop
File renamed without changes.
0 .../query/useListAllServiceTemplatesQuery.ts → .../query/useListAllServiceTemplatesQuery.ts
View file
Open in desktop
File renamed without changes.
Loading