Merge branch 'main' into fix-677-node-selection

YoungHypo · web-flow · commit ce79bc187fa7 · 2025-05-20T16:50:40.000-07:00
diff --git a/src/api-engine/api/lib/peer/chaincode.py b/src/api-engine/api/lib/peer/chaincode.py
@@ -63,9 +63,15 @@ def lifecycle_query_installed(self, timeout):
         """
 
         try:
-            res = subprocess.Popen("{} lifecycle chaincode queryinstalled --output json --connTimeout {}"
-                                   .format(self.peer, timeout), shell=True,
-                                   stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            command = [
+                self.peer,
+                "lifecycle", "chaincode", "queryinstalled",
+                "--output", "json",
+                "--connTimeout", timeout
+            ]
+            LOG.info(" ".join(command))
+            res = subprocess.Popen(command, shell=False,
+                                      stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 
             stdout, stderr = res.communicate()
             return_code = res.returncode
@@ -106,8 +112,8 @@ def lifecycle_get_installed_package(self, timeout):
             raise Exception(err_msg)
         return res_return
 
-    def lifecycle_approve_for_my_org(self, orderer_url, orderer_tls_rootcert, channel_name, cc_name,
-                                     chaincode_version, policy, sequence=1):
+    def lifecycle_approve_for_my_org(self, orderer_url, channel_name, cc_name,
+                                     chaincode_version, sequence, policy, init_flag):
         """
         The administrator can use the peer lifecycle chaincode approveformyorg subcommand to approve the chain code on
         behalf of the organization.
