From 1119d1b529ebeb44ff6786d49cfd476783827e49 Mon Sep 17 00:00:00 2001 From: zzxwill Date: Fri, 5 Feb 2021 17:55:16 +0800 Subject: [PATCH] fix lint issue --- dashboard/src/pages/Application/index.tsx | 3 +- .../src/pages/CreateApplication/index.tsx | 134 ++++++++---------- dashboard/src/services/capability.ts | 4 +- 3 files changed, 60 insertions(+), 81 deletions(-) diff --git a/dashboard/src/pages/Application/index.tsx b/dashboard/src/pages/Application/index.tsx index 43bc85383..a2b7dda81 100644 --- a/dashboard/src/pages/Application/index.tsx +++ b/dashboard/src/pages/Application/index.tsx @@ -7,7 +7,7 @@ import { deleteApplication, getApplications } from '@/services/application'; import { PlusOutlined } from '@ant-design/icons'; import { PageContainer } from '@ant-design/pro-layout'; // @ts-ignore -import { Link as ReactLink } from "react-router-dom"; +import { Link as ReactLink } from 'react-router-dom'; export default () => { const { currentEnvironment } = useModel('useEnvironmentModel'); @@ -45,7 +45,6 @@ export default () => { diff --git a/dashboard/src/pages/CreateApplication/index.tsx b/dashboard/src/pages/CreateApplication/index.tsx index 892c7ea73..75aed7f99 100644 --- a/dashboard/src/pages/CreateApplication/index.tsx +++ b/dashboard/src/pages/CreateApplication/index.tsx @@ -1,63 +1,61 @@ -import React, {useState} from 'react'; -import {Input, Dropdown, Menu, Button, Divider, Row, Col} from 'antd'; -import {useModel} from "@@/plugin-model/useModel"; -import {DownOutlined, UserOutlined} from '@ant-design/icons'; +import React, { useState } from 'react'; +import { Input, Dropdown, Menu, Button, Divider, Row, Col } from 'antd'; +import { useModel } from '@@/plugin-model/useModel'; +import { DownOutlined, UserOutlined } from '@ant-design/icons'; import FormRender from 'form-render/lib/antd'; -import {getCapabilityOpenAPISchema} from "@/services/capability"; +import { getCapabilityOpenAPISchema } from '@/services/capability'; // prevent Ant design style from being overridden import 'antd/dist/antd.css'; - export default (): React.ReactNode => { // @ts-ignore // eslint-disable-next-line @typescript-eslint/no-unused-vars - const {workloadsLoading, workloadList} = useModel('useWorkloadsModel'); + const { workloadsLoading, workloadList } = useModel('useWorkloadsModel'); // @ts-ignore // eslint-disable-next-line @typescript-eslint/no-unused-vars - const {traitsLoading, traitsList} = useModel('useTraitsModel'); + const { traitsLoading, traitsList } = useModel('useTraitsModel'); - const workloadMenuList = workloadList?.map((i) => - } onClick={() => handleMenuClick("workload_type", i.name)}> + const workloadMenuList = workloadList?.map((i) => ( + } + onClick={() => handleMenuClick('workload_type', i.name)} + > {i.name} - ) + )); - const traitMenuList = traitsList?.map((i) => - } onClick={() => handleMenuClick("trait", i.name)}> + const traitMenuList = traitsList?.map((i) => ( + } + onClick={() => handleMenuClick('trait', i.name)} + > {i.name} - ) + )); - const workloadsMenu = ( - - {workloadMenuList} - - ); - - const traitsMenu = ( - - {traitMenuList} - - ); + const workloadsMenu = {workloadMenuList}; + const traitsMenu = {traitMenuList}; // Capability parameters form render const [formData, setData] = useState({}); // schema is OpenAPI Schema JSON data - const [workloadSchema, setWorkloadSchema] = useState({}) - const [traitSchema, setTraitSchema] = useState({}) + const [workloadSchema, setWorkloadSchema] = useState({}); + const [traitSchema, setTraitSchema] = useState({}); const [valid, setValid] = useState([]); function handleMenuClick(capabilityType: string, capabilityName: string) { console.log('click', capabilityName); getCapabilityOpenAPISchema(capabilityName).then((result) => { - const data = JSON.parse(result.data) - if (capabilityType === "workload_type") { - setWorkloadSchema(data) - } else if (capabilityType === "trait") { - setTraitSchema(data) + const data = JSON.parse(result.data); + if (capabilityType === 'workload_type') { + setWorkloadSchema(data); + } else if (capabilityType === 'trait') { + setTraitSchema(data); } - }) + }); } const onSubmit = () => { @@ -70,64 +68,52 @@ export default (): React.ReactNode => { }; return ( -
+
- - Application - - + Application + - - Name: - + Name: - + - + - + - - Services - - + Services + - - Name: - + Name: - + - + - - Type: - + Type: - Select + Select - - Settings: - + Settings: { - + - - Traits - - + Traits + - - Type: - + Type: - e.preventDefault()}> - Select + e.preventDefault()}> + Select - - Properties: - + Properties: { - + - + - +
); diff --git a/dashboard/src/services/capability.ts b/dashboard/src/services/capability.ts index bdb9efb3e..f8d4a1ee4 100644 --- a/dashboard/src/services/capability.ts +++ b/dashboard/src/services/capability.ts @@ -1,14 +1,12 @@ import { request } from 'umi'; - /* * workload type list: get /api/workloads/ */ export async function getWorkloads(): Promise> { - return request( '/api/workloads'); + return request('/api/workloads'); } - /* * trait list: get /api/traits/ */