Merge branch 'dev/poc'

polarismesh · Oct 18, 2024 · 829e06f · 829e06f
2 parents 08b43a1 + dcf6d38
commit 829e06f
Show file tree

Hide file tree

Showing 7 changed files with 124 additions and 46 deletions.
diff --git a/web/src/polaris/administration/breaker/operations/Create.tsx b/web/src/polaris/administration/breaker/operations/Create.tsx
@@ -155,12 +155,26 @@ export default purify(function CustomRoutePage(props: DuckCmpProps<CreateDuck>)
                       <Card.Body title='主调服务'>
                         <Form style={{ padding: '0px', backgroundColor: 'inherit' }}>
                           <FormField field={sourceNamespace} label='命名空间' required>
-                            <TeaSelect
-                              value={sourceNamespace.getValue()}
+                            <AutoComplete
                               options={[
-                                { text: '全部命名空间', value: '*', disabled: destinationNamespace.getValue() === '*' },
-                                ...(data?.namespaceList || []),
+                                ...new Set([
+                                  {
+                                    text: '全部命名空间',
+                                    value: '*',
+                                    disabled: destinationNamespace.getValue() === '*',
+                                  },
+                                  ...(sourceNamespace.getValue()
+                                    ? [
+                                        {
+                                          text: `(输入值)${sourceNamespace.getValue()}`,
+                                          value: sourceNamespace.getValue(),
+                                        },
+                                      ]
+                                    : []),
+                                  ...data?.namespaceList,
+                                ]),
                               ]}
+                              tips='没有匹配的命名空间名称'
                               onChange={value => {
                                 if (value === '*') {
                                   sourceNamespace.setValue('*')
@@ -170,13 +184,26 @@ export default purify(function CustomRoutePage(props: DuckCmpProps<CreateDuck>)
                                 sourceNamespace.setValue(value)
                                 sourceService.setValue('')
                               }}
-                              searchable
-                              type={'simulate'}
-                              appearance={'button'}
-                              matchButtonWidth
-                              placeholder='请选择命名空间'
-                              style={{ width: '80%', maxWidth: '600px' }}
-                            />
+                            >
+                              {ref => (
+                                <TeaInput
+                                  ref={ref}
+                                  value={
+                                    sourceNamespace.getValue() === '*' ? '全部命名空间' : sourceNamespace.getValue()
+                                  }
+                                  onChange={value => {
+                                    if (value === '*') {
+                                      sourceNamespace.setValue('*')
+                                      sourceService.setValue('*')
+                                      return
+                                    }
+                                    sourceNamespace.setValue(value)
+                                    sourceService.setValue('')
+                                  }}
+                                  style={{ width: '80%', maxWidth: '600px' }}
+                                />
+                              )}
+                            </AutoComplete>
                           </FormField>
                           <FormField field={sourceService} label='服务名称' required>
                             <AutoComplete
@@ -203,6 +230,7 @@ export default purify(function CustomRoutePage(props: DuckCmpProps<CreateDuck>)
                                   onChange={value => {
                                     sourceService.setValue(value)
                                   }}
+                                  disabled={sourceNamespace.getValue() === '*'}
                                   style={{ width: '80%', maxWidth: '600px' }}
                                 />
                               )}
@@ -222,12 +250,26 @@ export default purify(function CustomRoutePage(props: DuckCmpProps<CreateDuck>)
                       <Card.Body title='被调服务'>
                         <Form style={{ padding: '0px', backgroundColor: 'inherit' }}>
                           <FormField field={destinationNamespace} label='命名空间' required>
-                            <TeaSelect
-                              value={destinationNamespace.getValue()}
+                            <AutoComplete
                               options={[
-                                { text: '全部命名空间', value: '*', disabled: sourceNamespace.getValue() === '*' },
-                                ...(data?.namespaceList || []),
+                                ...new Set([
+                                  {
+                                    text: '全部命名空间',
+                                    value: '*',
+                                    disabled: sourceNamespace.getValue() === '*',
+                                  },
+                                  ...(destinationNamespace.getValue()
+                                    ? [
+                                        {
+                                          text: `(输入值)${destinationNamespace.getValue()}`,
+                                          value: destinationNamespace.getValue(),
+                                        },
+                                      ]
+                                    : []),
+                                  ...data?.namespaceList,
+                                ]),
                               ]}
+                              tips='没有匹配的命名空间名称'
                               onChange={value => {
                                 if (value === '*') {
                                   destinationNamespace.setValue('*')
@@ -237,13 +279,28 @@ export default purify(function CustomRoutePage(props: DuckCmpProps<CreateDuck>)
                                 destinationNamespace.setValue(value)
                                 destinationService.setValue('')
                               }}
-                              searchable
-                              type={'simulate'}
-                              appearance={'button'}
-                              matchButtonWidth
-                              placeholder='请选择命名空间'
-                              style={{ width: '80%', maxWidth: '600px' }}
-                            />
+                            >
+                              {ref => (
+                                <TeaInput
+                                  ref={ref}
+                                  value={
+                                    destinationNamespace.getValue() === '*'
+                                      ? '全部命名空间'
+                                      : destinationNamespace.getValue()
+                                  }
+                                  onChange={value => {
+                                    if (value === '*') {
+                                      destinationNamespace.setValue('*')
+                                      destinationService.setValue('*')
+                                      return
+                                    }
+                                    destinationNamespace.setValue(value)
+                                    destinationService.setValue('')
+                                  }}
+                                  style={{ width: '80%', maxWidth: '600px' }}
+                                />
+                              )}
+                            </AutoComplete>
                           </FormField>
                           <FormField field={destinationService} label='服务名称' required>
                             <AutoComplete

diff --git a/web/src/polaris/namespace/getColumns.tsx b/web/src/polaris/namespace/getColumns.tsx
@@ -42,6 +42,11 @@ export default ({ duck: { creators } }: DuckCmpProps<NamespacePageDuck>): Column
       )
     },
   },
+  {
+    key: 'sync_to_global_registry',
+    header: '同步全局注册中心',
+    render: x => <Text>{x.sync_to_global_registry ? '开启' : '关闭' || '-'}</Text>,
+  },
   {
     key: 'commnet',
     header: '描述',

diff --git a/web/src/polaris/namespace/model.ts b/web/src/polaris/namespace/model.ts
@@ -16,6 +16,7 @@ export interface CreateNamespaceParams {
   user_ids?: string[]
   group_ids?: string[]
   service_export_to?: string[]
+  sync_to_global_registry?: boolean
 }
 export interface CreateNamespaceResult {
   namespace: Namespace
@@ -29,6 +30,7 @@ export interface ModifyNamespaceParams {
   remove_user_ids?: string[]
   remove_group_ids?: string[]
   service_export_to?: string[]
+  sync_to_global_registry?: boolean
 }
 export interface ModifyNamespaceResult {
   size: number

diff --git a/web/src/polaris/namespace/operation/Create.tsx b/web/src/polaris/namespace/operation/Create.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import { DuckCmpProps, purify } from 'saga-duck'
 import Duck from './CreateDuck'
-import { Form, Button, Icon, FormItem, Radio, RadioGroup, SelectMultiple } from 'tea-component'
+import { Form, Button, Icon, FormItem, Radio, RadioGroup, SelectMultiple, Switch } from 'tea-component'
 import Dialog from '@src/polaris/common/duckComponents/Dialog'
 import FormField from '@src/polaris/common/duckComponents/form/Field'
 import Input from '@src/polaris/common/duckComponents/form/Input'
@@ -37,11 +37,12 @@ const CreateForm = purify(function CreateForm(props: DuckCmpProps<Duck>) {
   } = duck
 
   const formApi = form.getAPI(store, dispatch)
-  const { name, comment, service_export_to, visibilityMode } = formApi.getFields([
+  const { name, comment, service_export_to, visibilityMode, sync_to_global_registry } = formApi.getFields([
     'name',
     'comment',
     'service_export_to',
     'visibilityMode',
+    'sync_to_global_registry',
   ])
   const options = selectors.options(store)
   const [showAdvance, setShowAdvance] = React.useState(false)
@@ -71,17 +72,15 @@ const CreateForm = purify(function CreateForm(props: DuckCmpProps<Duck>) {
 
           {showAdvance && (
             <>
-              {options.authOpen && (
-                <FormItem label={'授权'}>
-                  <ResourcePrincipalAuth
-                    userDuck={userSelect}
-                    userGroupDuck={userGroupSelect}
-                    duck={duck}
-                    store={store}
-                    dispatch={dispatch}
-                  />
-                </FormItem>
-              )}
+              <FormItem
+                label={'同步全局注册中心'}
+                tips={'开启后该命名空间下全部服务将均注册至全局注册中心相同命名空间下'}
+              >
+                <Switch
+                  value={sync_to_global_registry.getValue()}
+                  onChange={v => sync_to_global_registry.setValue(v)}
+                ></Switch>
+              </FormItem>
               <FormItem label={'服务可见性'} tips={'当前命名空间下的服务被允许可见的命名空间列表'} required>
                 <section style={{ marginBottom: '15px' }}>
                   <RadioGroup
@@ -111,6 +110,17 @@ const CreateForm = purify(function CreateForm(props: DuckCmpProps<Duck>) {
                   ></SelectMultiple>
                 )}
               </FormItem>
+              {options.authOpen && (
+                <FormItem label={'授权'}>
+                  <ResourcePrincipalAuth
+                    userDuck={userSelect}
+                    userGroupDuck={userGroupSelect}
+                    duck={duck}
+                    store={store}
+                    dispatch={dispatch}
+                  />
+                </FormItem>
+              )}
             </>
           )}
         </>

diff --git a/web/src/polaris/namespace/operation/CreateDuck.ts b/web/src/polaris/namespace/operation/CreateDuck.ts
@@ -70,6 +70,7 @@ export default class CreateDuck extends FormDialog {
             remove_user_ids: removeUserIds,
             remove_group_ids: removeGroupIds,
             service_export_to,
+            sync_to_global_registry: values.sync_to_global_registry,
           },
         ]),
       )
@@ -83,6 +84,7 @@ export default class CreateDuck extends FormDialog {
             user_ids: userIds,
             group_ids: groupIds,
             service_export_to,
+            sync_to_global_registry: values.sync_to_global_registry,
           },
         ]),
       )
@@ -169,6 +171,7 @@ export interface Values {
   groupIds: string[]
   service_export_to?: string[]
   visibilityMode?: string
+  sync_to_global_registry: boolean
 }
 class CreateForm extends Form {
   Values: Values

diff --git a/web/src/polaris/service/operation/Create.tsx b/web/src/polaris/service/operation/Create.tsx
@@ -104,17 +104,6 @@ const CreateForm = purify(function CreateForm(props: DuckCmpProps<Duck>) {
           </Button>
           {showAdvance && (
             <>
-              {options.authOpen && (
-                <FormItem label={'授权'}>
-                  <ResourcePrincipalAuth
-                    userDuck={userSelect}
-                    userGroupDuck={userGroupSelect}
-                    duck={duck}
-                    store={store}
-                    dispatch={dispatch}
-                  />
-                </FormItem>
-              )}
               <FormItem
                 label={'可见性'}
                 tips={'当前服务允许可见的命名空间列表，当与命名空间的服务可见性冲突时，优先使用该选项配置'}
@@ -148,6 +137,17 @@ const CreateForm = purify(function CreateForm(props: DuckCmpProps<Duck>) {
                   ></SelectMultiple>
                 )}
               </FormItem>
+              {options.authOpen && (
+                <FormItem label={'授权'}>
+                  <ResourcePrincipalAuth
+                    userDuck={userSelect}
+                    userGroupDuck={userGroupSelect}
+                    duck={duck}
+                    store={store}
+                    dispatch={dispatch}
+                  />
+                </FormItem>
+              )}
             </>
           )}
         </>

diff --git a/web/src/polaris/service/types.ts b/web/src/polaris/service/types.ts
@@ -32,6 +32,7 @@ export interface Namespace {
   total_health_instance_count?: number
   total_instance_count?: number
   service_export_to?: string[]
+  sync_to_global_registry: boolean
 }
 
 export const READ_ONLY_NAMESPACE = BuildConfig.readonlyNamespace