feat: update

apache · Apr 9, 2021 · 0755b95 · 0755b95
1 parent 23fb278
commit 0755b95
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/web/cypress/integration/plugin/create-delete-in-drawer-plugin.spec.js b/web/cypress/integration/plugin/create-delete-in-drawer-plugin.spec.js
@@ -38,7 +38,7 @@ context('Delete Plugin List with the Drawer', () => {
     });
 
     cy.get(this.domSelector.codeMirrorMode).invoke('text').then(text => {
-      if (text === 'UIForm') {
+      if (text === 'Form') {
         cy.get(this.domSelector.codeMirrorMode).click();
         cy.get(this.domSelector.selectDropdown).should('be.visible');
         cy.get(this.domSelector.selectJSON).click();

diff --git a/web/cypress/support/commands.js b/web/cypress/support/commands.js
@@ -79,7 +79,7 @@ Cypress.Commands.add('configurePlugins', (cases) => {
           cy.get(domSelector.drawer).should('exist');
 
           cy.get(domSelector.codeMirrorMode).invoke('text').then(text => {
-            if (text === 'UIForm') {
+            if (text === 'Form') {
               cy.get(domSelector.codeMirrorMode).click();
               cy.get(domSelector.selectDropdown).should('be.visible');
               cy.get(domSelector.selectJSON).click();

diff --git a/web/src/components/Plugin/PluginDetail.tsx b/web/src/components/Plugin/PluginDetail.tsx
@@ -95,7 +95,7 @@ const PluginDetail: React.FC<Props> = ({
   enum codeMirrorModeList {
     JSON = 'JSON',
     YAML = 'YAML',
-    UIForm = 'UIForm'
+    Form = 'Form'
   }
   const [form] = Form.useForm();
   const [UIForm] = Form.useForm();
@@ -111,7 +111,7 @@ const PluginDetail: React.FC<Props> = ({
   ];
 
   if (PLUGIN_UI_LIST.includes(name)) {
-    modeOptions.push({ label: codeMirrorModeList.UIForm, value: codeMirrorModeList.UIForm });
+    modeOptions.push({ label: codeMirrorModeList.Form, value: codeMirrorModeList.Form });
   }
 
   useEffect(() => {
@@ -120,7 +120,7 @@ const PluginDetail: React.FC<Props> = ({
       scope: 'global',
     });
     if (PLUGIN_UI_LIST.includes(name)) {
-      setCodeMirrorMode(codeMirrorModeList.UIForm);
+      setCodeMirrorMode(codeMirrorModeList.Form);
       UIForm.setFieldsValue(initialData[name]);
     };
   }, []);
@@ -207,7 +207,7 @@ const PluginDetail: React.FC<Props> = ({
         break;
       }
 
-      case codeMirrorModeList.UIForm: {
+      case codeMirrorModeList.Form: {
         if (codeMirrorMode === codeMirrorModeList.JSON) {
           UIForm.setFieldsValue(JSON.parse(ref.current.editor.getValue()));
         } else {
@@ -337,7 +337,7 @@ const PluginDetail: React.FC<Props> = ({
         <PageHeader
           title=""
           subTitle={
-            pluginType === 'auth' && schemaType !== 'consumer' && (codeMirrorMode !== codeMirrorModeList.UIForm) ? (
+            pluginType === 'auth' && schemaType !== 'consumer' && (codeMirrorMode !== codeMirrorModeList.Form) ? (
               <Alert message={formatMessage({ id: 'component.global.noConfigurationRequired' })} type="warning" />
             ) : null
           }
@@ -366,13 +366,13 @@ const PluginDetail: React.FC<Props> = ({
               }}
               data-cy='code-mirror-mode'
             ></Select>,
-            <Button type="primary" onClick={formatCodes} key={3}>
+            <Button type="primary" onClick={formatCodes} key={3} disabled={codeMirrorMode === codeMirrorModeList.Form}>
               {formatMessage({ id: 'component.global.format' })}
-            </Button>,
+            </Button>
           ]}
         />
-        {Boolean(codeMirrorMode === codeMirrorModeList.UIForm) && <PluginForm name={name} form={UIForm} renderForm={!(pluginType === 'auth' && schemaType !== 'consumer')} />}
-        <div style={{ display: codeMirrorMode === codeMirrorModeList.UIForm ? 'none' : 'unset' }}><CodeMirror
+        {Boolean(codeMirrorMode === codeMirrorModeList.Form) && <PluginForm name={name} form={UIForm} renderForm={!(pluginType === 'auth' && schemaType !== 'consumer')} />}
+        <div style={{ display: codeMirrorMode === codeMirrorModeList.Form ? 'none' : 'unset' }}><CodeMirror
           ref={(codemirror) => {
             ref.current = codemirror;
             if (codemirror) {

diff --git a/web/src/components/Plugin/typing.d.ts b/web/src/components/Plugin/typing.d.ts
@@ -30,5 +30,5 @@ declare namespace PluginComponent {
 
   type ReferPage = '' | 'route' | 'consumer' | 'service' | 'plugin';
 
-  type CodeMirrorMode = 'JSON' | 'YAML'| 'UIForm';
+  type CodeMirrorMode = 'JSON' | 'YAML'| 'Form';
 }