fix: adapt APISIX plugin disabled (#2717)

apache · Jan 20, 2023 · 7b8d9c5 · 7b8d9c5
1 parent 5ccb55b
commit 7b8d9c5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/web/.eslintrc.js b/web/.eslintrc.js
@@ -33,6 +33,7 @@ module.exports = {
     'import/order': 'off',
     'simple-import-sort/imports': 'error',
     'simple-import-sort/exports': 'error',
+    'no-underscore-dangle': 'off',
   },
   settings: {
     'import/resolver': {

diff --git a/web/src/components/Plugin/PluginDetail.tsx b/web/src/components/Plugin/PluginDetail.tsx
@@ -181,7 +181,7 @@ const PluginDetail: React.FC<Props> = ({
 
   useEffect(() => {
     form.setFieldsValue({
-      disable: isEnabled ? true : initialData[name] && !initialData[name].disable,
+      disable: isEnabled ? true : initialData[name] && !initialData[name]._meta.disable,
       scope: 'global',
     });
     if (PLUGIN_UI_LIST.includes(name)) {
@@ -415,7 +415,9 @@ const PluginDetail: React.FC<Props> = ({
           name="disable"
         >
           <Switch
-            defaultChecked={isEnabled ? true : initialData[name] && !initialData[name].disable}
+            defaultChecked={
+              isEnabled ? true : initialData[name] && !initialData[name]._meta.disable
+            }
             disabled={readonly || isEnabled}
           />
         </Form.Item>

diff --git a/web/src/components/Plugin/PluginPage.tsx b/web/src/components/Plugin/PluginPage.tsx
@@ -101,7 +101,7 @@ const PluginPage: React.FC<Props> = ({
 
   useEffect(() => {
     const openPluginList = pluginList.filter(
-      (item) => initialData[item.name] && !initialData[item.name].disable,
+      (item) => initialData[item.name] && !initialData[item.name]._meta.disable,
     );
     setPlugins(initialData);
     setEnablePluginsList(openPluginList);
@@ -244,16 +244,16 @@ const PluginPage: React.FC<Props> = ({
                   actions={[
                     <Button
                       type={
-                        initialData[item.name] && !initialData[item.name].disable
+                        initialData[item.name] && !initialData[item.name]._meta.disable
                           ? 'primary'
                           : 'default'
                       }
-                      danger={initialData[item.name] && !initialData[item.name].disable}
+                      danger={initialData[item.name] && !initialData[item.name]._meta.disable}
                       onClick={() => {
                         setName(item.name);
                       }}
                     >
-                      {initialData[item.name] && !initialData[item.name].disable
+                      {initialData[item.name] && !initialData[item.name]._meta.disable
                         ? formatMessage({ id: 'component.plugin.disable' })
                         : formatMessage({ id: 'component.plugin.enable' })}
                     </Button>,
@@ -315,7 +315,7 @@ const PluginPage: React.FC<Props> = ({
       onChange={({ monacoData, formData, shouldDelete }) => {
         let newPlugins = {
           ...initialData,
-          [name]: { ...monacoData, disable: !formData.disable },
+          [name]: { ...monacoData, _meta: { disable: !formData.disable } },
         };
         let handleType = 'edit';
         if (shouldDelete === true) {