[Improve] Selector module adaptation namespace (#471)

* fix * [Improve] adapt selector page namespace --------- Co-authored-by: ‘xcsnx’ <‘[email protected]’>
apache · Aug 20, 2024 · d7eb121 · d7eb121
1 parent c34cec1
commit d7eb121
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 15 deletions.
diff --git a/src/models/common.js b/src/models/common.js
@@ -140,8 +140,8 @@ export default {
     },
     *deleteSelector(params, { call, put }) {
       const { payload, fetchValue } = params;
-      const { list } = payload;
-      const json = yield call(deleteSelector, { list });
+      const { list, namespaceId } = payload;
+      const json = yield call(deleteSelector, { list, namespaceId });
       if (json.code === 200) {
         message.success(
           getIntlContent("SHENYU.COMMON.RESPONSE.DELETE.SUCCESS"),
@@ -238,8 +238,8 @@ export default {
 
     *reload(params, { put }) {
       const { fetchValue } = params;
-      const { pluginId, currentPage, pageSize } = fetchValue;
-      const payload = { pluginId, currentPage, pageSize };
+      const { pluginId, currentPage, pageSize, namespaceId } = fetchValue;
+      const payload = { pluginId, currentPage, pageSize, namespaceId };
       yield put({ type: "fetchSelector", payload });
     },
 

diff --git a/src/routes/Plugin/Common/RuleCopy.js b/src/routes/Plugin/Common/RuleCopy.js
@@ -17,6 +17,7 @@
 
 import React, { Component } from "react";
 import { Modal, TreeSelect } from "antd";
+import { connect } from "dva";
 import {
   getPluginDropDownList,
   getAllSelectors,
@@ -25,6 +26,9 @@ import {
 } from "../../../services/api";
 import { getIntlContent } from "../../../utils/IntlUtils";
 
+@connect(({ global }) => ({
+  currentNamespaceId: global.currentNamespaceId,
+}))
 class RuleCopy extends Component {
   constructor(props) {
     super(props);
@@ -40,6 +44,7 @@ class RuleCopy extends Component {
   }
 
   getAllRule = async () => {
+    const { currentNamespaceId } = this.props;
     const { code: pluginCode, data: pluginList = [] } =
       await getPluginDropDownList();
     const {
@@ -48,6 +53,7 @@ class RuleCopy extends Component {
     } = await getAllSelectors({
       currentPage: 1,
       pageSize: 9999,
+      namespaceId: currentNamespaceId,
     });
     const {
       code: ruleCode,

diff --git a/src/routes/Plugin/Common/SelectorCopy.js b/src/routes/Plugin/Common/SelectorCopy.js
@@ -17,13 +17,17 @@
 
 import React, { Component } from "react";
 import { Modal, TreeSelect } from "antd";
+import { connect } from "dva";
 import {
   getPluginDropDownList,
   getAllSelectors,
   findSelector,
 } from "../../../services/api";
 import { getIntlContent } from "../../../utils/IntlUtils";
 
+@connect(({ global }) => ({
+  currentNamespaceId: global.currentNamespaceId,
+}))
 class SelectorCopy extends Component {
   constructor(props) {
     super(props);
@@ -39,6 +43,7 @@ class SelectorCopy extends Component {
   }
 
   getAllSelectors = async () => {
+    const { currentNamespaceId } = this.props;
     const { code: pluginCode, data: pluginList = [] } =
       await getPluginDropDownList();
     const {
@@ -47,6 +52,7 @@ class SelectorCopy extends Component {
     } = await getAllSelectors({
       currentPage: 1,
       pageSize: 9999,
+      namespaceId: currentNamespaceId,
     });
     const pluginMap = {};
     const selectorTree = [];
@@ -86,12 +92,15 @@ class SelectorCopy extends Component {
   };
 
   handleOk = async () => {
-    const { onOk } = this.props;
+    const { onOk, currentNamespaceId } = this.props;
     const { value } = this.state;
     this.setState({
       loading: true,
     });
-    const { data = {} } = await findSelector({ id: value });
+    const { data = {} } = await findSelector({
+      id: value,
+      namespaceId: currentNamespaceId,
+    });
     this.setState({
       loading: false,
     });

diff --git a/src/routes/Plugin/Common/index.js b/src/routes/Plugin/Common/index.js
@@ -83,8 +83,8 @@ export default class Common extends Component {
     const preId = prevProps.match.params.id;
     const newId = this.props.match.params.id;
     const { selectorPage, selectorPageSize } = this.state;
+    const { dispatch, plugins, currentNamespaceId } = this.props;
     if (newId !== preId) {
-      const { dispatch } = this.props;
       dispatch({
         type: "common/resetData",
       });
@@ -102,6 +102,11 @@ export default class Common extends Component {
         });
       }
     }
+    if (prevProps.currentNamespaceId !== currentNamespaceId) {
+      if (plugins) {
+        this.getAllSelectors(selectorPage, selectorPageSize, plugins);
+      }
+    }
   }
   /* eslint-enable no-unused-vars */
 
@@ -113,7 +118,7 @@ export default class Common extends Component {
   }
 
   getAllSelectors = (page, pageSize, plugins) => {
-    const { dispatch } = this.props;
+    const { dispatch, currentNamespaceId } = this.props;
     const { selectorName } = this.state;
     let name = this.props.match.params ? this.props.match.params.id : "";
     const tempPlugin = this.getPlugin(plugins, name);
@@ -127,6 +132,7 @@ export default class Common extends Component {
         pageSize,
         pluginId: tempPluginId,
         name: selectorName,
+        namespaceId: currentNamespaceId,
       },
     });
     this.setState({ selectorSelectedRowKeys: [] });
@@ -199,7 +205,7 @@ export default class Common extends Component {
 
   addSelector = () => {
     const { selectorPage, selectorPageSize } = this.state;
-    const { dispatch, plugins } = this.props;
+    const { dispatch, plugins, currentNamespaceId } = this.props;
     let name = this.props.match.params ? this.props.match.params.id : "";
     const plugin = this.getPlugin(plugins, name);
     const { id: pluginId, config } = plugin;
@@ -241,11 +247,13 @@ export default class Common extends Component {
                   pluginId,
                   ...selector,
                   upstreams: upstreamsWithProps,
+                  namespaceId: currentNamespaceId,
                 },
                 fetchValue: {
                   pluginId,
                   currentPage: selectorPage,
                   pageSize: selectorPageSize,
+                  namespaceId: currentNamespaceId,
                 },
                 callback: (selectorId) => {
                   this.addDiscoveryUpstream({
@@ -280,11 +288,16 @@ export default class Common extends Component {
             handleOk={(selector) => {
               dispatch({
                 type: "common/addSelector",
-                payload: { pluginId, ...selector },
+                payload: {
+                  pluginId,
+                  ...selector,
+                  namespaceId: currentNamespaceId,
+                },
                 fetchValue: {
                   pluginId,
                   currentPage: selectorPage,
                   pageSize: selectorPageSize,
+                  namespaceId: currentNamespaceId,
                 },
                 callback: () => {
                   this.closeModal();
@@ -470,7 +483,7 @@ export default class Common extends Component {
   };
 
   editSelector = (record) => {
-    const { dispatch, plugins } = this.props;
+    const { dispatch, plugins, currentNamespaceId } = this.props;
     const { selectorPage, selectorPageSize } = this.state;
     let name = this.props.match.params ? this.props.match.params.id : "";
     const plugin = this.getPlugin(plugins, name);
@@ -483,6 +496,7 @@ export default class Common extends Component {
       type: "common/fetchSeItem",
       payload: {
         id,
+        namespaceId: currentNamespaceId,
       },
       callback: (selector) => {
         if (isDiscovery) {
@@ -541,11 +555,13 @@ export default class Common extends Component {
                       pluginId,
                       ...values,
                       id,
+                      namespaceId: currentNamespaceId,
                     },
                     fetchValue: {
                       pluginId,
                       currentPage: selectorPage,
                       pageSize: selectorPageSize,
+                      namespaceId: currentNamespaceId,
                     },
                     callback: () => {
                       const {
@@ -603,11 +619,13 @@ export default class Common extends Component {
                       pluginId,
                       ...values,
                       id,
+                      namespaceId: currentNamespaceId,
                     },
                     fetchValue: {
                       pluginId,
                       currentPage: selectorPage,
                       pageSize: selectorPageSize,
+                      namespaceId: currentNamespaceId,
                     },
                     callback: () => {
                       this.closeModal();
@@ -624,7 +642,7 @@ export default class Common extends Component {
   };
 
   enableSelector = ({ list, enabled }) => {
-    const { dispatch, plugins } = this.props;
+    const { dispatch, plugins, currentNamespaceId } = this.props;
     const { selectorPage, selectorPageSize } = this.state;
     let name = this.props.match.params ? this.props.match.params.id : "";
     const plugin = this.getPlugin(plugins, name);
@@ -634,11 +652,13 @@ export default class Common extends Component {
       payload: {
         list,
         enabled,
+        namespaceId: currentNamespaceId,
       },
       fetchValue: {
         pluginId,
         currentPage: selectorPage,
         pageSize: selectorPageSize,
+        namespaceId: currentNamespaceId,
       },
     });
   };
@@ -666,19 +686,21 @@ export default class Common extends Component {
   };
 
   deleteSelector = (record) => {
-    const { dispatch, plugins } = this.props;
+    const { dispatch, plugins, currentNamespaceId } = this.props;
     const { selectorPage, selectorPageSize } = this.state;
     let name = this.props.match.params ? this.props.match.params.id : "";
     const pluginId = this.getPluginId(plugins, name);
     dispatch({
       type: "common/deleteSelector",
       payload: {
         list: [record.id],
+        namespaceId: currentNamespaceId,
       },
       fetchValue: {
         pluginId,
         currentPage: selectorPage,
         pageSize: selectorPageSize,
+        namespaceId: currentNamespaceId,
       },
     });
   };

diff --git a/src/services/api.js b/src/services/api.js
@@ -429,7 +429,10 @@ export async function addSelector(params) {
 export async function deleteSelector(params) {
   return request(`${baseUrl}/selector/batch`, {
     method: `DELETE`,
-    body: [...params.list],
+    body: {
+      ids: [...params.list],
+      namespaceId: params.namespaceId,
+    },
   });
 }
 
@@ -450,6 +453,7 @@ export async function enableSelector(params) {
     body: {
       ids: params.list,
       enabled: params.enabled,
+      namespaceId: params.namespaceId,
     },
   });
 }
@@ -463,7 +467,7 @@ export async function getAllSelectors(params) {
 
 /* get single selector */
 export async function findSelector(params) {
-  return request(`${baseUrl}/selector/${params.id}`, {
+  return request(`${baseUrl}/selector/${params.id}/${params.namespaceId}`, {
     method: `GET`,
   });
 }