@@ -116,8 +122,9 @@ def lifecycle_approve_for_my_org(self, orderer_url, orderer_tls_rootcert, channe
         :param channel_name: channel name
         :param cc_name: chaincode name
         :param chaincode_version: chaincode version
-        :param policy: chaincode policy
         :param sequence: The channel chain code defines the serial number. The default value is 1
+        :param policy: chaincode policy
+        :param init_flag: if the chaincode is first init.
         :return:
         """
         try:
@@ -131,18 +138,43 @@ def lifecycle_approve_for_my_org(self, orderer_url, orderer_tls_rootcert, channe
             if package_id == "":
                 return 1, "not exist the chaincode, please check chaincode_name and chaincode_version"
 
+            command = []
             if os.getenv("CORE_PEER_TLS_ENABLED") == "false" or os.getenv("CORE_PEER_TLS_ENABLED") is None:
-                res = subprocess.Popen("{} lifecycle chaincode approveformyorg -o {} - --channelID {} --name {} "
-                                       "--version {} --init-required --package-id {} --sequence {} --signature-policy {}"
-                                       .format(self.peer, orderer_url, channel_name, cc_name, chaincode_version, package_id,
-                                               sequence, policy), shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+                command = [
+                    self.peer,
+                    "lifecycle", "chaincode", "approveformyorg",
+                    "-o", orderer_url,
+                    "--channelID", channel_name,
+                    "--name", cc_name,
+                    "--version", chaincode_version,
+                    "--package-id", package_id,
+                    "--sequence", str(sequence)
+                ]
             else:
-                res = subprocess.Popen("{} lifecycle chaincode approveformyorg -o {} --tls --cafile {} --channelID {} "
-                                       "--name {} --version {} --init-required --package-id {} --sequence {} "
-                                       "--signature-policy {}"
-                                       .format(self.peer, orderer_url, orderer_tls_rootcert, channel_name,
-                                               cc_name, chaincode_version, package_id, sequence, policy), shell=True,
-                                       stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+                ORDERER_CA = os.getenv("ORDERER_CA")
+                command = [
+                    self.peer,
+                    "lifecycle", "chaincode", "approveformyorg",
+                    "-o", orderer_url,
+                    "--ordererTLSHostnameOverride", orderer_url.split(":")[0],
+                    "--channelID", channel_name,
+                    "--name", cc_name,
+                    "--version", chaincode_version,
+                    "--package-id", package_id,
+                    "--sequence", str(sequence),
+                    "--tls",
+                    "--cafile", ORDERER_CA
+                ]
+            
+            if init_flag:
+                command.append("--init-required")
+            if policy:
+                command.append("--signature-policy")
+                command.append(policy)
+
+            LOG.info(" ".join(command))
+            res = subprocess.Popen(command, shell=False,
+                                   stdout=subprocess.PIPE, stderr=subprocess.PIPE)
             stdout, stderr = res.communicate()
             return_code = res.returncode
 
diff --git a/src/api-engine/api/routes/chaincode/serializers.py b/src/api-engine/api/routes/chaincode/serializers.py
@@ -62,9 +62,9 @@ class ChainCodeApproveForMyOrgBody(serializers.Serializer):
     channel_name = serializers.CharField(max_length=128, required=True)
     chaincode_name = serializers.CharField(max_length=128, required=True)
     chaincode_version = serializers.CharField(max_length=128, required=True)
-    policy = serializers.CharField(max_length=128, required=True)
-    orderer_url = serializers.CharField(max_length=128, required=True)
     sequence = serializers.IntegerField(min_value=1, required=True)
+    policy = serializers.CharField(max_length=128, required=False, allow_blank=True)
+    init_flag = serializers.BooleanField(required=False)
 
 
 class ChainCodeCommitBody(ChainCodeApproveForMyOrgBody):
diff --git a/src/api-engine/api/routes/chaincode/views.py b/src/api-engine/api/routes/chaincode/views.py
@@ -361,35 +361,27 @@ def approve_for_my_org(self, request):
             try:
                 channel_name = serializer.validated_data.get("channel_name")
                 chaincode_name = serializer.validated_data.get("chaincode_name")
-                chaincode_version = serializer.validated_data.get(
-                    "chaincode_version")
-                policy = serializer.validated_data.get("policy")
-                # Perhaps the orderer's port is best stored in the database
-                orderer_url = serializer.validated_data.get("orderer_url")
+                chaincode_version = serializer.validated_data.get("chaincode_version")
+                policy = serializer.validated_data.get("policy", "")
                 sequence = serializer.validated_data.get("sequence")
+                init_flag = serializer.validated_data.get("init_flag", False)
 
                 org = request.user.organization
                 qs = Node.objects.filter(type="orderer", organization=org)
                 if not qs.exists():
                     raise ResourceNotFound
                 orderer_node = qs.first()
+                orderer_url = orderer_node.name + "." + org.name.split(".", 1)[1] + ":" + str(7050)
 
-                orderer_tls_dir = "{}/{}/crypto-config/ordererOrganizations/{}/orderers/{}/msp/tlscacerts" \
-                                  .format(CELLO_HOME, org.name, org.name.split(".", 1)[1], orderer_node.name + "." +
-                                          org.name.split(".", 1)[1])
-                orderer_tls_root_cert = ""
-                for _, _, files in os.walk(orderer_tls_dir):
-                    orderer_tls_root_cert = orderer_tls_dir + "/" + files[0]
-                    break
                 qs = Node.objects.filter(type="peer", organization=org)
                 if not qs.exists():
                     raise ResourceNotFound
                 peer_node = qs.first()
                 envs = init_env_vars(peer_node, org)
 
                 peer_channel_cli = PeerChainCode(**envs)
-                code, content = peer_channel_cli.lifecycle_approve_for_my_org(orderer_url, orderer_tls_root_cert, channel_name,
-                                                                              chaincode_name, chaincode_version, policy, sequence)
+                code, content = peer_channel_cli.lifecycle_approve_for_my_org(orderer_url, channel_name,
+                                                                              chaincode_name, chaincode_version, sequence, policy, init_flag)
                 if code != 0:
                     return Response(err(" lifecycle_approve_for_my_org failed. err: " + content), status=status.HTTP_400_BAD_REQUEST)
             except Exception as e:
diff --git a/src/dashboard/config/config.js b/src/dashboard/config/config.js
@@ -11,9 +11,9 @@ export default {
   antd: {},
   locale: {
     default: 'en-US',
-    antd: false,
-    title: false,
-    baseNavigator: true,
+    antd: true,
+    title: true,
+    baseNavigator: false,
     baseSeparator: '-',
   },
   pwa: false,
diff --git a/src/dashboard/src/components/SelectLang/index.js b/src/dashboard/src/components/SelectLang/index.js
@@ -9,6 +9,7 @@ import styles from './index.less';
 class SelectLang extends PureComponent {
   changeLang = ({ key }) => {
     setLocale(key);
+    localStorage.setItem('umi_locale', key);
   };
 
   render() {
diff --git a/src/dashboard/src/layouts/BasicLayout.js b/src/dashboard/src/layouts/BasicLayout.js
@@ -1,10 +1,10 @@
 /*
  SPDX-License-Identifier: Apache-2.0
 */
-import React from 'react';
+import React, { Component } from 'react';
 import { Layout } from 'antd';
 import DocumentTitle from 'react-document-title';
-import { connect } from 'umi';
+import { connect, setLocale, getLocale } from 'umi';
 import { ContainerQuery } from 'react-container-query';
 import classNames from 'classnames';
 import Media from 'react-media';
@@ -46,7 +46,7 @@ const query = {
   },
 };
 
-class BasicLayout extends React.Component {
+class BasicLayout extends Component {
   componentDidMount() {
     const {
       dispatch,
@@ -62,6 +62,17 @@ class BasicLayout extends React.Component {
       type: 'menu/getMenuData',
       payload: { routes, path, authority },
     });
+
+    // Initialize language from localStorage or default to English
+    const savedLocale = localStorage.getItem('umi_locale');
+    const currentLocale = getLocale();
+
+    if (savedLocale && savedLocale !== currentLocale) {
+      setLocale(savedLocale);
+    } else if (!savedLocale) {
+      setLocale('en-US');
+      localStorage.setItem('umi_locale', 'en-US');
+    }
   }
 
   getContext() {
diff --git a/src/dashboard/src/locales/en-US.js b/src/dashboard/src/locales/en-US.js
@@ -26,6 +26,29 @@ export default {
   'app.forms.basic.title': 'Basic form',
   'app.forms.basic.description':
     'Form pages are used to collect or verify information to users, and basic forms are common in scenarios where there are fewer data items.',
+
+  // Error messages
+  'error.request.200': 'Server successfully returned requested data.',
+  'error.request.201': 'Created or modified data successfully.',
+  'error.request.202': 'A request has entered the background queue.',
+  'error.request.204': 'Data deleted successfully.',
+  'error.request.400': 'Bad request, server did not create or modify data.',
+  'error.request.401': 'User does not have permission (token, username, password error).',
+  'error.request.403': 'User is authorized but access is forbidden.',
+  'error.request.404': 'Request made to non-existent record, server did not operate.',
+  'error.request.406': 'Requested format not available.',
+  'error.request.410': 'Requested resource permanently deleted and will not be available again.',
+  'error.request.422': 'Validation error occurred while creating an object.',
+  'error.request.500': 'Server error, please check server.',
+  'error.request.502': 'Gateway error.',
+  'error.request.503': 'Service unavailable, server temporarily overloaded or maintaining.',
+  'error.request.504': 'Gateway timeout.',
+  'error.network': 'Network error, please check your connection.',
+  'error.login.invalidCredentials': 'Invalid username or password.',
+  'error.login.expired': 'Not logged in or session expired. Please log in again.',
+  'error.register.duplicate': 'Email address or organization name already exists.',
+  'error.request.generic': 'Request error: {status}',
+
   ...exception,
   ...globalHeader,
   ...login,
diff --git a/src/dashboard/src/locales/zh-CN.js b/src/dashboard/src/locales/zh-CN.js
@@ -26,6 +26,29 @@ export default {
   'app.forms.basic.title': '基础表单',
   'app.forms.basic.description':
     '表单页用于向用户收集或验证信息，基础表单常见于数据项较少的表单场景。',
+
+  // Error messages
+  'error.request.200': '服务器成功返回请求的数据。',
+  'error.request.201': '新建或修改数据成功。',
+  'error.request.202': '一个请求已经进入后台排队（异步任务）。',
+  'error.request.204': '删除数据成功。',
+  'error.request.400': '发出的请求有错误，服务器没有进行新建或修改数据的操作。',
+  'error.request.401': '用户没有权限（令牌、用户名、密码错误）。',
+  'error.request.403': '用户得到授权，但是访问是被禁止的。',
+  'error.request.404': '发出的请求针对的是不存在的记录，服务器没有进行操作。',
+  'error.request.406': '请求的格式不可得。',
+  'error.request.410': '请求的资源被永久删除，且不会再得到的。',
+  'error.request.422': '当创建一个对象时，发生一个验证错误。',
+  'error.request.500': '服务器发生错误，请检查服务器。',
+  'error.request.502': '网关错误。',
+  'error.request.503': '服务不可用，服务器暂时过载或维护。',
+  'error.request.504': '网关超时。',
+  'error.network': '网络错误，请检查您的网络连接。',
+  'error.login.invalidCredentials': '用户名或密码错误。',
+  'error.login.expired': '未登录或登录已过期，请重新登录。',
+  'error.register.duplicate': '邮箱地址或组织名已存在。',
+  'error.request.generic': '请求错误：{status}',
+
   ...exception,
   ...globalHeader,
   ...login,
diff --git a/src/dashboard/src/models/chaincode.js b/src/dashboard/src/models/chaincode.js
@@ -1,4 +1,9 @@
-import { listChainCode, uploadChainCode, installChainCode } from '@/services/chaincode';
+import {
+  listChainCode,
+  uploadChainCode,
+  installChainCode,
+  approveChainCode,
+} from '@/services/chaincode';
 
 export default {
   namespace: 'chainCode',
@@ -42,6 +47,12 @@ export default {
         callback(response);
       }
     },
+    *approveChainCode({ payload, callback }, { call }) {
+      const response = yield call(approveChainCode, payload);
+      if (callback) {
+        callback(response);
+      }
+    },
   },
   reducers: {
     save(state, { payload }) {
diff --git a/src/dashboard/src/pages/ChainCode/ChainCode.js b/src/dashboard/src/pages/ChainCode/ChainCode.js
@@ -123,6 +123,25 @@ class ChainCode extends PureComponent {
     });
   };
 
+  handleApprove = (values, callback) => {
+    const { dispatch } = this.props;
+
+    const payload = {
+      channel_name: values.channel,
+      chaincode_name: values.name,
+      chaincode_version: values.version,
+      sequence: parseInt(values.sequence, 10),
+      policy: values.policy,
+      init_flag: !!values.initFlag,
+    };
+
+    dispatch({
+      type: 'chainCode/approveChainCode',
+      payload,
+      callback,
+    });
+  };
+
   handleUpload = (values, callback) => {
     const { dispatch } = this.props;
     const formData = new FormData();
@@ -194,8 +213,13 @@ class ChainCode extends PureComponent {
       approveModalVisible,
       handleApproveModalVisible: this.handleApproveModalVisible,
       fetchChainCodes: this.fetchChainCodes,
+      handleApprove: this.handleApprove,
       approving,
       selectedRows: [],
+      initFlagChange: e => {
+        // this can be used to handle the initFlag change, currently only for demo
+        console.log('initFlag changed:', e.target.checked);
+      },
       intl,
     };
 
diff --git a/src/dashboard/src/pages/ChainCode/forms/ApproveForm.js b/src/dashboard/src/pages/ChainCode/forms/ApproveForm.js
diff --git a/src/dashboard/src/services/chaincode.js b/src/dashboard/src/services/chaincode.js
diff --git a/src/dashboard/src/utils/request.js b/src/dashboard/src/utils/request.js
