(shenyu-dashboard) branch master updated: adapt namespce export import (#498)

[dengliming]

This is an automated email from the ASF dual-hosted git repository.

dengliming pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu-dashboard.git


The following commit(s) were added to refs/heads/master by this push:
     new 907a3308 adapt namespce export import (#498)
907a3308 is described below

commit 907a3308cb4bcdb5ac9e53343b259f4641043835
Author: aias00 <rok...@163.com>
AuthorDate: Wed Nov 13 10:08:58 2024 +0800

    adapt namespce export import (#498)
    
    * remove 'resource' button in namespacePlugin
    
    * fix es lint
    
    * fix namespace sync bug
    
    * namespace config import adapt
    
    * [type:feature]adapt_namespace_export
    
    * [type:feature]adapt_namespace_export
    
    * adapt namespace config import export
    
    * remove console
---
 src/components/GlobalHeader/ExportModal.js                  | 4 +---
 src/components/GlobalHeader/{AddModal.js => ImportModal.js} | 4 ++--
 src/components/GlobalHeader/index.js                        | 6 +++---
 src/models/common.js                                        | 5 +++--
 src/services/api.js                                         | 2 +-
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/components/GlobalHeader/ExportModal.js 
b/src/components/GlobalHeader/ExportModal.js
index e6dfceca..802c3575 100644
--- a/src/components/GlobalHeader/ExportModal.js
+++ b/src/components/GlobalHeader/ExportModal.js
@@ -73,7 +73,6 @@ const NamespaceSelector = forwardRef(
 class ExportModal extends Component {
   constructor(props) {
     super(props);
-
     this.state = {
       currentNamespaceId: defaultNamespaceId,
     };
@@ -84,8 +83,7 @@ class ExportModal extends Component {
     e.preventDefault();
     form.validateFieldsAndScroll((err, values) => {
       if (!err) {
-        let { namespace, file } = values;
-        handleOk({ namespace, file });
+        handleOk(values);
       }
     });
   };
diff --git a/src/components/GlobalHeader/AddModal.js 
b/src/components/GlobalHeader/ImportModal.js
similarity index 98%
rename from src/components/GlobalHeader/AddModal.js
rename to src/components/GlobalHeader/ImportModal.js
index 71dab4db..9f38da8a 100644
--- a/src/components/GlobalHeader/AddModal.js
+++ b/src/components/GlobalHeader/ImportModal.js
@@ -94,7 +94,7 @@ const NamespaceSelector = forwardRef(
   platform: global.platform,
   namespaces: global.namespaces,
 }))
-class AddModal extends Component {
+class ImportModal extends Component {
   constructor(props) {
     super(props);
 
@@ -186,4 +186,4 @@ class AddModal extends Component {
   }
 }
 
-export default Form.create()(AddModal);
+export default Form.create()(ImportModal);
diff --git a/src/components/GlobalHeader/index.js 
b/src/components/GlobalHeader/index.js
index 4e22a48c..f5b219ed 100644
--- a/src/components/GlobalHeader/index.js
+++ b/src/components/GlobalHeader/index.js
@@ -28,7 +28,7 @@ import {
 } from "antd";
 import { connect } from "dva";
 import { withRouter } from "dva/router";
-import AddModal from "./AddModal";
+import ImportModal from "./ImportModal";
 import ExportModal from "./ExportModal";
 import ImportResultModal from "./ImportResultModal";
 import styles from "./index.less";
@@ -183,7 +183,7 @@ class GlobalHeader extends PureComponent {
   importConfigClick = () => {
     this.setState({
       popup: (
-        <AddModal
+        <ImportModal
           disabled={false}
           handleOk={(values) => {
             const { dispatch } = this.props;
@@ -234,7 +234,7 @@ class GlobalHeader extends PureComponent {
           handleOk={(values) => {
             const { dispatch } = this.props;
             dispatch({
-              type: "common/exportAll",
+              type: "common/exportByNamespace",
               payload: values,
               callback: (res) => {
                 this.closeModal(true);
diff --git a/src/models/common.js b/src/models/common.js
index f63df052..7935bbff 100644
--- a/src/models/common.js
+++ b/src/models/common.js
@@ -30,6 +30,7 @@ import {
   updateRule,
   enableRule,
   asyncConfigExport,
+  asyncConfigExportByNamespace,
   asyncConfigImport,
 } from "../services/api";
 import { getIntlContent } from "../utils/IntlUtils";
@@ -256,8 +257,8 @@ export default {
       yield call(asyncConfigExport);
     },
 
-    *exportByNamespace(_, { call }) {
-      yield call(asyncConfigExport);
+    *exportByNamespace(params, { call }) {
+      yield call(asyncConfigExportByNamespace, params);
     },
 
     *import(params, { call }) {
diff --git a/src/services/api.js b/src/services/api.js
index f17e745f..10af4a51 100644
--- a/src/services/api.js
+++ b/src/services/api.js
@@ -549,7 +549,7 @@ export async function asyncConfigExport() {
 // export configs by namespace
 export async function asyncConfigExportByNamespace(params) {
   return download(
-    `${baseUrl}/configs/exportByNamespace?namespaceId=${params.namespaceId}`,
+    
`${baseUrl}/configs/exportByNamespace?namespace=${params.payload.namespace}`,
     {
       method: `GET`,
     },