update api.

eclipse-xpanse · Dec 18, 2023 · 902e5be · 902e5be
1 parent 89528c6
commit 902e5be
Show file tree

Hide file tree

Showing 30 changed files with 1,233 additions and 835 deletions.
diff --git a/src/components/content/credentials/AddCredential.tsx b/src/components/content/credentials/AddCredential.tsx
@@ -75,7 +75,11 @@ function AddCredential({ role, onCancel }: { role: string | undefined; onCancel:
 
     const credentialCapabilitiesQuery = useQuery({
         queryKey: ['credentialCapabilitiesQuery', currentCsp, currentType],
-        queryFn: () => CredentialsManagementService.getCredentialCapabilities(currentCsp, currentType),
+        queryFn: () =>
+            CredentialsManagementService.getCredentialCapabilities(
+                currentCsp ?? CredentialVariables.csp.HUAWEI,
+                currentType
+            ),
         staleTime: 60000,
         enabled: currentCsp !== undefined && currentType !== undefined,
     });

diff --git a/src/components/content/policies/AddOrUpdatePolicy.tsx b/src/components/content/policies/AddOrUpdatePolicy.tsx
@@ -7,9 +7,9 @@ import React, { useRef, useState } from 'react';
 import {
     CloudServiceProvider,
     CredentialVariables,
-    PolicyCreateRequest,
-    PolicyUpdateRequest,
-    Policy,
+    UserPolicy,
+    UserPolicyCreateRequest,
+    UserPolicyUpdateRequest,
 } from '../../../xpanse-api/generated';
 import '../../../styles/policies.css';
 import { Alert, Button, Card, Form, Image, Radio, RadioChangeEvent, Select, Upload, UploadFile } from 'antd';
@@ -28,23 +28,23 @@ export const AddOrUpdatePolicy = ({
     currentPolicyService,
     getCancelUpdateStatus,
 }: {
-    currentPolicyService: Policy | undefined;
+    currentPolicyService: UserPolicy | undefined;
     getCancelUpdateStatus: (arg: boolean) => void;
 }): React.JSX.Element => {
     const [form] = Form.useForm();
     const policyContent = useRef<string>(currentPolicyService?.policy ?? '');
-    const [createPolicyRequest, setCreatePolicyRequest] = useState<PolicyCreateRequest | undefined>(undefined);
-    const [updatePolicyRequest, setUpdatePolicyRequest] = useState<PolicyUpdateRequest | undefined>(undefined);
+    const [createPolicyRequest, setCreatePolicyRequest] = useState<UserPolicyCreateRequest | undefined>(undefined);
+    const [updatePolicyRequest, setUpdatePolicyRequest] = useState<UserPolicyUpdateRequest | undefined>(undefined);
     const [isEnabled, setIsEnabled] = useState<boolean>(false);
     const [isUpdated, setIsUpdated] = useState<boolean>(false);
     const files = useRef<UploadFile[]>([]);
     const [regoFileUploadStatus, setRegoFileUploadStatus] = useState<PolicyUploadFileStatus>('notStarted');
     const createPoliciesManagementServiceRequest = useCreatePolicyRequest();
     const updatePoliciesManagementServiceRequest = useUpdatePolicyRequest();
 
-    const onFinish = (policyRequest: { csp: Policy.csp; enabled: boolean; policy: string }) => {
+    const onFinish = (policyRequest: { csp: UserPolicy.csp; enabled: boolean; policy: string }) => {
         if (currentPolicyService === undefined) {
-            const policyCreateRequest: PolicyCreateRequest = policyRequest as PolicyCreateRequest;
+            const policyCreateRequest: UserPolicyCreateRequest = policyRequest as UserPolicyCreateRequest;
             policyCreateRequest.csp = policyRequest.csp;
             policyCreateRequest.enabled = policyRequest.enabled;
             policyCreateRequest.policy = policyRequest.policy;
@@ -55,7 +55,7 @@ export const AddOrUpdatePolicy = ({
                 setIsUpdated(comparePolicyUpdateRequestResult(policyRequest));
                 return;
             }
-            const policyUpdateRequest: PolicyUpdateRequest = policyRequest as PolicyUpdateRequest;
+            const policyUpdateRequest: UserPolicyUpdateRequest = policyRequest as UserPolicyUpdateRequest;
             policyUpdateRequest.id = currentPolicyService.id;
             policyUpdateRequest.csp = policyRequest.csp;
             policyUpdateRequest.enabled = policyRequest.enabled;
@@ -66,7 +66,7 @@ export const AddOrUpdatePolicy = ({
     };
 
     const comparePolicyUpdateRequestResult = (policyRequest: {
-        csp: Policy.csp;
+        csp: UserPolicy.csp;
         enabled: boolean;
         policy: string;
     }): boolean => {

diff --git a/src/components/content/policies/Policies.tsx b/src/components/content/policies/Policies.tsx
@@ -8,7 +8,7 @@ import { Button, Image, Modal, Popconfirm, Popover, Space, Table } from 'antd';
 import { ColumnsType } from 'antd/es/table';
 import '../../../styles/policies.css';
 import useListPoliciesManagementServiceQuery from './useListPoliciesManagementServiceQuery';
-import { AbstractCredentialInfo, CloudServiceProvider, Policy } from '../../../xpanse-api/generated';
+import { AbstractCredentialInfo, CloudServiceProvider, UserPolicy } from '../../../xpanse-api/generated';
 import { ColumnFilterItem } from 'antd/es/table/interface';
 import PoliciesManagementServiceListError from './PoliciesManagementServiceListError';
 import { CloseCircleOutlined, EditOutlined, PlusCircleOutlined, SyncOutlined } from '@ant-design/icons';
@@ -20,10 +20,10 @@ import { cspMap } from '../common/csp/CspLogo';
 
 function Policies(): React.JSX.Element {
     const [id, setId] = useState<string>('');
-    const [currentPolicyService, setCurrentPolicyService] = useState<Policy | undefined>(undefined);
+    const [currentPolicyService, setCurrentPolicyService] = useState<UserPolicy | undefined>(undefined);
     const [cspFilters, setCspFilters] = useState<ColumnFilterItem[]>([]);
     const [enabledFilters, setEnabledFilters] = useState<ColumnFilterItem[]>([]);
-    const [policiesManagementServiceList, setPoliciesManagementServiceList] = useState<Policy[]>([]);
+    const [policiesManagementServiceList, setPoliciesManagementServiceList] = useState<UserPolicy[]>([]);
     const listPoliciesManagementServiceQuery = useListPoliciesManagementServiceQuery();
     const [isOpenAddOrUpdatePolicyModal, setIsOpenAddOrUpdatePolicyModal] = useState<boolean>(false);
 
@@ -42,7 +42,7 @@ function Policies(): React.JSX.Element {
         return <PoliciesManagementServiceListError error={listPoliciesManagementServiceQuery.error} />;
     }
 
-    const columns: ColumnsType<Policy> = [
+    const columns: ColumnsType<UserPolicy> = [
         {
             title: 'Policy ID',
             dataIndex: 'id',
@@ -87,7 +87,7 @@ function Policies(): React.JSX.Element {
         {
             title: 'Content',
             dataIndex: 'policy',
-            render: (_text: string, record: Policy) => {
+            render: (_text: string, record: UserPolicy) => {
                 return (
                     <Popover
                         content={
@@ -107,7 +107,7 @@ function Policies(): React.JSX.Element {
         {
             title: 'Operation',
             dataIndex: 'operation',
-            render: (_text: string, record: Policy) => {
+            render: (_text: string, record: UserPolicy) => {
                 return (
                     <>
                         <Space size='middle'>
@@ -160,7 +160,7 @@ function Policies(): React.JSX.Element {
         },
     ];
 
-    const deleteCurrentPolicy = (record: Policy) => {
+    const deleteCurrentPolicy = (record: UserPolicy) => {
         setId(record.id);
         deletePoliciesManagementServiceRequest.mutate(record.id);
     };
@@ -185,7 +185,7 @@ function Policies(): React.JSX.Element {
         setIsOpenAddOrUpdatePolicyModal(false);
         refreshPoliciesManagementServiceList();
     };
-    const updatePoliciesManagementService = (record: Policy) => {
+    const updatePoliciesManagementService = (record: UserPolicy) => {
         setCurrentPolicyService(record);
         setIsOpenAddOrUpdatePolicyModal(true);
     };

diff --git a/src/components/content/policies/add/PolicyCreateResultStatus.tsx b/src/components/content/policies/add/PolicyCreateResultStatus.tsx
@@ -5,7 +5,7 @@
 
 import { Alert } from 'antd';
 import React from 'react';
-import { ApiError, Policy, Response } from '../../../../xpanse-api/generated';
+import { ApiError, Response, UserPolicy } from '../../../../xpanse-api/generated';
 import PolicySubmitResultDetails from '../PolicySubmitResultDetails';
 
 export default function PolicyCreateResultStatus({
@@ -17,7 +17,7 @@ export default function PolicyCreateResultStatus({
     isError: boolean;
     isSuccess: boolean;
     error: Error | null;
-    currentPolicyService: Policy | undefined;
+    currentPolicyService: UserPolicy | undefined;
 }): React.JSX.Element {
     if (isError) {
         if (error instanceof ApiError && 'details' in error.body) {

diff --git a/src/components/content/policies/add/useCreatePolicyRequest.ts b/src/components/content/policies/add/useCreatePolicyRequest.ts
@@ -4,12 +4,12 @@
  */
 
 import { useMutation } from '@tanstack/react-query';
-import { PoliciesManagementService, PolicyCreateRequest } from '../../../../xpanse-api/generated';
+import { UserPoliciesManagementService, UserPolicyCreateRequest } from '../../../../xpanse-api/generated';
 
 export function useCreatePolicyRequest() {
     return useMutation({
-        mutationFn: (requestBody: PolicyCreateRequest) => {
-            return PoliciesManagementService.addPolicy(requestBody);
+        mutationFn: (requestBody: UserPolicyCreateRequest) => {
+            return UserPoliciesManagementService.addUserPolicy(requestBody);
         },
     });
 }
diff --git a/src/components/content/policies/delete/useDeletePolicyRequest.tsx b/src/components/content/policies/delete/useDeletePolicyRequest.tsx
@@ -4,12 +4,12 @@
  */
 
 import { useMutation } from '@tanstack/react-query';
-import { PoliciesManagementService } from '../../../../xpanse-api/generated';
+import { UserPoliciesManagementService } from '../../../../xpanse-api/generated';
 
 export function useDeletePolicyRequest() {
     return useMutation({
         mutationFn: (id: string) => {
-            return PoliciesManagementService.deletePolicy(id);
+            return UserPoliciesManagementService.deleteUserPolicy(id);
         },
     });
 }
diff --git a/src/components/content/policies/update/PolicyUpdateResultStatus.tsx b/src/components/content/policies/update/PolicyUpdateResultStatus.tsx
@@ -5,7 +5,7 @@
 
 import { Alert } from 'antd';
 import React from 'react';
-import { ApiError, Policy, Response } from '../../../../xpanse-api/generated';
+import { ApiError, Response, UserPolicy } from '../../../../xpanse-api/generated';
 import PolicySubmitResultDetails from '../PolicySubmitResultDetails';
 
 export default function PolicyUpdateResultStatus({
@@ -17,7 +17,7 @@ export default function PolicyUpdateResultStatus({
     isError: boolean;
     isSuccess: boolean;
     error: Error | null;
-    currentPolicyService: Policy | undefined;
+    currentPolicyService: UserPolicy | undefined;
 }): React.JSX.Element {
     if (isError) {
         if (error instanceof ApiError && 'details' in error.body) {

diff --git a/src/components/content/policies/update/useUpdatePolicyRequest.ts b/src/components/content/policies/update/useUpdatePolicyRequest.ts
@@ -4,12 +4,12 @@
  */
 
 import { useMutation } from '@tanstack/react-query';
-import { PoliciesManagementService, PolicyUpdateRequest } from '../../../../xpanse-api/generated';
+import { UserPoliciesManagementService, UserPolicyUpdateRequest } from '../../../../xpanse-api/generated';
 
 export function useUpdatePolicyRequest() {
     return useMutation({
-        mutationFn: (requestBody: PolicyUpdateRequest) => {
-            return PoliciesManagementService.updatePolicy(requestBody);
+        mutationFn: (requestBody: UserPolicyUpdateRequest) => {
+            return UserPoliciesManagementService.updateUserPolicy(requestBody);
         },
     });
 }
diff --git a/src/components/content/policies/useListPoliciesManagementServiceQuery.ts b/src/components/content/policies/useListPoliciesManagementServiceQuery.ts
@@ -4,13 +4,13 @@
  */
 
 import { useQuery } from '@tanstack/react-query';
-import { PoliciesManagementService } from '../../../xpanse-api/generated';
+import { UserPoliciesManagementService } from '../../../xpanse-api/generated';
 
 export default function useListPoliciesManagementServiceQuery() {
     return useQuery({
         queryKey: ['listPoliciesManagementService'],
         queryFn: () => {
-            return PoliciesManagementService.listPolicies(undefined, undefined);
+            return UserPoliciesManagementService.listUserPolicies();
         },
         refetchOnWindowFocus: false,
     });