fix: bugs

liuxiran · Apr 26, 2021 · d75b137 · d75b137
1 parent 0fe93b2
commit d75b137
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/web/src/components/Upstream/components/UpstreamSelector.tsx b/web/src/components/Upstream/components/UpstreamSelector.tsx
@@ -59,9 +59,6 @@ const UpstreamSelector: React.FC<Props> = ({ onChange, list = [], disabled, requ
             {item.name}
           </Select.Option>
         ))}
-        <Select.Option value={formatMessage({ id: 'page.upstream.step.select.upstream.select.none' })}>{
-          formatMessage({ id: 'page.upstream.step.select.upstream.select.none' })
-        }</Select.Option>
       </Select>
     </Form.Item>
   )

diff --git a/web/src/pages/Service/Create.tsx b/web/src/pages/Service/Create.tsx
@@ -51,10 +51,12 @@ const Page: React.FC = (props) => {
       fetchItem(serviceId).then(({ data }) => {
         if (data.upstream_id) {
           upstreamForm.setFieldsValue({ upstream_id: data.upstream_id })
-        }
-        if (data.upstream) {
+        } else if (data.upstream) {
           upstreamForm.setFieldsValue(convertToFormData(data.upstream))
+        } else {
+          upstreamForm.setFieldsValue({ upstream_id: 'None' })
         }
+
         form.setFieldsValue(omit(data, ['upstream_id', 'upstream', 'plugins']));
         setPlugins(data.plugins || {});
       });
@@ -68,13 +70,11 @@ const Page: React.FC = (props) => {
     };
 
     const upstreamFormData = upstreamRef.current?.getData();
-    if (!upstreamFormData) {
-      return
-    }
-    if (!upstreamFormData.upstream_id) {
-      data.upstream = upstreamFormData;
-    } else if (upstreamFormData.upstream_id !== 'None') {
-      data.upstream_id = upstreamFormData.upstream_id;
+
+    if (!upstreamFormData?.upstream_id) {
+      data.upstream = upstreamFormData
+    } else {
+      data.upstream_id = upstreamFormData.upstream_id
     }
 
     const { serviceId } = (props as any).match.params;

diff --git a/web/src/pages/Service/components/Step1.tsx b/web/src/pages/Service/components/Step1.tsx
@@ -59,7 +59,7 @@ const Step1: React.FC<ServiceModule.Step1PassProps> = ({
       </Form>
       <UpstreamForm
         ref={upstreamRef}
-        required
+        required={false}
         form={upstreamForm}
         disabled={disabled}
         list={list}

diff --git a/web/src/pages/Service/locales/en-US.ts b/web/src/pages/Service/locales/en-US.ts
@@ -21,5 +21,6 @@ export default {
   'page.service.list': 'Service List',
   'page.service.description': 'A service consists of a combination of public plugin configuration and upstream target information in a route. Services are associated with Routes and Upstreams, and a service can correspond to a set of upstream nodes and can be bound by multiple routes.',
   'page.service.create': 'Create Service',
-  'page.service.configure': 'Configure Service'
+  'page.service.configure': 'Configure Service',
+  'page.service.fields.name.required': 'Please enter the service name',
 };