Merge branch 'main' into issue-update-chaincode-query

Author: YoungHypo

.gitignore

@@ -255,4 +255,7 @@ deno.lock
 
 # test postman
 tests/postman/env.json
-tests/postman/junitResult.xml
+tests/postman/junitResult.xml
+
+# Postgres
+pgdata/

MAINTAINERS.md

@@ -6,6 +6,7 @@
 | Yang Feng | fengyangsy | [email protected] |
 | Yuanmao Zhu | zhuyuanmao | [email protected] |
 | Xichen Pan | xichen1 | [email protected]  |
+| Haibo Yang | YoungHypo | [email protected]  |
 
 ## Release Managers
 

src/dashboard/.eslintrc.js

@@ -2,8 +2,19 @@
  SPDX-License-Identifier: Apache-2.0
 */
 module.exports = {
-  parser: 'babel-eslint',
+  parser: '@babel/eslint-parser',
+  parserOptions: {
+    requireConfigFile: false,
+    babelOptions: {
+      presets: ['@babel/preset-react'],
+      plugins: [['@babel/plugin-proposal-decorators', { legacy: true }]],
+    },
+    ecmaFeatures: {
+      legacyDecorators: true,
+    },
+  },
   extends: ['airbnb', 'prettier', 'plugin:compat/recommended'],
+  plugins: ['react-hooks'],
   env: {
     browser: true,
     node: true,
@@ -37,8 +48,34 @@ module.exports = {
     'jsx-a11y/anchor-is-valid': 0,
     'linebreak-style': 0,
     'prefer-destructuring': 0,
+    'react/jsx-props-no-spreading': 0,
+    'react/function-component-definition': 0,
+    'react/react-in-jsx-scope': 0,
+    'react-hooks/rules-of-hooks': 'off',
+    'react-hooks/exhaustive-deps': 'warn',
+    'import/extensions': 0,
+    'react/state-in-constructor': 0,
+    'react/static-property-placement': 0,
+    'class-methods-use-this': 0,
+    'react/jsx-fragments': 0,
+    'react/jsx-no-useless-fragment': 0,
+    'react/no-arrow-function-lifecycle': 0,
+    'react/no-unstable-nested-components': 0,
+    'react/no-unused-class-component-methods': 0,
+    'arrow-body-style': 0,
+    'no-useless-catch': 0,
+    'compat/compat': 0,
+    'import/order': 0,
+    'react/jsx-curly-brace-presence': 0,
+    'default-case-last': 0,
+    'prefer-regex-literals': 0,
   },
   settings: {
     polyfills: ['fetch', 'promises', 'url', 'object-assign'],
+    'import/resolver': {
+      node: {
+        extensions: ['.js', '.jsx', '.ts', '.tsx'],
+      },
+    },
   },
 };

src/dashboard/package.json

@@ -54,13 +54,16 @@
     "@ant-design/icons": "^4.1.0",
     "@ant-design/pro-layout": "^5.0.0",
     "@antv/data-set": "^0.10.1",
+    "@babel/core": "^7.26.10",
+    "@babel/plugin-proposal-decorators": "^7.25.9",
     "antd": "^4.2.5",
     "bizcharts": "3.5.3",
     "bizcharts-plugin-slider": "^2.1.1-beta.1",
     "body-parser": "^1.19.0",
     "cello-paginator": "^1.0.1",
     "classnames": "^2.2.6",
     "enquire-js": "^0.2.1",
+    "eslint-plugin-react-hooks": "^5.2.0",
     "express": "^4.16.4",
     "gg-editor": "^2.0.2",
     "lodash": "^4.17.11",
@@ -90,28 +93,29 @@
     "validator": "^13.7.0"
   },
   "devDependencies": {
+    "@babel/eslint-parser": "^7.22.15",
+    "@babel/preset-react": "^7.22.15",
     "@types/history": "^4.7.2",
     "@types/react": "^16.8.1",
     "@types/react-dom": "^16.0.11",
     "glob": "^9.0.0",
     "@umijs/preset-react": "^1.2.2",
     "antd-pro-merge-less": "^1.0.0",
     "antd-theme-webpack-plugin": "^1.2.0",
-    "babel-eslint": "^10.0.1",
     "chalk": "^2.4.2",
     "check-prettier": "^1.0.1",
     "cross-env": "^5.2.0",
     "cross-port-killer": "^1.0.1",
     "enzyme": "^3.9.0",
-    "eslint": "^5.13.0",
-    "eslint-config-airbnb": "^17.1.0",
-    "eslint-config-prettier": "^4.1.0",
-    "eslint-plugin-babel": "^5.3.0",
-    "eslint-plugin-compat": "^2.6.3",
-    "eslint-plugin-import": "2.20.1",
-    "eslint-plugin-jsx-a11y": "^6.2.1",
-    "eslint-plugin-markdown": "^2.2.0",
-    "eslint-plugin-react": "^7.12.4",
+    "eslint": "^8.53.0",
+    "eslint-config-airbnb": "^19.0.4",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-babel": "^5.3.1",
+    "eslint-plugin-compat": "^4.2.0",
+    "eslint-plugin-import": "^2.29.0",
+    "eslint-plugin-jsx-a11y": "^6.7.1",
+    "eslint-plugin-markdown": "^3.0.1",
+    "eslint-plugin-react": "^7.33.2",
     "faker": "^4.1.0",
     "gh-pages": "^6.1.1",
     "husky": "^4.2.5",

tests/dashboard/docker-compose.yml

@@ -1,8 +1,8 @@
 version: '3.2'
 services:
   test-dashboard:
-    image: node:14.18
+    image: node:20.15
     volumes:
       - $ROOT_PATH/src/dashboard:/dashboard
     working_dir: /dashboard
-    command: bash -c "npm i && npm run lint"
+    command: bash -c "yarn && yarn lint"