diff --git a/.github/actions/catch-install-pnpm/action.yml b/.github/actions/catch-install-pnpm/action.yml index 28115c5ed..64c9ad525 100644 --- a/.github/actions/catch-install-pnpm/action.yml +++ b/.github/actions/catch-install-pnpm/action.yml @@ -11,7 +11,7 @@ runs: - name: Install Node.js uses: actions/setup-node@v4 with: - node-version: 20 + node-version: '20.19' cache: 'pnpm' - name: Install dependencies diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 397ad2eb9..4d9700e19 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,7 +26,15 @@ jobs: if: ${{ !contains(github.event.pull_request.title, '[skip checker]') }} strategy: matrix: - shard: [1, 2, 3, 4] + include: + - package_name: base + package_path: packages/base + - package_name: '@actiontech/dms-kit' + package_path: packages/dms-kit + - package_name: '@actiontech/shared' + package_path: packages/shared + - package_name: sqle + package_path: packages/sqle steps: - name: Checkout repository uses: actions/checkout@v4 @@ -34,64 +42,14 @@ jobs: - name: Install dependencies uses: ./.github/actions/catch-install-pnpm - - name: Coverage test report - run: sh ./scripts/jest/run-ci.sh ${{ matrix.shard }} ${{ strategy.job-total }} + - name: Run package test suite + run: pnpm turbo run test:ci --filter=${{ matrix.package_name }} - - uses: actions/upload-artifact@v4 - with: - name: coverage-artifacts-${{ matrix.shard }} - path: coverage/ - - report: - runs-on: ubuntu-latest - if: ${{ !contains(github.event.pull_request.title, '[skip checker]') }} - needs: [test] - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Get Coverage 1 - uses: actions/download-artifact@v4 - with: - name: coverage-artifacts-1 - path: coverage - - - name: Get Coverage 2 - uses: actions/download-artifact@v4 - with: - name: coverage-artifacts-2 - path: coverage - - - name: Get Coverage 3 - uses: actions/download-artifact@v4 - with: - name: coverage-artifacts-3 - path: coverage - - - name: Get Coverage 4 - uses: actions/download-artifact@v4 - with: - name: coverage-artifacts-4 - path: coverage - - - name: Install dependencies - uses: ./.github/actions/catch-install-pnpm - - - name: Merge coverage reports - run: node ./scripts/jest/merge-report-json.js - - - name: Coverage test report + - name: Coverage report uses: ArtiomTr/jest-coverage-report-action@v2 with: github-token: ${{ secrets.GITHUB_TOKEN }} - base-coverage-file: coverage-merged.json - coverage-file: coverage-merged.json - - - name: Delete artifact - uses: geekyeggo/delete-artifact@v5 - with: - name: | - coverage-artifacts-1 - coverage-artifacts-2 - coverage-artifacts-3 - coverage-artifacts-4 + custom-title: 'Coverage report (${{ matrix.package_name }})' + coverage-file: ${{ matrix.package_path }}/coverage/report.json + base-coverage-file: ${{ matrix.package_path }}/coverage/report.json + skip-step: all diff --git a/.gitignore b/.gitignore index 4dbb2d65d..bbf1b4067 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,6 @@ /.pnpm-store /.pnp .pnp.js -.vscode .eslintcache dist @@ -16,9 +15,8 @@ dist # testing /ce_coverage /coverage +**/coverage/** /report.json -/coverage-merged -/coverage-merged.json # production /build @@ -53,4 +51,6 @@ verdaccio ftp-data -/scripts/cli/dms-kit-publish/docs \ No newline at end of file +/scripts/cli/dms-kit-publish/docs + +*.turbo \ No newline at end of file diff --git a/.prettierrc b/.oxfmtrc.json similarity index 54% rename from .prettierrc rename to .oxfmtrc.json index ed8abe384..aa9ef744a 100644 --- a/.prettierrc +++ b/.oxfmtrc.json @@ -1,4 +1,5 @@ { + "$schema": "./node_modules/oxfmt/configuration_schema.json", "tabWidth": 2, "semi": true, "printWidth": 80, @@ -8,5 +9,10 @@ "useTabs": false, "singleQuote": true, "bracketSpacing": true, - "jsxBracketSameLine": false + "jsxBracketSameLine": false, + "sortPackageJson": false, + "ignorePatterns": [ + "*.snap", + "*.md" + ] } diff --git a/.oxlintrc.json b/.oxlintrc.json new file mode 100644 index 000000000..72db1b5f1 --- /dev/null +++ b/.oxlintrc.json @@ -0,0 +1,42 @@ +{ + "$schema": "./node_modules/oxlint/configuration_schema.json", + "plugins": [ + "react", + "import", + "node", + "jest", + "typescript", + "unicorn", + "oxc" + ], + "categories": { + "correctness": "warn", + "suspicious": "warn" + }, + "rules": { + "no-console": "warn", + "react-in-jsx-scope": "off", + "no-shadow": "off", + "no-shadow-restricted-names": "error", + "prefer-const": "warn", + "no-extra-boolean-cast": "off", + "no-template-curly-in-string": "warn", + "react/display-name": "off", + "import/no-anonymous-default-export": "warn" + }, + "env": { + "builtin": true + }, + "ignorePatterns": [ + "**/*.test.ts", + "**/*.test.tsx", + "**/demo/**", + "**/demos/**", + "**/dist/**", + "**/es/**", + "**/node_modules/**", + "packages/shared/lib/api/*", + "packages/**/mockApi/*", + "packages/**/testUtil/*" + ] +} \ No newline at end of file diff --git a/.prettierignore b/.prettierignore deleted file mode 100644 index 9cb972fd1..000000000 --- a/.prettierignore +++ /dev/null @@ -1,2 +0,0 @@ -*.snap -*.md \ No newline at end of file diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 000000000..6bc9efd97 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,8 @@ +{ + "recommendations": [ + "streetsidesoftware.code-spell-checker", + "rain.react-i18n-prompt", + "styled-components.vscode-styled-components", + "oxc.oxc-vscode" + ] +} diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 000000000..cf37c5f73 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,33 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "type": "node", + "request": "launch", + "name": "Debug CLI/create-dms-page", + "skipFiles": ["/**"], + "program": "${workspaceFolder}/scripts/cli/create-dms-page/src/index.ts", + "preLaunchTask": "npm: build - packages/cli/create-dms-page", + "outFiles": [ + "${workspaceFolder}/scripts/cli/create-dms-page/dist/**/*.js" + ], + "args": ["base"], // 在这里添加命令行参数 + "console": "integratedTerminal" + }, + { + "type": "node", + "request": "launch", + "name": "Debug CLI/api-mock-server", + "skipFiles": ["/**"], + "program": "${workspaceFolder}/scripts/cli/api-mock-server/src/index.ts", + "preLaunchTask": "npm: build - packages/cli/api-mock-server", + "outFiles": [ + "${workspaceFolder}/scripts/cli/api-mock-server/dist/**/*.js" + ], + "args": ["start"] // 在这里添加命令行参数 + } + ] +} diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000..83c07cb78 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,29 @@ +{ + "react-i18n-prompt.language-package-exclude-path": "packages/**/{src,lib}/locale/zh-CN/**/index.{ts,js,tsx,jsx}", + "react-i18n-prompt.language-package-path": "packages/**/{src,lib}/locale/zh-CN/**/*.{ts,js,tsx,jsx}", + "typescript.tsdk": "node_modules/typescript/lib", + "commentTranslate.multiLineMerge": true, + "commentTranslate.hover.enabled": true, + "commentTranslate.targetLanguage": "zh-CN", + "commentTranslate.browse.mode": "inplace", + "editor.formatOnSave": true, + "editor.defaultFormatter": "oxc.oxc-vscode", + "[javascript]": { + "editor.defaultFormatter": "oxc.oxc-vscode" + }, + "[javascriptreact]": { + "editor.defaultFormatter": "oxc.oxc-vscode" + }, + "[typescript]": { + "editor.defaultFormatter": "oxc.oxc-vscode" + }, + "[typescriptreact]": { + "editor.defaultFormatter": "oxc.oxc-vscode" + }, + "[json]": { + "editor.defaultFormatter": "oxc.oxc-vscode" + }, + "[jsonc]": { + "editor.defaultFormatter": "oxc.oxc-vscode" + } +} diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 000000000..8763973ce --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,23 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "type": "npm", + "script": "build", + "path": "scripts/cli/create-dms-page", + "group": "build", + "problemMatcher": [], + "label": "npm: build - packages/cli/create-dms-page", + "detail": "tsc" + }, + { + "type": "npm", + "script": "build", + "path": "scripts/cli/api-mock-server", + "group": "build", + "problemMatcher": [], + "label": "npm: build - packages/cli/api-mock-server", + "detail": "tsc" + } + ] +} diff --git a/Makefile b/Makefile index 58996cf14..69e577045 100644 --- a/Makefile +++ b/Makefile @@ -38,13 +38,13 @@ docker_clean: $(DOCKER) run -v $(MAIN_MODULE):/usr/src/app -w /usr/src/app --rm $(DOCKER_IMAGE) sh -c "git config --global --add safe.directory /usr/src/app && git clean -dfx" docker_build_ce: pull_image docker_install_node_modules - $(DOCKER) run -v $(MAIN_MODULE):/usr/src/app --user $(UID):$(GID) -w /usr/src/app --rm $(DOCKER_IMAGE) sh -c "pnpm build" + $(DOCKER) run -v $(MAIN_MODULE):/usr/src/app --user $(UID):$(GID) -w /usr/src/app --rm $(DOCKER_IMAGE) sh -c "pnpm --filter base build:release" docker_build_ee: pull_image docker_install_node_modules - $(DOCKER) run -v $(MAIN_MODULE):/usr/src/app --user $(UID):$(GID) -w /usr/src/app --rm $(DOCKER_IMAGE) sh -c "pnpm build:ee" + $(DOCKER) run -v $(MAIN_MODULE):/usr/src/app --user $(UID):$(GID) -w /usr/src/app --rm $(DOCKER_IMAGE) sh -c "pnpm --filter base build:release:ee" docker_build_demo: pull_image docker_install_node_modules - $(DOCKER) run -v $(MAIN_MODULE):/usr/src/app --user $(UID):$(GID) -w /usr/src/app --rm $(DOCKER_IMAGE) sh -c "pnpm build:demo" + $(DOCKER) run -v $(MAIN_MODULE):/usr/src/app --user $(UID):$(GID) -w /usr/src/app --rm $(DOCKER_IMAGE) sh -c "pnpm --filter base build:release:demo" docker_dms_kit_publish: docker_install_node_modules $(DOCKER) run -v $(MAIN_MODULE):/usr/src/app --user $(UID):$(GID) -w /usr/src/app --rm \ diff --git a/eslint.config.mjs b/eslint.config.mjs deleted file mode 100644 index b92397d45..000000000 --- a/eslint.config.mjs +++ /dev/null @@ -1,101 +0,0 @@ -import { defineConfig, globalIgnores } from 'eslint/config'; -import globals from 'globals'; -import tseslint from 'typescript-eslint'; -import pluginReact from 'eslint-plugin-react'; -import pluginImport from 'eslint-plugin-import'; -import pluginReactHooks from 'eslint-plugin-react-hooks'; -import pluginNode from 'eslint-plugin-node'; - -export default defineConfig([ - tseslint.configs.recommended, - { - files: ['**/scripts/**/*.{js,mjs,cjs,ts,jsx,tsx}'], - plugins: { - import: pluginImport, - node: pluginNode - }, - languageOptions: { - globals: { - ...globals.node - } - }, - rules: { - '@typescript-eslint/no-unused-vars': 'warn', - '@typescript-eslint/no-explicit-any': 'off', - '@typescript-eslint/no-require-imports': 'warn', - '@typescript-eslint/no-empty-object-type': 'off' - } - }, - { - files: ['**/packages/**/*.{js,mjs,cjs,ts,jsx,tsx}'], - ...pluginReact.configs.flat.recommended, - plugins: { - import: pluginImport, - react: pluginReact, - 'react-hooks': pluginReactHooks - }, - languageOptions: { - ...pluginReact.configs.flat.recommended.languageOptions, - globals: { - ...globals.browser - } - }, - settings: { - react: { - pragma: 'React', - version: 'detect' - } - }, - rules: { - ...pluginReactHooks.configs.recommended.rules, - 'no-shadow': 'off', - '@typescript-eslint/no-shadow': 'error', - 'no-shadow-restricted-names': 'error', - 'testing-library/render-result-naming-convention': 0, - 'prefer-const': 'warn', - '@typescript-eslint/no-non-null-asserted-optional-chain': 0, - '@typescript-eslint/no-non-null-assertion': 0, - 'no-extra-boolean-cast': 'off', - 'import/no-anonymous-default-export': [2, { allowNew: true }], - '@typescript-eslint/no-empty-interface': [ - 'error', - { - allowSingleExtends: true - } - ], - '@typescript-eslint/no-explicit-any': 'off', - 'react/display-name': 0, - 'react/prop-types': 'off', - 'react/require-default-props': 'off', - 'no-console': 'warn', - '@typescript-eslint/no-unused-vars': 'warn', - 'no-template-curly-in-string': 'warn', - '@typescript-eslint/no-empty-object-type': 'off', - '@typescript-eslint/no-empty-function': 'warn', - 'import/no-anonymous-default-export': 'warn' - } - }, - globalIgnores([ - 'jest.config.js', - 'eslint.config.mjs', - '**/packages/**/*.test.ts', - '**/packages/**/*.test.tsx', - '**/packages/shared/lib/api/*', - '**/packages/**/mockApi/*', - '**/packages/**/testUtil/*', - '**/packages/**/demo/*', - '**/packages/**/demos/*', - 'jest-setup.ts', - 'node_modules/*', - '**/packages/*/node_modules/*', - '**/scripts/jest/*.js', - '/**/node_modules/*', - 'dist', - 'packages/*/dist', - 'packages/*/scripts', - '# config', - 'vite.config.ts', - '.eslintrc.json', - 'es' - ]) -]); diff --git a/jest.config.js b/jest.config.js deleted file mode 100644 index 6515087c5..000000000 --- a/jest.config.js +++ /dev/null @@ -1,150 +0,0 @@ -process.env.TZ = 'Asia/Shanghai'; - -const path = require('path'); - -const { compilerOptions } = require('./tsconfig.json'); -const { pathsToModuleNameMapper } = require('ts-jest'); - -compilerOptions.paths['~/*'][0] = path.resolve(compilerOptions.paths['~/*'][0]); - -const sharedModuleNameMapper = { - '.+\\.(css|style|less|sass|scss|ttf|woff|woff2)$': 'identity-obj-proxy', - '@ant-design/plots': - '/packages/shared/lib/testUtil/mockModule/mockAntDesignPlots.jsx', - 'monaco-editor': - '/packages/shared/lib/testUtil/mockModule/mockEditor.jsx', - '@monaco-editor/react': - '/packages/shared/lib/testUtil/mockModule/mockEditor.jsx', - '@uiw/react-md-editor': - '/packages/shared/lib/testUtil/mockModule/mockEditor.jsx', - '@actiontech/(.*)': '/packages/$1', - '@react-sigma/core(.*)$': - '/packages/shared/lib/testUtil/mockModule/mockSigmaCore.tsx', - '@react-sigma/graph-search$': - '/packages/shared/lib/testUtil/mockModule/mockSigmaGraphSearch.tsx', - ...pathsToModuleNameMapper(compilerOptions.paths) -}; - -const sharedIgnorePatterns = ['/node_modules/', '/demo/', '/demos/']; - -// Naming conventions for condition-specific test files: -// *.ce.test.{ts,tsx} → CE project (ee=false, ce=true, sqle=true, dms=false) 不要强制匹配 ce.test, ce.[可选项].test.{ts,tsx} -// *.sqle.test.{ts,tsx} → EE project (ee=true, ce=false, sqle=true, dms=false) 同上 -// *.provision.test.{ts,tsx} → PROVISION project (ee=true, ce=false, sqle=false, provision=true, dms=false) 同上 -// *.test.{ts,tsx} → DMS project (ee=true, ce=false, sqle=true, provision=true, dms=true) [default] 同上 -// 实现:`.ce.` / `.sqle.` / `.provision.` 与 `.test.` 之间可有零段或多段 `.xxx.`(正则见下方 *_TEST_FILE_RE)。 -const CE_TEST_FILE_RE = '\\.ce(\\.[^./]+)*\\.test\\.[jt]sx?$'; -const SQLE_TEST_FILE_RE = '\\.sqle(\\.[^./]+)*\\.test\\.[jt]sx?$'; -const PROVISION_TEST_FILE_RE = '\\.provision(\\.[^./]+)*\\.test\\.[jt]sx?$'; - -const sharedProjectConfig = { - transform: { - '^.+\\.(ts|tsx|js|jsx)$': '/scripts/jest/custom-transform.js', - '^.+\\.(png|jpg|jpeg|css|json)$': '/scripts/jest/file-transform.js' - }, - transformIgnorePatterns: [ - '/dist/', - 'node_modules/(?!(?:.pnpm/)?(@react-sigma|.+/es))[^/]+?/(?!(es|node_modules)/)' - ], - moduleFileExtensions: ['ts', 'tsx', 'js', 'json', 'jsx', 'node'], - testEnvironment: 'jest-environment-jsdom', - resetMocks: true, - moduleNameMapper: sharedModuleNameMapper, - collectCoverageFrom: [ - 'packages/**/{src,lib}/{page,components,hooks,global,store,utils}/**/*.{ts,tsx}', - 'packages/**/src/App.tsx', - 'packages/shared/api/common/**', - '!packages/**/index.type.ts', - '!packages/**/index.enum.ts', - '!packages/sqle/src/page/SqlAnalyze/SqlAnalyze/ProcessListCom/**', - '!packages/shared/lib/hooks/usePrompt/index.tsx', - '!packages/sqle/src/page/Knowledge/Graph/components/**', - '!packages/**/demo/**', - '!packages/**/demos/**' - ], - setupFilesAfterEnv: ['/jest-setup.ts'] -}; - -module.exports = { - projects: [ - { - ...sharedProjectConfig, - displayName: 'dms', - globals: { - TEST_CONDITIONS: { - ee: true, - ce: false, - sqle: true, - provision: true, - dms: true - } - }, - // Default tests only: exclude CE / sqle / provision condition tests (dedicated projects) - testPathIgnorePatterns: [ - ...sharedIgnorePatterns, - CE_TEST_FILE_RE, - SQLE_TEST_FILE_RE, - PROVISION_TEST_FILE_RE - ] - }, - { - ...sharedProjectConfig, - displayName: 'sqle-ce', - globals: { - TEST_CONDITIONS: { - ee: false, - ce: true, - sqle: true, - provision: false, - dms: false - } - }, - testRegex: CE_TEST_FILE_RE, - testPathIgnorePatterns: sharedIgnorePatterns - }, - { - ...sharedProjectConfig, - displayName: 'sqle-ee', - globals: { - TEST_CONDITIONS: { - ee: true, - ce: false, - sqle: true, - provision: false, - dms: false - } - }, - testRegex: SQLE_TEST_FILE_RE, - // e.g. *.ce.sqle.test.* belongs to CE, not EE - testPathIgnorePatterns: [...sharedIgnorePatterns, CE_TEST_FILE_RE] - }, - { - ...sharedProjectConfig, - displayName: 'provision', - globals: { - TEST_CONDITIONS: { - ee: true, - ce: false, - sqle: false, - provision: true, - dms: false - } - }, - testRegex: PROVISION_TEST_FILE_RE, - testPathIgnorePatterns: [...sharedIgnorePatterns, CE_TEST_FILE_RE] - } - ], - reporters: [ - 'default', - [ - 'jest-slow-test-reporter', - { - numTests: 8, - outputDirectory: 'reports', - outputName: 'report.xml', - color: true, - warnSlowerThan: 6000 - } - ] - ] -}; diff --git a/package.json b/package.json index 567c18aeb..0c154ac6a 100644 --- a/package.json +++ b/package.json @@ -5,25 +5,26 @@ "main": "index.js", "packageManager": "pnpm@10.10.0", "engines": { + "node": "^20.19.0 || >=22.12.0", "pnpm": ">=9.7.0" }, "scripts": { + "preview": "pnpm --filter base preview", "preinstall": "npx only-allow pnpm", - "start": "concurrently \"pnpm --filter base start\" \"pnpm --filter @actiontech/dms-kit dev\"", - "start:ee": "concurrently \"pnpm --filter base start:ee\" \"pnpm --filter @actiontech/dms-kit dev\"", - "start:demo": "concurrently \"pnpm --filter base start:demo\" \"pnpm --filter @actiontech/dms-kit dev\"", - "build": "pnpm --filter @actiontech/dms-kit build && pnpm --filter base build", - "build:ee": "pnpm --filter @actiontech/dms-kit build && pnpm --filter base build:ee", - "build:demo": "pnpm --filter @actiontech/dms-kit build && pnpm --filter base build:demo", - "prettier:w": "prettier -w packages/*/src/ packages/shared/lib/ scripts/cli/*/src", - "prettier:c": "prettier -c packages/*/src/ packages/shared/lib/ scripts/cli/*/src", - "eslint": "eslint packages/*/src/ packages/shared/lib/ scripts/cli/*/src", - "stylelint": "stylelint packages/*/{src,lib}/**/{*.less,style.ts,element.ts}", - "ts-check": "tsc --noEmit", - "checker": "concurrently \"pnpm ts-check\" \"pnpm eslint\" \"pnpm stylelint\" \"pnpm prettier:c\"", - "test": "sh ./scripts/jest/run.sh", - "test:c": "sh ./scripts/jest/run-coverage.sh", - "test:ci": "sh ./scripts/jest/run-ci.sh 1 1 && node ./scripts/jest/merge-report-json.js", + "start": "turbo run start --filter=base --parallel", + "start:ee": "turbo run start:ee --filter=base --parallel", + "start:demo": "turbo run start:demo --filter=base --parallel", + "build": "turbo run build --filter=@actiontech/dms-kit && pnpm --filter base build", + "build:ee": "turbo run build --filter=@actiontech/dms-kit && pnpm --filter base build:ee", + "build:demo": "turbo run build --filter=@actiontech/dms-kit && pnpm --filter base build:demo", + "check:turbo": "turbo run check --filter='./packages/*'", + "oxfmt:w": "oxfmt --write \"packages/*/src/**/*\" \"packages/shared/lib/**/*\" \"scripts/cli/*/src/**/*\"", + "checker": "pnpm check:turbo", + "test": "pnpm --workspace-concurrency=1 --filter base --filter @actiontech/dms-kit --filter @actiontech/shared --filter sqle run test:run", + "test:u": "pnpm --workspace-concurrency=1 --filter base --filter @actiontech/dms-kit --filter @actiontech/shared --filter sqle run test:run:u", + "test:c": "pnpm --workspace-concurrency=1 --filter base --filter @actiontech/dms-kit --filter @actiontech/shared --filter sqle run test:c", + "test:ci": "turbo run test:ci --filter='./packages/*'", + "test:ci:turbo": "pnpm test:ci", "test:clean": "jest --clearCache", "icon:g": "pnpm --filter @actiontech/icons icon:g", "icon:docs:g": "pnpm --filter @actiontech/icons docs:g", @@ -34,12 +35,13 @@ "api_client:g": "cross-env npm_config_registry=http://10.186.18.19:4873 pnpx @actiontech/cli api-client -y", "api_mocks:g": "cross-env npm_config_registry=http://10.186.18.19:4873 pnpx @actiontech/cli api-mocks -y", "ai-doc": "cross-env npm_config_registry=http://10.186.18.19:4873 pnpx @actiontech/cli ai-doc", - "postinstall": "pnpm --filter @actiontech/dms-kit build", + "dms-kit:build": "turbo run build --filter=@actiontech/dms-kit", "dms-kit:publish": "pnpm --filter @actiontech/cli-dms-kit-publish build && dms-kit-publish" }, "keywords": [], "author": "", "devDependencies": { + "@actiontech/tooling-config": "workspace:^", "@actiontech/cli-create-dms-page": "workspace:^", "@actiontech/cli-dms-kit-publish": "workspace:^", "@cfaester/enzyme-adapter-react-18": "^0.7.0", @@ -60,12 +62,11 @@ "@types/testing-library__jest-dom": "^5.14.5", "@typescript-eslint/eslint-plugin": "^5.30.6", "@typescript-eslint/parser": "^5.30.6", - "@vitejs/plugin-react": "^4.2.1", + "@vitejs/plugin-react": "^6", "babel-jest": "^29.7.0", "babel-preset-react-app": "^10.0.1", "blob-polyfill": "^7.0.20220408", "comment-parser": "^1.4.1", - "concurrently": "^9.1.2", "cross-env": "^7.0.3", "enzyme": "^3.11.0", "enzyme-to-json": "^3.6.2", @@ -85,6 +86,8 @@ "less": "^4.1.3", "mockdate": "^3.0.5", "msw": "^0.45.0", + "oxfmt": "^0.45.0", + "oxlint": "^1.60.0", "postcss-less": "^6.0.0", "postcss-styled-syntax": "^0.6.4", "prettier": "^2.7.1", @@ -95,11 +98,11 @@ "stylelint-prettier": "^4.0.2", "ts-jest": "27.1.5", "tsx": "^4.20.5", - "typescript": "^5.0.2", + "turbo": "^2.9.6", + "typescript": "^6", "typescript-eslint": "^8.28.0", - "vite": "^5.2.6", + "vite": "^8", "vite-plugin-conditional-compile": "1.4.3", - "vite-plugin-eslint": "^1.8.1", "vite-plugin-html": "^3.2.2" }, "dependencies": { @@ -117,6 +120,7 @@ "@mui/styles": "^5.11.16", "@mui/system": "^5.9.1", "@reduxjs/toolkit": "^1.9.3", + "@uiw/react-md-editor": "^3.23.5", "@xyflow/react": "^12.3.0", "ahooks": "^3.7.0", "antd": "^5.7.3", @@ -140,8 +144,7 @@ "react-redux": "^8.0.5", "react-router-dom": "^6.10.0", "recoil": "^0.7.4", - "sql-formatter": "^12.2.4", - "@uiw/react-md-editor": "^3.23.5" + "sql-formatter": "^12.2.4" }, "resolutions": { "headers-polyfill": "3.0.10", @@ -149,4 +152,4 @@ "@babel/core": "^7.22.0", "@ant-design/cssinjs": "1.17.0" } -} \ No newline at end of file +} diff --git a/packages/base/jest.config.mjs b/packages/base/jest.config.mjs new file mode 100644 index 000000000..c3629d79b --- /dev/null +++ b/packages/base/jest.config.mjs @@ -0,0 +1,19 @@ +import { createJestConfig } from '@actiontech/tooling-config/jest/create-jest-config'; +import { fileURLToPath } from 'node:url'; +import path from 'node:path'; + +const packageRoot = path.dirname(fileURLToPath(import.meta.url)); + +export default createJestConfig({ + packageRoot, + enabledProjects: ['dms', 'sqle-ce', 'sqle-ee'], + collectCoverageFrom: [ + 'src/{page,components,hooks,global,store,utils}/**/*.{ts,tsx}', + 'src/App.tsx', + '!src/**/*.test.{ts,tsx}', + '!src/**/*.type.ts', + '!src/**/*.enum.ts', + '!src/**/demo/**', + '!src/**/demos/**' + ] +}); diff --git a/packages/base/package.json b/packages/base/package.json index b0aa6eb18..b5639aba1 100644 --- a/packages/base/package.json +++ b/packages/base/package.json @@ -6,17 +6,28 @@ "start": "cross-env buildType=ce,SQLE vite --port=3020", "start:ee": "cross-env buildType=ee,SQLE vite --port=3020", "start:demo": "cross-env buildType=ce,SQLE,DEMO vite --port=3020", - "build": "node ../../scripts/getGitVersion.mjs ce && tsc && cross-env NODE_OPTIONS=--max_old_space_size=102400 buildType=ce,SQLE vite build", - "build:ee": "node ../../scripts/getGitVersion.mjs ee && tsc && cross-env NODE_OPTIONS=--max_old_space_size=102400 buildType=ee,SQLE vite build", - "build:demo": "node ../../scripts/getGitVersion.mjs trial && tsc && cross-env NODE_OPTIONS=--max_old_space_size=102400 buildType=ce,SQLE,DEMO vite build", + "build": "tsc && cross-env NODE_OPTIONS=--max_old_space_size=102400 buildType=ce,SQLE vite build", + "build:ee": "tsc && cross-env NODE_OPTIONS=--max_old_space_size=102400 buildType=ee,SQLE vite build", + "build:demo": "tsc && cross-env NODE_OPTIONS=--max_old_space_size=102400 buildType=ce,SQLE,DEMO vite build", + "build:release": "node ../../scripts/getGitVersion.mjs ce && pnpm build", + "build:release:ee": "node ../../scripts/getGitVersion.mjs ee && pnpm build:ee", + "build:release:demo": "node ../../scripts/getGitVersion.mjs trial && pnpm build:demo", "preview": "vite preview", + "oxlint": "oxlint --no-error-on-unmatched-pattern src vite.config.mts", + "typecheck": "tsc --noEmit -p tsconfig.json", + "stylelint": "stylelint \"src/**/{*.less,style.ts,element.ts}\" --allow-empty-input", + "oxfmt": "oxfmt --check \"src/**/*\"", + "check": "echo \"base check\"", "test": "jest --watchAll=true", - "test:c": "jest --coverage", - "test:ci": "jest --ci --watchAll=false --coverage --color --silent --testLocationInResults" + "test:c": "jest --watchAll=false --coverage --coverageDirectory=coverage", + "test:run": "jest --watchAll=false --color", + "test:run:u": "jest -u --watchAll=false --color", + "test:ci": "jest --ci --watchAll=false --coverage --coverageDirectory=coverage --json --outputFile=coverage/report.json --color --silent --testLocationInResults" }, "dependencies": { "@actiontech/shared": "workspace:^", "@actiontech/dms-kit": "workspace:^", + "@actiontech/tooling-config": "workspace:^", "babel-preset-react-app": "^10.0.1", "sqle": "workspace:^", "@actiontech/icons": "workspace:^" diff --git a/packages/base/src/hooks/useFetchPermissionData/index.tsx b/packages/base/src/hooks/useFetchPermissionData/index.tsx index 4e6948124..614b9a569 100644 --- a/packages/base/src/hooks/useFetchPermissionData/index.tsx +++ b/packages/base/src/hooks/useFetchPermissionData/index.tsx @@ -39,10 +39,14 @@ const useFetchPermissionData = () => { ); const results = await Promise.all(requests); - return results.reduce((acc, curr, index) => { - acc[REQUIRED_MODULES[index]] = curr.data?.data?.is_supported ?? false; - return acc; - }, {} as Record); + return results.reduce( + (acc, curr, index) => { + acc[REQUIRED_MODULES[index]] = + curr.data?.data?.is_supported ?? false; + return acc; + }, + {} as Record + ); }, { onFinally: () => { diff --git a/packages/base/src/index.less b/packages/base/src/index.less index f075fdb4b..dae7e8cfb 100644 --- a/packages/base/src/index.less +++ b/packages/base/src/index.less @@ -9,16 +9,38 @@ } .font-en-num-medium { - font-family: 'PlusJakartaSans Medium', -apple-system, 'Microsoft YaHei', - BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, 'Noto Sans', - sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', + font-family: + 'PlusJakartaSans Medium', + -apple-system, + 'Microsoft YaHei', + BlinkMacSystemFont, + 'Segoe UI', + Roboto, + 'Helvetica Neue', + Arial, + 'Noto Sans', + sans-serif, + 'Apple Color Emoji', + 'Segoe UI Emoji', + 'Segoe UI Symbol', 'Noto Color Emoji'; } body * { - font-family: 'PlusJakartaSans Medium', -apple-system, 'Microsoft YaHei', - BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, 'Noto Sans', - sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', + font-family: + 'PlusJakartaSans Medium', + -apple-system, + 'Microsoft YaHei', + BlinkMacSystemFont, + 'Segoe UI', + Roboto, + 'Helvetica Neue', + Arial, + 'Noto Sans', + sans-serif, + 'Apple Color Emoji', + 'Segoe UI Emoji', + 'Segoe UI Symbol', 'Noto Color Emoji'; } diff --git a/packages/base/src/page/CloudBeaver/List/__snapshots__/index.test.tsx.snap b/packages/base/src/page/CloudBeaver/List/__snapshots__/index.test.tsx.snap index 999d78dca..bce969db9 100644 --- a/packages/base/src/page/CloudBeaver/List/__snapshots__/index.test.tsx.snap +++ b/packages/base/src/page/CloudBeaver/List/__snapshots__/index.test.tsx.snap @@ -844,7 +844,7 @@ exports[`test base/CloudBeaver/List filter data with search 1`] = ` class="ant-table-cell ellipsis-column-width" >
查看差异
查看SQL执行解释
diff --git a/packages/base/src/page/Nav/SideMenu/MenuList/menus/index.type.ts b/packages/base/src/page/Nav/SideMenu/MenuList/menus/index.type.ts index 31d04c4e5..1d8632311 100644 --- a/packages/base/src/page/Nav/SideMenu/MenuList/menus/index.type.ts +++ b/packages/base/src/page/Nav/SideMenu/MenuList/menus/index.type.ts @@ -24,8 +24,10 @@ export interface MenuItemI18nConfig { permission?: PermissionsConstantType; } -export interface MenuItemTranslatedConfig - extends Omit { +export interface MenuItemTranslatedConfig extends Omit< + MenuItemI18nConfig, + 'label' +> { label: ReactNode; } @@ -36,8 +38,10 @@ interface MenuTreeGroupI18n { permission?: PermissionsConstantType; } -interface MenuTreeGroupTranslated - extends Omit { +interface MenuTreeGroupTranslated extends Omit< + MenuTreeGroupI18n, + 'groupLabelKey' +> { label: string; } diff --git a/packages/base/src/page/System/LoginConnection/LoginBasicSetting/index.tsx b/packages/base/src/page/System/LoginConnection/LoginBasicSetting/index.tsx index 4f541820b..c0d30ceb6 100644 --- a/packages/base/src/page/System/LoginConnection/LoginBasicSetting/index.tsx +++ b/packages/base/src/page/System/LoginConnection/LoginBasicSetting/index.tsx @@ -55,8 +55,8 @@ const LoginBasicSetting: React.FC = () => { const confirmTitle = isPasswordLoginDisabled ? t('dmsSystem.loginBasic.confirmDisable') : isLDAPEnabled - ? t('dmsSystem.loginBasic.confirmEnableWithLDAP') - : t('dmsSystem.loginBasic.confirmEnable'); + ? t('dmsSystem.loginBasic.confirmEnableWithLDAP') + : t('dmsSystem.loginBasic.confirmEnable'); return ( { }; } else { const { key, path } = route; - const content = key === '*' ? `${JSON.stringify(route)}` : key ?? path; + const content = key === '*' ? `${JSON.stringify(route)}` : (key ?? path); return { key, path: path ?? '', diff --git a/packages/base/tsconfig.json b/packages/base/tsconfig.json index 740aafa02..cc3ae8dea 100644 --- a/packages/base/tsconfig.json +++ b/packages/base/tsconfig.json @@ -3,7 +3,10 @@ "include": ["src"], "compilerOptions": { "paths": { - "~/*": ["./src/*"] + "~/*": ["./src/*"], + "@actiontech/dms-kit": ["../dms-kit/src/index.ts"], + "@actiontech/dms-kit/es/*": ["../dms-kit/src/*"], + "@actiontech/dms-kit/*": ["../dms-kit/src/*"] }, "skipLibCheck": true } diff --git a/packages/base/vite.config.mts b/packages/base/vite.config.mts index d625f0809..7f1ef1754 100644 --- a/packages/base/vite.config.mts +++ b/packages/base/vite.config.mts @@ -1,6 +1,5 @@ import { defineConfig } from 'vite'; import react from '@vitejs/plugin-react'; -import eslint from 'vite-plugin-eslint'; import vitePluginConditionalCompile from 'vite-plugin-conditional-compile'; import { createHtmlPlugin } from 'vite-plugin-html'; import * as path from 'path'; @@ -50,14 +49,6 @@ export default defineConfig(() => { demo: isDemo } }), - eslint({ - exclude: [ - '**/node_modules/**', - '**/packages/**/lib/**', - '**/packages/**/es/**', - '!**/packages/**/lib/api/common/**' - ] - }), react(), createHtmlPlugin({ inject: { @@ -68,9 +59,20 @@ export default defineConfig(() => { }) ], resolve: { - alias: { - '~': path.resolve(__dirname, '../provision/src') - } + alias: [ + { + find: /^@actiontech\/dms-kit\/es\/(.*)$/, + replacement: path.resolve(__dirname, '../dms-kit/src/$1') + }, + { + find: '@actiontech/dms-kit', + replacement: path.resolve(__dirname, '../dms-kit/src') + }, + { + find: '~', + replacement: path.resolve(__dirname, '../provision/src') + } + ] }, css: { preprocessorOptions: { @@ -81,6 +83,7 @@ export default defineConfig(() => { } }, build: { + target: 'chrome80', rollupOptions: { // resolve css in js 'use client' warn onwarn(warning, warn) { @@ -91,13 +94,33 @@ export default defineConfig(() => { }, output: { minifyInternalExports: true, - manualChunks: { - 'antd.module': ['antd'], - 'react.module': ['react'], - 'lodash.module': ['lodash'], - 'antd.icon.module': ['@ant-design/icons'], - 'antd.plots': ['@ant-design/plots'], - 'actiontech.shared': ['@actiontech/shared'] + codeSplitting: { + groups: [ + { + test: /[\\/]node_modules[\\/]antd[\\/]/, + name: 'antd.module' + }, + { + test: /[\\/]node_modules[\\/]react[\\/]/, + name: 'react.module' + }, + { + test: /[\\/]node_modules[\\/]lodash[\\/]/, + name: 'lodash.module' + }, + { + test: /[\\/]node_modules[\\/]@ant-design[\\/]icons[\\/]/, + name: 'antd.icon.module' + }, + { + test: /[\\/]node_modules[\\/]@ant-design[\\/]plots[\\/]/, + name: 'antd.plots' + }, + { + test: /[\\/]node_modules[\\/]@actiontech[\\/]shared[\\/]/, + name: 'actiontech.shared' + } + ] } } } diff --git a/packages/dms-kit/jest.config.mjs b/packages/dms-kit/jest.config.mjs new file mode 100644 index 000000000..b5af9812e --- /dev/null +++ b/packages/dms-kit/jest.config.mjs @@ -0,0 +1,18 @@ +import { createJestConfig } from '@actiontech/tooling-config/jest/create-jest-config'; +import { fileURLToPath } from 'node:url'; +import path from 'node:path'; + +const packageRoot = path.dirname(fileURLToPath(import.meta.url)); + +export default createJestConfig({ + packageRoot, + enabledProjects: ['dms'], + collectCoverageFrom: [ + 'src/**/*.{ts,tsx}', + '!src/**/*.test.{ts,tsx}', + '!src/**/*.type.ts', + '!src/**/*.enum.ts', + '!src/**/demo/**', + '!src/**/demos/**' + ] +}); diff --git a/packages/dms-kit/package.json b/packages/dms-kit/package.json index 311f8f1eb..e0c90669f 100644 --- a/packages/dms-kit/package.json +++ b/packages/dms-kit/package.json @@ -16,12 +16,22 @@ "scripts": { "build": "father build", "dev": "father dev --incremental", + "start": "pnpm dev", + "start:ee": "pnpm dev", + "start:demo": "pnpm dev", "docs:dev": "dumi dev", "docs:build": "dumi build", "docs:preview": "dumi preview", + "oxlint": "oxlint --no-error-on-unmatched-pattern src", + "typecheck": "tsc --noEmit -p tsconfig.json", + "stylelint": "stylelint \"src/**/{*.less,style.ts,element.ts}\" --allow-empty-input", + "oxfmt": "oxfmt --check \"src/**/*\"", + "check": "echo \"dms-kit check\"", "test": "jest --watchAll=true", - "test:c": "jest --watchAll=false --coverage", - "test:ci": "jest --ci --watchAll=false --coverage --color --silent --testLocationInResults" + "test:c": "jest --watchAll=false --coverage --coverageDirectory=coverage", + "test:run": "jest --watchAll=false --color", + "test:run:u": "jest -u --watchAll=false --color", + "test:ci": "jest --ci --watchAll=false --coverage --coverageDirectory=coverage --json --outputFile=coverage/report.json --color --silent --testLocationInResults" }, "dependencies": { "ahooks": "^3.7.0", @@ -54,8 +64,9 @@ "typescript": "^5.0.2" }, "devDependencies": { + "@actiontech/tooling-config": "workspace:^", "father": "^4.5.2", "dumi": "^2.3.8", "babel-plugin-import": "^1.13.8" } -} \ No newline at end of file +} diff --git a/packages/dms-kit/src/components/ActiontechTable/demo/advanced.tsx b/packages/dms-kit/src/components/ActiontechTable/demo/advanced.tsx index 5383be4f0..dbd618423 100644 --- a/packages/dms-kit/src/components/ActiontechTable/demo/advanced.tsx +++ b/packages/dms-kit/src/components/ActiontechTable/demo/advanced.tsx @@ -260,7 +260,7 @@ const AdvancedDemo: React.FC = () => { return ( <> - {/* + {/* 使用独立的 TableToolbar 组件 注意:在 demo 环境中,组件外层有容器包裹,需要手动设置 width: '100%' 在实际项目中使用时,如果也遇到宽度不足的问题,请添加相同的 style @@ -295,7 +295,7 @@ const AdvancedDemo: React.FC = () => { style={{ width: '100%' }} /> - {/* + {/* 使用独立的 TableFilterContainer 组件 同样需要设置 width: '100%' 确保筛选容器占满整行 */} diff --git a/packages/dms-kit/src/components/ActiontechTable/demo/filter.tsx b/packages/dms-kit/src/components/ActiontechTable/demo/filter.tsx index dc22ec01b..e11a0a375 100644 --- a/packages/dms-kit/src/components/ActiontechTable/demo/filter.tsx +++ b/packages/dms-kit/src/components/ActiontechTable/demo/filter.tsx @@ -201,7 +201,7 @@ const FilterDemo: React.FC = () => { return ( <> - {/* + {/* 使用独立的 TableToolbar 组件 注意:在 demo 环境中,组件外层有容器包裹,需要手动设置 width: '100%' 在实际项目中使用时,如果也遇到宽度不足的问题,请添加相同的 style @@ -216,7 +216,7 @@ const FilterDemo: React.FC = () => { style={{ width: '100%' }} /> - {/* + {/* 使用独立的 TableFilterContainer 组件 同样需要设置 width: '100%' 确保筛选容器占满整行 */} diff --git a/packages/dms-kit/src/components/ActiontechTable/demo/setting.tsx b/packages/dms-kit/src/components/ActiontechTable/demo/setting.tsx index 35557f70b..9c8c3a915 100644 --- a/packages/dms-kit/src/components/ActiontechTable/demo/setting.tsx +++ b/packages/dms-kit/src/components/ActiontechTable/demo/setting.tsx @@ -158,7 +158,7 @@ const SettingDemo: React.FC = () => { return ( <> - {/* + {/* 使用独立的 TableToolbar 组件 注意:在 demo 环境中,组件外层有容器包裹,需要手动设置 width: '100%' 在实际项目中使用时,如果也遇到宽度不足的问题,请添加相同的 style diff --git a/packages/dms-kit/src/components/ActiontechTable/demo/toolbar.tsx b/packages/dms-kit/src/components/ActiontechTable/demo/toolbar.tsx index 138d2c426..5c2cb814c 100644 --- a/packages/dms-kit/src/components/ActiontechTable/demo/toolbar.tsx +++ b/packages/dms-kit/src/components/ActiontechTable/demo/toolbar.tsx @@ -123,7 +123,7 @@ const ToolbarDemo: React.FC = () => { return ( <> - {/* + {/* 使用独立的 TableToolbar 组件 注意:在 demo 环境中,组件外层有容器包裹,需要手动设置 width: '100%' 在实际项目中使用时,如果也遇到宽度不足的问题,请添加相同的 style diff --git a/packages/dms-kit/src/components/ActiontechTable/hooks/useTableAction.tsx b/packages/dms-kit/src/components/ActiontechTable/hooks/useTableAction.tsx index 64450164d..f2634343f 100644 --- a/packages/dms-kit/src/components/ActiontechTable/hooks/useTableAction.tsx +++ b/packages/dms-kit/src/components/ActiontechTable/hooks/useTableAction.tsx @@ -190,9 +190,9 @@ const useTableAction = () => { className: ACTIONTECH_TABLE_OPERATOR_COLUMN_CLS, title: Array.isArray(actions) ? () => t('common.operate') - : actions.title ?? (() => t('common.operate')), - fixed: Array.isArray(actions) ? 'right' : actions.fixed ?? 'right', - width: Array.isArray(actions) ? maxWidth : actions.width ?? maxWidth, + : (actions.title ?? (() => t('common.operate'))), + fixed: Array.isArray(actions) ? 'right' : (actions.fixed ?? 'right'), + width: Array.isArray(actions) ? maxWidth : (actions.width ?? maxWidth), render: (_: unknown, record: T) => renderContent(record) }; }, diff --git a/packages/dms-kit/src/components/ActiontechTable/hooks/useTableFilterContainer.tsx b/packages/dms-kit/src/components/ActiontechTable/hooks/useTableFilterContainer.tsx index 67271eb69..ef6e75817 100644 --- a/packages/dms-kit/src/components/ActiontechTable/hooks/useTableFilterContainer.tsx +++ b/packages/dms-kit/src/components/ActiontechTable/hooks/useTableFilterContainer.tsx @@ -114,7 +114,7 @@ const useTableFilterContainer = < const updateAllSelectedFilterItem = useCallback( (checked: boolean) => { - updateTableFilterInfo(() => ({} as F)); + updateTableFilterInfo(() => ({}) as F); setFilterButtonMeta((meta) => { meta.forEach((value, key) => { meta.set(key, { ...value, checked }); diff --git a/packages/dms-kit/src/components/ActiontechTable/hooks/useTableSettings.tsx b/packages/dms-kit/src/components/ActiontechTable/hooks/useTableSettings.tsx index 82aabcb08..07c2c222b 100644 --- a/packages/dms-kit/src/components/ActiontechTable/hooks/useTableSettings.tsx +++ b/packages/dms-kit/src/components/ActiontechTable/hooks/useTableSettings.tsx @@ -80,17 +80,20 @@ const useTableSettings = < const columnsInfo: CatchTableColumnValueType = defaultColumns.reduce< CatchTableColumnValueType - >((acc, cur, index) => { - return { - ...acc, - [cur.dataIndex]: { - order: index + 1, - show: cur.show ?? true, - fixed: cur?.fixed, - title: getColumnsLabel(cur.title) - } - }; - }, {} as CatchTableColumnValueType); + >( + (acc, cur, index) => { + return { + ...acc, + [cur.dataIndex]: { + order: index + 1, + show: cur.show ?? true, + fixed: cur?.fixed, + title: getColumnsLabel(cur.title) + } + }; + }, + {} as CatchTableColumnValueType + ); const data: CatchTableColumnsType = localData ? { ...localData, [username]: columnsInfo } diff --git a/packages/dms-kit/src/components/ActiontechTable/index.type.ts b/packages/dms-kit/src/components/ActiontechTable/index.type.ts index 8caf77730..e73d055e7 100644 --- a/packages/dms-kit/src/components/ActiontechTable/index.type.ts +++ b/packages/dms-kit/src/components/ActiontechTable/index.type.ts @@ -117,12 +117,12 @@ export type TableFilterContainerProps< export type FilterCustomProps = C extends 'select' ? CustomSelectProps : C extends 'date-range' - ? RangePickerProps - : C extends 'input' - ? CustomInputProps - : C extends 'search-input' - ? ICustomSearchInputProps - : never; + ? RangePickerProps + : C extends 'input' + ? CustomInputProps + : C extends 'search-input' + ? ICustomSearchInputProps + : never; /** * 表格筛选信息中 value 的数据格式 diff --git a/packages/dms-kit/src/components/BasicTable/BasicTable.types.ts b/packages/dms-kit/src/components/BasicTable/BasicTable.types.ts index c74c1a63d..95472f068 100644 --- a/packages/dms-kit/src/components/BasicTable/BasicTable.types.ts +++ b/packages/dms-kit/src/components/BasicTable/BasicTable.types.ts @@ -1,7 +1,8 @@ import { TableProps } from 'antd'; -export interface BasicTableProps> - extends TableProps { +export interface BasicTableProps< + T = Record +> extends TableProps { errorMessage?: string; isPaginationFixed?: boolean; } diff --git a/packages/dms-kit/src/components/CustomSegmentedFilter/CustomSegmentedFilter.tsx b/packages/dms-kit/src/components/CustomSegmentedFilter/CustomSegmentedFilter.tsx index b135df8fd..d45d18bb3 100644 --- a/packages/dms-kit/src/components/CustomSegmentedFilter/CustomSegmentedFilter.tsx +++ b/packages/dms-kit/src/components/CustomSegmentedFilter/CustomSegmentedFilter.tsx @@ -50,7 +50,7 @@ const CustomSegmentedFilter = < return { label: typeof item.label === 'string' - ? labelDictionary[item.label] ?? item.label + ? (labelDictionary[item.label] ?? item.label) : item.label, value: item.value as V }; diff --git a/packages/dms-kit/src/components/CustomSelect/CustomSelect.tsx b/packages/dms-kit/src/components/CustomSelect/CustomSelect.tsx index a3899fe78..73892ad84 100644 --- a/packages/dms-kit/src/components/CustomSelect/CustomSelect.tsx +++ b/packages/dms-kit/src/components/CustomSelect/CustomSelect.tsx @@ -40,7 +40,7 @@ const CustomSelect: React.FC = ({ const showLabel: string = typeof option.label === 'string' ? option.label - : option.text ?? option.value; + : (option.text ?? option.value); if ( !showLabel.toLowerCase().includes(innerSearchValue?.toLowerCase() ?? '') diff --git a/packages/dms-kit/src/components/SegmentedTabs/demo/animation.tsx b/packages/dms-kit/src/components/SegmentedTabs/demo/animation.tsx index 0dbec4ec9..2d0dbb50a 100644 --- a/packages/dms-kit/src/components/SegmentedTabs/demo/animation.tsx +++ b/packages/dms-kit/src/components/SegmentedTabs/demo/animation.tsx @@ -275,10 +275,10 @@ const AnimationDemo: React.FC = () => { ? activeKey1 === 'fade' ? ' 淡入效果 (fadeIn 0.3s)' : activeKey1 === 'slide' - ? ' 滑入效果 (slideIn 0.3s)' - : activeKey1 === 'bounce' - ? ' 弹跳效果 (bounceIn 0.5s)' - : ' 无动画' + ? ' 滑入效果 (slideIn 0.3s)' + : activeKey1 === 'bounce' + ? ' 弹跳效果 (bounceIn 0.5s)' + : ' 无动画' : ' 已禁用'}

diff --git a/packages/dms-kit/src/components/SystemConfigurationHub/demo/readOnlyMode.tsx b/packages/dms-kit/src/components/SystemConfigurationHub/demo/readOnlyMode.tsx index 63cc87bc2..b2fb0afb3 100644 --- a/packages/dms-kit/src/components/SystemConfigurationHub/demo/readOnlyMode.tsx +++ b/packages/dms-kit/src/components/SystemConfigurationHub/demo/readOnlyMode.tsx @@ -50,8 +50,8 @@ const ReadOnlyModeDemo = () => { {val === 'production' ? '生产环境' : val === 'staging' - ? '预发环境' - : '开发环境'} + ? '预发环境' + : '开发环境'} ); } diff --git a/packages/dms-kit/src/components/ToggleTokens/ToggleTokens.tsx b/packages/dms-kit/src/components/ToggleTokens/ToggleTokens.tsx index e6c602e5f..462db2683 100644 --- a/packages/dms-kit/src/components/ToggleTokens/ToggleTokens.tsx +++ b/packages/dms-kit/src/components/ToggleTokens/ToggleTokens.tsx @@ -76,7 +76,7 @@ const ToggleTokens = ( return { label: typeof item.label === 'string' - ? labelDictionary[item.label] ?? item.label + ? (labelDictionary[item.label] ?? item.label) : item.label, value: item.value, className: item.className, diff --git a/packages/dms-kit/src/providers/index.tsx b/packages/dms-kit/src/providers/index.tsx index bc6fec420..58d415003 100644 --- a/packages/dms-kit/src/providers/index.tsx +++ b/packages/dms-kit/src/providers/index.tsx @@ -3,8 +3,7 @@ import { LocaleProvider, LocaleProviderProps } from './locale'; import { SupportTheme } from '../enum'; export interface ConfigProviderProps - extends ThemeProviderProps, - LocaleProviderProps {} + extends ThemeProviderProps, LocaleProviderProps {} export const ConfigProvider: React.FC = ({ children, diff --git a/packages/dms-kit/src/styleWrapper/element.ts b/packages/dms-kit/src/styleWrapper/element.ts index 9861ce6b1..d3c624f3b 100644 --- a/packages/dms-kit/src/styleWrapper/element.ts +++ b/packages/dms-kit/src/styleWrapper/element.ts @@ -258,8 +258,8 @@ export const ToggleButtonStyleWrapper = styled('div')<{ !!active ? theme.sharedTheme.uiToken.colorPrimary : disabled - ? theme.sharedTheme.basic.colorFontGrayByWhite - : theme.sharedTheme.uiToken.colorTextSecondary}; + ? theme.sharedTheme.basic.colorFontGrayByWhite + : theme.sharedTheme.uiToken.colorTextSecondary}; background: ${({ active, theme }) => !!active ? theme.sharedTheme.basic.colorPrimaryBgActive @@ -277,7 +277,9 @@ export const ToggleButtonStyleWrapper = styled('div')<{ ); transform: scale(0); opacity: 0; - transition: transform 0.3s ease-out, opacity 0.3s ease-out; + transition: + transform 0.3s ease-out, + opacity 0.3s ease-out; } &:active::before { diff --git a/packages/dms-kit/src/types/ambient-modules.d.ts b/packages/dms-kit/src/types/ambient-modules.d.ts new file mode 100644 index 000000000..35306c6fc --- /dev/null +++ b/packages/dms-kit/src/types/ambient-modules.d.ts @@ -0,0 +1 @@ +declare module '*.css'; diff --git a/packages/dms-kit/src/utils/HighlightCode.ts b/packages/dms-kit/src/utils/HighlightCode.ts index 60e822f67..a3d4b763e 100644 --- a/packages/dms-kit/src/utils/HighlightCode.ts +++ b/packages/dms-kit/src/utils/HighlightCode.ts @@ -1,5 +1,7 @@ import hljs from 'highlight.js/lib/core'; import sqlCore from 'highlight.js/lib/languages/sql'; + +// oxlint-disable-next-line import/no-unassigned-import import 'highlight.js/styles/github.css'; class HighlightCode { @@ -13,5 +15,5 @@ class HighlightCode { } } -// eslint-disable-next-line import/no-anonymous-default-export +// oxlint-disable-next-line import/no-anonymous-default-export export default new HighlightCode(); diff --git a/packages/icons/package.json b/packages/icons/package.json index 48cf230af..a3381b9a4 100644 --- a/packages/icons/package.json +++ b/packages/icons/package.json @@ -9,6 +9,11 @@ "docs:build": "dumi build", "docs:preview": "dumi preview", "build": "father build", + "oxlint": "oxlint --no-error-on-unmatched-pattern src", + "typecheck": "tsc --noEmit -p tsconfig.json", + "stylelint": "stylelint \"src/**/{*.less,style.ts,element.ts}\" --allow-empty-input", + "oxfmt": "oxfmt --check \"src/**/*\"", + "check": "echo \"icons check\"", "icon:g": "svgr --template template/template.cjs -d src svg/ ", "docs:g": "node scripts/generate.js" }, @@ -21,4 +26,4 @@ "dumi": "^2.3.8", "father": "^4.1.0" } -} \ No newline at end of file +} diff --git a/packages/icons/tsconfig.json b/packages/icons/tsconfig.json index 6cec366d2..574fae7d5 100644 --- a/packages/icons/tsconfig.json +++ b/packages/icons/tsconfig.json @@ -6,11 +6,10 @@ "esModuleInterop": true, "resolveJsonModule": true, "jsx": "react-jsx", - "baseUrl": "./", "paths": { - "@@/*": [".dumi/tmp/*"], - "@actiontech/icons": ["src"], - "@actiontech/icons/*": ["src/*", "*"] + "@@/*": ["./.dumi/tmp/*"], + "@actiontech/icons": ["./src"], + "@actiontech/icons/*": ["./src/*", "./*"] } }, "include": [".dumirc.ts", "src/**/*"] diff --git a/packages/shared/jest.config.mjs b/packages/shared/jest.config.mjs new file mode 100644 index 000000000..ed7c7a116 --- /dev/null +++ b/packages/shared/jest.config.mjs @@ -0,0 +1,26 @@ +import { createJestConfig } from '@actiontech/tooling-config/jest/create-jest-config'; +import { fileURLToPath } from 'node:url'; +import path from 'node:path'; + +const packageRoot = path.dirname(fileURLToPath(import.meta.url)); + +export default createJestConfig({ + packageRoot, + enabledProjects: ['dms', 'sqle-ce'], + collectCoverageFrom: [ + 'src/**/*.{ts,tsx}', + 'lib/**/*.{ts,tsx}', + 'api/common/**/*.{ts,tsx}', + '!src/**/*.test.{ts,tsx}', + '!lib/**/*.test.{ts,tsx}', + '!src/**/*.type.ts', + '!src/**/*.enum.ts', + '!lib/**/*.type.ts', + '!lib/**/*.enum.ts', + '!lib/hooks/usePrompt/index.tsx', + '!src/**/demo/**', + '!src/**/demos/**', + '!lib/**/demo/**', + '!lib/**/demos/**' + ] +}); diff --git a/packages/shared/lib/api/base/service/CBOperationLogs/index.d.ts b/packages/shared/lib/api/base/service/CBOperationLogs/index.d.ts index dc5e26134..841e9925d 100644 --- a/packages/shared/lib/api/base/service/CBOperationLogs/index.d.ts +++ b/packages/shared/lib/api/base/service/CBOperationLogs/index.d.ts @@ -45,5 +45,4 @@ export interface IGetCBOperationLogTipsParams { project_uid: string; } -export interface IGetCBOperationLogTipsReturn - extends IGetCBOperationLogTipsReply {} +export interface IGetCBOperationLogTipsReturn extends IGetCBOperationLogTipsReply {} diff --git a/packages/shared/lib/api/base/service/CloudBeaver/index.d.ts b/packages/shared/lib/api/base/service/CloudBeaver/index.d.ts index 553012409..678488752 100644 --- a/packages/shared/lib/api/base/service/CloudBeaver/index.d.ts +++ b/packages/shared/lib/api/base/service/CloudBeaver/index.d.ts @@ -1,4 +1,3 @@ import { IGetSQLQueryConfigurationReply } from '../common.d'; -export interface IGetSQLQueryConfigurationReturn - extends IGetSQLQueryConfigurationReply {} +export interface IGetSQLQueryConfigurationReturn extends IGetSQLQueryConfigurationReply {} diff --git a/packages/shared/lib/api/base/service/Configuration/index.d.ts b/packages/shared/lib/api/base/service/Configuration/index.d.ts index 51c2a35af..5f8d34bf0 100644 --- a/packages/shared/lib/api/base/service/Configuration/index.d.ts +++ b/packages/shared/lib/api/base/service/Configuration/index.d.ts @@ -32,25 +32,19 @@ import { ITestWeChatConfigurationReply } from '../common.d'; -export interface IGetFeishuConfigurationReturn - extends IGetFeishuConfigurationReply {} +export interface IGetFeishuConfigurationReturn extends IGetFeishuConfigurationReply {} -export interface IUpdateFeishuConfigurationParams - extends IUpdateFeishuConfigurationReq {} +export interface IUpdateFeishuConfigurationParams extends IUpdateFeishuConfigurationReq {} export interface IUpdateFeishuConfigurationReturn extends IGenericResp {} -export interface ITestFeishuConfigurationParams - extends ITestFeishuConfigurationReq {} +export interface ITestFeishuConfigurationParams extends ITestFeishuConfigurationReq {} -export interface ITestFeishuConfigurationReturn - extends ITestFeishuConfigurationReply {} +export interface ITestFeishuConfigurationReturn extends ITestFeishuConfigurationReply {} -export interface IGetLDAPConfigurationReturn - extends IGetLDAPConfigurationResDataReply {} +export interface IGetLDAPConfigurationReturn extends IGetLDAPConfigurationResDataReply {} -export interface IUpdateLDAPConfigurationParams - extends IUpdateLDAPConfigurationReq {} +export interface IUpdateLDAPConfigurationParams extends IUpdateLDAPConfigurationReq {} export interface IUpdateLDAPConfigurationReturn extends IGenericResp {} @@ -70,75 +64,58 @@ export interface ICheckLicenseReturn extends ICheckLicenseReply {} export interface IGetLicenseUsageReturn extends IGetLicenseUsageReply {} -export interface IUpdateLoginConfigurationParams - extends IUpdateLoginConfigurationReq {} +export interface IUpdateLoginConfigurationParams extends IUpdateLoginConfigurationReq {} export interface IUpdateLoginConfigurationReturn extends IGenericResp {} export interface IGetLoginTipsReturn extends IGetLoginTipsReply {} -export interface IGetOauth2ConfigurationReturn - extends IGetOauth2ConfigurationResDataReply {} +export interface IGetOauth2ConfigurationReturn extends IGetOauth2ConfigurationResDataReply {} -export interface IUpdateOauth2ConfigurationParams - extends IOauth2ConfigurationReq {} +export interface IUpdateOauth2ConfigurationParams extends IOauth2ConfigurationReq {} export interface IUpdateOauth2ConfigurationReturn extends IGenericResp {} export interface IGetSmsConfigurationReturn extends IGetSmsConfigurationReply {} -export interface IUpdateSmsConfigurationParams - extends IUpdateSmsConfigurationReq {} +export interface IUpdateSmsConfigurationParams extends IUpdateSmsConfigurationReq {} export interface IUpdateSmsConfigurationReturn extends IGenericResp {} export interface ITestSmsConfigurationParams extends ITestSmsConfigurationReq {} -export interface ITestSmsConfigurationReturn - extends ITestSmsConfigurationReply {} +export interface ITestSmsConfigurationReturn extends ITestSmsConfigurationReply {} -export interface IGetSMTPConfigurationReturn - extends IGetSMTPConfigurationReply {} +export interface IGetSMTPConfigurationReturn extends IGetSMTPConfigurationReply {} -export interface IUpdateSMTPConfigurationParams - extends IUpdateSMTPConfigurationReq {} +export interface IUpdateSMTPConfigurationParams extends IUpdateSMTPConfigurationReq {} export interface IUpdateSMTPConfigurationReturn extends IGenericResp {} -export interface ITestSMTPConfigurationParams - extends ITestSMTPConfigurationReq {} +export interface ITestSMTPConfigurationParams extends ITestSMTPConfigurationReq {} -export interface ITestSMTPConfigurationReturn - extends ITestSMTPConfigurationReply {} +export interface ITestSMTPConfigurationReturn extends ITestSMTPConfigurationReply {} export interface IGetSystemVariablesReturn extends IGetSystemVariablesReply {} -export interface IUpdateSystemVariablesParams - extends IUpdateSystemVariablesReqV1 {} +export interface IUpdateSystemVariablesParams extends IUpdateSystemVariablesReqV1 {} export interface IUpdateSystemVariablesReturn extends IGenericResp {} -export interface IGetWebHookConfigurationReturn - extends IGetWebHookConfigurationReply {} +export interface IGetWebHookConfigurationReturn extends IGetWebHookConfigurationReply {} -export interface IUpdateWebHookConfigurationParams - extends IUpdateWebHookConfigurationReq {} +export interface IUpdateWebHookConfigurationParams extends IUpdateWebHookConfigurationReq {} export interface IUpdateWebHookConfigurationReturn extends IGenericResp {} -export interface ITestWebHookConfigurationReturn - extends ITestWebHookConfigurationReply {} +export interface ITestWebHookConfigurationReturn extends ITestWebHookConfigurationReply {} -export interface IGetWeChatConfigurationReturn - extends IGetWeChatConfigurationReply {} +export interface IGetWeChatConfigurationReturn extends IGetWeChatConfigurationReply {} -export interface IUpdateWeChatConfigurationParams - extends IUpdateWeChatConfigurationReq {} +export interface IUpdateWeChatConfigurationParams extends IUpdateWeChatConfigurationReq {} export interface IUpdateWeChatConfigurationReturn extends IGenericResp {} -export interface ITestWeChatConfigurationParams - extends ITestWeChatConfigurationReq {} +export interface ITestWeChatConfigurationParams extends ITestWeChatConfigurationReq {} -export interface ITestWeChatConfigurationReturn - extends ITestWeChatConfigurationReply {} +export interface ITestWeChatConfigurationReturn extends ITestWeChatConfigurationReply {} diff --git a/packages/shared/lib/api/base/service/DBService/index.d.ts b/packages/shared/lib/api/base/service/DBService/index.d.ts index 7383c918c..1a1a7bef1 100644 --- a/packages/shared/lib/api/base/service/DBService/index.d.ts +++ b/packages/shared/lib/api/base/service/DBService/index.d.ts @@ -63,18 +63,15 @@ export interface IListGlobalDBServicesParams { fuzzy_keyword?: string; } -export interface IListGlobalDBServicesReturn - extends IListGlobalDBServicesReply {} +export interface IListGlobalDBServicesReturn extends IListGlobalDBServicesReply {} -export interface IListDBServiceDriverOptionReturn - extends IListDBServiceDriverOptionReply {} +export interface IListDBServiceDriverOptionReturn extends IListDBServiceDriverOptionReply {} export interface IListGlobalDBServicesTipsParams { function_support?: ListGlobalDBServicesTipsFunctionSupportEnum; } -export interface IListGlobalDBServicesTipsReturn - extends IListGlobalDBServicesTipsReply {} +export interface IListGlobalDBServicesTipsReturn extends IListGlobalDBServicesTipsReply {} export interface IListDBServicesParams { page_size: number; @@ -114,24 +111,19 @@ export interface IAddDBServiceParams extends IAddDBServiceReq { export interface IAddDBServiceReturn extends IAddDBServiceReply {} -export interface ICheckDBServiceIsConnectableParams - extends ICheckDBServiceIsConnectableReq { +export interface ICheckDBServiceIsConnectableParams extends ICheckDBServiceIsConnectableReq { project_uid: string; } -export interface ICheckDBServiceIsConnectableReturn - extends ICheckDBServiceIsConnectableReply {} +export interface ICheckDBServiceIsConnectableReturn extends ICheckDBServiceIsConnectableReply {} -export interface ICheckProjectDBServicesConnectionsParams - extends ICheckDBServicesIsConnectableReq { +export interface ICheckProjectDBServicesConnectionsParams extends ICheckDBServicesIsConnectableReq { project_uid: string; } -export interface ICheckProjectDBServicesConnectionsReturn - extends ICheckDBServicesIsConnectableReply {} +export interface ICheckProjectDBServicesConnectionsReturn extends ICheckDBServicesIsConnectableReply {} -export interface IImportDBServicesOfOneProjectParams - extends IImportDBServicesOfOneProjectReq { +export interface IImportDBServicesOfOneProjectParams extends IImportDBServicesOfOneProjectReq { project_uid: string; } @@ -175,8 +167,7 @@ export interface ICheckDBServiceIsConnectableByIdParams { db_service_uid: string; } -export interface ICheckDBServiceIsConnectableByIdReturn - extends ICheckDBServiceIsConnectableReply {} +export interface ICheckDBServiceIsConnectableByIdReturn extends ICheckDBServiceIsConnectableReply {} export interface IListGlobalDBServicesV2Params { page_size: number; @@ -206,8 +197,7 @@ export interface IListGlobalDBServicesV2Params { fuzzy_keyword?: string; } -export interface IListGlobalDBServicesV2Return - extends IListGlobalDBServicesReplyV2 {} +export interface IListGlobalDBServicesV2Return extends IListGlobalDBServicesReplyV2 {} export interface IListDBServicesV2Params { page_size: number; @@ -247,8 +237,7 @@ export interface IAddDBServiceV2Params extends IAddDBServiceReqV2 { export interface IAddDBServiceV2Return extends IAddDBServiceReply {} -export interface IImportDBServicesOfOneProjectV2Params - extends IImportDBServicesOfOneProjectReqV2 { +export interface IImportDBServicesOfOneProjectV2Params extends IImportDBServicesOfOneProjectReqV2 { project_uid: string; } diff --git a/packages/shared/lib/api/base/service/DBServiceSyncTask/index.d.ts b/packages/shared/lib/api/base/service/DBServiceSyncTask/index.d.ts index 7e1254ae5..11f38eacf 100644 --- a/packages/shared/lib/api/base/service/DBServiceSyncTask/index.d.ts +++ b/packages/shared/lib/api/base/service/DBServiceSyncTask/index.d.ts @@ -8,25 +8,21 @@ import { IGenericResp } from '../common.d'; -export interface IListDBServiceSyncTasksReturn - extends IListDBServiceSyncTasksReply {} +export interface IListDBServiceSyncTasksReturn extends IListDBServiceSyncTasksReply {} export interface IAddDBServiceSyncTaskParams extends IAddDBServiceSyncTaskReq {} export interface IAddDBServiceSyncTaskReturn extends IAddDBServiceReply {} -export interface IListDBServiceSyncTaskTipsReturn - extends IListDBServiceSyncTaskTipsReply {} +export interface IListDBServiceSyncTaskTipsReturn extends IListDBServiceSyncTaskTipsReply {} export interface IGetDBServiceSyncTaskParams { db_service_sync_task_uid: string; } -export interface IGetDBServiceSyncTaskReturn - extends IGetDBServiceSyncTaskReply {} +export interface IGetDBServiceSyncTaskReturn extends IGetDBServiceSyncTaskReply {} -export interface IUpdateDBServiceSyncTaskParams - extends IUpdateDBServiceSyncTaskReq { +export interface IUpdateDBServiceSyncTaskParams extends IUpdateDBServiceSyncTaskReq { db_service_sync_task_uid: string; } diff --git a/packages/shared/lib/api/base/service/DMSProxy/index.d.ts b/packages/shared/lib/api/base/service/DMSProxy/index.d.ts index 310ba64b2..7387f183a 100644 --- a/packages/shared/lib/api/base/service/DMSProxy/index.d.ts +++ b/packages/shared/lib/api/base/service/DMSProxy/index.d.ts @@ -1,6 +1,5 @@ import { IRegisterDMSProxyTargetReq, IGenericResp } from '../common.d'; -export interface IRegisterDMSProxyTargetParams - extends IRegisterDMSProxyTargetReq {} +export interface IRegisterDMSProxyTargetParams extends IRegisterDMSProxyTargetReq {} export interface IRegisterDMSProxyTargetReturn extends IGenericResp {} diff --git a/packages/shared/lib/api/base/service/DataExportTask/index.d.ts b/packages/shared/lib/api/base/service/DataExportTask/index.d.ts index 5ded6188d..a3523510a 100644 --- a/packages/shared/lib/api/base/service/DataExportTask/index.d.ts +++ b/packages/shared/lib/api/base/service/DataExportTask/index.d.ts @@ -11,8 +11,7 @@ export interface IBatchGetDataExportTaskParams { data_export_task_uids: string; } -export interface IBatchGetDataExportTaskReturn - extends IBatchGetDataExportTaskReply {} +export interface IBatchGetDataExportTaskReturn extends IBatchGetDataExportTaskReply {} export interface IAddDataExportTaskParams extends IAddDataExportTaskReq { project_uid: string; @@ -30,8 +29,7 @@ export interface IListDataExportTaskSQLsParams { page_index?: number; } -export interface IListDataExportTaskSQLsReturn - extends IListDataExportTaskSQLsReply {} +export interface IListDataExportTaskSQLsReturn extends IListDataExportTaskSQLsReply {} export interface IDownloadDataExportTaskSQLsParams { project_uid: string; diff --git a/packages/shared/lib/api/base/service/DataExportWorkflows/index.d.ts b/packages/shared/lib/api/base/service/DataExportWorkflows/index.d.ts index f9dab237a..bf5e61b81 100644 --- a/packages/shared/lib/api/base/service/DataExportWorkflows/index.d.ts +++ b/packages/shared/lib/api/base/service/DataExportWorkflows/index.d.ts @@ -14,8 +14,7 @@ import { ListDataExportWorkflowsFilterByStatusEnum } from './index.enum'; -export interface IGetGlobalDataExportWorkflowsReturn - extends IGetGlobalDataExportWorkflowsReply {} +export interface IGetGlobalDataExportWorkflowsReturn extends IGetGlobalDataExportWorkflowsReply {} export interface IListAllDataExportWorkflowsParams { project_uid: string; @@ -39,8 +38,7 @@ export interface IListAllDataExportWorkflowsParams { fuzzy_keyword?: string; } -export interface IListAllDataExportWorkflowsReturn - extends IListDataExportWorkflowsReply {} +export interface IListAllDataExportWorkflowsReturn extends IListDataExportWorkflowsReply {} export interface IListDataExportWorkflowsParams { project_uid: string; @@ -64,19 +62,15 @@ export interface IListDataExportWorkflowsParams { fuzzy_keyword?: string; } -export interface IListDataExportWorkflowsReturn - extends IListDataExportWorkflowsReply {} +export interface IListDataExportWorkflowsReturn extends IListDataExportWorkflowsReply {} -export interface IAddDataExportWorkflowParams - extends IAddDataExportWorkflowReq { +export interface IAddDataExportWorkflowParams extends IAddDataExportWorkflowReq { project_uid: string; } -export interface IAddDataExportWorkflowReturn - extends IAddDataExportWorkflowReply {} +export interface IAddDataExportWorkflowReturn extends IAddDataExportWorkflowReply {} -export interface ICancelDataExportWorkflowParams - extends ICancelDataExportWorkflowReq { +export interface ICancelDataExportWorkflowParams extends ICancelDataExportWorkflowReq { project_uid: string; } @@ -88,8 +82,7 @@ export interface IGetDataExportWorkflowParams { project_uid: string; } -export interface IGetDataExportWorkflowReturn - extends IGetDataExportWorkflowReply {} +export interface IGetDataExportWorkflowReturn extends IGetDataExportWorkflowReply {} export interface IApproveDataExportWorkflowParams { project_uid: string; @@ -107,8 +100,7 @@ export interface IExportDataExportWorkflowParams { export interface IExportDataExportWorkflowReturn extends IGenericResp {} -export interface IRejectDataExportWorkflowParams - extends IRejectDataExportWorkflowReq { +export interface IRejectDataExportWorkflowParams extends IRejectDataExportWorkflowReq { project_uid: string; data_export_workflow_uid: string; diff --git a/packages/shared/lib/api/base/service/Masking/index.d.ts b/packages/shared/lib/api/base/service/Masking/index.d.ts index f75855f95..d7cd0c1e3 100644 --- a/packages/shared/lib/api/base/service/Masking/index.d.ts +++ b/packages/shared/lib/api/base/service/Masking/index.d.ts @@ -36,8 +36,7 @@ export interface IListPendingApprovalRequestsParams { page_index?: number; } -export interface IListPendingApprovalRequestsReturn - extends IListPendingApprovalRequestsReply {} +export interface IListPendingApprovalRequestsReturn extends IListPendingApprovalRequestsReply {} export interface IGetPlaintextAccessRequestDetailParams { project_uid: string; @@ -45,18 +44,15 @@ export interface IGetPlaintextAccessRequestDetailParams { request_id: number; } -export interface IGetPlaintextAccessRequestDetailReturn - extends IGetPlaintextAccessRequestDetailReply {} +export interface IGetPlaintextAccessRequestDetailReturn extends IGetPlaintextAccessRequestDetailReply {} -export interface IProcessApprovalRequestParams - extends IProcessApprovalRequestReq { +export interface IProcessApprovalRequestParams extends IProcessApprovalRequestReq { project_uid: string; request_id: number; } -export interface IProcessApprovalRequestReturn - extends IProcessApprovalRequestReply {} +export interface IProcessApprovalRequestReturn extends IProcessApprovalRequestReply {} export interface IGetMaskingOverviewTreeParams { project_uid: string; @@ -68,16 +64,13 @@ export interface IGetMaskingOverviewTreeParams { masking_config_statuses?: GetMaskingOverviewTreeMaskingConfigStatusesEnum; } -export interface IGetMaskingOverviewTreeReturn - extends IGetMaskingOverviewTreeReply {} +export interface IGetMaskingOverviewTreeReturn extends IGetMaskingOverviewTreeReply {} -export interface IConfigureMaskingRulesParams - extends IConfigureMaskingRulesReq { +export interface IConfigureMaskingRulesParams extends IConfigureMaskingRulesReq { project_uid: string; } -export interface IConfigureMaskingRulesReturn - extends IConfigureMaskingRulesReply {} +export interface IConfigureMaskingRulesReturn extends IConfigureMaskingRulesReply {} export interface IListSensitiveDataDiscoveryTasksParams { project_uid: string; @@ -87,16 +80,13 @@ export interface IListSensitiveDataDiscoveryTasksParams { page_index?: number; } -export interface IListSensitiveDataDiscoveryTasksReturn - extends IListSensitiveDataDiscoveryTasksReply {} +export interface IListSensitiveDataDiscoveryTasksReturn extends IListSensitiveDataDiscoveryTasksReply {} -export interface IAddSensitiveDataDiscoveryTaskParams - extends IAddSensitiveDataDiscoveryTaskReq { +export interface IAddSensitiveDataDiscoveryTaskParams extends IAddSensitiveDataDiscoveryTaskReq { project_uid: string; } -export interface IAddSensitiveDataDiscoveryTaskReturn - extends IAddSensitiveDataDiscoveryTaskReply {} +export interface IAddSensitiveDataDiscoveryTaskReturn extends IAddSensitiveDataDiscoveryTaskReply {} export interface IListCreatableDBServicesForMaskingTaskParams { project_uid: string; @@ -108,18 +98,15 @@ export interface IListCreatableDBServicesForMaskingTaskParams { keywords?: string; } -export interface IListCreatableDBServicesForMaskingTaskReturn - extends IListCreatableDBServicesForMaskingTaskReply {} +export interface IListCreatableDBServicesForMaskingTaskReturn extends IListCreatableDBServicesForMaskingTaskReply {} -export interface IUpdateSensitiveDataDiscoveryTaskParams - extends IUpdateSensitiveDataDiscoveryTaskReq { +export interface IUpdateSensitiveDataDiscoveryTaskParams extends IUpdateSensitiveDataDiscoveryTaskReq { project_uid: string; task_id: number; } -export interface IUpdateSensitiveDataDiscoveryTaskReturn - extends IUpdateSensitiveDataDiscoveryTaskReply {} +export interface IUpdateSensitiveDataDiscoveryTaskReturn extends IUpdateSensitiveDataDiscoveryTaskReply {} export interface IDeleteSensitiveDataDiscoveryTaskParams { project_uid: string; @@ -127,8 +114,7 @@ export interface IDeleteSensitiveDataDiscoveryTaskParams { task_id: number; } -export interface IDeleteSensitiveDataDiscoveryTaskReturn - extends IDeleteSensitiveDataDiscoveryTaskReply {} +export interface IDeleteSensitiveDataDiscoveryTaskReturn extends IDeleteSensitiveDataDiscoveryTaskReply {} export interface IListSensitiveDataDiscoveryTaskHistoriesParams { project_uid: string; @@ -140,8 +126,7 @@ export interface IListSensitiveDataDiscoveryTaskHistoriesParams { page_index?: number; } -export interface IListSensitiveDataDiscoveryTaskHistoriesReturn - extends IListSensitiveDataDiscoveryTaskHistoriesReply {} +export interface IListSensitiveDataDiscoveryTaskHistoriesReturn extends IListSensitiveDataDiscoveryTaskHistoriesReply {} export interface IGetTableColumnMaskingDetailsParams { project_uid: string; @@ -151,8 +136,7 @@ export interface IGetTableColumnMaskingDetailsParams { keywords?: string; } -export interface IGetTableColumnMaskingDetailsReturn - extends IGetTableColumnMaskingDetailsReply {} +export interface IGetTableColumnMaskingDetailsReturn extends IGetTableColumnMaskingDetailsReply {} export interface IListMaskingTemplatesParams { project_uid: string; @@ -162,8 +146,7 @@ export interface IListMaskingTemplatesParams { page_index?: number; } -export interface IListMaskingTemplatesReturn - extends IListMaskingTemplatesReply {} +export interface IListMaskingTemplatesReturn extends IListMaskingTemplatesReply {} export interface IAddMaskingTemplateParams extends IAddMaskingTemplateReq { project_uid: string; @@ -171,15 +154,13 @@ export interface IAddMaskingTemplateParams extends IAddMaskingTemplateReq { export interface IAddMaskingTemplateReturn extends IAddMaskingTemplateReply {} -export interface IUpdateMaskingTemplateParams - extends IUpdateMaskingTemplateReq { +export interface IUpdateMaskingTemplateParams extends IUpdateMaskingTemplateReq { project_uid: string; template_id: number; } -export interface IUpdateMaskingTemplateReturn - extends IUpdateMaskingTemplateReply {} +export interface IUpdateMaskingTemplateReturn extends IUpdateMaskingTemplateReply {} export interface IDeleteMaskingTemplateParams { project_uid: string; @@ -187,5 +168,4 @@ export interface IDeleteMaskingTemplateParams { template_id: number; } -export interface IDeleteMaskingTemplateReturn - extends IDeleteMaskingTemplateReply {} +export interface IDeleteMaskingTemplateReturn extends IDeleteMaskingTemplateReply {} diff --git a/packages/shared/lib/api/base/service/Member/index.d.ts b/packages/shared/lib/api/base/service/Member/index.d.ts index 9da686dda..5f8a839b5 100644 --- a/packages/shared/lib/api/base/service/Member/index.d.ts +++ b/packages/shared/lib/api/base/service/Member/index.d.ts @@ -38,8 +38,7 @@ export interface IListMembersForInternalParams { project_uid: string; } -export interface IListMembersForInternalReturn - extends IListMembersForInternalReply {} +export interface IListMembersForInternalReturn extends IListMembersForInternalReply {} export interface IListMemberTipsParams { project_uid: string; diff --git a/packages/shared/lib/api/base/service/OperationRecord/index.d.ts b/packages/shared/lib/api/base/service/OperationRecord/index.d.ts index 2a9cb1a23..a618bcdf1 100644 --- a/packages/shared/lib/api/base/service/OperationRecord/index.d.ts +++ b/packages/shared/lib/api/base/service/OperationRecord/index.d.ts @@ -22,8 +22,7 @@ export interface IGetOperationRecordListParams { page_size: number; } -export interface IGetOperationRecordListReturn - extends IGetOperationRecordListReply {} +export interface IGetOperationRecordListReturn extends IGetOperationRecordListReply {} export interface IAddOperationRecordParams extends IAddOperationRecordReq {} diff --git a/packages/shared/lib/api/base/service/Project/index.d.ts b/packages/shared/lib/api/base/service/Project/index.d.ts index 6cfc9bfc6..f50b012f4 100644 --- a/packages/shared/lib/api/base/service/Project/index.d.ts +++ b/packages/shared/lib/api/base/service/Project/index.d.ts @@ -85,22 +85,17 @@ export interface IDeleteBusinessTagParams { export interface IDeleteBusinessTagReturn extends IGenericResp {} -export interface ICheckDBServicesPrivilegesParams - extends ICheckDBServicesPrivilegesReq {} +export interface ICheckDBServicesPrivilegesParams extends ICheckDBServicesPrivilegesReq {} -export interface ICheckDBServicesPrivilegesReturn - extends ICheckDBServicesPrivilegesReply {} +export interface ICheckDBServicesPrivilegesReturn extends ICheckDBServicesPrivilegesReply {} export interface IDBServicesConnectionParams extends IDBServiceConnectionReq {} -export interface IDBServicesConnectionReturn - extends IDBServicesConnectionReply {} +export interface IDBServicesConnectionReturn extends IDBServicesConnectionReply {} -export interface ICheckGlobalDBServicesConnectionsParams - extends IDBServicesConnectionReq {} +export interface ICheckGlobalDBServicesConnectionsParams extends IDBServicesConnectionReq {} -export interface ICheckGlobalDBServicesConnectionsReturn - extends IDBServicesConnectionReqReply {} +export interface ICheckGlobalDBServicesConnectionsReturn extends IDBServicesConnectionReqReply {} export interface IExportProjectsParams { order_by?: ExportProjectsOrderByEnum; @@ -114,8 +109,7 @@ export interface IImportProjectsParams extends IImportProjectsReq {} export interface IImportProjectsReturn extends IGenericResp {} -export interface IImportDBServicesOfProjectsParams - extends IImportDBServicesOfProjectsReq {} +export interface IImportDBServicesOfProjectsParams extends IImportDBServicesOfProjectsReq {} export interface IImportDBServicesOfProjectsReturn extends IGenericResp {} @@ -127,8 +121,7 @@ export interface IPreviewImportProjectsParams { projects_file?: any; } -export interface IPreviewImportProjectsReturn - extends IPreviewImportProjectsReply {} +export interface IPreviewImportProjectsReturn extends IPreviewImportProjectsReply {} export interface IGetProjectTipsParams { project_uid?: string; @@ -228,8 +221,7 @@ export interface IImportProjectsV2Params extends IImportProjectsReqV2 {} export interface IImportProjectsV2Return extends IGenericResp {} -export interface IImportDBServicesOfProjectsV2Params - extends IImportDBServicesOfProjectsReqV2 {} +export interface IImportDBServicesOfProjectsV2Params extends IImportDBServicesOfProjectsReqV2 {} export interface IImportDBServicesOfProjectsV2Return extends IGenericResp {} @@ -241,8 +233,7 @@ export interface IPreviewImportProjectsV2Params { projects_file?: any; } -export interface IPreviewImportProjectsV2Return - extends IPreviewImportProjectsReplyV2 {} +export interface IPreviewImportProjectsV2Return extends IPreviewImportProjectsReplyV2 {} export interface IUpdateProjectV2Params extends IUpdateProjectReqV2 { project_uid: string; diff --git a/packages/shared/lib/api/base/service/ResourceOverview/index.d.ts b/packages/shared/lib/api/base/service/ResourceOverview/index.d.ts index 45a55e29b..653548917 100644 --- a/packages/shared/lib/api/base/service/ResourceOverview/index.d.ts +++ b/packages/shared/lib/api/base/service/ResourceOverview/index.d.ts @@ -33,14 +33,11 @@ export interface IGetResourceOverviewResourceListV1Params { page_size?: number; } -export interface IGetResourceOverviewResourceListV1Return - extends IResourceOverviewResourceListResV1 {} +export interface IGetResourceOverviewResourceListV1Return extends IResourceOverviewResourceListResV1 {} -export interface IGetResourceOverviewResourceTypeDistributionV1Return - extends IResourceOverviewResourceTypeDistributionResV1 {} +export interface IGetResourceOverviewResourceTypeDistributionV1Return extends IResourceOverviewResourceTypeDistributionResV1 {} -export interface IGetResourceOverviewStatisticsV1Return - extends IResourceOverviewStatisticsResV1 {} +export interface IGetResourceOverviewStatisticsV1Return extends IResourceOverviewStatisticsResV1 {} export interface IGetResourceOverviewTopologyV1Params { filter_by_db_type?: string; @@ -54,5 +51,4 @@ export interface IGetResourceOverviewTopologyV1Params { fuzzy_search_resource_name?: string; } -export interface IGetResourceOverviewTopologyV1Return - extends IResourceOverviewTopologyResV1 {} +export interface IGetResourceOverviewTopologyV1Return extends IResourceOverviewTopologyResV1 {} diff --git a/packages/shared/lib/api/sqle/service/GlobalDashboard/index.d.ts b/packages/shared/lib/api/sqle/service/GlobalDashboard/index.d.ts index 4b5bf9c62..0442fab80 100644 --- a/packages/shared/lib/api/sqle/service/GlobalDashboard/index.d.ts +++ b/packages/shared/lib/api/sqle/service/GlobalDashboard/index.d.ts @@ -28,8 +28,7 @@ export interface IGetGlobalAccountListV2Params { filter_instance_id?: string; } -export interface IGetGlobalAccountListV2Return - extends IGlobalAccountListResV2 {} +export interface IGetGlobalAccountListV2Return extends IGlobalAccountListResV2 {} export interface IGetGlobalAccountStatisticsV2Params { filter_project_uid?: string; @@ -37,8 +36,7 @@ export interface IGetGlobalAccountStatisticsV2Params { filter_instance_id?: string; } -export interface IGetGlobalAccountStatisticsV2Return - extends IGlobalAccountStatisticsResV2 {} +export interface IGetGlobalAccountStatisticsV2Return extends IGlobalAccountStatisticsResV2 {} export interface IGetGlobalSqlManageStatisticsV2Params { filter_project_uid?: string; @@ -46,8 +44,7 @@ export interface IGetGlobalSqlManageStatisticsV2Params { filter_instance_id?: string; } -export interface IGetGlobalSqlManageStatisticsV2Return - extends IGlobalSqlManageStatisticsResV2 {} +export interface IGetGlobalSqlManageStatisticsV2Return extends IGlobalSqlManageStatisticsResV2 {} export interface IGetGlobalSqlManageTaskListV2Params { page_index: number; @@ -63,8 +60,7 @@ export interface IGetGlobalSqlManageTaskListV2Params { filter_instance_id?: string; } -export interface IGetGlobalSqlManageTaskListV2Return - extends IGlobalSqlManageTaskListResV2 {} +export interface IGetGlobalSqlManageTaskListV2Return extends IGlobalSqlManageTaskListResV2 {} export interface IGetGlobalWorkflowListV2Params { cursor?: string; @@ -84,8 +80,7 @@ export interface IGetGlobalWorkflowListV2Params { workflow_type?: GetGlobalWorkflowListV2WorkflowTypeEnum; } -export interface IGetGlobalWorkflowListV2Return - extends IGlobalWorkflowListResV2 {} +export interface IGetGlobalWorkflowListV2Return extends IGlobalWorkflowListResV2 {} export interface IGetGlobalWorkflowStatisticsV2Params { filter_project_uid?: string; @@ -93,5 +88,4 @@ export interface IGetGlobalWorkflowStatisticsV2Params { filter_instance_id?: string; } -export interface IGetGlobalWorkflowStatisticsV2Return - extends IGlobalWorkflowStatisticsResV2 {} +export interface IGetGlobalWorkflowStatisticsV2Return extends IGlobalWorkflowStatisticsResV2 {} diff --git a/packages/shared/lib/api/sqle/service/OperationRecord/index.d.ts b/packages/shared/lib/api/sqle/service/OperationRecord/index.d.ts index 9e16ea36c..9354cbd2c 100644 --- a/packages/shared/lib/api/sqle/service/OperationRecord/index.d.ts +++ b/packages/shared/lib/api/sqle/service/OperationRecord/index.d.ts @@ -22,8 +22,7 @@ export interface IGetOperationRecordListV1Params { page_size: number; } -export interface IGetOperationRecordListV1Return - extends IGetOperationRecordListResV1 {} +export interface IGetOperationRecordListV1Return extends IGetOperationRecordListResV1 {} export interface IGetExportOperationRecordListV1Params { filter_operate_time_from?: string; @@ -39,8 +38,6 @@ export interface IGetExportOperationRecordListV1Params { filter_operate_action?: string; } -export interface IGetOperationActionListReturn - extends IGetOperationActionListResV1 {} +export interface IGetOperationActionListReturn extends IGetOperationActionListResV1 {} -export interface IGetOperationTypeNameListReturn - extends IGetOperationTypeNamesListResV1 {} +export interface IGetOperationTypeNameListReturn extends IGetOperationTypeNamesListResV1 {} diff --git a/packages/shared/lib/api/sqle/service/ReportPushConfig/index.d.ts b/packages/shared/lib/api/sqle/service/ReportPushConfig/index.d.ts index d0cb9e8da..8c085614d 100644 --- a/packages/shared/lib/api/sqle/service/ReportPushConfig/index.d.ts +++ b/packages/shared/lib/api/sqle/service/ReportPushConfig/index.d.ts @@ -8,11 +8,9 @@ export interface IGetReportPushConfigListParams { project_name: string; } -export interface IGetReportPushConfigListReturn - extends IGetReportPushConfigsListResV1 {} +export interface IGetReportPushConfigListReturn extends IGetReportPushConfigsListResV1 {} -export interface IUpdateReportPushConfigParams - extends IUpdateReportPushConfigReqV1 { +export interface IUpdateReportPushConfigParams extends IUpdateReportPushConfigReqV1 { project_name: string; report_push_config_id: string; diff --git a/packages/shared/lib/api/sqle/service/SqlInsight/index.d.ts b/packages/shared/lib/api/sqle/service/SqlInsight/index.d.ts index e3657289a..201b5f5e1 100644 --- a/packages/shared/lib/api/sqle/service/SqlInsight/index.d.ts +++ b/packages/shared/lib/api/sqle/service/SqlInsight/index.d.ts @@ -21,8 +21,7 @@ export interface IGetSqlPerformanceInsightsParams { instance_id: string; } -export interface IGetSqlPerformanceInsightsReturn - extends IGetSqlPerformanceInsightsResp {} +export interface IGetSqlPerformanceInsightsReturn extends IGetSqlPerformanceInsightsResp {} export interface IGetSqlPerformanceInsightsRelatedSQLParams { project_name: string; @@ -44,8 +43,7 @@ export interface IGetSqlPerformanceInsightsRelatedSQLParams { page_size: number; } -export interface IGetSqlPerformanceInsightsRelatedSQLReturn - extends IGetSqlPerformanceInsightsRelatedSQLResp {} +export interface IGetSqlPerformanceInsightsRelatedSQLReturn extends IGetSqlPerformanceInsightsRelatedSQLResp {} export interface IGetSqlPerformanceInsightsRelatedTransactionParams { project_name: string; @@ -55,5 +53,4 @@ export interface IGetSqlPerformanceInsightsRelatedTransactionParams { sql_id: string; } -export interface IGetSqlPerformanceInsightsRelatedTransactionReturn - extends IGetSqlPerformanceInsightsRelatedTransactionResp {} +export interface IGetSqlPerformanceInsightsRelatedTransactionReturn extends IGetSqlPerformanceInsightsRelatedTransactionResp {} diff --git a/packages/shared/lib/api/sqle/service/SqlManage/index.d.ts b/packages/shared/lib/api/sqle/service/SqlManage/index.d.ts index 47e4da1ef..6494b8cea 100644 --- a/packages/shared/lib/api/sqle/service/SqlManage/index.d.ts +++ b/packages/shared/lib/api/sqle/service/SqlManage/index.d.ts @@ -59,8 +59,7 @@ export interface IGetGlobalSqlManageListParams { page_size: number; } -export interface IGetGlobalSqlManageListReturn - extends IGetGlobalSqlManageListResp {} +export interface IGetGlobalSqlManageListReturn extends IGetGlobalSqlManageListResp {} export interface IGetGlobalSqlManageStatisticsParams { filter_project_uid?: string; @@ -72,8 +71,7 @@ export interface IGetGlobalSqlManageStatisticsParams { filter_current_step_assignee_user_id?: string; } -export interface IGetGlobalSqlManageStatisticsReturn - extends IGetGlobalSqlManageStatisticsResp {} +export interface IGetGlobalSqlManageStatisticsReturn extends IGetGlobalSqlManageStatisticsResp {} export interface IGetSqlManageListParams { project_name: string; @@ -117,8 +115,7 @@ export interface IGetAbnormalInstanceAuditPlansV1Params { project_name: string; } -export interface IGetAbnormalInstanceAuditPlansV1Return - extends IGetAbnormalAuditPlanInstancesResp {} +export interface IGetAbnormalInstanceAuditPlansV1Return extends IGetAbnormalAuditPlanInstancesResp {} export interface IBatchUpdateSqlManageParams extends IBatchUpdateSqlManageReq { project_name: string; @@ -166,8 +163,7 @@ export interface IGetSqlManageRuleTipsParams { project_name: string; } -export interface IGetSqlManageRuleTipsReturn - extends IGetSqlManageRuleTipsResp {} +export interface IGetSqlManageRuleTipsReturn extends IGetSqlManageRuleTipsResp {} export interface ISendSqlManageParams extends ISqlManageCodingReq { project_name: string; @@ -183,8 +179,7 @@ export interface IGetSqlManageSqlAnalysisV1Params { affectRowsEnabled?: boolean; } -export interface IGetSqlManageSqlAnalysisV1Return - extends IGetSqlManageSqlAnalysisResp {} +export interface IGetSqlManageSqlAnalysisV1Return extends IGetSqlManageSqlAnalysisResp {} export interface IGetSqlManageSqlAnalysisChartV1Params { project_name: string; @@ -200,8 +195,7 @@ export interface IGetSqlManageSqlAnalysisChartV1Params { metric_name: string; } -export interface IGetSqlManageSqlAnalysisChartV1Return - extends ISqlManageAnalysisChartResp {} +export interface IGetSqlManageSqlAnalysisChartV1Return extends ISqlManageAnalysisChartResp {} export interface IGetSqlManageListV2Params { project_name: string; diff --git a/packages/shared/lib/api/sqle/service/ai_hub/index.d.ts b/packages/shared/lib/api/sqle/service/ai_hub/index.d.ts index 2641133d3..b26755153 100644 --- a/packages/shared/lib/api/sqle/service/ai_hub/index.d.ts +++ b/packages/shared/lib/api/sqle/service/ai_hub/index.d.ts @@ -7,11 +7,8 @@ import { export interface IGetAIHubBannerReturn extends IGetAIHubBannerResp {} -export interface IGetAIHubExecutionDataReturn - extends IGetAIHubExecutionDataResp {} +export interface IGetAIHubExecutionDataReturn extends IGetAIHubExecutionDataResp {} -export interface IGetAIHubManagementViewReturn - extends IGetAIHubManagementViewResp {} +export interface IGetAIHubManagementViewReturn extends IGetAIHubManagementViewResp {} -export interface IGetAIHubStrategicValueReturn - extends IGetAIHubStrategicValueResp {} +export interface IGetAIHubStrategicValueReturn extends IGetAIHubStrategicValueResp {} diff --git a/packages/shared/lib/api/sqle/service/audit_plan/index.d.ts b/packages/shared/lib/api/sqle/service/audit_plan/index.d.ts index 8e970a381..73369b078 100644 --- a/packages/shared/lib/api/sqle/service/audit_plan/index.d.ts +++ b/packages/shared/lib/api/sqle/service/audit_plan/index.d.ts @@ -88,11 +88,9 @@ export interface IGetAuditPlanNotifyConfigV1Params { audit_plan_name: string; } -export interface IGetAuditPlanNotifyConfigV1Return - extends IGetAuditPlanNotifyConfigResV1 {} +export interface IGetAuditPlanNotifyConfigV1Return extends IGetAuditPlanNotifyConfigResV1 {} -export interface IUpdateAuditPlanNotifyConfigV1Params - extends IUpdateAuditPlanNotifyConfigReqV1 { +export interface IUpdateAuditPlanNotifyConfigV1Params extends IUpdateAuditPlanNotifyConfigReqV1 { project_name: string; audit_plan_name: string; @@ -106,8 +104,7 @@ export interface ITestAuditPlanNotifyConfigV1Params { audit_plan_name: string; } -export interface ITestAuditPlanNotifyConfigV1Return - extends ITestAuditPlanNotifyConfigResV1 {} +export interface ITestAuditPlanNotifyConfigV1Return extends ITestAuditPlanNotifyConfigResV1 {} export interface IGetAuditPlanReportsV1Params { project_name: string; @@ -119,8 +116,7 @@ export interface IGetAuditPlanReportsV1Params { page_size: number; } -export interface IGetAuditPlanReportsV1Return - extends IGetAuditPlanReportsResV1 {} +export interface IGetAuditPlanReportsV1Return extends IGetAuditPlanReportsResV1 {} export interface IGetAuditPlanReportV1Params { project_name: string; @@ -152,8 +148,7 @@ export interface IGetAuditPlanReportsSQLsV1Params { page_size: number; } -export interface IGetAuditPlanReportsSQLsV1Return - extends IGetAuditPlanReportSQLsResV1 {} +export interface IGetAuditPlanReportsSQLsV1Return extends IGetAuditPlanReportSQLsResV1 {} export interface IGetTaskAnalysisDataParams { project_name: string; @@ -165,8 +160,7 @@ export interface IGetTaskAnalysisDataParams { number: string; } -export interface IGetTaskAnalysisDataReturn - extends IGetAuditPlanAnalysisDataResV1 {} +export interface IGetTaskAnalysisDataReturn extends IGetAuditPlanAnalysisDataResV1 {} export interface IGetAuditPlanSQLsV1Params { project_name: string; @@ -180,8 +174,7 @@ export interface IGetAuditPlanSQLsV1Params { export interface IGetAuditPlanSQLsV1Return extends IGetAuditPlanSQLsResV1 {} -export interface IFullSyncAuditPlanSQLsV1Params - extends IFullSyncAuditPlanSQLsReqV1 { +export interface IFullSyncAuditPlanSQLsV1Params extends IFullSyncAuditPlanSQLsReqV1 { project_name: string; audit_plan_name: string; @@ -189,8 +182,7 @@ export interface IFullSyncAuditPlanSQLsV1Params export interface IFullSyncAuditPlanSQLsV1Return extends IBaseRes {} -export interface IPartialSyncAuditPlanSQLsV1Params - extends IPartialSyncAuditPlanSQLsReqV1 { +export interface IPartialSyncAuditPlanSQLsV1Params extends IPartialSyncAuditPlanSQLsReqV1 { project_name: string; audit_plan_name: string; @@ -236,8 +228,7 @@ export interface IGetAuditPlanReportsSQLsParams { page_size: number; } -export interface IGetAuditPlanReportsSQLsReturn - extends IGetAuditPlanReportSQLsResV2 {} +export interface IGetAuditPlanReportsSQLsReturn extends IGetAuditPlanReportSQLsResV2 {} export interface IGetAuditPlantAnalysisDataV2Params { project_name: string; @@ -249,11 +240,9 @@ export interface IGetAuditPlantAnalysisDataV2Params { number: string; } -export interface IGetAuditPlantAnalysisDataV2Return - extends IGetAuditPlanAnalysisDataResV2 {} +export interface IGetAuditPlantAnalysisDataV2Return extends IGetAuditPlanAnalysisDataResV2 {} -export interface IFullSyncAuditPlanSQLsV2Params - extends IFullSyncAuditPlanSQLsReqV2 { +export interface IFullSyncAuditPlanSQLsV2Params extends IFullSyncAuditPlanSQLsReqV2 { project_name: string; audit_plan_name: string; @@ -261,8 +250,7 @@ export interface IFullSyncAuditPlanSQLsV2Params export interface IFullSyncAuditPlanSQLsV2Return extends IBaseRes {} -export interface IPartialSyncAuditPlanSQLsV2Params - extends IPartialSyncAuditPlanSQLsReqV2 { +export interface IPartialSyncAuditPlanSQLsV2Params extends IPartialSyncAuditPlanSQLsReqV2 { project_name: string; audit_plan_name: string; diff --git a/packages/shared/lib/api/sqle/service/audit_whitelist/index.d.ts b/packages/shared/lib/api/sqle/service/audit_whitelist/index.d.ts index 732f28310..2b57044a2 100644 --- a/packages/shared/lib/api/sqle/service/audit_whitelist/index.d.ts +++ b/packages/shared/lib/api/sqle/service/audit_whitelist/index.d.ts @@ -19,8 +19,7 @@ export interface IGetAuditWhitelistV1Params { export interface IGetAuditWhitelistV1Return extends IGetAuditWhitelistResV1 {} -export interface ICreateAuditWhitelistV1Params - extends ICreateAuditWhitelistReqV1 { +export interface ICreateAuditWhitelistV1Params extends ICreateAuditWhitelistReqV1 { project_name: string; } @@ -34,8 +33,7 @@ export interface IDeleteAuditWhitelistByIdV1Params { export interface IDeleteAuditWhitelistByIdV1Return extends IBaseRes {} -export interface IUpdateAuditWhitelistByIdV1Params - extends IUpdateAuditWhitelistReqV1 { +export interface IUpdateAuditWhitelistByIdV1Params extends IUpdateAuditWhitelistReqV1 { project_name: string; audit_whitelist_id: string; diff --git a/packages/shared/lib/api/sqle/service/configuration/index.d.ts b/packages/shared/lib/api/sqle/service/configuration/index.d.ts index b289212c8..7296e81ff 100644 --- a/packages/shared/lib/api/sqle/service/configuration/index.d.ts +++ b/packages/shared/lib/api/sqle/service/configuration/index.d.ts @@ -24,24 +24,19 @@ import { IGetDriversRes } from '../common.d'; -export interface IGetCodingConfigurationV1Return - extends IGetCodingConfigurationResV1 {} +export interface IGetCodingConfigurationV1Return extends IGetCodingConfigurationResV1 {} -export interface IUpdateCodingConfigurationV1Params - extends IUpdateCodingConfigurationReqV1 {} +export interface IUpdateCodingConfigurationV1Params extends IUpdateCodingConfigurationReqV1 {} export interface IUpdateCodingConfigurationV1Return extends IBaseRes {} -export interface ITestCodingConfigV1Params - extends ITestCodingConfigurationReqV1 {} +export interface ITestCodingConfigV1Params extends ITestCodingConfigurationReqV1 {} export interface ITestCodingConfigV1Return extends ITestCodingConfigResV1 {} -export interface IGetDingTalkConfigurationV1Return - extends IGetDingTalkConfigurationResV1 {} +export interface IGetDingTalkConfigurationV1Return extends IGetDingTalkConfigurationResV1 {} -export interface IUpdateDingTalkConfigurationV1Params - extends IUpdateDingTalkConfigurationReqV1 {} +export interface IUpdateDingTalkConfigurationV1Params extends IUpdateDingTalkConfigurationReqV1 {} export interface IUpdateDingTalkConfigurationV1Return extends IBaseRes {} @@ -49,19 +44,15 @@ export interface ITestDingTalkConfigV1Return extends ITestDingTalkConfigResV1 {} export interface IGetDriversV1Return extends IGetDriversResV1 {} -export interface IGetFeishuAuditConfigurationV1Return - extends IGetFeishuAuditConfigurationResV1 {} +export interface IGetFeishuAuditConfigurationV1Return extends IGetFeishuAuditConfigurationResV1 {} -export interface IUpdateFeishuAuditConfigurationV1Params - extends IUpdateFeishuConfigurationReqV1 {} +export interface IUpdateFeishuAuditConfigurationV1Params extends IUpdateFeishuConfigurationReqV1 {} export interface IUpdateFeishuAuditConfigurationV1Return extends IBaseRes {} -export interface ITestFeishuAuditConfigV1Params - extends ITestFeishuConfigurationReqV1 {} +export interface ITestFeishuAuditConfigV1Params extends ITestFeishuConfigurationReqV1 {} -export interface ITestFeishuAuditConfigV1Return - extends ITestFeishuConfigResV1 {} +export interface ITestFeishuAuditConfigV1Return extends ITestFeishuConfigResV1 {} export interface ITestGitConnectionV1Params extends ITestGitConnectionReqV1 {} @@ -85,18 +76,14 @@ export interface IGetSSHPublicKeyReturn extends ISSHPublicKeyInfoV1Rsp {} export interface IGenSSHPublicKeyReturn extends IBaseRes {} -export interface IGetWechatAuditConfigurationV1Return - extends IGetWechatAuditConfigurationResV1 {} +export interface IGetWechatAuditConfigurationV1Return extends IGetWechatAuditConfigurationResV1 {} -export interface IUpdateWechatAuditConfigurationV1Params - extends IUpdateWechatConfigurationReqV1 {} +export interface IUpdateWechatAuditConfigurationV1Params extends IUpdateWechatConfigurationReqV1 {} export interface IUpdateWechatAuditConfigurationV1Return extends IBaseRes {} -export interface ITestWechatAuditConfigV1Params - extends ITestWechatConfigurationReqV1 {} +export interface ITestWechatAuditConfigV1Params extends ITestWechatConfigurationReqV1 {} -export interface ITestWechatAuditConfigV1Return - extends ITestWechatConfigResV1 {} +export interface ITestWechatAuditConfigV1Return extends ITestWechatConfigResV1 {} export interface IGetDriversV2Return extends IGetDriversRes {} diff --git a/packages/shared/lib/api/sqle/service/database_comparison/index.d.ts b/packages/shared/lib/api/sqle/service/database_comparison/index.d.ts index 5ff79a98d..a807d226c 100644 --- a/packages/shared/lib/api/sqle/service/database_comparison/index.d.ts +++ b/packages/shared/lib/api/sqle/service/database_comparison/index.d.ts @@ -7,26 +7,20 @@ import { IGenModifySQLResV1 } from '../common.d'; -export interface IGetComparisonStatementV1Params - extends IGetComparisonStatementsReqV1 { +export interface IGetComparisonStatementV1Params extends IGetComparisonStatementsReqV1 { project_name: string; } -export interface IGetComparisonStatementV1Return - extends IDatabaseComparisonStatementsResV1 {} +export interface IGetComparisonStatementV1Return extends IDatabaseComparisonStatementsResV1 {} -export interface IExecuteDatabaseComparisonV1Params - extends IGetDatabaseComparisonReqV1 { +export interface IExecuteDatabaseComparisonV1Params extends IGetDatabaseComparisonReqV1 { project_name: string; } -export interface IExecuteDatabaseComparisonV1Return - extends IDatabaseComparisonResV1 {} +export interface IExecuteDatabaseComparisonV1Return extends IDatabaseComparisonResV1 {} -export interface IGenDatabaseDiffModifySQLsV1Params - extends IGenModifylSQLReqV1 { +export interface IGenDatabaseDiffModifySQLsV1Params extends IGenModifylSQLReqV1 { project_name: string; } -export interface IGenDatabaseDiffModifySQLsV1Return - extends IGenModifySQLResV1 {} +export interface IGenDatabaseDiffModifySQLsV1Return extends IGenModifySQLResV1 {} diff --git a/packages/shared/lib/api/sqle/service/instance/index.d.ts b/packages/shared/lib/api/sqle/service/instance/index.d.ts index ac67ae45e..d66c7322f 100644 --- a/packages/shared/lib/api/sqle/service/instance/index.d.ts +++ b/packages/shared/lib/api/sqle/service/instance/index.d.ts @@ -22,11 +22,9 @@ export interface IGetDatabaseDriverLogosParams { db_types: string[]; } -export interface IGetDatabaseDriverLogosReturn - extends IGetDatabaseDriverLogosResV1 {} +export interface IGetDatabaseDriverLogosReturn extends IGetDatabaseDriverLogosResV1 {} -export interface IGetDatabaseDriverOptionsReturn - extends IGetDatabaseDriverOptionsResV1 {} +export interface IGetDatabaseDriverOptionsReturn extends IGetDatabaseDriverOptionsResV1 {} export interface IGetInstanceTipListV1Params { project_name: string; @@ -42,13 +40,11 @@ export interface IGetInstanceTipListV1Params { export interface IGetInstanceTipListV1Return extends IGetInstanceTipsResV1 {} -export interface IBatchCheckInstanceIsConnectableByNameParams - extends IBatchCheckInstanceConnectionsReqV1 { +export interface IBatchCheckInstanceIsConnectableByNameParams extends IBatchCheckInstanceConnectionsReqV1 { project_name: string; } -export interface IBatchCheckInstanceIsConnectableByNameReturn - extends IBatchGetInstanceConnectionsResV1 {} +export interface IBatchCheckInstanceIsConnectableByNameReturn extends IBatchGetInstanceConnectionsResV1 {} export interface ICheckInstanceIsConnectableByNameV1Params { project_name: string; @@ -56,8 +52,7 @@ export interface ICheckInstanceIsConnectableByNameV1Params { instance_name: string; } -export interface ICheckInstanceIsConnectableByNameV1Return - extends IGetInstanceConnectableResV1 {} +export interface ICheckInstanceIsConnectableByNameV1Return extends IGetInstanceConnectableResV1 {} export interface IGetInstanceRuleListV1Params { project_name: string; diff --git a/packages/shared/lib/api/sqle/service/instance_audit_plan/index.d.ts b/packages/shared/lib/api/sqle/service/instance_audit_plan/index.d.ts index 05a3507b3..7b65f2e53 100644 --- a/packages/shared/lib/api/sqle/service/instance_audit_plan/index.d.ts +++ b/packages/shared/lib/api/sqle/service/instance_audit_plan/index.d.ts @@ -42,16 +42,13 @@ export interface IGetInstanceAuditPlansV1Params { page_size: number; } -export interface IGetInstanceAuditPlansV1Return - extends IGetInstanceAuditPlansResV1 {} +export interface IGetInstanceAuditPlansV1Return extends IGetInstanceAuditPlansResV1 {} -export interface ICreateInstanceAuditPlanV1Params - extends ICreateInstanceAuditPlanReqV1 { +export interface ICreateInstanceAuditPlanV1Params extends ICreateInstanceAuditPlanReqV1 { project_name: string; } -export interface ICreateInstanceAuditPlanV1Return - extends ICreatInstanceAuditPlanResV1 {} +export interface ICreateInstanceAuditPlanV1Return extends ICreatInstanceAuditPlanResV1 {} export interface IGetInstanceAuditPlanDetailV1Params { project_name: string; @@ -59,11 +56,9 @@ export interface IGetInstanceAuditPlanDetailV1Params { instance_audit_plan_id: string; } -export interface IGetInstanceAuditPlanDetailV1Return - extends IGetInstanceAuditPlanDetailResV1 {} +export interface IGetInstanceAuditPlanDetailV1Return extends IGetInstanceAuditPlanDetailResV1 {} -export interface IUpdateInstanceAuditPlanV1Params - extends IUpdateInstanceAuditPlanReqV1 { +export interface IUpdateInstanceAuditPlanV1Params extends IUpdateInstanceAuditPlanReqV1 { project_name: string; instance_audit_plan_id: string; @@ -79,8 +74,7 @@ export interface IDeleteInstanceAuditPlanV1Params { export interface IDeleteInstanceAuditPlanV1Return extends IBaseRes {} -export interface IUpdateInstanceAuditPlanStatusV1Params - extends IUpdateInstanceAuditPlanStatusReqV1 { +export interface IUpdateInstanceAuditPlanStatusV1Params extends IUpdateInstanceAuditPlanStatusReqV1 { project_name: string; instance_audit_plan_id: string; @@ -94,8 +88,7 @@ export interface IGetInstanceAuditPlanOverviewV1Params { instance_audit_plan_id: string; } -export interface IGetInstanceAuditPlanOverviewV1Return - extends IGetInstanceAuditPlanOverviewResV1 {} +export interface IGetInstanceAuditPlanOverviewV1Return extends IGetInstanceAuditPlanOverviewResV1 {} export interface IDeleteAuditPlanByTypeV1Params { project_name: string; @@ -107,8 +100,7 @@ export interface IDeleteAuditPlanByTypeV1Params { export interface IDeleteAuditPlanByTypeV1Return extends IBaseRes {} -export interface IUpdateAuditPlanStatusV1Params - extends IUpdateAuditPlanStatusReqV1 { +export interface IUpdateAuditPlanStatusV1Params extends IUpdateAuditPlanStatusReqV1 { project_name: string; instance_audit_plan_id: string; @@ -128,8 +120,7 @@ export interface IAuditPlanTriggerSqlAuditV1Params { export interface IAuditPlanTriggerSqlAuditV1Return extends IBaseRes {} -export interface IGetInstanceAuditPlanSQLDataV1Params - extends IGetAuditPlanSQLDataReqV1 { +export interface IGetInstanceAuditPlanSQLDataV1Params extends IGetAuditPlanSQLDataReqV1 { project_name: string; instance_audit_plan_id: string; @@ -137,11 +128,9 @@ export interface IGetInstanceAuditPlanSQLDataV1Params audit_plan_id: string; } -export interface IGetInstanceAuditPlanSQLDataV1Return - extends IGetAuditPlanSQLDataResV1 {} +export interface IGetInstanceAuditPlanSQLDataV1Return extends IGetAuditPlanSQLDataResV1 {} -export interface IGetInstanceAuditPlanSQLExportV1Params - extends IGetAuditPlanSQLExportReqV1 { +export interface IGetInstanceAuditPlanSQLExportV1Params extends IGetAuditPlanSQLExportReqV1 { project_name: string; instance_audit_plan_id: string; @@ -157,8 +146,7 @@ export interface IGetInstanceAuditPlanSQLMetaV1Params { audit_plan_id: string; } -export interface IGetInstanceAuditPlanSQLMetaV1Return - extends IGetAuditPlanSQLMetaResV1 {} +export interface IGetInstanceAuditPlanSQLMetaV1Return extends IGetAuditPlanSQLMetaResV1 {} export interface IGetInstanceAuditPlanSQLsV1Params { project_name: string; @@ -172,8 +160,7 @@ export interface IGetInstanceAuditPlanSQLsV1Params { page_size: number; } -export interface IGetInstanceAuditPlanSQLsV1Return - extends IGetAuditPlanSQLsResV1 {} +export interface IGetInstanceAuditPlanSQLsV1Return extends IGetAuditPlanSQLsResV1 {} export interface IGetAuditPlanSqlAnalysisDataV1Params { project_name: string; @@ -185,11 +172,9 @@ export interface IGetAuditPlanSqlAnalysisDataV1Params { affectRowsEnabled?: boolean; } -export interface IGetAuditPlanSqlAnalysisDataV1Return - extends IGetSqlManageSqlAnalysisResp {} +export interface IGetAuditPlanSqlAnalysisDataV1Return extends IGetSqlManageSqlAnalysisResp {} -export interface IRefreshAuditPlanTokenV1Params - extends IRefreshAuditPlanTokenReqV1 { +export interface IRefreshAuditPlanTokenV1Params extends IRefreshAuditPlanTokenReqV1 { project_name: string; instance_audit_plan_id: string; @@ -197,8 +182,7 @@ export interface IRefreshAuditPlanTokenV1Params export interface IRefreshAuditPlanTokenV1Return extends IBaseRes {} -export interface IUploadInstanceAuditPlanSQLsV2Params - extends IUploadInstanceAuditPlanSQLsReqV2 { +export interface IUploadInstanceAuditPlanSQLsV2Params extends IUploadInstanceAuditPlanSQLsReqV2 { project_name: string; audit_plan_id: string; @@ -226,8 +210,7 @@ export interface IGetInstanceAuditPlansV2Params { page_size: number; } -export interface IGetInstanceAuditPlansV2Return - extends IGetInstanceAuditPlansRes {} +export interface IGetInstanceAuditPlansV2Return extends IGetInstanceAuditPlansRes {} export interface IGetInstanceAuditPlanDetailV2Params { project_name: string; @@ -235,5 +218,4 @@ export interface IGetInstanceAuditPlanDetailV2Params { instance_audit_plan_id: string; } -export interface IGetInstanceAuditPlanDetailV2Return - extends IGetInstanceAuditPlanDetailRes {} +export interface IGetInstanceAuditPlanDetailV2Return extends IGetInstanceAuditPlanDetailRes {} diff --git a/packages/shared/lib/api/sqle/service/knowledge_base/index.d.ts b/packages/shared/lib/api/sqle/service/knowledge_base/index.d.ts index c1ba716a8..37d61323c 100644 --- a/packages/shared/lib/api/sqle/service/knowledge_base/index.d.ts +++ b/packages/shared/lib/api/sqle/service/knowledge_base/index.d.ts @@ -22,5 +22,4 @@ export interface IGetKnowledgeGraphParams { export interface IGetKnowledgeGraphReturn extends IGetKnowledgeGraphResp {} -export interface IGetKnowledgeBaseTagListReturn - extends IGetKnowledgeBaseTagListRes {} +export interface IGetKnowledgeBaseTagListReturn extends IGetKnowledgeBaseTagListRes {} diff --git a/packages/shared/lib/api/sqle/service/rule_template/index.d.ts b/packages/shared/lib/api/sqle/service/rule_template/index.d.ts index ff584e2c3..56258388b 100644 --- a/packages/shared/lib/api/sqle/service/rule_template/index.d.ts +++ b/packages/shared/lib/api/sqle/service/rule_template/index.d.ts @@ -47,8 +47,7 @@ export interface IGetRuleTypeByDBTypeV1Params { db_type: string; } -export interface IGetRuleTypeByDBTypeV1Return - extends IGetRuleTypeByDBTypeResV1 {} +export interface IGetRuleTypeByDBTypeV1Return extends IGetRuleTypeByDBTypeResV1 {} export interface IGetCustomRuleV1Params { rule_id: string; @@ -80,8 +79,7 @@ export interface IGetProjectRuleTemplateTipsV1Params { filter_db_type?: string; } -export interface IGetProjectRuleTemplateTipsV1Return - extends IGetRuleTemplateTipsResV1 {} +export interface IGetProjectRuleTemplateTipsV1Return extends IGetRuleTemplateTipsResV1 {} export interface IGetProjectRuleTemplateListV1Params { project_name: string; @@ -91,11 +89,9 @@ export interface IGetProjectRuleTemplateListV1Params { page_size: number; } -export interface IGetProjectRuleTemplateListV1Return - extends IGetProjectRuleTemplatesResV1 {} +export interface IGetProjectRuleTemplateListV1Return extends IGetProjectRuleTemplatesResV1 {} -export interface ICreateProjectRuleTemplateV1Params - extends ICreateProjectRuleTemplateReqV1 { +export interface ICreateProjectRuleTemplateV1Params extends ICreateProjectRuleTemplateReqV1 { project_name: string; } @@ -111,8 +107,7 @@ export interface IGetProjectRuleTemplateV1Params { tags?: string; } -export interface IGetProjectRuleTemplateV1Return - extends IGetProjectRuleTemplateResV1 {} +export interface IGetProjectRuleTemplateV1Return extends IGetProjectRuleTemplateResV1 {} export interface IDeleteProjectRuleTemplateV1Params { project_name: string; @@ -122,8 +117,7 @@ export interface IDeleteProjectRuleTemplateV1Params { export interface IDeleteProjectRuleTemplateV1Return extends IBaseRes {} -export interface IUpdateProjectRuleTemplateV1Params - extends IUpdateProjectRuleTemplateReqV1 { +export interface IUpdateProjectRuleTemplateV1Params extends IUpdateProjectRuleTemplateReqV1 { project_name: string; rule_template_name: string; @@ -131,8 +125,7 @@ export interface IUpdateProjectRuleTemplateV1Params export interface IUpdateProjectRuleTemplateV1Return extends IBaseRes {} -export interface ICloneProjectRuleTemplateV1Params - extends ICloneProjectRuleTemplateReqV1 { +export interface ICloneProjectRuleTemplateV1Params extends ICloneProjectRuleTemplateReqV1 { project_name: string; rule_template_name: string; @@ -154,11 +147,9 @@ export interface IGetCustomRuleKnowledgeV1Params { db_type: string; } -export interface IGetCustomRuleKnowledgeV1Return - extends IGetRuleKnowledgeResV1 {} +export interface IGetCustomRuleKnowledgeV1Return extends IGetRuleKnowledgeResV1 {} -export interface IUpdateCustomRuleKnowledgeParams - extends IUpdateRuleKnowledgeReq { +export interface IUpdateCustomRuleKnowledgeParams extends IUpdateRuleKnowledgeReq { rule_name: string; db_type: string; @@ -186,8 +177,7 @@ export interface IGetRuleTemplateTipsV1Params { filter_db_type?: string; } -export interface IGetRuleTemplateTipsV1Return - extends IGetRuleTemplateTipsResV1 {} +export interface IGetRuleTemplateTipsV1Return extends IGetRuleTemplateTipsResV1 {} export interface IGetRuleTemplateListV1Params { page_index: number; @@ -207,8 +197,7 @@ export interface IImportProjectRuleTemplateV1Params { rule_template_file: any; } -export interface IImportProjectRuleTemplateV1Return - extends IParseProjectRuleTemplateFileResV1 {} +export interface IImportProjectRuleTemplateV1Return extends IParseProjectRuleTemplateFileResV1 {} export interface IGetRuleTemplateV1Params { rule_template_name: string; @@ -260,8 +249,6 @@ export interface IGetRuleListV1Params { export interface IGetRuleListV1Return extends IGetRulesResV1 {} -export interface IGetCategoryStatisticsReturn - extends IGetRuleCategoryStatisticResV1 {} +export interface IGetCategoryStatisticsReturn extends IGetRuleCategoryStatisticResV1 {} -export interface IGetDriverRuleVersionTipsReturn - extends IGetDriverRuleVersionTipsResV1 {} +export interface IGetDriverRuleVersionTipsReturn extends IGetDriverRuleVersionTipsResV1 {} diff --git a/packages/shared/lib/api/sqle/service/sql_analysis/index.d.ts b/packages/shared/lib/api/sqle/service/sql_analysis/index.d.ts index c91c8c515..00bb106d0 100644 --- a/packages/shared/lib/api/sqle/service/sql_analysis/index.d.ts +++ b/packages/shared/lib/api/sqle/service/sql_analysis/index.d.ts @@ -14,8 +14,7 @@ export interface IDirectGetSQLAnalysisV1Params { sql?: string; } -export interface IDirectGetSQLAnalysisV1Return - extends IDirectGetSQLAnalysisResV1 {} +export interface IDirectGetSQLAnalysisV1Return extends IDirectGetSQLAnalysisResV1 {} export interface ISqlLineageAnalyzeV1Params extends ISQLLineageAnalyzeReqV1 {} diff --git a/packages/shared/lib/api/sqle/service/sql_audit_record/index.d.ts b/packages/shared/lib/api/sqle/service/sql_audit_record/index.d.ts index c9836b070..0f978e5c1 100644 --- a/packages/shared/lib/api/sqle/service/sql_audit_record/index.d.ts +++ b/packages/shared/lib/api/sqle/service/sql_audit_record/index.d.ts @@ -59,15 +59,13 @@ export interface ICreateSQLAuditRecordV1Params { git_user_password?: string; } -export interface ICreateSQLAuditRecordV1Return - extends ICreateSQLAuditRecordResV1 {} +export interface ICreateSQLAuditRecordV1Return extends ICreateSQLAuditRecordResV1 {} export interface IGetSQLAuditRecordTagTipsV1Params { project_name: string; } -export interface IGetSQLAuditRecordTagTipsV1Return - extends IGetSQLAuditRecordTagTipsResV1 {} +export interface IGetSQLAuditRecordTagTipsV1Return extends IGetSQLAuditRecordTagTipsResV1 {} export interface IGetSQLAuditRecordV1Params { project_name: string; @@ -77,8 +75,7 @@ export interface IGetSQLAuditRecordV1Params { export interface IGetSQLAuditRecordV1Return extends IGetSQLAuditRecordResV1 {} -export interface IUpdateSQLAuditRecordV1Params - extends IUpdateSQLAuditRecordReqV1 { +export interface IUpdateSQLAuditRecordV1Params extends IUpdateSQLAuditRecordReqV1 { project_name: string; sql_audit_record_id: string; diff --git a/packages/shared/lib/api/sqle/service/sql_optimization/index.d.ts b/packages/shared/lib/api/sqle/service/sql_optimization/index.d.ts index 1339fdb45..24c1fa087 100644 --- a/packages/shared/lib/api/sqle/service/sql_optimization/index.d.ts +++ b/packages/shared/lib/api/sqle/service/sql_optimization/index.d.ts @@ -31,8 +31,7 @@ export interface IGetOptimizationRecordsParams { project_name: string; } -export interface IGetOptimizationRecordsReturn - extends IGetOptimizationRecordsRes {} +export interface IGetOptimizationRecordsReturn extends IGetOptimizationRecordsRes {} export interface IOptimizeSQLReqParams extends IOptimizeSQLReq { project_name: string; @@ -70,8 +69,7 @@ export interface IGetOptimizationRecordReqParams { sql?: string; } -export interface IGetOptimizationRecordReqReturn - extends IGetOptimizationRecordRes {} +export interface IGetOptimizationRecordReqReturn extends IGetOptimizationRecordRes {} export interface IGetOptimizationSQLsParams { page_index: number; @@ -99,8 +97,7 @@ export interface IGetDBPerformanceImproveOverviewParams { project_name: string; } -export interface IGetDBPerformanceImproveOverviewReturn - extends IGetDBPerformanceImproveOverviewResp {} +export interface IGetDBPerformanceImproveOverviewReturn extends IGetDBPerformanceImproveOverviewResp {} export interface IGetOptimizationOverviewParams { filter_create_time_from: string; @@ -110,8 +107,7 @@ export interface IGetOptimizationOverviewParams { project_name: string; } -export interface IGetOptimizationOverviewReturn - extends IGetOptimizationOverviewResp {} +export interface IGetOptimizationOverviewReturn extends IGetOptimizationOverviewResp {} export interface IGetOptimizationRecordsV2Params { fuzzy_search?: string; @@ -131,8 +127,7 @@ export interface IGetOptimizationRecordsV2Params { project_name: string; } -export interface IGetOptimizationRecordsV2Return - extends IGetOptimizationRecordsRes {} +export interface IGetOptimizationRecordsV2Return extends IGetOptimizationRecordsRes {} export interface ISQLOptimizeV2Params extends IOptimizeSQLReq { project_name: string; @@ -174,11 +169,9 @@ export interface IGetOptimizationSQLDetailV2Params { optimization_record_id: string; } -export interface IGetOptimizationSQLDetailV2Return - extends IGetOptimizationDetailRes {} +export interface IGetOptimizationSQLDetailV2Return extends IGetOptimizationDetailRes {} -export interface IAddOptimizedSQLFeedbackParams - extends IOptimizedSQLFeedbackReq { +export interface IAddOptimizedSQLFeedbackParams extends IOptimizedSQLFeedbackReq { project_name: string; optimization_record_id: string; @@ -196,8 +189,7 @@ export interface IDeleteOptimizedSQLFeedbackParams { export interface IDeleteOptimizedSQLFeedbackReturn extends IBaseRes {} -export interface IUpdateOptimizedSQLFeedbackParams - extends IUpdateOptimizedSQLFeedbackReq { +export interface IUpdateOptimizedSQLFeedbackParams extends IUpdateOptimizedSQLFeedbackReq { project_name: string; optimization_record_id: string; diff --git a/packages/shared/lib/api/sqle/service/sql_version/index.d.ts b/packages/shared/lib/api/sqle/service/sql_version/index.d.ts index fc0d5dc61..4790cea5c 100644 --- a/packages/shared/lib/api/sqle/service/sql_version/index.d.ts +++ b/packages/shared/lib/api/sqle/service/sql_version/index.d.ts @@ -47,8 +47,7 @@ export interface IGetSqlVersionDetailV1Params { sql_version_id: string; } -export interface IGetSqlVersionDetailV1Return - extends IGetSqlVersionDetailResV1 {} +export interface IGetSqlVersionDetailV1Return extends IGetSqlVersionDetailResV1 {} export interface IDeleteSqlVersionV1Params { project_name: string; @@ -66,8 +65,7 @@ export interface IUpdateSqlVersionV1Params extends IUpdateSqlVersionReqV1 { export interface IUpdateSqlVersionV1Return extends IBaseRes {} -export interface IBatchExecuteWorkflowsV1Params - extends IBatchExecuteWorkflowsReqV1 { +export interface IBatchExecuteWorkflowsV1Params extends IBatchExecuteWorkflowsReqV1 { project_name: string; sql_version_id: string; @@ -75,8 +73,7 @@ export interface IBatchExecuteWorkflowsV1Params export interface IBatchExecuteWorkflowsV1Return extends IBaseRes {} -export interface IBatchReleaseWorkflowsV1Params - extends IBatchReleaseWorkflowReqV1 { +export interface IBatchReleaseWorkflowsV1Params extends IBatchReleaseWorkflowReqV1 { project_name: string; sql_version_id: string; @@ -100,11 +97,9 @@ export interface IGetWorkflowsThatCanBeAssociatedToVersionV1Params { sql_version_stage_id: string; } -export interface IGetWorkflowsThatCanBeAssociatedToVersionV1Return - extends IGetWorkflowsThatCanBeAssociatedToVersionResV1 {} +export interface IGetWorkflowsThatCanBeAssociatedToVersionV1Return extends IGetWorkflowsThatCanBeAssociatedToVersionResV1 {} -export interface IBatchAssociateWorkflowsWithVersionV1Params - extends IBatchAssociateWorkflowsWithVersionReqV1 { +export interface IBatchAssociateWorkflowsWithVersionV1Params extends IBatchAssociateWorkflowsWithVersionReqV1 { project_name: string; sql_version_id: string; @@ -122,5 +117,4 @@ export interface IGetDependenciesBetweenStageInstanceV1Params { sql_version_stage_id: string; } -export interface IGetDependenciesBetweenStageInstanceV1Return - extends IGetDepBetweenStageInstanceResV1 {} +export interface IGetDependenciesBetweenStageInstanceV1Return extends IGetDepBetweenStageInstanceResV1 {} diff --git a/packages/shared/lib/api/sqle/service/statistic/index.d.ts b/packages/shared/lib/api/sqle/service/statistic/index.d.ts index ada4b6e8e..d5fd7f151 100644 --- a/packages/shared/lib/api/sqle/service/statistic/index.d.ts +++ b/packages/shared/lib/api/sqle/service/statistic/index.d.ts @@ -34,8 +34,7 @@ export interface IStatisticsAuditedSQLV1Params { project_name: string; } -export interface IStatisticsAuditedSQLV1Return - extends IStatisticsAuditedSQLResV1 {} +export interface IStatisticsAuditedSQLV1Return extends IStatisticsAuditedSQLResV1 {} export interface IGetInstanceHealthV1Params { project_name: string; @@ -59,8 +58,7 @@ export interface IStatisticRiskWorkflowV1Params { project_name: string; } -export interface IStatisticRiskWorkflowV1Return - extends IStatisticRiskWorkflowResV1 {} +export interface IStatisticRiskWorkflowV1Return extends IStatisticRiskWorkflowResV1 {} export interface IGetRoleUserCountV1Params { project_name: string; @@ -72,52 +70,43 @@ export interface IStatisticWorkflowStatusV1Params { project_name: string; } -export interface IStatisticWorkflowStatusV1Return - extends IGetWorkflowStatusCountResV1 {} +export interface IStatisticWorkflowStatusV1Return extends IGetWorkflowStatusCountResV1 {} export interface IGetProjectStatisticsV1Params { project_name: string; } -export interface IGetProjectStatisticsV1Return - extends IGetProjectStatisticsResV1 {} +export interface IGetProjectStatisticsV1Return extends IGetProjectStatisticsResV1 {} export interface IGetInstanceOverviewStatisticsV1Params { filter_by_db_service_ids?: string[]; } -export interface IGetInstanceOverviewStatisticsV1Return - extends IGetInstanceOverviewStatisticsRes {} +export interface IGetInstanceOverviewStatisticsV1Return extends IGetInstanceOverviewStatisticsRes {} export interface IGetSqlAverageExecutionTimeV1Params { limit: number; } -export interface IGetSqlAverageExecutionTimeV1Return - extends IGetSqlAverageExecutionTimeResV1 {} +export interface IGetSqlAverageExecutionTimeV1Return extends IGetSqlAverageExecutionTimeResV1 {} export interface IGetSqlExecutionFailPercentV1Params { limit: number; } -export interface IGetSqlExecutionFailPercentV1Return - extends IGetSqlExecutionFailPercentResV1 {} +export interface IGetSqlExecutionFailPercentV1Return extends IGetSqlExecutionFailPercentResV1 {} -export interface IGetInstancesTypePercentV1Return - extends IGetInstancesTypePercentResV1 {} +export interface IGetInstancesTypePercentV1Return extends IGetInstancesTypePercentResV1 {} export interface IGetLicenseUsageV1Return extends IGetLicenseUsageResV1 {} -export interface IGetWorkflowAuditPassPercentV1Return - extends IGetWorkflowAuditPassPercentResV1 {} +export interface IGetWorkflowAuditPassPercentV1Return extends IGetWorkflowAuditPassPercentResV1 {} export interface IGetWorkflowCountV1Return extends IGetWorkflowCountsResV1 {} -export interface IGetWorkflowDurationOfWaitingForAuditV1Return - extends IGetWorkflowDurationOfWaitingForAuditResV1 {} +export interface IGetWorkflowDurationOfWaitingForAuditV1Return extends IGetWorkflowDurationOfWaitingForAuditResV1 {} -export interface IGetWorkflowDurationOfWaitingForExecutionV1Return - extends IGetWorkflowDurationOfWaitingForExecutionResV1 {} +export interface IGetWorkflowDurationOfWaitingForExecutionV1Return extends IGetWorkflowDurationOfWaitingForExecutionResV1 {} export interface IGetWorkflowCreatedCountEachDayV1Params { filter_date_from: string; @@ -125,28 +114,22 @@ export interface IGetWorkflowCreatedCountEachDayV1Params { filter_date_to: string; } -export interface IGetWorkflowCreatedCountEachDayV1Return - extends IGetWorkflowCreatedCountsEachDayResV1 {} +export interface IGetWorkflowCreatedCountEachDayV1Return extends IGetWorkflowCreatedCountsEachDayResV1 {} -export interface IGetWorkflowPercentCountedByInstanceTypeV1Return - extends IGetWorkflowPercentCountedByInstanceTypeResV1 {} +export interface IGetWorkflowPercentCountedByInstanceTypeV1Return extends IGetWorkflowPercentCountedByInstanceTypeResV1 {} -export interface IGetWorkflowPassPercentV1Return - extends IGetWorkflowPassPercentResV1 {} +export interface IGetWorkflowPassPercentV1Return extends IGetWorkflowPassPercentResV1 {} export interface IGetWorkflowRejectedPercentGroupByCreatorV1Params { limit: number; } -export interface IGetWorkflowRejectedPercentGroupByCreatorV1Return - extends IGetWorkflowRejectedPercentGroupByCreatorResV1 {} +export interface IGetWorkflowRejectedPercentGroupByCreatorV1Return extends IGetWorkflowRejectedPercentGroupByCreatorResV1 {} export interface IGetWorkflowRejectedPercentGroupByInstanceV1Params { limit: number; } -export interface IGetWorkflowRejectedPercentGroupByInstanceV1Return - extends IGetWorkflowRejectedPercentGroupByInstanceResV1 {} +export interface IGetWorkflowRejectedPercentGroupByInstanceV1Return extends IGetWorkflowRejectedPercentGroupByInstanceResV1 {} -export interface IGetWorkflowStatusCountV1Return - extends IGetWorkflowStatusCountResV1 {} +export interface IGetWorkflowStatusCountV1Return extends IGetWorkflowStatusCountResV1 {} diff --git a/packages/shared/lib/api/sqle/service/system/index.d.ts b/packages/shared/lib/api/sqle/service/system/index.d.ts index 4b694b4d2..76d9f19b9 100644 --- a/packages/shared/lib/api/sqle/service/system/index.d.ts +++ b/packages/shared/lib/api/sqle/service/system/index.d.ts @@ -5,8 +5,7 @@ import { getSystemModuleStatusModuleNameEnum } from './index.enum'; -export interface IGetSystemModuleRedDotsReturn - extends IGetSystemModuleRedDotsRes {} +export interface IGetSystemModuleRedDotsReturn extends IGetSystemModuleRedDotsRes {} export interface IGetSystemModuleStatusParams { db_type?: getSystemModuleStatusDbTypeEnum; diff --git a/packages/shared/lib/api/sqle/service/task/index.d.ts b/packages/shared/lib/api/sqle/service/task/index.d.ts index 1504b65a3..215011105 100644 --- a/packages/shared/lib/api/sqle/service/task/index.d.ts +++ b/packages/shared/lib/api/sqle/service/task/index.d.ts @@ -32,8 +32,7 @@ export interface ICreateAuditTasksV1Params extends ICreateAuditTasksGroupReqV1 { project_name: string; } -export interface ICreateAuditTasksV1Return - extends ICreateAuditTasksGroupResV1 {} +export interface ICreateAuditTasksV1Return extends ICreateAuditTasksGroupResV1 {} export interface ICreateAndAuditTaskV1Params extends ICreateAuditTaskReqV1 { project_name: string; @@ -79,8 +78,7 @@ export interface IUpdateSqlFileOrderV1Params extends IUpdateSqlFileOrderV1Req { task_id: string; } -export interface IUpdateSqlFileOrderV1Return - extends IGetSqlFileOrderMethodResV1 {} +export interface IUpdateSqlFileOrderV1Return extends IGetSqlFileOrderMethodResV1 {} export interface IAuditTaskGroupIdV1Params { task_group_id: number; @@ -118,8 +116,7 @@ export interface IGetAuditTaskSQLContentV1Params { task_id: string; } -export interface IGetAuditTaskSQLContentV1Return - extends IGetAuditTaskSQLContentResV1 {} +export interface IGetAuditTaskSQLContentV1Return extends IGetAuditTaskSQLContentResV1 {} export interface IDownloadAuditTaskSQLFileV1Params { task_id: string; @@ -149,8 +146,7 @@ export interface IGetAuditTaskSQLsV1Params { export interface IGetAuditTaskSQLsV1Return extends IGetAuditTaskSQLsResV1 {} -export interface IUpdateAuditTaskSQLsV1Params - extends IUpdateAuditTaskSQLsReqV1 { +export interface IUpdateAuditTaskSQLsV1Params extends IUpdateAuditTaskSQLsReqV1 { task_id: string; number: string; @@ -180,11 +176,9 @@ export interface IGetAsyncRewriteTaskStatusParams { number: number; } -export interface IGetAsyncRewriteTaskStatusReturn - extends IAsyncRewriteTaskStatusRes {} +export interface IGetAsyncRewriteTaskStatusReturn extends IAsyncRewriteTaskStatusRes {} -export interface IGetSqlFileOrderMethodV1Return - extends IGetSqlFileOrderMethodResV1 {} +export interface IGetSqlFileOrderMethodV1Return extends IGetSqlFileOrderMethodResV1 {} export interface IGetAuditFileListParams { task_id: string; @@ -202,8 +196,7 @@ export interface IGetAuditFileExecStatisticParams { file_id: string; } -export interface IGetAuditFileExecStatisticReturn - extends IGetAuditFileExecStatisticRes {} +export interface IGetAuditFileExecStatisticReturn extends IGetAuditFileExecStatisticRes {} export interface IGetAuditTaskSQLsV2Params { task_id: string; @@ -233,5 +226,4 @@ export interface IGetTaskAnalysisDataV2Params { affectRowsEnabled?: boolean; } -export interface IGetTaskAnalysisDataV2Return - extends IGetTaskAnalysisDataResV2 {} +export interface IGetTaskAnalysisDataV2Return extends IGetTaskAnalysisDataResV2 {} diff --git a/packages/shared/lib/api/sqle/service/workflow/index.d.ts b/packages/shared/lib/api/sqle/service/workflow/index.d.ts index 10d9f54bd..34e956ded 100644 --- a/packages/shared/lib/api/sqle/service/workflow/index.d.ts +++ b/packages/shared/lib/api/sqle/service/workflow/index.d.ts @@ -52,8 +52,7 @@ import { GetBackupSqlListV1FilterExecStatusEnum } from './index.enum'; -export interface IGetScheduledTaskDefaultOptionV1Return - extends IScheduledTaskDefaultOptionV1Rsp {} +export interface IGetScheduledTaskDefaultOptionV1Return extends IScheduledTaskDefaultOptionV1Rsp {} export interface IGetGlobalDataExportWorkflowsV1Params { filter_create_user_id?: string; @@ -73,8 +72,7 @@ export interface IGetGlobalDataExportWorkflowsV1Params { page_size: number; } -export interface IGetGlobalDataExportWorkflowsV1Return - extends IGetWorkflowsResV1 {} +export interface IGetGlobalDataExportWorkflowsV1Return extends IGetWorkflowsResV1 {} export interface IGetGlobalDataExportWorkflowStatisticsV1Params { filter_create_user_id?: string; @@ -90,8 +88,7 @@ export interface IGetGlobalDataExportWorkflowStatisticsV1Params { filter_current_step_assignee_user_id?: string; } -export interface IGetGlobalDataExportWorkflowStatisticsV1Return - extends IGlobalWorkflowStatisticsResV1 {} +export interface IGetGlobalDataExportWorkflowStatisticsV1Return extends IGlobalWorkflowStatisticsResV1 {} export interface IGetGlobalWorkflowsV1Params { filter_create_user_id?: string; @@ -127,8 +124,7 @@ export interface IGetGlobalWorkflowStatisticsParams { filter_current_step_assignee_user_id?: string; } -export interface IGetGlobalWorkflowStatisticsReturn - extends IGlobalWorkflowStatisticsResV1 {} +export interface IGetGlobalWorkflowStatisticsReturn extends IGlobalWorkflowStatisticsResV1 {} export interface IGetWorkflowTemplateV1Params { project_name: string; @@ -136,11 +132,9 @@ export interface IGetWorkflowTemplateV1Params { workflow_type: getWorkflowTemplateV1WorkflowTypeEnum; } -export interface IGetWorkflowTemplateV1Return - extends IGetWorkflowTemplateResV1 {} +export interface IGetWorkflowTemplateV1Return extends IGetWorkflowTemplateResV1 {} -export interface IUpdateWorkflowTemplateV1Params - extends IUpdateWorkflowTemplateReqV1 { +export interface IUpdateWorkflowTemplateV1Params extends IUpdateWorkflowTemplateReqV1 { project_name: string; workflow_type: updateWorkflowTemplateV1WorkflowTypeEnum; @@ -152,8 +146,7 @@ export interface IGetWorkflowTemplateListV1Params { project_name: string; } -export interface IGetWorkflowTemplateListV1Return - extends IGetWorkflowTemplateListResV1 {} +export interface IGetWorkflowTemplateListV1Return extends IGetWorkflowTemplateListResV1 {} export interface IGetWorkflowsV1Params { filter_subject?: string; @@ -219,18 +212,15 @@ export interface IAutoCreateAndExecuteWorkflowV1Params { input_zip_file?: any; } -export interface IAutoCreateAndExecuteWorkflowV1Return - extends IAutoCreateAndExecuteWorkflowResV1 {} +export interface IAutoCreateAndExecuteWorkflowV1Return extends IAutoCreateAndExecuteWorkflowResV1 {} -export interface IBatchCancelWorkflowsV1Params - extends IBatchCancelWorkflowsReqV1 { +export interface IBatchCancelWorkflowsV1Params extends IBatchCancelWorkflowsReqV1 { project_name: string; } export interface IBatchCancelWorkflowsV1Return extends IBaseRes {} -export interface IBatchCompleteWorkflowsV1Params - extends IBatchCompleteWorkflowsReqV1 { +export interface IBatchCompleteWorkflowsV1Params extends IBatchCompleteWorkflowsReqV1 { project_name: string; } @@ -280,15 +270,13 @@ export interface IGetBackupSqlListV1Params { export interface IGetBackupSqlListV1Return extends IBackupSqlListRes {} -export interface ICreateRollbackWorkflowParams - extends ICreateRollbackWorkflowReq { +export interface ICreateRollbackWorkflowParams extends ICreateRollbackWorkflowReq { project_name: string; workflow_id: string; } -export interface ICreateRollbackWorkflowReturn - extends ICreateRollbackWorkflowRes {} +export interface ICreateRollbackWorkflowReturn extends ICreateRollbackWorkflowRes {} export interface ITerminateMultipleTaskByWorkflowV1Params { workflow_id: string; @@ -306,8 +294,7 @@ export interface IGetWorkflowAttachmentParams { task_id: string; } -export interface IReExecuteTaskOnWorkflowV1Params - extends IReExecuteTaskOnWorkflowReq { +export interface IReExecuteTaskOnWorkflowV1Params extends IReExecuteTaskOnWorkflowReq { project_name: string; workflow_id: string; @@ -377,8 +364,7 @@ export interface IGetSummaryOfInstanceTasksV1Params { project_name: string; } -export interface IGetSummaryOfInstanceTasksV1Return - extends IGetWorkflowTasksResV1 {} +export interface IGetSummaryOfInstanceTasksV1Return extends IGetWorkflowTasksResV1 {} export interface IExecuteTasksOnWorkflowV1Params { workflow_name: string; @@ -398,8 +384,7 @@ export interface IExecuteOneTaskOnWorkflowV1Params { export interface IExecuteOneTaskOnWorkflowV1Return extends IBaseRes {} -export interface IUpdateWorkflowScheduleV1Params - extends IUpdateWorkflowScheduleReqV1 { +export interface IUpdateWorkflowScheduleV1Params extends IUpdateWorkflowScheduleReqV1 { workflow_name: string; task_id: string; @@ -409,15 +394,13 @@ export interface IUpdateWorkflowScheduleV1Params export interface IUpdateWorkflowScheduleV1Return extends IBaseRes {} -export interface IUpdateTaskBackupStrategyV1Params - extends IUpdateTaskBackupStrategyReq { +export interface IUpdateTaskBackupStrategyV1Params extends IUpdateTaskBackupStrategyReq { task_id: string; } export interface IUpdateTaskBackupStrategyV1Return extends IBaseRes {} -export interface IUpdateSqlBackupStrategyV1Params - extends IUpdateSqlBackupStrategyReq { +export interface IUpdateSqlBackupStrategyV1Params extends IUpdateSqlBackupStrategyReq { task_id: string; sql_id: string; @@ -429,8 +412,7 @@ export interface IGetWorkflowStatisticOfInstancesParams { instance_id: string; } -export interface IGetWorkflowStatisticOfInstancesReturn - extends IGetWorkflowStatisticOfInstancesResV1 {} +export interface IGetWorkflowStatisticOfInstancesReturn extends IGetWorkflowStatisticOfInstancesResV1 {} export interface ICreateWorkflowV2Params extends ICreateWorkflowReqV2 { project_name: string; @@ -438,15 +420,13 @@ export interface ICreateWorkflowV2Params extends ICreateWorkflowReqV2 { export interface ICreateWorkflowV2Return extends ICreateWorkflowResV2 {} -export interface IBatchCancelWorkflowsV2Params - extends IBatchCancelWorkflowsReqV2 { +export interface IBatchCancelWorkflowsV2Params extends IBatchCancelWorkflowsReqV2 { project_name: string; } export interface IBatchCancelWorkflowsV2Return extends IBaseRes {} -export interface IBatchCompleteWorkflowsV2Params - extends IBatchCompleteWorkflowsReqV2 { +export interface IBatchCompleteWorkflowsV2Params extends IBatchCompleteWorkflowsReqV2 { project_name: string; } @@ -502,8 +482,7 @@ export interface IGetSummaryOfInstanceTasksV2Params { project_name: string; } -export interface IGetSummaryOfInstanceTasksV2Return - extends IGetWorkflowTasksResV2 {} +export interface IGetSummaryOfInstanceTasksV2Return extends IGetWorkflowTasksResV2 {} export interface IExecuteTasksOnWorkflowV2Params { workflow_id: string; @@ -523,8 +502,7 @@ export interface IExecuteOneTaskOnWorkflowV2Params { export interface IExecuteOneTaskOnWorkflowV2Return extends IBaseRes {} -export interface IUpdateWorkflowScheduleV2Params - extends IUpdateWorkflowScheduleReqV2 { +export interface IUpdateWorkflowScheduleV2Params extends IUpdateWorkflowScheduleReqV2 { workflow_id: string; task_id: string; @@ -534,8 +512,7 @@ export interface IUpdateWorkflowScheduleV2Params export interface IUpdateWorkflowScheduleV2Return extends IBaseRes {} -export interface IBatchCompleteWorkflowsV3Params - extends IBatchCompleteWorkflowsReqV3 { +export interface IBatchCompleteWorkflowsV3Params extends IBatchCompleteWorkflowsReqV3 { project_name: string; } diff --git a/packages/shared/lib/components/MonacoEditor/hooks/__tests__/useMonacoScrollbarHandler.test.ts b/packages/shared/lib/components/MonacoEditor/hooks/__tests__/useMonacoScrollbarHandler.test.ts index 8368a400a..82dfb4ab9 100644 --- a/packages/shared/lib/components/MonacoEditor/hooks/__tests__/useMonacoScrollbarHandler.test.ts +++ b/packages/shared/lib/components/MonacoEditor/hooks/__tests__/useMonacoScrollbarHandler.test.ts @@ -15,7 +15,7 @@ const createMockEditor = (overrides = {}) => onDidChangeModelContent: jest.fn(), onDidLayoutChange: jest.fn(), ...overrides - } as unknown as editor.IStandaloneCodeEditor); + }) as unknown as editor.IStandaloneCodeEditor; const createMockMonaco = () => ({ @@ -23,7 +23,7 @@ const createMockMonaco = () => defineTheme: jest.fn(), setTheme: jest.fn() } - } as unknown as Monaco); + }) as unknown as Monaco; describe('useMonacoScrollbarHandler', () => { it('should return required refs and setupScrollbarHandler function', () => { diff --git a/packages/shared/lib/components/SQLRenderer/__tests__/__snapshots__/SQLRenderer.test.tsx.snap b/packages/shared/lib/components/SQLRenderer/__tests__/__snapshots__/SQLRenderer.test.tsx.snap index 3eadce090..4f2aa2256 100644 --- a/packages/shared/lib/components/SQLRenderer/__tests__/__snapshots__/SQLRenderer.test.tsx.snap +++ b/packages/shared/lib/components/SQLRenderer/__tests__/__snapshots__/SQLRenderer.test.tsx.snap @@ -3,7 +3,7 @@ exports[`test SQLRenderer should apply word-wrap class when wordWrap is true 1`] = `
       
@@ -170,7 +170,7 @@ exports[`test SQLRenderer should render with different props configurations 1`]
       class="ant-spin-container"
     >
       
           
@@ -371,7 +371,7 @@ exports[`test SQLRenderer should render with different props configurations 1`]
 exports[`test SQLRenderer should render with different props configurations 2`] = `
 
       
diff --git a/packages/shared/lib/components/SQLRenderer/__tests__/__snapshots__/Snippet.test.tsx.snap b/packages/shared/lib/components/SQLRenderer/__tests__/__snapshots__/Snippet.test.tsx.snap
index 4805e5bd1..377ea6880 100644
--- a/packages/shared/lib/components/SQLRenderer/__tests__/__snapshots__/Snippet.test.tsx.snap
+++ b/packages/shared/lib/components/SQLRenderer/__tests__/__snapshots__/Snippet.test.tsx.snap
@@ -3,7 +3,7 @@
 exports[`test SQLRenderer.Snippet render snap when basic props are set 1`] = `
 
= string extends T ? Record : // eslint-disable-next-line @typescript-eslint/no-unused-vars - T extends `${infer _}:${infer Param}/${infer Rest}` - ? { [K in Param | keyof ExtractPathParams]: string } - : // eslint-disable-next-line @typescript-eslint/no-unused-vars - T extends `${infer _}:${infer Param}` - ? { [K in Param]: string } - : unknown; + T extends `${infer _}:${infer Param}/${infer Rest}` + ? { [K in Param | keyof ExtractPathParams]: string } + : // eslint-disable-next-line @typescript-eslint/no-unused-vars + T extends `${infer _}:${infer Param}` + ? { [K in Param]: string } + : unknown; // 提取查询参数 export type ExtractPathQueries = string extends T ? Record : T extends `${infer Param}&${infer Rest}` - ? { [K in Param]?: string } & ExtractPathQueries - : T extends `${infer Param}` - ? { [K in Param]?: string } - : unknown; + ? { [K in Param]?: string } & ExtractPathQueries + : T extends `${infer Param}` + ? { [K in Param]?: string } + : unknown; export type InferParamsFromConfig = T extends ObjectRoutePathValue ? T['prefix'] extends string @@ -35,11 +35,11 @@ export type InferParamsFromConfig = T extends ObjectRoutePathValue ? ExtractPathParams & ExtractPathParams : ExtractPathParams : ExtractPathParams extends object + ? ExtractPathParams + : never + : ExtractPathParams extends object ? ExtractPathParams : never - : ExtractPathParams extends object - ? ExtractPathParams - : never : never; export type InferQueriesFromConfig = T extends ObjectRoutePathValue @@ -61,26 +61,27 @@ export type TypedLinkProps = Omit< } : { to: T; queries?: InferQueriesFromConfig } : InferQueriesFromConfig extends never - ? { - to: T | To; - params: InferParamsFromConfig; - } - : { - to: T | To; - params: InferParamsFromConfig; - queries?: InferQueriesFromConfig; - }); + ? { + to: T | To; + params: InferParamsFromConfig; + } + : { + to: T | To; + params: InferParamsFromConfig; + queries?: InferQueriesFromConfig; + }); -export type NavigateTypedOptions = InferParamsFromConfig extends never - ? InferQueriesFromConfig extends never - ? NavigateOptions - : NavigateOptions & { queries?: InferQueriesFromConfig } - : InferQueriesFromConfig extends never - ? NavigateOptions & { params: InferParamsFromConfig } - : NavigateOptions & { - params: InferParamsFromConfig; - queries?: InferQueriesFromConfig; - }; +export type NavigateTypedOptions = + InferParamsFromConfig extends never + ? InferQueriesFromConfig extends never + ? NavigateOptions + : NavigateOptions & { queries?: InferQueriesFromConfig } + : InferQueriesFromConfig extends never + ? NavigateOptions & { params: InferParamsFromConfig } + : NavigateOptions & { + params: InferParamsFromConfig; + queries?: InferQueriesFromConfig; + }; // todo 遗留 params 存在但 options 为可选参数的问题 export type NavigateFunction = { diff --git a/packages/shared/lib/features/usePermission/index.type.ts b/packages/shared/lib/features/usePermission/index.type.ts index 91508c479..9cbd9e28c 100644 --- a/packages/shared/lib/features/usePermission/index.type.ts +++ b/packages/shared/lib/features/usePermission/index.type.ts @@ -16,8 +16,8 @@ type ReplaceButtonsPermissions = T extends (...args: any[]) => any ? Array> : ReturnType : T extends Array - ? Array> - : T; + ? Array> + : T; // 根据 ActiontechTableActionsConfig 调整内部 permissions 的类型 export type ActiontechTableActionsWithPermissions< diff --git a/packages/shared/lib/features/usePermission/permissions.ts b/packages/shared/lib/features/usePermission/permissions.ts index af725c8b5..940461bc9 100644 --- a/packages/shared/lib/features/usePermission/permissions.ts +++ b/packages/shared/lib/features/usePermission/permissions.ts @@ -289,7 +289,7 @@ type ValueOf = T[keyof T]; type PermissionValueType = T extends string ? T : T extends object - ? PermissionValueType> - : never; + ? PermissionValueType> + : never; export type PermissionsConstantType = PermissionValueType; diff --git a/packages/shared/lib/types/ambient-modules.d.ts b/packages/shared/lib/types/ambient-modules.d.ts new file mode 100644 index 000000000..35306c6fc --- /dev/null +++ b/packages/shared/lib/types/ambient-modules.d.ts @@ -0,0 +1 @@ +declare module '*.css'; diff --git a/packages/shared/package.json b/packages/shared/package.json index f78ab4c84..e753901b3 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -5,15 +5,23 @@ "license": "MIT", "scripts": { "build": "tsup", + "oxlint": "oxlint --no-error-on-unmatched-pattern src lib api", + "typecheck": "tsc --noEmit -p tsconfig.json", + "stylelint": "stylelint \"{src,lib}/**/{*.less,style.ts,element.ts}\" --allow-empty-input", + "oxfmt": "oxfmt --check \"src/**/*\" \"lib/**/*\"", + "check": "echo \"shared check\"", "test": "jest --watchAll=true", - "test:c": "jest --watchAll=false --coverage", - "test:ci": "jest --ci --watchAll=false --coverage --color --silent --testLocationInResults" + "test:c": "jest --watchAll=false --coverage --coverageDirectory=coverage", + "test:run": "jest --watchAll=false --color", + "test:run:u": "jest -u --watchAll=false --color", + "test:ci": "jest --ci --watchAll=false --coverage --coverageDirectory=coverage --json --outputFile=coverage/report.json --color --silent --testLocationInResults" }, "dependencies": { "@actiontech/icons": "workspace:^", "@actiontech/dms-kit": "workspace:^" }, "devDependencies": { + "@actiontech/tooling-config": "workspace:^", "tsup": "^8.5.0" } -} \ No newline at end of file +} diff --git a/packages/shared/tsconfig.json b/packages/shared/tsconfig.json index ee6467a89..123b99889 100644 --- a/packages/shared/tsconfig.json +++ b/packages/shared/tsconfig.json @@ -3,7 +3,10 @@ "include": ["./lib"], "compilerOptions": { "paths": { - "~/*": ["./src/*"] + "~/*": ["./src/*"], + "@actiontech/dms-kit": ["../dms-kit/src/index.ts"], + "@actiontech/dms-kit/es/*": ["../dms-kit/src/*"], + "@actiontech/dms-kit/*": ["../dms-kit/src/*"] } } } diff --git a/packages/sqle/Makefile b/packages/sqle/Makefile deleted file mode 100644 index 949d4242d..000000000 --- a/packages/sqle/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -test: - docker pull docker-registry:5000/actiontech/sqle-ui-unit-test && \ - docker run --rm -v ${shell pwd}:/app docker-registry:5000/actiontech/sqle-ui-unit-test diff --git a/packages/sqle/jest.config.mjs b/packages/sqle/jest.config.mjs new file mode 100644 index 000000000..06aa95479 --- /dev/null +++ b/packages/sqle/jest.config.mjs @@ -0,0 +1,21 @@ +import { createJestConfig } from '@actiontech/tooling-config/jest/create-jest-config'; +import { fileURLToPath } from 'node:url'; +import path from 'node:path'; + +const packageRoot = path.dirname(fileURLToPath(import.meta.url)); + +export default createJestConfig({ + packageRoot, + enabledProjects: ['dms', 'sqle-ce', 'sqle-ee'], + collectCoverageFrom: [ + 'src/{page,components,hooks,global,store,utils}/**/*.{ts,tsx}', + 'src/App.tsx', + '!src/**/*.test.{ts,tsx}', + '!src/**/*.type.ts', + '!src/**/*.enum.ts', + '!src/page/SqlAnalyze/SqlAnalyze/ProcessListCom/**', + '!src/page/Knowledge/Graph/components/**', + '!src/**/demo/**', + '!src/**/demos/**' + ] +}); diff --git a/packages/sqle/package.json b/packages/sqle/package.json index 68dacf6a5..ff5e44b9a 100644 --- a/packages/sqle/package.json +++ b/packages/sqle/package.json @@ -23,6 +23,7 @@ "web-vitals": "^0.2.4" }, "devDependencies": { + "@actiontech/tooling-config": "workspace:^", "@types/react-grid-layout": "^1.3.2", "graphology-types": "^0.24.8", "jest-canvas-mock": "^2.2.0" @@ -30,10 +31,16 @@ "scripts": { "start": "PORT=3030 craco start", "build": "craco build", + "oxlint": "oxlint --no-error-on-unmatched-pattern src", + "typecheck": "tsc --noEmit -p tsconfig.json", + "stylelint": "stylelint \"src/**/{*.less,style.ts,element.ts}\" --allow-empty-input", + "oxfmt": "oxfmt --check \"src/**/*\"", + "check": "echo \"sqle check\"", "test": "jest --watchAll=true", - "test:c": "jest --watchAll=false --coverage", - "test:ci": "jest --ci --watchAll=false --coverage --color --silent --testLocationInResults", - "eject": "react-scripts eject" + "test:c": "jest --watchAll=false --coverage --coverageDirectory=coverage", + "test:run": "jest --watchAll=false --color", + "test:run:u": "jest -u --watchAll=false --color", + "test:ci": "jest --ci --watchAll=false --coverage --coverageDirectory=coverage --json --outputFile=coverage/report.json --color --silent --testLocationInResults" }, "browserslist": { "production": [ diff --git a/packages/sqle/src/components/SqlRewrittenDrawer/__tests__/components/__snapshots__/OverallRewrittenSuggestion.test.tsx.snap b/packages/sqle/src/components/SqlRewrittenDrawer/__tests__/components/__snapshots__/OverallRewrittenSuggestion.test.tsx.snap index 98980f85c..cbdc05d53 100644 --- a/packages/sqle/src/components/SqlRewrittenDrawer/__tests__/components/__snapshots__/OverallRewrittenSuggestion.test.tsx.snap +++ b/packages/sqle/src/components/SqlRewrittenDrawer/__tests__/components/__snapshots__/OverallRewrittenSuggestion.test.tsx.snap @@ -117,12 +117,12 @@ exports[`OverallRewrittenSuggestion should render execution order explanation se
查看差异
查看SQL执行解释
diff --git a/packages/sqle/src/components/SqlRewrittenDrawer/__tests__/components/__snapshots__/RewriteProgressDisplay.test.tsx.snap b/packages/sqle/src/components/SqlRewrittenDrawer/__tests__/components/__snapshots__/RewriteProgressDisplay.test.tsx.snap index 43a961b10..5d36376c2 100644 --- a/packages/sqle/src/components/SqlRewrittenDrawer/__tests__/components/__snapshots__/RewriteProgressDisplay.test.tsx.snap +++ b/packages/sqle/src/components/SqlRewrittenDrawer/__tests__/components/__snapshots__/RewriteProgressDisplay.test.tsx.snap @@ -165,7 +165,7 @@ exports[`RewriteProgressDisplay Component Rendering should render progress conta
查看差异
@@ -225,7 +225,7 @@ exports[`RewrittenSuggestionDetails and RewrittenSuggestionItem RewrittenSuggest
查看差异
@@ -391,7 +391,7 @@ exports[`RewrittenSuggestionDetails and RewrittenSuggestionItem RewrittenSuggest
查看差异
diff --git a/packages/sqle/src/components/SqlRewrittenDrawer/components/RewriteProgressDisplay/index.tsx b/packages/sqle/src/components/SqlRewrittenDrawer/components/RewriteProgressDisplay/index.tsx index 8657482e8..d9c66fa26 100644 --- a/packages/sqle/src/components/SqlRewrittenDrawer/components/RewriteProgressDisplay/index.tsx +++ b/packages/sqle/src/components/SqlRewrittenDrawer/components/RewriteProgressDisplay/index.tsx @@ -273,9 +273,12 @@ const RewriteProgressDisplay: React.FC = ({ const isProcessing = rule.status === RewriteSuggestionStatusEnum.initial; const hasExistingTimer = activeProgressTimers.current.has(rule.ruleId); if (isProcessing && !hasExistingTimer) { - const initialDelay = setTimeout(() => { - startRuleStageProgress(rule.ruleId); - }, Math.random() * 1000 + 500); + const initialDelay = setTimeout( + () => { + startRuleStageProgress(rule.ruleId); + }, + Math.random() * 1000 + 500 + ); activeProgressTimers.current.set(rule.ruleId, initialDelay); } else if (!isProcessing && hasExistingTimer) { clearRuleTimer(rule.ruleId); diff --git a/packages/sqle/src/components/SqlRewrittenDrawer/index.type.ts b/packages/sqle/src/components/SqlRewrittenDrawer/index.type.ts index 185dc93b8..05324180d 100644 --- a/packages/sqle/src/components/SqlRewrittenDrawer/index.type.ts +++ b/packages/sqle/src/components/SqlRewrittenDrawer/index.type.ts @@ -21,5 +21,4 @@ interface SqlRewrittenDrawerBaseProps { } export interface SqlRewrittenDrawerWithBaseProps - extends SqlRewrittenDrawerBaseProps, - SqlRewrittenDrawerProps {} + extends SqlRewrittenDrawerBaseProps, SqlRewrittenDrawerProps {} diff --git a/packages/sqle/src/hooks/useStaticStatus/index.data.ts b/packages/sqle/src/hooks/useStaticStatus/index.data.ts index bef639716..3b533dd8f 100644 --- a/packages/sqle/src/hooks/useStaticStatus/index.data.ts +++ b/packages/sqle/src/hooks/useStaticStatus/index.data.ts @@ -16,10 +16,13 @@ import { t } from '../../locale'; export const translateDictionaryI18nLabel = ( dic: StaticEnumDictionary ) => { - return Object.keys(dic).reduce>((acc, cur) => { - const key = cur as keyof StaticEnumDictionary; - return { ...acc, [key]: t(dic[key]) }; - }, {} as Record); + return Object.keys(dic).reduce>( + (acc, cur) => { + const key = cur as keyof StaticEnumDictionary; + return { ...acc, [key]: t(dic[key]) }; + }, + {} as Record + ); }; export const execStatusDictionary: StaticEnumDictionary = diff --git a/packages/sqle/src/index.tsx b/packages/sqle/src/index.tsx index 6a1ae6db0..a15dc4bfe 100644 --- a/packages/sqle/src/index.tsx +++ b/packages/sqle/src/index.tsx @@ -6,8 +6,6 @@ import { Provider } from 'react-redux'; import store from './store'; import { BrowserRouter as Router } from 'react-router-dom'; import './locale'; -import './utils/HighlightCode'; -import './index.less'; import { initReactI18n } from './locale'; ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render( diff --git a/packages/sqle/src/page/DataSourceComparison/ComparisonEntry/__tests__/__snapshots__/ModifedSqlAuditResult.test.tsx.snap b/packages/sqle/src/page/DataSourceComparison/ComparisonEntry/__tests__/__snapshots__/ModifedSqlAuditResult.test.tsx.snap index 708e474c4..239e50bcc 100644 --- a/packages/sqle/src/page/DataSourceComparison/ComparisonEntry/__tests__/__snapshots__/ModifedSqlAuditResult.test.tsx.snap +++ b/packages/sqle/src/page/DataSourceComparison/ComparisonEntry/__tests__/__snapshots__/ModifedSqlAuditResult.test.tsx.snap @@ -246,7 +246,7 @@ exports[`ModifiedSqlAuditResult index should set the activeTabKey to the first s
                     
@@ -371,7 +371,7 @@ exports[`ModifiedSqlAuditResult index should set the activeTabKey to the first s
                   
                     
@@ -540,7 +540,7 @@ exports[`ModifiedSqlAuditResult index should set the activeTabKey to the first s
                   
                     
@@ -804,7 +804,7 @@ exports[`ModifiedSqlAuditResult index should update the activeTabKey and re-rend
                   
                     
@@ -929,7 +929,7 @@ exports[`ModifiedSqlAuditResult index should update the activeTabKey and re-rend
                   
                     
@@ -1098,7 +1098,7 @@ exports[`ModifiedSqlAuditResult index should update the activeTabKey and re-rend
                   
                     
@@ -1222,7 +1222,7 @@ exports[`ModifiedSqlAuditResult list should render the correct number of list it
                   
                     
@@ -1347,7 +1347,7 @@ exports[`ModifiedSqlAuditResult list should render the correct number of list it
                   
                     
@@ -1516,7 +1516,7 @@ exports[`ModifiedSqlAuditResult list should render the correct number of list it
                   
                     
diff --git a/packages/sqle/src/page/DataSourceComparison/ComparisonEntry/__tests__/__snapshots__/index.test.tsx.snap b/packages/sqle/src/page/DataSourceComparison/ComparisonEntry/__tests__/__snapshots__/index.test.tsx.snap
index 455a5bfee..b55e78242 100644
--- a/packages/sqle/src/page/DataSourceComparison/ComparisonEntry/__tests__/__snapshots__/index.test.tsx.snap
+++ b/packages/sqle/src/page/DataSourceComparison/ComparisonEntry/__tests__/__snapshots__/index.test.tsx.snap
@@ -507,7 +507,7 @@ exports[`EnvironmentSelector should handle card click correctly 1`] = `
                 style="margin-right: 12px;"
               >
                 
只看差异
@@ -2068,7 +2068,7 @@ exports[`EnvironmentSelector should handle card click correctly 2`] = ` style="margin-right: 12px;" >
只看差异
diff --git a/packages/sqle/src/page/GlobalDashboard/components/SqlGovernancePanel/__tests__/__snapshots__/index.test.tsx.snap b/packages/sqle/src/page/GlobalDashboard/components/SqlGovernancePanel/__tests__/__snapshots__/index.test.tsx.snap index 08a7fd072..64eab3721 100644 --- a/packages/sqle/src/page/GlobalDashboard/components/SqlGovernancePanel/__tests__/__snapshots__/index.test.tsx.snap +++ b/packages/sqle/src/page/GlobalDashboard/components/SqlGovernancePanel/__tests__/__snapshots__/index.test.tsx.snap @@ -373,7 +373,7 @@ exports[`GlobalDashboard/SqlGovernancePanel should render sql governance panel a class="global-dashboard-sql-fingerprint-cell" >
{ getWorkflowStatistics={getWorkflowStatistics} projectName={projectName} /> - {/* todo 智能扫描重构,先隐藏 + {/* todo 智能扫描重构,先隐藏 */} ); diff --git a/packages/sqle/src/page/Knowledge/Common/KnowledgeSearchBar/index.type.ts b/packages/sqle/src/page/Knowledge/Common/KnowledgeSearchBar/index.type.ts index b85d6bc13..32caeda19 100644 --- a/packages/sqle/src/page/Knowledge/Common/KnowledgeSearchBar/index.type.ts +++ b/packages/sqle/src/page/Knowledge/Common/KnowledgeSearchBar/index.type.ts @@ -1,7 +1,8 @@ import useKnowledgeSearchBar from './hooks/useKnowledgeSearchBar'; -export interface KnowledgeSearchBarProps - extends Partial> { +export interface KnowledgeSearchBarProps extends Partial< + ReturnType +> { onSearch?: (params: { searchText: string; selectedTags?: string[] }) => void; allowSelectTag?: boolean; allowSearchEmptyText?: boolean; diff --git a/packages/sqle/src/page/Knowledge/Graph/style.ts b/packages/sqle/src/page/Knowledge/Graph/style.ts index 86d14580a..3eb281a6f 100644 --- a/packages/sqle/src/page/Knowledge/Graph/style.ts +++ b/packages/sqle/src/page/Knowledge/Graph/style.ts @@ -9,7 +9,8 @@ export const KnowledgeGraphStyleWrapper = styled('div')` border: 1px solid ${({ theme }) => theme.sqleTheme.knowledgeTheme.graph.wrapper.borderColor}; background-blend-mode: soft-light; - background-image: radial-gradient( + background-image: + radial-gradient( ${({ theme }) => theme.sqleTheme.knowledgeTheme.graph.wrapper.dotColor} 1px, ${({ theme }) => @@ -24,7 +25,9 @@ export const KnowledgeGraphStyleWrapper = styled('div')` 1px ); background-size: 20px 20px; - background-position: 0 0, 10px 10px; + background-position: + 0 0, + 10px 10px; .ant-spin-nested-loading { width: 100%; diff --git a/packages/sqle/src/page/Knowledge/__tests__/__snapshots__/index.test.tsx.snap b/packages/sqle/src/page/Knowledge/__tests__/__snapshots__/index.test.tsx.snap index 6e2a51dfd..0a7055de7 100644 --- a/packages/sqle/src/page/Knowledge/__tests__/__snapshots__/index.test.tsx.snap +++ b/packages/sqle/src/page/Knowledge/__tests__/__snapshots__/index.test.tsx.snap @@ -47,7 +47,7 @@ exports[`Knowledge render init snap 1`] = `
{ setDetailData( clickData?.type?.startsWith(defaultItemKey) ? {} - : data.filter( + : (data.filter( (item: IDBTypeAuditPlan) => clickData?.type === item.db_type - )?.[0] ?? {} + )?.[0] ?? {}) ); }; const chartChildrenProps = useMemo(() => { diff --git a/packages/sqle/src/page/ProjectOverview/index.tsx b/packages/sqle/src/page/ProjectOverview/index.tsx index 304745571..6e035e243 100644 --- a/packages/sqle/src/page/ProjectOverview/index.tsx +++ b/packages/sqle/src/page/ProjectOverview/index.tsx @@ -77,7 +77,7 @@ const Overview = () => { - {/* todo 智能扫描重构 先隐藏 + {/* todo 智能扫描重构 先隐藏 */} @@ -104,7 +104,7 @@ const Overview = () => {
- {/* todo 智能扫描重构 先隐藏 + {/* todo 智能扫描重构 先隐藏
diff --git a/packages/sqle/src/page/PushRuleConfiguration/components/WorkflowUpdateNotifier/index.tsx b/packages/sqle/src/page/PushRuleConfiguration/components/WorkflowUpdateNotifier/index.tsx index 3b07f2094..0deecac5b 100644 --- a/packages/sqle/src/page/PushRuleConfiguration/components/WorkflowUpdateNotifier/index.tsx +++ b/packages/sqle/src/page/PushRuleConfiguration/components/WorkflowUpdateNotifier/index.tsx @@ -94,7 +94,7 @@ const WorkflowUpdateNotifier: React.FC = ({ dataIndex: 'trigger_type', render: (type) => { return type - ? WorkflowPushFrequencyDictionary[type] ?? 'unknown' + ? (WorkflowPushFrequencyDictionary[type] ?? 'unknown') : '--'; } }, @@ -103,7 +103,7 @@ const WorkflowUpdateNotifier: React.FC = ({ dataIndex: 'push_user_Type', render: (type) => { return type - ? WorkflowPushUserTypeDictionary[type] ?? 'unknown' + ? (WorkflowPushUserTypeDictionary[type] ?? 'unknown') : '--'; } }, diff --git a/packages/sqle/src/page/ReportStatistics/AIGovernanceTab/components/ManagementView/components/ProjectIOAnalysis/index.test.tsx b/packages/sqle/src/page/ReportStatistics/AIGovernanceTab/components/ManagementView/components/ProjectIOAnalysis/index.test.tsx index 8fda55dd6..d3ccae49a 100644 --- a/packages/sqle/src/page/ReportStatistics/AIGovernanceTab/components/ManagementView/components/ProjectIOAnalysis/index.test.tsx +++ b/packages/sqle/src/page/ReportStatistics/AIGovernanceTab/components/ManagementView/components/ProjectIOAnalysis/index.test.tsx @@ -123,7 +123,7 @@ describe('ReportStatistics/ManagementView/ProjectIOAnalysis', () => { colorTextBase: '#111' } } - } as any) + }) as any ); const { container } = sqleSuperRender( diff --git a/packages/sqle/src/page/ReportStatistics/EEIndex/component/base/CardShow/index.tsx b/packages/sqle/src/page/ReportStatistics/EEIndex/component/base/CardShow/index.tsx index 91222a9b5..829de6c8f 100644 --- a/packages/sqle/src/page/ReportStatistics/EEIndex/component/base/CardShow/index.tsx +++ b/packages/sqle/src/page/ReportStatistics/EEIndex/component/base/CardShow/index.tsx @@ -37,7 +37,7 @@ const CardShow = (props: ICardShowProps) => { }} /> ) : ( - numberCont ?? defaultNumber + (numberCont ?? defaultNumber) )}
{noteCont}
diff --git a/packages/sqle/src/page/Rule/__snapshots__/index.test.tsx.snap b/packages/sqle/src/page/Rule/__snapshots__/index.test.tsx.snap index 712d51290..d67387b70 100644 --- a/packages/sqle/src/page/Rule/__snapshots__/index.test.tsx.snap +++ b/packages/sqle/src/page/Rule/__snapshots__/index.test.tsx.snap @@ -55,7 +55,7 @@ exports[`sqle/Rule should filter list based on project name correctly 1`] = ` style="margin-right: 12px;" >
{ + code: ({ + children, + className, + node + }: { + children: string; + className: string; + node: { children: Parameters[0] }; + }) => { /** * label 代码块 * Example: @@ -23,11 +31,8 @@ export const markdownPreviewOptions: PreviewOptions = { if (isArray(match) && !!match[1]) { return ; } - const code = - props.node && props.node.children - ? getCodeString(props.node.children) - : children; + node && node.children ? getCodeString(node.children) : children; /** * sql_diff 代码块 * Example: diff --git a/packages/sqle/src/page/RuleKnowledge/RuleUnderstand/__tests__/__snapshots__/index.test.tsx.snap b/packages/sqle/src/page/RuleKnowledge/RuleUnderstand/__tests__/__snapshots__/index.test.tsx.snap index 5fa42ff66..2eabfd895 100644 --- a/packages/sqle/src/page/RuleKnowledge/RuleUnderstand/__tests__/__snapshots__/index.test.tsx.snap +++ b/packages/sqle/src/page/RuleKnowledge/RuleUnderstand/__tests__/__snapshots__/index.test.tsx.snap @@ -53,7 +53,7 @@ exports[`page/RuleUnderstand render content data 1`] = ` 关联的语法节点
                                   
diff --git a/packages/sqle/src/page/SqlAnalyze/ManagementConf/__snapshots__/index.test.tsx.snap b/packages/sqle/src/page/SqlAnalyze/ManagementConf/__snapshots__/index.test.tsx.snap
index 7eeedf74e..41be9a3fd 100644
--- a/packages/sqle/src/page/SqlAnalyze/ManagementConf/__snapshots__/index.test.tsx.snap
+++ b/packages/sqle/src/page/SqlAnalyze/ManagementConf/__snapshots__/index.test.tsx.snap
@@ -110,7 +110,7 @@ exports[`SqlAnalyze/ManagementConfAnalyze filter sql execution plan cost 1`] = `
                     class="basic-cont-wrapper sql-cont"
                   >
                     
{ +export interface AuditResultTableProps extends Pick< + AuditResultListProps, + | 'updateTaskRecordCount' + | 'allowSwitchBackupPolicy' + | 'updateTaskAuditRuleExceptionStatus' +> { noDuplicate: boolean; taskID?: string; auditLevelFilterValue: getAuditTaskSQLsV2FilterAuditLevelEnum | null; diff --git a/packages/sqle/src/page/SqlExecWorkflow/Common/AuditResultList/__tests__/__snapshots__/index.test.tsx.snap b/packages/sqle/src/page/SqlExecWorkflow/Common/AuditResultList/__tests__/__snapshots__/index.test.tsx.snap index 0a5afc895..7c82eec46 100644 --- a/packages/sqle/src/page/SqlExecWorkflow/Common/AuditResultList/__tests__/__snapshots__/index.test.tsx.snap +++ b/packages/sqle/src/page/SqlExecWorkflow/Common/AuditResultList/__tests__/__snapshots__/index.test.tsx.snap @@ -1848,7 +1848,7 @@ exports[`sqle/ExecWorkflow/Common/AuditResultList render snap has task 2`] = ` class="ant-table-cell audit-result-exec-sql-column" >
- >((acc, curr, index) => { - return { - ...acc, - [index]: { - form_data: curr.modify_sqls - ?.flatMap((v) => v.sql_statement) - ?.join('\n') - } - }; - }, {} as Record); + >( + (acc, curr, index) => { + return { + ...acc, + [index]: { + form_data: curr.modify_sqls + ?.flatMap((v) => v.sql_statement) + ?.join('\n') + } + }; + }, + {} as Record + ); form.setFieldsValue({ isSameSqlForAll: false, databaseInfo: databaseDiffModifiedSqlInfos.map((item) => { diff --git a/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/RetryExecuteModal/__tests__/__snapshots__/index.test.tsx.snap b/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/RetryExecuteModal/__tests__/__snapshots__/index.test.tsx.snap index d4b654ced..d9f7e6335 100644 --- a/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/RetryExecuteModal/__tests__/__snapshots__/index.test.tsx.snap +++ b/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/RetryExecuteModal/__tests__/__snapshots__/index.test.tsx.snap @@ -229,7 +229,7 @@ exports[`RetryExecuteModal handles row selection correctly 1`] = ` class="ant-table-cell" >
{ +export interface SortableSQLFilesTableRowProps extends React.HTMLAttributes { 'data-row-key': string; } diff --git a/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/TaskResultList/Common/ResultCard/__tests__/__snapshots__/FileMode.test.tsx.snap b/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/TaskResultList/Common/ResultCard/__tests__/__snapshots__/FileMode.test.tsx.snap index b10de9fdc..14193558d 100644 --- a/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/TaskResultList/Common/ResultCard/__tests__/__snapshots__/FileMode.test.tsx.snap +++ b/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/TaskResultList/Common/ResultCard/__tests__/__snapshots__/FileMode.test.tsx.snap @@ -830,7 +830,7 @@ exports[`test TaskResultList/Result/FileMode should render collapse children and class="ant-table-cell ellipsis-column-large-width" >
                   
@@ -263,7 +263,7 @@ exports[`sqle/ExecWorkflow/AuditDetail/SqlMode ce render init snap 1`] = `
                   class="ant-space-item"
                 >
                   
                       
diff --git a/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/TaskResultList/Common/ResultCard/__tests__/__snapshots__/SqlMode.test.tsx.snap b/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/TaskResultList/Common/ResultCard/__tests__/__snapshots__/SqlMode.test.tsx.snap
index c22974542..b886caf26 100644
--- a/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/TaskResultList/Common/ResultCard/__tests__/__snapshots__/SqlMode.test.tsx.snap
+++ b/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/TaskResultList/Common/ResultCard/__tests__/__snapshots__/SqlMode.test.tsx.snap
@@ -260,7 +260,7 @@ exports[`sqle/ExecWorkflow/AuditDetail/SqlMode render associated rollback workfl
               class="lazy-load-wrapper segmented-item-content lazy-load-wrapper-show css-952l0m"
             >
               
                   
@@ -643,7 +643,7 @@ exports[`sqle/ExecWorkflow/AuditDetail/SqlMode render backup strategy tip 1`] =
               class="lazy-load-wrapper segmented-item-content lazy-load-wrapper-hidden css-952l0m"
             >
               
                   
@@ -718,7 +718,7 @@ exports[`sqle/ExecWorkflow/AuditDetail/SqlMode render backup strategy tip 1`] =
                   class="ant-space-item"
                 >
                   
                       
@@ -1103,7 +1103,7 @@ exports[`sqle/ExecWorkflow/AuditDetail/SqlMode render change exec_sql & rollback
               class="lazy-load-wrapper segmented-item-content lazy-load-wrapper-show css-952l0m"
             >
               
                   
@@ -1486,7 +1486,7 @@ exports[`sqle/ExecWorkflow/AuditDetail/SqlMode render change exec_sql & rollback
               class="lazy-load-wrapper segmented-item-content lazy-load-wrapper-hidden css-952l0m"
             >
               
                   
@@ -1546,7 +1546,7 @@ exports[`sqle/ExecWorkflow/AuditDetail/SqlMode render change exec_sql & rollback
                   class="ant-space-item"
                 >
                   
                       
@@ -1931,7 +1931,7 @@ exports[`sqle/ExecWorkflow/AuditDetail/SqlMode render change exec_sql & rollback
               class="lazy-load-wrapper segmented-item-content lazy-load-wrapper-show css-952l0m"
             >
               
                   
@@ -1991,7 +1991,7 @@ exports[`sqle/ExecWorkflow/AuditDetail/SqlMode render change exec_sql & rollback
                   class="ant-space-item"
                 >
                   
                       
@@ -2376,7 +2376,7 @@ exports[`sqle/ExecWorkflow/AuditDetail/SqlMode render change exec_sql & rollback
               class="lazy-load-wrapper segmented-item-content lazy-load-wrapper-hidden css-952l0m"
             >
               
                   
@@ -2436,7 +2436,7 @@ exports[`sqle/ExecWorkflow/AuditDetail/SqlMode render change exec_sql & rollback
                   class="ant-space-item"
                 >
                   
                       
@@ -2826,7 +2826,7 @@ exports[`sqle/ExecWorkflow/AuditDetail/SqlMode render click add desc 1`] = `
               class="lazy-load-wrapper segmented-item-content lazy-load-wrapper-show css-952l0m"
             >
               
                   
@@ -4475,7 +4475,7 @@ exports[`sqle/ExecWorkflow/AuditDetail/SqlMode render has backup conflict 1`] =
                   class="ant-space-item"
                 >
                   
                       
@@ -4881,7 +4881,7 @@ exports[`sqle/ExecWorkflow/AuditDetail/SqlMode render no sql execution result 1`
               class="lazy-load-wrapper segmented-item-content lazy-load-wrapper-hidden css-952l0m"
             >
               
                   
@@ -4968,7 +4968,7 @@ exports[`sqle/ExecWorkflow/AuditDetail/SqlMode render no sql execution result 1`
                   class="ant-space-item"
                 >
                   
                       
@@ -5374,7 +5374,7 @@ exports[`sqle/ExecWorkflow/AuditDetail/SqlMode render no sql execution result an
               class="lazy-load-wrapper segmented-item-content lazy-load-wrapper-hidden css-952l0m"
             >
               
                   
@@ -5460,7 +5460,7 @@ exports[`sqle/ExecWorkflow/AuditDetail/SqlMode render no sql execution result an
                   class="ant-space-item"
                 >
                   
                       
@@ -5845,7 +5845,7 @@ exports[`sqle/ExecWorkflow/AuditDetail/SqlMode render snap when data is empty 1`
               class="lazy-load-wrapper segmented-item-content lazy-load-wrapper-show css-952l0m"
             >
               
                   
@@ -6327,7 +6327,7 @@ exports[`sqle/ExecWorkflow/AuditDetail/SqlMode render sql execution result 1`] =
                   class="ant-space-item"
                 >
                   
                       
@@ -6722,7 +6722,7 @@ exports[`sqle/ExecWorkflow/AuditDetail/SqlMode should render retry execute actio
             class="lazy-load-wrapper segmented-item-content lazy-load-wrapper-show css-952l0m"
           >
             
                 
diff --git a/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/TaskResultList/Common/SqlStatementResultTable/__tests__/__snapshots__/index.test.tsx.snap b/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/TaskResultList/Common/SqlStatementResultTable/__tests__/__snapshots__/index.test.tsx.snap
index 27dcc4050..643a60a34 100644
--- a/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/TaskResultList/Common/SqlStatementResultTable/__tests__/__snapshots__/index.test.tsx.snap
+++ b/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/TaskResultList/Common/SqlStatementResultTable/__tests__/__snapshots__/index.test.tsx.snap
@@ -143,7 +143,7 @@ exports[`test TaskResultList/SQLStatementResultTable render retry execute action
                           class="ant-table-cell ellipsis-column-large-width"
                         >
                           
                           
diff --git a/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/TaskResultList/SqlFileStatementOverview/__tests__/__snapshots__/index.test.tsx.snap b/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/TaskResultList/SqlFileStatementOverview/__tests__/__snapshots__/index.test.tsx.snap
index 7b4eac8b2..440f405d8 100644
--- a/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/TaskResultList/SqlFileStatementOverview/__tests__/__snapshots__/index.test.tsx.snap
+++ b/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/TaskResultList/SqlFileStatementOverview/__tests__/__snapshots__/index.test.tsx.snap
@@ -788,7 +788,7 @@ exports[`test AuditDetail/SqlFileStatementOverview should match snapshot 2`] = `
                           class="ant-table-cell ellipsis-column-large-width"
                         >
                           
{ filterContainerMeta={filterContainerMeta} updateTableFilterInfo={updateTableFilterInfo} filterCustomProps={ - new Map([ + new Map([ [ 'audit_level', { diff --git a/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/TaskResultList/WaterfallList/SqlExecuteMode/__tests__/__snapshots__/index.test.tsx.snap b/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/TaskResultList/WaterfallList/SqlExecuteMode/__tests__/__snapshots__/index.test.tsx.snap index cdb187530..2eb62b063 100644 --- a/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/TaskResultList/WaterfallList/SqlExecuteMode/__tests__/__snapshots__/index.test.tsx.snap +++ b/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/TaskResultList/WaterfallList/SqlExecuteMode/__tests__/__snapshots__/index.test.tsx.snap @@ -299,7 +299,7 @@ exports[`test WaterfallList/SQLExecuteMode render onUpdateDescription 1`] = ` class="lazy-load-wrapper segmented-item-content lazy-load-wrapper-show css-952l0m" >
                               
@@ -812,7 +812,7 @@ exports[`test WaterfallList/SQLExecuteMode should match snapshot 2`] = `
                           class="lazy-load-wrapper segmented-item-content lazy-load-wrapper-show css-952l0m"
                         >
                           
                               
diff --git a/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/__tests__/__snapshots__/index.test.tsx.snap b/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/__tests__/__snapshots__/index.test.tsx.snap
index 723984db7..3beb2af25 100644
--- a/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/__tests__/__snapshots__/index.test.tsx.snap
+++ b/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/__tests__/__snapshots__/index.test.tsx.snap
@@ -1285,7 +1285,7 @@ exports[`test AuditExecResultPanel matches snapshot and selects task on initial
                           class="lazy-load-wrapper segmented-item-content lazy-load-wrapper-show css-952l0m"
                         >
                           
                               
@@ -3093,7 +3093,7 @@ exports[`test AuditExecResultPanel sql retry execute permission should enable re
                           class="lazy-load-wrapper segmented-item-content lazy-load-wrapper-show css-952l0m"
                         >
                           
                               
@@ -4099,7 +4099,7 @@ exports[`test AuditExecResultPanel updates layout to waterfall and retrieves tas
                               class="lazy-load-wrapper segmented-item-content lazy-load-wrapper-show css-952l0m"
                             >
                               
                                   
diff --git a/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/index.tsx b/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/index.tsx
index d27310fcd..012b01281 100644
--- a/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/index.tsx
+++ b/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/index.tsx
@@ -1,7 +1,10 @@
 import { useTranslation } from 'react-i18next';
 import { AuditExecResultPanelProps } from './index.type';
 import { AuditExecResultPanelStyleWrapper } from './style';
-import { SegmentedRowStyleWrapper } from '@actiontech/dms-kit';
+import {
+  FilterCustomProps,
+  SegmentedRowStyleWrapper
+} from '@actiontech/dms-kit';
 import { BasicSegmented, EmptyBox } from '@actiontech/dms-kit';
 import { WORKFLOW_OVERVIEW_TAB_KEY } from '../../hooks/useAuditExecResultPanelSetup';
 import {
@@ -35,6 +38,7 @@ import { ModalName } from '../../../../../data/ModalName';
 import EmitterKey from '../../../../../data/EmitterKey';
 import EventEmitter from '../../../../../utils/EventEmitter';
 import useRetryExecute from './hooks/useRetryExecute';
+import { IAuditTaskSQLResV2 } from '@actiontech/shared/lib/api/sqle/service/common';
 
 const AuditExecResultPanel: React.FC = ({
   activeTabKey,
@@ -180,7 +184,7 @@ const AuditExecResultPanel: React.FC = ({
         filterContainerMeta={filterContainerMeta}
         updateTableFilterInfo={updateTableFilterInfo}
         filterCustomProps={
-          new Map([
+          new Map([
             [
               'audit_level',
               {
diff --git a/packages/sqle/src/page/SqlExecWorkflow/Detail/components/ModifySqlStatement/__tests__/__snapshots__/index.test.tsx.snap b/packages/sqle/src/page/SqlExecWorkflow/Detail/components/ModifySqlStatement/__tests__/__snapshots__/index.test.tsx.snap
index c565aaab7..b46de786e 100644
--- a/packages/sqle/src/page/SqlExecWorkflow/Detail/components/ModifySqlStatement/__tests__/__snapshots__/index.test.tsx.snap
+++ b/packages/sqle/src/page/SqlExecWorkflow/Detail/components/ModifySqlStatement/__tests__/__snapshots__/index.test.tsx.snap
@@ -3089,7 +3089,7 @@ VALUES ('1234567890', 'example@email.com', '123456789012345678', '9876543210', '
                                 class="ant-table-cell audit-result-exec-sql-column"
                               >
                                 
= ({ (i) => i.instance_name === item.instance_name ); return { - key: isSameSqlForAll ? `${index}` : item.task_id?.toString() ?? '', + key: isSameSqlForAll ? `${index}` : (item.task_id?.toString() ?? ''), instanceName: item.instance_name, schemaName: item.instance_schema, enableBackup: item.enable_backup, diff --git a/packages/sqle/src/page/SqlExecWorkflow/Detail/components/ModifySqlStatement/index.type.ts b/packages/sqle/src/page/SqlExecWorkflow/Detail/components/ModifySqlStatement/index.type.ts index 8b9c35d45..a11a995a8 100644 --- a/packages/sqle/src/page/SqlExecWorkflow/Detail/components/ModifySqlStatement/index.type.ts +++ b/packages/sqle/src/page/SqlExecWorkflow/Detail/components/ModifySqlStatement/index.type.ts @@ -7,11 +7,10 @@ import { import React from 'react'; import { SubmitWorkflowButtonProps } from '../../../Common/SubmitWorkflowButton/index.type'; -export interface ModifySqlStatementProps - extends Pick< - SubmitWorkflowButtonProps, - 'submitWorkflowConfirmationMessage' | 'isConfirmationRequiredForSubmission' - > { +export interface ModifySqlStatementProps extends Pick< + SubmitWorkflowButtonProps, + 'submitWorkflowConfirmationMessage' | 'isConfirmationRequiredForSubmission' +> { backToDetail: () => void; backToDetailText?: React.ReactNode; isAtRejectStep: boolean; diff --git a/packages/sqle/src/page/SqlExecWorkflow/Detail/components/SqlRollback/__tests__/__snapshots__/index.test.tsx.snap b/packages/sqle/src/page/SqlExecWorkflow/Detail/components/SqlRollback/__tests__/__snapshots__/index.test.tsx.snap index 75f41080d..b1aa2960d 100644 --- a/packages/sqle/src/page/SqlExecWorkflow/Detail/components/SqlRollback/__tests__/__snapshots__/index.test.tsx.snap +++ b/packages/sqle/src/page/SqlExecWorkflow/Detail/components/SqlRollback/__tests__/__snapshots__/index.test.tsx.snap @@ -426,7 +426,7 @@ exports[`sqle/ExecWorkflow/Detail/SqlRollback render isAtRollbackStep is true 1` class="ant-table-cell ellipsis-column-width" >
= TableProps['rowSelection']; -export interface TableTransferProps - extends TransferProps { +export interface TableTransferProps extends TransferProps { dataSource: ExpandedBackupSqlType[]; leftColumns: TableColumnsType; rightColumns: TableColumnsType; diff --git a/packages/sqle/src/page/SqlInsights/__tests__/__snapshots__/index.test.tsx.snap b/packages/sqle/src/page/SqlInsights/__tests__/__snapshots__/index.test.tsx.snap index 0db7c3821..c918528f4 100644 --- a/packages/sqle/src/page/SqlInsights/__tests__/__snapshots__/index.test.tsx.snap +++ b/packages/sqle/src/page/SqlInsights/__tests__/__snapshots__/index.test.tsx.snap @@ -3611,7 +3611,7 @@ exports[`SqlInsights should get related sql list when current date range is exit >
{ selectedRecord: null }, modalStatus: { - [ModalName.Sql_Insights_Related_SQL_Item_Relate_Transaction_Drawer]: - false + [ModalName.Sql_Insights_Related_SQL_Item_Relate_Transaction_Drawer]: false } } }) @@ -104,8 +103,7 @@ describe('SqlInsights', () => { selectedRecord: null }, modalStatus: { - [ModalName.Sql_Insights_Related_SQL_Item_Relate_Transaction_Drawer]: - false + [ModalName.Sql_Insights_Related_SQL_Item_Relate_Transaction_Drawer]: false } } }) diff --git a/packages/sqle/src/page/SqlInsights/components/DrawerManager/SqlRelatedTransactionDrawer/index.tsx b/packages/sqle/src/page/SqlInsights/components/DrawerManager/SqlRelatedTransactionDrawer/index.tsx index 9a5627acc..29fb2c75a 100644 --- a/packages/sqle/src/page/SqlInsights/components/DrawerManager/SqlRelatedTransactionDrawer/index.tsx +++ b/packages/sqle/src/page/SqlInsights/components/DrawerManager/SqlRelatedTransactionDrawer/index.tsx @@ -49,8 +49,7 @@ const SqlRelatedTransactionDrawer = () => { dispatch( initSqlInsightsModalStatus({ modalStatus: { - [ModalName.Sql_Insights_Related_SQL_Item_Relate_Transaction_Drawer]: - false + [ModalName.Sql_Insights_Related_SQL_Item_Relate_Transaction_Drawer]: false } }) ); diff --git a/packages/sqle/src/page/SqlInsights/components/RelatedSqlList/__tests__/__snapshots__/index.test.tsx.snap b/packages/sqle/src/page/SqlInsights/components/RelatedSqlList/__tests__/__snapshots__/index.test.tsx.snap index 78fe637e5..1ca2868de 100644 --- a/packages/sqle/src/page/SqlInsights/components/RelatedSqlList/__tests__/__snapshots__/index.test.tsx.snap +++ b/packages/sqle/src/page/SqlInsights/components/RelatedSqlList/__tests__/__snapshots__/index.test.tsx.snap @@ -304,7 +304,7 @@ exports[`RelatedSqlList should render component with date range selected 1`] = ` >
{ (sortData.field as unknown as GetSqlManageListV3SortFieldEnum) ?? undefined, sort_order: sortData?.order - ? orderDesc[sortData?.order] ?? undefined + ? (orderDesc[sortData?.order] ?? undefined) : undefined }; }; diff --git a/packages/sqle/src/page/SqlManagementConf/Detail/ScanTypeSqlCollection/__tests__/__snapshots__/index.test.tsx.snap b/packages/sqle/src/page/SqlManagementConf/Detail/ScanTypeSqlCollection/__tests__/__snapshots__/index.test.tsx.snap index 4cd83e6c4..7766bcc27 100644 --- a/packages/sqle/src/page/SqlManagementConf/Detail/ScanTypeSqlCollection/__tests__/__snapshots__/index.test.tsx.snap +++ b/packages/sqle/src/page/SqlManagementConf/Detail/ScanTypeSqlCollection/__tests__/__snapshots__/index.test.tsx.snap @@ -1131,7 +1131,7 @@ exports[`test ScanTypeSqlCollection should match snapshot 2`] = ` class="ant-table-cell ellipsis-column-large-width" >
{ const currentDesc = desc && /Top\s+SQL$/i.test(desc) ? 'Top SQL' - : desc ?? 'custom_action_desc'; + : (desc ?? 'custom_action_desc'); if (currentDesc) { dataTypeSource.add(currentDesc); } @@ -194,7 +194,7 @@ const TableTaskTypeFilter = (props: TableTaskTypeFilterProps) => { const comTaskType = taskType && taskType !== PageDefaultEnum.allTypeVal ? Array.isArray(relationalData[taskType]) - ? relationalData[taskType][0]?.type ?? '' + ? (relationalData[taskType][0]?.type ?? '') : '' : ''; updateParams({ diff --git a/packages/sqle/src/page/SqlManagementException/List/__tests__/__snapshots__/index.test.tsx.snap b/packages/sqle/src/page/SqlManagementException/List/__tests__/__snapshots__/index.test.tsx.snap index e8b6e3bbd..858a6e383 100644 --- a/packages/sqle/src/page/SqlManagementException/List/__tests__/__snapshots__/index.test.tsx.snap +++ b/packages/sqle/src/page/SqlManagementException/List/__tests__/__snapshots__/index.test.tsx.snap @@ -328,7 +328,7 @@ exports[`slqe/Whitelist/SqlManagementExceptionList should render sqlManagementEx class="ant-table-cell ellipsis-column-width" >
+
+ +
diff --git a/packages/sqle/src/page/SqlOptimization/Result/Modal/__tests__/__snapshots__/TableStructureModal.test.tsx.snap b/packages/sqle/src/page/SqlOptimization/Result/Modal/__tests__/__snapshots__/TableStructureModal.test.tsx.snap index 679698814..1c08ce984 100644 --- a/packages/sqle/src/page/SqlOptimization/Result/Modal/__tests__/__snapshots__/TableStructureModal.test.tsx.snap +++ b/packages/sqle/src/page/SqlOptimization/Result/Modal/__tests__/__snapshots__/TableStructureModal.test.tsx.snap @@ -167,7 +167,7 @@ CREATE TABLE enrollments ( class="section-content" >
                         
diff --git a/packages/sqle/src/page/SqlOptimization/Result/__tests__/__snapshots__/ResultContent.test.tsx.snap b/packages/sqle/src/page/SqlOptimization/Result/__tests__/__snapshots__/ResultContent.test.tsx.snap
index c2d122b5c..9883ac452 100644
--- a/packages/sqle/src/page/SqlOptimization/Result/__tests__/__snapshots__/ResultContent.test.tsx.snap
+++ b/packages/sqle/src/page/SqlOptimization/Result/__tests__/__snapshots__/ResultContent.test.tsx.snap
@@ -293,7 +293,7 @@ WHERE
                     class="ant-card-body"
                   >
                     
                         
diff --git a/packages/sqle/src/page/SqlOptimization/Result/__tests__/__snapshots__/index.test.tsx.snap b/packages/sqle/src/page/SqlOptimization/Result/__tests__/__snapshots__/index.test.tsx.snap
index ac74a7315..819dd1bce 100644
--- a/packages/sqle/src/page/SqlOptimization/Result/__tests__/__snapshots__/index.test.tsx.snap
+++ b/packages/sqle/src/page/SqlOptimization/Result/__tests__/__snapshots__/index.test.tsx.snap
@@ -334,7 +334,7 @@ WHERE
                       class="ant-card-body"
                     >
                       
                           
@@ -1589,7 +1589,7 @@ WHERE
                       评估反馈