- {useMemo(
- () => (
-
- {' '}
- {targetZoneList && essentialParameter && (
-
-
- {intl.formatMessage({
- id: 'Dashboard.Tenant.New.ResourcePools.ZonePriority',
- defaultMessage: 'Zone优先级',
- })}
-
- {targetZoneList.map((item, index) => (
-
- ))}
-
- )}
-
- ),
-
- [selectClusterId, clusterList, essentialParameter],
+ {targetZoneList && essentialParameter && (
+
+
+ {intl.formatMessage({
+ id: 'Dashboard.Tenant.New.ResourcePools.ZonePriority',
+ defaultMessage: 'Zone优先级',
+ })}
+
+ {targetZoneList.map((item, index) => (
+
+ ))}
+
)}
Unit config
diff --git a/ui/src/pages/Tenant/New/index.tsx b/ui/src/pages/Tenant/New/index.tsx
index df611e06c..e0e595b9a 100644
--- a/ui/src/pages/Tenant/New/index.tsx
+++ b/ui/src/pages/Tenant/New/index.tsx
@@ -18,8 +18,19 @@ export default function New() {
const [form] = Form.useForm();
const [passwordVal, setPasswordVal] = useState('');
const [selectClusterId, setSelectClusterId] = useState
();
-
- const { data: clusterList = [] } = useRequest(getSimpleClusterList);
+ const [clusterList, setClusterList] = useState([]);
+ useRequest(getSimpleClusterList, {
+ onSuccess: ({ successful, data }) => {
+ if (successful) {
+ data.forEach((cluster)=>{
+ cluster.topology.forEach((zone)=>{
+ zone.checked = false;
+ })
+ })
+ setClusterList(data);
+ }
+ },
+ });
const { data: essentialParameterRes,run: getEssentialParameters} = useRequest(
getEssentialParametersReq,
{
@@ -118,6 +129,7 @@ export default function New() {
selectClusterId={selectClusterId}
essentialParameter={essentialParameter}
clusterList={clusterList}
+ setClusterList={setClusterList}
/>
diff --git a/ui/src/pages/Tenant/ZoneItem/index.tsx b/ui/src/pages/Tenant/ZoneItem/index.tsx
new file mode 100644
index 000000000..84c786c5e
--- /dev/null
+++ b/ui/src/pages/Tenant/ZoneItem/index.tsx
@@ -0,0 +1,75 @@
+import InputNumber from '@/components/InputNumber';
+import { intl } from '@/utils/intl';
+import { Checkbox, Col, Form } from 'antd';
+
+interface ZoneItemProps {
+ name: string;
+ checked: boolean;
+ obZoneResource: any;
+ checkBoxOnChange: (checked: boolean, name: string) => void;
+ key: number;
+ formName?:string[]|string;
+}
+
+export default function ZoneItem({
+ name,
+ key,
+ checked,
+ obZoneResource,
+ checkBoxOnChange,
+ formName = ['pools', name, 'priority']
+}: ZoneItemProps) {
+ return (
+
+ {name}
+ checkBoxOnChange(e.target.checked, name)}
+ />
+
+
+
+
+
+
+ {obZoneResource && (
+
+
+ {intl.formatMessage({
+ id: 'Dashboard.Tenant.New.ResourcePools.AvailableResources',
+ defaultMessage: '可用资源：',
+ })}
+
+
+ CPU {obZoneResource['availableCPU']}
+
+
+ Memory {obZoneResource['availableMemory'] / (1 << 30)}GB
+
+
+ {intl.formatMessage({
+ id: 'Dashboard.Tenant.New.ResourcePools.LogDiskSize',
+ defaultMessage: '日志磁盘大小',
+ })}
+ {obZoneResource['availableLogDisk'] / (1 << 30)}GB
+
+
+ )}
+
+ );
+}
diff --git a/ui/src/pages/Tenant/helper.ts b/ui/src/pages/Tenant/helper.ts
index b077ee6e4..4eb1179f7 100644
--- a/ui/src/pages/Tenant/helper.ts
+++ b/ui/src/pages/Tenant/helper.ts
@@ -1,6 +1,6 @@
-// import { encryptText } from '@/hook/usePublicKey';
+import { encryptText } from '@/hook/usePublicKey';
import dayjs from 'dayjs';
-import { clone } from 'lodash';
+import { clone,cloneDeep } from 'lodash';
import type { MaxResourceType } from './New/ResourcePools';
const isExist = (val: string | number | undefined): boolean => {
@@ -37,7 +37,7 @@ export function formatNewTenantForm(
priority: originFormData[key]?.[zone]?.priority,
type: 'Full',
}))
- .filter((item) => item.priority);
+ .filter((item) => item.priority || item.priority === 0);
} else if (key === 'source') {
if (originFormData[key]['tenant'] || originFormData[key]['restore'])
result[key] = {};
@@ -48,16 +48,14 @@ export function formatNewTenantForm(
let { until } = originFormData[key]['restore'];
result[key]['restore'] = {
...originFormData[key]['restore'],
- ossAccessId: originFormData[key]['restore'].ossAccessId,
- ossAccessKey: originFormData[key]['restore'].ossAccessKey,
- // ossAccessId: encryptText(
- // originFormData[key]['restore'].ossAccessId,
- // publicKey,
- // ),
- // ossAccessKey: encryptText(
- // originFormData[key]['restore'].ossAccessKey,
- // publicKey,
- // ),
+ ossAccessId: encryptText(
+ originFormData[key]['restore'].ossAccessId,
+ publicKey,
+ ),
+ ossAccessKey: encryptText(
+ originFormData[key]['restore'].ossAccessKey,
+ publicKey,
+ ),
until:
until && until.date && until.time
? {
@@ -69,19 +67,16 @@ export function formatNewTenantForm(
: { unlimited: true },
};
if (originFormData[key]['restore'].bakEncryptionPassword) {
- result[key]['restore']['bakEncryptionPassword'] =
- originFormData[key]['restore'].bakEncryptionPassword;
- // result[key]['restore']['bakEncryptionPassword'] = encryptText(
- // originFormData[key]['restore'].bakEncryptionPassword,
- // publicKey,
- // );
+ result[key]['restore']['bakEncryptionPassword'] = encryptText(
+ originFormData[key]['restore'].bakEncryptionPassword,
+ publicKey,
+ );
} else {
delete result[key]['restore']['bakEncryptionPassword'];
}
}
} else if (key === 'rootPassword') {
- result[key] = originFormData[key];
- // result[key] = encryptText(originFormData[key], publicKey);
+ result[key] = encryptText(originFormData[key], publicKey);
} else if (key === 'unitConfig') {
result[key] = formatUnitConfig(originFormData[key]);
} else {
@@ -99,17 +94,19 @@ export function formatNewTenantForm(
export function formatBackupForm(originFormData: any, publicKey?: string) {
let formData = clone(originFormData);
if (formData.bakEncryptionPassword) {
- formData.bakEncryptionPassword = originFormData.bakEncryptionPassword;
- // formData.bakEncryptionPassword = encryptText(
- // originFormData.bakEncryptionPassword,
- // publicKey,
- // );
+ formData.bakEncryptionPassword = publicKey
+ ? encryptText(originFormData.bakEncryptionPassword, publicKey)
+ : originFormData.bakEncryptionPassword;
+ }
+ if (formData.ossAccessId) {
+ formData.ossAccessId = publicKey
+ ? encryptText(originFormData.ossAccessId, publicKey)
+ : originFormData.ossAccessId;
}
- if (formData.ossAccessId) formData.ossAccessId = originFormData.ossAccessId;
if (formData.ossAccessKey)
- formData.ossAccessKey = originFormData.ossAccessKey;
- // formData.ossAccessId = encryptText(originFormData.ossAccessId, publicKey);
- // formData.ossAccessKey = encryptText(originFormData.ossAccessKey, publicKey);
+ formData.ossAccessKey = publicKey
+ ? encryptText(originFormData.ossAccessKey, publicKey)
+ : originFormData.ossAccessId;
formData.scheduleTime = dayjs(formData.scheduleTime).format('HH:mm');
formData.scheduleType = formData.scheduleDates.mode;
delete formData.scheduleDates.days;
@@ -186,4 +183,29 @@ export function findMinParameter(
maxLogDisk: findMinValue('availableLogDisk', selectResources),
maxMemory: findMinValue('availableMemory', selectResources),
};
-}
\ No newline at end of file
+}
+
+export const getNewClusterList = (
+ clusterList: API.SimpleClusterList,
+ zone: string,
+ checked: boolean,
+ target: {
+ id?: number;
+ name?: string;
+ },
+) => {
+ const _clusterList = cloneDeep(clusterList);
+ for (let cluster of _clusterList) {
+ if (
+ cluster.clusterId === target.id ||
+ cluster.clusterName === target.name
+ ) {
+ cluster.topology.forEach((zoneItem) => {
+ if (zoneItem.zone === zone) {
+ zoneItem.checked = checked;
+ }
+ });
+ }
+ }
+ return _clusterList;
+};
\ No newline at end of file
diff --git a/ui/src/pages/Tenant/index.tsx b/ui/src/pages/Tenant/index.tsx
index bb68a8158..214ac1d8e 100644
--- a/ui/src/pages/Tenant/index.tsx
+++ b/ui/src/pages/Tenant/index.tsx
@@ -6,7 +6,7 @@ import { useEffect,useRef,useState } from 'react';
import EventsTable from '@/components/EventsTable';
import MonitorComp from '@/components/MonitorComp';
-import { REFRESH_TENANT_TIME } from '@/constants';
+import { REFRESH_TENANT_TIME, RESULT_STATUS } from '@/constants';
import { getAllTenants } from '@/services/tenant';
import TenantsList from './TenantsList';
@@ -29,7 +29,7 @@ export default function TenantPage() {
onSuccess: ({ data, successful }) => {
if (successful) {
const operatingTenant = data.find(
- (tenant) => tenant.status !== 'running',
+ (tenant) => !RESULT_STATUS.includes(tenant.status),
);
if (operatingTenant) {
timerRef.current = setTimeout(() => {
diff --git a/ui/src/services/index.ts b/ui/src/services/index.ts
index bec82737c..d0cef7ffb 100644
--- a/ui/src/services/index.ts
+++ b/ui/src/services/index.ts
@@ -6,7 +6,8 @@ import { request } from '@umijs/max';
import _ from 'lodash';
import moment from 'moment';
-const clusterPrefix = '/api/v1/obclusters';
+const obClusterPrefix = '/api/v1/obclusters';
+const clusterPrefix = '/api/v1/cluster';
export async function loginReq(body: API.User) {
return request('/api/v1/login', {
@@ -90,7 +91,7 @@ export async function getNodeLabelsReq() {
}
export async function getClusterStatisticReq(): Promise {
- const r = await request('/api/v1/obclusters/statistic', {
+ const r = await request(`${obClusterPrefix}/statistic`, {
method: 'GET',
});
return {
@@ -100,7 +101,7 @@ export async function getClusterStatisticReq(): Promise('/api/v1/obclusters', {
+ const r = await request(obClusterPrefix, {
method: 'GET',
});
if (r.successful) {
@@ -142,19 +143,23 @@ export async function getObclusterListReq() {
return [];
}
-export async function getSimpleClusterList(): Promise {
- const r = await request('/api/v1/obclusters', {
+export async function getSimpleClusterList(): Promise {
+ const r = await request(obClusterPrefix, {
method: 'GET',
});
if (r.successful) {
- return r.data.map((clusterDetail) => ({
- clusterId: clusterDetail.clusterId,
- name: clusterDetail.name,
- namespace: clusterDetail.namespace,
- topology: clusterDetail.topology,
- }));
- }
- return [];
+ return{
+ ...r,
+ data:r.data.map((clusterDetail) => ({
+ clusterId: clusterDetail.clusterId,
+ name: clusterDetail.name,
+ namespace: clusterDetail.namespace,
+ topology: clusterDetail.topology,
+ clusterName: clusterDetail.clusterName
+ }))
+ }
+ };
+ return r;
}
export async function getClusterDetailReq({
@@ -168,7 +173,7 @@ export async function getClusterDetailReq({
useFor?: string;
tenantReplicas?: API.ReplicaDetailType[];
}) {
- const r = await request(`/api/v1/obclusters/namespace/${ns}/name/${name}`, {
+ const r = await request(`${obClusterPrefix}/namespace/${ns}/name/${name}`, {
method: 'GET',
});
if (r.successful) {
@@ -186,7 +191,7 @@ export async function upgradeObcluster({
name: string;
image: string;
}) {
- const r = await request(`/api/v1/obclusters/namespace/${ns}/name/${name}`, {
+ const r = await request(`${obClusterPrefix}/namespace/${ns}/name/${name}`, {
method: 'POST',
data: { image },
});
@@ -208,7 +213,7 @@ export async function scaleObserver({
replicas: number;
}) {
const r = await request(
- `/api/v1/obclusters/namespace/${namespace}/name/${name}/obzones/${zoneName}/scale`,
+ `${obClusterPrefix}/namespace/${namespace}/name/${name}/obzones/${zoneName}/scale`,
{
method: 'POST',
data: { replicas },
@@ -237,7 +242,7 @@ export async function addObzone({
nodeSelector: { key: string; value: string }[];
}) {
const r = await request(
- `/api/v1/obclusters/namespace/${namespace}/name/${name}/obzones`,
+ `${obClusterPrefix}/namespace/${namespace}/name/${name}/obzones`,
{ method: 'POST', data: body },
);
if (r.successful && !r.message)
@@ -258,7 +263,7 @@ export async function deleteObcluster({
ns: string;
name: string;
}) {
- const r = await request(`/api/v1/obclusters/namespace/${ns}/name/${name}`, {
+ const r = await request(`${obClusterPrefix}/namespace/${ns}/name/${name}`, {
method: 'DELETE',
});
return {
@@ -278,7 +283,7 @@ export async function deleteObzone({
zoneName: string;
}) {
const r = await request(
- `/api/v1/obclusters/namespace/${ns}/name/${name}/obzones/${zoneName}`,
+ `${obClusterPrefix}/namespace/${ns}/name/${name}/obzones/${zoneName}`,
{
method: 'DELETE',
},
@@ -420,5 +425,5 @@ export async function getEssentialParameters({
ns,
name,
}: API.NamespaceAndName): Promise {
- return request(`${clusterPrefix}/${ns}/${name}/essential-parameters`);
+ return request(`${obClusterPrefix}/${ns}/${name}/essential-parameters`);
}
\ No newline at end of file
diff --git a/ui/src/services/typings.d.ts b/ui/src/services/typings.d.ts
index 42dd0c0e4..20d2920d6 100644
--- a/ui/src/services/typings.d.ts
+++ b/ui/src/services/typings.d.ts
@@ -69,6 +69,7 @@ declare namespace API {
statusDetail: string;
rootService: string;
observers: Server[];
+ checked?: boolean;
};
type ClusterItem = {
@@ -81,11 +82,16 @@ declare namespace API {
type SimpleClusterList = {
name: string;
+ clusterName: string;
clusterId: number;
namespace: string;
topology: Topology[];
}[];
+ interface SimpleClusterListResponse extends CommonResponse {
+ data: SimpleClusterList;
+ }
+
type ClusterList = ClusterItem[];
type ModalType =
@@ -380,15 +386,6 @@ declare namespace API {
unitNum: number;
};
- type UnitConfig = {
- iopsWeight: number;
- logDiskSize: string;
- maxIops: number;
- memorySize: string;
- cpuCount: number;
- minIops: number;
- };
-
type PatchTenantConfiguration = {
unitConfig?: {
pools?: {
diff --git a/ui/src/utils/helper.ts b/ui/src/utils/helper.ts
index cff021458..32460488d 100644
--- a/ui/src/utils/helper.ts
+++ b/ui/src/utils/helper.ts
@@ -1,4 +1,6 @@
+import type { UnitDetailType } from '@/components/customModal/ModifyUnitDetailModal';
import { intl } from '@/utils/intl';
+import { clone } from 'lodash';
type StatisticStatus = 'running' | 'deleting' | 'operating' | 'failed';
type StatisticDataType = { status: StatisticStatus; count: number }[];
@@ -38,3 +40,24 @@ export const formatStatisticData = (
}
return r;
};
+
+export const formatUnitDetailData = (originUnitData: UnitDetailType) => {
+ const _originUnitData: UnitDetailType = clone(originUnitData);
+ _originUnitData.unitConfig.unitConfig.logDiskSize = _originUnitData.unitConfig.unitConfig.logDiskSize + 'Gi';
+ _originUnitData.unitConfig.unitConfig.memorySize = _originUnitData.unitConfig.unitConfig.memorySize + 'Gi';
+ _originUnitData.unitConfig.unitConfig.cpuCount = String(
+ _originUnitData.unitConfig.unitConfig.cpuCount,
+ );
+ return {
+ unitConfig: {
+ unitConfig: _originUnitData.unitConfig.unitConfig,
+ pools: Object.keys(_originUnitData.unitConfig.pools)
+ .map((zone) => ({
+ zone,
+ priority: _originUnitData.unitConfig.pools?.[zone]?.priority,
+ type: 'Full',
+ }))
+ .filter((item) => item.priority || item.priority === 0),
+ },
+ };
+};
\ No newline at end of file