Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
feat(frontend): introduce Biome toolchain to replace Prettier (#18087)
boojack7fa27d936470
diff --git a/.github/workflows/frontend-tests.yml b/.github/workflows/frontend-tests.ymlindex 89d600c695..814e5a2d10 100644--- a/.github/workflows/frontend-tests.yml+++ b/.github/workflows/frontend-tests.yml@@ -25,15 +25,16 @@ jobs:node-version: '24.11.0'cache: pnpmcache-dependency-path: "frontend/pnpm-lock.yaml"- - run: pnpm install --frozen-lockfile+ - name: Install dependencies+ run: pnpm install --frozen-lockfileworking-directory: frontend- - name: Run format check- run: pnpm prettier --check .+ - name: Biome check (format, lint, imports)+ run: pnpm biome:ciworking-directory: frontend- - name: Run pnpm lint+ - name: ESLint check (Vue-specific + i18n)run: pnpm lintworking-directory: frontend- - name: Run pnpm type-check+ - name: TypeScript type checkrun: pnpm type-checkworking-directory: frontend@@ -49,16 +50,17 @@ jobs:node-version: '24.11.0'cache: pnpmcache-dependency-path: "frontend/pnpm-lock.yaml"- - run: pnpm install --frozen-lockfile+ - name: Install dependencies+ run: pnpm install --frozen-lockfileworking-directory: frontend- name: Copy config filesrun: |cp ../backend/enterprise/plan.yaml ./src/typescp ../backend/component/iam/permission.yaml ./src/types/iamworking-directory: frontend- - name: Run pnpm test+ - name: Run unit testsrun: pnpm testworking-directory: frontend- - name: Run pnpm release build+ - name: Build for productionrun: pnpm release-dockerworking-directory: frontenddiff --git a/.vscode/extensions.json b/.vscode/extensions.jsonindex aa91ffb119..d54eef1b40 100644--- a/.vscode/extensions.json+++ b/.vscode/extensions.json@@ -4,7 +4,7 @@"dbaeumer.vscode-eslint","lokalise.i18n-ally","antfu.iconify",- "esbenp.prettier-vscode",+ "biomejs.biome","bradlc.vscode-tailwindcss","eamodio.gitlens"]diff --git a/.vscode/settings.json b/.vscode/settings.jsonindex a3777776cf..f19df0725a 100644--- a/.vscode/settings.json+++ b/.vscode/settings.json@@ -15,19 +15,19 @@"*.vue": "vue"},"[javascript]": {- "editor.defaultFormatter": "esbenp.prettier-vscode"+ "editor.defaultFormatter": "biomejs.biome"},"[typescript]": {- "editor.defaultFormatter": "esbenp.prettier-vscode"+ "editor.defaultFormatter": "biomejs.biome"},"[json]": {- "editor.defaultFormatter": "esbenp.prettier-vscode"+ "editor.defaultFormatter": "biomejs.biome"},"[jsonc]": {- "editor.defaultFormatter": "esbenp.prettier-vscode"+ "editor.defaultFormatter": "biomejs.biome"},"[vue]": {- "editor.defaultFormatter": "esbenp.prettier-vscode"+ "editor.defaultFormatter": "biomejs.biome"},"[yaml]": {"editor.autoIndent": "advanced"diff --git a/CLAUDE.md b/CLAUDE.mdindex fde6651806..0c16f7436d 100644--- a/CLAUDE.md+++ b/CLAUDE.md@@ -23,11 +23,13 @@ This file provides guidance to AI coding assistants when working with code in th### Frontend Code Changes-1. **Format** — Run `cd frontend && pnpm prettier --write <glob>` (e.g., `pnpm prettier --write src/components/**/*.vue`)-2. **Lint** — Run `pnpm --dir frontend lint --fix`+1. **Format** — Run `pnpm --dir frontend biome:format` (formats all files) or `cd frontend && pnpm biome format --write <path>` for specific files+2. **Lint** — Run `pnpm --dir frontend lint --fix` (ESLint for Vue-specific rules) and `pnpm --dir frontend biome:lint` (Biome linter)3. **Type check** — Run `pnpm --dir frontend type-check`4. **Test** — Run `pnpm --dir frontend test`+**Recommended**: Use `pnpm --dir frontend biome:check` to format, lint, and organize imports in one command+### Proto Changes1. **Format** — Run `buf format -w proto`@@ -64,9 +66,18 @@ pnpm --dir frontend i# Dev serverpnpm --dir frontend dev-# Lint+# Format (Biome)+pnpm --dir frontend biome:format++# Lint (ESLint for Vue-specific rules)pnpm --dir frontend lint+# Lint (Biome)+pnpm --dir frontend biome:lint++# Format + Lint + Organize imports (recommended)+pnpm --dir frontend biome:check+# Type checkpnpm --dir frontend type-checkdiff --git a/frontend/.prettierignore b/frontend/.prettierignoredeleted file mode 100644index 7eb738396d..0000000000--- a/frontend/.prettierignore+++ /dev/null@@ -1,9 +0,0 @@-**/*.html-**/*.yaml-**/*.yml-**/*.json-**/*.md--src/assets-src/shims-3rd-party.d.ts-src/types/proto-es\ No newline at end of filediff --git a/frontend/.prettierrc.js b/frontend/.prettierrc.jsdeleted file mode 100644index cbcf1e7628..0000000000--- a/frontend/.prettierrc.js+++ /dev/null@@ -1,15 +0,0 @@-module.exports = {- useTabs: false,- tabWidth: 2,- singleQuote: false,- trailingComma: "es5",- printWidth: 80,- plugins: [require.resolve("@trivago/prettier-plugin-sort-imports")],- importOrder: [- "^[.]/init$",- "<BUILTIN_MODULES>",- "<THIRD_PARTY_MODULES>",- "^@/(.+)",- "^[./]",- ],-};diff --git a/frontend/.vscode/extensions.json b/frontend/.vscode/extensions.jsonindex 344b8cea0c..7e6ca98f93 100644--- a/frontend/.vscode/extensions.json+++ b/frontend/.vscode/extensions.json@@ -4,7 +4,7 @@"dbaeumer.vscode-eslint","lokalise.i18n-ally","antfu.iconify",- "esbenp.prettier-vscode",+ "biomejs.biome","bradlc.vscode-tailwindcss"]}diff --git a/frontend/.vscode/settings.json b/frontend/.vscode/settings.jsonindex 6edb5abd40..8b9c9c945d 100644--- a/frontend/.vscode/settings.json+++ b/frontend/.vscode/settings.json@@ -24,22 +24,22 @@"*.vue": "vue"},"[javascript]": {- "editor.defaultFormatter": "esbenp.prettier-vscode"+ "editor.defaultFormatter": "biomejs.biome"},"[typescript]": {- "editor.defaultFormatter": "esbenp.prettier-vscode"+ "editor.defaultFormatter": "biomejs.biome"},"[json]": {- "editor.defaultFormatter": "esbenp.prettier-vscode"+ "editor.defaultFormatter": "biomejs.biome"},"[jsonc]": {- "editor.defaultFormatter": "esbenp.prettier-vscode"+ "editor.defaultFormatter": "biomejs.biome"},"[vue]": {- "editor.defaultFormatter": "esbenp.prettier-vscode"+ "editor.defaultFormatter": "biomejs.biome"},"[yaml]": {- "editor.defaultFormatter": "esbenp.prettier-vscode",+ "editor.defaultFormatter": "biomejs.biome","editor.formatOnSave": true,"editor.formatOnSaveMode": "file"},diff --git a/frontend/biome.json b/frontend/biome.jsonnew file mode 100644index 0000000000..ea101190e3--- /dev/null+++ b/frontend/biome.json@@ -0,0 +1,265 @@+{+ "$schema": "https://biomejs.dev/schemas/2.3.5/schema.json",+ "vcs": { "enabled": true, "clientKind": "git", "useIgnoreFile": true },+ "files": {+ "ignoreUnknown": true+ },+ "formatter": {+ "enabled": true,+ "indentStyle": "space",+ "indentWidth": 2,+ "lineWidth": 80+ },+ "css": {+ "parser": {+ "cssModules": false,+ "tailwindDirectives": true+ }+ },+ "linter": {+ "enabled": true,+ "rules": {+ "recommended": false,+ "complexity": {+ "noUselessEscapeInRegex": "error",+ "noUselessTypeConstraint": "error"+ },+ "correctness": {+ "noEmptyPattern": "error",+ "noUnusedVariables": "error"+ },+ "style": {+ "noCommonJs": "error",+ "noNamespace": "error",+ "useArrayLiterals": "error",+ "useAsConstAssertion": "error",+ "useBlockStatements": "off"+ },+ "suspicious": {+ "noConsole": {+ "level": "error",+ "options": { "allow": ["warn", "error", "debug", "assert", "log"] }+ },+ "noDebugger": "error",+ "noExplicitAny": "off",+ "noExtraNonNullAssertion": "error",+ "noMisleadingInstantiator": "error",+ "noNonNullAssertedOptionalChain": "error",+ "noUnsafeDeclarationMerging": "error",+ "useNamespaceKeyword": "error"+ }+ }+ },+ "javascript": {+ "formatter": {+ "quoteStyle": "double",+ "trailingCommas": "es5"+ },+ "globals": [+ "onanimationend",+ "ongamepadconnected",+ "onlostpointercapture",+ "onanimationiteration",+ "onkeyup",+ "onmousedown",+ "onanimationstart",+ "onslotchange",+ "onprogress",+ "ontransitionstart",+ "onpause",+ "onended",+ "onpointerover",+ "onscrollend",+ "onformdata",+ "ontransitionrun",+ "onanimationcancel",+ "ondrag",+ "onchange",+ "onbeforeinstallprompt",+ "onbeforexrselect",+ "onmessage",+ "ontransitioncancel",+ "onpointerdown",+ "onabort",+ "onpointerout",+ "oncuechange",+ "ongotpointercapture",+ "onscrollsnapchanging",+ "onsearch",+ "onsubmit",+ "onstalled",+ "onsuspend",+ "onreset",+ "onerror",+ "onresize",+ "onmouseenter",+ "ongamepaddisconnected",+ "ondragover",+ "onbeforetoggle",+ "onmouseover",+ "onpagehide",+ "onmousemove",+ "onratechange",+ "oncommand",+ "onmessageerror",+ "onwheel",+ "ondevicemotion",+ "onauxclick",+ "ontransitionend",+ "onpaste",+ "onpageswap",+ "ononline",+ "ondeviceorientationabsolute",+ "onkeydown",+ "onclose",+ "onselect",+ "onpageshow",+ "onpointercancel",+ "onbeforematch",+ "onpointerrawupdate",+ "ondragleave",+ "onscrollsnapchange",+ "onseeked",+ "onwaiting",+ "onbeforeunload",+ "onplaying",+ "onvolumechange",+ "ondragend",+ "onstorage",+ "onloadeddata",+ "onfocus",+ "onoffline",+ "onplay",+ "onafterprint",+ "onclick",+ "oncut",+ "onmouseout",+ "ondblclick",+ "oncanplay",+ "onloadstart",+ "onappinstalled",+ "onpointermove",+ "ontoggle",+ "oncontextmenu",+ "onblur",+ "oncancel",+ "onbeforeprint",+ "oncontextrestored",+ "onloadedmetadata",+ "onpointerup",+ "onlanguagechange",+ "oncopy",+ "onselectstart",+ "onscroll",+ "onload",+ "ondragstart",+ "onbeforeinput",+ "oncanplaythrough",+ "oninput",+ "oninvalid",+ "ontimeupdate",+ "ondurationchange",+ "onselectionchange",+ "onmouseup",+ "location",+ "onkeypress",+ "onpointerleave",+ "oncontextlost",+ "ondrop",+ "onsecuritypolicyviolation",+ "oncontentvisibilityautostatechange",+ "ondeviceorientation",+ "onseeking",+ "onrejectionhandled",+ "onunload",+ "onmouseleave",+ "onhashchange",+ "onpointerenter",+ "onmousewheel",+ "onunhandledrejection",+ "ondragenter",+ "onpopstate",+ "onpagereveal",+ "onemptied"+ ]+ },+ "overrides": [+ {+ "includes": ["**/proto-es/**", "src/types/proto-es/**"],+ "formatter": { "enabled": false },+ "linter": { "enabled": false }+ },+ {+ "includes": [+ "src/shims-3rd-party.d.ts",+ "tailwind.config.js",+ "vite-plugin-export-csp-hashes.ts"+ ],+ "formatter": { "enabled": false },+ "linter": { "enabled": false }+ },+ {+ "includes": ["**/*.ts", "**/*.tsx", "**/*.mts", "**/*.cts"],+ "linter": {+ "rules": {+ "complexity": { "noArguments": "error" },+ "correctness": {+ "noConstAssign": "off",+ "noGlobalObjectCalls": "off",+ "noInvalidBuiltinInstantiation": "off",+ "noInvalidConstructorSuper": "off",+ "noSetterReturn": "off",+ "noUndeclaredVariables": "off",+ "noUnreachable": "off",+ "noUnreachableSuper": "off"+ },+ "style": { "useConst": "error" },+ "suspicious": {+ "noClassAssign": "off",+ "noDuplicateClassMembers": "off",+ "noDuplicateObjectKeys": "off",+ "noDuplicateParameters": "off",+ "noFunctionAssign": "off",+ "noImportAssign": "off",+ "noRedeclare": "off",+ "noUnsafeNegation": "off",+ "noVar": "error",+ "noWith": "off",+ "useGetterReturn": "off"+ }+ }+ }+ },+ {+ "includes": ["*.vue", "**/*.vue"],+ "javascript": { "globals": [] },+ "linter": {+ "rules": {+ "correctness": {+ "noUnusedVariables": "off"+ }+ }+ }+ },+ {+ "includes": ["**/index.ts"],+ "assist": {+ "enabled": false+ }+ },+ {+ "includes": ["*.json", "**/*.json", "*.json5", "**/*.json5"],+ "javascript": { "globals": [] }+ },+ {+ "includes": ["*.yaml", "**/*.yaml", "*.yml", "**/*.yml"],+ "javascript": { "globals": [] },+ "linter": {+ "rules": { "suspicious": { "noIrregularWhitespace": "off" } }+ }+ }+ ],+ "assist": {+ "enabled": true+ }+}diff --git a/frontend/eslint.config.mjs b/frontend/eslint.config.mjsindex 1867852b2d..ca59a7b99a 100644--- a/frontend/eslint.config.mjs+++ b/frontend/eslint.config.mjs@@ -1,6 +1,5 @@import vueI18n from "@intlify/eslint-plugin-vue-i18n";import vueTsEslintConfig from "@vue/eslint-config-typescript";-import eslintPluginPrettierRecommended from "eslint-plugin-prettier/recommended";import pluginVue from "eslint-plugin-vue";export default [@@ -14,7 +13,6 @@ export default [rootDir: import.meta.dirname,}),...vueI18n.configs["flat/recommended"],- eslintPluginPrettierRecommended,{ignores: ["**/dist/**", "**/node_modules/**", "**/proto-es/**"],},diff --git a/frontend/naive-ui.config.ts b/frontend/naive-ui.config.tsindex d200208318..bafd5ae038 100644--- a/frontend/naive-ui.config.ts+++ b/frontend/naive-ui.config.ts@@ -1,8 +1,8 @@import {+ dateZhCN,type GlobalThemeOverrides,- type NLocale,type NDateLocale,- dateZhCN,+ type NLocale,zhCN,} from "naive-ui";import { computed } from "vue";diff --git a/frontend/package.json b/frontend/package.jsonindex 12ffe9193f..27217ab41a 100644--- a/frontend/package.json+++ b/frontend/package.json@@ -13,7 +13,11 @@"type-check": "export NODE_OPTIONS=--max_old_space_size=8000 && vue-tsc --build --force","test": "vitest run --passWithNoTests","coverage": "vitest --coverage",- "i18n": "TS_NODE_PROJECT='./tsconfig.i18n.json' ts-node i18n.ts && eslint --cache src --fix"+ "i18n": "TS_NODE_PROJECT='./tsconfig.i18n.json' ts-node i18n.ts && eslint --cache src --fix",+ "biome:format": "biome format --write .",+ "biome:lint": "biome lint --write .",+ "biome:check": "biome check --write .",+ "biome:ci": "biome ci ."},"dependencies": {"@buf/googleapis_googleapis.bufbuild_es": "2.9.0-20251009205305-72c8614f3bd0.1",@@ -43,7 +47,6 @@"file-saver": "^2.0.5","highlight.js": "11.11.1","html-to-image": "^1.11.13",- "inter-ui": "4.1.1","is-chinese": "^2.0.0","js-yaml": "4.1.0","jszip": "^3.10.1",@@ -82,6 +85,7 @@"vueuc": "0.4.65"},"devDependencies": {+ "@biomejs/biome": "2.3.5","@codingame/esbuild-import-meta-url-plugin": "^1.0.3","@iconify/json": "2.2.403","@intlify/eslint-plugin-vue-i18n": "^4.0.0",@@ -90,7 +94,6 @@"@tailwindcss/forms": "0.5.10","@tailwindcss/typography": "0.5.19","@tailwindcss/vite": "^4.1.16",- "@trivago/prettier-plugin-sort-imports": "^5.2.2","@tsconfig/node22": "22.0.2","@types/crypto-js": "^4.2.2","@types/d3-shape": "^3.1.7",@@ -116,7 +119,6 @@"@vitejs/plugin-vue": "6.0.1","@vitejs/plugin-vue-jsx": "5.1.1","@vue/compiler-sfc": "3.5.22",- "@vue/eslint-config-prettier": "10.2.0","@vue/eslint-config-typescript": "^14.5.0","@vue/test-utils": "2.4.6","@vue/tsconfig": "0.8.1",@@ -124,15 +126,12 @@"code-inspector-plugin": "^1.0.0","dotenv": "^17.0.0","eslint": "9.39.1",- "eslint-config-prettier": "^10.1.5",- "eslint-plugin-prettier": "^5.5.3","eslint-plugin-vue": "10.5.1","events": "^3.3.0","jquery": "3.7.1","jsdom": "27.1.0","micromark-util-sanitize-uri": "^2.0.1","postcss": "8.5.6",- "prettier": "3.6.2","pretty-print-json": "^3.0.6","remark-gfm": "^4.0.1","remark-parse": "^11.0.0",diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yamlindex 47aa42c288..e201c52416 100644--- a/frontend/pnpm-lock.yaml+++ b/frontend/pnpm-lock.yaml@@ -91,9 +91,6 @@ importers:html-to-image:specifier: ^1.11.13version: 1.11.13- inter-ui:- specifier: 4.1.1- version: 4.1.1is-chinese:specifier: ^2.0.0version: 2.0.0@@ -203,6 +200,9 @@ importers:specifier: 0.4.65version: 0.4.65([email protected]([email protected]))devDependencies:+ '@biomejs/biome':+ specifier: 2.3.5+ version: 2.3.5'@codingame/esbuild-import-meta-url-plugin':specifier: ^1.0.3version: 1.0.3@@ -227,9 +227,6 @@ importers:'@tailwindcss/vite':specifier: ^4.1.16version: 4.1.16([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected]))- '@trivago/prettier-plugin-sort-imports':- specifier: ^5.2.2- version: 5.2.2(@vue/[email protected])([email protected])'@tsconfig/node22':specifier: 22.0.2version: 22.0.2@@ -305,9 +302,6 @@ importers:'@vue/compiler-sfc':specifier: 3.5.22version: 3.5.22- '@vue/eslint-config-prettier':- specifier: 10.2.0'@vue/eslint-config-typescript':specifier: ^14.5.0version: 14.6.0([email protected](@typescript-eslint/[email protected]([email protected]([email protected]))([email protected]))([email protected]([email protected]))([email protected]([email protected]([email protected]))))([email protected]([email protected]))([email protected])@@ -329,12 +323,6 @@ importers:eslint:specifier: 9.39.1version: 9.39.1([email protected])- eslint-config-prettier:- specifier: ^10.1.5- version: 10.1.8([email protected]([email protected]))- eslint-plugin-prettier:- specifier: ^5.5.3- version: 5.5.4([email protected]([email protected]([email protected])))([email protected]([email protected]))([email protected])eslint-plugin-vue:specifier: 10.5.1version: 10.5.1(@typescript-eslint/[email protected]([email protected]([email protected]))([email protected]))([email protected]([email protected]))([email protected]([email protected]([email protected])))@@ -353,9 +341,6 @@ importers:postcss:specifier: 8.5.6version: 8.5.6- prettier:- specifier: 3.6.2- version: 3.6.2pretty-print-json:specifier: ^3.0.6version: 3.0.6@@ -950,6 +935,59 @@ packages:resolution: {integrity: sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==}engines: {node: '>=6.9.0'}+ '@biomejs/[email protected]':+ resolution: {integrity: sha512-HvLhNlIlBIbAV77VysRIBEwp55oM/QAjQEin74QQX9Xb259/XP/D5AGGnZMOyF1el4zcvlNYYR3AyTMUV3ILhg==}+ engines: {node: '>=14.21.3'}+ hasBin: true++ '@biomejs/[email protected]':+ resolution: {integrity: sha512-fLdTur8cJU33HxHUUsii3GLx/TR0BsfQx8FkeqIiW33cGMtUD56fAtrh+2Fx1uhiCsVZlFh6iLKUU3pniZREQw==}+ engines: {node: '>=14.21.3'}+ cpu: [arm64]+ os: [darwin]++ '@biomejs/[email protected]':+ resolution: {integrity: sha512-qpT8XDqeUlzrOW8zb4k3tjhT7rmvVRumhi2657I2aGcY4B+Ft5fNwDdZGACzn8zj7/K1fdWjgwYE3i2mSZ+vOA==}+ engines: {node: '>=14.21.3'}+ cpu: [x64]+ os: [darwin]++ '@biomejs/[email protected]':+ resolution: {integrity: sha512-eGUG7+hcLgGnMNl1KHVZUYxahYAhC462jF/wQolqu4qso2MSk32Q+QrpN7eN4jAHAg7FUMIo897muIhK4hXhqg==}+ engines: {node: '>=14.21.3'}+ cpu: [arm64]+ os: [linux]++ '@biomejs/[email protected]':+ resolution: {integrity: sha512-u/pybjTBPGBHB66ku4pK1gj+Dxgx7/+Z0jAriZISPX1ocTO8aHh8x8e7Kb1rB4Ms0nA/SzjtNOVJ4exVavQBCw==}+ engines: {node: '>=14.21.3'}+ cpu: [arm64]+ os: [linux]++ '@biomejs/[email protected]':+ resolution: {integrity: sha512-awVuycTPpVTH/+WDVnEEYSf6nbCBHf/4wB3lquwT7puhNg8R4XvonWNZzUsfHZrCkjkLhFH/vCZK5jHatD9FEg==}+ engines: {node: '>=14.21.3'}+ cpu: [x64]+ os: [linux]++ '@biomejs/[email protected]':+ resolution: {integrity: sha512-XrIVi9YAW6ye0CGQ+yax0gLfx+BFOtKaNX74n+xHWla6Cl6huUmcKNO7HPx7BiKnJUzrxXY1qYlm7xMvi08X4g==}+ engines: {node: '>=14.21.3'}+ cpu: [x64]+ os: [linux]++ '@biomejs/[email protected]':+ resolution: {integrity: sha512-DlBiMlBZZ9eIq4H7RimDSGsYcOtfOIfZOaI5CqsWiSlbTfqbPVfWtCf92wNzx8GNMbu1s7/g3ZZESr6+GwM/SA==}+ engines: {node: '>=14.21.3'}+ cpu: [arm64]+ os: [win32]++ '@biomejs/[email protected]':+ resolution: {integrity: sha512-nUmR8gb6yvrKhtRgzwo/gDimPwnO5a4sCydf8ZS2kHIJhEmSmk+STsusr1LHTuM//wXppBawvSQi2xFXJCdgKQ==}+ engines: {node: '>=14.21.3'}+ cpu: [x64]+ os: [win32]+'@buf/googleapis_googleapis.bufbuild_es@2.9.0-20251009205305-72c8614f3bd0.1':resolution: {tarball: https://buf.build/gen/npm/v1/@buf/googleapis_googleapis.bufbuild_es/-/googleapis_googleapis.bufbuild_es-2.9.0-20251009205305-72c8614f3bd0.1.tgz}peerDependencies:@@ -2268,22 +2306,6 @@ packages:peerDependencies:vue: ^2.7.0 || ^3.0.0- '@trivago/[email protected]':- resolution: {integrity: sha512-fYDQA9e6yTNmA13TLVSA+WMQRc5Bn/c0EUBditUHNfMMxN7M82c38b1kEggVE3pLpZ0FwkwJkUEKMiOi52JXFA==}- engines: {node: '>18.12'}- peerDependencies:- '@vue/compiler-sfc': 3.x- prettier: 2.x - 3.x- prettier-plugin-svelte: 3.x- svelte: 4.x || 5.x- peerDependenciesMeta:- '@vue/compiler-sfc':- optional: true- prettier-plugin-svelte:- optional: true- svelte:- optional: true-'@tsconfig/[email protected]':resolution: {integrity: sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==}@@ -2617,12 +2639,6 @@ packages:'@vue/[email protected]':resolution: {integrity: sha512-+udSj47aRl5aKb0memBvcUG9koarqnxNM5yjuREvqwK6T3ap4mn3Zqqc17QrBFTqSMjr3HK1cvStEZpMDpfdyw==}- '@vue/[email protected]':- resolution: {integrity: sha512-GL3YBLwv/+b86yHcNNfPJxOTtVFJ4Mbc9UU3zR+KVoG7SwGTjPT+32fXamscNumElhcpXW3mT0DgzS9w32S7Bw==}- peerDependencies:- eslint: '>= 8.21.0'- prettier: '>= 3.0.0'-'@vue/[email protected]':resolution: {integrity: sha512-UpiRY/7go4Yps4mYCjkvlIbVWmn9YvPGQDxTAlcKLphyaD77LjIu3plH4Y9zNT0GB4f3K5tMmhhtRhPOgrQ/bQ==}engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}@@ -3309,26 +3325,6 @@ packages:peerDependencies:eslint: '>=6.0.0'- resolution: {integrity: sha512-82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w==}- hasBin: true- peerDependencies:- eslint: '>=7.0.0'-- resolution: {integrity: sha512-swNtI95SToIz05YINMA6Ox5R057IMAmWZ26GqPxusAp1TZzj+IdY9tXNWWD3vkF/wEqydCONcwjTFpxybBqZsg==}- engines: {node: ^14.18.0 || >=16.0.0}- peerDependencies:- '@types/eslint': '>=8.0.0'- eslint: '>=8.0.0'- eslint-config-prettier: '>= 7.0.0 <10.0.0 || >=10.1.0'- prettier: '>=3.0.0'- peerDependenciesMeta:- '@types/eslint':- optional: true- eslint-config-prettier:- optional: true-resolution: {integrity: sha512-SbR9ZBUFKgvWAbq3RrdCtWaW0IKm6wwUiApxf3BVTNfqUIo4IQQmreMg2iHFJJ6C/0wss3LXURBJ1OwS/MhFcQ==}engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}@@ -3420,9 +3416,6 @@ packages:resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}- resolution: {integrity: sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==}-resolution: {integrity: sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==}engines: {node: '>=8.6.0'}@@ -3625,10 +3618,6 @@ packages:resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}- resolution: {integrity: sha512-451h0J29HyOmA+JXgSi/6M12tL7ZCZ8arYKZUXiOXTJpJbAKqJvFh3k5SiV3x7tKe0C0KyrKUUiQIvvZ2PQDcA==}- engines: {node: '>=16.0.0'}-resolution: {integrity: sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==}engines: {node: '>=12'}@@ -3699,9 +3688,6 @@ packages:resolution: {integrity: sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==}- resolution: {integrity: sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==}-resolution: {integrity: sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==}hasBin: true@@ -4394,15 +4380,6 @@ packages:resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}engines: {node: '>= 0.8.0'}- resolution: {integrity: sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==}- engines: {node: '>=6.0.0'}-- resolution: {integrity: sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==}- engines: {node: '>=14'}- hasBin: true-resolution: {integrity: sha512-wboR7e5Vqim2giCXJouicwrfB/+whrJuVByBB2/ItHOmEgIEkqKfRiqLR9Rr297cJjplfAyEjwxJ2DJmiPk1yA==}@@ -4740,10 +4717,6 @@ packages:resolution: {integrity: sha512-2SG1TnJGjMkD4+gblONMGYSrwAzYi+ymOitD+Jb/iMYm57nH20PlkVeMQRah3yDMKEa0QQYUF/QPWpdW7C6zNg==}engines: {node: ^14.18.0 || >=16.0.0}- resolution: {integrity: sha512-MeQTA1r0litLUf0Rp/iisCaL8761lKAZHaimlbGK4j0HysC4PLfqygQj9srcs0m2RdtDYnF8UuYyKpbjHYp7Jw==}- engines: {node: ^14.18.0 || >=16.0.0}-resolution: {integrity: sha512-Nk8c4lXvMB98MtbmjX7JwJRgJOL8fluecYCfCeYBznwmpOs8Bf15hLM6z4z71EDAhQVrQrI+wt1aLWSXZq+hXA==}@@ -6003,6 +5976,41 @@ snapshots:'@babel/helper-string-parser': 7.27.1'@babel/helper-validator-identifier': 7.27.1+ '@biomejs/[email protected]':+ optionalDependencies:+ '@biomejs/cli-darwin-arm64': 2.3.5+ '@biomejs/cli-darwin-x64': 2.3.5+ '@biomejs/cli-linux-arm64': 2.3.5+ '@biomejs/cli-linux-arm64-musl': 2.3.5+ '@biomejs/cli-linux-x64': 2.3.5+ '@biomejs/cli-linux-x64-musl': 2.3.5+ '@biomejs/cli-win32-arm64': 2.3.5+ '@biomejs/cli-win32-x64': 2.3.5++ '@biomejs/[email protected]':+ optional: true++ '@biomejs/[email protected]':+ optional: true++ '@biomejs/[email protected]':+ optional: true++ '@biomejs/[email protected]':+ optional: true++ '@biomejs/[email protected]':+ optional: true++ '@biomejs/[email protected]':+ optional: true++ '@biomejs/[email protected]':+ optional: true++ '@biomejs/[email protected]':+ optional: true+'@buf/googleapis_googleapis.bufbuild_es@2.9.0-20251009205305-72c8614f3bd0.1(@bufbuild/[email protected])':dependencies:'@bufbuild/protobuf': 2.10.0@@ -7841,20 +7849,6 @@ snapshots:'@tanstack/virtual-core': 3.13.12vue: 3.5.22([email protected])- dependencies:- '@babel/generator': 7.28.3- '@babel/parser': 7.28.4- '@babel/traverse': 7.28.4- '@babel/types': 7.28.4- javascript-natural-sort: 0.7.1- lodash: 4.17.21- prettier: 3.6.2- optionalDependencies:- '@vue/compiler-sfc': 3.5.22- transitivePeerDependencies:- - supports-color-'@tsconfig/[email protected]': {}'@tsconfig/[email protected]': {}@@ -8321,15 +8315,6 @@ snapshots:dependencies:rfdc: 1.4.1- dependencies:- eslint: 9.39.1([email protected])- eslint-config-prettier: 10.1.8([email protected]([email protected]))- eslint-plugin-prettier: 5.5.4([email protected]([email protected]([email protected])))([email protected]([email protected]))([email protected])- prettier: 3.6.2- transitivePeerDependencies:- - '@types/eslint'-'@vue/[email protected]([email protected](@typescript-eslint/[email protected]([email protected]([email protected]))([email protected]))([email protected]([email protected]))([email protected]([email protected]([email protected]))))([email protected]([email protected]))([email protected])':dependencies:@@ -9052,19 +9037,6 @@ snapshots:eslint: 9.39.1([email protected])semver: 7.7.3- dependencies:- eslint: 9.39.1([email protected])-- [email protected]([email protected]([email protected]([email protected])))([email protected]([email protected]))([email protected]):- dependencies:- eslint: 9.39.1([email protected])- prettier: 3.6.2- prettier-linter-helpers: 1.0.0- synckit: 0.11.11- optionalDependencies:- eslint-config-prettier: 10.1.8([email protected]([email protected]))-[email protected](@typescript-eslint/[email protected]([email protected]([email protected]))([email protected]))([email protected]([email protected]))([email protected]([email protected]([email protected]))):dependencies:'@eslint-community/eslint-utils': 4.9.0([email protected]([email protected]))@@ -9172,8 +9144,6 @@ snapshots:- [email protected]: {}-dependencies:'@nodelib/fs.stat': 2.0.5@@ -9363,8 +9333,6 @@ snapshots:- [email protected]: {}-@@ -9417,8 +9385,6 @@ snapshots:optionalDependencies:'@pkgjs/parseargs': 0.11.0- [email protected]: {}-@@ -10358,12 +10324,6 @@ snapshots:- dependencies:- fast-diff: 1.3.0-- [email protected]: {}-@@ -10712,10 +10672,6 @@ snapshots:'@pkgr/core': 0.2.9tslib: 2.8.1- dependencies:- '@pkgr/core': 0.2.9-diff --git a/frontend/src/App.vue b/frontend/src/App.vueindex fc1782b8aa..68805cfa54 100644--- a/frontend/src/App.vue+++ b/frontend/src/App.vue@@ -32,16 +32,15 @@ import {NDialogProvider,NNotificationProvider,} from "naive-ui";-import { onErrorCaptured, watchEffect } from "vue";-import { watch } from "vue";+import { onErrorCaptured, watch, watchEffect } from "vue";import { useRoute, useRouter } from "vue-router";import Watermark from "@/components/misc/Watermark.vue";-import { themeOverrides, dateLang, generalLang } from "../naive-ui.config";+import { dateLang, generalLang, themeOverrides } from "../naive-ui.config";import { provideAppRootContext } from "./AppRootContext";import AuthContext from "./AuthContext.vue";-import NotificationContext from "./NotificationContext.vue";import OverlayStackManager from "./components/misc/OverlayStackManager.vue";import { overrideAppProfile } from "./customAppProfile";+import NotificationContext from "./NotificationContext.vue";import { t } from "./plugins/i18n";import { useNotificationStore } from "./store";import { isDev } from "./utils";diff --git a/frontend/src/AuthContext.vue b/frontend/src/AuthContext.vueindex 6d2b4e5779..77fabe019f 100644--- a/frontend/src/AuthContext.vue+++ b/frontend/src/AuthContext.vue@@ -8,7 +8,7 @@</template><script setup lang="ts">-import { onMounted, onUnmounted, ref, watch, computed } from "vue";+import { computed, onMounted, onUnmounted, ref, watch } from "vue";import { useRouter } from "vue-router";import { isAuthRelatedRoute } from "@/utils/auth";import InactiveRemindModal from "@/views/auth/InactiveRemindModal.vue";@@ -16,12 +16,12 @@ import SigninModal from "@/views/auth/SigninModal.vue";import { t } from "./plugins/i18n";import { WORKSPACE_ROOT_MODULE } from "./router/dashboard/workspaceRoutes";import {+ pushNotification,useAuthStore,useCurrentUserV1,- pushNotification,- useWorkspaceV1Store,useGroupStore,useRoleStore,+ useWorkspaceV1Store,} from "./store";import { isDev } from "./utils";diff --git a/frontend/src/NotificationContext.vue b/frontend/src/NotificationContext.vueindex 11af8e746e..867ebecd52 100644--- a/frontend/src/NotificationContext.vue+++ b/frontend/src/NotificationContext.vue@@ -4,7 +4,7 @@<script setup lang="ts">import { useNotification } from "naive-ui";-import { watchEffect, h } from "vue";+import { h, watchEffect } from "vue";import { useNotificationStore } from "@/store";import type { BBNotificationStyle } from "@/types";diff --git a/frontend/src/assets/css/github-markdown-style.css b/frontend/src/assets/css/github-markdown-style.cssindex 378c072e21..94983abb3d 100644--- a/frontend/src/assets/css/github-markdown-style.css+++ b/frontend/src/assets/css/github-markdown-style.css@@ -4,8 +4,9 @@margin: 0;color: #24292f;background-color: #ffffff;- font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial,- sans-serif, "Apple Color Emoji", "Segoe UI Emoji";+ font-family:+ -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif,+ "Apple Color Emoji", "Segoe UI Emoji";font-size: 14px;line-height: 1.5;word-wrap: break-word;@@ -235,8 +236,14 @@.markdown-body kbd {display: inline-block;padding: 3px 5px;- font: 11px ui-monospace, SFMono-Regular, SF Mono, Menlo, Consolas,- Liberation Mono, monospace;+ font:+ 11px ui-monospace,+ SFMono-Regular,+ SF Mono,+ Menlo,+ Consolas,+ Liberation Mono,+ monospace;line-height: 10px;color: #24292f;vertical-align: middle;@@ -332,16 +339,28 @@.markdown-body tt,.markdown-body code {- font-family: ui-monospace, SFMono-Regular, SF Mono, Menlo, Consolas,- Liberation Mono, monospace;+ font-family:+ ui-monospace,+ SFMono-Regular,+ SF Mono,+ Menlo,+ Consolas,+ Liberation Mono,+ monospace;font-size: 12px;}.markdown-body pre {margin-top: 0;margin-bottom: 0;- font-family: ui-monospace, SFMono-Regular, SF Mono, Menlo, Consolas,- Liberation Mono, monospace;+ font-family:+ ui-monospace,+ SFMono-Regular,+ SF Mono,+ Menlo,+ Consolas,+ Liberation Mono,+ monospace;font-size: 12px;word-wrap: normal;}diff --git a/frontend/src/assets/css/inter.css b/frontend/src/assets/css/inter.cssdeleted file mode 100644index 07d1c13c43..0000000000--- a/frontend/src/assets/css/inter.css+++ /dev/null@@ -1,20 +0,0 @@-@use "~inter-ui/default" with (- $inter-font-display: swap,- $inter-font-path: '~inter-ui/Inter (web)'-);-@use "~inter-ui/variable" with (- $inter-font-display: swap,- $inter-font-path: '~inter-ui/Inter (web)'-);-@include default.all;-@include variable.all;--html {- font-family: "Inter", "system-ui";-}--@supports (font-variation-settings: normal) {- html {- font-family: "Inter var", "system-ui";- }-}diff --git a/frontend/src/assets/css/tailwind.css b/frontend/src/assets/css/tailwind.cssindex fe5b5d1be4..3598a6f370 100644--- a/frontend/src/assets/css/tailwind.css+++ b/frontend/src/assets/css/tailwind.css@@ -4,7 +4,7 @@Colors for dark themeOnly used by Web Terminal now*/-@config '../../../tailwind.config.js';+@config "../../../tailwind.config.js";/*The default border color has changed to `currentcolor` in Tailwind CSS v4,diff --git a/frontend/src/bbkit/BBAlert.vue b/frontend/src/bbkit/BBAlert.vueindex bbd8b7cd46..fe7e26d08c 100644--- a/frontend/src/bbkit/BBAlert.vue+++ b/frontend/src/bbkit/BBAlert.vue@@ -18,7 +18,7 @@</template><script lang="ts" setup>-import { NModal, type ButtonProps } from "naive-ui";+import { type ButtonProps, NModal } from "naive-ui";import { t } from "@/plugins/i18n";withDefaults(diff --git a/frontend/src/bbkit/BBButtonConfirm.vue b/frontend/src/bbkit/BBButtonConfirm.vueindex 2d269a6461..cf8d5ef2c0 100644--- a/frontend/src/bbkit/BBButtonConfirm.vue+++ b/frontend/src/bbkit/BBButtonConfirm.vue@@ -45,7 +45,7 @@<script lang="tsx" setup>import { ArchiveIcon, Trash2Icon, Undo2Icon } from "lucide-vue-next";-import { NButton, type ButtonProps } from "naive-ui";+import { type ButtonProps, NButton } from "naive-ui";import { computed, reactive } from "vue";import { useI18n } from "vue-i18n";import BBAlert from "./BBAlert.vue";diff --git a/frontend/src/bbkit/BBModal.vue b/frontend/src/bbkit/BBModal.vueindex 287ca7a297..d346d63f20 100644--- a/frontend/src/bbkit/BBModal.vue+++ b/frontend/src/bbkit/BBModal.vue@@ -51,8 +51,7 @@import { XIcon } from "lucide-vue-next";import { NButton, NModal } from "naive-ui";import type { PropType, RenderFunction } from "vue";-import { defineComponent, h } from "vue";-import { toRef } from "vue";+import { defineComponent, h, toRef } from "vue";import { useOverlayStack } from "@/components/misc/OverlayStackManager.vue";import { useEmitteryEventListener } from "@/composables/useEmitteryEventListener";import type { VueClass } from "@/utils";diff --git a/frontend/src/components/AdvancedSearch/AdvancedSearch.vue b/frontend/src/components/AdvancedSearch/AdvancedSearch.vueindex 84371feda7..6357f92bb8 100644--- a/frontend/src/components/AdvancedSearch/AdvancedSearch.vue+++ b/frontend/src/components/AdvancedSearch/AdvancedSearch.vue@@ -83,33 +83,31 @@</template><script lang="ts" setup>-import { useDebounceFn, onClickOutside } from "@vueuse/core";-import { useElementSize } from "@vueuse/core";+import { onClickOutside, useDebounceFn, useElementSize } from "@vueuse/core";import { cloneDeep, last } from "lodash-es";-import { FilterIcon } from "lucide-vue-next";-import { XIcon } from "lucide-vue-next";-import { NButton, NInput, type InputInst } from "naive-ui";+import { FilterIcon, XIcon } from "lucide-vue-next";+import { type InputInst, NButton, NInput } from "naive-ui";import scrollIntoView from "scroll-into-view-if-needed";import { zindexable as vZindexable } from "vdirs";-import { reactive, watch, onMounted, ref, computed, nextTick } from "vue";+import { computed, nextTick, onMounted, reactive, ref, watch } from "vue";import { useRouter } from "vue-router";import { useCurrentUserV1 } from "@/store";import { DEBOUNCE_SEARCH_DELAY } from "@/types";import type { SearchParams, SearchScopeId } from "@/utils";import {+ buildSearchParamsBySearchText,+ buildSearchTextBySearchParams,emptySearchParams,getValueFromSearchParams,+ mergeSearchParams,minmax,upsertScope,- buildSearchTextBySearchParams,- buildSearchParamsBySearchText,- mergeSearchParams,useDynamicLocalStorage,} from "@/utils";import ScopeMenu from "./ScopeMenu.vue";import ScopeTags from "./ScopeTags.vue";-import ValueMenu from "./ValueMenu.vue";import type { ScopeOption } from "./types";+import ValueMenu from "./ValueMenu.vue";const props = withDefaults(defineProps<{diff --git a/frontend/src/components/AdvancedSearch/ValueMenu.vue b/frontend/src/components/AdvancedSearch/ValueMenu.vueindex 50bba0cca0..7f6fd6675e 100644--- a/frontend/src/components/AdvancedSearch/ValueMenu.vue+++ b/frontend/src/components/AdvancedSearch/ValueMenu.vue@@ -89,7 +89,7 @@ import {useElementSize,useWindowSize,} from "@vueuse/core";-import { NEmpty, NButton, NVirtualList } from "naive-ui";+import { NButton, NEmpty, NVirtualList } from "naive-ui";import { computed, nextTick, ref, watch } from "vue";import type { ScopeOption, ValueOption } from "./types";diff --git a/frontend/src/components/AdvancedSearch/useCommonSearchScopeOptions.ts b/frontend/src/components/AdvancedSearch/useCommonSearchScopeOptions.tsindex 1b77b8c571..235fef744a 100644--- a/frontend/src/components/AdvancedSearch/useCommonSearchScopeOptions.ts+++ b/frontend/src/components/AdvancedSearch/useCommonSearchScopeOptions.ts@@ -1,9 +1,9 @@import type { VNode } from "vue";import { computed, h, unref } from "vue";import {+ EnvironmentV1Name,InstanceV1Name,ProjectV1Name,- EnvironmentV1Name,RichEngineName,} from "@/components/v2";import { t } from "@/plugins/i18n";@@ -15,16 +15,16 @@ import {useProjectV1Store,} from "@/store";import type { MaybeRef } from "@/types";-import { unknownEnvironment, UNKNOWN_ENVIRONMENT_NAME } from "@/types";+import { UNKNOWN_ENVIRONMENT_NAME, unknownEnvironment } from "@/types";import { Engine } from "@/types/proto-es/v1/common_pb";import type { SearchScopeId } from "@/utils";import {extractEnvironmentResourceName,extractInstanceResourceName,extractProjectResourceName,- supportedEngineV1List,getDefaultPagination,hasWorkspacePermissionV2,+ supportedEngineV1List,} from "@/utils";import type { ScopeOption, ValueOption } from "./types";diff --git a/frontend/src/components/AuditLog/AuditLogDataTable.vue b/frontend/src/components/AuditLog/AuditLogDataTable.vueindex 3a19ed722e..3749d62b65 100644--- a/frontend/src/components/AuditLog/AuditLogDataTable.vue+++ b/frontend/src/components/AuditLog/AuditLogDataTable.vue@@ -15,15 +15,15 @@ import { createRegistry, toJsonString } from "@bufbuild/protobuf";import { AnySchema } from "@bufbuild/protobuf/wkt";import dayjs from "dayjs";import { ExternalLinkIcon } from "lucide-vue-next";-import { NButton, NDataTable, type DataTableColumn } from "naive-ui";+import { type DataTableColumn, NButton, NDataTable } from "naive-ui";import { computed } from "vue";import { useI18n } from "vue-i18n";import BBAvatar from "@/bbkit/BBAvatar.vue";import { useProjectV1Store, useUserStore } from "@/store";import {+ getProjectIdRolloutUidStageUid,projectNamePrefix,rolloutNamePrefix,- getProjectIdRolloutUidStageUid,} from "@/store/modules/v1/common";import { getDateForPbTimestampProtoEs } from "@/types";import { StatusSchema } from "@/types/proto-es/google/rpc/status_pb";@@ -32,20 +32,22 @@ import {AuditDataSchema,AuditLog_Severity,} from "@/types/proto-es/v1/audit_log_service_pb";-import { IssueService, type Issue } from "@/types/proto-es/v1/issue_service_pb";-import { file_v1_plan_service } from "@/types/proto-es/v1/plan_service_pb";-import { PlanService, type Plan } from "@/types/proto-es/v1/plan_service_pb";+import { type Issue, IssueService } from "@/types/proto-es/v1/issue_service_pb";+import {+ file_v1_plan_service,+ type Plan,+ PlanService,+} from "@/types/proto-es/v1/plan_service_pb";import {- RolloutService,type Rollout,+ RolloutService,} from "@/types/proto-es/v1/rollout_service_pb";import { SettingSchema } from "@/types/proto-es/v1/setting_service_pb";import {- SQLService,type ExportRequest,+ SQLService,} from "@/types/proto-es/v1/sql_service_pb";-import { humanizeDurationV1 } from "@/utils";-import { extractProjectResourceName } from "@/utils";+import { extractProjectResourceName, humanizeDurationV1 } from "@/utils";import JSONStringView from "./JSONStringView.vue";type AuditDataTableColumn = DataTableColumn<AuditLog> & {diff --git a/frontend/src/components/AuditLog/AuditLogSearch/AuditLogSearch.vue b/frontend/src/components/AuditLog/AuditLogSearch/AuditLogSearch.vueindex d725bf5469..e4e77c3928 100644--- a/frontend/src/components/AuditLog/AuditLogSearch/AuditLogSearch.vue+++ b/frontend/src/components/AuditLog/AuditLogSearch/AuditLogSearch.vue@@ -33,8 +33,8 @@ import { SYSTEM_BOT_USER_NAME } from "@/types";import { AuditLog_Severity } from "@/types/proto-es/v1/audit_log_service_pb";import { UserType } from "@/types/proto-es/v1/user_service_pb";import {- getDefaultPagination,extractProjectResourceName,+ getDefaultPagination,type SearchParams,} from "@/utils";diff --git a/frontend/src/components/Changelog/AffectedTablesSelect.vue b/frontend/src/components/Changelog/AffectedTablesSelect.vueindex 6d729ce34d..ae689d5a52 100644--- a/frontend/src/components/Changelog/AffectedTablesSelect.vue+++ b/frontend/src/components/Changelog/AffectedTablesSelect.vue@@ -12,8 +12,8 @@</template><script setup lang="tsx">-import { NSelect } from "naive-ui";import type { SelectOption } from "naive-ui";+import { NSelect } from "naive-ui";import { computed } from "vue";import { useDBSchemaV1Store } from "@/store";import { type ComposedDatabase, type Table } from "@/types";diff --git a/frontend/src/components/Changelog/ChangelogDataTable.vue b/frontend/src/components/Changelog/ChangelogDataTable.vueindex 8d1823031f..c32928e39d 100644--- a/frontend/src/components/Changelog/ChangelogDataTable.vue+++ b/frontend/src/components/Changelog/ChangelogDataTable.vue@@ -17,8 +17,7 @@import { type DataTableColumn, NDataTable } from "naive-ui";import { computed } from "vue";import { useI18n } from "vue-i18n";-import { useRouter } from "vue-router";-import { RouterLink } from "vue-router";+import { RouterLink, useRouter } from "vue-router";import { getDateForPbTimestampProtoEs } from "@/types";import type { Changelog } from "@/types/proto-es/v1/database_service_pb";import {diff --git a/frontend/src/components/Changelog/ChangelogDetail.vue b/frontend/src/components/Changelog/ChangelogDetail.vueindex 845729e6de..4636d47b48 100644--- a/frontend/src/components/Changelog/ChangelogDetail.vue+++ b/frontend/src/components/Changelog/ChangelogDetail.vue@@ -131,23 +131,23 @@<script lang="ts" setup>import { NSwitch, NTag } from "naive-ui";-import { computed, reactive, watch, unref } from "vue";+import { computed, reactive, unref, watch } from "vue";import { BBSpin } from "@/bbkit";import { DiffEditor, MonacoEditor } from "@/components/MonacoEditor";import { CopyButton } from "@/components/v2";import {useChangelogStore,- useDBSchemaV1Store,useDatabaseV1ByName,+ useDBSchemaV1Store,} from "@/store";import { getDateForPbTimestampProtoEs } from "@/types";import type { Changelog } from "@/types/proto-es/v1/database_service_pb";import { ChangelogView } from "@/types/proto-es/v1/database_service_pb";import {extractIssueUID,+ getAffectedTableDisplayName,getStatementSize,hasProjectPermissionV2,- getAffectedTableDisplayName,wrapRefAsPromise,} from "@/utils";import {diff --git a/frontend/src/components/ColumnDataTable/ClassificationCell.vue b/frontend/src/components/ColumnDataTable/ClassificationCell.vueindex 957cea270b..ee144d26f5 100644--- a/frontend/src/components/ColumnDataTable/ClassificationCell.vue+++ b/frontend/src/components/ColumnDataTable/ClassificationCell.vue@@ -35,7 +35,7 @@<script lang="ts" setup>import { PencilIcon, XIcon } from "lucide-vue-next";import { NPopconfirm } from "naive-ui";-import { ref, computed } from "vue";+import { computed, ref } from "vue";import ClassificationLevelBadge from "@/components/SchemaTemplate/ClassificationLevelBadge.vue";import { MiniActionButton } from "@/components/v2";import type { Engine } from "@/types/proto-es/v1/common_pb";diff --git a/frontend/src/components/ColumnDataTable/LabelsCell.vue b/frontend/src/components/ColumnDataTable/LabelsCell.vueindex e9f3c789eb..3069cdcd41 100644--- a/frontend/src/components/ColumnDataTable/LabelsCell.vue+++ b/frontend/src/components/ColumnDataTable/LabelsCell.vue@@ -22,10 +22,9 @@</template><script lang="ts" setup>-import { computed } from "vue";-import { reactive } from "vue";+import { computed, reactive } from "vue";import { LabelsCell } from "@/components/v2/Model/cells";-import { useDatabaseCatalog, getColumnCatalog } from "@/store";+import { getColumnCatalog, useDatabaseCatalog } from "@/store";import LabelEditorDrawer from "../LabelEditorDrawer.vue";import { updateColumnCatalog } from "./utils";diff --git a/frontend/src/components/ColumnDataTable/index.vue b/frontend/src/components/ColumnDataTable/index.vueindex 7972a580d0..cc24f4e805 100644--- a/frontend/src/components/ColumnDataTable/index.vue+++ b/frontend/src/components/ColumnDataTable/index.vue@@ -13,14 +13,13 @@<script lang="ts" setup>import type { DataTableColumn } from "naive-ui";import { NCheckbox, NDataTable } from "naive-ui";-import { computed } from "vue";-import { h } from "vue";+import { computed, h } from "vue";import { useI18n } from "vue-i18n";import { getColumnDefaultValuePlaceholder } from "@/components/SchemaEditorLite";import {- useSubscriptionV1Store,- useDatabaseCatalog,getColumnCatalog,+ useDatabaseCatalog,+ useSubscriptionV1Store,} from "@/store";import type { ComposedDatabase } from "@/types";import { Engine } from "@/types/proto-es/v1/common_pb";diff --git a/frontend/src/components/ColumnDataTable/utils.ts b/frontend/src/components/ColumnDataTable/utils.tsindex 3c8baba0b5..37fdded078 100644--- a/frontend/src/components/ColumnDataTable/utils.ts+++ b/frontend/src/components/ColumnDataTable/utils.ts@@ -8,10 +8,10 @@ import type {TableCatalog,} from "@/types/proto-es/v1/database_catalog_service_pb";import {- SchemaCatalogSchema,ColumnCatalogSchema,- TableCatalogSchema,+ SchemaCatalogSchema,TableCatalog_ColumnsSchema,+ TableCatalogSchema,} from "@/types/proto-es/v1/database_catalog_service_pb";export const supportClassificationFromCommentFeature = (engine: Engine) => {diff --git a/frontend/src/components/CreateDatabasePrepForm/CreateDatabasePrepPanel.vue b/frontend/src/components/CreateDatabasePrepForm/CreateDatabasePrepPanel.vueindex 1b031dbca9..897358a754 100644--- a/frontend/src/components/CreateDatabasePrepForm/CreateDatabasePrepPanel.vue+++ b/frontend/src/components/CreateDatabasePrepForm/CreateDatabasePrepPanel.vue@@ -198,12 +198,12 @@ import {} from "@/types";import { Engine } from "@/types/proto-es/v1/common_pb";import type { InstanceRole } from "@/types/proto-es/v1/instance_role_service_pb";-import { IssueSchema, Issue_Type } from "@/types/proto-es/v1/issue_service_pb";+import { Issue_Type, IssueSchema } from "@/types/proto-es/v1/issue_service_pb";import type { Plan_CreateDatabaseConfig } from "@/types/proto-es/v1/plan_service_pb";import {- PlanSchema,- Plan_SpecSchema,Plan_CreateDatabaseConfigSchema,+ Plan_SpecSchema,+ PlanSchema,} from "@/types/proto-es/v1/plan_service_pb";import {enginesSupportCreateDatabase,diff --git a/frontend/src/components/CustomApproval/Settings/components/CustomApproval/CustomApproval.vue b/frontend/src/components/CustomApproval/Settings/components/CustomApproval/CustomApproval.vueindex 8bad54b4ff..62b64972eb 100644--- a/frontend/src/components/CustomApproval/Settings/components/CustomApproval/CustomApproval.vue+++ b/frontend/src/components/CustomApproval/Settings/components/CustomApproval/CustomApproval.vue@@ -22,9 +22,9 @@<script lang="ts" setup>import { NTabPane, NTabs } from "naive-ui";import { provideRiskFilter } from "../common/RiskFilter";+import { useCustomApprovalContext } from "./context";import FlowsPanel from "./FlowsPanel";import RulesPanel from "./RulesPanel";-import { useCustomApprovalContext } from "./context";const { tab } = useCustomApprovalContext();provideRiskFilter();diff --git a/frontend/src/components/CustomApproval/Settings/components/CustomApproval/FlowsPanel/FlowTable.vue b/frontend/src/components/CustomApproval/Settings/components/CustomApproval/FlowsPanel/FlowTable.vueindex 44b62e41b4..1d238dfb57 100644--- a/frontend/src/components/CustomApproval/Settings/components/CustomApproval/FlowsPanel/FlowTable.vue+++ b/frontend/src/components/CustomApproval/Settings/components/CustomApproval/FlowsPanel/FlowTable.vue@@ -53,18 +53,18 @@<script lang="tsx" setup>import { create as createProto } from "@bufbuild/protobuf";-import { NButton, NDataTable } from "naive-ui";import type { DataTableColumn } from "naive-ui";+import { NButton, NDataTable } from "naive-ui";import { computed, reactive } from "vue";import { useI18n } from "vue-i18n";import { BBModal } from "@/bbkit";import { SpinnerButton } from "@/components/v2/Form";import { pushNotification, useWorkspaceApprovalSettingStore } from "@/store";import {- type LocalApprovalRule,BUILTIN_APPROVAL_FLOWS,type BuiltinApprovalFlow,isBuiltinFlowId,+ type LocalApprovalRule,} from "@/types";import type { ApprovalFlow } from "@/types/proto-es/v1/issue_service_pb";import { ApprovalFlowSchema } from "@/types/proto-es/v1/issue_service_pb";diff --git a/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/RulesSection.vue b/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/RulesSection.vueindex b53bf8586b..6805685a54 100644--- a/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/RulesSection.vue+++ b/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/RulesSection.vue@@ -19,8 +19,8 @@</template><script lang="tsx" setup>-import { NDataTable } from "naive-ui";import type { DataTableColumn } from "naive-ui";+import { NDataTable } from "naive-ui";import { computed } from "vue";import { useI18n } from "vue-i18n";import { pushNotification, useWorkspaceApprovalSettingStore } from "@/store";diff --git a/frontend/src/components/CustomApproval/Settings/components/CustomApproval/common/StepsTable.vue b/frontend/src/components/CustomApproval/Settings/components/CustomApproval/common/StepsTable.vueindex 251fe13148..da9862defd 100644--- a/frontend/src/components/CustomApproval/Settings/components/CustomApproval/common/StepsTable.vue+++ b/frontend/src/components/CustomApproval/Settings/components/CustomApproval/common/StepsTable.vue@@ -23,13 +23,13 @@<script lang="tsx" setup>/* eslint-disable vue/no-mutating-props */import {- ArrowUpIcon,ArrowDownIcon,- TrashIcon,+ ArrowUpIcon,PlusIcon,+ TrashIcon,} from "lucide-vue-next";-import { NButton, NDataTable } from "naive-ui";import type { DataTableColumn } from "naive-ui";+import { NButton, NDataTable } from "naive-ui";import { computed } from "vue";import { useI18n } from "vue-i18n";import { RoleSelect } from "@/components/v2";diff --git a/frontend/src/components/CustomApproval/Settings/components/CustomApproval/context.ts b/frontend/src/components/CustomApproval/Settings/components/CustomApproval/context.tsindex a7f99a33b8..1ad2916019 100644--- a/frontend/src/components/CustomApproval/Settings/components/CustomApproval/context.ts+++ b/frontend/src/components/CustomApproval/Settings/components/CustomApproval/context.ts@@ -1,4 +1,4 @@-import { inject, provide, type InjectionKey, type Ref } from "vue";+import { type InjectionKey, inject, provide, type Ref } from "vue";import type { LocalApprovalRule } from "@/types";export const TabValueList = ["rules", "flows", "external-approval"] as const;diff --git a/frontend/src/components/CustomApproval/Settings/components/RiskCenter/RiskCenter.vue b/frontend/src/components/CustomApproval/Settings/components/RiskCenter/RiskCenter.vueindex ed0959f585..4f6f30094b 100644--- a/frontend/src/components/CustomApproval/Settings/components/RiskCenter/RiskCenter.vue+++ b/frontend/src/components/CustomApproval/Settings/components/RiskCenter/RiskCenter.vue@@ -32,9 +32,9 @@ import { useRiskStore } from "@/store";import { PresetRiskLevelList, useSupportedSourceList } from "@/types";import { RiskSchema } from "@/types/proto-es/v1/risk_service_pb";import { hasWorkspacePermissionV2 } from "@/utils";-import { RiskFilter, orderByLevelDesc, useRiskFilter } from "../common";-import RiskSection from "./RiskSection.vue";+import { orderByLevelDesc, RiskFilter, useRiskFilter } from "../common";import { useRiskCenterContext } from "./context";+import RiskSection from "./RiskSection.vue";const context = useRiskCenterContext();const riskStore = useRiskStore();diff --git a/frontend/src/components/CustomApproval/Settings/components/RiskCenter/RiskDialog/RiskForm.vue b/frontend/src/components/CustomApproval/Settings/components/RiskCenter/RiskDialog/RiskForm.vueindex 8788841731..6cec8933c0 100644--- a/frontend/src/components/CustomApproval/Settings/components/RiskCenter/RiskDialog/RiskForm.vue+++ b/frontend/src/components/CustomApproval/Settings/components/RiskCenter/RiskDialog/RiskForm.vue@@ -94,19 +94,19 @@<script lang="ts" setup>import { create } from "@bufbuild/protobuf";-import { cloneDeep, head, uniq, flatten } from "lodash-es";+import { cloneDeep, flatten, head, uniq } from "lodash-es";import { NButton, NInput } from "naive-ui";import { computed, reactive, watch } from "vue";import ExprEditor from "@/components/ExprEditor";import LearnMoreLink from "@/components/LearnMoreLink.vue";import type { ConditionGroupExpr, Factor, SimpleExpr } from "@/plugins/cel";-import { ExprType } from "@/plugins/cel";import {- resolveCELExpr,buildCELExpr,- wrapAsGroup,- validateSimpleExpr,+ ExprType,emptySimpleExpr,+ resolveCELExpr,+ validateSimpleExpr,+ wrapAsGroup,} from "@/plugins/cel";import { useSupportedSourceList } from "@/types";import { ExprSchema } from "@/types/proto-es/google/type/expr_pb";diff --git a/frontend/src/components/CustomApproval/Settings/components/RiskCenter/RiskDialog/RuleTemplateTable.vue b/frontend/src/components/CustomApproval/Settings/components/RiskCenter/RiskDialog/RuleTemplateTable.vueindex 622e75ef9d..372337cc63 100644--- a/frontend/src/components/CustomApproval/Settings/components/RiskCenter/RiskDialog/RuleTemplateTable.vue+++ b/frontend/src/components/CustomApproval/Settings/components/RiskCenter/RiskDialog/RuleTemplateTable.vue@@ -29,8 +29,8 @@<script lang="tsx" setup>import { create } from "@bufbuild/protobuf";-import { NButton, NDataTable, useDialog } from "naive-ui";import type { DataTableColumn } from "naive-ui";+import { NButton, NDataTable, useDialog } from "naive-ui";import { computed, ref } from "vue";import { useI18n } from "vue-i18n";import { BBModal } from "@/bbkit";@@ -41,12 +41,12 @@ import type { Risk } from "@/types/proto-es/v1/risk_service_pb";import { Risk_Source } from "@/types/proto-es/v1/risk_service_pb";import { batchConvertParsedExprToCELString, defer } from "@/utils";import { useRiskCenterContext } from "../context";-import ViewTemplate from "./ViewTemplate.vue";import {type RuleTemplate,- useRuleTemplates,titleOfTemplate,+ useRuleTemplates,} from "./template";+import ViewTemplate from "./ViewTemplate.vue";const props = defineProps<{dirty?: boolean;diff --git a/frontend/src/components/CustomApproval/Settings/components/RiskCenter/RiskDialog/template.ts b/frontend/src/components/CustomApproval/Settings/components/RiskCenter/RiskDialog/template.tsindex 24e0077cf7..6d5424ad7b 100644--- a/frontend/src/components/CustomApproval/Settings/components/RiskCenter/RiskDialog/template.ts+++ b/frontend/src/components/CustomApproval/Settings/components/RiskCenter/RiskDialog/template.ts@@ -7,8 +7,8 @@ import { useEnvironmentV1List } from "@/store";import { PresetRiskLevel, PresetRoleType } from "@/types";import { Risk_Source } from "@/types/proto-es/v1/risk_service_pb";import {- CEL_ATTRIBUTE_RESOURCE_ENVIRONMENT_ID,CEL_ATTRIBUTE_REQUEST_ROLE,+ CEL_ATTRIBUTE_RESOURCE_ENVIRONMENT_ID,CEL_ATTRIBUTE_STATEMENT_AFFECTED_ROWS,CEL_ATTRIBUTE_STATEMENT_SQL_TYPE,} from "@/utils/cel-attributes";diff --git a/frontend/src/components/CustomApproval/Settings/components/RiskCenter/RiskTable.vue b/frontend/src/components/CustomApproval/Settings/components/RiskCenter/RiskTable.vueindex 72684f5589..68d0c54707 100644--- a/frontend/src/components/CustomApproval/Settings/components/RiskCenter/RiskTable.vue+++ b/frontend/src/components/CustomApproval/Settings/components/RiskCenter/RiskTable.vue@@ -9,8 +9,8 @@</template><script lang="tsx" setup>-import { NButton, NDataTable } from "naive-ui";import type { DataTableColumn } from "naive-ui";+import { NButton, NDataTable } from "naive-ui";import { computed } from "vue";import { useI18n } from "vue-i18n";import { SpinnerButton, SpinnerSwitch } from "@/components/v2/Form";diff --git a/frontend/src/components/CustomApproval/Settings/components/RiskCenter/context.ts b/frontend/src/components/CustomApproval/Settings/components/RiskCenter/context.tsindex 8aa3571798..2b9ca77455 100644--- a/frontend/src/components/CustomApproval/Settings/components/RiskCenter/context.ts+++ b/frontend/src/components/CustomApproval/Settings/components/RiskCenter/context.ts@@ -1,4 +1,4 @@-import { inject, provide, type InjectionKey, type Ref } from "vue";+import { type InjectionKey, inject, provide, type Ref } from "vue";import type { Risk } from "@/types/proto-es/v1/risk_service_pb";export type DialogContext = {diff --git a/frontend/src/components/CustomApproval/Settings/components/common/RiskFilter/context.ts b/frontend/src/components/CustomApproval/Settings/components/common/RiskFilter/context.tsindex 29f54a5517..add0d956cb 100644--- a/frontend/src/components/CustomApproval/Settings/components/common/RiskFilter/context.ts+++ b/frontend/src/components/CustomApproval/Settings/components/common/RiskFilter/context.ts@@ -1,4 +1,4 @@-import { type InjectionKey, type Ref, inject, provide, ref } from "vue";+import { type InjectionKey, inject, provide, type Ref, ref } from "vue";import { Risk_Source } from "@/types/proto-es/v1/risk_service_pb";export type RiskFilterContext = {diff --git a/frontend/src/components/CustomApproval/Settings/components/common/utils.ts b/frontend/src/components/CustomApproval/Settings/components/common/utils.tsindex 504352c491..9d21f3e63b 100644--- a/frontend/src/components/CustomApproval/Settings/components/common/utils.ts+++ b/frontend/src/components/CustomApproval/Settings/components/common/utils.ts@@ -1,24 +1,24 @@import { CheckIcon } from "lucide-vue-next";import type { SelectOption } from "naive-ui";-import { h } from "vue";import type { VNode } from "vue";+import { h } from "vue";import { type OptionConfig } from "@/components/ExprEditor/context";import { getInstanceIdOptions } from "@/components/SensitiveData/components/utils";import { EnvironmentV1Name, RichDatabaseName } from "@/components/v2";-import { SQLTypeList, type Factor } from "@/plugins/cel";+import { type Factor, SQLTypeList } from "@/plugins/cel";import { t } from "@/plugins/i18n";import {useEnvironmentV1Store,- useProjectV1Store,useInstanceV1Store,+ useProjectV1Store,useRoleStore,} from "@/store";import {+ type ComposedDatabase,DEFAULT_PROJECT_NAME,PRESET_WORKSPACE_ROLES,PresetRiskLevelList,useSupportedSourceList,- type ComposedDatabase,} from "@/types";import { Engine, RiskLevel } from "@/types/proto-es/v1/common_pb";import type { Project } from "@/types/proto-es/v1/project_service_pb";@@ -31,21 +31,21 @@ import {supportedEngineV1List,} from "@/utils";import {+ CEL_ATTRIBUTE_LEVEL,CEL_ATTRIBUTE_REQUEST_EXPIRATION_DAYS,CEL_ATTRIBUTE_REQUEST_ROLE,- CEL_ATTRIBUTE_STATEMENT_AFFECTED_ROWS,- CEL_ATTRIBUTE_STATEMENT_TABLE_ROWS,- CEL_ATTRIBUTE_STATEMENT_SQL_TYPE,- CEL_ATTRIBUTE_STATEMENT_TEXT,+ CEL_ATTRIBUTE_RESOURCE_DATABASE_NAME,+ CEL_ATTRIBUTE_RESOURCE_DB_ENGINE,CEL_ATTRIBUTE_RESOURCE_ENVIRONMENT_ID,- CEL_ATTRIBUTE_RESOURCE_PROJECT_ID,CEL_ATTRIBUTE_RESOURCE_INSTANCE_ID,- CEL_ATTRIBUTE_RESOURCE_DATABASE_NAME,- CEL_ATTRIBUTE_RESOURCE_TABLE_NAME,+ CEL_ATTRIBUTE_RESOURCE_PROJECT_ID,CEL_ATTRIBUTE_RESOURCE_SCHEMA_NAME,- CEL_ATTRIBUTE_RESOURCE_DB_ENGINE,- CEL_ATTRIBUTE_LEVEL,+ CEL_ATTRIBUTE_RESOURCE_TABLE_NAME,CEL_ATTRIBUTE_SOURCE,+ CEL_ATTRIBUTE_STATEMENT_AFFECTED_ROWS,+ CEL_ATTRIBUTE_STATEMENT_SQL_TYPE,+ CEL_ATTRIBUTE_STATEMENT_TABLE_ROWS,+ CEL_ATTRIBUTE_STATEMENT_TEXT,} from "@/utils/cel-attributes";export const sourceText = (source: Risk_Source) => {diff --git a/frontend/src/components/DataExportPrepForm/DataExportPrepForm.vue b/frontend/src/components/DataExportPrepForm/DataExportPrepForm.vueindex d79ad2fadd..d40d47d39c 100644--- a/frontend/src/components/DataExportPrepForm/DataExportPrepForm.vue+++ b/frontend/src/components/DataExportPrepForm/DataExportPrepForm.vue@@ -41,13 +41,13 @@<script lang="ts" setup>import { NButton } from "naive-ui";import { computed, reactive } from "vue";-import { useRouter, type LocationQueryRaw } from "vue-router";+import { type LocationQueryRaw, useRouter } from "vue-router";import DatabaseAndGroupSelector, {type DatabaseSelectState,} from "@/components/DatabaseAndGroupSelector/";import { PROJECT_V1_ROUTE_PLAN_DETAIL } from "@/router/dashboard/projectV1";import { useProjectByName } from "@/store";-import { generateIssueTitle, extractProjectResourceName } from "@/utils";+import { extractProjectResourceName, generateIssueTitle } from "@/utils";import { DrawerContent } from "../v2";type LocalState = {diff --git a/frontend/src/components/Database/DatabaseChangelogPanel.vue b/frontend/src/components/Database/DatabaseChangelogPanel.vueindex aa4b7291da..93791d6789 100644--- a/frontend/src/components/Database/DatabaseChangelogPanel.vue+++ b/frontend/src/components/Database/DatabaseChangelogPanel.vue@@ -117,15 +117,15 @@ import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";import dayjs from "dayjs";import saveAs from "file-saver";import JSZip from "jszip";-import { computed, reactive, watch, ref } from "vue";+import { computed, reactive, ref, watch } from "vue";import type { ComponentExposed } from "vue-component-type-helpers";import { useI18n } from "vue-i18n";import { useRouter } from "vue-router";import { BBAlert, BBSpin } from "@/bbkit";import {AffectedTablesSelect,- ChangeTypeSelect,ChangelogDataTable,+ ChangeTypeSelect,} from "@/components/Changelog";import { useDatabaseDetailContext } from "@/components/Database/context";import { TooltipButton } from "@/components/v2";@@ -136,8 +136,9 @@ import {useChangelogStore,useDatabaseV1Store,} from "@/store";-import type { ComposedDatabase, Table, SearchChangeLogParams } from "@/types";+import type { ComposedDatabase, SearchChangeLogParams, Table } from "@/types";import { DEFAULT_PROJECT_NAME } from "@/types";+import type { Changelog } from "@/types/proto-es/v1/database_service_pb";import {Changelog_MigrationType,Changelog_Status,@@ -146,7 +147,6 @@ import {DatabaseSchema$,UpdateDatabaseRequestSchema,} from "@/types/proto-es/v1/database_service_pb";-import type { Changelog } from "@/types/proto-es/v1/database_service_pb";import { extractProjectResourceName } from "@/utils";import { getChangelogChangeType } from "@/utils/v1/changelog";diff --git a/frontend/src/components/Database/DatabaseOverviewInfo.vue b/frontend/src/components/Database/DatabaseOverviewInfo.vueindex 4ab783dd81..aa723e956d 100644--- a/frontend/src/components/Database/DatabaseOverviewInfo.vue+++ b/frontend/src/components/Database/DatabaseOverviewInfo.vue@@ -60,7 +60,7 @@ import { computed } from "vue";import { useDBSchemaV1Store } from "@/store";import type { ComposedDatabase } from "@/types";import { Engine, State } from "@/types/proto-es/v1/common_pb";-import { instanceV1HasCollationAndCharacterSet, humanizeDate } from "@/utils";+import { humanizeDate, instanceV1HasCollationAndCharacterSet } from "@/utils";const props = defineProps<{database: ComposedDatabase;diff --git a/frontend/src/components/Database/DatabaseOverviewPanel.vue b/frontend/src/components/Database/DatabaseOverviewPanel.vueindex 8077b6c2e2..4a4012825c 100644--- a/frontend/src/components/Database/DatabaseOverviewPanel.vue+++ b/frontend/src/components/Database/DatabaseOverviewPanel.vue@@ -160,8 +160,8 @@ import { NSelect } from "naive-ui";import { computed, reactive, watch } from "vue";import { useI18n } from "vue-i18n";import { useRoute, useRouter } from "vue-router";-import DBExtensionDataTable from "@/components/DBExtensionDataTable.vue";import { useDatabaseDetailContext } from "@/components/Database/context";+import DBExtensionDataTable from "@/components/DBExtensionDataTable.vue";import ExternalTableDataTable from "@/components/ExternalTableDataTable.vue";import FunctionDataTable from "@/components/FunctionDataTable.vue";import StreamTable from "@/components/StreamTable.vue";diff --git a/frontend/src/components/Database/DatabaseSensitiveDataPanel.vue b/frontend/src/components/Database/DatabaseSensitiveDataPanel.vueindex 43fb22ad07..385ca17e22 100644--- a/frontend/src/components/Database/DatabaseSensitiveDataPanel.vue+++ b/frontend/src/components/Database/DatabaseSensitiveDataPanel.vue@@ -75,23 +75,25 @@ import { ShieldCheckIcon } from "lucide-vue-next";import { NButton } from "naive-ui";import { computed, reactive, watch } from "vue";import {- FeatureModal,- FeatureBadge,FeatureAttention,+ FeatureBadge,+ FeatureModal,} from "@/components/FeatureGuard";-import GrantAccessDrawer from "@/components/SensitiveData/GrantAccessDrawer.vue";import SensitiveColumnTable from "@/components/SensitiveData/components/SensitiveColumnTable.vue";+import GrantAccessDrawer from "@/components/SensitiveData/GrantAccessDrawer.vue";import type { MaskData } from "@/components/SensitiveData/types";import { isCurrentColumnException } from "@/components/SensitiveData/utils";import { SearchBox } from "@/components/v2";-import { featureToRef, usePolicyV1Store, useDatabaseCatalog } from "@/store";+import { featureToRef, useDatabaseCatalog, usePolicyV1Store } from "@/store";import { type ComposedDatabase } from "@/types";import {- ObjectSchema_Type,type ObjectSchema,+ ObjectSchema_Type,} from "@/types/proto-es/v1/database_catalog_service_pb";-import { MaskingExceptionPolicySchema } from "@/types/proto-es/v1/org_policy_service_pb";-import { PolicyType } from "@/types/proto-es/v1/org_policy_service_pb";+import {+ MaskingExceptionPolicySchema,+ PolicyType,+} from "@/types/proto-es/v1/org_policy_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import { hasProjectPermissionV2, instanceV1MaskingForNoSQL } from "@/utils";diff --git a/frontend/src/components/DatabaseAndGroupSelector/DatabaseAndGroupSelector.vue b/frontend/src/components/DatabaseAndGroupSelector/DatabaseAndGroupSelector.vueindex 07c8acb940..cce1f3cc1c 100644--- a/frontend/src/components/DatabaseAndGroupSelector/DatabaseAndGroupSelector.vue+++ b/frontend/src/components/DatabaseAndGroupSelector/DatabaseAndGroupSelector.vue@@ -46,15 +46,15 @@<script lang="ts" setup>import { head } from "lodash-es";-import { NTabs, NTabPane } from "naive-ui";+import { NTabPane, NTabs } from "naive-ui";import { computed, reactive, ref, watch } from "vue";import AdvancedSearch from "@/components/AdvancedSearch";import DatabaseGroupDataTable from "@/components/DatabaseGroup/DatabaseGroupDataTable.vue";import { PagedDatabaseTable } from "@/components/v2/Model/DatabaseV1Table";import { useDBGroupListByProject } from "@/store";import {- instanceNamePrefix,environmentNamePrefix,+ instanceNamePrefix,} from "@/store/modules/v1/common";import type { Project } from "@/types/proto-es/v1/project_service_pb";import {diff --git a/frontend/src/components/DatabaseDetail/DriftedDatabaseAlert.vue b/frontend/src/components/DatabaseDetail/DriftedDatabaseAlert.vueindex 3a9e582124..26ec045f07 100644--- a/frontend/src/components/DatabaseDetail/DriftedDatabaseAlert.vue+++ b/frontend/src/components/DatabaseDetail/DriftedDatabaseAlert.vue@@ -60,11 +60,11 @@ import LearnMoreLink from "@/components/LearnMoreLink.vue";import { DiffEditor } from "@/components/MonacoEditor";import {pushNotification,- useDatabaseV1Store,useChangelogStore,+ useDatabaseV1Store,} from "@/store";-import { DEFAULT_PROJECT_NAME } from "@/types";import type { ComposedDatabase } from "@/types";+import { DEFAULT_PROJECT_NAME } from "@/types";import {ChangelogView,DatabaseSchema$,diff --git a/frontend/src/components/DatabaseDetail/ExportSchemaButton.vue b/frontend/src/components/DatabaseDetail/ExportSchemaButton.vueindex 10b9e4612c..21f5a376f4 100644--- a/frontend/src/components/DatabaseDetail/ExportSchemaButton.vue+++ b/frontend/src/components/DatabaseDetail/ExportSchemaButton.vue@@ -20,11 +20,11 @@ import { computed, ref } from "vue";import { useI18n } from "vue-i18n";import { databaseServiceClientConnect } from "@/grpcweb";import { pushNotification } from "@/store";-import { isValidDatabaseName } from "@/types";import type { ComposedDatabase } from "@/types";+import { isValidDatabaseName } from "@/types";import {- GetDatabaseSDLSchemaRequestSchema,GetDatabaseSDLSchemaRequest_SDLFormat,+ GetDatabaseSDLSchemaRequestSchema,} from "@/types/proto-es/v1/database_service_pb";import { hasProjectPermissionV2 } from "@/utils";diff --git a/frontend/src/components/DatabaseDetail/SQLEditorButtonV1.vue b/frontend/src/components/DatabaseDetail/SQLEditorButtonV1.vueindex 365f86186a..5bbcc091b3 100644--- a/frontend/src/components/DatabaseDetail/SQLEditorButtonV1.vue+++ b/frontend/src/components/DatabaseDetail/SQLEditorButtonV1.vue@@ -27,9 +27,9 @@ import type { ComposedDatabase } from "@/types";import { DEFAULT_PROJECT_NAME, defaultProject } from "@/types";import type { VueClass } from "@/utils";import {- hasProjectPermissionV2,- extractProjectResourceName,extractInstanceResourceName,+ extractProjectResourceName,+ hasProjectPermissionV2,isSQLEditorRoute,} from "@/utils";diff --git a/frontend/src/components/DatabaseDetail/Settings/DatabaseSettingsPanel.vue b/frontend/src/components/DatabaseDetail/Settings/DatabaseSettingsPanel.vueindex 648a3cc89e..50af4f763b 100644--- a/frontend/src/components/DatabaseDetail/Settings/DatabaseSettingsPanel.vue+++ b/frontend/src/components/DatabaseDetail/Settings/DatabaseSettingsPanel.vue@@ -37,10 +37,10 @@ import { useI18n } from "vue-i18n";import { useDatabaseDetailContext } from "@/components/Database/context";import { EnvironmentSelect } from "@/components/v2";import {+ environmentNamePrefix,+ pushNotification,useDatabaseV1Store,useEnvironmentV1Store,- pushNotification,- environmentNamePrefix,} from "@/store";import { type ComposedDatabase } from "@/types";import { UpdateDatabaseRequestSchema } from "@/types/proto-es/v1/database_service_pb";diff --git a/frontend/src/components/DatabaseDetail/SyncDatabaseButton.vue b/frontend/src/components/DatabaseDetail/SyncDatabaseButton.vueindex 020a6054bf..6dcbf3a314 100644--- a/frontend/src/components/DatabaseDetail/SyncDatabaseButton.vue+++ b/frontend/src/components/DatabaseDetail/SyncDatabaseButton.vue@@ -21,8 +21,8 @@ import {useDatabaseV1Store,useDBSchemaV1Store,} from "@/store";-import { isValidDatabaseName } from "@/types";import type { ComposedDatabase } from "@/types";+import { isValidDatabaseName } from "@/types";import { hasProjectPermissionV2 } from "@/utils";const props = defineProps<{diff --git a/frontend/src/components/DatabaseGroup/DatabaseGroupDataTable.vue b/frontend/src/components/DatabaseGroup/DatabaseGroupDataTable.vueindex 602efa09fc..acef9d7ab0 100644--- a/frontend/src/components/DatabaseGroup/DatabaseGroupDataTable.vue+++ b/frontend/src/components/DatabaseGroup/DatabaseGroupDataTable.vue@@ -20,7 +20,7 @@<script lang="tsx" setup>import { ExternalLinkIcon } from "lucide-vue-next";-import { NDataTable, NEllipsis, type DataTableColumn } from "naive-ui";+import { type DataTableColumn, NDataTable, NEllipsis } from "naive-ui";import { computed } from "vue";import { useI18n } from "vue-i18n";import { useRouter } from "vue-router";diff --git a/frontend/src/components/DatabaseGroup/DatabaseGroupForm.vue b/frontend/src/components/DatabaseGroup/DatabaseGroupForm.vueindex d66c8f0ed1..023e4aafb3 100644--- a/frontend/src/components/DatabaseGroup/DatabaseGroupForm.vue+++ b/frontend/src/components/DatabaseGroup/DatabaseGroupForm.vue@@ -83,8 +83,8 @@ import {wrapAsGroup,} from "@/plugins/cel";import {- PROJECT_V1_ROUTE_DATABASE_GROUPS,PROJECT_V1_ROUTE_DATABASE_GROUP_DETAIL,+ PROJECT_V1_ROUTE_DATABASE_GROUPS,} from "@/router/dashboard/projectV1";import { pushNotification, useDBGroupStore } from "@/store";import {@@ -94,9 +94,9 @@ import {import type { Expr as CELExpr } from "@/types/proto-es/google/api/expr/v1alpha1/syntax_pb";import { ExprSchema } from "@/types/proto-es/google/type/expr_pb";import {+ type DatabaseGroup,DatabaseGroupSchema,DatabaseGroupView,- type DatabaseGroup,} from "@/types/proto-es/v1/database_group_service_pb";import type { Project } from "@/types/proto-es/v1/project_service_pb";import {diff --git a/frontend/src/components/DatabaseGroup/MatchedDatabaseView.vue b/frontend/src/components/DatabaseGroup/MatchedDatabaseView.vueindex 62ef669846..02c24e4122 100644--- a/frontend/src/components/DatabaseGroup/MatchedDatabaseView.vue+++ b/frontend/src/components/DatabaseGroup/MatchedDatabaseView.vue@@ -62,18 +62,21 @@import type { ConnectError } from "@connectrpc/connect";import { useDebounceFn } from "@vueuse/core";import { NButton, NCollapse, NCollapseItem } from "naive-ui";-import { watch, reactive, ref } from "vue";+import { reactive, ref, watch } from "vue";import { useI18n } from "vue-i18n";import { BBSpin } from "@/bbkit";-import { DatabaseV1Name, InstanceV1Name } from "@/components/v2";-import { EnvironmentV1Name } from "@/components/v2";+import {+ DatabaseV1Name,+ EnvironmentV1Name,+ InstanceV1Name,+} from "@/components/v2";import type { ConditionGroupExpr } from "@/plugins/cel";import { validateSimpleExpr } from "@/plugins/cel";import { useDatabaseV1Store, useDBGroupStore } from "@/store";import {+ type ComposedDatabase,DEBOUNCE_SEARCH_DELAY,isValidDatabaseName,- type ComposedDatabase,} from "@/types";import { getDefaultPagination } from "@/utils";@@ -141,27 +144,30 @@ const loadMoreUnmatched = async (token: string) => {};};-const getMatched = (): DatabaseMatchList<number> => ({+const getMatched = (title: string): DatabaseMatchList<number> => ({token: 0,loading: false,databaseList: [],- title: t("database-group.matched-database"),+ title,name: "matched",hasNext: (token: number) => token < matchedDatabaseNameList.value.length,loadMore: loadMoreMatched,});-const getUnMatched = (): DatabaseMatchList<string> => ({+const getUnMatched = (title: string): DatabaseMatchList<string> => ({token: "",loading: false,databaseList: [],- title: t("database-group.unmatched-database"),+ title,name: "unmatched",hasNext: (token: string) => !!token,loadMore: loadMoreUnmatched,});-const getInitialState = () => [getMatched(), getUnMatched()];+const getInitialState = () => [+ getMatched(t("database-group.matched-database")),+ getUnMatched(t("database-group.unmatched-database")),+];const state = reactive<LocalState>({loading: false,@@ -172,6 +178,7 @@ const state = reactive<LocalState>({const dbGroupStore = useDBGroupStore();const databaseStore = useDatabaseV1Store();+// biome-ignore format: ESLint requires trailing comma for generic type parameterconst loadMoreDatabase = async <T,>(state: DatabaseMatchList<T>) => {state.loading = true;try {diff --git a/frontend/src/components/DatabaseGroup/utils.ts b/frontend/src/components/DatabaseGroup/utils.tsindex ee85cd8951..47b55c79ee 100644--- a/frontend/src/components/DatabaseGroup/utils.ts+++ b/frontend/src/components/DatabaseGroup/utils.ts@@ -6,12 +6,12 @@ import {import { type OptionConfig } from "@/components/ExprEditor/context";import { getInstanceIdOptions } from "@/components/SensitiveData/components/utils";import type { Factor } from "@/plugins/cel";-import { useInstanceV1Store, useDatabaseV1Store } from "@/store";+import { useDatabaseV1Store, useInstanceV1Store } from "@/store";import { getDefaultPagination } from "@/utils";import {+ CEL_ATTRIBUTE_RESOURCE_DATABASE_NAME,CEL_ATTRIBUTE_RESOURCE_ENVIRONMENT_ID,CEL_ATTRIBUTE_RESOURCE_INSTANCE_ID,- CEL_ATTRIBUTE_RESOURCE_DATABASE_NAME,} from "@/utils/cel-attributes";export const FactorList: Factor[] = [diff --git a/frontend/src/components/DefinitionView.vue b/frontend/src/components/DefinitionView.vueindex e449a54b03..16db4884b7 100644--- a/frontend/src/components/DefinitionView.vue+++ b/frontend/src/components/DefinitionView.vue@@ -32,7 +32,7 @@<script lang="ts" setup>import { NEllipsis } from "naive-ui";-import { computed, ref, reactive, onMounted } from "vue";+import { computed, onMounted, reactive, ref } from "vue";const MAX_HEIGHT = 60;diff --git a/frontend/src/components/EmailInput.vue b/frontend/src/components/EmailInput.vueindex ef615c99a5..b37def9690 100644--- a/frontend/src/components/EmailInput.vue+++ b/frontend/src/components/EmailInput.vue@@ -23,7 +23,7 @@<script lang="ts" setup>import { NInput, NInputGroup, NInputGroupLabel, NSelect } from "naive-ui";-import { reactive, watch, computed, watchEffect } from "vue";+import { computed, reactive, watch, watchEffect } from "vue";import { useSettingV1Store } from "@/store";interface LocalState {diff --git a/frontend/src/components/EnvironmentForm/AccessControlConfigure.vue b/frontend/src/components/EnvironmentForm/AccessControlConfigure.vueindex 5ccea1eb6f..b4e509e9c4 100644--- a/frontend/src/components/EnvironmentForm/AccessControlConfigure.vue+++ b/frontend/src/components/EnvironmentForm/AccessControlConfigure.vue@@ -110,10 +110,10 @@ import type {QueryDataPolicy,} from "@/types/proto-es/v1/org_policy_service_pb";import {- DataSourceQueryPolicySchema,DataSourceQueryPolicy_Restriction,- QueryDataPolicySchema,+ DataSourceQueryPolicySchema,PolicyType,+ QueryDataPolicySchema,} from "@/types/proto-es/v1/org_policy_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import { hasWorkspacePermissionV2 } from "@/utils";diff --git a/frontend/src/components/EnvironmentForm/EnvironmentForm.vue b/frontend/src/components/EnvironmentForm/EnvironmentForm.vueindex 379d3183a1..9e6041482a 100644--- a/frontend/src/components/EnvironmentForm/EnvironmentForm.vue+++ b/frontend/src/components/EnvironmentForm/EnvironmentForm.vue@@ -9,7 +9,7 @@</template><script lang="ts" setup>-import { toRef, computed } from "vue";+import { computed, toRef } from "vue";import { useEmitteryEventListener } from "@/composables/useEmitteryEventListener";import { hasFeature } from "@/store";import type { Policy } from "@/types/proto-es/v1/org_policy_service_pb";diff --git a/frontend/src/components/EnvironmentForm/Form.vue b/frontend/src/components/EnvironmentForm/Form.vueindex 5875014d84..08e3ff9fd2 100644--- a/frontend/src/components/EnvironmentForm/Form.vue+++ b/frontend/src/components/EnvironmentForm/Form.vue@@ -148,7 +148,7 @@<script lang="tsx" setup>import { computedAsync } from "@vueuse/core";-import { NCheckbox, NInput, NColorPicker } from "naive-ui";+import { NCheckbox, NColorPicker, NInput } from "naive-ui";import { computed, ref, watch } from "vue";import { useI18n } from "vue-i18n";import { BBButtonConfirm } from "@/bbkit";@@ -156,12 +156,12 @@ import LearnMoreLink from "@/components/LearnMoreLink.vue";import RequiredStar from "@/components/RequiredStar.vue";import { useEmitteryEventListener } from "@/composables/useEmitteryEventListener";import {+ hasFeature,+ pushNotification,+ useDatabaseV1Store,useEnvironmentV1List,useEnvironmentV1Store,useInstanceV1Store,- useDatabaseV1Store,- hasFeature,- pushNotification,} from "@/store";import { environmentNamePrefix } from "@/store/modules/v1/common";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";@@ -169,8 +169,8 @@ import { FeatureBadge } from "../FeatureGuard";import SQLReviewForResource from "../SQLReview/components/SQLReviewForResource.vue";import { ResourceIdField } from "../v2";import AccessControlConfigure from "./AccessControlConfigure.vue";-import RolloutPolicyConfig from "./RolloutPolicyConfig.vue";import { useEnvironmentFormContext } from "./context";+import RolloutPolicyConfig from "./RolloutPolicyConfig.vue";withDefaults(defineProps<{diff --git a/frontend/src/components/EnvironmentForm/RolloutPolicyConfig.vue b/frontend/src/components/EnvironmentForm/RolloutPolicyConfig.vueindex 2f3f7db5d5..b57361dea9 100644--- a/frontend/src/components/EnvironmentForm/RolloutPolicyConfig.vue+++ b/frontend/src/components/EnvironmentForm/RolloutPolicyConfig.vue@@ -132,18 +132,18 @@<script setup lang="ts">import { create } from "@bufbuild/protobuf";import { cloneDeep } from "lodash-es";-import { NRadioGroup, NRadio } from "naive-ui";-import { ref, watch, computed } from "vue";+import { NRadio, NRadioGroup } from "naive-ui";+import { computed, ref, watch } from "vue";import { useI18n } from "vue-i18n";import type {Policy,RolloutPolicy,} from "@/types/proto-es/v1/org_policy_service_pb";import {- RolloutPolicySchema,- RolloutPolicy_CheckersSchema,- RolloutPolicy_Checkers_RequiredStatusChecksSchema,RolloutPolicy_Checkers_PlanCheckEnforcement,+ RolloutPolicy_Checkers_RequiredStatusChecksSchema,+ RolloutPolicy_CheckersSchema,+ RolloutPolicySchema,} from "@/types/proto-es/v1/org_policy_service_pb";import { RoleSelect, Switch } from "../v2";diff --git a/frontend/src/components/EnvironmentForm/context.ts b/frontend/src/components/EnvironmentForm/context.tsindex d9702be433..4be58bfbea 100644--- a/frontend/src/components/EnvironmentForm/context.ts+++ b/frontend/src/components/EnvironmentForm/context.ts@@ -2,11 +2,11 @@ import Emittery from "emittery";import { cloneDeep, isEmpty, isEqual } from "lodash-es";import { useDialog } from "naive-ui";import type { InjectionKey, Ref } from "vue";-import { provide, inject, computed, ref, watch } from "vue";+import { computed, inject, provide, ref, watch } from "vue";import type { ResourceIdField } from "@/components/v2";import {- PolicyType,type Policy,+ PolicyType,} from "@/types/proto-es/v1/org_policy_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import type { Environment } from "@/types/v1/environment";diff --git a/frontend/src/components/ExpirationSelector.vue b/frontend/src/components/ExpirationSelector.vueindex 98cd8a829a..3214550ca1 100644--- a/frontend/src/components/ExpirationSelector.vue+++ b/frontend/src/components/ExpirationSelector.vue@@ -48,7 +48,7 @@<script lang="ts" setup>import { useLocalStorage } from "@vueuse/core";import dayjs from "dayjs";-import { NSelect, NDatePicker } from "naive-ui";+import { NDatePicker, NSelect } from "naive-ui";import { computed, reactive, watch } from "vue";import { useI18n } from "vue-i18n";import { useSettingV1Store } from "@/store";diff --git a/frontend/src/components/ExprEditor/ConditionGroup.vue b/frontend/src/components/ExprEditor/ConditionGroup.vueindex bb120a43ee..a9df56a117 100644--- a/frontend/src/components/ExprEditor/ConditionGroup.vue+++ b/frontend/src/components/ExprEditor/ConditionGroup.vue@@ -138,22 +138,22 @@ import { computed } from "vue";import {type ConditionExpr,type ConditionGroupExpr,- type LogicalOperator,- LogicalOperatorList,- isConditionGroupExpr,- isConditionExpr,- isRawStringExpr,ExprType,- type RawStringExpr,- isNumberFactor,type Factor,+ isConditionExpr,+ isConditionGroupExpr,+ isNumberFactor,+ isRawStringExpr,isStringFactor,isTimestampFactor,+ type LogicalOperator,+ LogicalOperatorList,+ type RawStringExpr,} from "@/plugins/cel";import Condition from "./Condition.vue";-import RawString from "./RawString.vue";import { getOperatorListByFactor } from "./components/common";import { useExprEditorContext } from "./context";+import RawString from "./RawString.vue";const props = defineProps<{expr: ConditionGroupExpr;diff --git a/frontend/src/components/ExprEditor/ExprEditor.vue b/frontend/src/components/ExprEditor/ExprEditor.vueindex 647679d33e..f48149887e 100644--- a/frontend/src/components/ExprEditor/ExprEditor.vue+++ b/frontend/src/components/ExprEditor/ExprEditor.vue@@ -8,7 +8,7 @@import { toRef } from "vue";import type { ConditionGroupExpr, Factor, Operator } from "@/plugins/cel";import ConditionGroup from "./ConditionGroup.vue";-import { provideExprEditorContext, type OptionConfig } from "./context";+import { type OptionConfig, provideExprEditorContext } from "./context";const props = withDefaults(defineProps<{diff --git a/frontend/src/components/ExprEditor/components/MultiSelect.vue b/frontend/src/components/ExprEditor/components/MultiSelect.vueindex b2bfec1bcc..54d74265bf 100644--- a/frontend/src/components/ExprEditor/components/MultiSelect.vue+++ b/frontend/src/components/ExprEditor/components/MultiSelect.vue@@ -28,9 +28,9 @@<script lang="ts" setup>import { useDebounceFn } from "@vueuse/core";-import { NCheckbox, NSelect } from "naive-ui";import type { SelectOption } from "naive-ui";-import { toRef, watch, reactive, computed } from "vue";+import { NCheckbox, NSelect } from "naive-ui";+import { computed, reactive, toRef, watch } from "vue";import { type ConditionExpr } from "@/plugins/cel";import { DEBOUNCE_SEARCH_DELAY } from "@/types";import { useExprEditorContext } from "../context";diff --git a/frontend/src/components/ExprEditor/components/OperatorSelect.vue b/frontend/src/components/ExprEditor/components/OperatorSelect.vueindex 8fac5d938a..27ed55b945 100644--- a/frontend/src/components/ExprEditor/components/OperatorSelect.vue+++ b/frontend/src/components/ExprEditor/components/OperatorSelect.vue@@ -15,9 +15,9 @@import { NSelect, type SelectOption } from "naive-ui";import { computed, watch } from "vue";import {- type Operator,- type ConditionOperator,type ConditionExpr,+ type ConditionOperator,+ type Operator,} from "@/plugins/cel";import { useExprEditorContext } from "../context";import { getOperatorListByFactor } from "./common";diff --git a/frontend/src/components/ExprEditor/components/SingleSelect.vue b/frontend/src/components/ExprEditor/components/SingleSelect.vueindex f129ea78b0..3b7cb9597c 100644--- a/frontend/src/components/ExprEditor/components/SingleSelect.vue+++ b/frontend/src/components/ExprEditor/components/SingleSelect.vue@@ -17,9 +17,9 @@<script lang="ts" setup>import { useDebounceFn } from "@vueuse/core";-import { NSelect } from "naive-ui";import type { SelectOption } from "naive-ui";-import { toRef, watch, reactive } from "vue";+import { NSelect } from "naive-ui";+import { reactive, toRef, watch } from "vue";import { type ConditionExpr } from "@/plugins/cel";import { DEBOUNCE_SEARCH_DELAY } from "@/types";import { useExprEditorContext } from "../context";diff --git a/frontend/src/components/ExprEditor/components/ValueInput.vue b/frontend/src/components/ExprEditor/components/ValueInput.vueindex 5c6d9f5ce1..2c4785a0d6 100644--- a/frontend/src/components/ExprEditor/components/ValueInput.vue+++ b/frontend/src/components/ExprEditor/components/ValueInput.vue@@ -47,12 +47,12 @@ import { isNumber } from "lodash-es";import { computed, watch } from "vue";import {type ConditionExpr,- isEqualityOperator,isCollectionOperator,- isStringOperator,isCompareOperator,+ isEqualityOperator,isNumberFactor,isStringFactor,+ isStringOperator,} from "@/plugins/cel";import { useExprEditorContext } from "../context";import MultiSelect from "./MultiSelect.vue";diff --git a/frontend/src/components/ExprEditor/components/common.ts b/frontend/src/components/ExprEditor/components/common.tsindex 4e20118a02..81538a3d63 100644--- a/frontend/src/components/ExprEditor/components/common.ts+++ b/frontend/src/components/ExprEditor/components/common.ts@@ -1,13 +1,13 @@-import type { Ref, ComputedRef } from "vue";+import type { ComputedRef, Ref } from "vue";import { computed } from "vue";import type { ConditionExpr } from "@/plugins/cel";import {- getOperatorListByFactor as getRawOperatorListByFactor,type Factor,+ getOperatorListByFactor as getRawOperatorListByFactor,type Operator,} from "@/plugins/cel";import { t, te } from "@/plugins/i18n";-import { useExprEditorContext, type OptionConfig } from "../context";+import { type OptionConfig, useExprEditorContext } from "../context";export const useSelectOptionConfig = (expr: Ref<ConditionExpr>diff --git a/frontend/src/components/ExprEditor/context.ts b/frontend/src/components/ExprEditor/context.tsindex bc8c36053b..e7ff137006 100644--- a/frontend/src/components/ExprEditor/context.ts+++ b/frontend/src/components/ExprEditor/context.ts@@ -1,5 +1,5 @@import type { SelectOption } from "naive-ui";-import { inject, provide, type InjectionKey, type Ref } from "vue";+import { type InjectionKey, inject, provide, type Ref } from "vue";import type { Factor, Operator } from "@/plugins/cel";export type OptionConfig = {diff --git a/frontend/src/components/ExternalTableDetailDrawer.vue b/frontend/src/components/ExternalTableDetailDrawer.vueindex beb8ac6ccb..d59176d956 100644--- a/frontend/src/components/ExternalTableDetailDrawer.vue+++ b/frontend/src/components/ExternalTableDetailDrawer.vue@@ -128,13 +128,13 @@<script lang="ts" setup>import { create } from "@bufbuild/protobuf";import { computedAsync } from "@vueuse/core";-import { computed, ref, reactive } from "vue";+import { computed, reactive, ref } from "vue";import {DatabaseV1Name,- InstanceV1Name,Drawer,DrawerContent,EnvironmentV1Name,+ InstanceV1Name,ProjectV1Name,SearchBox,} from "@/components/v2";diff --git a/frontend/src/components/FeatureGuard/FeatureBadge.vue b/frontend/src/components/FeatureGuard/FeatureBadge.vueindex 7c7139ce3f..876eb69904 100644--- a/frontend/src/components/FeatureGuard/FeatureBadge.vue+++ b/frontend/src/components/FeatureGuard/FeatureBadge.vue@@ -59,7 +59,7 @@<script lang="ts" setup>import { SparklesIcon } from "lucide-vue-next";import { NTooltip } from "naive-ui";-import { reactive, computed } from "vue";+import { computed, reactive } from "vue";import { useSubscriptionV1Store } from "@/store";import type {Instance,diff --git a/frontend/src/components/FileContentPreviewModal.vue b/frontend/src/components/FileContentPreviewModal.vueindex e3e20d9366..dc41232bcf 100644--- a/frontend/src/components/FileContentPreviewModal.vue+++ b/frontend/src/components/FileContentPreviewModal.vue@@ -38,12 +38,12 @@</template><script lang="ts" setup>-import { NSelect, NButton, NSpin } from "naive-ui";+import { NButton, NSelect, NSpin } from "naive-ui";import { computed, reactive, ref, watch } from "vue";import { BBModal } from "@/bbkit";import { MonacoEditor } from "@/components/MonacoEditor";import { pushNotification } from "@/store";-import { ENCODINGS, readFileAsArrayBuffer, type Encoding } from "@/utils";+import { ENCODINGS, type Encoding, readFileAsArrayBuffer } from "@/utils";interface LocalState {encoding: Encoding;diff --git a/frontend/src/components/GeneralSetting/AIAugmentationSetting.vue b/frontend/src/components/GeneralSetting/AIAugmentationSetting.vueindex 40f13d9150..7bd6a6e4d9 100644--- a/frontend/src/components/GeneralSetting/AIAugmentationSetting.vue+++ b/frontend/src/components/GeneralSetting/AIAugmentationSetting.vue@@ -165,14 +165,13 @@ import { NSelect, NTooltip } from "naive-ui";import scrollIntoView from "scroll-into-view-if-needed";import { computed, onMounted, reactive, ref, watch, watchEffect } from "vue";import { useI18n } from "vue-i18n";-import { BBTextField } from "@/bbkit";-import { BBAttention } from "@/bbkit";+import { BBAttention, BBTextField } from "@/bbkit";import LearnMoreLink from "@/components/LearnMoreLink.vue";import { Switch } from "@/components/v2";-import { useSettingV1Store, useActuatorV1Store } from "@/store/modules";+import { useActuatorV1Store, useSettingV1Store } from "@/store/modules";import {- AISettingSchema,AISetting_Provider,+ AISettingSchema,Setting_SettingName,ValueSchema as SettingValueSchema,} from "@/types/proto-es/v1/setting_service_pb";diff --git a/frontend/src/components/GeneralSetting/DomainRestrictionSetting.vue b/frontend/src/components/GeneralSetting/DomainRestrictionSetting.vueindex fe24b3a772..9dabf81f1c 100644--- a/frontend/src/components/GeneralSetting/DomainRestrictionSetting.vue+++ b/frontend/src/components/GeneralSetting/DomainRestrictionSetting.vue@@ -57,7 +57,7 @@<script lang="ts" setup>import { create } from "@bufbuild/protobuf";import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";-import { isEqual, cloneDeep } from "lodash-es";+import { cloneDeep, isEqual } from "lodash-es";import { NCheckbox, NDynamicTags } from "naive-ui";import { computed, reactive } from "vue";import { featureToRef } from "@/store";diff --git a/frontend/src/components/GeneralSetting/GeneralSetting.vue b/frontend/src/components/GeneralSetting/GeneralSetting.vueindex 3d5e2b39a7..a82bdd4ce5 100644--- a/frontend/src/components/GeneralSetting/GeneralSetting.vue+++ b/frontend/src/components/GeneralSetting/GeneralSetting.vue@@ -72,14 +72,14 @@import { create } from "@bufbuild/protobuf";import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";import { isEqual } from "lodash-es";-import { NTooltip, NButton, NInput } from "naive-ui";+import { NButton, NInput, NTooltip } from "naive-ui";import { storeToRefs } from "pinia";import { computed, reactive, ref } from "vue";import { BBModal } from "@/bbkit";import LearnMoreLink from "@/components/LearnMoreLink.vue";import { router } from "@/router";import { SQL_EDITOR_HOME_MODULE } from "@/router/sqlEditor";-import { useSettingV1Store, useActuatorV1Store } from "@/store";+import { useActuatorV1Store, useSettingV1Store } from "@/store";import { DatabaseChangeMode } from "@/types/proto-es/v1/setting_service_pb";import WorkspaceMode from "@/views/Setup/WorkspaceMode.vue";diff --git a/frontend/src/components/GeneralSetting/MaximumRoleExpirationSetting.vue b/frontend/src/components/GeneralSetting/MaximumRoleExpirationSetting.vueindex d07fb2b0b8..d651e8fee1 100644--- a/frontend/src/components/GeneralSetting/MaximumRoleExpirationSetting.vue+++ b/frontend/src/components/GeneralSetting/MaximumRoleExpirationSetting.vue@@ -33,7 +33,7 @@import { create } from "@bufbuild/protobuf";import { DurationSchema, FieldMaskSchema } from "@bufbuild/protobuf/wkt";import { isEqual } from "lodash-es";-import { NInputNumber, NCheckbox } from "naive-ui";+import { NCheckbox, NInputNumber } from "naive-ui";import { computed, reactive } from "vue";import { useSettingV1Store } from "@/store/modules/v1/setting";diff --git a/frontend/src/components/GeneralSetting/MaximumSQLResultSizeSetting.vue b/frontend/src/components/GeneralSetting/MaximumSQLResultSizeSetting.vueindex 6cdadbd880..f19844b65d 100644--- a/frontend/src/components/GeneralSetting/MaximumSQLResultSizeSetting.vue+++ b/frontend/src/components/GeneralSetting/MaximumSQLResultSizeSetting.vue@@ -79,16 +79,16 @@import { create } from "@bufbuild/protobuf";import { isEqual } from "lodash-es";import { NInputNumber } from "naive-ui";-import { ref, computed } from "vue";+import { computed, ref } from "vue";import {+ featureToRef,usePolicyByParentAndType,usePolicyV1Store,- featureToRef,} from "@/store";import {- QueryDataPolicySchema,PolicyResourceType,PolicyType,+ QueryDataPolicySchema,} from "@/types/proto-es/v1/org_policy_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import { FeatureBadge } from "../FeatureGuard";diff --git a/frontend/src/components/GeneralSetting/PasswordRestrictionSetting.vue b/frontend/src/components/GeneralSetting/PasswordRestrictionSetting.vueindex dab1ff4bd8..9a729cef15 100644--- a/frontend/src/components/GeneralSetting/PasswordRestrictionSetting.vue+++ b/frontend/src/components/GeneralSetting/PasswordRestrictionSetting.vue@@ -166,14 +166,14 @@import { create } from "@bufbuild/protobuf";import { DurationSchema } from "@bufbuild/protobuf/wkt";import { cloneDeep, isEqual } from "lodash-es";-import { NInputNumber, NCheckbox } from "naive-ui";-import { computed, ref, reactive } from "vue";+import { NCheckbox, NInputNumber } from "naive-ui";+import { computed, reactive, ref } from "vue";import { featureToRef } from "@/store";import { useSettingV1Store } from "@/store/modules/v1/setting";import type { PasswordRestrictionSetting } from "@/types/proto-es/v1/setting_service_pb";import {- Setting_SettingName,PasswordRestrictionSettingSchema,+ Setting_SettingName,ValueSchema as SettingValueSchema,} from "@/types/proto-es/v1/setting_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";diff --git a/frontend/src/components/GeneralSetting/SecuritySetting.vue b/frontend/src/components/GeneralSetting/SecuritySetting.vueindex 7434b364c2..61d85339dc 100644--- a/frontend/src/components/GeneralSetting/SecuritySetting.vue+++ b/frontend/src/components/GeneralSetting/SecuritySetting.vue@@ -72,9 +72,9 @@ import {useSettingV1Store,} from "@/store";import {- QueryDataPolicySchema,PolicyResourceType,PolicyType,+ QueryDataPolicySchema,} from "@/types/proto-es/v1/org_policy_service_pb";import {Setting_SettingName,diff --git a/frontend/src/components/GeneralSetting/SignInFrequencySetting.vue b/frontend/src/components/GeneralSetting/SignInFrequencySetting.vueindex 72497f8e84..ea35e7a566 100644--- a/frontend/src/components/GeneralSetting/SignInFrequencySetting.vue+++ b/frontend/src/components/GeneralSetting/SignInFrequencySetting.vue@@ -83,10 +83,9 @@<script lang="ts" setup>import { create } from "@bufbuild/protobuf";-import { DurationSchema } from "@bufbuild/protobuf/wkt";-import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";+import { DurationSchema, FieldMaskSchema } from "@bufbuild/protobuf/wkt";import { isEqual } from "lodash-es";-import { NInputNumber, NRadioGroup, NRadio, NTooltip } from "naive-ui";+import { NInputNumber, NRadio, NRadioGroup, NTooltip } from "naive-ui";import { computed, reactive, watch } from "vue";import { FeatureBadge, FeatureModal } from "@/components/FeatureGuard";import { featureToRef } from "@/store";diff --git a/frontend/src/components/GrantRequestPanel/DatabaseResourceForm/DatabaseResourceSelector.vue b/frontend/src/components/GrantRequestPanel/DatabaseResourceForm/DatabaseResourceSelector.vueindex b807c93ca3..5ff5beccd1 100644--- a/frontend/src/components/GrantRequestPanel/DatabaseResourceForm/DatabaseResourceSelector.vue+++ b/frontend/src/components/GrantRequestPanel/DatabaseResourceForm/DatabaseResourceSelector.vue@@ -29,35 +29,34 @@import { useDebounceFn } from "@vueuse/core";import { orderBy, uniqBy } from "lodash-es";import type { TransferRenderSourceList, TreeOption } from "naive-ui";-import { NTransfer, NTree, NButton } from "naive-ui";+import { NButton, NTransfer, NTree } from "naive-ui";import { computed, h, onMounted, ref, watch } from "vue";import { useI18n } from "vue-i18n";import { BBSpin } from "@/bbkit";import AdvancedSearch from "@/components/AdvancedSearch";import { useCommonSearchScopeOptions } from "@/components/AdvancedSearch/useCommonSearchScopeOptions";import {+ batchGetOrFetchDatabases,type DatabaseFilter,useDatabaseV1Store,useDBSchemaV1Store,- batchGetOrFetchDatabases,} from "@/store";import {- instanceNamePrefix,environmentNamePrefix,+ instanceNamePrefix,} from "@/store/modules/v1/common";import {- DEBOUNCE_SEARCH_DELAY,type ComposedDatabase,type DatabaseResource,+ DEBOUNCE_SEARCH_DELAY,} from "@/types";import {- getDefaultPagination,- type SearchParams,CommonFilterScopeIdList,extractProjectResourceName,+ getDefaultPagination,+ type SearchParams,} from "@/utils";import { convertScopeValueToEngine } from "@/utils/v1/common-conversions";-import Label from "./Label.vue";import type { DatabaseTreeOption } from "./common";import {flattenTreeOptions,@@ -65,6 +64,7 @@ import {mapTreeOptions,parseStringToResource,} from "./common";+import Label from "./Label.vue";const props = defineProps<{disabled?: boolean;diff --git a/frontend/src/components/GrantRequestPanel/DatabaseResourceForm/Label.vue b/frontend/src/components/GrantRequestPanel/DatabaseResourceForm/Label.vueindex 1359b5f1c9..90dbaf7e44 100644--- a/frontend/src/components/GrantRequestPanel/DatabaseResourceForm/Label.vue+++ b/frontend/src/components/GrantRequestPanel/DatabaseResourceForm/Label.vue@@ -20,12 +20,12 @@import { computedAsync } from "@vueuse/core";import { escape } from "lodash-es";import { computed, h } from "vue";-import DatabaseIcon from "~icons/heroicons-outline/circle-stack";-import TableIcon from "~icons/heroicons-outline/table-cells";-import SchemaIcon from "~icons/heroicons-outline/view-columns";import { EnvironmentV1Name, InstanceV1Name } from "@/components/v2";import { useDatabaseV1Store } from "@/store";import { getHighlightHTMLByRegExp } from "@/utils";+import DatabaseIcon from "~icons/heroicons-outline/circle-stack";+import TableIcon from "~icons/heroicons-outline/table-cells";+import SchemaIcon from "~icons/heroicons-outline/view-columns";import type { DatabaseTreeOption } from "./common";const props = defineProps<{diff --git a/frontend/src/components/GrantRequestPanel/DatabaseResourceForm/index.vue b/frontend/src/components/GrantRequestPanel/DatabaseResourceForm/index.vueindex f81dc60102..8ef5f71101 100644--- a/frontend/src/components/GrantRequestPanel/DatabaseResourceForm/index.vue+++ b/frontend/src/components/GrantRequestPanel/DatabaseResourceForm/index.vue@@ -43,10 +43,10 @@</template><script lang="ts" setup>-import { NRadioGroup, NRadio, NTooltip } from "naive-ui";+import { NRadio, NRadioGroup, NTooltip } from "naive-ui";import { computed, onMounted, reactive, watch } from "vue";import { FeatureBadge, FeatureModal } from "@/components/FeatureGuard";-import { useProjectByName, hasFeature } from "@/store";+import { hasFeature, useProjectByName } from "@/store";import type { DatabaseResource } from "@/types";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import DatabaseResourceSelector from "./DatabaseResourceSelector.vue";diff --git a/frontend/src/components/GrantRequestPanel/GrantRequestPanel.vue b/frontend/src/components/GrantRequestPanel/GrantRequestPanel.vueindex cf4662bb49..ca340ea696 100644--- a/frontend/src/components/GrantRequestPanel/GrantRequestPanel.vue+++ b/frontend/src/components/GrantRequestPanel/GrantRequestPanel.vue@@ -61,15 +61,15 @@ import type { Binding } from "@/types/proto-es/v1/iam_policy_pb";import { BindingSchema } from "@/types/proto-es/v1/iam_policy_pb";import {CreateIssueRequestSchema,+ GrantRequestSchema,IssueSchema,Issue_Type as NewIssue_Type,- GrantRequestSchema,} from "@/types/proto-es/v1/issue_service_pb";import {- generateIssueTitle,displayRoleTitle,- extractProjectResourceName,extractIssueUID,+ extractProjectResourceName,+ generateIssueTitle,} from "@/utils";interface LocalState {diff --git a/frontend/src/components/HelpDrawer/HelpDrawer.vue b/frontend/src/components/HelpDrawer/HelpDrawer.vueindex d8ede62e2c..441435e549 100644--- a/frontend/src/components/HelpDrawer/HelpDrawer.vue+++ b/frontend/src/components/HelpDrawer/HelpDrawer.vue@@ -57,11 +57,11 @@<script lang="ts" setup>import type { Node, Tag } from "@markdoc/markdoc";import { storeToRefs } from "pinia";-import { ref, reactive, watch, computed } from "vue";+import { computed, reactive, ref, watch } from "vue";import { useRoute } from "vue-router";import { Drawer, DrawerContent } from "@/components/v2";import { useLanguage } from "@/composables/useLanguage";-import { useUIStateStore, useHelpStore } from "@/store";+import { useHelpStore, useUIStateStore } from "@/store";import type { RouteMapList } from "@/types";const [diff --git a/frontend/src/components/HighlightCodeBlock.ts b/frontend/src/components/HighlightCodeBlock.tsindex 2f78f45465..61bbc20176 100644--- a/frontend/src/components/HighlightCodeBlock.ts+++ b/frontend/src/components/HighlightCodeBlock.ts@@ -1,5 +1,5 @@import hljs from "highlight.js/lib/core";-import { h, defineComponent } from "vue";+import { defineComponent, h } from "vue";export default defineComponent({name: "HighlightCodeBlock",diff --git a/frontend/src/components/IAMRemindModal.vue b/frontend/src/components/IAMRemindModal.vueindex 82988ae873..92e7dd132e 100644--- a/frontend/src/components/IAMRemindModal.vue+++ b/frontend/src/components/IAMRemindModal.vue@@ -38,21 +38,21 @@import dayjs from "dayjs";import { orderBy } from "lodash-es";import { NButton, NCheckbox } from "naive-ui";-import { computed, watch, reactive } from "vue";-import { useRouter, useRoute } from "vue-router";+import { computed, reactive, watch } from "vue";+import { useRoute, useRouter } from "vue-router";import { BBModal } from "@/bbkit";import {useCurrentUserV1,+ useProjectIamPolicyStore,useProjectV1Store,useRoleStore,- useProjectIamPolicyStore,} from "@/store";import type { Role } from "@/types/proto-es/v1/role_service_pb";import {- useDynamicLocalStorage,+ autoProjectRoute,bindingListInIAM,displayRoleTitle,- autoProjectRoute,+ useDynamicLocalStorage,} from "@/utils";import { convertFromExpr } from "@/utils/issue/cel";diff --git a/frontend/src/components/Icon/ViewIcon.vue b/frontend/src/components/Icon/ViewIcon.vueindex 23cdb412a7..21e8af4ca2 100644--- a/frontend/src/components/Icon/ViewIcon.vue+++ b/frontend/src/components/Icon/ViewIcon.vue@@ -10,6 +10,5 @@</div></template><script setup lang="ts">-import { GlassesIcon } from "lucide-vue-next";-import { TableIcon } from "lucide-vue-next";+import { GlassesIcon, TableIcon } from "lucide-vue-next";</script>diff --git a/frontend/src/components/IdentityProvider/IdentityProviderCreateWizard.vue b/frontend/src/components/IdentityProvider/IdentityProviderCreateWizard.vueindex 48073c7cfd..e6f32dda7d 100644--- a/frontend/src/components/IdentityProvider/IdentityProviderCreateWizard.vue+++ b/frontend/src/components/IdentityProvider/IdentityProviderCreateWizard.vue@@ -426,22 +426,22 @@import { create as createProto } from "@bufbuild/protobuf";import { head } from "lodash-es";import {- KeyIcon,- ShieldCheckIcon,+ ArrowRightIcon,+ BuildingIcon,+ ChromeIcon,DatabaseIcon,GithubIcon,- ChromeIcon,GitlabIcon,- BuildingIcon,- ArrowRightIcon,InfoIcon,+ KeyIcon,+ ShieldCheckIcon,} from "lucide-vue-next";import {- NSteps,- NStep,- NRadioGroup,- NRadio,NButton,+ NRadio,+ NRadioGroup,+ NStep,+ NSteps,NTooltip,} from "naive-ui";import { computed, reactive, ref, watch } from "vue";@@ -464,19 +464,19 @@ import { idpNamePrefix } from "@/store/modules/v1/common";import type {FieldMapping,IdentityProvider,+ LDAPIdentityProviderConfig,OAuth2IdentityProviderConfig,OIDCIdentityProviderConfig,- LDAPIdentityProviderConfig,} from "@/types/proto-es/v1/idp_service_pb";import {FieldMappingSchema,- IdentityProviderSchema,IdentityProviderConfigSchema,+ IdentityProviderSchema,IdentityProviderType,+ LDAPIdentityProviderConfigSchema,OAuth2AuthStyle,OAuth2IdentityProviderConfigSchema,OIDCIdentityProviderConfigSchema,- LDAPIdentityProviderConfigSchema,} from "@/types/proto-es/v1/idp_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import type { OAuth2IdentityProviderTemplate } from "@/utils";diff --git a/frontend/src/components/IdentityProvider/IdentityProviderEditForm.vue b/frontend/src/components/IdentityProvider/IdentityProviderEditForm.vueindex 7d6b5b51aa..56995ce65a 100644--- a/frontend/src/components/IdentityProvider/IdentityProviderEditForm.vue+++ b/frontend/src/components/IdentityProvider/IdentityProviderEditForm.vue@@ -233,16 +233,16 @@ import { create as createProto } from "@bufbuild/protobuf";import { cloneDeep, isEqual } from "lodash-es";import {ArrowRightIcon,+ DatabaseIcon,InfoIcon,KeyIcon,ShieldCheckIcon,- DatabaseIcon,} from "lucide-vue-next";import { NButton, NTooltip } from "naive-ui";import { computed, reactive, ref, watch } from "vue";import { useI18n } from "vue-i18n";import { useRouter } from "vue-router";-import { BBTextField, BBButtonConfirm } from "@/bbkit";+import { BBButtonConfirm, BBTextField } from "@/bbkit";import LearnMoreLink from "@/components/LearnMoreLink.vue";import RequiredStar from "@/components/RequiredStar.vue";import { ResourceIdField } from "@/components/v2";@@ -253,18 +253,18 @@ import { getIdentityProviderResourceId } from "@/store/modules/v1/common";import type {FieldMapping,IdentityProvider,+ LDAPIdentityProviderConfig,OAuth2IdentityProviderConfig,OIDCIdentityProviderConfig,- LDAPIdentityProviderConfig,} from "@/types/proto-es/v1/idp_service_pb";import {FieldMappingSchema,+ IdentityProviderConfigSchema,IdentityProviderSchema,IdentityProviderType,+ LDAPIdentityProviderConfigSchema,OAuth2IdentityProviderConfigSchema,OIDCIdentityProviderConfigSchema,- LDAPIdentityProviderConfigSchema,- IdentityProviderConfigSchema,} from "@/types/proto-es/v1/idp_service_pb";import {hasWorkspacePermissionV2,diff --git a/frontend/src/components/IdentityProvider/IdentityProviderForm.vue b/frontend/src/components/IdentityProvider/IdentityProviderForm.vueindex 98a3cd65ff..f6b4326d6d 100644--- a/frontend/src/components/IdentityProvider/IdentityProviderForm.vue+++ b/frontend/src/components/IdentityProvider/IdentityProviderForm.vue@@ -488,18 +488,18 @@</template><script setup lang="ts">-import { NRadioGroup, NRadio, NCheckbox, NInputNumber } from "naive-ui";+import { NCheckbox, NInputNumber, NRadio, NRadioGroup } from "naive-ui";import { computed, watch } from "vue";import { BBTextField } from "@/bbkit";import RequiredStar from "@/components/RequiredStar.vue";import {+ type IdentityProvider,IdentityProviderType,+ type LDAPIdentityProviderConfig,+ LDAPIdentityProviderConfig_SecurityProtocol,OAuth2AuthStyle,- type IdentityProvider,type OAuth2IdentityProviderConfig,type OIDCIdentityProviderConfig,- type LDAPIdentityProviderConfig,- LDAPIdentityProviderConfig_SecurityProtocol,} from "@/types/proto-es/v1/idp_service_pb";interface Props {diff --git a/frontend/src/components/IdentityProvider/IdentityProviderTable.vue b/frontend/src/components/IdentityProvider/IdentityProviderTable.vueindex 5bc6412cff..f505facf84 100644--- a/frontend/src/components/IdentityProvider/IdentityProviderTable.vue+++ b/frontend/src/components/IdentityProvider/IdentityProviderTable.vue@@ -12,7 +12,7 @@</template><script lang="ts" setup>-import { NDataTable, type DataTableColumn } from "naive-ui";+import { type DataTableColumn, NDataTable } from "naive-ui";import { computed } from "vue";import { useI18n } from "vue-i18n";import { useRouter } from "vue-router";diff --git a/frontend/src/components/IdentityProvider/TestConnection.vue b/frontend/src/components/IdentityProvider/TestConnection.vueindex e1c90384f8..5ecedb9b74 100644--- a/frontend/src/components/IdentityProvider/TestConnection.vue+++ b/frontend/src/components/IdentityProvider/TestConnection.vue@@ -91,7 +91,7 @@import { create } from "@bufbuild/protobuf";import type { ConnectError } from "@connectrpc/connect";import { NButton, NModal } from "naive-ui";-import { ref, onUnmounted, watch } from "vue";+import { onUnmounted, ref, watch } from "vue";import { identityProviderServiceClientConnect } from "@/grpcweb";import { pushNotification } from "@/store";import type { OAuthWindowEventPayload } from "@/types";@@ -99,10 +99,10 @@ import type {IdentityProvider,TestIdentityProviderResponse,} from "@/types/proto-es/v1/idp_service_pb";-import { IdentityProviderType } from "@/types/proto-es/v1/idp_service_pb";import {- TestIdentityProviderRequestSchema,CreateIdentityProviderRequestSchema,+ IdentityProviderType,+ TestIdentityProviderRequestSchema,} from "@/types/proto-es/v1/idp_service_pb";import { openWindowForSSO } from "@/utils";diff --git a/frontend/src/components/InputWithTemplate/AutoWidthInput.vue b/frontend/src/components/InputWithTemplate/AutoWidthInput.vueindex e090c74590..35c5aa0d02 100644--- a/frontend/src/components/InputWithTemplate/AutoWidthInput.vue+++ b/frontend/src/components/InputWithTemplate/AutoWidthInput.vue@@ -18,7 +18,7 @@</template><script lang="ts" setup>-import { watch, reactive, ref, watchEffect, nextTick } from "vue";+import { nextTick, reactive, ref, watch, watchEffect } from "vue";const props = defineProps({value: {diff --git a/frontend/src/components/InputWithTemplate/InputWithTemplate.vue b/frontend/src/components/InputWithTemplate/InputWithTemplate.vueindex e6ad25b94b..2d8aa7274d 100644--- a/frontend/src/components/InputWithTemplate/InputWithTemplate.vue+++ b/frontend/src/components/InputWithTemplate/InputWithTemplate.vue@@ -61,12 +61,12 @@<script lang="ts" setup>import { NTooltip } from "naive-ui";import type { PropType } from "vue";-import { reactive, watch, watchEffect, ref, onUnmounted, onMounted } from "vue";+import { onMounted, onUnmounted, reactive, ref, watch, watchEffect } from "vue";import { BBBadge } from "@/bbkit";import AutoWidthInput from "./AutoWidthInput.vue";import type { Template, TemplateInput } from "./types";import { InputType } from "./types";-import { getTemplateInputs, templateInputsToString, KEY_EVENT } from "./utils";+import { getTemplateInputs, KEY_EVENT, templateInputsToString } from "./utils";interface LocalState {inputData: string;diff --git a/frontend/src/components/InstanceAssignment.vue b/frontend/src/components/InstanceAssignment.vueindex 7a796ca15a..4cc94c5053 100644--- a/frontend/src/components/InstanceAssignment.vue+++ b/frontend/src/components/InstanceAssignment.vue@@ -69,16 +69,15 @@ import { create } from "@bufbuild/protobuf";import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";import { NButton } from "naive-ui";import { storeToRefs } from "pinia";-import { reactive, computed, ref, watch } from "vue";+import { computed, reactive, ref, watch } from "vue";import { useI18n } from "vue-i18n";-import { PagedInstanceTable } from "@/components/v2";-import { Drawer, DrawerContent } from "@/components/v2";+import { Drawer, DrawerContent, PagedInstanceTable } from "@/components/v2";import {pushNotification,+ useActuatorV1Store,+ useDatabaseV1Store,useInstanceV1Store,useSubscriptionV1Store,- useDatabaseV1Store,- useActuatorV1Store,} from "@/store";import type {Instance,diff --git a/frontend/src/components/InstanceForm/Buttons.vue b/frontend/src/components/InstanceForm/Buttons.vueindex b421ee0c6e..d540cf11e9 100644--- a/frontend/src/components/InstanceForm/Buttons.vue+++ b/frontend/src/components/InstanceForm/Buttons.vue@@ -72,15 +72,15 @@ import {InstanceSchema,} from "@/types/proto-es/v1/instance_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";-import { defer, isValidSpannerHost, convertKVListToLabels } from "@/utils";-import ScanIntervalInput from "./ScanIntervalInput.vue";+import { convertKVListToLabels, defer, isValidSpannerHost } from "@/utils";import {calcDataSourceUpdateMask,+ type EditDataSource,extractBasicInfo,extractDataSourceEditState,- type EditDataSource,} from "./common";import { useInstanceFormContext } from "./context";+import ScanIntervalInput from "./ScanIntervalInput.vue";const props = withDefaults(defineProps<{diff --git a/frontend/src/components/InstanceForm/DataSourceSection/CreateDataSourceExample.vue b/frontend/src/components/InstanceForm/DataSourceSection/CreateDataSourceExample.vueindex b6dc648436..7e764b7728 100644--- a/frontend/src/components/InstanceForm/DataSourceSection/CreateDataSourceExample.vue+++ b/frontend/src/components/InstanceForm/DataSourceSection/CreateDataSourceExample.vue@@ -201,18 +201,18 @@<script lang="ts" setup>import hljs from "highlight.js/lib/core";import { NCode, NConfigProvider } from "naive-ui";-import { reactive, computed } from "vue";+import { computed, reactive } from "vue";import { BBAttention } from "@/bbkit";import { CopyButton } from "@/components/v2";import {- languageOfEngineV1,DATASOURCE_ADMIN_USER_NAME,DATASOURCE_READONLY_USER_NAME,+ languageOfEngineV1,} from "@/types";import { Engine } from "@/types/proto-es/v1/common_pb";import {- DataSourceType,DataSource_AuthenticationType,+ DataSourceType,} from "@/types/proto-es/v1/instance_service_pb";interface LocalState {diff --git a/frontend/src/components/InstanceForm/DataSourceSection/CredentialSourceForm.vue b/frontend/src/components/InstanceForm/DataSourceSection/CredentialSourceForm.vueindex c9bec1734e..4da2873dcd 100644--- a/frontend/src/components/InstanceForm/DataSourceSection/CredentialSourceForm.vue+++ b/frontend/src/components/InstanceForm/DataSourceSection/CredentialSourceForm.vue@@ -268,13 +268,13 @@<script lang="tsx" setup>/* eslint-disable vue/no-mutating-props */import { create } from "@bufbuild/protobuf";-import { NRadioGroup, NRadio, NInput } from "naive-ui";-import { computed, watch, ref } from "vue";+import { NInput, NRadio, NRadioGroup } from "naive-ui";+import { computed, ref, watch } from "vue";import { useI18n } from "vue-i18n";import {DataSource_AuthenticationType,- DataSource_AzureCredentialSchema,DataSource_AWSCredentialSchema,+ DataSource_AzureCredentialSchema,DataSource_GCPCredentialSchema,} from "@/types/proto-es/v1/instance_service_pb";import type { EditDataSource } from "../common";diff --git a/frontend/src/components/InstanceForm/DataSourceSection/DataSourceForm.vue b/frontend/src/components/InstanceForm/DataSourceSection/DataSourceForm.vueindex bac4c65908..296f90c8bd 100644--- a/frontend/src/components/InstanceForm/DataSourceSection/DataSourceForm.vue+++ b/frontend/src/components/InstanceForm/DataSourceSection/DataSourceForm.vue@@ -1033,20 +1033,20 @@ import { useI18n } from "vue-i18n";import { BBTextField } from "@/bbkit";import { FeatureBadge } from "@/components/FeatureGuard";import LearnMoreLink from "@/components/LearnMoreLink.vue";-import RequiredStar from "@/components/RequiredStar.vue";import DroppableTextarea from "@/components/misc/DroppableTextarea.vue";+import RequiredStar from "@/components/RequiredStar.vue";import { Switch } from "@/components/v2";import type { DataSourceOptions } from "@/types/dataSource";import { Engine } from "@/types/proto-es/v1/common_pb";import {+ DataSource_AuthenticationType,+ DataSource_RedisType,DataSourceExternalSecret_AppRoleAuthOption_SecretType,+ DataSourceExternalSecret_AppRoleAuthOptionSchema,DataSourceExternalSecret_AuthType,DataSourceExternalSecret_SecretType,- DataSourceType,- DataSource_AuthenticationType,- DataSource_RedisType,DataSourceExternalSecretSchema,- DataSourceExternalSecret_AppRoleAuthOptionSchema,+ DataSourceType,KerberosConfigSchema,SASLConfigSchema,} from "@/types/proto-es/v1/instance_service_pb";diff --git a/frontend/src/components/InstanceForm/DataSourceSection/DataSourceTabs.vue b/frontend/src/components/InstanceForm/DataSourceSection/DataSourceTabs.vueindex 75abcaadd3..d2d213d08d 100644--- a/frontend/src/components/InstanceForm/DataSourceSection/DataSourceTabs.vue+++ b/frontend/src/components/InstanceForm/DataSourceSection/DataSourceTabs.vue@@ -49,8 +49,8 @@<script setup lang="ts">import { pullAt } from "lodash-es";import type { TabsInst } from "naive-ui";-import { NTabs, NTab, NButton } from "naive-ui";-import { nextTick, ref, watch, computed } from "vue";+import { NButton, NTab, NTabs } from "naive-ui";+import { computed, nextTick, ref, watch } from "vue";import { BBButtonConfirm } from "@/bbkit";import { useInstanceV1Store } from "@/store";import { hasWorkspacePermissionV2 } from "@/utils";diff --git a/frontend/src/components/InstanceForm/DataSourceSection/SslCertificateFormV1.vue b/frontend/src/components/InstanceForm/DataSourceSection/SslCertificateFormV1.vueindex d89ae045fb..36a836091d 100644--- a/frontend/src/components/InstanceForm/DataSourceSection/SslCertificateFormV1.vue+++ b/frontend/src/components/InstanceForm/DataSourceSection/SslCertificateFormV1.vue@@ -61,7 +61,7 @@<script lang="ts" setup>import { Info } from "lucide-vue-next";-import { NTabs, NTabPane, NSwitch, NTooltip } from "naive-ui";+import { NSwitch, NTabPane, NTabs, NTooltip } from "naive-ui";import { computed, reactive, watch } from "vue";import DroppableTextarea from "@/components/misc/DroppableTextarea.vue";import { t } from "@/plugins/i18n";diff --git a/frontend/src/components/InstanceForm/Form.vue b/frontend/src/components/InstanceForm/Form.vueindex 7fb06ccfcb..a698e93dbb 100644--- a/frontend/src/components/InstanceForm/Form.vue+++ b/frontend/src/components/InstanceForm/Form.vue@@ -515,12 +515,12 @@ import type { Duration } from "@bufbuild/protobuf/wkt";import { TrashIcon } from "lucide-vue-next";import {NButton,- NInput,- NSwitch,- NRadioGroup,- NRadio,NCheckbox,NDivider,+ NInput,+ NRadio,+ NRadioGroup,+ NSwitch,} from "naive-ui";import { computed, ref } from "vue";import { useI18n } from "vue-i18n";@@ -536,45 +536,45 @@ import {} from "@/components/v2";import ResourceIdField from "@/components/v2/Form/ResourceIdField.vue";import {+ pushNotification,useActuatorV1Store,- useInstanceV1Store,useDatabaseV1Store,+ useInstanceV1Store,useSubscriptionV1Store,- pushNotification,} from "@/store";import {environmentNamePrefix,instanceNamePrefix,} from "@/store/modules/v1/common";-import { UNKNOWN_ID, isValidEnvironmentName } from "@/types";+import { isValidEnvironmentName, UNKNOWN_ID } from "@/types";import { Engine } from "@/types/proto-es/v1/common_pb";import {- DataSource_AuthenticationType,DataSource_AddressSchema,+ DataSource_AuthenticationType,+ DataSource_RedisType,} from "@/types/proto-es/v1/instance_service_pb";-import { DataSource_RedisType } from "@/types/proto-es/v1/instance_service_pb";import { PlanType } from "@/types/proto-es/v1/subscription_service_pb";import {- isDev,+ autoSubscriptionRoute,extractInstanceResourceName,+ isDev,onlyAllowNumber,- autoSubscriptionRoute,- urlfy,supportedEngineV1List,+ urlfy,} from "@/utils";import LearnMoreLink from "../LearnMoreLink.vue";import BigQueryHostInput from "./BigQueryHostInput.vue";-import DataSourceSection from "./DataSourceSection/DataSourceSection.vue";-import MaximumConnectionsInput from "./MaximumConnectionsInput.vue";-import ScanIntervalInput from "./ScanIntervalInput.vue";-import SpannerHostInput from "./SpannerHostInput.vue";-import SyncDatabases from "./SyncDatabases.vue";import {MongoDBConnectionStringSchemaList,- SnowflakeExtraLinkPlaceHolder,RedisConnectionType,+ SnowflakeExtraLinkPlaceHolder,} from "./constants";import { useInstanceFormContext } from "./context";+import DataSourceSection from "./DataSourceSection/DataSourceSection.vue";+import MaximumConnectionsInput from "./MaximumConnectionsInput.vue";+import ScanIntervalInput from "./ScanIntervalInput.vue";+import SpannerHostInput from "./SpannerHostInput.vue";+import SyncDatabases from "./SyncDatabases.vue";defineProps<{hideArchiveRestore?: boolean;diff --git a/frontend/src/components/InstanceForm/InstanceForm.vue b/frontend/src/components/InstanceForm/InstanceForm.vueindex 7dca9d0f28..ce82863125 100644--- a/frontend/src/components/InstanceForm/InstanceForm.vue+++ b/frontend/src/components/InstanceForm/InstanceForm.vue@@ -11,7 +11,7 @@</template><script lang="ts" setup>-import { watch, onMounted, toRef, computed } from "vue";+import { computed, onMounted, toRef, watch } from "vue";import { useEmitteryEventListener } from "@/composables/useEmitteryEventListener";import { useActuatorV1Store, useSettingV1Store } from "@/store";import { Engine } from "@/types/proto-es/v1/common_pb";diff --git a/frontend/src/components/InstanceForm/common.ts b/frontend/src/components/InstanceForm/common.tsindex 89fcdb1cbc..8bf27e606a 100644--- a/frontend/src/components/InstanceForm/common.ts+++ b/frontend/src/components/InstanceForm/common.ts@@ -8,8 +8,8 @@ import type {Instance,} from "@/types/proto-es/v1/instance_service_pb";import {- DataSourceType,DataSource_AuthenticationType,+ DataSourceType,} from "@/types/proto-es/v1/instance_service_pb";import { PlanType } from "@/types/proto-es/v1/subscription_service_pb";import { calcUpdateMask } from "@/utils";diff --git a/frontend/src/components/InstanceForm/context.ts b/frontend/src/components/InstanceForm/context.tsindex 2bb418f5c4..1c885cc10c 100644--- a/frontend/src/components/InstanceForm/context.ts+++ b/frontend/src/components/InstanceForm/context.ts@@ -14,30 +14,28 @@ import {useSubscriptionV1Store,} from "@/store";import { Engine, State } from "@/types/proto-es/v1/common_pb";-import {- CreateInstanceRequestSchema,- AddDataSourceRequestSchema,- UpdateDataSourceRequestSchema,-} from "@/types/proto-es/v1/instance_service_pb";import type {- Instance,DataSource,+ Instance,} from "@/types/proto-es/v1/instance_service_pb";-import { InstanceSchema } from "@/types/proto-es/v1/instance_service_pb";import {+ AddDataSourceRequestSchema,+ CreateInstanceRequestSchema,+ DataSource_AuthenticationType,+ DataSource_RedisType,DataSourceExternalSecret_AuthType,DataSourceExternalSecret_SecretType,DataSourceType,- DataSource_AuthenticationType,- DataSource_RedisType,+ InstanceSchema,+ UpdateDataSourceRequestSchema,} from "@/types/proto-es/v1/instance_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import {+ convertKVListToLabels,+ convertLabelsToKVList,extractInstanceResourceName,hasWorkspacePermissionV2,isValidSpannerHost,- convertLabelsToKVList,- convertKVListToLabels,} from "@/utils";import { extractGrpcErrorMessage } from "@/utils/grpcweb";import type { LabelListEditor } from "../Label";diff --git a/frontend/src/components/IssueV1/GrantRequestIssueDetailPage.vue b/frontend/src/components/IssueV1/GrantRequestIssueDetailPage.vueindex 5de58d7556..d54d46f70e 100644--- a/frontend/src/components/IssueV1/GrantRequestIssueDetailPage.vue+++ b/frontend/src/components/IssueV1/GrantRequestIssueDetailPage.vue@@ -112,12 +112,12 @@ import { provideSidebarContext } from "../Plan/logic";import { Drawer } from "../v2";import {BannerSection,- HeaderSection,+ DatabaseResourceTable,DescriptionSection,+ HeaderSection,IssueCommentSection,IssueReviewActionPanel,IssueStatusActionPanel,- DatabaseResourceTable,Sidebar,} from "./components";import type { IssueReviewAction, IssueStatusAction } from "./logic";diff --git a/frontend/src/components/IssueV1/IssueDetailPage.vue b/frontend/src/components/IssueV1/IssueDetailPage.vueindex 277475f5ef..6b89627c88 100644--- a/frontend/src/components/IssueV1/IssueDetailPage.vue+++ b/frontend/src/components/IssueV1/IssueDetailPage.vue@@ -95,18 +95,18 @@ import { provideSidebarContext } from "../Plan/logic";import { Drawer } from "../v2";import {BannerSection,- HeaderSection,- StageSection,- TaskListSection,- TaskRunSection,- PlanCheckSection,- StatementSection,DescriptionSection,- Sidebar,+ HeaderSection,+ IssueCommentSection,IssueReviewActionPanel,IssueStatusActionPanel,+ PlanCheckSection,+ Sidebar,+ StageSection,+ StatementSection,+ TaskListSection,TaskRolloutActionPanel,- IssueCommentSection,+ TaskRunSection,} from "./components";import type {IssueReviewAction,diff --git a/frontend/src/components/IssueV1/components/BannerSection.vue b/frontend/src/components/IssueV1/components/BannerSection.vueindex 5b5fa42255..0e8c7f4659 100644--- a/frontend/src/components/IssueV1/components/BannerSection.vue+++ b/frontend/src/components/IssueV1/components/BannerSection.vue@@ -38,14 +38,14 @@<script lang="ts" setup>import { computed } from "vue";import {- IssueStatus,Issue_ApprovalStatus,+ IssueStatus,} from "@/types/proto-es/v1/issue_service_pb";import { Task_Status } from "@/types/proto-es/v1/rollout_service_pb";import { activeTaskInRollout, isDatabaseChangeRelatedIssue } from "@/utils";import {- useIssueContext,isUnfinishedResolvedTask as checkUnfinishedResolvedTask,+ useIssueContext,} from "../logic";const { issue } = useIssueContext();diff --git a/frontend/src/components/IssueV1/components/CurrentApproverV1.vue b/frontend/src/components/IssueV1/components/CurrentApproverV1.vueindex c2f599bd1f..cd2ac01488 100644--- a/frontend/src/components/IssueV1/components/CurrentApproverV1.vue+++ b/frontend/src/components/IssueV1/components/CurrentApproverV1.vue@@ -57,9 +57,9 @@ import {} from "@/store";import { type ComposedIssue } from "@/types";import {- IssueStatus,Issue_ApprovalStatus,Issue_Approver_Status,+ IssueStatus,} from "@/types/proto-es/v1/issue_service_pb";const props = defineProps<{diff --git a/frontend/src/components/IssueV1/components/DescriptionSection/DescriptionSection.vue b/frontend/src/components/IssueV1/components/DescriptionSection/DescriptionSection.vueindex 40ada0897e..7b4d57e380 100644--- a/frontend/src/components/IssueV1/components/DescriptionSection/DescriptionSection.vue+++ b/frontend/src/components/IssueV1/components/DescriptionSection/DescriptionSection.vue@@ -72,7 +72,7 @@<script lang="ts" setup>import { create } from "@bufbuild/protobuf";-import { NInput, NButton } from "naive-ui";+import { NButton, NInput } from "naive-ui";import { computed, nextTick, reactive, ref, watch } from "vue";import { useI18n } from "vue-i18n";import { useRenderMarkdown } from "@/components/MarkdownEditor";diff --git a/frontend/src/components/IssueV1/components/GrantRequest/DatabaseResourceTable.vue b/frontend/src/components/IssueV1/components/GrantRequest/DatabaseResourceTable.vueindex 5565aa3a40..ccd030052b 100644--- a/frontend/src/components/IssueV1/components/GrantRequest/DatabaseResourceTable.vue+++ b/frontend/src/components/IssueV1/components/GrantRequest/DatabaseResourceTable.vue@@ -10,13 +10,12 @@<script lang="tsx" setup>import { uniq } from "lodash-es";-import { NDataTable } from "naive-ui";import type { DataTableColumn } from "naive-ui";-import { computed } from "vue";-import { watch } from "vue";+import { NDataTable } from "naive-ui";+import { computed, watch } from "vue";import { useI18n } from "vue-i18n";import { EnvironmentV1Name, InstanceV1Name } from "@/components/v2";-import { useDatabaseV1Store, batchGetOrFetchDatabases } from "@/store";+import { batchGetOrFetchDatabases, useDatabaseV1Store } from "@/store";import type { DatabaseResource } from "@/types";import type { DatabaseGroup } from "@/types/proto-es/v1/database_group_service_pb";diff --git a/frontend/src/components/IssueV1/components/HeaderSection/Actions/Actions.vue b/frontend/src/components/IssueV1/components/HeaderSection/Actions/Actions.vueindex 91e45068d2..90cc2a7bbf 100644--- a/frontend/src/components/IssueV1/components/HeaderSection/Actions/Actions.vue+++ b/frontend/src/components/IssueV1/components/HeaderSection/Actions/Actions.vue@@ -15,10 +15,10 @@ import { asyncComputed } from "@vueuse/core";import { computed } from "vue";import { extractUserId, useCurrentUserV1 } from "@/store";import {- IssueStatus,Issue_ApprovalStatus,+ IssueStatus,} from "@/types/proto-es/v1/issue_service_pb";-import { isGrantRequestIssue, checkRoleContainsAnyPermission } from "@/utils";+import { checkRoleContainsAnyPermission, isGrantRequestIssue } from "@/utils";import { useIssueContext } from "../../../logic";import { CreateButton } from "./create";import { TinySQLEditorButton } from "./request";diff --git a/frontend/src/components/IssueV1/components/HeaderSection/Actions/common/IssueStatusActionButtonGroup/IssueStatusActionButton.vue b/frontend/src/components/IssueV1/components/HeaderSection/Actions/common/IssueStatusActionButtonGroup/IssueStatusActionButton.vueindex e9664d5ff3..c0ee29ec56 100644--- a/frontend/src/components/IssueV1/components/HeaderSection/Actions/common/IssueStatusActionButtonGroup/IssueStatusActionButton.vue+++ b/frontend/src/components/IssueV1/components/HeaderSection/Actions/common/IssueStatusActionButtonGroup/IssueStatusActionButton.vue@@ -19,7 +19,7 @@</template><script setup lang="ts">-import { NTooltip, NButton } from "naive-ui";+import { NButton, NTooltip } from "naive-ui";import { computed } from "vue";import { ErrorList } from "@/components/IssueV1/components/common";import type { IssueStatusAction } from "@/components/IssueV1/logic";diff --git a/frontend/src/components/IssueV1/components/HeaderSection/Actions/common/IssueStatusActionButtonGroup/IssueStatusActionButtonGroup.vue b/frontend/src/components/IssueV1/components/HeaderSection/Actions/common/IssueStatusActionButtonGroup/IssueStatusActionButtonGroup.vueindex 5d2c5097d9..5b50ba9616 100644--- a/frontend/src/components/IssueV1/components/HeaderSection/Actions/common/IssueStatusActionButtonGroup/IssueStatusActionButtonGroup.vue+++ b/frontend/src/components/IssueV1/components/HeaderSection/Actions/common/IssueStatusActionButtonGroup/IssueStatusActionButtonGroup.vue@@ -38,7 +38,7 @@</template><script setup lang="ts">-import { NButton, NDropdown, type DropdownOption } from "naive-ui";+import { type DropdownOption, NButton, NDropdown } from "naive-ui";import type { VNode } from "vue";import { computed, h } from "vue";import { useI18n } from "vue-i18n";diff --git a/frontend/src/components/IssueV1/components/HeaderSection/Actions/create/CreateButton.vue b/frontend/src/components/IssueV1/components/HeaderSection/Actions/create/CreateButton.vueindex 506b80e099..4065e6d80d 100644--- a/frontend/src/components/IssueV1/components/HeaderSection/Actions/create/CreateButton.vue+++ b/frontend/src/components/IssueV1/components/HeaderSection/Actions/create/CreateButton.vue@@ -46,13 +46,13 @@<script setup lang="ts">import { create } from "@bufbuild/protobuf";-import { NTooltip, NButton } from "naive-ui";+import { NButton, NTooltip } from "naive-ui";import { zindexable as vZindexable } from "vdirs";import { computed, ref } from "vue";import { useI18n } from "vue-i18n";import { useRouter } from "vue-router";-import { getValidIssueLabels } from "@/components/IssueV1/components/IssueLabelSelector.vue";import { ErrorList } from "@/components/IssueV1/components/common";+import { getValidIssueLabels } from "@/components/IssueV1/components/IssueLabelSelector.vue";import {isValidStage,specForTask,@@ -75,15 +75,20 @@ import {} from "@/grpcweb";import { PROJECT_V1_ROUTE_ISSUE_DETAIL } from "@/router/dashboard/projectV1";import {- useSheetV1Store,- useCurrentProjectV1,pushNotification,+ useCurrentProjectV1,+ useSheetV1Store,} from "@/store";-import { CreateIssueRequestSchema } from "@/types/proto-es/v1/issue_service_pb";-import { IssueSchema, Issue_Type } from "@/types/proto-es/v1/issue_service_pb";-import { CreatePlanRequestSchema } from "@/types/proto-es/v1/plan_service_pb";+import {+ CreateIssueRequestSchema,+ Issue_Type,+ IssueSchema,+} from "@/types/proto-es/v1/issue_service_pb";import type { Plan_ExportDataConfig } from "@/types/proto-es/v1/plan_service_pb";-import { type Plan_ChangeDatabaseConfig } from "@/types/proto-es/v1/plan_service_pb";+import {+ CreatePlanRequestSchema,+ type Plan_ChangeDatabaseConfig,+} from "@/types/proto-es/v1/plan_service_pb";import {CheckReleaseRequestSchema,Release_File_Type,@@ -91,8 +96,9 @@ import {import { CreateRolloutRequestSchema } from "@/types/proto-es/v1/rollout_service_pb";import type { Sheet } from "@/types/proto-es/v1/sheet_service_pb";import { Advice_Level } from "@/types/proto-es/v1/sql_service_pb";-import { databaseForTask } from "@/utils";import {+ type Defer,+ databaseForTask,defer,extractProjectResourceName,extractSheetUID,@@ -101,7 +107,6 @@ import {hasPermissionToCreateChangeDatabaseIssueInProject,issueV1Slug,sheetNameOfTaskV1,- type Defer,} from "@/utils";const { t } = useI18n();diff --git a/frontend/src/components/IssueV1/components/HeaderSection/Actions/review/IssueReviewButtonGroup.vue b/frontend/src/components/IssueV1/components/HeaderSection/Actions/review/IssueReviewButtonGroup.vueindex c15c89fce9..d97e8ba247 100644--- a/frontend/src/components/IssueV1/components/HeaderSection/Actions/review/IssueReviewButtonGroup.vue+++ b/frontend/src/components/IssueV1/components/HeaderSection/Actions/review/IssueReviewButtonGroup.vue@@ -28,15 +28,15 @@ import {taskRolloutActionDisplayName,useIssueContext,} from "@/components/IssueV1";-import { useCurrentUserV1, extractUserId, useCurrentProjectV1 } from "@/store";+import { extractUserId, useCurrentProjectV1, useCurrentUserV1 } from "@/store";import {- IssueStatus,Issue_ApprovalStatus,+ IssueStatus,} from "@/types/proto-es/v1/issue_service_pb";import {- isDatabaseChangeRelatedIssue,- hasWorkspacePermissionV2,hasProjectPermissionV2,+ hasWorkspacePermissionV2,+ isDatabaseChangeRelatedIssue,} from "@/utils";import type { ExtraActionOption } from "../common";import { IssueStatusActionButtonGroup } from "../common";diff --git a/frontend/src/components/IssueV1/components/HeaderSection/Actions/rollout/CombinedRolloutButtonGroup.vue b/frontend/src/components/IssueV1/components/HeaderSection/Actions/rollout/CombinedRolloutButtonGroup.vueindex 104770d7d5..a43c3bd7e9 100644--- a/frontend/src/components/IssueV1/components/HeaderSection/Actions/rollout/CombinedRolloutButtonGroup.vue+++ b/frontend/src/components/IssueV1/components/HeaderSection/Actions/rollout/CombinedRolloutButtonGroup.vue@@ -23,19 +23,19 @@ import { computed } from "vue";import { useI18n } from "vue-i18n";import type { TaskRolloutAction } from "@/components/IssueV1/logic";import {- PrimaryTaskRolloutActionList,allowUserToApplyTaskRolloutAction,getApplicableIssueStatusActionList,getApplicableStageRolloutActionList,getApplicableTaskRolloutActionList,+ PrimaryTaskRolloutActionList,releaserCandidatesForIssue,useIssueContext,} from "@/components/IssueV1/logic";import type { Task } from "@/types/proto-es/v1/rollout_service_pb";import type { ExtraActionOption } from "../common";import { IssueStatusActionButtonGroup } from "../common";-import RolloutActionButtonGroup from "./RolloutActionButtonGroup.vue";import type { RolloutAction } from "./common";+import RolloutActionButtonGroup from "./RolloutActionButtonGroup.vue";const { t } = useI18n();const { issue, selectedStage, selectedTask, events } = useIssueContext();diff --git a/frontend/src/components/IssueV1/components/HeaderSection/Actions/rollout/RolloutActionButton.vue b/frontend/src/components/IssueV1/components/HeaderSection/Actions/rollout/RolloutActionButton.vueindex 3acb712e0a..02c9404bfe 100644--- a/frontend/src/components/IssueV1/components/HeaderSection/Actions/rollout/RolloutActionButton.vue+++ b/frontend/src/components/IssueV1/components/HeaderSection/Actions/rollout/RolloutActionButton.vue@@ -35,7 +35,7 @@ import type { ErrorItem } from "@/components/misc/ErrorList.vue";import ErrorList from "@/components/misc/ErrorList.vue";import { ContextMenuButton } from "@/components/v2";import { useUserStore } from "@/store";-import { userNamePrefix, roleNamePrefix } from "@/store/modules/v1/common";+import { roleNamePrefix, userNamePrefix } from "@/store/modules/v1/common";import { displayRoleTitle } from "@/utils";import type { RolloutAction, RolloutButtonAction } from "./common";diff --git a/frontend/src/components/IssueV1/components/HeaderSection/Actions/rollout/RolloutActionButtonGroup.vue b/frontend/src/components/IssueV1/components/HeaderSection/Actions/rollout/RolloutActionButtonGroup.vueindex 8ac03bde97..26a2bf8a0b 100644--- a/frontend/src/components/IssueV1/components/HeaderSection/Actions/rollout/RolloutActionButtonGroup.vue+++ b/frontend/src/components/IssueV1/components/HeaderSection/Actions/rollout/RolloutActionButtonGroup.vue@@ -15,8 +15,8 @@ import type {StageRolloutAction,TaskRolloutAction,} from "@/components/IssueV1/logic";-import RolloutActionButton from "./RolloutActionButton.vue";import type { RolloutAction } from "./common";+import RolloutActionButton from "./RolloutActionButton.vue";defineProps<{taskRolloutActionList: TaskRolloutAction[];diff --git a/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentList.vue b/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentList.vueindex 642ed80910..e648e2b87a 100644--- a/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentList.vue+++ b/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentList.vue@@ -104,10 +104,10 @@ import { useRoute } from "vue-router";import MarkdownEditor from "@/components/MarkdownEditor";import UserAvatar from "@/components/User/UserAvatar.vue";import {+ extractUserId,+ useCurrentProjectV1,useCurrentUserV1,useIssueCommentStore,- useCurrentProjectV1,- extractUserId,} from "@/store";import type { ComposedIssue } from "@/types";import type { IssueComment } from "@/types/proto-es/v1/issue_service_pb";@@ -115,10 +115,10 @@ import { ListIssueCommentsRequestSchema } from "@/types/proto-es/v1/issue_servicimport { hasProjectPermissionV2 } from "@/utils";import { useIssueContext } from "../../logic";import {+ type DistinctIssueComment,IssueCommentView,isSimilarIssueComment,isUserEditableComment,- type DistinctIssueComment,} from "./IssueCommentView";import IssueCreatedCommentV1 from "./IssueCommentView/IssueCreatedCommentV1.vue";diff --git a/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/ActionCreator.vue b/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/ActionCreator.vueindex ab6d02107a..4e634d7261 100644--- a/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/ActionCreator.vue+++ b/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/ActionCreator.vue@@ -19,7 +19,7 @@import { computedAsync } from "@vueuse/core";import { computed } from "vue";import SystemBotTag from "@/components/misc/SystemBotTag.vue";-import { useUserStore, extractUserId } from "@/store";+import { extractUserId, useUserStore } from "@/store";const props = defineProps<{// Format: users/{email}diff --git a/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/ActionIcon.vue b/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/ActionIcon.vueindex f60461f9d7..b7ecfb6630 100644--- a/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/ActionIcon.vue+++ b/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/ActionIcon.vue@@ -104,21 +104,25 @@<script lang="ts" setup>import { computedAsync } from "@vueuse/core";import {- ThumbsUpIcon,- PlayIcon,CheckCircle2Icon,- PlusIcon,+ CircleAlertIcon,+ CodeIcon,+ MinusIcon,PencilIcon,PlayCircleIcon,- MinusIcon,- CodeIcon,- CircleAlertIcon,+ PlayIcon,+ PlusIcon,+ ThumbsUpIcon,} from "lucide-vue-next";import { computed } from "vue";import { SkipIcon } from "@/components/Icon";import PrincipalAvatar from "@/components/PrincipalAvatar.vue";-import { IssueCommentType, useUserStore, getIssueCommentType } from "@/store";-import { extractUserId } from "@/store";+import {+ extractUserId,+ getIssueCommentType,+ IssueCommentType,+ useUserStore,+} from "@/store";import type { IssueComment } from "@/types/proto-es/v1/issue_service_pb";import {IssueComment_Approval_Status,diff --git a/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/ActionSentence.vue b/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/ActionSentence.vueindex b660cad6db..fe553414b6 100644--- a/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/ActionSentence.vue+++ b/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/ActionSentence.vue@@ -6,8 +6,12 @@import type { h } from "vue";import { defineComponent } from "vue";import { Translation, useI18n } from "vue-i18n";-import { useUserStore, IssueCommentType, getIssueCommentType } from "@/store";-import { extractUserId } from "@/store";+import {+ extractUserId,+ getIssueCommentType,+ IssueCommentType,+ useUserStore,+} from "@/store";import { type ComposedIssue } from "@/types";import type { IssueComment } from "@/types/proto-es/v1/issue_service_pb";import {diff --git a/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/IssueCommentAction.vue b/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/IssueCommentAction.vueindex bf4bad3e78..e1b48ba829 100644--- a/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/IssueCommentAction.vue+++ b/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/IssueCommentAction.vue@@ -70,9 +70,13 @@<script lang="ts" setup>import HumanizeTs from "@/components/misc/HumanizeTs.vue";-import { IssueCommentType, getIssueCommentType } from "@/store";-import { useUserStore, extractUserId } from "@/store";-import { getTimeForPbTimestampProtoEs, type ComposedIssue } from "@/types";+import {+ extractUserId,+ getIssueCommentType,+ IssueCommentType,+ useUserStore,+} from "@/store";+import { type ComposedIssue, getTimeForPbTimestampProtoEs } from "@/types";import type { IssueComment } from "@/types/proto-es/v1/issue_service_pb";import type { Rollout } from "@/types/proto-es/v1/rollout_service_pb";import ActionCreator from "./ActionCreator.vue";diff --git a/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/IssueCreatedCommentV1.vue b/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/IssueCreatedCommentV1.vueindex 0d4e19c6ef..d7ace66e89 100644--- a/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/IssueCreatedCommentV1.vue+++ b/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/IssueCreatedCommentV1.vue@@ -87,20 +87,19 @@<script lang="ts" setup>import { create } from "@bufbuild/protobuf";-import { PlusIcon, PencilIcon } from "lucide-vue-next";+import { PencilIcon, PlusIcon } from "lucide-vue-next";import { NButton } from "naive-ui";import { computed, reactive } from "vue";import MarkdownEditor from "@/components/MarkdownEditor";-import UserAvatar from "@/components/User/UserAvatar.vue";import HumanizeTs from "@/components/misc/HumanizeTs.vue";-import { planServiceClientConnect, issueServiceClientConnect } from "@/grpcweb";-import { useCurrentUserV1, useUserStore } from "@/store";-import { useCurrentProjectV1 } from "@/store";-import { getTimeForPbTimestampProtoEs, type ComposedIssue } from "@/types";+import UserAvatar from "@/components/User/UserAvatar.vue";+import { issueServiceClientConnect, planServiceClientConnect } from "@/grpcweb";+import { useCurrentProjectV1, useCurrentUserV1, useUserStore } from "@/store";+import { type ComposedIssue, getTimeForPbTimestampProtoEs } from "@/types";import { UpdateIssueRequestSchema } from "@/types/proto-es/v1/issue_service_pb";import {- UpdatePlanRequestSchema,PlanSchema,+ UpdatePlanRequestSchema,} from "@/types/proto-es/v1/plan_service_pb";import { hasProjectPermissionV2 } from "@/utils";import ActionCreator from "./ActionCreator.vue";diff --git a/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/TaskName.vue b/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/TaskName.vueindex e952e9fb4b..4693e253cc 100644--- a/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/TaskName.vue+++ b/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/TaskName.vue@@ -29,9 +29,10 @@ import {} from "@/router/dashboard/projectV1";import type { Issue } from "@/types/proto-es/v1/issue_service_pb";import type { Task } from "@/types/proto-es/v1/rollout_service_pb";-import { databaseForTask, extractRolloutUID } from "@/utils";import {+ databaseForTask,extractProjectResourceName,+ extractRolloutUID,extractSchemaVersionFromTask,extractStageUID,extractTaskUID,diff --git a/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/common.ts b/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/common.tsindex 0e1d068c0a..69b391c9d5 100644--- a/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/common.ts+++ b/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/common.ts@@ -1,4 +1,4 @@-import { IssueCommentType, getIssueCommentType } from "@/store";+import { getIssueCommentType, IssueCommentType } from "@/store";import type { IssueComment } from "@/types/proto-es/v1/issue_service_pb";import { isNullOrUndefined } from "@/utils";diff --git a/frontend/src/components/IssueV1/components/IssueSearch/IssueSearch.vue b/frontend/src/components/IssueV1/components/IssueSearch/IssueSearch.vueindex f787f983b1..361b51975d 100644--- a/frontend/src/components/IssueV1/components/IssueSearch/IssueSearch.vue+++ b/frontend/src/components/IssueV1/components/IssueSearch/IssueSearch.vue@@ -41,7 +41,7 @@</template><script lang="ts" setup>-import { ref, computed } from "vue";+import { computed, ref } from "vue";import AdvancedSearch from "@/components/AdvancedSearch";import TimeRange from "@/components/AdvancedSearch/TimeRange.vue";import type { SearchParams, SearchScopeId } from "@/utils";diff --git a/frontend/src/components/IssueV1/components/IssueSearch/PresetButtons.vue b/frontend/src/components/IssueV1/components/IssueSearch/PresetButtons.vueindex 6688435fcf..6065094b63 100644--- a/frontend/src/components/IssueV1/components/IssueSearch/PresetButtons.vue+++ b/frontend/src/components/IssueV1/components/IssueSearch/PresetButtons.vue@@ -14,14 +14,14 @@</template><script lang="ts" setup>-import { NTabs, NTab } from "naive-ui";+import { NTab, NTabs } from "naive-ui";import { computed } from "vue";import { useI18n } from "vue-i18n";import { useCurrentUserV1 } from "@/store";import type { SearchParams } from "@/utils";import {- getValueFromSearchParams,getSemanticIssueStatusFromSearchParams,+ getValueFromSearchParams,upsertScope,} from "@/utils";diff --git a/frontend/src/components/IssueV1/components/IssueSearch/Status.vue b/frontend/src/components/IssueV1/components/IssueSearch/Status.vueindex 9b5e21316c..d1ed83e1d7 100644--- a/frontend/src/components/IssueV1/components/IssueSearch/Status.vue+++ b/frontend/src/components/IssueV1/components/IssueSearch/Status.vue@@ -14,7 +14,7 @@</template><script lang="ts" setup>-import { NTabs, NTab } from "naive-ui";+import { NTab, NTabs } from "naive-ui";import { computed } from "vue";import { useI18n } from "vue-i18n";import type { SearchParams, SemanticIssueStatus } from "@/utils";diff --git a/frontend/src/components/IssueV1/components/IssueSearch/useIssueSearchScopeOptions.ts b/frontend/src/components/IssueV1/components/IssueSearch/useIssueSearchScopeOptions.tsindex 76006878c5..aebfb944c9 100644--- a/frontend/src/components/IssueV1/components/IssueSearch/useIssueSearchScopeOptions.ts+++ b/frontend/src/components/IssueV1/components/IssueSearch/useIssueSearchScopeOptions.ts@@ -22,10 +22,10 @@ import { type Label } from "@/types/proto-es/v1/project_service_pb";import { UserType } from "@/types/proto-es/v1/user_service_pb";import type { SearchParams, SearchScopeId } from "@/utils";import {- getDefaultPagination,extractEnvironmentResourceName,extractInstanceResourceName,extractProjectResourceName,+ getDefaultPagination,} from "@/utils";export const useIssueSearchScopeOptions = (diff --git a/frontend/src/components/IssueV1/components/IssueTableV1.vue b/frontend/src/components/IssueV1/components/IssueTableV1.vueindex 669bff0543..ccf1d49aaf 100644--- a/frontend/src/components/IssueV1/components/IssueTableV1.vue+++ b/frontend/src/components/IssueV1/components/IssueTableV1.vue@@ -41,8 +41,8 @@import { useElementSize } from "@vueuse/core";import { orderBy } from "lodash-es";import type { DataTableColumn } from "naive-ui";-import { NPerformantEllipsis, NDataTable } from "naive-ui";-import { reactive, computed, watch, ref, h } from "vue";+import { NDataTable, NPerformantEllipsis } from "naive-ui";+import { computed, h, reactive, ref, watch } from "vue";import { useI18n } from "vue-i18n";import { useRouter } from "vue-router";import { BBAvatar } from "@/bbkit";@@ -52,15 +52,15 @@ import { useElementVisibilityInScrollParent } from "@/composables/useElementVisiimport { useIssueLayoutVersion } from "@/composables/useIssueLayoutVersion";import { useUserStore } from "@/store";import {+ type ComposedIssue,getTimeForPbTimestampProtoEs,unknownUser,- type ComposedIssue,} from "@/types";import {- getHighlightHTMLByRegExp,- humanizeTs,extractIssueUID,+ getHighlightHTMLByRegExp,getIssueRoute,+ humanizeTs,} from "@/utils";import { projectOfIssue } from "../logic";import IssueLabelSelector, {diff --git a/frontend/src/components/IssueV1/components/Panel/BatchIssueStatusActionPanel.vue b/frontend/src/components/IssueV1/components/Panel/BatchIssueStatusActionPanel.vueindex 4fec0f0556..8b654da19b 100644--- a/frontend/src/components/IssueV1/components/Panel/BatchIssueStatusActionPanel.vue+++ b/frontend/src/components/IssueV1/components/Panel/BatchIssueStatusActionPanel.vue@@ -65,9 +65,9 @@ import { computed, reactive, ref } from "vue";import { useI18n } from "vue-i18n";import type { IssueStatusAction } from "@/components/IssueV1/logic";import {+ IssueStatusActionToIssueStatusMap,issueStatusActionButtonProps,issueStatusActionDisplayName,- IssueStatusActionToIssueStatusMap,} from "@/components/IssueV1/logic";import { issueServiceClientConnect } from "@/grpcweb";import { pushNotification } from "@/store";diff --git a/frontend/src/components/IssueV1/components/Panel/IssueReviewActionPanel.vue b/frontend/src/components/IssueV1/components/Panel/IssueReviewActionPanel.vueindex 7e1a7b8e5f..76dddce72c 100644--- a/frontend/src/components/IssueV1/components/Panel/IssueReviewActionPanel.vue+++ b/frontend/src/components/IssueV1/components/Panel/IssueReviewActionPanel.vue@@ -103,9 +103,9 @@ import { computed, reactive, ref } from "vue";import { useI18n } from "vue-i18n";import type { IssueReviewAction } from "@/components/IssueV1/logic";import {- useIssueContext,issueReviewActionDisplayName,planCheckRunSummaryForIssue,+ useIssueContext,} from "@/components/IssueV1/logic";import PlanCheckRunBar from "@/components/PlanCheckRun/PlanCheckRunBar.vue";import RequiredStar from "@/components/RequiredStar.vue";diff --git a/frontend/src/components/IssueV1/components/Panel/IssueStatusActionPanel.vue b/frontend/src/components/IssueV1/components/Panel/IssueStatusActionPanel.vueindex 2329a93001..81e9a0901c 100644--- a/frontend/src/components/IssueV1/components/Panel/IssueStatusActionPanel.vue+++ b/frontend/src/components/IssueV1/components/Panel/IssueStatusActionPanel.vue@@ -95,10 +95,10 @@ import { computed, reactive, ref } from "vue";import { useI18n } from "vue-i18n";import type { IssueStatusAction } from "@/components/IssueV1/logic";import {- useIssueContext,+ IssueStatusActionToIssueStatusMap,issueStatusActionButtonProps,issueStatusActionDisplayName,- IssueStatusActionToIssueStatusMap,+ useIssueContext,} from "@/components/IssueV1/logic";import ErrorList from "@/components/misc/ErrorList.vue";import { issueServiceClientConnect } from "@/grpcweb";diff --git a/frontend/src/components/IssueV1/components/Panel/TaskRolloutActionPanel.vue b/frontend/src/components/IssueV1/components/Panel/TaskRolloutActionPanel.vueindex 93b198dc7c..471b501a5b 100644--- a/frontend/src/components/IssueV1/components/Panel/TaskRolloutActionPanel.vue+++ b/frontend/src/components/IssueV1/components/Panel/TaskRolloutActionPanel.vue@@ -248,14 +248,14 @@ import {taskRunListForTask,useIssueContext,} from "@/components/IssueV1/logic";-import PlanCheckRunBar from "@/components/PlanCheckRun/PlanCheckRunBar.vue";import { planCheckRunSummaryForCheckRunList } from "@/components/PlanCheckRun/common";+import PlanCheckRunBar from "@/components/PlanCheckRun/PlanCheckRunBar.vue";import { EnvironmentV1Name } from "@/components/v2";import { rolloutServiceClientConnect } from "@/grpcweb";import {pushNotification,- useEnvironmentV1Store,useCurrentProjectV1,+ useEnvironmentV1Store,usePolicyByParentAndType,} from "@/store";import { Issue_Approver_Status } from "@/types/proto-es/v1/issue_service_pb";@@ -263,13 +263,11 @@ import {PolicyType,RolloutPolicy_Checkers_PlanCheckEnforcement,} from "@/types/proto-es/v1/org_policy_service_pb";+import type { Task } from "@/types/proto-es/v1/rollout_service_pb";import {+ BatchCancelTaskRunsRequestSchema,BatchRunTasksRequestSchema,BatchSkipTasksRequestSchema,- BatchCancelTaskRunsRequestSchema,-} from "@/types/proto-es/v1/rollout_service_pb";-import type { Task } from "@/types/proto-es/v1/rollout_service_pb";-import {Task_Status,TaskRun_Status,} from "@/types/proto-es/v1/rollout_service_pb";diff --git a/frontend/src/components/IssueV1/components/PlanCheckSection/PlanCheckSection.vue b/frontend/src/components/IssueV1/components/PlanCheckSection/PlanCheckSection.vueindex 2e4e431f2f..9fd8b23eaf 100644--- a/frontend/src/components/IssueV1/components/PlanCheckSection/PlanCheckSection.vue+++ b/frontend/src/components/IssueV1/components/PlanCheckSection/PlanCheckSection.vue@@ -17,9 +17,12 @@ import {useIssueContext,} from "@/components/IssueV1/logic";import PlanCheckRunBar from "@/components/PlanCheckRun/PlanCheckRunBar.vue";-import { useCurrentUserV1, extractUserId, useCurrentProjectV1 } from "@/store";-import { databaseForTask } from "@/utils";-import { hasProjectPermissionV2, isValidTaskName } from "@/utils";+import { extractUserId, useCurrentProjectV1, useCurrentUserV1 } from "@/store";+import {+ databaseForTask,+ hasProjectPermissionV2,+ isValidTaskName,+} from "@/utils";const currentUser = useCurrentUserV1();const { issue, selectedTask, getPlanCheckRunsForTask } = useIssueContext();diff --git a/frontend/src/components/IssueV1/components/Sidebar/PreBackupSection/PreBackupSection.vue b/frontend/src/components/IssueV1/components/Sidebar/PreBackupSection/PreBackupSection.vueindex e4a8eb8380..e8f556118f 100644--- a/frontend/src/components/IssueV1/components/Sidebar/PreBackupSection/PreBackupSection.vue+++ b/frontend/src/components/IssueV1/components/Sidebar/PreBackupSection/PreBackupSection.vue@@ -16,8 +16,8 @@ import { useCurrentProjectV1 } from "@/store";import type { Plan } from "@/types/proto-es/v1/plan_service_pb";import { TaskRun_Status } from "@/types/proto-es/v1/rollout_service_pb";import { databaseForTask } from "@/utils";-import TaskRollbackSection from "./TaskRollbackSection.vue";import { ROLLBACK_AVAILABLE_ENGINES } from "./common";+import TaskRollbackSection from "./TaskRollbackSection.vue";const { isCreating, issue, selectedTask, events } = useIssueContext();const { project } = useCurrentProjectV1();diff --git a/frontend/src/components/IssueV1/components/Sidebar/PreBackupSection/TaskRollbackButton.vue b/frontend/src/components/IssueV1/components/Sidebar/PreBackupSection/TaskRollbackButton.vueindex 86c96479a7..22d334ea6b 100644--- a/frontend/src/components/IssueV1/components/Sidebar/PreBackupSection/TaskRollbackButton.vue+++ b/frontend/src/components/IssueV1/components/Sidebar/PreBackupSection/TaskRollbackButton.vue@@ -13,8 +13,8 @@ import { Undo2Icon } from "lucide-vue-next";import { NButton } from "naive-ui";import { v4 as uuidv4 } from "uuid";import { computed, ref } from "vue";-import { useRouter } from "vue-router";import type { LocationQueryRaw } from "vue-router";+import { useRouter } from "vue-router";import {latestTaskRunForTask,useIssueContext,@@ -23,9 +23,9 @@ import { rolloutServiceClientConnect } from "@/grpcweb";import { PROJECT_V1_ROUTE_ISSUE_DETAIL } from "@/router/dashboard/projectV1";import {pushNotification,+ useCurrentProjectV1,useSheetV1Store,useStorageStore,- useCurrentProjectV1,} from "@/store";import { PreviewTaskRunRollbackRequestSchema } from "@/types/proto-es/v1/rollout_service_pb";import {diff --git a/frontend/src/components/IssueV1/components/Sidebar/Sidebar.vue b/frontend/src/components/IssueV1/components/Sidebar/Sidebar.vueindex 35d4a1d0bb..050132a5ad 100644--- a/frontend/src/components/IssueV1/components/Sidebar/Sidebar.vue+++ b/frontend/src/components/IssueV1/components/Sidebar/Sidebar.vue@@ -75,8 +75,10 @@ import { provideGhostSettingContext } from "@/components/Plan/components/Configuimport { ApprovalFlowSection } from "@/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection";import { issueServiceClientConnect } from "@/grpcweb";import { pushNotification, useCurrentProjectV1 } from "@/store";-import { UpdateIssueRequestSchema } from "@/types/proto-es/v1/issue_service_pb";-import { IssueSchema } from "@/types/proto-es/v1/issue_service_pb";+import {+ IssueSchema,+ UpdateIssueRequestSchema,+} from "@/types/proto-es/v1/issue_service_pb";import type { Plan } from "@/types/proto-es/v1/plan_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import { specForTask, useIssueContext } from "../../logic";diff --git a/frontend/src/components/IssueV1/components/Sidebar/TaskCheckSummarySection/AffectedRowsView.vue b/frontend/src/components/IssueV1/components/Sidebar/TaskCheckSummarySection/AffectedRowsView.vueindex 4ab1b2b48d..561c3b3ee3 100644--- a/frontend/src/components/IssueV1/components/Sidebar/TaskCheckSummarySection/AffectedRowsView.vue+++ b/frontend/src/components/IssueV1/components/Sidebar/TaskCheckSummarySection/AffectedRowsView.vue@@ -41,13 +41,12 @@</template><script setup lang="ts">-import { NTag, NPopover } from "naive-ui";+import { NPopover, NTag } from "naive-ui";import { computed } from "vue";-import { useIssueContext, projectOfIssue } from "@/components/IssueV1/logic";+import { projectOfIssue, useIssueContext } from "@/components/IssueV1/logic";import { type PlanCheckRun } from "@/types/proto-es/v1/plan_service_pb";import type { Task } from "@/types/proto-es/v1/rollout_service_pb";-import { databaseForTask } from "@/utils";-import { flattenTaskV1List } from "@/utils";+import { databaseForTask, flattenTaskV1List } from "@/utils";const props = defineProps<{taskSummaryReportMap: Map<string, PlanCheckRun>;diff --git a/frontend/src/components/IssueV1/components/Sidebar/TaskCheckSummarySection/FailedTasksView.vue b/frontend/src/components/IssueV1/components/Sidebar/TaskCheckSummarySection/FailedTasksView.vueindex b0084d3f8b..b6be67e343 100644--- a/frontend/src/components/IssueV1/components/Sidebar/TaskCheckSummarySection/FailedTasksView.vue+++ b/frontend/src/components/IssueV1/components/Sidebar/TaskCheckSummarySection/FailedTasksView.vue@@ -31,14 +31,13 @@</template><script setup lang="ts">-import { NTag, NPopover } from "naive-ui";+import { NPopover, NTag } from "naive-ui";import { computed } from "vue";-import { useIssueContext, projectOfIssue } from "@/components/IssueV1";+import { projectOfIssue, useIssueContext } from "@/components/IssueV1";import type { PlanCheckRun } from "@/types/proto-es/v1/plan_service_pb";import type { Task } from "@/types/proto-es/v1/rollout_service_pb";import { Advice_Level } from "@/types/proto-es/v1/sql_service_pb";-import { databaseForTask } from "@/utils";-import { flattenTaskV1List } from "@/utils";+import { databaseForTask, flattenTaskV1List } from "@/utils";const props = defineProps<{taskSummaryReportMap: Map<string, PlanCheckRun>;diff --git a/frontend/src/components/IssueV1/components/Sidebar/TaskCheckSummarySection/TaskCheckSummarySection.vue b/frontend/src/components/IssueV1/components/Sidebar/TaskCheckSummarySection/TaskCheckSummarySection.vueindex 37126518e0..b3fe2de3b6 100644--- a/frontend/src/components/IssueV1/components/Sidebar/TaskCheckSummarySection/TaskCheckSummarySection.vue+++ b/frontend/src/components/IssueV1/components/Sidebar/TaskCheckSummarySection/TaskCheckSummarySection.vue@@ -22,8 +22,8 @@import { computed, ref } from "vue";import { useIssueContext } from "@/components/IssueV1";import {- PlanCheckRun_Type,type PlanCheckRun,+ PlanCheckRun_Type,} from "@/types/proto-es/v1/plan_service_pb";import {flattenTaskV1List,diff --git a/frontend/src/components/IssueV1/components/StageSection/StageSection.vue b/frontend/src/components/IssueV1/components/StageSection/StageSection.vueindex c1b2002857..3b3d24e96b 100644--- a/frontend/src/components/IssueV1/components/StageSection/StageSection.vue+++ b/frontend/src/components/IssueV1/components/StageSection/StageSection.vue@@ -51,7 +51,7 @@</template><script lang="ts" setup>-import { NScrollbar, NEmpty } from "naive-ui";+import { NEmpty, NScrollbar } from "naive-ui";import { computed } from "vue";import { useIssueContext } from "@/components/IssueV1/logic";import NoPermissionPlaceholder from "@/components/misc/NoPermissionPlaceholder.vue";diff --git a/frontend/src/components/IssueV1/components/StatementSection/EditorView/EditorActionPopover.vue b/frontend/src/components/IssueV1/components/StatementSection/EditorView/EditorActionPopover.vueindex f877536d74..e1e6007b40 100644--- a/frontend/src/components/IssueV1/components/StatementSection/EditorView/EditorActionPopover.vue+++ b/frontend/src/components/IssueV1/components/StatementSection/EditorView/EditorActionPopover.vue@@ -26,7 +26,7 @@<script setup lang="tsx">import { EllipsisVerticalIcon } from "lucide-vue-next";-import { NPopover, NButton, NDivider } from "naive-ui";+import { NButton, NDivider, NPopover } from "naive-ui";import { computed } from "vue";import { useIssueContext } from "@/components/IssueV1/logic";import { useCurrentProjectV1 } from "@/store";diff --git a/frontend/src/components/IssueV1/components/StatementSection/EditorView/EditorView.vue b/frontend/src/components/IssueV1/components/StatementSection/EditorView/EditorView.vueindex 6d2ba9f787..123f53bb4e 100644--- a/frontend/src/components/IssueV1/components/StatementSection/EditorView/EditorView.vue+++ b/frontend/src/components/IssueV1/components/StatementSection/EditorView/EditorView.vue@@ -191,13 +191,13 @@ import {} from "@/components/IssueV1/logic";import { MonacoEditor } from "@/components/MonacoEditor";import { extensionNameOfLanguage } from "@/components/MonacoEditor/utils";+import SQLUploadButton from "@/components/misc/SQLUploadButton.vue";import {createEmptyLocalSheet,databaseEngineForSpec,} from "@/components/Plan";import RequiredStar from "@/components/RequiredStar.vue";import DownloadSheetButton from "@/components/Sheet/DownloadSheetButton.vue";-import SQLUploadButton from "@/components/misc/SQLUploadButton.vue";import { planServiceClientConnect } from "@/grpcweb";import {pushNotification,@@ -210,8 +210,8 @@ import { IssueStatus } from "@/types/proto-es/v1/issue_service_pb";import { UpdatePlanRequestSchema } from "@/types/proto-es/v1/plan_service_pb";import { SheetSchema } from "@/types/proto-es/v1/sheet_service_pb";import type { Advice } from "@/types/proto-es/v1/sql_service_pb";-import { databaseForTask } from "@/utils";import {+ databaseForTask,flattenTaskV1List,getSheetStatement,getStatementSize,@@ -219,8 +219,8 @@ import {useInstanceV1EditorLanguage,} from "@/utils";import { useSQLAdviceMarkers } from "../useSQLAdviceMarkers";-import EditorActionPopover from "./EditorActionPopover.vue";import { provideEditorContext } from "./context";+import EditorActionPopover from "./EditorActionPopover.vue";import type { EditState } from "./useTempEditState";import { useTempEditState } from "./useTempEditState";diff --git a/frontend/src/components/IssueV1/components/StatementSection/StatementSection.vue b/frontend/src/components/IssueV1/components/StatementSection/StatementSection.vueindex 7b8c391bbe..0aba6d809c 100644--- a/frontend/src/components/IssueV1/components/StatementSection/StatementSection.vue+++ b/frontend/src/components/IssueV1/components/StatementSection/StatementSection.vue@@ -15,8 +15,7 @@ import { usePlanSQLCheckContext } from "@/components/Plan/components/SQLCheckSecimport { useRouteChangeGuard } from "@/composables/useRouteChangeGuard";import { useCurrentProjectV1 } from "@/store";import { TaskTypeListWithStatement } from "@/types";-import { databaseForTask } from "@/utils";-import { isValidTaskName } from "@/utils";+import { databaseForTask, isValidTaskName } from "@/utils";import { useIssueContext } from "../../logic";import EditorView from "./EditorView";diff --git a/frontend/src/components/IssueV1/components/StatementSection/useSQLAdviceMarkers.ts b/frontend/src/components/IssueV1/components/StatementSection/useSQLAdviceMarkers.tsindex 77da5cc1f9..9665c8e3e9 100644--- a/frontend/src/components/IssueV1/components/StatementSection/useSQLAdviceMarkers.ts+++ b/frontend/src/components/IssueV1/components/StatementSection/useSQLAdviceMarkers.ts@@ -3,7 +3,7 @@ import { computed, type Ref } from "vue";import type { AdviceOption } from "@/components/MonacoEditor";import type { PlanCheckRun } from "@/types/proto-es/v1/plan_service_pb";import { PlanCheckRun_Type } from "@/types/proto-es/v1/plan_service_pb";-import { Advice_Level, type Advice } from "@/types/proto-es/v1/sql_service_pb";+import { type Advice, Advice_Level } from "@/types/proto-es/v1/sql_service_pb";import { extractPlanCheckRunUID } from "@/utils";import { type IssueContext } from "../../logic";diff --git a/frontend/src/components/IssueV1/components/TaskListSection/CurrentTaskSection.vue b/frontend/src/components/IssueV1/components/TaskListSection/CurrentTaskSection.vueindex 07e607d6e2..d71e4e81a7 100644--- a/frontend/src/components/IssueV1/components/TaskListSection/CurrentTaskSection.vue+++ b/frontend/src/components/IssueV1/components/TaskListSection/CurrentTaskSection.vue@@ -86,14 +86,13 @@ import {InstanceV1Name,} from "@/components/v2";import {+ useCurrentProjectV1,useDatabaseV1Store,useEnvironmentV1Store,- useCurrentProjectV1,} from "@/store";import { formatEnvironmentName, isValidDatabaseName } from "@/types";import { Task_Status, Task_Type } from "@/types/proto-es/v1/rollout_service_pb";-import { databaseForTask } from "@/utils";-import { extractInstanceResourceName } from "@/utils";+import { databaseForTask, extractInstanceResourceName } from "@/utils";type DatabaseCreationStatus = "EXISTED" | "PENDING_CREATE" | "CREATED";diff --git a/frontend/src/components/IssueV1/components/TaskListSection/TaskCard.vue b/frontend/src/components/IssueV1/components/TaskListSection/TaskCard.vueindex 594b37033f..921cc74ba1 100644--- a/frontend/src/components/IssueV1/components/TaskListSection/TaskCard.vue+++ b/frontend/src/components/IssueV1/components/TaskListSection/TaskCard.vue@@ -64,10 +64,13 @@ import {MigrationType,} from "@/types/proto-es/v1/common_pb";import type { Task } from "@/types/proto-es/v1/rollout_service_pb";-import { Task_Type, Task_Status } from "@/types/proto-es/v1/rollout_service_pb";-import { databaseForTask } from "@/utils";-import { databaseV1Url, extractSchemaVersionFromTask } from "@/utils";-import { useInstanceForTask, specForTask, useIssueContext } from "../../logic";+import { Task_Status, Task_Type } from "@/types/proto-es/v1/rollout_service_pb";+import {+ databaseForTask,+ databaseV1Url,+ extractSchemaVersionFromTask,+} from "@/utils";+import { specForTask, useInstanceForTask, useIssueContext } from "../../logic";import TaskStatusIcon from "../TaskStatusIcon.vue";import TaskExtraActionsButton from "./TaskExtraActionsButton.vue";diff --git a/frontend/src/components/IssueV1/components/TaskListSection/TaskExtraActionsButton.vue b/frontend/src/components/IssueV1/components/TaskListSection/TaskExtraActionsButton.vueindex 6041115afc..e926eacaff 100644--- a/frontend/src/components/IssueV1/components/TaskListSection/TaskExtraActionsButton.vue+++ b/frontend/src/components/IssueV1/components/TaskListSection/TaskExtraActionsButton.vue@@ -22,7 +22,7 @@<script setup lang="ts">import type { DropdownOption } from "naive-ui";-import { NDropdown, NButton } from "naive-ui";+import { NButton, NDropdown } from "naive-ui";import type { VNode } from "vue";import { computed, h } from "vue";import { useI18n } from "vue-i18n";diff --git a/frontend/src/components/IssueV1/components/TaskListSection/TaskListSection.vue b/frontend/src/components/IssueV1/components/TaskListSection/TaskListSection.vueindex c042021839..c2d4ccf4e2 100644--- a/frontend/src/components/IssueV1/components/TaskListSection/TaskListSection.vue+++ b/frontend/src/components/IssueV1/components/TaskListSection/TaskListSection.vue@@ -62,7 +62,7 @@<script lang="ts" setup>import { useDebounceFn } from "@vueuse/core";import { NButton } from "naive-ui";-import { computed, ref, reactive, watch } from "vue";+import { computed, reactive, ref, watch } from "vue";import { BBSpin } from "@/bbkit";import { usePlanSQLCheckContext } from "@/components/Plan/components/SQLCheckSection/context";import { useVerticalScrollState } from "@/composables/useScrollState";@@ -70,13 +70,12 @@ import { batchGetOrFetchDatabases, useCurrentProjectV1 } from "@/store";import { DEBOUNCE_SEARCH_DELAY } from "@/types";import type { Task_Status } from "@/types/proto-es/v1/rollout_service_pb";import type { Advice_Level } from "@/types/proto-es/v1/sql_service_pb";-import { databaseForTask } from "@/utils";-import { isDev } from "@/utils";+import { databaseForTask, isDev } from "@/utils";import { useIssueContext } from "../../logic";import CurrentTaskSection from "./CurrentTaskSection.vue";+import { filterTask } from "./filter";import TaskCard from "./TaskCard.vue";import TaskFilter from "./TaskFilter.vue";-import { filterTask } from "./filter";interface StageState {// Index is the current number of tasks to show.diff --git a/frontend/src/components/IssueV1/components/TaskRunSection/TaskRunComment.vue b/frontend/src/components/IssueV1/components/TaskRunSection/TaskRunComment.vueindex 342c3b3a8e..9eca357d83 100644--- a/frontend/src/components/IssueV1/components/TaskRunSection/TaskRunComment.vue+++ b/frontend/src/components/IssueV1/components/TaskRunSection/TaskRunComment.vue@@ -33,18 +33,22 @@ import { useCurrentProjectV1 } from "@/store";import { getProjectIdRolloutUidStageUidTaskUid } from "@/store/modules/v1/common";import { useTaskRunLogStore } from "@/store/modules/v1/taskRunLog";import {- unknownTask,- getTimeForPbTimestampProtoEs,getDateForPbTimestampProtoEs,+ getTimeForPbTimestampProtoEs,+ unknownTask,} from "@/types";+import type { TaskRun } from "@/types/proto-es/v1/rollout_service_pb";import {- TaskRun_Status,Task_Type,+ TaskRun_Status,} from "@/types/proto-es/v1/rollout_service_pb";-import type { TaskRun } from "@/types/proto-es/v1/rollout_service_pb";import { isPostgresFamily } from "@/types/v1/instance";-import { databaseForTask } from "@/utils";-import { databaseV1Url, extractTaskUID, flattenTaskV1List } from "@/utils";+import {+ databaseForTask,+ databaseV1Url,+ extractTaskUID,+ flattenTaskV1List,+} from "@/utils";import { extractChangelogUID } from "@/utils/v1/changelog";import { useIssueContext } from "../../logic";import { displayTaskRunLogEntryType } from "./TaskRunLogTable/common";diff --git a/frontend/src/components/IssueV1/components/TaskRunSection/TaskRunDetail.vue b/frontend/src/components/IssueV1/components/TaskRunSection/TaskRunDetail.vueindex e9c62c7647..54963a2c50 100644--- a/frontend/src/components/IssueV1/components/TaskRunSection/TaskRunDetail.vue+++ b/frontend/src/components/IssueV1/components/TaskRunSection/TaskRunDetail.vue@@ -25,14 +25,14 @@<script lang="ts" setup>import { uniqueId } from "lodash-es";import { RefreshCcwIcon } from "lucide-vue-next";-import { NButton, NTabs, NTabPane } from "naive-ui";+import { NButton, NTabPane, NTabs } from "naive-ui";import { computed, reactive, ref, watch } from "vue";import { useSheetV1Store } from "@/store";import { Engine } from "@/types/proto-es/v1/common_pb";import type { Database } from "@/types/proto-es/v1/database_service_pb";import {- TaskRun_Status,type TaskRun,+ TaskRun_Status,} from "@/types/proto-es/v1/rollout_service_pb";import TaskRunLogTable from "./TaskRunLogTable";import TaskRunSession from "./TaskRunSession";diff --git a/frontend/src/components/IssueV1/components/TaskRunSection/TaskRunLogTable/TaskRunLogTable.vue b/frontend/src/components/IssueV1/components/TaskRunSection/TaskRunLogTable/TaskRunLogTable.vueindex 634f5d03d2..badbfd20d7 100644--- a/frontend/src/components/IssueV1/components/TaskRunSection/TaskRunLogTable/TaskRunLogTable.vue+++ b/frontend/src/components/IssueV1/components/TaskRunSection/TaskRunLogTable/TaskRunLogTable.vue@@ -13,25 +13,25 @@ import { create } from "@bufbuild/protobuf";import { computedAsync } from "@vueuse/core";import { last } from "lodash-es";import { CircleAlertIcon } from "lucide-vue-next";-import { NTooltip, NDataTable, type DataTableColumn } from "naive-ui";+import { type DataTableColumn, NDataTable, NTooltip } from "naive-ui";import { computed, ref } from "vue";import { useI18n } from "vue-i18n";import { rolloutServiceClientConnect } from "@/grpcweb";-import { GetTaskRunLogRequestSchema } from "@/types/proto-es/v1/rollout_service_pb";import {+ GetTaskRunLogRequestSchema,type TaskRun,TaskRunLogEntry_Type,} from "@/types/proto-es/v1/rollout_service_pb";import type { Sheet } from "@/types/proto-es/v1/sheet_service_pb";-import DetailCell, { detailCellRowSpan } from "./DetailCell";-import DurationCell from "./DurationCell.vue";-import LogTimeCell from "./LogTimeCell.vue";-import StatementCell from "./StatementCell.vue";import {- type FlattenLogEntry,convertTaskRunLogEntryToFlattenLogEntries,displayTaskRunLogEntryType,+ type FlattenLogEntry,} from "./common";+import DetailCell, { detailCellRowSpan } from "./DetailCell";+import DurationCell from "./DurationCell.vue";+import LogTimeCell from "./LogTimeCell.vue";+import StatementCell from "./StatementCell.vue";const props = defineProps<{taskRun: TaskRun;diff --git a/frontend/src/components/IssueV1/components/TaskRunSection/TaskRunLogTable/common.ts b/frontend/src/components/IssueV1/components/TaskRunSection/TaskRunLogTable/common.tsindex 94d711435f..10e85771e3 100644--- a/frontend/src/components/IssueV1/components/TaskRunSection/TaskRunLogTable/common.ts+++ b/frontend/src/components/IssueV1/components/TaskRunSection/TaskRunLogTable/common.ts@@ -1,15 +1,15 @@import { t } from "@/plugins/i18n";import { getDateForPbTimestampProtoEs } from "@/types";import {- TaskRunLogEntry_Type,- type TaskRunLogEntry_SchemaDump,- type TaskRunLogEntry_TaskRunStatusUpdate,- type TaskRunLogEntry_TransactionControl,- type TaskRunLogEntry_DatabaseSync,type TaskRunLogEntry,+ type TaskRunLogEntry_ComputeDiff,+ type TaskRunLogEntry_DatabaseSync,type TaskRunLogEntry_PriorBackup,type TaskRunLogEntry_RetryInfo,- type TaskRunLogEntry_ComputeDiff,+ type TaskRunLogEntry_SchemaDump,+ type TaskRunLogEntry_TaskRunStatusUpdate,+ type TaskRunLogEntry_TransactionControl,+ TaskRunLogEntry_Type,} from "@/types/proto-es/v1/rollout_service_pb";export type FlattenLogEntry = {diff --git a/frontend/src/components/IssueV1/components/TaskRunSection/TaskRunSection.vue b/frontend/src/components/IssueV1/components/TaskRunSection/TaskRunSection.vueindex 1483a304cc..ea5092f71b 100644--- a/frontend/src/components/IssueV1/components/TaskRunSection/TaskRunSection.vue+++ b/frontend/src/components/IssueV1/components/TaskRunSection/TaskRunSection.vue@@ -10,8 +10,8 @@<script lang="ts" setup>import { computed, watchEffect } from "vue";import {- useIssueContext,taskRunListForTask,+ useIssueContext,} from "@/components/IssueV1/logic";import { useTaskRunLogStore } from "@/store/modules/v1/taskRunLog";import { TaskRun_Status } from "@/types/proto-es/v1/rollout_service_pb";diff --git a/frontend/src/components/IssueV1/components/TaskRunSection/TaskRunSession/PostgresSessionTable.vue b/frontend/src/components/IssueV1/components/TaskRunSection/TaskRunSession/PostgresSessionTable.vueindex 54c3928747..7c76bfe25e 100644--- a/frontend/src/components/IssueV1/components/TaskRunSection/TaskRunSession/PostgresSessionTable.vue+++ b/frontend/src/components/IssueV1/components/TaskRunSection/TaskRunSession/PostgresSessionTable.vue@@ -49,7 +49,7 @@<script setup lang="tsx">import { AlignHorizontalJustifyStartIcon } from "lucide-vue-next";-import { NDataTable, type DataTableColumn } from "naive-ui";+import { type DataTableColumn, NDataTable } from "naive-ui";import { computed } from "vue";import { getDateForPbTimestampProtoEs } from "@/types";import type {diff --git a/frontend/src/components/IssueV1/components/TaskRunSection/TaskRunSession/TaskRunSession.vue b/frontend/src/components/IssueV1/components/TaskRunSection/TaskRunSession/TaskRunSession.vueindex 1aef01dc4b..db8c016a07 100644--- a/frontend/src/components/IssueV1/components/TaskRunSection/TaskRunSession/TaskRunSession.vue+++ b/frontend/src/components/IssueV1/components/TaskRunSection/TaskRunSession/TaskRunSession.vue@@ -22,10 +22,10 @@ import { computed, ref } from "vue";import { BBSpin } from "@/bbkit";import { rolloutServiceClientConnect } from "@/grpcweb";import { silentContextKey } from "@/grpcweb/context-key";-import { GetTaskRunSessionRequestSchema } from "@/types/proto-es/v1/rollout_service_pb";import {- TaskRun_Status,+ GetTaskRunSessionRequestSchema,type TaskRun,+ TaskRun_Status,} from "@/types/proto-es/v1/rollout_service_pb";import PostgresSessionTable from "./PostgresSessionTable.vue";diff --git a/frontend/src/components/IssueV1/components/TaskRunSection/TaskRunTable.vue b/frontend/src/components/IssueV1/components/TaskRunSection/TaskRunTable.vueindex 34bbfeb419..30e06c6257 100644--- a/frontend/src/components/IssueV1/components/TaskRunSection/TaskRunTable.vue+++ b/frontend/src/components/IssueV1/components/TaskRunSection/TaskRunTable.vue@@ -26,7 +26,7 @@ import { create } from "@bufbuild/protobuf";import { type Duration, DurationSchema } from "@bufbuild/protobuf/wkt";import { computedAsync } from "@vueuse/core";import { last } from "lodash-es";-import { NButton, type DataTableColumn, NDataTable } from "naive-ui";+import { type DataTableColumn, NButton, NDataTable } from "naive-ui";import { computed, ref } from "vue";import { useI18n } from "vue-i18n";import HumanizeDate from "@/components/misc/HumanizeDate.vue";@@ -38,16 +38,19 @@ import {getTimeForPbTimestampProtoEs,} from "@/types";import {- TaskRun_Status,type TaskRun,+ TaskRun_Status,} from "@/types/proto-es/v1/rollout_service_pb";-import { databaseForTask } from "@/utils";-import { humanizeDurationV1, sheetNameOfTaskV1 } from "@/utils";+import {+ databaseForTask,+ humanizeDurationV1,+ sheetNameOfTaskV1,+} from "@/utils";import { useIssueContext } from "../../logic";import TaskRunComment from "./TaskRunComment.vue";import TaskRunDetail from "./TaskRunDetail.vue";-import DetailCell from "./TaskRunLogTable/DetailCell";import { convertTaskRunLogEntryToFlattenLogEntries } from "./TaskRunLogTable/common";+import DetailCell from "./TaskRunLogTable/DetailCell";import TaskRunStatusIcon from "./TaskRunStatusIcon.vue";defineOptions({diff --git a/frontend/src/components/IssueV1/logic/action/issue.ts b/frontend/src/components/IssueV1/logic/action/issue.tsindex 25dc5ee35f..52459b3c7e 100644--- a/frontend/src/components/IssueV1/logic/action/issue.ts+++ b/frontend/src/components/IssueV1/logic/action/issue.ts@@ -1,6 +1,6 @@import type { ButtonProps } from "naive-ui";import { t } from "@/plugins/i18n";-import { useCurrentUserV1, extractUserId } from "@/store";+import { extractUserId, useCurrentUserV1 } from "@/store";import type { ComposedIssue } from "@/types";import { IssueStatus } from "@/types/proto-es/v1/issue_service_pb";import { Task_Status } from "@/types/proto-es/v1/rollout_service_pb";diff --git a/frontend/src/components/IssueV1/logic/action/task.ts b/frontend/src/components/IssueV1/logic/action/task.tsindex 6550cf934a..4b34ebabf5 100644--- a/frontend/src/components/IssueV1/logic/action/task.ts+++ b/frontend/src/components/IssueV1/logic/action/task.ts@@ -4,7 +4,7 @@ import { t } from "@/plugins/i18n";import { useCurrentUserV1 } from "@/store";import { userNamePrefix } from "@/store/modules/v1/common";import type { ComposedIssue } from "@/types";-import { IssueStatus, Issue_Type } from "@/types/proto-es/v1/issue_service_pb";+import { Issue_Type, IssueStatus } from "@/types/proto-es/v1/issue_service_pb";import type { Task } from "@/types/proto-es/v1/rollout_service_pb";import { Task_Status, Task_Type } from "@/types/proto-es/v1/rollout_service_pb";import {diff --git a/frontend/src/components/IssueV1/logic/base.ts b/frontend/src/components/IssueV1/logic/base.tsindex e2355921eb..beb1eaa474 100644--- a/frontend/src/components/IssueV1/logic/base.ts+++ b/frontend/src/components/IssueV1/logic/base.ts@@ -9,13 +9,13 @@ import type { Stage, Task } from "@/types/proto-es/v1/rollout_service_pb";import {activeStageInRollout,activeTaskInStageV1,+ extractStageUID,+ extractTaskUID,flattenTaskV1List,- uidFromSlug,indexOrUIDFromSlug,stageV1Slug,taskV1Slug,- extractTaskUID,- extractStageUID,+ uidFromSlug,} from "@/utils";import type { IssueContext, IssueEvents } from "./context";import { planCheckRunListForTask } from "./plan-check";diff --git a/frontend/src/components/IssueV1/logic/context.ts b/frontend/src/components/IssueV1/logic/context.tsindex 268ce19144..91e4ec9a80 100644--- a/frontend/src/components/IssueV1/logic/context.ts+++ b/frontend/src/components/IssueV1/logic/context.ts@@ -1,6 +1,6 @@import type Emittery from "emittery";import { v4 as uuidv4 } from "uuid";-import type { InjectionKey, Ref, ComputedRef } from "vue";+import type { ComputedRef, InjectionKey, Ref } from "vue";import { inject, provide } from "vue";import type { ComposedIssue } from "@/types";import type { PlanCheckRun } from "@/types/proto-es/v1/plan_service_pb";diff --git a/frontend/src/components/IssueV1/logic/initialize/create.ts b/frontend/src/components/IssueV1/logic/initialize/create.tsindex d39d512734..e5ff7ff090 100644--- a/frontend/src/components/IssueV1/logic/initialize/create.ts+++ b/frontend/src/components/IssueV1/logic/initialize/create.ts@@ -3,9 +3,9 @@ import { reactive } from "vue";import { useRoute } from "vue-router";import {buildPlan,+ type CreatePlanParams,extractInitialSQLFromQuery,getLocalSheetByName,- type CreatePlanParams,} from "@/components/Plan";import { rolloutServiceClientConnect } from "@/grpcweb";import { useCurrentUserV1, useProjectV1Store, useSheetV1Store } from "@/store";@@ -14,16 +14,18 @@ import type { IssueType } from "@/types";import { emptyIssue, TaskTypeListWithStatement } from "@/types";import { Issue_Type, IssueStatus } from "@/types/proto-es/v1/issue_service_pb";import type { Plan } from "@/types/proto-es/v1/plan_service_pb";-import type { Stage, Rollout } from "@/types/proto-es/v1/rollout_service_pb";-import { RolloutSchema } from "@/types/proto-es/v1/rollout_service_pb";-import { PreviewRolloutRequestSchema } from "@/types/proto-es/v1/rollout_service_pb";+import type { Rollout, Stage } from "@/types/proto-es/v1/rollout_service_pb";+import {+ PreviewRolloutRequestSchema,+ RolloutSchema,+} from "@/types/proto-es/v1/rollout_service_pb";import {+ extractEnvironmentResourceName,extractProjectResourceName,extractSheetUID,getSheetStatement,hasProjectPermissionV2,sheetNameOfTaskV1,- extractEnvironmentResourceName,} from "@/utils";import { nextUID } from "../base";diff --git a/frontend/src/components/IssueV1/logic/plan-check.ts b/frontend/src/components/IssueV1/logic/plan-check.tsindex 8a5c2086f2..c688130815 100644--- a/frontend/src/components/IssueV1/logic/plan-check.ts+++ b/frontend/src/components/IssueV1/logic/plan-check.ts@@ -6,7 +6,7 @@ import type { Task } from "@/types/proto-es/v1/rollout_service_pb";import { Task_Status } from "@/types/proto-es/v1/rollout_service_pb";import { Advice_Level } from "@/types/proto-es/v1/sql_service_pb";import { databaseForTask } from "@/utils";-import { specForTask, useIssueContext, projectOfIssue } from ".";+import { projectOfIssue, specForTask, useIssueContext } from ".";export const planSpecHasPlanChecks = (spec: Plan_Spec) => {if (spec.config?.case === "createDatabaseConfig") {diff --git a/frontend/src/components/IssueV1/logic/poll.ts b/frontend/src/components/IssueV1/logic/poll.tsindex 6f18b06f85..b4bde35ece 100644--- a/frontend/src/components/IssueV1/logic/poll.ts+++ b/frontend/src/components/IssueV1/logic/poll.ts@@ -15,8 +15,7 @@ import {} from "@/types/proto-es/v1/common_pb";import { IssueStatus } from "@/types/proto-es/v1/issue_service_pb";import { Task_Type } from "@/types/proto-es/v1/rollout_service_pb";-import { databaseForTask } from "@/utils";-import { extractIssueUID, flattenTaskV1List } from "@/utils";+import { databaseForTask, extractIssueUID, flattenTaskV1List } from "@/utils";import { useIssueContext } from "./context";import { projectOfIssue } from "./utils";diff --git a/frontend/src/components/IssueV1/logic/releaser.ts b/frontend/src/components/IssueV1/logic/releaser.tsindex f7194079ae..417a5388ce 100644--- a/frontend/src/components/IssueV1/logic/releaser.ts+++ b/frontend/src/components/IssueV1/logic/releaser.ts@@ -1,6 +1,6 @@import { uniq } from "lodash-es";import { useProjectIamPolicyStore } from "@/store";-import { userNamePrefix, roleNamePrefix } from "@/store/modules/v1/common";+import { roleNamePrefix, userNamePrefix } from "@/store/modules/v1/common";import type { ComposedIssue } from "@/types";import { memberMapToRolesInProjectIAM } from "@/utils";import { projectOfIssue } from "./utils";diff --git a/frontend/src/components/IssueV1/logic/utils.ts b/frontend/src/components/IssueV1/logic/utils.tsindex 445f480e6c..0cf97b98b5 100644--- a/frontend/src/components/IssueV1/logic/utils.ts+++ b/frontend/src/components/IssueV1/logic/utils.ts@@ -7,16 +7,16 @@ import {useProjectV1Store,} from "@/store";import {+ type ComposedDatabase,+ type ComposedIssue,isValidDatabaseName,isValidInstanceName,unknownDatabase,unknownInstance,- type ComposedDatabase,- type ComposedIssue,} from "@/types";import { State } from "@/types/proto-es/v1/common_pb";import { InstanceResourceSchema } from "@/types/proto-es/v1/instance_service_pb";-import { IssueStatus, type Issue } from "@/types/proto-es/v1/issue_service_pb";+import { type Issue, IssueStatus } from "@/types/proto-es/v1/issue_service_pb";import type { Plan } from "@/types/proto-es/v1/plan_service_pb";import type { Project } from "@/types/proto-es/v1/project_service_pb";import type { Task } from "@/types/proto-es/v1/rollout_service_pb";diff --git a/frontend/src/components/LabelEditorDrawer.vue b/frontend/src/components/LabelEditorDrawer.vueindex 92b452ede2..7508adb93a 100644--- a/frontend/src/components/LabelEditorDrawer.vue+++ b/frontend/src/components/LabelEditorDrawer.vue@@ -32,9 +32,9 @@</template><script lang="ts" setup>-import { isEqual, cloneDeep } from "lodash-es";+import { cloneDeep, isEqual } from "lodash-es";import { NButton } from "naive-ui";-import { computed, reactive, watch, ref } from "vue";+import { computed, reactive, ref, watch } from "vue";import { useI18n } from "vue-i18n";import { BBAttention } from "@/bbkit";import { LabelListEditor } from "@/components/Label";diff --git a/frontend/src/components/MarkdownEditor/MarkdownEditor.vue b/frontend/src/components/MarkdownEditor/MarkdownEditor.vueindex 6b538c3cb6..cff8ac71a4 100644--- a/frontend/src/components/MarkdownEditor/MarkdownEditor.vue+++ b/frontend/src/components/MarkdownEditor/MarkdownEditor.vue@@ -89,20 +89,19 @@<script lang="ts" setup>import { useDebounceFn } from "@vueuse/core";import {+ BoldIcon,CodeIcon,- LinkIcon,HashIcon,- BoldIcon,HeadingIcon,+ LinkIcon,} from "lucide-vue-next";-import { NButton, NTooltip, NTabs, NTab, NScrollbar } from "naive-ui";-import { nextTick, ref, reactive, watch, toRef, onMounted } from "vue";+import { NButton, NScrollbar, NTab, NTabs, NTooltip } from "naive-ui";import type { Component } from "vue";+import { nextTick, onMounted, reactive, ref, toRef, watch } from "vue";import { useI18n } from "vue-i18n";import { HighlightLabelText } from "@/components/v2";import { useIssueV1Store } from "@/store";-import { type ComposedIssue } from "@/types";-import { DEBOUNCE_SEARCH_DELAY } from "@/types";+import { type ComposedIssue, DEBOUNCE_SEARCH_DELAY } from "@/types";import type { Project } from "@/types/proto-es/v1/project_service_pb";import { Task_Status } from "@/types/proto-es/v1/rollout_service_pb";import {diff --git a/frontend/src/components/Member/MemberDataTable/cells/UserNameCell.vue b/frontend/src/components/Member/MemberDataTable/cells/UserNameCell.vueindex 516ea1aebd..6903f37455 100644--- a/frontend/src/components/Member/MemberDataTable/cells/UserNameCell.vue+++ b/frontend/src/components/Member/MemberDataTable/cells/UserNameCell.vue@@ -55,13 +55,12 @@<script lang="ts" setup>import { NTag } from "naive-ui";import { computed } from "vue";-import UserAvatar from "@/components/User/UserAvatar.vue";import ServiceAccountTag from "@/components/misc/ServiceAccountTag.vue";import SystemBotTag from "@/components/misc/SystemBotTag.vue";import YouTag from "@/components/misc/YouTag.vue";+import UserAvatar from "@/components/User/UserAvatar.vue";import { useCurrentUserV1, usePermissionStore } from "@/store";-import { SYSTEM_BOT_USER_NAME } from "@/types";-import { unknownUser } from "@/types";+import { SYSTEM_BOT_USER_NAME, unknownUser } from "@/types";import { State } from "@/types/proto-es/v1/common_pb";import type { User } from "@/types/proto-es/v1/user_service_pb";import { UserType } from "@/types/proto-es/v1/user_service_pb";diff --git a/frontend/src/components/Member/MemberDataTable/cells/UserOperationsCell.vue b/frontend/src/components/Member/MemberDataTable/cells/UserOperationsCell.vueindex 4b2c2c8f7a..81fa5ad258 100644--- a/frontend/src/components/Member/MemberDataTable/cells/UserOperationsCell.vue+++ b/frontend/src/components/Member/MemberDataTable/cells/UserOperationsCell.vue@@ -42,7 +42,7 @@import { PencilIcon, Trash2Icon } from "lucide-vue-next";import { NButton, NPopconfirm } from "naive-ui";import { computed } from "vue";-import { unknownUser, SYSTEM_BOT_USER_NAME } from "@/types";+import { SYSTEM_BOT_USER_NAME, unknownUser } from "@/types";import { State } from "@/types/proto-es/v1/common_pb";import type { MemberBinding } from "../../types";diff --git a/frontend/src/components/Member/MemberDataTable/cells/UserRolesCell.vue b/frontend/src/components/Member/MemberDataTable/cells/UserRolesCell.vueindex 05abe5b373..0d074a17e0 100644--- a/frontend/src/components/Member/MemberDataTable/cells/UserRolesCell.vue+++ b/frontend/src/components/Member/MemberDataTable/cells/UserRolesCell.vue@@ -27,7 +27,7 @@ import { Building2Icon } from "lucide-vue-next";import { NTag, NTooltip } from "naive-ui";import { computed } from "vue";import type { Binding } from "@/types/proto-es/v1/iam_policy_pb";-import { displayRoleTitle, sortRoles, isBindingPolicyExpired } from "@/utils";+import { displayRoleTitle, isBindingPolicyExpired, sortRoles } from "@/utils";import type { MemberRole } from "../../types";const props = defineProps<{diff --git a/frontend/src/components/Member/MemberDataTable/index.vue b/frontend/src/components/Member/MemberDataTable/index.vueindex 8127fc64a0..29f5d4547b 100644--- a/frontend/src/components/Member/MemberDataTable/index.vue+++ b/frontend/src/components/Member/MemberDataTable/index.vue@@ -19,8 +19,8 @@import { orderBy } from "lodash-es";import type {DataTableColumn,- DataTableRowKey,DataTableRowData,+ DataTableRowKey,} from "naive-ui";import { NDataTable } from "naive-ui";import { computed, h, ref } from "vue";diff --git a/frontend/src/components/Member/MemberDataTableByRole.vue b/frontend/src/components/Member/MemberDataTableByRole.vueindex 315ca3868d..2f60ee154b 100644--- a/frontend/src/components/Member/MemberDataTableByRole.vue+++ b/frontend/src/components/Member/MemberDataTableByRole.vue@@ -14,7 +14,7 @@import { orderBy } from "lodash-es";import { Building2Icon, Trash2Icon } from "lucide-vue-next";import type { DataTableColumn } from "naive-ui";-import { NDataTable, NTooltip, NPopconfirm } from "naive-ui";+import { NDataTable, NPopconfirm, NTooltip } from "naive-ui";import { computed } from "vue";import { useI18n } from "vue-i18n";import GroupNameCell from "@/components/User/Settings/UserDataTableByGroup/cells/GroupNameCell.vue";diff --git a/frontend/src/components/Member/MembersBindingSelect.vue b/frontend/src/components/Member/MembersBindingSelect.vueindex e9f3835017..a46a8ce76a 100644--- a/frontend/src/components/Member/MembersBindingSelect.vue+++ b/frontend/src/components/Member/MembersBindingSelect.vue@@ -79,14 +79,14 @@ import RequiredStar from "@/components/RequiredStar.vue";import { GroupSelect, UserSelect } from "@/components/v2";import {extractGroupEmail,- useUserStore,- useGroupStore,extractUserId,+ useGroupStore,+ useUserStore,} from "@/store";import { groupNamePrefix } from "@/store/modules/v1/common";import {- getUserEmailInBinding,getGroupEmailInBinding,+ getUserEmailInBinding,groupBindingPrefix,} from "@/types";diff --git a/frontend/src/components/Member/utils.ts b/frontend/src/components/Member/utils.tsindex 69142796f5..2e215b035b 100644--- a/frontend/src/components/Member/utils.ts+++ b/frontend/src/components/Member/utils.ts@@ -3,21 +3,20 @@ import { orderBy } from "lodash-es";import { extractGroupEmail, useGroupStore, useUserStore } from "@/store";import {extractUserId,- userNamePrefix,groupNamePrefix,+ userNamePrefix,} from "@/store/modules/v1/common";import {- getUserEmailInBinding,getGroupEmailInBinding,+ getUserEmailInBinding,groupBindingPrefix,} from "@/types";import { State } from "@/types/proto-es/v1/common_pb";import { GroupSchema } from "@/types/proto-es/v1/group_service_pb";import type { IamPolicy } from "@/types/proto-es/v1/iam_policy_pb";-import { UserSchema } from "@/types/proto-es/v1/user_service_pb";import type { User } from "@/types/proto-es/v1/user_service_pb";-import { UserType } from "@/types/proto-es/v1/user_service_pb";-import type { MemberBinding, GroupBinding } from "./types";+import { UserSchema, UserType } from "@/types/proto-es/v1/user_service_pb";+import type { GroupBinding, MemberBinding } from "./types";const getMemberBinding = async (member: string,diff --git a/frontend/src/components/MonacoEditor/DiffEditor.vue b/frontend/src/components/MonacoEditor/DiffEditor.vueindex 4c085d1263..e04924b0c9 100644--- a/frontend/src/components/MonacoEditor/DiffEditor.vue+++ b/frontend/src/components/MonacoEditor/DiffEditor.vue@@ -13,14 +13,14 @@import * as monaco from "monaco-editor";import { v4 as uuidv4 } from "uuid";import {+ computed,+ nextTick,+ onBeforeUnmount,onMounted,ref,+ shallowRef,toRef,- nextTick,watch,- shallowRef,- onBeforeUnmount,- computed,} from "vue";import { BBSpin } from "@/bbkit";import type { Language } from "@/types";diff --git a/frontend/src/components/MonacoEditor/MonacoEditor.vue b/frontend/src/components/MonacoEditor/MonacoEditor.vueindex 63bc321244..0be153b539 100644--- a/frontend/src/components/MonacoEditor/MonacoEditor.vue+++ b/frontend/src/components/MonacoEditor/MonacoEditor.vue@@ -18,7 +18,7 @@<script setup lang="ts">import { v4 as uuidv4 } from "uuid";-import { computed, toRef, ref } from "vue";+import { computed, ref, toRef } from "vue";import type { Language } from "@/types";import MonacoTextModelEditor from "./MonacoTextModelEditor.vue";import { useMonacoTextModel } from "./text-model";diff --git a/frontend/src/components/MonacoEditor/MonacoTextModelEditor.vue b/frontend/src/components/MonacoEditor/MonacoTextModelEditor.vueindex 62dfe0092f..9f4155d298 100644--- a/frontend/src/components/MonacoEditor/MonacoTextModelEditor.vue+++ b/frontend/src/components/MonacoEditor/MonacoTextModelEditor.vue@@ -56,36 +56,36 @@ import { throttle } from "lodash-es";import * as monaco from "monaco-editor";import { NPopover } from "naive-ui";import {+ computed,+ nextTick,+ onBeforeUnmount,onMounted,ref,- toRef,- nextTick,shallowRef,- onBeforeUnmount,+ toRef,watch,- computed,} from "vue";import { BBSpin } from "@/bbkit";import type { SQLDialect } from "@/types";import {type AutoCompleteContext,type AutoHeightOptions,+ type FormatContentOptions,+ useActiveRangeByCursor,useAdvices,useAutoComplete,useAutoHeight,useContent,+ useDecoration,useFormatContent,+ useLineHighlights,+ useLSPConnectionState,useModel,useOptionByKey,useOptions,+ useOverrideSuggestIcons,useSelectedContent,useSelection,- useLineHighlights,- useLSPConnectionState,- useOverrideSuggestIcons,- type FormatContentOptions,- useActiveRangeByCursor,- useDecoration,} from "./composables";import { createMonacoEditor } from "./editor";import type {diff --git a/frontend/src/components/MonacoEditor/WrappedMonacoEditor.vue b/frontend/src/components/MonacoEditor/WrappedMonacoEditor.vueindex 828e7cee5a..972566d248 100644--- a/frontend/src/components/MonacoEditor/WrappedMonacoEditor.vue+++ b/frontend/src/components/MonacoEditor/WrappedMonacoEditor.vue@@ -11,8 +11,7 @@<script setup lang="ts">import { useParentElement } from "@vueuse/core";-import { defineAsyncComponent, ref } from "vue";-import { computed } from "vue";+import { computed, defineAsyncComponent, ref } from "vue";import { BBSpin } from "@/bbkit";const MonacoEditor = defineAsyncComponent(() => import("./MonacoEditor.vue"));diff --git a/frontend/src/components/MonacoEditor/composables/useDecoration.ts b/frontend/src/components/MonacoEditor/composables/useDecoration.tsindex 30eb3e3d1b..20199735d4 100644--- a/frontend/src/components/MonacoEditor/composables/useDecoration.ts+++ b/frontend/src/components/MonacoEditor/composables/useDecoration.ts@@ -1,5 +1,5 @@import * as monaco from "monaco-editor";-import { computed, ref, watch, type Ref, type ShallowRef } from "vue";+import { computed, type Ref, ref, type ShallowRef, watch } from "vue";import type { MonacoModule } from "../types";export const useDecoration = (diff --git a/frontend/src/components/MonacoEditor/utils.ts b/frontend/src/components/MonacoEditor/utils.tsindex 3b7665b92d..f4063c5824 100644--- a/frontend/src/components/MonacoEditor/utils.ts+++ b/frontend/src/components/MonacoEditor/utils.ts@@ -1,6 +1,5 @@import { Range } from "monaco-editor";-import { isRef, unref, watch } from "vue";-import { h } from "vue";+import { h, isRef, unref, watch } from "vue";import { t } from "@/plugins/i18n";import { pushNotification } from "@/store";import type { Language, MaybeRef, SQLDialect } from "@/types";diff --git a/frontend/src/components/PasswordSigninForm.vue b/frontend/src/components/PasswordSigninForm.vueindex 79eb167f2a..c0ca2166dd 100644--- a/frontend/src/components/PasswordSigninForm.vue+++ b/frontend/src/components/PasswordSigninForm.vue@@ -88,11 +88,11 @@ import { create } from "@bufbuild/protobuf";import { EyeIcon, EyeOffIcon } from "lucide-vue-next";import { NButton } from "naive-ui";import { storeToRefs } from "pinia";-import { computed, reactive, onMounted } from "vue";+import { computed, onMounted, reactive } from "vue";import { useRoute } from "vue-router";import { BBTextField } from "@/bbkit";import RequiredStar from "@/components/RequiredStar.vue";-import { useAuthStore, useActuatorV1Store } from "@/store";+import { useActuatorV1Store, useAuthStore } from "@/store";import { LoginRequestSchema } from "@/types/proto-es/v1/auth_service_pb";interface LocalState {diff --git a/frontend/src/components/Plan/components/AddSpecDrawer.vue b/frontend/src/components/Plan/components/AddSpecDrawer.vueindex d5fa3d21d1..d64e382d94 100644--- a/frontend/src/components/Plan/components/AddSpecDrawer.vue+++ b/frontend/src/components/Plan/components/AddSpecDrawer.vue@@ -134,30 +134,30 @@<script setup lang="ts">import { create as createProto } from "@bufbuild/protobuf";-import { FileDiffIcon, EditIcon } from "lucide-vue-next";+import { EditIcon, FileDiffIcon } from "lucide-vue-next";import {NButton,NRadio,NRadioGroup,- NSteps,NStep,+ NSteps,useDialog,} from "naive-ui";import { v4 as uuidv4 } from "uuid";import type { Ref } from "vue";import { computed, reactive, ref, watch } from "vue";import { useI18n } from "vue-i18n";-import { useRouter } from "vue-router";import type { LocationQueryRaw } from "vue-router";-import DatabaseAndGroupSelector from "@/components/DatabaseAndGroupSelector";+import { useRouter } from "vue-router";import type { DatabaseSelectState } from "@/components/DatabaseAndGroupSelector";+import DatabaseAndGroupSelector from "@/components/DatabaseAndGroupSelector";import { getLocalSheetByName, getNextLocalSheetUID } from "@/components/Plan";import { Drawer, DrawerContent } from "@/components/v2";import { PROJECT_V1_ROUTE_ISSUE_DETAIL } from "@/router/dashboard/projectV1";import {- useCurrentProjectV1,batchGetOrFetchDatabases,pushNotification,+ useCurrentProjectV1,useDatabaseV1Store,} from "@/store";import type { ComposedDatabase } from "@/types";@@ -167,8 +167,8 @@ import {} from "@/types/proto-es/v1/common_pb";import {Plan_ChangeDatabaseConfigSchema,- Plan_SpecSchema,type Plan_Spec,+ Plan_SpecSchema,} from "@/types/proto-es/v1/plan_service_pb";import { extractProjectResourceName, generateIssueTitle } from "@/utils";diff --git a/frontend/src/components/Plan/components/BannerSection/BannerSection.vue b/frontend/src/components/Plan/components/BannerSection/BannerSection.vueindex 543bdbe2ff..257a9505e4 100644--- a/frontend/src/components/Plan/components/BannerSection/BannerSection.vue+++ b/frontend/src/components/Plan/components/BannerSection/BannerSection.vue@@ -41,9 +41,9 @@ import { usePlanContext } from "@/components/Plan";import { PROJECT_V1_ROUTE_ROLLOUT_DETAIL } from "@/router/dashboard/projectV1";import { State } from "@/types/proto-es/v1/common_pb";import {- IssueStatus,Issue_ApprovalStatus,Issue_Type,+ IssueStatus,} from "@/types/proto-es/v1/issue_service_pb";import { Task_Status, Task_Type } from "@/types/proto-es/v1/rollout_service_pb";import {diff --git a/frontend/src/components/Plan/components/ChecksView/ChecksView.vue b/frontend/src/components/Plan/components/ChecksView/ChecksView.vueindex 959c2d6020..e71c42d802 100644--- a/frontend/src/components/Plan/components/ChecksView/ChecksView.vue+++ b/frontend/src/components/Plan/components/ChecksView/ChecksView.vue@@ -128,24 +128,24 @@import { create } from "@bufbuild/protobuf";import type { Timestamp } from "@bufbuild/protobuf/wkt";import {+ AlertCircleIcon,CheckCircleIcon,- FileCodeIcon,+ CircleQuestionMarkIcon,DatabaseIcon,- ShieldIcon,+ FileCodeIcon,SearchCodeIcon,- CircleQuestionMarkIcon,+ ShieldIcon,XCircleIcon,- AlertCircleIcon,} from "lucide-vue-next";import { NTooltip } from "naive-ui";import { computed, ref } from "vue";import { useI18n } from "vue-i18n";import { BBSpin } from "@/bbkit";import {- PlanCheckRun_Status,- PlanCheckRun_Type,type PlanCheckRun,PlanCheckRun_ResultSchema,+ PlanCheckRun_Status,+ PlanCheckRun_Type,} from "@/types/proto-es/v1/plan_service_pb";import { Advice_Level } from "@/types/proto-es/v1/sql_service_pb";import { humanizeTs } from "@/utils";diff --git a/frontend/src/components/Plan/components/Configuration/GhostSection/GhostFlagsPanel.vue b/frontend/src/components/Plan/components/Configuration/GhostSection/GhostFlagsPanel.vueindex 10444310ce..5219790efb 100644--- a/frontend/src/components/Plan/components/Configuration/GhostSection/GhostFlagsPanel.vue+++ b/frontend/src/components/Plan/components/Configuration/GhostSection/GhostFlagsPanel.vue@@ -47,8 +47,8 @@ import { Drawer, DrawerContent } from "@/components/v2";import { planServiceClientConnect } from "@/grpcweb";import { pushNotification } from "@/store";import { UpdatePlanRequestSchema } from "@/types/proto-es/v1/plan_service_pb";-import FlagsForm from "./FlagsForm";import { useGhostSettingContext } from "./context";+import FlagsForm from "./FlagsForm";defineProps<{show: boolean;diff --git a/frontend/src/components/Plan/components/Configuration/GhostSection/GhostSection.vue b/frontend/src/components/Plan/components/Configuration/GhostSection/GhostSection.vueindex 18dd68f760..462a13e30b 100644--- a/frontend/src/components/Plan/components/Configuration/GhostSection/GhostSection.vue+++ b/frontend/src/components/Plan/components/Configuration/GhostSection/GhostSection.vue@@ -57,9 +57,9 @@ import { WrenchIcon } from "lucide-vue-next";import { NButton, NTooltip } from "naive-ui";import { ref } from "vue";import LearnMoreLink from "@/components/LearnMoreLink.vue";+import { useGhostSettingContext } from "./context";import GhostFlagsPanel from "./GhostFlagsPanel.vue";import GhostSwitch from "./GhostSwitch.vue";-import { useGhostSettingContext } from "./context";const showFlagsPanel = ref(false);diff --git a/frontend/src/components/Plan/components/Configuration/GhostSection/GhostSwitch.vue b/frontend/src/components/Plan/components/Configuration/GhostSection/GhostSwitch.vueindex eac764dc37..c35fa8d91a 100644--- a/frontend/src/components/Plan/components/Configuration/GhostSection/GhostSwitch.vue+++ b/frontend/src/components/Plan/components/Configuration/GhostSection/GhostSwitch.vue@@ -32,9 +32,9 @@ import { NSwitch, NTooltip } from "naive-ui";import { computed } from "vue";import { useI18n } from "vue-i18n";import LearnMoreLink from "@/components/LearnMoreLink.vue";-import { targetsForSpec } from "@/components/Plan/logic";import type { ErrorItem } from "@/components/misc/ErrorList.vue";import { default as ErrorList } from "@/components/misc/ErrorList.vue";+import { targetsForSpec } from "@/components/Plan/logic";import { planServiceClientConnect } from "@/grpcweb";import { pushNotification } from "@/store";import { MigrationType } from "@/types/proto-es/v1/common_pb";diff --git a/frontend/src/components/Plan/components/Configuration/GhostSection/common.ts b/frontend/src/components/Plan/components/Configuration/GhostSection/common.tsindex 1e43e1743b..d6793f7ecb 100644--- a/frontend/src/components/Plan/components/Configuration/GhostSection/common.ts+++ b/frontend/src/components/Plan/components/Configuration/GhostSection/common.ts@@ -1,8 +1,8 @@import { isDBGroupChangeSpec } from "@/components/Plan/logic";import type { ComposedDatabase } from "@/types";-import { Engine } from "@/types/proto-es/v1/common_pb";import {DatabaseChangeType,+ Engine,MigrationType,} from "@/types/proto-es/v1/common_pb";import { type Plan_Spec } from "@/types/proto-es/v1/plan_service_pb";diff --git a/frontend/src/components/Plan/components/Configuration/GhostSection/context.ts b/frontend/src/components/Plan/components/Configuration/GhostSection/context.tsindex 3b94e7eca9..5c3d913b35 100644--- a/frontend/src/components/Plan/components/Configuration/GhostSection/context.ts+++ b/frontend/src/components/Plan/components/Configuration/GhostSection/context.ts@@ -2,13 +2,13 @@ import Emittery from "emittery";import type { InjectionKey, Ref } from "vue";import { computed, inject, provide, unref } from "vue";import { targetsForSpec } from "@/components/Plan/logic";-import { useCurrentUserV1, extractUserId, useDatabaseV1Store } from "@/store";+import { extractUserId, useCurrentUserV1, useDatabaseV1Store } from "@/store";import { isValidDatabaseName } from "@/types";import type { Issue } from "@/types/proto-es/v1/issue_service_pb";import { IssueStatus } from "@/types/proto-es/v1/issue_service_pb";import type { Plan, Plan_Spec } from "@/types/proto-es/v1/plan_service_pb";import type { Project } from "@/types/proto-es/v1/project_service_pb";-import type { Task, Rollout } from "@/types/proto-es/v1/rollout_service_pb";+import type { Rollout, Task } from "@/types/proto-es/v1/rollout_service_pb";import { Task_Status } from "@/types/proto-es/v1/rollout_service_pb";import {flattenTaskV1List,@@ -17,8 +17,8 @@ import {} from "@/utils";import {allowGhostForSpec,- getGhostEnabledForSpec,GHOST_AVAILABLE_ENGINES,+ getGhostEnabledForSpec,} from "./common";export const KEY = Symbol(diff --git a/frontend/src/components/Plan/components/Configuration/InstanceRoleSection/InstanceRoleSelect.vue b/frontend/src/components/Plan/components/Configuration/InstanceRoleSection/InstanceRoleSelect.vueindex e4ecc1b125..e090894066 100644--- a/frontend/src/components/Plan/components/Configuration/InstanceRoleSection/InstanceRoleSelect.vue+++ b/frontend/src/components/Plan/components/Configuration/InstanceRoleSection/InstanceRoleSelect.vue@@ -20,8 +20,8 @@ import { create } from "@bufbuild/protobuf";import { NSelect, type SelectOption } from "naive-ui";import { computed, nextTick, ref, watch } from "vue";import {- usePlanContext,updateSpecSheetWithStatement,+ usePlanContext,} from "@/components/Plan/logic";import { instanceRoleServiceClientConnect } from "@/grpcweb";import { DEFAULT_PAGE_SIZE } from "@/store/modules/common";diff --git a/frontend/src/components/Plan/components/Configuration/IsolationLevelSection/IsolationLevelSection.vue b/frontend/src/components/Plan/components/Configuration/IsolationLevelSection/IsolationLevelSection.vueindex 059d9b05c5..87b9504ee0 100644--- a/frontend/src/components/Plan/components/Configuration/IsolationLevelSection/IsolationLevelSection.vue+++ b/frontend/src/components/Plan/components/Configuration/IsolationLevelSection/IsolationLevelSection.vue@@ -28,8 +28,8 @@import { NTooltip } from "naive-ui";import { computed } from "vue";import { useTransactionModeSettingContext } from "../TransactionModeSection/context";-import IsolationLevelSelect from "./IsolationLevelSelect.vue";import { useIsolationLevelSettingContext } from "./context";+import IsolationLevelSelect from "./IsolationLevelSelect.vue";// Check if isolation level section should be shown based on contextconst { shouldShow } = useIsolationLevelSettingContext();diff --git a/frontend/src/components/Plan/components/Configuration/IsolationLevelSection/IsolationLevelSelect.vue b/frontend/src/components/Plan/components/Configuration/IsolationLevelSection/IsolationLevelSelect.vueindex a096fe5460..9830a70910 100644--- a/frontend/src/components/Plan/components/Configuration/IsolationLevelSection/IsolationLevelSelect.vue+++ b/frontend/src/components/Plan/components/Configuration/IsolationLevelSection/IsolationLevelSelect.vue@@ -15,15 +15,15 @@import { NSelect, type SelectOption } from "naive-ui";import { computed, nextTick, ref, watch } from "vue";import {- usePlanContext,updateSpecSheetWithStatement,+ usePlanContext,} from "@/components/Plan/logic";import { setSheetStatement } from "@/utils";import { useSelectedSpec } from "../../SpecDetailView/context";import {+ type IsolationLevel,parseStatement,updateIsolationLevel,- type IsolationLevel,} from "../../StatementSection/directiveUtils";import { useSpecSheet } from "../../StatementSection/useSpecSheet";import { useIsolationLevelSettingContext } from "./context";diff --git a/frontend/src/components/Plan/components/Configuration/PreBackupSection/PreBackupSwitch.vue b/frontend/src/components/Plan/components/Configuration/PreBackupSection/PreBackupSwitch.vueindex 583fd7ab7b..689d7ba57f 100644--- a/frontend/src/components/Plan/components/Configuration/PreBackupSection/PreBackupSwitch.vue+++ b/frontend/src/components/Plan/components/Configuration/PreBackupSection/PreBackupSwitch.vue@@ -30,9 +30,9 @@ import { NSwitch, NTooltip } from "naive-ui";import { computed } from "vue";import { useI18n } from "vue-i18n";import LearnMoreLink from "@/components/LearnMoreLink.vue";-import { targetsForSpec } from "@/components/Plan/logic";import type { ErrorItem } from "@/components/misc/ErrorList.vue";import ErrorList from "@/components/misc/ErrorList.vue";+import { targetsForSpec } from "@/components/Plan/logic";import { pushNotification } from "@/store";import {PRE_BACKUP_AVAILABLE_ENGINES,diff --git a/frontend/src/components/Plan/components/Configuration/PreBackupSection/context.ts b/frontend/src/components/Plan/components/Configuration/PreBackupSection/context.tsindex 97c7e54de6..a8aa9ca86f 100644--- a/frontend/src/components/Plan/components/Configuration/PreBackupSection/context.ts+++ b/frontend/src/components/Plan/components/Configuration/PreBackupSection/context.ts@@ -3,29 +3,29 @@ import Emittery from "emittery";import { cloneDeep } from "lodash-es";import {computed,+ type InjectionKey,inject,provide,- unref,- type InjectionKey,type Ref,+ unref,} from "vue";import { isDatabaseChangeSpec, targetsForSpec } from "@/components/Plan/logic";import { planServiceClientConnect } from "@/grpcweb";-import { useCurrentUserV1, extractUserId, useDatabaseV1Store } from "@/store";+import { extractUserId, useCurrentUserV1, useDatabaseV1Store } from "@/store";import { isValidDatabaseName } from "@/types";import {DatabaseChangeType,Engine,MigrationType,} from "@/types/proto-es/v1/common_pb";-import { IssueStatus, type Issue } from "@/types/proto-es/v1/issue_service_pb";+import { type Issue, IssueStatus } from "@/types/proto-es/v1/issue_service_pb";import {- UpdatePlanRequestSchema,type Plan,type Plan_Spec,+ UpdatePlanRequestSchema,} from "@/types/proto-es/v1/plan_service_pb";import type { Project } from "@/types/proto-es/v1/project_service_pb";-import type { Task, Rollout } from "@/types/proto-es/v1/rollout_service_pb";+import type { Rollout, Task } from "@/types/proto-es/v1/rollout_service_pb";import { Task_Status } from "@/types/proto-es/v1/rollout_service_pb";import { flattenTaskV1List, hasProjectPermissionV2 } from "@/utils";import { BACKUP_AVAILABLE_ENGINES } from "./common";diff --git a/frontend/src/components/Plan/components/Configuration/TransactionModeSection/TransactionModeSection.vue b/frontend/src/components/Plan/components/Configuration/TransactionModeSection/TransactionModeSection.vueindex e108c5da62..73a28df16d 100644--- a/frontend/src/components/Plan/components/Configuration/TransactionModeSection/TransactionModeSection.vue+++ b/frontend/src/components/Plan/components/Configuration/TransactionModeSection/TransactionModeSection.vue@@ -31,8 +31,8 @@<script lang="ts" setup>import { NTooltip } from "naive-ui";-import TransactionModeSwitch from "./TransactionModeSwitch.vue";import { useTransactionModeSettingContext } from "./context";+import TransactionModeSwitch from "./TransactionModeSwitch.vue";const { transactionMode } = useTransactionModeSettingContext();</script>diff --git a/frontend/src/components/Plan/components/Configuration/TransactionModeSection/TransactionModeSwitch.vue b/frontend/src/components/Plan/components/Configuration/TransactionModeSection/TransactionModeSwitch.vueindex a93f276a34..e44bd6d86a 100644--- a/frontend/src/components/Plan/components/Configuration/TransactionModeSection/TransactionModeSwitch.vue+++ b/frontend/src/components/Plan/components/Configuration/TransactionModeSection/TransactionModeSwitch.vue@@ -10,8 +10,8 @@import { NSwitch } from "naive-ui";import { computed, nextTick, ref, watch } from "vue";import {- usePlanContext,updateSpecSheetWithStatement,+ usePlanContext,} from "@/components/Plan/logic";import { getDefaultTransactionMode, setSheetStatement } from "@/utils";import { useSelectedSpec } from "../../SpecDetailView/context";diff --git a/frontend/src/components/Plan/components/ExportOption/ExportFormatSelector.vue b/frontend/src/components/Plan/components/ExportOption/ExportFormatSelector.vueindex 3ae99a1594..26ed17efcd 100644--- a/frontend/src/components/Plan/components/ExportOption/ExportFormatSelector.vue+++ b/frontend/src/components/Plan/components/ExportOption/ExportFormatSelector.vue@@ -15,9 +15,8 @@</template><script setup lang="ts">-import { NRadioGroup, NRadio } from "naive-ui";-import { computed } from "vue";-import { onMounted } from "vue";+import { NRadio, NRadioGroup } from "naive-ui";+import { computed, onMounted } from "vue";import { ExportFormat } from "@/types/proto-es/v1/common_pb";import { exportFormatToString } from "@/utils/v1/common-conversions";diff --git a/frontend/src/components/Plan/components/ExportOption/ExportPasswordInputer.vue b/frontend/src/components/Plan/components/ExportOption/ExportPasswordInputer.vueindex dab69b51ad..e20883ab5a 100644--- a/frontend/src/components/Plan/components/ExportOption/ExportPasswordInputer.vue+++ b/frontend/src/components/Plan/components/ExportOption/ExportPasswordInputer.vue@@ -29,8 +29,8 @@</template><script setup lang="ts">-import { NSwitch, NInput } from "naive-ui";-import { watch, ref } from "vue";+import { NInput, NSwitch } from "naive-ui";+import { ref, watch } from "vue";import RequiredStar from "@/components/RequiredStar.vue";const props = defineProps<{diff --git a/frontend/src/components/Plan/components/HeaderSection/Actions/Actions.vue b/frontend/src/components/Plan/components/HeaderSection/Actions/Actions.vueindex 748a165b21..d037912c3a 100644--- a/frontend/src/components/Plan/components/HeaderSection/Actions/Actions.vue+++ b/frontend/src/components/Plan/components/HeaderSection/Actions/Actions.vue@@ -48,7 +48,7 @@ import { computed, nextTick, ref } from "vue";import { useI18n } from "vue-i18n";import { useRouter } from "vue-router";import { useSpecsValidation } from "@/components/Plan/components/common";-import { usePlanContext, usePlanCheckStatus } from "@/components/Plan/logic";+import { usePlanCheckStatus, usePlanContext } from "@/components/Plan/logic";import { useResourcePoller } from "@/components/Plan/logic/poller";import { useEditorState } from "@/components/Plan/logic/useEditorState";import {@@ -57,45 +57,48 @@ import {} from "@/grpcweb";import { PROJECT_V1_ROUTE_ISSUE_DETAIL_V1 } from "@/router/dashboard/projectV1";import {- useCurrentUserV1,candidatesOfApprovalStepV1,extractUserId,- useCurrentProjectV1,pushNotification,+ useCurrentProjectV1,+ useCurrentUserV1,} from "@/store";import { usePlanStore } from "@/store/modules/v1/plan";import { State } from "@/types/proto-es/v1/common_pb";import {CreateIssueRequestSchema,- IssueSchema,- IssueStatus,- Issue_Approver_Status,Issue_ApprovalStatus,+ Issue_Approver_Status,Issue_Type,+ IssueSchema,+ IssueStatus,} from "@/types/proto-es/v1/issue_service_pb";import type { Plan, Plan_Spec } from "@/types/proto-es/v1/plan_service_pb";-import { CreateRolloutRequestSchema } from "@/types/proto-es/v1/rollout_service_pb";-import { Task_Type, Task_Status } from "@/types/proto-es/v1/rollout_service_pb";+import {+ CreateRolloutRequestSchema,+ Task_Status,+ Task_Type,+} from "@/types/proto-es/v1/rollout_service_pb";import { Advice_Level } from "@/types/proto-es/v1/sql_service_pb";import {- isUserIncludedInList,- hasProjectPermissionV2,- extractProjectResourceName,extractIssueUID,- isValidPlanName,+ extractProjectResourceName,+ hasProjectPermissionV2,+ isUserIncludedInList,isValidIssueName,+ isValidPlanName,} from "@/utils";import TaskRolloutActionPanel from "../../RolloutView/TaskRolloutActionPanel.vue";import { CreateButton } from "./create";import { IssueReviewActionPanel, IssueStatusActionPanel } from "./panels";import {- UnifiedActionGroup,type ActionConfig,type IssueReviewAction,type IssueStatusAction,type PlanAction,type RolloutAction,type UnifiedAction,+ UnifiedActionGroup,} from "./unified";const { t } = useI18n();diff --git a/frontend/src/components/Plan/components/HeaderSection/Actions/create/CreateButton.vue b/frontend/src/components/Plan/components/HeaderSection/Actions/create/CreateButton.vueindex ffb588e503..7c59acd4df 100644--- a/frontend/src/components/Plan/components/HeaderSection/Actions/create/CreateButton.vue+++ b/frontend/src/components/Plan/components/HeaderSection/Actions/create/CreateButton.vue@@ -21,7 +21,7 @@<script setup lang="ts">import { create } from "@bufbuild/protobuf";-import { NTooltip, NButton } from "naive-ui";+import { NButton, NTooltip } from "naive-ui";import { computed, nextTick, ref } from "vue";import { useI18n } from "vue-i18n";import { useRouter } from "vue-router";@@ -32,41 +32,41 @@ import {import {databaseEngineForSpec,getLocalSheetByName,+ usePlanContext,} from "@/components/Plan/logic";-import { usePlanContext } from "@/components/Plan/logic";import {- planServiceClientConnect,issueServiceClientConnect,+ planServiceClientConnect,rolloutServiceClientConnect,} from "@/grpcweb";import {- PROJECT_V1_ROUTE_PLAN_DETAIL,PROJECT_V1_ROUTE_ISSUE_DETAIL_V1,+ PROJECT_V1_ROUTE_PLAN_DETAIL,} from "@/router/dashboard/projectV1";import {+ pushNotification,useCurrentProjectV1,- useSheetV1Store,useCurrentUserV1,- pushNotification,+ useSheetV1Store,} from "@/store";import {CreateIssueRequestSchema,+ Issue_Type,IssueSchema,IssueStatus,- Issue_Type,} from "@/types/proto-es/v1/issue_service_pb";-import { CreatePlanRequestSchema } from "@/types/proto-es/v1/plan_service_pb";import {+ CreatePlanRequestSchema,type Plan_ChangeDatabaseConfig,type Plan_ExportDataConfig,} from "@/types/proto-es/v1/plan_service_pb";import { CreateRolloutRequestSchema } from "@/types/proto-es/v1/rollout_service_pb";import type { Sheet } from "@/types/proto-es/v1/sheet_service_pb";import {+ extractIssueUID,extractPlanUID,extractProjectResourceName,extractSheetUID,- extractIssueUID,hasProjectPermissionV2,} from "@/utils";diff --git a/frontend/src/components/Plan/components/HeaderSection/Actions/export/ExportArchiveDownloadAction.vue b/frontend/src/components/Plan/components/HeaderSection/Actions/export/ExportArchiveDownloadAction.vueindex aad31539b7..7a41ec3959 100644--- a/frontend/src/components/Plan/components/HeaderSection/Actions/export/ExportArchiveDownloadAction.vue+++ b/frontend/src/components/Plan/components/HeaderSection/Actions/export/ExportArchiveDownloadAction.vue@@ -30,14 +30,14 @@import { create } from "@bufbuild/protobuf";import dayjs from "dayjs";import { first, orderBy } from "lodash-es";-import { DownloadIcon, CalendarXIcon } from "lucide-vue-next";+import { CalendarXIcon, DownloadIcon } from "lucide-vue-next";import { NButton, NTooltip } from "naive-ui";import { computed, reactive } from "vue";import { usePlanContext } from "@/components/Plan/logic";import { useSQLStore } from "@/store";import {- TaskRun_ExportArchiveStatus,type TaskRun,+ TaskRun_ExportArchiveStatus,} from "@/types/proto-es/v1/rollout_service_pb";import { ExportRequestSchema } from "@/types/proto-es/v1/sql_service_pb";import { extractTaskRunUID, extractTaskUID } from "@/utils";diff --git a/frontend/src/components/Plan/components/HeaderSection/Actions/panels/IssueReviewActionPanel.vue b/frontend/src/components/Plan/components/HeaderSection/Actions/panels/IssueReviewActionPanel.vueindex 731e100096..5f3a5b385e 100644--- a/frontend/src/components/Plan/components/HeaderSection/Actions/panels/IssueReviewActionPanel.vue+++ b/frontend/src/components/Plan/components/HeaderSection/Actions/panels/IssueReviewActionPanel.vue@@ -83,8 +83,8 @@ import { NButton, NCheckbox, NInput, NTooltip } from "naive-ui";import { computed, nextTick, reactive, ref } from "vue";import { useI18n } from "vue-i18n";import { useRouter } from "vue-router";-import CommonDrawer from "@/components/IssueV1/components/Panel/CommonDrawer.vue";import { ErrorList } from "@/components/IssueV1/components/common";+import CommonDrawer from "@/components/IssueV1/components/Panel/CommonDrawer.vue";import { usePlanContextWithIssue } from "@/components/Plan/logic";import RequiredStar from "@/components/RequiredStar.vue";import { issueServiceClientConnect } from "@/grpcweb";diff --git a/frontend/src/components/Plan/components/HeaderSection/Actions/panels/IssueStatusActionPanel.vue b/frontend/src/components/Plan/components/HeaderSection/Actions/panels/IssueStatusActionPanel.vueindex 0c2e27fe4d..421cbcbc7d 100644--- a/frontend/src/components/Plan/components/HeaderSection/Actions/panels/IssueStatusActionPanel.vue+++ b/frontend/src/components/Plan/components/HeaderSection/Actions/panels/IssueStatusActionPanel.vue@@ -62,9 +62,9 @@ import CommonDrawer from "@/components/IssueV1/components/Panel/CommonDrawer.vueimport { usePlanContextWithIssue } from "@/components/Plan/logic";import { issueServiceClientConnect } from "@/grpcweb";import { useCurrentProjectV1 } from "@/store";-import { IssueStatus } from "@/types/proto-es/v1/issue_service_pb";import {BatchUpdateIssuesStatusRequestSchema,+ IssueStatus,IssueStatus as NewIssueStatus,} from "@/types/proto-es/v1/issue_service_pb";import type { IssueStatusAction } from "../unified";diff --git a/frontend/src/components/Plan/components/HeaderSection/Actions/unified/UnifiedActionGroup.vue b/frontend/src/components/Plan/components/HeaderSection/Actions/unified/UnifiedActionGroup.vueindex 18d22fdeeb..2fb912e2cf 100644--- a/frontend/src/components/Plan/components/HeaderSection/Actions/unified/UnifiedActionGroup.vue+++ b/frontend/src/components/Plan/components/HeaderSection/Actions/unified/UnifiedActionGroup.vue@@ -38,25 +38,25 @@<script setup lang="ts">import { first, orderBy } from "lodash-es";import { EllipsisVerticalIcon } from "lucide-vue-next";-import { NButton, NDropdown, type DropdownOption } from "naive-ui";-import { computed, h } from "vue";+import { type DropdownOption, NButton, NDropdown } from "naive-ui";import type { VNode } from "vue";+import { computed, h } from "vue";import { useI18n } from "vue-i18n";import { DropdownItemWithErrorList } from "@/components/IssueV1/components/common";-import { useCurrentUserV1, extractUserId } from "@/store";+import { extractUserId, useCurrentUserV1 } from "@/store";import { IssueStatus } from "@/types/proto-es/v1/issue_service_pb";import {Task_Status,Task_Type,+ type TaskRun,TaskRun_ExportArchiveStatus,TaskRun_Status,- type TaskRun,} from "@/types/proto-es/v1/rollout_service_pb";import { extractTaskRunUID, extractTaskUID } from "@/utils";import { usePlanContext } from "../../../../logic";import { ExportArchiveDownloadAction } from "../export";-import UnifiedActionButton from "./UnifiedActionButton.vue";import type { ActionConfig, UnifiedAction } from "./types";+import UnifiedActionButton from "./UnifiedActionButton.vue";const props = defineProps<{primaryAction?: ActionConfig;diff --git a/frontend/src/components/Plan/components/HeaderSection/DescriptionSection.vue b/frontend/src/components/Plan/components/HeaderSection/DescriptionSection.vueindex 590916418c..7d1db77ce3 100644--- a/frontend/src/components/Plan/components/HeaderSection/DescriptionSection.vue+++ b/frontend/src/components/Plan/components/HeaderSection/DescriptionSection.vue@@ -70,15 +70,17 @@<script setup lang="ts">import { create } from "@bufbuild/protobuf";-import { PlusIcon, ChevronUpIcon } from "lucide-vue-next";+import { ChevronUpIcon, PlusIcon } from "lucide-vue-next";import { NButton } from "naive-ui";import { computed, reactive, watch } from "vue";import MarkdownEditor from "@/components/MarkdownEditor";import { useResourcePoller } from "@/components/Plan/logic/poller";import { planServiceClientConnect } from "@/grpcweb";-import { useCurrentUserV1, extractUserId, useCurrentProjectV1 } from "@/store";-import { UpdatePlanRequestSchema } from "@/types/proto-es/v1/plan_service_pb";-import { PlanSchema } from "@/types/proto-es/v1/plan_service_pb";+import { extractUserId, useCurrentProjectV1, useCurrentUserV1 } from "@/store";+import {+ PlanSchema,+ UpdatePlanRequestSchema,+} from "@/types/proto-es/v1/plan_service_pb";import { hasProjectPermissionV2 } from "@/utils";import { usePlanContext } from "../../logic";diff --git a/frontend/src/components/Plan/components/HeaderSection/TitleInput.vue b/frontend/src/components/Plan/components/HeaderSection/TitleInput.vueindex d4ad03a322..c864865786 100644--- a/frontend/src/components/Plan/components/HeaderSection/TitleInput.vue+++ b/frontend/src/components/Plan/components/HeaderSection/TitleInput.vue@@ -25,18 +25,20 @@ import { computed, reactive, watch } from "vue";import { useI18n } from "vue-i18n";import { issueServiceClientConnect, planServiceClientConnect } from "@/grpcweb";import {- pushNotification,- useCurrentUserV1,extractUserId,+ pushNotification,useCurrentProjectV1,+ useCurrentUserV1,} from "@/store";import {- IssueSchema,Issue_Type,+ IssueSchema,UpdateIssueRequestSchema,} from "@/types/proto-es/v1/issue_service_pb";-import { UpdatePlanRequestSchema } from "@/types/proto-es/v1/plan_service_pb";-import { PlanSchema } from "@/types/proto-es/v1/plan_service_pb";+import {+ PlanSchema,+ UpdatePlanRequestSchema,+} from "@/types/proto-es/v1/plan_service_pb";import { hasProjectPermissionV2 } from "@/utils";import { usePlanContext } from "../../logic";diff --git a/frontend/src/components/Plan/components/IssueReviewView/DatabaseChangeView.vue b/frontend/src/components/Plan/components/IssueReviewView/DatabaseChangeView.vueindex 229d638d24..dc0d4431b0 100644--- a/frontend/src/components/Plan/components/IssueReviewView/DatabaseChangeView.vue+++ b/frontend/src/components/Plan/components/IssueReviewView/DatabaseChangeView.vue@@ -76,7 +76,7 @@ import { useCurrentProjectV1, useEnvironmentV1Store } from "@/store";import { Issue_Type } from "@/types/proto-es/v1/issue_service_pb";import { Advice_Level } from "@/types/proto-es/v1/sql_service_pb";import { extractProjectResourceName, getStageStatus } from "@/utils";-import { usePlanContext, usePlanCheckStatus } from "../../logic";+import { usePlanCheckStatus, usePlanContext } from "../../logic";import ChecksDrawer from "../ChecksView/ChecksDrawer.vue";import PlanCheckStatusCount from "../PlanCheckStatusCount.vue";diff --git a/frontend/src/components/Plan/components/IssueReviewView/DatabaseCreateView.vue b/frontend/src/components/Plan/components/IssueReviewView/DatabaseCreateView.vueindex 9085d97d00..a1e2fb8834 100644--- a/frontend/src/components/Plan/components/IssueReviewView/DatabaseCreateView.vue+++ b/frontend/src/components/Plan/components/IssueReviewView/DatabaseCreateView.vue@@ -79,11 +79,11 @@ import {InstanceV1Name,} from "@/components/v2";import {+ useCurrentProjectV1,useEnvironmentV1Store,useInstanceV1Store,useSheetV1Store,} from "@/store";-import { useCurrentProjectV1 } from "@/store";import type { Plan_CreateDatabaseConfig } from "@/types/proto-es/v1/plan_service_pb";import { Task_Status } from "@/types/proto-es/v1/rollout_service_pb";import { isValidInstanceName } from "@/types/v1/instance";diff --git a/frontend/src/components/Plan/components/IssueReviewView/DatabaseExportView.vue b/frontend/src/components/Plan/components/IssueReviewView/DatabaseExportView.vueindex 7066252a94..389732d302 100644--- a/frontend/src/components/Plan/components/IssueReviewView/DatabaseExportView.vue+++ b/frontend/src/components/Plan/components/IssueReviewView/DatabaseExportView.vue@@ -22,9 +22,9 @@ import { usePlanContextWithRollout } from "../../logic";import { useSelectedSpec } from "../SpecDetailView/context";import StatementSection from "../StatementSection";import {- TasksSection,- OptionsSection,ExecutionHistorySection,+ OptionsSection,+ TasksSection,} from "./DatabaseExportView";const databaseStore = useDatabaseV1Store();diff --git a/frontend/src/components/Plan/components/IssueReviewView/DatabaseExportView/ExecutionHistorySection.vue b/frontend/src/components/Plan/components/IssueReviewView/DatabaseExportView/ExecutionHistorySection.vueindex 1346140f59..fa831e3cfa 100644--- a/frontend/src/components/Plan/components/IssueReviewView/DatabaseExportView/ExecutionHistorySection.vue+++ b/frontend/src/components/Plan/components/IssueReviewView/DatabaseExportView/ExecutionHistorySection.vue@@ -26,8 +26,7 @@ import { computed } from "vue";import TaskRunTable from "@/components/Plan/components/RolloutView/TaskRunTable.vue";import type { TaskRun } from "@/types/proto-es/v1/rollout_service_pb";import { extractTaskUID } from "@/utils";-import { usePlanContext } from "../../../logic";-import { usePlanContextWithRollout } from "../../../logic";+import { usePlanContext, usePlanContextWithRollout } from "../../../logic";const { plan, rollout } = usePlanContext();const { taskRuns } = usePlanContextWithRollout();diff --git a/frontend/src/components/Plan/components/IssueReviewView/OverviewSection.vue b/frontend/src/components/Plan/components/IssueReviewView/OverviewSection.vueindex e10ab7986e..263e73aeb8 100644--- a/frontend/src/components/Plan/components/IssueReviewView/OverviewSection.vue+++ b/frontend/src/components/Plan/components/IssueReviewView/OverviewSection.vue@@ -75,7 +75,7 @@ import { PROJECT_V1_ROUTE_ROLLOUT_DETAIL_STAGE_DETAIL } from "@/router/dashboardimport { useCurrentProjectV1, useEnvironmentV1Store } from "@/store";import { Advice_Level } from "@/types/proto-es/v1/sql_service_pb";import { extractProjectResourceName, getStageStatus } from "@/utils";-import { usePlanContext, usePlanCheckStatus } from "../../logic";+import { usePlanCheckStatus, usePlanContext } from "../../logic";import ChecksDrawer from "../ChecksView/ChecksDrawer.vue";import PlanCheckStatusCount from "../PlanCheckStatusCount.vue";diff --git a/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/ApprovalFlowSection.vue b/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/ApprovalFlowSection.vueindex 3ab460f819..8f621f65c2 100644--- a/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/ApprovalFlowSection.vue+++ b/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/ApprovalFlowSection.vue@@ -54,7 +54,7 @@</template><script setup lang="ts">-import { NTimeline, NButton } from "naive-ui";+import { NButton, NTimeline } from "naive-ui";import { computed, ref } from "vue";import { BBSpin } from "@/bbkit";import FeatureBadge from "@/components/FeatureGuard/FeatureBadge.vue";diff --git a/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/ApprovalStepItem.vue b/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/ApprovalStepItem.vueindex 496a627be5..a7ad4108fd 100644--- a/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/ApprovalStepItem.vue+++ b/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/ApprovalStepItem.vue@@ -76,22 +76,22 @@ import { NTimelineItem } from "naive-ui";import { computed, watchEffect } from "vue";import { useI18n } from "vue-i18n";import {- useCurrentUserV1,- useUserStore,useCurrentProjectV1,+ useCurrentUserV1,useGroupStore,useProjectIamPolicyStore,+ useUserStore,} from "@/store";import { userNamePrefix } from "@/store/modules/v1/common";-import { SYSTEM_BOT_EMAIL, groupBindingPrefix, PresetRoleType } from "@/types";+import { groupBindingPrefix, PresetRoleType, SYSTEM_BOT_EMAIL } from "@/types";import { State } from "@/types/proto-es/v1/common_pb";-import { Issue_Approver_Status } from "@/types/proto-es/v1/issue_service_pb";import type {Issue,Issue_Approver,} from "@/types/proto-es/v1/issue_service_pb";+import { Issue_Approver_Status } from "@/types/proto-es/v1/issue_service_pb";import type { User as UserType } from "@/types/proto-es/v1/user_service_pb";-import { memberMapToRolesInProjectIAM, isBindingPolicyExpired } from "@/utils";+import { isBindingPolicyExpired, memberMapToRolesInProjectIAM } from "@/utils";import ApprovalUserView from "./ApprovalUserView.vue";import PotentialApprovers from "./PotentialApprovers.vue";diff --git a/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/RiskLevelIcon.vue b/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/RiskLevelIcon.vueindex 3951ae7f00..97cb3565b8 100644--- a/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/RiskLevelIcon.vue+++ b/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/RiskLevelIcon.vue@@ -20,7 +20,7 @@</template><script setup lang="ts">-import { ShieldCheckIcon, ShieldAlertIcon } from "lucide-vue-next";+import { ShieldAlertIcon, ShieldCheckIcon } from "lucide-vue-next";import { NTooltip } from "naive-ui";import { computed } from "vue";import { useI18n } from "vue-i18n";diff --git a/frontend/src/components/Plan/components/IssueReviewView/Sidebar/IssueStatusSection.vue b/frontend/src/components/Plan/components/IssueReviewView/Sidebar/IssueStatusSection.vueindex 66459294a7..12ba59281c 100644--- a/frontend/src/components/Plan/components/IssueReviewView/Sidebar/IssueStatusSection.vue+++ b/frontend/src/components/Plan/components/IssueReviewView/Sidebar/IssueStatusSection.vue@@ -13,12 +13,12 @@import { NTag } from "naive-ui";import { computed } from "vue";import { useI18n } from "vue-i18n";+import type { Issue } from "@/types/proto-es/v1/issue_service_pb";import {- IssueStatus,- Issue_Approver_Status,Issue_ApprovalStatus,+ Issue_Approver_Status,+ IssueStatus,} from "@/types/proto-es/v1/issue_service_pb";-import type { Issue } from "@/types/proto-es/v1/issue_service_pb";const props = defineProps<{issue: Issue;diff --git a/frontend/src/components/Plan/components/IssueReviewView/Sidebar/Sidebar.vue b/frontend/src/components/Plan/components/IssueReviewView/Sidebar/Sidebar.vueindex 5fd6d93451..9ca1d87913 100644--- a/frontend/src/components/Plan/components/IssueReviewView/Sidebar/Sidebar.vue+++ b/frontend/src/components/Plan/components/IssueReviewView/Sidebar/Sidebar.vue@@ -27,8 +27,8 @@ import {useCurrentUserV1,} from "@/store";import {- UpdateIssueRequestSchema,IssueStatus,+ UpdateIssueRequestSchema,} from "@/types/proto-es/v1/issue_service_pb";import { hasProjectPermissionV2 } from "@/utils";import { usePlanContextWithIssue } from "../../../logic/context";diff --git a/frontend/src/components/Plan/components/PlanCheckRunStatusIcon.vue b/frontend/src/components/Plan/components/PlanCheckRunStatusIcon.vueindex 22b7ac2ac6..69d8e0af54 100644--- a/frontend/src/components/Plan/components/PlanCheckRunStatusIcon.vue+++ b/frontend/src/components/Plan/components/PlanCheckRunStatusIcon.vue@@ -25,10 +25,10 @@<script lang="ts" setup>import type { PropType } from "vue";import { computed } from "vue";-import CheckIcon from "~icons/heroicons-solid/check";-import XIcon from "~icons/heroicons-solid/x";import type { Plan } from "@/types/proto-es/v1/plan_service_pb";import { Advice_Level } from "@/types/proto-es/v1/sql_service_pb";+import CheckIcon from "~icons/heroicons-solid/check";+import XIcon from "~icons/heroicons-solid/x";import { usePlanCheckStatus } from "../logic";export type SizeType = "small" | "normal";diff --git a/frontend/src/components/Plan/components/PlanCheckSection/PlanCheckSection.vue b/frontend/src/components/Plan/components/PlanCheckSection/PlanCheckSection.vueindex 8a04c6a617..105a5a16c4 100644--- a/frontend/src/components/Plan/components/PlanCheckSection/PlanCheckSection.vue+++ b/frontend/src/components/Plan/components/PlanCheckSection/PlanCheckSection.vue@@ -69,16 +69,16 @@<script setup lang="ts">import { create } from "@bufbuild/protobuf";import type { ConnectError } from "@connectrpc/connect";-import { PlayIcon, CircleQuestionMarkIcon } from "lucide-vue-next";-import { NButton, NTooltip, NTag } from "naive-ui";+import { CircleQuestionMarkIcon, PlayIcon } from "lucide-vue-next";+import { NButton, NTag, NTooltip } from "naive-ui";import { computed, ref, watch } from "vue";import { STATEMENT_SKIP_CHECK_THRESHOLD } from "@/components/SQLCheck/common";import { planServiceClientConnect } from "@/grpcweb";import {- useCurrentUserV1,- useCurrentProjectV1,- pushNotification,extractUserId,+ pushNotification,+ useCurrentProjectV1,+ useCurrentUserV1,} from "@/store";import { RunPlanChecksRequestSchema } from "@/types/proto-es/v1/plan_service_pb";import { Advice_Level } from "@/types/proto-es/v1/sql_service_pb";@@ -86,8 +86,8 @@ import { hasProjectPermissionV2 } from "@/utils";import {planCheckRunListForSpec,planSpecHasPlanChecks,- usePlanContext,usePlanCheckStatus,+ usePlanContext,} from "../../logic";import { useResourcePoller } from "../../logic/poller";import ChecksDrawer from "../ChecksView/ChecksDrawer.vue";diff --git a/frontend/src/components/Plan/components/PlanCheckStatusCount.vue b/frontend/src/components/Plan/components/PlanCheckStatusCount.vueindex 4285457c79..c029b1ec01 100644--- a/frontend/src/components/Plan/components/PlanCheckStatusCount.vue+++ b/frontend/src/components/Plan/components/PlanCheckStatusCount.vue@@ -51,10 +51,10 @@<script setup lang="ts">import {- CheckCircleIcon,AlertCircleIcon,- XCircleIcon,+ CheckCircleIcon,LoaderIcon,+ XCircleIcon,} from "lucide-vue-next";import { computed, type PropType } from "vue";import type { Plan } from "@/types/proto-es/v1/plan_service_pb";diff --git a/frontend/src/components/Plan/components/PlanDataTable/PlanDataTable.vue b/frontend/src/components/Plan/components/PlanDataTable/PlanDataTable.vueindex 7e6cf1094e..ac52ff3d49 100644--- a/frontend/src/components/Plan/components/PlanDataTable/PlanDataTable.vue+++ b/frontend/src/components/Plan/components/PlanDataTable/PlanDataTable.vue@@ -14,7 +14,7 @@<script lang="tsx" setup>import type { DataTableColumn } from "naive-ui";-import { NPerformantEllipsis, NDataTable, NTag } from "naive-ui";+import { NDataTable, NPerformantEllipsis, NTag } from "naive-ui";import { computed } from "vue";import { useI18n } from "vue-i18n";import { useRouter } from "vue-router";diff --git a/frontend/src/components/Plan/components/RefreshIndicator.vue b/frontend/src/components/Plan/components/RefreshIndicator.vueindex 8e4a70f5d8..e23243f99c 100644--- a/frontend/src/components/Plan/components/RefreshIndicator.vue+++ b/frontend/src/components/Plan/components/RefreshIndicator.vue@@ -24,7 +24,7 @@import dayjs from "dayjs";import { RefreshCcwIcon } from "lucide-vue-next";import { NButton } from "naive-ui";-import { computed, ref, onUnmounted } from "vue";+import { computed, onUnmounted, ref } from "vue";import { useI18n } from "vue-i18n";import { useResourcePoller } from "../logic/poller";diff --git a/frontend/src/components/Plan/components/RolloutView/RolloutView.vue b/frontend/src/components/Plan/components/RolloutView/RolloutView.vueindex 608c367b26..627674052b 100644--- a/frontend/src/components/Plan/components/RolloutView/RolloutView.vue+++ b/frontend/src/components/Plan/components/RolloutView/RolloutView.vue@@ -58,13 +58,13 @@ import { useI18n } from "vue-i18n";import { BBSpin } from "@/bbkit";import { rolloutServiceClientConnect } from "@/grpcweb";import { pushNotification, useCurrentProjectV1 } from "@/store";-import { CreateRolloutRequestSchema } from "@/types/proto-es/v1/rollout_service_pb";import type { Stage, Task } from "@/types/proto-es/v1/rollout_service_pb";+import { CreateRolloutRequestSchema } from "@/types/proto-es/v1/rollout_service_pb";import { usePlanContextWithRollout } from "../../logic";+import { useRolloutViewContext } from "./context";import StagesView from "./StagesView.vue";import TaskRolloutActionPanel from "./TaskRolloutActionPanel.vue";import TaskRunRollbackSection from "./TaskRunRollbackSection.vue";-import { useRolloutViewContext } from "./context";const { t } = useI18n();const { project } = useCurrentProjectV1();diff --git a/frontend/src/components/Plan/components/RolloutView/StageCard.vue b/frontend/src/components/Plan/components/RolloutView/StageCard.vueindex e37cb1cbfa..0f17bc0908 100644--- a/frontend/src/components/Plan/components/RolloutView/StageCard.vue+++ b/frontend/src/components/Plan/components/RolloutView/StageCard.vue@@ -177,40 +177,40 @@import type { Timestamp as TimestampPb } from "@bufbuild/protobuf/wkt";import dayjs from "dayjs";import {+ CalendarClockIcon,ChevronDownIcon,ChevronUpIcon,- CalendarClockIcon,} from "lucide-vue-next";-import { NTooltip, NButton, NTag } from "naive-ui";+import { NButton, NTag, NTooltip } from "naive-ui";import { twMerge } from "tailwind-merge";import { computed, ref, watch } from "vue";import { useRouter } from "vue-router";+import Timestamp from "@/components/misc/Timestamp.vue";import DatabaseDisplay from "@/components/Plan/components/common/DatabaseDisplay.vue";import { TASK_STATUS_FILTERS } from "@/components/Plan/constants/task";import TaskStatus from "@/components/Rollout/kits/TaskStatus.vue";-import Timestamp from "@/components/misc/Timestamp.vue";import { EnvironmentV1Name } from "@/components/v2";import {PROJECT_V1_ROUTE_ROLLOUT_DETAIL_STAGE_DETAIL,PROJECT_V1_ROUTE_ROLLOUT_DETAIL_TASK_DETAIL,} from "@/router/dashboard/projectV1";import {+ batchGetOrFetchDatabases,useCurrentProjectV1,useEnvironmentV1Store,- batchGetOrFetchDatabases,} from "@/store";import { getTimeForPbTimestampProtoEs } from "@/types";import type {+ Rollout,Stage,Task,- Rollout,} from "@/types/proto-es/v1/rollout_service_pb";import { Task_Status } from "@/types/proto-es/v1/rollout_service_pb";import {extractProjectResourceName,- stringifyTaskStatus,getStageStatus,humanizeTs,+ stringifyTaskStatus,} from "@/utils";import { usePlanContextWithRollout } from "../../logic";import StageActions from "./StageActions.vue";diff --git a/frontend/src/components/Plan/components/RolloutView/StagesView.vue b/frontend/src/components/Plan/components/RolloutView/StagesView.vueindex 43c59960ad..114a87c8c0 100644--- a/frontend/src/components/Plan/components/RolloutView/StagesView.vue+++ b/frontend/src/components/Plan/components/RolloutView/StagesView.vue@@ -24,10 +24,10 @@<script setup lang="ts">import { computed } from "vue";import type {+ Rollout,Stage,Task,Task_Status,- Rollout,} from "@/types/proto-es/v1/rollout_service_pb";import { Task_Status as TaskStatus } from "@/types/proto-es/v1/rollout_service_pb";import StageCard from "./StageCard.vue";diff --git a/frontend/src/components/Plan/components/RolloutView/TaskFilter.vue b/frontend/src/components/Plan/components/RolloutView/TaskFilter.vueindex a2c3425127..75d10454f1 100644--- a/frontend/src/components/Plan/components/RolloutView/TaskFilter.vue+++ b/frontend/src/components/Plan/components/RolloutView/TaskFilter.vue@@ -41,8 +41,8 @@ import { TASK_STATUS_FILTERS } from "@/components/Plan/constants/task";import TaskStatus from "@/components/Rollout/kits/TaskStatus.vue";import type {Rollout,- Task_Status,Stage,+ Task_Status,} from "@/types/proto-es/v1/rollout_service_pb";import { stringifyTaskStatus } from "@/utils";import { useRolloutViewContext } from "./context";diff --git a/frontend/src/components/Plan/components/RolloutView/TaskOperations.vue b/frontend/src/components/Plan/components/RolloutView/TaskOperations.vueindex 00bae89da6..f5ee7ffd14 100644--- a/frontend/src/components/Plan/components/RolloutView/TaskOperations.vue+++ b/frontend/src/components/Plan/components/RolloutView/TaskOperations.vue@@ -50,7 +50,7 @@</template><script lang="ts" setup>-import { PlayIcon, XIcon, SkipForwardIcon } from "lucide-vue-next";+import { PlayIcon, SkipForwardIcon, XIcon } from "lucide-vue-next";import { NButton, NScrollbar, NTooltip } from "naive-ui";import type { VNode } from "vue";import { computed, h, reactive } from "vue";@@ -58,12 +58,12 @@ import { useI18n } from "vue-i18n";import { useCurrentUserV1 } from "@/store";import { userNamePrefix } from "@/store/modules/v1/common";import { Issue_Type } from "@/types/proto-es/v1/issue_service_pb";-import { Task_Status } from "@/types/proto-es/v1/rollout_service_pb";import type {- Task,Rollout,Stage,+ Task,} from "@/types/proto-es/v1/rollout_service_pb";+import { Task_Status } from "@/types/proto-es/v1/rollout_service_pb";import { usePlanContextWithRollout } from "../../logic";import TaskRolloutActionPanel from "./TaskRolloutActionPanel.vue";import { canRolloutTasks } from "./taskPermissions";diff --git a/frontend/src/components/Plan/components/RolloutView/TaskRollbackButton.vue b/frontend/src/components/Plan/components/RolloutView/TaskRollbackButton.vueindex 324bc05842..6519d714a1 100644--- a/frontend/src/components/Plan/components/RolloutView/TaskRollbackButton.vue+++ b/frontend/src/components/Plan/components/RolloutView/TaskRollbackButton.vue@@ -26,9 +26,9 @@ import { NButton } from "naive-ui";import { computed, ref } from "vue";import { useCurrentProjectV1 } from "@/store";import type {+ Rollout,Task,TaskRun,- Rollout,} from "@/types/proto-es/v1/rollout_service_pb";import { databaseForTask } from "@/utils";import TaskRunRollbackDrawer from "./TaskRunRollbackDrawer.vue";diff --git a/frontend/src/components/Plan/components/RolloutView/TaskRolloutActionPanel.vue b/frontend/src/components/Plan/components/RolloutView/TaskRolloutActionPanel.vueindex aceb13565f..f6fe527aad 100644--- a/frontend/src/components/Plan/components/RolloutView/TaskRolloutActionPanel.vue+++ b/frontend/src/components/Plan/components/RolloutView/TaskRolloutActionPanel.vue@@ -293,54 +293,55 @@ import { flatten } from "lodash-es";import {NAlert,NButton,+ NCheckbox,NDatePicker,NInput,+ NRadio,+ NRadioGroup,NScrollbar,NTag,NTooltip,NVirtualList,- NCheckbox,- NRadio,- NRadioGroup,} from "naive-ui";import { computed, ref, watchEffect } from "vue";import { useI18n } from "vue-i18n";import { semanticTaskType } from "@/components/IssueV1";-import CommonDrawer from "@/components/IssueV1/components/Panel/CommonDrawer.vue";import { ErrorList } from "@/components/IssueV1/components/common";+import CommonDrawer from "@/components/IssueV1/components/Panel/CommonDrawer.vue";import { EnvironmentV1Name } from "@/components/v2";import { rolloutServiceClientConnect } from "@/grpcweb";import {pushNotification,+ useCurrentUserV1,useEnvironmentV1Store,usePolicyByParentAndType,- useCurrentUserV1,} from "@/store";import { userNamePrefix } from "@/store/modules/v1/common";import {- Issue_Approver_Status,Issue_ApprovalStatus,+ Issue_Approver_Status,Issue_Type,} from "@/types/proto-es/v1/issue_service_pb";import {PolicyType,RolloutPolicy_Checkers_PlanCheckEnforcement,} from "@/types/proto-es/v1/org_policy_service_pb";+import type {+ BatchRunTasksRequest,+ Stage,+ Task,+} from "@/types/proto-es/v1/rollout_service_pb";import {+ BatchCancelTaskRunsRequestSchema,BatchRunTasksRequestSchema,BatchSkipTasksRequestSchema,- BatchCancelTaskRunsRequestSchema,ListTaskRunsRequestSchema,+ Task_Status,+ Task_Type,TaskRun_Status,} from "@/types/proto-es/v1/rollout_service_pb";-import type {- BatchRunTasksRequest,- Stage,- Task,-} from "@/types/proto-es/v1/rollout_service_pb";-import { Task_Status, Task_Type } from "@/types/proto-es/v1/rollout_service_pb";import { extractStageUID, isNullOrUndefined } from "@/utils";-import { usePlanContextWithRollout, usePlanCheckStatus } from "../../logic";+import { usePlanCheckStatus, usePlanContextWithRollout } from "../../logic";import PlanCheckStatusCount from "../PlanCheckStatusCount.vue";import TaskDatabaseName from "./TaskDatabaseName.vue";import { canRolloutTasks } from "./taskPermissions";diff --git a/frontend/src/components/Plan/components/RolloutView/TaskRunComment.vue b/frontend/src/components/Plan/components/RolloutView/TaskRunComment.vueindex ab1bcade4f..ff76731476 100644--- a/frontend/src/components/Plan/components/RolloutView/TaskRunComment.vue+++ b/frontend/src/components/Plan/components/RolloutView/TaskRunComment.vue@@ -33,8 +33,8 @@ import { NEllipsis } from "naive-ui";import { computed } from "vue";import { useI18n } from "vue-i18n";import {- getTimeForPbTimestampProtoEs,getDateForPbTimestampProtoEs,+ getTimeForPbTimestampProtoEs,} from "@/types";import type { TaskRun } from "@/types/proto-es/v1/rollout_service_pb";import { TaskRun_Status } from "@/types/proto-es/v1/rollout_service_pb";diff --git a/frontend/src/components/Plan/components/RolloutView/TaskRunRollbackDrawer.vue b/frontend/src/components/Plan/components/RolloutView/TaskRunRollbackDrawer.vueindex c6e692f647..790961767c 100644--- a/frontend/src/components/Plan/components/RolloutView/TaskRunRollbackDrawer.vue+++ b/frontend/src/components/Plan/components/RolloutView/TaskRunRollbackDrawer.vue@@ -121,9 +121,9 @@ import { create } from "@bufbuild/protobuf";import { createContextValues } from "@connectrpc/connect";import { isUndefined } from "lodash-es";import { DatabaseBackupIcon } from "lucide-vue-next";-import { NSteps, NStep, NButton, NAlert, NSkeleton } from "naive-ui";+import { NAlert, NButton, NSkeleton, NStep, NSteps } from "naive-ui";import { v4 as uuidv4 } from "uuid";-import { computed, reactive, ref, watch, nextTick } from "vue";+import { computed, nextTick, reactive, ref, watch } from "vue";import { useRouter } from "vue-router";import { MonacoEditor } from "@/components/MonacoEditor";import DatabaseDisplay from "@/components/Plan/components/common/DatabaseDisplay.vue";@@ -151,9 +151,9 @@ import {PlanSchema,} from "@/types/proto-es/v1/plan_service_pb";import type {+ Rollout,Task,TaskRun,- Rollout,} from "@/types/proto-es/v1/rollout_service_pb";import { PreviewTaskRunRollbackRequestSchema } from "@/types/proto-es/v1/rollout_service_pb";import { SheetSchema } from "@/types/proto-es/v1/sheet_service_pb";diff --git a/frontend/src/components/Plan/components/RolloutView/TaskRunRollbackSection.vue b/frontend/src/components/Plan/components/RolloutView/TaskRunRollbackSection.vueindex b4c64c0f64..8a161250c1 100644--- a/frontend/src/components/Plan/components/RolloutView/TaskRunRollbackSection.vue+++ b/frontend/src/components/Plan/components/RolloutView/TaskRunRollbackSection.vue@@ -27,9 +27,9 @@ import { NButton } from "naive-ui";import { computed, ref } from "vue";import { taskRunNamePrefix, useCurrentProjectV1 } from "@/store";import type {+ Rollout,Task,TaskRun,- Rollout,} from "@/types/proto-es/v1/rollout_service_pb";import { TaskRun_Status } from "@/types/proto-es/v1/rollout_service_pb";import { databaseForTask } from "@/utils";diff --git a/frontend/src/components/Plan/components/RolloutView/TaskRunTable.vue b/frontend/src/components/Plan/components/RolloutView/TaskRunTable.vueindex f29c9cb1cc..04a65aef93 100644--- a/frontend/src/components/Plan/components/RolloutView/TaskRunTable.vue+++ b/frontend/src/components/Plan/components/RolloutView/TaskRunTable.vue@@ -33,8 +33,8 @@ import { computed, ref } from "vue";import { useI18n } from "vue-i18n";import TaskRunDetail from "@/components/IssueV1/components/TaskRunSection/TaskRunDetail.vue";import TaskRunStatusIcon from "@/components/IssueV1/components/TaskRunSection/TaskRunStatusIcon.vue";-import DatabaseDisplay from "@/components/Plan/components/common/DatabaseDisplay.vue";import HumanizeDate from "@/components/misc/HumanizeDate.vue";+import DatabaseDisplay from "@/components/Plan/components/common/DatabaseDisplay.vue";import { Drawer, DrawerContent } from "@/components/v2";import { useCurrentProjectV1 } from "@/store";import {@@ -43,8 +43,7 @@ import {} from "@/types";import type { Task, TaskRun } from "@/types/proto-es/v1/rollout_service_pb";import { TaskRun_Status } from "@/types/proto-es/v1/rollout_service_pb";-import { databaseForTask } from "@/utils";-import { humanizeDurationV1, extractTaskUID } from "@/utils";+import { databaseForTask, extractTaskUID, humanizeDurationV1 } from "@/utils";import { usePlanContextWithRollout } from "../../logic";import TaskRunComment from "./TaskRunComment.vue";diff --git a/frontend/src/components/Plan/components/RolloutView/TaskStatusActions.vue b/frontend/src/components/Plan/components/RolloutView/TaskStatusActions.vueindex 5a9e1c322c..92ad8acdc9 100644--- a/frontend/src/components/Plan/components/RolloutView/TaskStatusActions.vue+++ b/frontend/src/components/Plan/components/RolloutView/TaskStatusActions.vue@@ -38,13 +38,13 @@ import { EllipsisVerticalIcon } from "lucide-vue-next";import { NButton, NDropdown } from "naive-ui";import { computed, ref } from "vue";import { useI18n } from "vue-i18n";-import { Task_Status } from "@/types/proto-es/v1/rollout_service_pb";import type {- Task,- TaskRun,Rollout,Stage,+ Task,+ TaskRun,} from "@/types/proto-es/v1/rollout_service_pb";+import { Task_Status } from "@/types/proto-es/v1/rollout_service_pb";import { usePlanContextWithRollout } from "../../logic";import TaskRolloutActionPanel from "./TaskRolloutActionPanel.vue";import { canRolloutTasks } from "./taskPermissions";diff --git a/frontend/src/components/Plan/components/RolloutView/TaskTable.vue b/frontend/src/components/Plan/components/RolloutView/TaskTable.vueindex a8cead9a9e..3604bea8ca 100644--- a/frontend/src/components/Plan/components/RolloutView/TaskTable.vue+++ b/frontend/src/components/Plan/components/RolloutView/TaskTable.vue@@ -25,11 +25,11 @@ import { computed, watch } from "vue";import { useI18n } from "vue-i18n";import { useRouter } from "vue-router";import { semanticTaskType } from "@/components/IssueV1";+import Timestamp from "@/components/misc/Timestamp.vue";import DatabaseDisplay from "@/components/Plan/components/common/DatabaseDisplay.vue";import TaskStatus from "@/components/Rollout/kits/TaskStatus.vue";-import Timestamp from "@/components/misc/Timestamp.vue";import { PROJECT_V1_ROUTE_ROLLOUT_DETAIL_TASK_DETAIL } from "@/router/dashboard/projectV1";-import { useCurrentProjectV1, batchGetOrFetchDatabases } from "@/store";+import { batchGetOrFetchDatabases, useCurrentProjectV1 } from "@/store";import { getTimeForPbTimestampProtoEs } from "@/types";import type { Task } from "@/types/proto-es/v1/rollout_service_pb";import { Task_Status } from "@/types/proto-es/v1/rollout_service_pb";diff --git a/frontend/src/components/Plan/components/RolloutView/TaskTableView.vue b/frontend/src/components/Plan/components/RolloutView/TaskTableView.vueindex 162698ca62..25ccebe8b7 100644--- a/frontend/src/components/Plan/components/RolloutView/TaskTableView.vue+++ b/frontend/src/components/Plan/components/RolloutView/TaskTableView.vue@@ -25,9 +25,9 @@<script setup lang="ts">import { ref } from "vue";import {+ type Stage,type Task,Task_Status,- type Stage,} from "@/types/proto-es/v1/rollout_service_pb";import { usePlanContextWithRollout } from "../../logic";import TaskOperations from "./TaskOperations.vue";diff --git a/frontend/src/components/Plan/components/RolloutView/TaskView.vue b/frontend/src/components/Plan/components/RolloutView/TaskView.vueindex d8cf698553..a0c1a4e129 100644--- a/frontend/src/components/Plan/components/RolloutView/TaskView.vue+++ b/frontend/src/components/Plan/components/RolloutView/TaskView.vue@@ -156,14 +156,15 @@ import {} from "@/store";import { getTimeForPbTimestampProtoEs, unknownTask } from "@/types";import { TaskRun_Status } from "@/types/proto-es/v1/rollout_service_pb";-import { databaseForTask, extractPlanUID } from "@/utils";import {+ databaseForTask,+ extractPlanUID,+ extractProjectResourceName,extractSchemaVersionFromTask,getSheetStatement,sheetNameOfTaskV1,- extractProjectResourceName,} from "@/utils";-import { usePlanContextWithRollout, getSpecTitle } from "../../logic";+import { getSpecTitle, usePlanContextWithRollout } from "../../logic";import DatabaseDisplay from "../common/DatabaseDisplay.vue";import TaskRollbackButton from "./TaskRollbackButton.vue";import TaskRunTable from "./TaskRunTable.vue";diff --git a/frontend/src/components/Plan/components/RolloutView/context.ts b/frontend/src/components/Plan/components/RolloutView/context.tsindex 128b369978..f104df272d 100644--- a/frontend/src/components/Plan/components/RolloutView/context.ts+++ b/frontend/src/components/Plan/components/RolloutView/context.ts@@ -1,15 +1,15 @@import { create } from "@bufbuild/protobuf";import { createContextValues } from "@connectrpc/connect";import type { InjectionKey } from "vue";-import { computed, inject, provide, ref, onUnmounted } from "vue";+import { computed, inject, onUnmounted, provide, ref } from "vue";import { rolloutServiceClientConnect } from "@/grpcweb";import { silentContextKey } from "@/grpcweb/context-key";import { useCurrentProjectV1 } from "@/store";+import type { Rollout } from "@/types/proto-es/v1/rollout_service_pb";import {CreateRolloutRequestSchema,RolloutSchema,} from "@/types/proto-es/v1/rollout_service_pb";-import type { Rollout } from "@/types/proto-es/v1/rollout_service_pb";import { usePlanContextWithRollout } from "../../logic";export const KEY = Symbol(diff --git a/frontend/src/components/Plan/components/RolloutView/taskPermissions.ts b/frontend/src/components/Plan/components/RolloutView/taskPermissions.tsindex 129cf2a94f..437add04f0 100644--- a/frontend/src/components/Plan/components/RolloutView/taskPermissions.ts+++ b/frontend/src/components/Plan/components/RolloutView/taskPermissions.ts@@ -1,18 +1,18 @@import {- useCurrentUserV1,useCurrentProjectV1,- useProjectIamPolicyStore,+ useCurrentUserV1,useDatabaseV1Store,usePolicyV1Store,+ useProjectIamPolicyStore,} from "@/store";-import { userNamePrefix, roleNamePrefix } from "@/store/modules/v1/common";-import { Issue_Type } from "@/types/proto-es/v1/issue_service_pb";+import { roleNamePrefix, userNamePrefix } from "@/store/modules/v1/common";import type { Issue } from "@/types/proto-es/v1/issue_service_pb";+import { Issue_Type } from "@/types/proto-es/v1/issue_service_pb";import { PolicyType } from "@/types/proto-es/v1/org_policy_service_pb";import type { Task } from "@/types/proto-es/v1/rollout_service_pb";import {- hasWorkspacePermissionV2,hasProjectPermissionV2,+ hasWorkspacePermissionV2,memberMapToRolesInProjectIAM,} from "@/utils";diff --git a/frontend/src/components/Plan/components/SQLCheckSection/AdviceStatusIcon.vue b/frontend/src/components/Plan/components/SQLCheckSection/AdviceStatusIcon.vueindex f17e0efe84..0bc7aa7231 100644--- a/frontend/src/components/Plan/components/SQLCheckSection/AdviceStatusIcon.vue+++ b/frontend/src/components/Plan/components/SQLCheckSection/AdviceStatusIcon.vue@@ -21,9 +21,9 @@<script setup lang="ts">import {CheckIcon,+ CircleAlertIcon,PlayIcon,TriangleAlertIcon,- CircleAlertIcon,} from "lucide-vue-next";import { NTooltip } from "naive-ui";import { computed } from "vue";diff --git a/frontend/src/components/Plan/components/SQLCheckSection/SQLCheckBadge.vue b/frontend/src/components/Plan/components/SQLCheckSection/SQLCheckBadge.vueindex 12cb2f1233..0a9d56f8b4 100644--- a/frontend/src/components/Plan/components/SQLCheckSection/SQLCheckBadge.vue+++ b/frontend/src/components/Plan/components/SQLCheckSection/SQLCheckBadge.vue@@ -32,7 +32,7 @@</template><script setup lang="ts">-import { CheckIcon, TriangleAlertIcon, CircleAlertIcon } from "lucide-vue-next";+import { CheckIcon, CircleAlertIcon, TriangleAlertIcon } from "lucide-vue-next";import { NTag } from "naive-ui";import { computed, ref } from "vue";import { TaskSpinner } from "@/components/IssueV1/components/common";diff --git a/frontend/src/components/Plan/components/SQLCheckSection/SQLCheckButton.vue b/frontend/src/components/Plan/components/SQLCheckSection/SQLCheckButton.vueindex bafe17d0ca..4da87db4f6 100644--- a/frontend/src/components/Plan/components/SQLCheckSection/SQLCheckButton.vue+++ b/frontend/src/components/Plan/components/SQLCheckSection/SQLCheckButton.vue@@ -54,9 +54,9 @@ import { NButton, NPopover } from "naive-ui";import { computed, ref } from "vue";import { useI18n } from "vue-i18n";import { BBSpin } from "@/bbkit";+import ErrorList from "@/components/misc/ErrorList.vue";import { SQLCheckPanel } from "@/components/SQLCheck";import { STATEMENT_SKIP_CHECK_THRESHOLD } from "@/components/SQLCheck/common";-import ErrorList from "@/components/misc/ErrorList.vue";import { releaseServiceClientConnect } from "@/grpcweb";import type { CheckReleaseResponse } from "@/types/proto-es/v1/release_service_pb";import {@@ -65,10 +65,10 @@ import {Release_File_Type,} from "@/types/proto-es/v1/release_service_pb";import {+ Advice_Level,AdviceSchema,Advice_Level as ProtoESAdvice_Level,} from "@/types/proto-es/v1/sql_service_pb";-import { Advice_Level } from "@/types/proto-es/v1/sql_service_pb";import type { Defer, VueStyle } from "@/utils";import { defer } from "@/utils";import { useSpecSheet } from "../StatementSection/useSpecSheet";diff --git a/frontend/src/components/Plan/components/SQLCheckSection/SQLCheckSection.vue b/frontend/src/components/Plan/components/SQLCheckSection/SQLCheckSection.vueindex a496d5527d..62d8243f59 100644--- a/frontend/src/components/Plan/components/SQLCheckSection/SQLCheckSection.vue+++ b/frontend/src/components/Plan/components/SQLCheckSection/SQLCheckSection.vue@@ -38,9 +38,9 @@import { NTag, NTooltip } from "naive-ui";import { computed } from "vue";import { isValidDatabaseName } from "@/types";+import { usePlanSQLCheckContext } from "./context";import SQLCheckBadge from "./SQLCheckBadge.vue";import SQLCheckButton from "./SQLCheckButton.vue";-import { usePlanSQLCheckContext } from "./context";const { database, resultMap } = usePlanSQLCheckContext();diff --git a/frontend/src/components/Plan/components/SQLCheckV1Section/SQLCheckV1Section.vue b/frontend/src/components/Plan/components/SQLCheckV1Section/SQLCheckV1Section.vueindex 117b99b59c..45935e3f62 100644--- a/frontend/src/components/Plan/components/SQLCheckV1Section/SQLCheckV1Section.vue+++ b/frontend/src/components/Plan/components/SQLCheckV1Section/SQLCheckV1Section.vue@@ -84,10 +84,10 @@<script setup lang="ts">import { create } from "@bufbuild/protobuf";import {- CheckCircleIcon,AlertCircleIcon,- XCircleIcon,+ CheckCircleIcon,PlayIcon,+ XCircleIcon,} from "lucide-vue-next";import { NButton, NTag, NTooltip } from "naive-ui";import { computed, ref, watch } from "vue";@@ -101,22 +101,20 @@ import {MigrationType,} from "@/types/proto-es/v1/common_pb";import {- PlanCheckRun_Type,- PlanCheckRun_Status,type PlanCheckRun,type PlanCheckRun_Result,- PlanCheckRunSchema,PlanCheckRun_ResultSchema,+ PlanCheckRun_Status,+ PlanCheckRun_Type,+ PlanCheckRunSchema,} from "@/types/proto-es/v1/plan_service_pb";import {CheckReleaseRequestSchema,- Release_File_Type,-} from "@/types/proto-es/v1/release_service_pb";-import {- Release_File_MigrationType,type CheckReleaseResponse_CheckResult,+ Release_File_MigrationType,+ Release_File_Type,} from "@/types/proto-es/v1/release_service_pb";-import { Advice_Level, type Advice } from "@/types/proto-es/v1/sql_service_pb";+import { type Advice, Advice_Level } from "@/types/proto-es/v1/sql_service_pb";import {extractProjectResourceName,getSheetStatement,diff --git a/frontend/src/components/Plan/components/SpecDetailView/AllTargetsDrawer.vue b/frontend/src/components/Plan/components/SpecDetailView/AllTargetsDrawer.vueindex 6a9be29b27..cda13f4343 100644--- a/frontend/src/components/Plan/components/SpecDetailView/AllTargetsDrawer.vue+++ b/frontend/src/components/Plan/components/SpecDetailView/AllTargetsDrawer.vue@@ -74,15 +74,15 @@<script setup lang="ts">import { NTag } from "naive-ui";-import { reactive, computed, watch } from "vue";+import { computed, reactive, watch } from "vue";import { BBSpin } from "@/bbkit";import DatabaseGroupIcon from "@/components/DatabaseGroupIcon.vue";import { Drawer, DrawerContent, SearchBox } from "@/components/v2";import DatabaseGroupName from "@/components/v2/Model/DatabaseGroupName.vue";import {- useDBGroupStore,batchGetOrFetchDatabases,useDatabaseV1Store,+ useDBGroupStore,} from "@/store";import { isValidDatabaseGroupName, isValidDatabaseName } from "@/types";import type { DatabaseGroup } from "@/types/proto-es/v1/database_group_service_pb";diff --git a/frontend/src/components/Plan/components/SpecDetailView/EditMigrationTypeModal.vue b/frontend/src/components/Plan/components/SpecDetailView/EditMigrationTypeModal.vueindex e6ff844fe5..ade7cd47ad 100644--- a/frontend/src/components/Plan/components/SpecDetailView/EditMigrationTypeModal.vue+++ b/frontend/src/components/Plan/components/SpecDetailView/EditMigrationTypeModal.vue@@ -44,8 +44,8 @@</template><script setup lang="ts">-import { FileDiffIcon, EditIcon } from "lucide-vue-next";-import { NModal, NRadioGroup, NRadio } from "naive-ui";+import { EditIcon, FileDiffIcon } from "lucide-vue-next";+import { NModal, NRadio, NRadioGroup } from "naive-ui";import { ref, watch } from "vue";import { MigrationType } from "@/types/proto-es/v1/common_pb";diff --git a/frontend/src/components/Plan/components/SpecDetailView/FailedTaskRunsSection.vue b/frontend/src/components/Plan/components/SpecDetailView/FailedTaskRunsSection.vueindex d98b94b8b2..b7d410bbc2 100644--- a/frontend/src/components/Plan/components/SpecDetailView/FailedTaskRunsSection.vue+++ b/frontend/src/components/Plan/components/SpecDetailView/FailedTaskRunsSection.vue@@ -51,7 +51,7 @@<script lang="tsx" setup>import { ExternalLinkIcon } from "lucide-vue-next";-import { NButton, type DataTableColumn, NDataTable } from "naive-ui";+import { type DataTableColumn, NButton, NDataTable } from "naive-ui";import { computed, reactive, ref, watchEffect } from "vue";import { useI18n } from "vue-i18n";import { useRouter } from "vue-router";@@ -64,18 +64,18 @@ import { useCurrentProjectV1, useDatabaseV1Store } from "@/store";import { useTaskRunLogStore } from "@/store/modules/v1/taskRunLog";import { getDateForPbTimestampProtoEs } from "@/types";import {- TaskRun_Status,Task_Status,type TaskRun,+ TaskRun_Status,} from "@/types/proto-es/v1/rollout_service_pb";import {+ extractProjectResourceName,extractTaskUID,flattenTaskV1List,- extractProjectResourceName,} from "@/utils";import { usePlanContextWithRollout } from "../../logic";-import TaskRunComment from "../RolloutView/TaskRunComment.vue";import DatabaseDisplay from "../common/DatabaseDisplay.vue";+import TaskRunComment from "../RolloutView/TaskRunComment.vue";import { useSelectedSpec } from "./context";const DEFAULT_TASK_RUNS_PER_PAGE = 5;diff --git a/frontend/src/components/Plan/components/SpecDetailView/SpecDetailView.vue b/frontend/src/components/Plan/components/SpecDetailView/SpecDetailView.vueindex c4d73772e0..919eefbd63 100644--- a/frontend/src/components/Plan/components/SpecDetailView/SpecDetailView.vue+++ b/frontend/src/components/Plan/components/SpecDetailView/SpecDetailView.vue@@ -28,11 +28,11 @@ import PlanCheckSection from "../PlanCheckSection";import { providePlanSQLCheckContext } from "../SQLCheckSection";import SQLCheckV1Section from "../SQLCheckV1Section";import StatementSection from "../StatementSection";+import { useSelectedSpec } from "./context";import DataExportOptionsSection from "./DataExportOptionsSection.vue";import FailedTaskRunsSection from "./FailedTaskRunsSection.vue";import SpecListSection from "./SpecListSection.vue";import TargetListSection from "./TargetListSection.vue";-import { useSelectedSpec } from "./context";const { project } = useCurrentProjectV1();const { isCreating, plan, rollout } = usePlanContext();diff --git a/frontend/src/components/Plan/components/SpecDetailView/SpecListSection.vue b/frontend/src/components/Plan/components/SpecDetailView/SpecListSection.vueindex 6ada7e639c..a44d911523 100644--- a/frontend/src/components/Plan/components/SpecDetailView/SpecListSection.vue+++ b/frontend/src/components/Plan/components/SpecDetailView/SpecListSection.vue@@ -82,10 +82,10 @@<script setup lang="ts">import { create } from "@bufbuild/protobuf";-import { PencilIcon, MoreVerticalIcon, TrashIcon } from "lucide-vue-next";-import { NTabs, NTab, NButton, useDialog, NTooltip, NDropdown } from "naive-ui";+import { MoreVerticalIcon, PencilIcon, TrashIcon } from "lucide-vue-next";import type { DropdownOption } from "naive-ui";-import { ref, computed, nextTick, h } from "vue";+import { NButton, NDropdown, NTab, NTabs, NTooltip, useDialog } from "naive-ui";+import { computed, h, nextTick, ref } from "vue";import { useI18n } from "vue-i18n";import { useRouter } from "vue-router";import { planServiceClientConnect } from "@/grpcweb";@@ -105,8 +105,8 @@ import { useEditorState } from "../../logic/useEditorState";import { getSpecTitle } from "../../logic/utils";import AddSpecDrawer from "../AddSpecDrawer.vue";import { useSpecsValidation } from "../common";-import EditMigrationTypeModal from "./EditMigrationTypeModal.vue";import { useSelectedSpec } from "./context";+import EditMigrationTypeModal from "./EditMigrationTypeModal.vue";const router = useRouter();const dialog = useDialog();diff --git a/frontend/src/components/Plan/components/SpecDetailView/TargetListSection.vue b/frontend/src/components/Plan/components/SpecDetailView/TargetListSection.vueindex adfedb1d25..e098581f4d 100644--- a/frontend/src/components/Plan/components/SpecDetailView/TargetListSection.vue+++ b/frontend/src/components/Plan/components/SpecDetailView/TargetListSection.vue@@ -105,25 +105,25 @@ import DatabaseGroupName from "@/components/v2/Model/DatabaseGroupName.vue";import { planServiceClientConnect } from "@/grpcweb";import { PROJECT_V1_ROUTE_DATABASE_GROUP_DETAIL } from "@/router/dashboard/projectV1";import {- useDBGroupStore,- useProjectV1Store,- pushNotification,batchGetOrFetchDatabases,getProjectNameAndDatabaseGroupName,projectNamePrefix,+ pushNotification,+ useDBGroupStore,+ useProjectV1Store,} from "@/store";import { isValidDatabaseGroupName, isValidDatabaseName } from "@/types";import {- DatabaseGroupView,type DatabaseGroup,+ DatabaseGroupView,} from "@/types/proto-es/v1/database_group_service_pb";import { UpdatePlanRequestSchema } from "@/types/proto-es/v1/plan_service_pb";import { extractProjectResourceName } from "@/utils";import { usePlanContext } from "../../logic/context";import DatabaseDisplay from "../common/DatabaseDisplay.vue";import AllTargetsDrawer from "./AllTargetsDrawer.vue";-import TargetsSelectorDrawer from "./TargetsSelectorDrawer.vue";import { useSelectedSpec } from "./context";+import TargetsSelectorDrawer from "./TargetsSelectorDrawer.vue";const DEFAULT_VISIBLE_TARGETS = 20;diff --git a/frontend/src/components/Plan/components/SpecDetailView/TargetsSelectorDrawer.vue b/frontend/src/components/Plan/components/SpecDetailView/TargetsSelectorDrawer.vueindex 5538d0413b..2d6633c990 100644--- a/frontend/src/components/Plan/components/SpecDetailView/TargetsSelectorDrawer.vue+++ b/frontend/src/components/Plan/components/SpecDetailView/TargetsSelectorDrawer.vue@@ -36,8 +36,8 @@<script setup lang="ts">import { NButton } from "naive-ui";import { computed, reactive, watch } from "vue";-import DatabaseAndGroupSelector from "@/components/DatabaseAndGroupSelector";import type { DatabaseSelectState } from "@/components/DatabaseAndGroupSelector";+import DatabaseAndGroupSelector from "@/components/DatabaseAndGroupSelector";import { Drawer, DrawerContent } from "@/components/v2";import { useCurrentProjectV1 } from "@/store";diff --git a/frontend/src/components/Plan/components/StatementSection/EditorView/EditorView.vue b/frontend/src/components/Plan/components/StatementSection/EditorView/EditorView.vueindex 864bd3031b..6a1c03f83e 100644--- a/frontend/src/components/Plan/components/StatementSection/EditorView/EditorView.vue+++ b/frontend/src/components/Plan/components/StatementSection/EditorView/EditorView.vue@@ -201,18 +201,18 @@ import { useI18n } from "vue-i18n";import { BBAttention, BBModal } from "@/bbkit";import { MonacoEditor } from "@/components/MonacoEditor";import { extensionNameOfLanguage } from "@/components/MonacoEditor/utils";+import SQLUploadButton from "@/components/misc/SQLUploadButton.vue";import { ErrorList } from "@/components/Plan/components/common";import {createEmptyLocalSheet,databaseEngineForSpec,databaseForSpec,- usePlanContext,planCheckRunListForSpec,+ usePlanContext,} from "@/components/Plan/logic";import { useEditorState } from "@/components/Plan/logic/useEditorState";import RequiredStar from "@/components/RequiredStar.vue";import DownloadSheetButton from "@/components/Sheet/DownloadSheetButton.vue";-import SQLUploadButton from "@/components/misc/SQLUploadButton.vue";import { planServiceClientConnect } from "@/grpcweb";import {pushNotification,@@ -235,8 +235,8 @@ import {import { engineSupportsSchemaEditor } from "@/utils/schemaEditor";import { useSelectedSpec } from "../../SpecDetailView/context";import SchemaEditorDrawer from "../SchemaEditorDrawer.vue";-import { useSQLAdviceMarkers } from "../useSQLAdviceMarkers";import { useSpecSheet } from "../useSpecSheet";+import { useSQLAdviceMarkers } from "../useSQLAdviceMarkers";type LocalState = {statement: string;diff --git a/frontend/src/components/Plan/components/StatementSection/ReleaseView/ReleaseView.vue b/frontend/src/components/Plan/components/StatementSection/ReleaseView/ReleaseView.vueindex ec8b74057b..d20e9ec434 100644--- a/frontend/src/components/Plan/components/StatementSection/ReleaseView/ReleaseView.vue+++ b/frontend/src/components/Plan/components/StatementSection/ReleaseView/ReleaseView.vue@@ -154,16 +154,18 @@<script setup lang="ts">import dayjs from "dayjs";-import { PackageIcon, ExternalLinkIcon } from "lucide-vue-next";+import { ExternalLinkIcon, PackageIcon } from "lucide-vue-next";import { NAlert, NButton } from "naive-ui";import { computed } from "vue";import { useI18n } from "vue-i18n";import { BBSpin } from "@/bbkit";import { useReleaseByName } from "@/store";-import { isValidReleaseName, getDateForPbTimestampProtoEs } from "@/types";+import { getDateForPbTimestampProtoEs, isValidReleaseName } from "@/types";import { VCSType } from "@/types/proto-es/v1/common_pb";-import { Release_File_Type } from "@/types/proto-es/v1/release_service_pb";-import { Release_File_MigrationType } from "@/types/proto-es/v1/release_service_pb";+import {+ Release_File_MigrationType,+ Release_File_Type,+} from "@/types/proto-es/v1/release_service_pb";import { useSelectedSpec } from "../../SpecDetailView/context";const { t } = useI18n();diff --git a/frontend/src/components/Plan/components/StatementSection/SchemaEditorDrawer.vue b/frontend/src/components/Plan/components/StatementSection/SchemaEditorDrawer.vueindex 658d6697f0..c14668340a 100644--- a/frontend/src/components/Plan/components/StatementSection/SchemaEditorDrawer.vue+++ b/frontend/src/components/Plan/components/StatementSection/SchemaEditorDrawer.vue@@ -50,11 +50,11 @@ import { cloneDeep } from "lodash-es";import { NButton, NSelect } from "naive-ui";import { computed, reactive, ref, watch } from "vue";import SchemaEditorLite, {- generateDiffDDL,type EditTarget,+ generateDiffDDL,} from "@/components/SchemaEditorLite";import { Drawer, DrawerContent } from "@/components/v2";-import { useDBSchemaV1Store, useDatabaseCatalogV1Store } from "@/store";+import { useDatabaseCatalogV1Store, useDBSchemaV1Store } from "@/store";import type { ComposedDatabase } from "@/types";import type { Project } from "@/types/proto-es/v1/project_service_pb";diff --git a/frontend/src/components/Plan/components/StatementSection/useSQLAdviceMarkers.ts b/frontend/src/components/Plan/components/StatementSection/useSQLAdviceMarkers.tsindex 30b8e6956a..e4b32f0cea 100644--- a/frontend/src/components/Plan/components/StatementSection/useSQLAdviceMarkers.ts+++ b/frontend/src/components/Plan/components/StatementSection/useSQLAdviceMarkers.ts@@ -1,9 +1,9 @@import { maxBy } from "lodash-es";import { computed, type Ref } from "vue";import type { AdviceOption } from "@/components/MonacoEditor";-import { PlanCheckRun_Type } from "@/types/proto-es/v1/plan_service_pb";import type { PlanCheckRun } from "@/types/proto-es/v1/plan_service_pb";-import { Advice_Level, type Advice } from "@/types/proto-es/v1/sql_service_pb";+import { PlanCheckRun_Type } from "@/types/proto-es/v1/plan_service_pb";+import { type Advice, Advice_Level } from "@/types/proto-es/v1/sql_service_pb";import { extractPlanCheckRunUID } from "@/utils";export const useSQLAdviceMarkers = (diff --git a/frontend/src/components/Plan/components/StatementSection/useSpecSheet.ts b/frontend/src/components/Plan/components/StatementSection/useSpecSheet.tsindex 0d9872c58c..b84e0f6a66 100644--- a/frontend/src/components/Plan/components/StatementSection/useSpecSheet.ts+++ b/frontend/src/components/Plan/components/StatementSection/useSpecSheet.ts@@ -1,5 +1,5 @@import { computedAsync } from "@vueuse/core";-import { computed, ref, type ComputedRef } from "vue";+import { type ComputedRef, computed, ref } from "vue";import { getLocalSheetByName } from "@/components/Plan";import { useSheetV1Store } from "@/store";import type { Plan_Spec } from "@/types/proto-es/v1/plan_service_pb";diff --git a/frontend/src/components/Plan/components/common/CheckResultItem.vue b/frontend/src/components/Plan/components/common/CheckResultItem.vueindex 6c2046d38c..50d5569441 100644--- a/frontend/src/components/Plan/components/common/CheckResultItem.vue+++ b/frontend/src/components/Plan/components/common/CheckResultItem.vue@@ -38,7 +38,7 @@</template><script setup lang="ts">-import { CheckCircleIcon, AlertCircleIcon, XCircleIcon } from "lucide-vue-next";+import { AlertCircleIcon, CheckCircleIcon, XCircleIcon } from "lucide-vue-next";import { NTag } from "naive-ui";import { computed } from "vue";import { getRuleLocalization, ruleTemplateMapV2 } from "@/types";diff --git a/frontend/src/components/Plan/components/common/DatabaseDisplay.vue b/frontend/src/components/Plan/components/common/DatabaseDisplay.vueindex 34471ae7d6..31304b95a9 100644--- a/frontend/src/components/Plan/components/common/DatabaseDisplay.vue+++ b/frontend/src/components/Plan/components/common/DatabaseDisplay.vue@@ -34,8 +34,7 @@<script setup lang="ts">import { ChevronRightIcon, ExternalLinkIcon } from "lucide-vue-next";import { computed } from "vue";-import { InstanceV1EngineIcon } from "@/components/v2";-import { EnvironmentV1Name } from "@/components/v2";+import { EnvironmentV1Name, InstanceV1EngineIcon } from "@/components/v2";import {useDatabaseV1Store,useEnvironmentV1Store,diff --git a/frontend/src/components/Plan/components/common/validateSpec.ts b/frontend/src/components/Plan/components/common/validateSpec.tsindex dd75b2a30d..b4f96b0ff0 100644--- a/frontend/src/components/Plan/components/common/validateSpec.ts+++ b/frontend/src/components/Plan/components/common/validateSpec.ts@@ -1,4 +1,4 @@-import { ref, watchEffect, type Ref, unref } from "vue";+import { type Ref, ref, unref, watchEffect } from "vue";import { getLocalSheetByName } from "@/components/Plan";import { useSheetV1Store } from "@/store";import type { Plan_Spec } from "@/types/proto-es/v1/plan_service_pb";diff --git a/frontend/src/components/Plan/logic/initialize/create.ts b/frontend/src/components/Plan/logic/initialize/create.tsindex 3028cd6eee..77210b0eeb 100644--- a/frontend/src/components/Plan/logic/initialize/create.ts+++ b/frontend/src/components/Plan/logic/initialize/create.ts@@ -12,10 +12,10 @@ import {} from "@/types/proto-es/v1/common_pb";import type { Plan_Spec } from "@/types/proto-es/v1/plan_service_pb";import {- PlanSchema,Plan_ChangeDatabaseConfigSchema,Plan_ExportDataConfigSchema,Plan_SpecSchema,+ PlanSchema,} from "@/types/proto-es/v1/plan_service_pb";import type { Project } from "@/types/proto-es/v1/project_service_pb";import { extractSheetUID, getSheetStatement, setSheetStatement } from "@/utils";diff --git a/frontend/src/components/Plan/logic/poller/poller.ts b/frontend/src/components/Plan/logic/poller/poller.tsindex 92c7f27813..4931d76108 100644--- a/frontend/src/components/Plan/logic/poller/poller.ts+++ b/frontend/src/components/Plan/logic/poller/poller.ts@@ -3,12 +3,12 @@ import { includes, uniq } from "lodash-es";import { v4 as uuidv4 } from "uuid";import {computed,+ type InjectionKey,inject,provide,ref,watch,watchEffect,- type InjectionKey,} from "vue";import { useRoute } from "vue-router";import { useProgressivePoll } from "@/composables/useProgressivePoll";@@ -28,10 +28,10 @@ import { RolloutSchema } from "@/types/proto-es/v1/rollout_service_pb";import { isValidIssueName, isValidPlanName } from "@/utils";import { usePlanContext } from "../context";import {+ refreshIssue,refreshPlan,refreshPlanCheckRuns,refreshRollout,- refreshIssue,refreshTaskRuns,} from "./utils";diff --git a/frontend/src/components/Plan/logic/poller/utils.ts b/frontend/src/components/Plan/logic/poller/utils.tsindex b8ec2ec202..a9bb9631ff 100644--- a/frontend/src/components/Plan/logic/poller/utils.ts+++ b/frontend/src/components/Plan/logic/poller/utils.ts@@ -5,19 +5,19 @@ import {planServiceClientConnect,rolloutServiceClientConnect,} from "@/grpcweb";-import { GetIssueRequestSchema } from "@/types/proto-es/v1/issue_service_pb";import type { Issue } from "@/types/proto-es/v1/issue_service_pb";+import { GetIssueRequestSchema } from "@/types/proto-es/v1/issue_service_pb";+import type { Plan, PlanCheckRun } from "@/types/proto-es/v1/plan_service_pb";import {GetPlanRequestSchema,ListPlanCheckRunsRequestSchema,} from "@/types/proto-es/v1/plan_service_pb";-import type { Plan, PlanCheckRun } from "@/types/proto-es/v1/plan_service_pb";import type { Project } from "@/types/proto-es/v1/project_service_pb";+import type { Rollout, TaskRun } from "@/types/proto-es/v1/rollout_service_pb";import {GetRolloutRequestSchema,ListTaskRunsRequestSchema,} from "@/types/proto-es/v1/rollout_service_pb";-import type { Rollout, TaskRun } from "@/types/proto-es/v1/rollout_service_pb";import { hasProjectPermissionV2 } from "@/utils";export const refreshPlan = async (plan: Ref<Plan>): Promise<void> => {diff --git a/frontend/src/components/Plan/logic/useEditorState.ts b/frontend/src/components/Plan/logic/useEditorState.tsindex 67211aa9ca..edae27c6b0 100644--- a/frontend/src/components/Plan/logic/useEditorState.ts+++ b/frontend/src/components/Plan/logic/useEditorState.ts@@ -1,4 +1,4 @@-import { ref, type Ref } from "vue";+import { type Ref, ref } from "vue";export interface EditorState {isEditing: Ref<boolean>;diff --git a/frontend/src/components/Plan/logic/usePlanCheckStatus.ts b/frontend/src/components/Plan/logic/usePlanCheckStatus.tsindex fa3ba11495..a4d6f562e0 100644--- a/frontend/src/components/Plan/logic/usePlanCheckStatus.ts+++ b/frontend/src/components/Plan/logic/usePlanCheckStatus.ts@@ -1,7 +1,7 @@-import { computed, type ComputedRef, type Ref } from "vue";+import { type ComputedRef, computed, type Ref } from "vue";import {- PlanCheckRun_Status,type Plan,+ PlanCheckRun_Status,} from "@/types/proto-es/v1/plan_service_pb";import { Advice_Level } from "@/types/proto-es/v1/sql_service_pb";diff --git a/frontend/src/components/Plan/logic/utils.ts b/frontend/src/components/Plan/logic/utils.tsindex 1554840c65..b374a1dc39 100644--- a/frontend/src/components/Plan/logic/utils.ts+++ b/frontend/src/components/Plan/logic/utils.ts@@ -2,8 +2,7 @@ import { create } from "@bufbuild/protobuf";import { cloneDeep } from "lodash-es";import { planServiceClientConnect } from "@/grpcweb";import { t } from "@/plugins/i18n";-import { projectNamePrefix, useSheetV1Store } from "@/store";-import { useProjectV1Store } from "@/store";+import { projectNamePrefix, useProjectV1Store, useSheetV1Store } from "@/store";import {DatabaseChangeType,MigrationType,diff --git a/frontend/src/components/PlanCheckRun/PlanCheckRunBadge.vue b/frontend/src/components/PlanCheckRun/PlanCheckRunBadge.vueindex 06d81d71db..e222fe9b3d 100644--- a/frontend/src/components/PlanCheckRun/PlanCheckRunBadge.vue+++ b/frontend/src/components/PlanCheckRun/PlanCheckRunBadge.vue@@ -38,7 +38,7 @@<script setup lang="ts">import { maxBy } from "lodash-es";-import { CheckIcon, TriangleAlertIcon, CircleAlertIcon } from "lucide-vue-next";+import { CheckIcon, CircleAlertIcon, TriangleAlertIcon } from "lucide-vue-next";import { NTag } from "naive-ui";import { computed } from "vue";import { useI18n } from "vue-i18n";diff --git a/frontend/src/components/PlanCheckRun/PlanCheckRunBadgeBar.vue b/frontend/src/components/PlanCheckRun/PlanCheckRunBadgeBar.vueindex f2f780908f..c74052bda9 100644--- a/frontend/src/components/PlanCheckRun/PlanCheckRunBadgeBar.vue+++ b/frontend/src/components/PlanCheckRun/PlanCheckRunBadgeBar.vue@@ -16,8 +16,8 @@import { orderBy } from "lodash-es";import { computed } from "vue";import {- PlanCheckRun_Type,type PlanCheckRun,+ PlanCheckRun_Type,} from "@/types/proto-es/v1/plan_service_pb";import { groupBy } from "@/utils/collections";import PlanCheckRunBadge from "./PlanCheckRunBadge.vue";diff --git a/frontend/src/components/PlanCheckRun/PlanCheckRunBar.vue b/frontend/src/components/PlanCheckRun/PlanCheckRunBar.vueindex 9214293e78..5cc7a28f57 100644--- a/frontend/src/components/PlanCheckRun/PlanCheckRunBar.vue+++ b/frontend/src/components/PlanCheckRun/PlanCheckRunBar.vue@@ -37,16 +37,16 @@ import { create } from "@bufbuild/protobuf";import { ref } from "vue";import { planServiceClientConnect } from "@/grpcweb";import type { ComposedDatabase } from "@/types";-import { RunPlanChecksRequestSchema } from "@/types/proto-es/v1/plan_service_pb";import type {PlanCheckRun,PlanCheckRun_Type,} from "@/types/proto-es/v1/plan_service_pb";+import { RunPlanChecksRequestSchema } from "@/types/proto-es/v1/plan_service_pb";import type { VueClass } from "@/utils";+import { usePlanCheckRunContext } from "./context";import PlanCheckRunBadgeBar from "./PlanCheckRunBadgeBar.vue";import PlanCheckRunButton from "./PlanCheckRunButton.vue";import PlanCheckRunModal from "./PlanCheckRunModal.vue";-import { usePlanCheckRunContext } from "./context";const props = withDefaults(defineProps<{diff --git a/frontend/src/components/PlanCheckRun/PlanCheckRunDetail.vue b/frontend/src/components/PlanCheckRun/PlanCheckRunDetail.vueindex c8d6d1df98..8e1996a047 100644--- a/frontend/src/components/PlanCheckRun/PlanCheckRunDetail.vue+++ b/frontend/src/components/PlanCheckRun/PlanCheckRunDetail.vue@@ -248,23 +248,23 @@ import {planNamePrefix,projectNamePrefix,} from "@/store/modules/v1/common";-import type { RuleTemplateV2, ComposedDatabase } from "@/types";+import type { ComposedDatabase, RuleTemplateV2 } from "@/types";import {+ convertPolicyRuleToRuleTemplate,GeneralErrorCode,- SQLReviewPolicyErrorCode,getRuleLocalization,ruleTemplateMapV2,- convertPolicyRuleToRuleTemplate,+ SQLReviewPolicyErrorCode,} from "@/types";import { SQLReviewRuleLevel } from "@/types/proto-es/v1/org_policy_service_pb";-import { BatchCancelPlanCheckRunsRequestSchema } from "@/types/proto-es/v1/plan_service_pb";import type {PlanCheckRun,PlanCheckRun_Result,} from "@/types/proto-es/v1/plan_service_pb";import {- PlanCheckRun_Status,+ BatchCancelPlanCheckRunsRequestSchema,PlanCheckRun_ResultSchema,+ PlanCheckRun_Status,} from "@/types/proto-es/v1/plan_service_pb";import { Advice_Level } from "@/types/proto-es/v1/sql_service_pb";import { convertPositionLineToMonacoLine } from "@/utils/v1/position";diff --git a/frontend/src/components/PlanCheckRun/PlanCheckRunPanel.vue b/frontend/src/components/PlanCheckRun/PlanCheckRunPanel.vueindex 501043417b..5a405c3881 100644--- a/frontend/src/components/PlanCheckRun/PlanCheckRunPanel.vue+++ b/frontend/src/components/PlanCheckRun/PlanCheckRunPanel.vue@@ -27,10 +27,10 @@ import { computed, ref } from "vue";import { useI18n } from "vue-i18n";import type { TabFilterItem } from "@/components/v2";import { TabFilter } from "@/components/v2";-import { getDateForPbTimestampProtoEs, type ComposedDatabase } from "@/types";+import { type ComposedDatabase, getDateForPbTimestampProtoEs } from "@/types";import {- PlanCheckRun_Type,type PlanCheckRun,+ PlanCheckRun_Type,} from "@/types/proto-es/v1/plan_service_pb";import { Advice_Level } from "@/types/proto-es/v1/sql_service_pb";import { extractPlanCheckRunUID, humanizeDate } from "@/utils";diff --git a/frontend/src/components/PlanCheckRun/common.ts b/frontend/src/components/PlanCheckRun/common.tsindex 5048075776..82fe42f4b3 100644--- a/frontend/src/components/PlanCheckRun/common.ts+++ b/frontend/src/components/PlanCheckRun/common.ts@@ -1,8 +1,8 @@import { maxBy } from "lodash-es";import {+ type PlanCheckRun,PlanCheckRun_Status,PlanCheckRun_Type,- type PlanCheckRun,} from "@/types/proto-es/v1/plan_service_pb";import { Advice_Level } from "@/types/proto-es/v1/sql_service_pb";import { extractPlanCheckRunUID } from "@/utils";diff --git a/frontend/src/components/ProfileDropdown.vue b/frontend/src/components/ProfileDropdown.vueindex d4da41bc9b..78baa2740b 100644--- a/frontend/src/components/ProfileDropdown.vue+++ b/frontend/src/components/ProfileDropdown.vue@@ -15,7 +15,7 @@<script lang="tsx" setup>import type { DropdownOption } from "naive-ui";-import { NSwitch, NDropdown } from "naive-ui";+import { NDropdown, NSwitch } from "naive-ui";import { storeToRefs } from "pinia";import { twMerge } from "tailwind-merge";import { computed, ref } from "vue";@@ -35,9 +35,9 @@ import {} from "@/store";import { PlanType } from "@/types/proto-es/v1/subscription_service_pb";import { hasWorkspacePermissionV2, isDev, isSQLEditorRoute } from "@/utils";+import Version from "./misc/Version.vue";import ProfilePreview from "./ProfilePreview.vue";import UserAvatar from "./User/UserAvatar.vue";-import Version from "./misc/Version.vue";const { t } = useI18n();diff --git a/frontend/src/components/Project/ProjectIssuesPanel.vue b/frontend/src/components/Project/ProjectIssuesPanel.vueindex d536f901cd..73dff119b9 100644--- a/frontend/src/components/Project/ProjectIssuesPanel.vue+++ b/frontend/src/components/Project/ProjectIssuesPanel.vue@@ -26,26 +26,29 @@<script lang="ts" setup>import { type UseStorageOptions } from "@vueuse/core";-import { reactive, computed, watch, ref, onMounted } from "vue";+import { computed, onMounted, reactive, ref, watch } from "vue";import type { ComponentExposed } from "vue-component-type-helpers";import { useRoute, useRouter } from "vue-router";import IssueTableV1 from "@/components/IssueV1/components/IssueTableV1.vue";import PagedTable from "@/components/v2/Model/PagedTable.vue";-import { useCurrentUserV1 } from "@/store";-import { useIssueV1Store, useRefreshIssueList } from "@/store";+import {+ useCurrentUserV1,+ useIssueV1Store,+ useRefreshIssueList,+} from "@/store";import type { ComposedIssue } from "@/types";import type { Project } from "@/types/proto-es/v1/project_service_pb";import type { SearchParams, SearchScope, SemanticIssueStatus } from "@/utils";import {+ applyUIIssueFilter,buildIssueFilterBySearchParams,+ buildSearchParamsBySearchText,+ buildSearchTextBySearchParams,buildUIIssueFilterBySearchParams,extractProjectResourceName,getSemanticIssueStatusFromSearchParams,- useDynamicLocalStorage,- applyUIIssueFilter,- buildSearchTextBySearchParams,- buildSearchParamsBySearchText,mergeSearchParams,+ useDynamicLocalStorage,} from "@/utils";import { IssueSearch } from "../IssueV1/components";diff --git a/frontend/src/components/Project/ProjectSwitch/ProjectSwitchContent.vue b/frontend/src/components/Project/ProjectSwitch/ProjectSwitchContent.vueindex 98877371ab..46018dbef8 100644--- a/frontend/src/components/Project/ProjectSwitch/ProjectSwitchContent.vue+++ b/frontend/src/components/Project/ProjectSwitch/ProjectSwitchContent.vue@@ -72,11 +72,11 @@<script lang="ts" setup>import { ChevronLeftIcon, PlusIcon } from "lucide-vue-next";import { NButton, NTabPane, NTabs, NTooltip } from "naive-ui";-import { computed, reactive, onMounted, watch } from "vue";+import { computed, onMounted, reactive, watch } from "vue";import { useI18n } from "vue-i18n";import { useRouter } from "vue-router";import { useRecentProjects } from "@/components/Project/useRecentProjects";-import { SearchBox, ProjectV1Table, PagedProjectTable } from "@/components/v2";+import { PagedProjectTable, ProjectV1Table, SearchBox } from "@/components/v2";import { PROJECT_V1_ROUTE_DETAIL } from "@/router/dashboard/projectV1";import { WORKSPACE_ROUTE_LANDING } from "@/router/dashboard/workspaceRoutes";import { useRecentVisit } from "@/router/useRecentVisit";diff --git a/frontend/src/components/Project/Settings/ProjectGeneralSettingPanel.vue b/frontend/src/components/Project/Settings/ProjectGeneralSettingPanel.vueindex bd1db9b79f..dc6b37078e 100644--- a/frontend/src/components/Project/Settings/ProjectGeneralSettingPanel.vue+++ b/frontend/src/components/Project/Settings/ProjectGeneralSettingPanel.vue@@ -52,9 +52,9 @@ import { useProjectV1Store } from "@/store";import { DEFAULT_PROJECT_NAME } from "@/types";import type { Project } from "@/types/proto-es/v1/project_service_pb";import {- extractProjectResourceName,- convertLabelsToKVList,convertKVListToLabels,+ convertLabelsToKVList,+ extractProjectResourceName,} from "@/utils";interface LocalState {diff --git a/frontend/src/components/Project/Settings/ProjectSecuritySettingPanel.vue b/frontend/src/components/Project/Settings/ProjectSecuritySettingPanel.vueindex 5a33eecc43..5029992d34 100644--- a/frontend/src/components/Project/Settings/ProjectSecuritySettingPanel.vue+++ b/frontend/src/components/Project/Settings/ProjectSecuritySettingPanel.vue@@ -14,7 +14,7 @@</template><script setup lang="ts">-import { ref, computed } from "vue";+import { computed, ref } from "vue";import AccessControlConfigure from "@/components/EnvironmentForm/AccessControlConfigure.vue";import { SQLReviewForResource } from "@/components/SQLReview";import type { Project } from "@/types/proto-es/v1/project_service_pb";diff --git a/frontend/src/components/Project/useProjectSidebar.ts b/frontend/src/components/Project/useProjectSidebar.tsindex 4dbe2de436..e60091283b 100644--- a/frontend/src/components/Project/useProjectSidebar.ts+++ b/frontend/src/components/Project/useProjectSidebar.ts@@ -1,34 +1,34 @@import {- Database,CircleDot,- Users,- Settings,+ Database,DownloadIcon,- PackageIcon,LayoutList,+ PackageIcon,PlayCircle,+ Settings,+ Users,Workflow,} from "lucide-vue-next";-import { computed, h, unref, type MaybeRef } from "vue";+import { computed, h, type MaybeRef, unref } from "vue";import { useRoute } from "vue-router";import type { SidebarItem } from "@/components/v2/Sidebar/type";import { getFlattenRoutes } from "@/components/v2/Sidebar/utils.ts";import { useIssueLayoutVersion } from "@/composables/useIssueLayoutVersion";import { t } from "@/plugins/i18n";import projectV1Routes, {- PROJECT_V1_ROUTE_DATABASES,- PROJECT_V1_ROUTE_ISSUES,- PROJECT_V1_ROUTE_SYNC_SCHEMA,- PROJECT_V1_ROUTE_MEMBERS,- PROJECT_V1_ROUTE_SETTINGS,- PROJECT_V1_ROUTE_WEBHOOKS,+ PROJECT_V1_ROUTE_AUDIT_LOGS,PROJECT_V1_ROUTE_DATABASE_GROUPS,+ PROJECT_V1_ROUTE_DATABASES,PROJECT_V1_ROUTE_EXPORT_CENTER,- PROJECT_V1_ROUTE_AUDIT_LOGS,- PROJECT_V1_ROUTE_RELEASES,+ PROJECT_V1_ROUTE_ISSUES,PROJECT_V1_ROUTE_MASKING_EXEMPTION,+ PROJECT_V1_ROUTE_MEMBERS,PROJECT_V1_ROUTE_PLANS,+ PROJECT_V1_ROUTE_RELEASES,PROJECT_V1_ROUTE_ROLLOUTS,+ PROJECT_V1_ROUTE_SETTINGS,+ PROJECT_V1_ROUTE_SYNC_SCHEMA,+ PROJECT_V1_ROUTE_WEBHOOKS,} from "@/router/dashboard/projectV1";import { DEFAULT_PROJECT_NAME } from "@/types";import type { Project } from "@/types/proto-es/v1/project_service_pb";diff --git a/frontend/src/components/Project/useRecentProjects.ts b/frontend/src/components/Project/useRecentProjects.tsindex f128d3e571..b7a8885587 100644--- a/frontend/src/components/Project/useRecentProjects.ts+++ b/frontend/src/components/Project/useRecentProjects.ts@@ -1,6 +1,6 @@import { computedAsync } from "@vueuse/core";import { computed } from "vue";-import { useProjectV1Store, useCurrentUserV1 } from "@/store";+import { useCurrentUserV1, useProjectV1Store } from "@/store";import { isValidProjectName } from "@/types";import { hasProjectPermissionV2, useDynamicLocalStorage } from "@/utils";diff --git a/frontend/src/components/ProjectDatabasesPanel.vue b/frontend/src/components/ProjectDatabasesPanel.vueindex 7ed541b209..7a4184a7a4 100644--- a/frontend/src/components/ProjectDatabasesPanel.vue+++ b/frontend/src/components/ProjectDatabasesPanel.vue@@ -49,16 +49,16 @@<script lang="ts" setup>import { PlusIcon } from "lucide-vue-next";import { NButton } from "naive-ui";-import { reactive, computed, ref, watch } from "vue";+import { computed, reactive, ref, watch } from "vue";import { CreateDatabasePrepPanel } from "@/components/CreateDatabasePrepForm";import { Drawer } from "@/components/v2";import { PagedDatabaseTable } from "@/components/v2/Model/DatabaseV1Table";import { useDatabaseV1Store } from "@/store";import {- instanceNamePrefix,environmentNamePrefix,+ instanceNamePrefix,} from "@/store/modules/v1/common";-import { isValidDatabaseName, type ComposedDatabase } from "@/types";+import { type ComposedDatabase, isValidDatabaseName } from "@/types";import { Engine } from "@/types/proto-es/v1/common_pb";import type { Project } from "@/types/proto-es/v1/project_service_pb";import type { SearchParams, SearchScope } from "@/utils";diff --git a/frontend/src/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vue b/frontend/src/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vueindex 568bfc01d8..856cd4e5fd 100644--- a/frontend/src/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vue+++ b/frontend/src/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vue@@ -78,13 +78,13 @@/* eslint-disable vue/no-mutating-props */import { isUndefined } from "lodash-es";import { NButton, NInput } from "naive-ui";-import { computed, reactive, watch, ref } from "vue";+import { computed, reactive, ref, watch } from "vue";import ExpirationSelector from "@/components/ExpirationSelector.vue";import QuerierDatabaseResourceForm from "@/components/GrantRequestPanel/DatabaseResourceForm/index.vue";import MembersBindingSelect from "@/components/Member/MembersBindingSelect.vue";import RequiredStar from "@/components/RequiredStar.vue";import { RoleSelect } from "@/components/v2/Select";-import { PresetRoleType, type DatabaseResource } from "@/types";+import { type DatabaseResource, PresetRoleType } from "@/types";import type { Binding } from "@/types/proto-es/v1/iam_policy_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import { checkRoleContainsAnyPermission } from "@/utils";diff --git a/frontend/src/components/ProjectMember/ProjectMemberPanel.vue b/frontend/src/components/ProjectMember/ProjectMemberPanel.vueindex 540a22a814..82c9b9d7bf 100644--- a/frontend/src/components/ProjectMember/ProjectMemberPanel.vue+++ b/frontend/src/components/ProjectMember/ProjectMemberPanel.vue@@ -123,9 +123,9 @@ import {useWorkspaceV1Store,} from "@/store";import {+ groupBindingPrefix,PRESET_WORKSPACE_ROLES,PresetRoleType,- groupBindingPrefix,} from "@/types";import type { Project } from "@/types/proto-es/v1/project_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";diff --git a/frontend/src/components/ProjectMember/ProjectMemberRolePanel/EditProjectRolePanel.vue b/frontend/src/components/ProjectMember/ProjectMemberRolePanel/EditProjectRolePanel.vueindex 6336cc002d..0ccfbef4ec 100644--- a/frontend/src/components/ProjectMember/ProjectMemberRolePanel/EditProjectRolePanel.vue+++ b/frontend/src/components/ProjectMember/ProjectMemberRolePanel/EditProjectRolePanel.vue@@ -101,7 +101,7 @@<script lang="ts" setup>import { cloneDeep, isEqual } from "lodash-es";import { NButton, NInput } from "naive-ui";-import { computed, reactive, onMounted, ref } from "vue";+import { computed, onMounted, reactive, ref } from "vue";import { useI18n } from "vue-i18n";import { BBButtonConfirm } from "@/bbkit";import ExpirationSelector from "@/components/ExpirationSelector.vue";@@ -110,17 +110,17 @@ import MembersBindingSelect from "@/components/Member/MembersBindingSelect.vue";import RequiredStar from "@/components/RequiredStar.vue";import { Drawer, DrawerContent } from "@/components/v2";import {+ pushNotification,useProjectIamPolicy,useProjectIamPolicyStore,- pushNotification,} from "@/store";-import { PresetRoleType, type DatabaseResource } from "@/types";+import { type DatabaseResource, PresetRoleType } from "@/types";import { State } from "@/types/proto-es/v1/common_pb";import type { Binding } from "@/types/proto-es/v1/iam_policy_pb";import type { Project } from "@/types/proto-es/v1/project_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";-import { displayRoleTitle, checkRoleContainsAnyPermission } from "@/utils";-import { convertFromExpr, buildConditionExpr } from "@/utils/issue/cel";+import { checkRoleContainsAnyPermission, displayRoleTitle } from "@/utils";+import { buildConditionExpr, convertFromExpr } from "@/utils/issue/cel";import { getBindingIdentifier } from "../utils";const props = defineProps<{diff --git a/frontend/src/components/ProjectMember/ProjectMemberRolePanel/index.vue b/frontend/src/components/ProjectMember/ProjectMemberRolePanel/index.vueindex 2c4966df5b..1b57fefa11 100644--- a/frontend/src/components/ProjectMember/ProjectMemberRolePanel/index.vue+++ b/frontend/src/components/ProjectMember/ProjectMemberRolePanel/index.vue@@ -138,8 +138,8 @@ import { create } from "@bufbuild/protobuf";import { computedAsync } from "@vueuse/core";import { cloneDeep, isEqual } from "lodash-es";import { Building2Icon, PencilIcon, TrashIcon } from "lucide-vue-next";-import { NButton, NTag, NTooltip, NDataTable, useDialog } from "naive-ui";import type { DataTableColumn } from "naive-ui";+import { NButton, NDataTable, NTag, NTooltip, useDialog } from "naive-ui";import { computed, reactive, ref, watch } from "vue";import { useI18n } from "vue-i18n";import { BBButtonConfirm } from "@/bbkit";@@ -148,25 +148,25 @@ import GroupMemberNameCell from "@/components/User/Settings/UserDataTableByGroupimport GroupNameCell from "@/components/User/Settings/UserDataTableByGroup/cells/GroupNameCell.vue";import { Drawer, DrawerContent, InstanceV1Name } from "@/components/v2";import {+ batchGetOrFetchDatabases,extractGroupEmail,extractUserId,+ pushNotification,useDatabaseV1Store,useProjectIamPolicy,useProjectIamPolicyStore,useUserStore,- pushNotification,- batchGetOrFetchDatabases,} from "@/store";-import { PresetRoleType, PRESET_ROLES, type DatabaseResource } from "@/types";+import { type DatabaseResource, PRESET_ROLES, PresetRoleType } from "@/types";import { State } from "@/types/proto-es/v1/common_pb";import type { Binding } from "@/types/proto-es/v1/iam_policy_pb";import { BindingSchema } from "@/types/proto-es/v1/iam_policy_pb";import type { Project } from "@/types/proto-es/v1/project_service_pb";import {+ checkRoleContainsAnyPermission,displayRoleTitle,hasProjectPermissionV2,memberMapToRolesInProjectIAM,- checkRoleContainsAnyPermission,} from "@/utils";import { buildConditionExpr, convertFromExpr } from "@/utils/issue/cel";import AddProjectMembersPanel from "../AddProjectMember/AddProjectMembersPanel.vue";diff --git a/frontend/src/components/ProjectSettingPanel.vue b/frontend/src/components/ProjectSettingPanel.vueindex 307586bb89..c38584f71e 100644--- a/frontend/src/components/ProjectSettingPanel.vue+++ b/frontend/src/components/ProjectSettingPanel.vue@@ -71,7 +71,7 @@<script lang="ts" setup>import { NButton } from "naive-ui";-import { ref, computed } from "vue";+import { computed, ref } from "vue";import { useI18n } from "vue-i18n";import { useRouteChangeGuard } from "@/composables/useRouteChangeGuard";import { pushNotification } from "@/store";@@ -79,8 +79,8 @@ import type { Project } from "@/types/proto-es/v1/project_service_pb";import ProjectArchiveRestoreButton from "./Project/ProjectArchiveRestoreButton.vue";import {ProjectGeneralSettingPanel,- ProjectSecuritySettingPanel,ProjectIssueRelatedSettingPanel,+ ProjectSecuritySettingPanel,} from "./Project/Settings/";defineProps<{diff --git a/frontend/src/components/ProjectWebhookForm.vue b/frontend/src/components/ProjectWebhookForm.vueindex a047e0070b..062ecd0a7c 100644--- a/frontend/src/components/ProjectWebhookForm.vue+++ b/frontend/src/components/ProjectWebhookForm.vue@@ -240,28 +240,28 @@ import { InfoIcon } from "lucide-vue-next";import {NButton,NCheckbox,+ NDivider,NInput,NRadio,NRadioGroup,NTooltip,- NDivider,} from "naive-ui";-import { reactive, computed, watch } from "vue";+import { computed, reactive, watch } from "vue";import { useI18n } from "vue-i18n";import { useRouter } from "vue-router";import { BBAttention, BBButtonConfirm } from "@/bbkit";import RequiredStar from "@/components/RequiredStar.vue";import FormLayout from "@/components/v2/Form/FormLayout.vue";import {- PROJECT_V1_ROUTE_WEBHOOKS,PROJECT_V1_ROUTE_WEBHOOK_DETAIL,+ PROJECT_V1_ROUTE_WEBHOOKS,} from "@/router/dashboard/projectV1";import { WORKSPACE_ROUTE_IM } from "@/router/dashboard/workspaceRoutes";import {pushNotification,+ useGracefulRequest,useProjectV1Store,useProjectWebhookV1Store,- useGracefulRequest,useSettingV1Store,} from "@/store";import {diff --git a/frontend/src/components/ProjectWebhookPanel.vue b/frontend/src/components/ProjectWebhookPanel.vueindex b7fa975852..d8a2e326e4 100644--- a/frontend/src/components/ProjectWebhookPanel.vue+++ b/frontend/src/components/ProjectWebhookPanel.vue@@ -20,8 +20,8 @@<script lang="tsx" setup>import { PlusIcon } from "lucide-vue-next";-import { NButton, NDataTable, NTag } from "naive-ui";import type { DataTableColumn } from "naive-ui";+import { NButton, NDataTable, NTag } from "naive-ui";import { computed, h } from "vue";import { useI18n } from "vue-i18n";import { useRouter } from "vue-router";diff --git a/frontend/src/components/ProvideDashboardContext.vue b/frontend/src/components/ProvideDashboardContext.vueindex af0ef73772..23221e31d2 100644--- a/frontend/src/components/ProvideDashboardContext.vue+++ b/frontend/src/components/ProvideDashboardContext.vue@@ -4,7 +4,7 @@</template><script lang="ts" setup>-import { ref, onMounted } from "vue";+import { onMounted, ref } from "vue";import { useRouter } from "vue-router";import {useEnvironmentV1Store,diff --git a/frontend/src/components/ProvideSQLEditorContext.vue b/frontend/src/components/ProvideSQLEditorContext.vueindex e5cc75fed9..7e3093f392 100644--- a/frontend/src/components/ProvideSQLEditorContext.vue+++ b/frontend/src/components/ProvideSQLEditorContext.vue@@ -26,20 +26,20 @@ import { useI18n } from "vue-i18n";import { useRoute, useRouter } from "vue-router";import { ProvideAIContext } from "@/plugins/ai";import {+ SQL_EDITOR_DATABASE_MODULE,SQL_EDITOR_HOME_MODULE,SQL_EDITOR_INSTANCE_MODULE,- SQL_EDITOR_DATABASE_MODULE,- SQL_EDITOR_WORKSHEET_MODULE,SQL_EDITOR_PROJECT_MODULE,+ SQL_EDITOR_WORKSHEET_MODULE,} from "@/router/sqlEditor";import {+ pushNotification,+ useDatabaseV1Store,usePolicyV1Store,useProjectV1Store,- useDatabaseV1Store,useSQLEditorStore,useSQLEditorTabStore,useWorkSheetStore,- pushNotification,} from "@/store";import type { SQLEditorConnection } from "@/types";import {@@ -52,7 +52,10 @@ import {import { PolicyResourceType } from "@/types/proto-es/v1/org_policy_service_pb";import {emptySQLEditorConnection,+ extractInstanceResourceName,extractProjectResourceName,+ extractWorksheetUID,+ getDefaultPagination,getSheetStatement,hasProjectPermissionV2,isDatabaseV1Queryable,@@ -60,15 +63,12 @@ import {projectNameFromSheetSlug,suggestedTabTitleForSQLEditorConnection,worksheetNameFromSlug,- extractWorksheetUID,- extractInstanceResourceName,- getDefaultPagination,} from "@/utils";-import { extractWorksheetConnection } from "@/views/sql-editor/Sheet";import {- useSQLEditorContext,type AsidePanelTab,+ useSQLEditorContext,} from "@/views/sql-editor/context";+import { extractWorksheetConnection } from "@/views/sql-editor/Sheet";const { t } = useI18n();const route = useRoute();diff --git a/frontend/src/components/Quickstart.vue b/frontend/src/components/Quickstart.vueindex 6b591d3b9d..bffe67cd43 100644--- a/frontend/src/components/Quickstart.vue+++ b/frontend/src/components/Quickstart.vue@@ -82,7 +82,7 @@<script setup lang="ts">import { computedAsync } from "@vueuse/core";-import { XIcon, CheckCircleIcon } from "lucide-vue-next";+import { CheckCircleIcon, XIcon } from "lucide-vue-next";import type { Ref } from "vue";import { computed, unref } from "vue";import { useI18n } from "vue-i18n";@@ -90,28 +90,28 @@ import type { RouteLocationRaw } from "vue-router";import { PROJECT_V1_ROUTE_ISSUE_DETAIL } from "@/router/dashboard/projectV1";import {DATABASE_ROUTE_DASHBOARD,+ ENVIRONMENT_V1_ROUTE_DASHBOARD,INSTANCE_ROUTE_DASHBOARD,PROJECT_V1_ROUTE_DASHBOARD,- ENVIRONMENT_V1_ROUTE_DASHBOARD,WORKSPACE_ROUTE_USERS,} from "@/router/dashboard/workspaceRoutes";import { SQL_EDITOR_WORKSHEET_MODULE } from "@/router/sqlEditor";import {- useAppFeature,pushNotification,- useUIStateStore,- useProjectV1Store,useActuatorV1Store,+ useAppFeature,useIssueV1Store,+ useProjectV1Store,+ useUIStateStore,useWorkSheetStore,} from "@/store";import { projectNamePrefix } from "@/store/modules/v1/common";import type { Permission } from "@/types";-import { UNKNOWN_PROJECT_NAME, isValidProjectName } from "@/types";+import { isValidProjectName, UNKNOWN_PROJECT_NAME } from "@/types";import {- hasWorkspacePermissionV2,- hasProjectPermissionV2,extractProjectResourceName,+ hasProjectPermissionV2,+ hasWorkspacePermissionV2,} from "@/utils";// The name of the sample project.diff --git a/frontend/src/components/Release/ReleaseDataTable.vue b/frontend/src/components/Release/ReleaseDataTable.vueindex d6de0fa210..22d1c879b4 100644--- a/frontend/src/components/Release/ReleaseDataTable.vue+++ b/frontend/src/components/Release/ReleaseDataTable.vue@@ -16,7 +16,7 @@<script lang="tsx" setup>import type { DataTableColumn } from "naive-ui";import { NDataTable, NTag } from "naive-ui";-import { reactive, computed, watch } from "vue";+import { computed, reactive, watch } from "vue";import { useI18n } from "vue-i18n";import { useRouter } from "vue-router";import { getTimeForPbTimestampProtoEs } from "@/types";diff --git a/frontend/src/components/Release/ReleaseDetail/NavBar/ApplyToDatabasePanel.vue b/frontend/src/components/Release/ReleaseDetail/NavBar/ApplyToDatabasePanel.vueindex 55b0f1ce8a..20fa38e006 100644--- a/frontend/src/components/Release/ReleaseDetail/NavBar/ApplyToDatabasePanel.vue+++ b/frontend/src/components/Release/ReleaseDetail/NavBar/ApplyToDatabasePanel.vue@@ -68,10 +68,10 @@ import {MigrationType,} from "@/types/proto-es/v1/common_pb";import { DatabaseGroupSchema } from "@/types/proto-es/v1/database_group_service_pb";-import { CreatePlanRequestSchema } from "@/types/proto-es/v1/plan_service_pb";import {- PlanSchema,+ CreatePlanRequestSchema,Plan_ChangeDatabaseConfigSchema,+ PlanSchema,} from "@/types/proto-es/v1/plan_service_pb";import { Release_File_MigrationType } from "@/types/proto-es/v1/release_service_pb";import { generateIssueTitle, issueV1Slug } from "@/utils";diff --git a/frontend/src/components/Release/ReleaseDetail/NavBar/utils.ts b/frontend/src/components/Release/ReleaseDetail/NavBar/utils.tsindex 7028250fee..669ed0c0a0 100644--- a/frontend/src/components/Release/ReleaseDetail/NavBar/utils.ts+++ b/frontend/src/components/Release/ReleaseDetail/NavBar/utils.ts@@ -4,11 +4,11 @@ import {rolloutServiceClientConnect,} from "@/grpcweb";import { useCurrentUserV1 } from "@/store";-import { emptyIssue, type ComposedIssue } from "@/types";-import { CreateIssueRequestSchema } from "@/types/proto-es/v1/issue_service_pb";+import { type ComposedIssue, emptyIssue } from "@/types";import {- IssueSchema,+ CreateIssueRequestSchema,Issue_Type,+ IssueSchema,IssueStatus,} from "@/types/proto-es/v1/issue_service_pb";import type { Plan } from "@/types/proto-es/v1/plan_service_pb";diff --git a/frontend/src/components/Release/ReleaseDetail/ReleaseDetail.vue b/frontend/src/components/Release/ReleaseDetail/ReleaseDetail.vueindex c4e44d5f22..0e05604554 100644--- a/frontend/src/components/Release/ReleaseDetail/ReleaseDetail.vue+++ b/frontend/src/components/Release/ReleaseDetail/ReleaseDetail.vue@@ -36,11 +36,11 @@ import { Drawer, DrawerContent } from "@/components/v2";import { PROJECT_V1_ROUTE_RELEASE_DETAIL } from "@/router/dashboard/projectV1";import type { Release_File } from "@/types/proto-es/v1/release_service_pb";import BasicInfo from "./BasicInfo.vue";+import { provideReleaseDetailContext } from "./context";import NavBar from "./NavBar";import ReleaseArchiveRestoreButton from "./ReleaseArchiveRestoreButton.vue";import ReleaseFileTable from "./ReleaseFileTable";import ReleaseFileDetailPanel from "./ReleaseFileTable/ReleaseFileDetailPanel.vue";-import { provideReleaseDetailContext } from "./context";interface LocalState {selectedReleaseFile?: Release_File;diff --git a/frontend/src/components/Release/ReleaseDetail/ReleaseFileTable/ReleaseFileTable.vue b/frontend/src/components/Release/ReleaseDetail/ReleaseFileTable/ReleaseFileTable.vueindex 6aaddbe1a2..cd41949c99 100644--- a/frontend/src/components/Release/ReleaseDetail/ReleaseFileTable/ReleaseFileTable.vue+++ b/frontend/src/components/Release/ReleaseDetail/ReleaseFileTable/ReleaseFileTable.vue@@ -12,7 +12,7 @@</template><script setup lang="tsx">-import { NDataTable, type DataTableColumn } from "naive-ui";+import { type DataTableColumn, NDataTable } from "naive-ui";import { computed, ref, watch } from "vue";import { useI18n } from "vue-i18n";import {diff --git a/frontend/src/components/Revision/CreateRevisionDrawer.vue b/frontend/src/components/Revision/CreateRevisionDrawer.vueindex d642b4abb7..522f0abd02 100644--- a/frontend/src/components/Revision/CreateRevisionDrawer.vue+++ b/frontend/src/components/Revision/CreateRevisionDrawer.vue@@ -390,20 +390,20 @@<script setup lang="ts">import { create as createProto } from "@bufbuild/protobuf";import {- PackageIcon,- FolderOpenIcon,FileIcon,- XIcon,+ FolderOpenIcon,+ PackageIcon,PlusIcon,+ XIcon,} from "lucide-vue-next";import {NButton,+ NInput,NRadio,NRadioGroup,- NSteps,- NStep,- NInput,NSelect,+ NStep,+ NSteps,} from "naive-ui";import type { Ref } from "vue";import { computed, ref, watch } from "vue";@@ -413,23 +413,23 @@ import ReleaseFileTable from "@/components/Release/ReleaseDetail/ReleaseFileTablimport { Drawer, DrawerContent } from "@/components/v2";import { revisionServiceClientConnect } from "@/grpcweb";import {+ pushNotification,useCurrentProjectV1,useReleaseStore,useRevisionStore,useSheetV1Store,- pushNotification,} from "@/store";import {- Release_File_Type,type Release,type Release_File,+ Release_File_Type,} from "@/types/proto-es/v1/release_service_pb";import {BatchCreateRevisionsRequestSchema,- CreateRevisionRequestSchema,- Revision_Type,type CreateRevisionRequest,+ CreateRevisionRequestSchema,type Revision,+ Revision_Type,} from "@/types/proto-es/v1/revision_service_pb";const props = defineProps<{diff --git a/frontend/src/components/Revision/RevisionDataTable.vue b/frontend/src/components/Revision/RevisionDataTable.vueindex 0c6988a5c4..5810c80613 100644--- a/frontend/src/components/Revision/RevisionDataTable.vue+++ b/frontend/src/components/Revision/RevisionDataTable.vue@@ -28,15 +28,15 @@<script lang="tsx" setup>import { TrashIcon } from "lucide-vue-next";-import { type DataTableColumn, NDataTable, NButton, useDialog } from "naive-ui";+import { type DataTableColumn, NButton, NDataTable, useDialog } from "naive-ui";import { computed, reactive } from "vue";import { useI18n } from "vue-i18n";import { useRouter } from "vue-router";import { useRevisionStore } from "@/store";import { getDateForPbTimestampProtoEs } from "@/types";import {- Revision_Type,type Revision,+ Revision_Type,} from "@/types/proto-es/v1/revision_service_pb";import { useDatabaseDetailContext } from "../Database/context";import HumanizeDate from "../misc/HumanizeDate.vue";diff --git a/frontend/src/components/Revision/RevisionDetailPanel.vue b/frontend/src/components/Revision/RevisionDetailPanel.vueindex 1fb47de7bb..3ac9daa956 100644--- a/frontend/src/components/Revision/RevisionDetailPanel.vue+++ b/frontend/src/components/Revision/RevisionDetailPanel.vue@@ -52,9 +52,9 @@ import { MonacoEditor } from "@/components/MonacoEditor";import { CopyButton } from "@/components/v2";import { rolloutServiceClientConnect } from "@/grpcweb";import { useRevisionStore, useSheetV1Store } from "@/store";-import { getDateForPbTimestampProtoEs, type ComposedDatabase } from "@/types";-import { GetTaskRunRequestSchema } from "@/types/proto-es/v1/rollout_service_pb";+import { type ComposedDatabase, getDateForPbTimestampProtoEs } from "@/types";import type { TaskRun } from "@/types/proto-es/v1/rollout_service_pb";+import { GetTaskRunRequestSchema } from "@/types/proto-es/v1/rollout_service_pb";import { extractIssueUID, getSheetStatement } from "@/utils";import TaskRunLogTable from "../IssueV1/components/TaskRunSection/TaskRunLogTable/TaskRunLogTable.vue";import HumanizeDate from "../misc/HumanizeDate.vue";diff --git a/frontend/src/components/Role/Setting/components/ImportPermissionFromRoleModal.vue b/frontend/src/components/Role/Setting/components/ImportPermissionFromRoleModal.vueindex 76ebae21fa..90faf7d96d 100644--- a/frontend/src/components/Role/Setting/components/ImportPermissionFromRoleModal.vue+++ b/frontend/src/components/Role/Setting/components/ImportPermissionFromRoleModal.vue@@ -47,11 +47,11 @@</template><script lang="ts" setup>-import { NSelect, NButton } from "naive-ui";+import { NButton, NSelect } from "naive-ui";import { computed, reactive } from "vue";import { BBModal } from "@/bbkit";import { useRoleStore } from "@/store";-import { displayRoleTitle, displayRoleDescription } from "@/utils";+import { displayRoleDescription, displayRoleTitle } from "@/utils";import { displayPermissionTitle } from "@/utils/permission";interface LocalState {diff --git a/frontend/src/components/Role/Setting/components/RoleDataTable/cells/RoleOperationsCell.vue b/frontend/src/components/Role/Setting/components/RoleDataTable/cells/RoleOperationsCell.vueindex aa1bdb6df6..d7b095a461 100644--- a/frontend/src/components/Role/Setting/components/RoleDataTable/cells/RoleOperationsCell.vue+++ b/frontend/src/components/Role/Setting/components/RoleDataTable/cells/RoleOperationsCell.vue@@ -29,10 +29,10 @@ import { NButton } from "naive-ui";import { computed, ref } from "vue";import { useI18n } from "vue-i18n";import ResourceOccupiedModal from "@/components/v2/ResourceOccupiedModal/ResourceOccupiedModal.vue";-import { useRoleStore, useWorkspaceV1Store, pushNotification } from "@/store";+import { pushNotification, useRoleStore, useWorkspaceV1Store } from "@/store";import type { Role } from "@/types/proto-es/v1/role_service_pb";import { hasWorkspacePermissionV2, isCustomRole } from "@/utils";-import { getErrorCode, extractGrpcErrorMessage } from "@/utils/grpcweb";+import { extractGrpcErrorMessage, getErrorCode } from "@/utils/grpcweb";import { useCustomRoleSettingContext } from "../../../context";const props = defineProps<{diff --git a/frontend/src/components/Role/Setting/components/RolePanel.vue b/frontend/src/components/Role/Setting/components/RolePanel.vueindex d2e3cb708e..36e8d4dbf3 100644--- a/frontend/src/components/Role/Setting/components/RolePanel.vue+++ b/frontend/src/components/Role/Setting/components/RolePanel.vue@@ -109,7 +109,7 @@ import { create } from "@bufbuild/protobuf";import { cloneDeep, uniq } from "lodash-es";import { PlusIcon } from "lucide-vue-next";import { NButton, NInput, NTransfer } from "naive-ui";-import { computed, reactive, watch, nextTick, ref } from "vue";+import { computed, nextTick, reactive, ref, watch } from "vue";import { useI18n } from "vue-i18n";import { BBSpin } from "@/bbkit";import { FeatureBadge } from "@/components/FeatureGuard";diff --git a/frontend/src/components/Role/Setting/context.ts b/frontend/src/components/Role/Setting/context.tsindex c95878ca16..baf23df4b7 100644--- a/frontend/src/components/Role/Setting/context.ts+++ b/frontend/src/components/Role/Setting/context.ts@@ -1,4 +1,4 @@-import { type InjectionKey, type Ref, provide, inject } from "vue";+import { type InjectionKey, inject, provide, type Ref } from "vue";export type CustomRoleSettingContext = {hasCustomRoleFeature: Ref<boolean>;diff --git a/frontend/src/components/Rollout/RolloutDataTable.vue b/frontend/src/components/Rollout/RolloutDataTable.vueindex f5830ba849..4c25bdda68 100644--- a/frontend/src/components/Rollout/RolloutDataTable.vue+++ b/frontend/src/components/Rollout/RolloutDataTable.vue@@ -17,17 +17,19 @@ import { NDataTable, NPerformantEllipsis, NTooltip } from "naive-ui";import { computed } from "vue";import { useI18n } from "vue-i18n";import { useRouter } from "vue-router";+import Timestamp from "@/components/misc/Timestamp.vue";import { TASK_STATUS_FILTERS } from "@/components/Plan/constants/task";import TaskStatus from "@/components/Rollout/kits/TaskStatus.vue";-import Timestamp from "@/components/misc/Timestamp.vue";import { EnvironmentV1Name } from "@/components/v2";import { useEnvironmentV1Store } from "@/store";-import type { Rollout } from "@/types/proto-es/v1/rollout_service_pb";-import type { Task_Status } from "@/types/proto-es/v1/rollout_service_pb";+import type {+ Rollout,+ Task_Status,+} from "@/types/proto-es/v1/rollout_service_pb";import {- stringifyTaskStatus,- getStageStatus,extractRolloutUID,+ getStageStatus,+ stringifyTaskStatus,} from "@/utils";withDefaults(diff --git a/frontend/src/components/SQLCheck/SQLCheckButton.vue b/frontend/src/components/SQLCheck/SQLCheckButton.vueindex 4b1f432cd4..3e7ac27a03 100644--- a/frontend/src/components/SQLCheck/SQLCheckButton.vue+++ b/frontend/src/components/SQLCheck/SQLCheckButton.vue@@ -70,8 +70,7 @@ import { create } from "@bufbuild/protobuf";import { asyncComputed } from "@vueuse/core";import type { ButtonProps } from "naive-ui";import { NButton, NPopover } from "naive-ui";-import { computed, onUnmounted, ref, watch } from "vue";-import { onMounted } from "vue";+import { computed, onMounted, onUnmounted, ref, watch } from "vue";import { useI18n } from "vue-i18n";import { BBSpin } from "@/bbkit";import { releaseServiceClientConnect } from "@/grpcweb";@@ -81,18 +80,18 @@ import type { CheckReleaseResponse } from "@/types/proto-es/v1/release_service_pimport {CheckReleaseRequestSchema,CheckReleaseResponseSchema,- Release_File_Type,Release_File_MigrationType,+ Release_File_Type,} from "@/types/proto-es/v1/release_service_pb";import type { Advice } from "@/types/proto-es/v1/sql_service_pb";-import { AdviceSchema, Advice_Level } from "@/types/proto-es/v1/sql_service_pb";+import { Advice_Level, AdviceSchema } from "@/types/proto-es/v1/sql_service_pb";import type { Defer, VueStyle } from "@/utils";import { defer } from "@/utils";import ErrorList from "../misc/ErrorList.vue";-import SQLCheckPanel from "./SQLCheckPanel.vue";-import SQLCheckSummary from "./SQLCheckSummary.vue";import { STATEMENT_SKIP_CHECK_THRESHOLD } from "./common";import { useSQLCheckContext } from "./context";+import SQLCheckPanel from "./SQLCheckPanel.vue";+import SQLCheckSummary from "./SQLCheckSummary.vue";const props = withDefaults(defineProps<{diff --git a/frontend/src/components/SQLCheck/SQLCheckPanel.vue b/frontend/src/components/SQLCheck/SQLCheckPanel.vueindex b76a1e7414..9b6240eadb 100644--- a/frontend/src/components/SQLCheck/SQLCheckPanel.vue+++ b/frontend/src/components/SQLCheck/SQLCheckPanel.vue@@ -63,14 +63,14 @@ import PlanCheckRunDetail from "@/components/PlanCheckRun/PlanCheckRunDetail.vueimport { useProjectV1Store } from "@/store";import type { ComposedDatabase } from "@/types";import { RiskLevel } from "@/types/proto-es/v1/common_pb";+import type { PlanCheckRun } from "@/types/proto-es/v1/plan_service_pb";import {- PlanCheckRunSchema,- PlanCheckRun_ResultSchema,PlanCheckRun_Result_SqlReviewReportSchema,+ PlanCheckRun_ResultSchema,PlanCheckRun_Status,+ PlanCheckRunSchema,} from "@/types/proto-es/v1/plan_service_pb";-import type { PlanCheckRun } from "@/types/proto-es/v1/plan_service_pb";-import { Advice_Level, type Advice } from "@/types/proto-es/v1/sql_service_pb";+import { type Advice, Advice_Level } from "@/types/proto-es/v1/sql_service_pb";import type { Defer } from "@/utils";const props = withDefaults(diff --git a/frontend/src/components/SQLReview/SQLReviewCreation.vue b/frontend/src/components/SQLReview/SQLReviewCreation.vueindex cd5c03e48f..27d5bcea94 100644--- a/frontend/src/components/SQLReview/SQLReviewCreation.vue+++ b/frontend/src/components/SQLReview/SQLReviewCreation.vue@@ -44,7 +44,7 @@<script lang="ts" setup>import { isEqual } from "lodash-es";import { useDialog } from "naive-ui";-import { reactive, computed } from "vue";+import { computed, reactive } from "vue";import { useI18n } from "vue-i18n";import { useRouter } from "vue-router";import { StepTab } from "@/components/v2";@@ -54,24 +54,24 @@ import {} from "@/router/dashboard/workspaceRoutes";import { pushNotification, useSQLReviewStore } from "@/store";import {- reviewConfigNamePrefix,getReviewConfigId,+ reviewConfigNamePrefix,} from "@/store/modules/v1/common";import type {RuleTemplateV2,- SQLReviewPolicyTemplateV2,SQLReviewPolicy,+ SQLReviewPolicyTemplateV2,} from "@/types";import {- getRuleMapByEngine,- convertRuleMapToPolicyRuleList,TEMPLATE_LIST_V2 as builtInTemplateList,+ convertRuleMapToPolicyRuleList,+ getRuleMapByEngine,} from "@/types";import { Engine } from "@/types/proto-es/v1/common_pb";import { hasWorkspacePermissionV2, sqlReviewPolicySlug } from "@/utils";+import { getTemplateId } from "./components";import SQLReviewConfig from "./SQLReviewConfig.vue";import SQLReviewInfo from "./SQLReviewInfo.vue";-import { getTemplateId } from "./components";interface LocalState {currentStep: number;diff --git a/frontend/src/components/SQLReview/SQLReviewInfo.vue b/frontend/src/components/SQLReview/SQLReviewInfo.vueindex 3481fb4db7..429cdbaa7d 100644--- a/frontend/src/components/SQLReview/SQLReviewInfo.vue+++ b/frontend/src/components/SQLReview/SQLReviewInfo.vue@@ -116,7 +116,7 @@<script lang="ts" setup>import { NRadio, NRadioGroup } from "naive-ui";-import { ref, watch, computed } from "vue";+import { computed, ref, watch } from "vue";import { BBAttention, BBTextField } from "@/bbkit";import ResourceIdField from "@/components/v2/Form/ResourceIdField.vue";import { useResourceByName } from "@/components/v2/ResourceOccupiedModal/useResourceByName";@@ -125,8 +125,8 @@ import { reviewConfigNamePrefix } from "@/store/modules/v1/common";import type { SQLReviewPolicyTemplateV2 } from "@/types";import type { Database } from "@/types/proto-es/v1/database_service_pb";import {- formatEnvironmentName,type Environment,+ formatEnvironmentName,} from "@/types/v1/environment";import { DatabaseSelect, EnvironmentSelect, ProjectSelect } from "../v2";import { SQLReviewTemplateSelector } from "./components";diff --git a/frontend/src/components/SQLReview/components/SQLReviewAttachResourcesPanel.vue b/frontend/src/components/SQLReview/components/SQLReviewAttachResourcesPanel.vueindex d370cd619d..37bbee80c4 100644--- a/frontend/src/components/SQLReview/components/SQLReviewAttachResourcesPanel.vue+++ b/frontend/src/components/SQLReview/components/SQLReviewAttachResourcesPanel.vue@@ -82,7 +82,7 @@<script setup lang="tsx">import { cloneDeep } from "lodash-es";import { NButton, NDivider } from "naive-ui";-import { watch, ref, computed } from "vue";+import { computed, ref, watch } from "vue";import { useI18n } from "vue-i18n";import {Drawer,@@ -91,7 +91,7 @@ import {ProjectSelect,} from "@/components/v2";import ResourceOccupiedModal from "@/components/v2/ResourceOccupiedModal/ResourceOccupiedModal.vue";-import { useSQLReviewStore, pushNotification } from "@/store";+import { pushNotification, useSQLReviewStore } from "@/store";import {environmentNamePrefix,projectNamePrefix,diff --git a/frontend/src/components/SQLReview/components/SQLReviewCategoryTabFilter.vue b/frontend/src/components/SQLReview/components/SQLReviewCategoryTabFilter.vueindex 087c3d5b49..88f0cd65b9 100644--- a/frontend/src/components/SQLReview/components/SQLReviewCategoryTabFilter.vue+++ b/frontend/src/components/SQLReview/components/SQLReviewCategoryTabFilter.vue@@ -20,7 +20,7 @@<script lang="ts" setup>import { useWindowSize } from "@vueuse/core";-import { NTabs, NTabPane } from "naive-ui";+import { NTabPane, NTabs } from "naive-ui";import { computed } from "vue";import { useI18n } from "vue-i18n";import type { RuleTemplateV2 } from "@/types";diff --git a/frontend/src/components/SQLReview/components/SQLReviewForResource.vue b/frontend/src/components/SQLReview/components/SQLReviewForResource.vueindex 61ca49e29c..4d2125b7e5 100644--- a/frontend/src/components/SQLReview/components/SQLReviewForResource.vue+++ b/frontend/src/components/SQLReview/components/SQLReviewForResource.vue@@ -58,7 +58,7 @@ import { computed, ref, watchEffect } from "vue";import { useRouter } from "vue-router";import { Switch } from "@/components/v2";import { WORKSPACE_ROUTE_SQL_REVIEW_DETAIL } from "@/router/dashboard/workspaceRoutes";-import { useSQLReviewStore, useReviewPolicyByResource } from "@/store";+import { useReviewPolicyByResource, useSQLReviewStore } from "@/store";import type { SQLReviewPolicy } from "@/types";import { hasWorkspacePermissionV2, sqlReviewPolicySlug } from "@/utils";import SQLReviewPolicySelectPanel from "./SQLReviewPolicySelectPanel.vue";diff --git a/frontend/src/components/SQLReview/components/SQLReviewPolicyDataTable.vue b/frontend/src/components/SQLReview/components/SQLReviewPolicyDataTable.vueindex 73abe2e980..3e423f13b7 100644--- a/frontend/src/components/SQLReview/components/SQLReviewPolicyDataTable.vue+++ b/frontend/src/components/SQLReview/components/SQLReviewPolicyDataTable.vue@@ -12,16 +12,15 @@<script setup lang="tsx">import { CheckIcon, XIcon } from "lucide-vue-next";-import { NCheckbox, NDataTable, NButton } from "naive-ui";import type { DataTableColumn } from "naive-ui";+import { NButton, NCheckbox, NDataTable } from "naive-ui";import { computed } from "vue";import { useI18n } from "vue-i18n";import { BBButtonConfirm } from "@/bbkit";import Resource from "@/components/v2/ResourceOccupiedModal/Resource.vue";import { pushNotification, useSQLReviewStore } from "@/store";import type { SQLReviewPolicy } from "@/types";-import { hasWorkspacePermissionV2 } from "@/utils";-import { getHighlightHTMLByRegExp } from "@/utils";+import { getHighlightHTMLByRegExp, hasWorkspacePermissionV2 } from "@/utils";const props = withDefaults(defineProps<{diff --git a/frontend/src/components/SQLReview/components/SQLReviewPolicySelectPanel.vue b/frontend/src/components/SQLReview/components/SQLReviewPolicySelectPanel.vueindex 34a1375034..437fbb373a 100644--- a/frontend/src/components/SQLReview/components/SQLReviewPolicySelectPanel.vue+++ b/frontend/src/components/SQLReview/components/SQLReviewPolicySelectPanel.vue@@ -45,7 +45,7 @@<script setup lang="ts">import { NButton } from "naive-ui";-import { watchEffect, computed } from "vue";+import { computed, watchEffect } from "vue";import { useRouter } from "vue-router";import { Drawer, DrawerContent } from "@/components/v2";import { WORKSPACE_ROUTE_SQL_REVIEW_CREATE } from "@/router/dashboard/workspaceRoutes";diff --git a/frontend/src/components/SQLReview/components/SQLReviewRulesSelectPanel.vue b/frontend/src/components/SQLReview/components/SQLReviewRulesSelectPanel.vueindex 09fa0d7cb6..614cbe1412 100644--- a/frontend/src/components/SQLReview/components/SQLReviewRulesSelectPanel.vue+++ b/frontend/src/components/SQLReview/components/SQLReviewRulesSelectPanel.vue@@ -46,8 +46,8 @@import { NButton } from "naive-ui";import { Drawer, DrawerContent } from "@/components/v2";import { type Engine } from "@/types/proto-es/v1/common_pb";-import { ruleTemplateMapV2 } from "@/types/sqlReview";import type { RuleTemplateV2 } from "@/types/sqlReview";+import { ruleTemplateMapV2 } from "@/types/sqlReview";import SQLReviewTabsByEngine from "./SQLReviewTabsByEngine.vue";import SQLRuleTableWithFilter from "./SQLRuleTableWithFilter.vue";import { getRuleKey } from "./utils";diff --git a/frontend/src/components/SQLReview/components/SQLReviewTabsByEngine.vue b/frontend/src/components/SQLReview/components/SQLReviewTabsByEngine.vueindex 6e7328e84e..5d6935fc90 100644--- a/frontend/src/components/SQLReview/components/SQLReviewTabsByEngine.vue+++ b/frontend/src/components/SQLReview/components/SQLReviewTabsByEngine.vue@@ -27,8 +27,8 @@</template><script setup lang="ts">-import { NTabs, NTabPane } from "naive-ui";-import { ref, watch, computed } from "vue";+import { NTabPane, NTabs } from "naive-ui";+import { computed, ref, watch } from "vue";import { RichEngineName } from "@/components/v2";import type { RuleTemplateV2 } from "@/types";import { Engine } from "@/types/proto-es/v1/common_pb";diff --git a/frontend/src/components/SQLReview/components/SQLRuleEditDialog.vue b/frontend/src/components/SQLReview/components/SQLRuleEditDialog.vueindex 2be3abcd34..350e931c27 100644--- a/frontend/src/components/SQLReview/components/SQLRuleEditDialog.vue+++ b/frontend/src/components/SQLReview/components/SQLRuleEditDialog.vue@@ -77,7 +77,7 @@<script lang="ts" setup>import { NButton } from "naive-ui";-import { nextTick, reactive, watch, ref } from "vue";+import { nextTick, reactive, ref, watch } from "vue";import { BBModal, BBTextField } from "@/bbkit";import { payloadValueListToComponentList } from "@/components/SQLReview/components";import { RichEngineName } from "@/components/v2";diff --git a/frontend/src/components/SQLReview/components/SQLRuleFilter.vue b/frontend/src/components/SQLReview/components/SQLRuleFilter.vueindex a627e8e9f2..fb523f23ad 100644--- a/frontend/src/components/SQLReview/components/SQLRuleFilter.vue+++ b/frontend/src/components/SQLReview/components/SQLRuleFilter.vue@@ -55,8 +55,8 @@ import { SearchBox } from "@/components/v2";import type { RuleTemplateV2 } from "@/types";import { getRuleLocalization } from "@/types";import type { SQLReviewRuleLevel } from "@/types/proto-es/v1/org_policy_service_pb";-import SQLReviewCategoryTabFilter from "./SQLReviewCategoryTabFilter.vue";import type { RuleListWithCategory } from "./SQLReviewCategoryTabFilter.vue";+import SQLReviewCategoryTabFilter from "./SQLReviewCategoryTabFilter.vue";import SQLReviewLevelFilter from "./SQLReviewLevelFilter.vue";import type { SQLRuleFilterParams } from "./useSQLRuleFilter";diff --git a/frontend/src/components/SQLReview/components/SQLRuleTable.vue b/frontend/src/components/SQLReview/components/SQLRuleTable.vueindex 928f984536..00364f7f76 100644--- a/frontend/src/components/SQLReview/components/SQLRuleTable.vue+++ b/frontend/src/components/SQLReview/components/SQLRuleTable.vue@@ -97,8 +97,8 @@<script lang="tsx" setup>import { ExternalLinkIcon, PencilIcon } from "lucide-vue-next";-import { NCheckbox, NDataTable, NButton, NDivider } from "naive-ui";import type { DataTableColumn } from "naive-ui";+import { NButton, NCheckbox, NDataTable, NDivider } from "naive-ui";import { computed, reactive } from "vue";import { useI18n } from "vue-i18n";import type { RuleTemplateV2 } from "@/types";diff --git a/frontend/src/components/SQLReview/components/SQLRuleTableWithFilter.vue b/frontend/src/components/SQLReview/components/SQLRuleTableWithFilter.vueindex 1d7ef6493e..61bc132ed9 100644--- a/frontend/src/components/SQLReview/components/SQLRuleTableWithFilter.vue+++ b/frontend/src/components/SQLReview/components/SQLRuleTableWithFilter.vue@@ -37,8 +37,8 @@ import { NEmpty } from "naive-ui";import { watch } from "vue";import {SQLRuleFilter,- useSQLRuleFilter,SQLRuleTable,+ useSQLRuleFilter,} from "@/components/SQLReview/components";import type { RuleTemplateV2 } from "@/types";import type { Engine } from "@/types/proto-es/v1/common_pb";diff --git a/frontend/src/components/SchemaDiagram/Canvas/Canvas.vue b/frontend/src/components/SchemaDiagram/Canvas/Canvas.vueindex 0296945e16..d98352ee41 100644--- a/frontend/src/components/SchemaDiagram/Canvas/Canvas.vue+++ b/frontend/src/components/SchemaDiagram/Canvas/Canvas.vue@@ -53,14 +53,14 @@</template><script lang="ts" setup>-import { NButtonGroup, NButton, NTooltip } from "naive-ui";+import { NButton, NButtonGroup, NTooltip } from "naive-ui";import { ref, useSlots } from "vue";import Square2x2 from "~icons/heroicons-outline/squares-2x2";import { useSchemaDiagramContext } from "../common";import { ZOOM_RANGE } from "../common/const";+import { useDragCanvas, useFitView, useSetCenter } from "./composables";import DummyCanvas from "./DummyCanvas.vue";import ZoomButton from "./ZoomButton.vue";-import { useDragCanvas, useFitView, useSetCenter } from "./composables";const slots = useSlots();diff --git a/frontend/src/components/SchemaDiagram/Canvas/ZoomButton.vue b/frontend/src/components/SchemaDiagram/Canvas/ZoomButton.vueindex 626024c3ae..4808fcabcf 100644--- a/frontend/src/components/SchemaDiagram/Canvas/ZoomButton.vue+++ b/frontend/src/components/SchemaDiagram/Canvas/ZoomButton.vue@@ -17,7 +17,7 @@</template><script lang="ts" setup>-import { NButtonGroup, NButton } from "naive-ui";+import { NButton, NButtonGroup } from "naive-ui";import { computed } from "vue";import { useSchemaDiagramContext } from "../common";diff --git a/frontend/src/components/SchemaDiagram/ER/ForeignKeyLine.vue b/frontend/src/components/SchemaDiagram/ER/ForeignKeyLine.vueindex 37f0058f2e..882b3deee3 100644--- a/frontend/src/components/SchemaDiagram/ER/ForeignKeyLine.vue+++ b/frontend/src/components/SchemaDiagram/ER/ForeignKeyLine.vue@@ -23,7 +23,7 @@ import {useGeometry,useSchemaDiagramContext,} from "../common";-import type { Point, Rect, Path, ForeignKey } from "../types";+import type { ForeignKey, Path, Point, Rect } from "../types";import SVGLine from "./libs/SVGLine.vue";type Direction = "LEFT" | "RIGHT";diff --git a/frontend/src/components/SchemaDiagram/ER/TableNode.vue b/frontend/src/components/SchemaDiagram/ER/TableNode.vueindex 2c0abb9e33..217a80fd7c 100644--- a/frontend/src/components/SchemaDiagram/ER/TableNode.vue+++ b/frontend/src/components/SchemaDiagram/ER/TableNode.vue@@ -98,11 +98,11 @@ import type {} from "@/types/proto-es/v1/database_service_pb";import type { VueClass } from "@/utils";import {- useSchemaDiagramContext,- isPrimaryKey,+ FocusButton,isIndex,+ isPrimaryKey,useGeometry,- FocusButton,+ useSchemaDiagramContext,} from "../common";import { isFocusedForeignTable } from "./libs/isFocusedFKTable";diff --git a/frontend/src/components/SchemaDiagram/Navigator/Tree.vue b/frontend/src/components/SchemaDiagram/Navigator/Tree.vueindex af993a16a9..0ec220f157 100644--- a/frontend/src/components/SchemaDiagram/Navigator/Tree.vue+++ b/frontend/src/components/SchemaDiagram/Navigator/Tree.vue@@ -19,7 +19,7 @@<script lang="ts" setup>import { NTree, type TreeOption } from "naive-ui";import { computed, h } from "vue";-import { isDescendantOf, hasSchemaProperty } from "@/utils";+import { hasSchemaProperty, isDescendantOf } from "@/utils";import { useSchemaDiagramContext } from "../common";import { DEFAULT_PADDINGS } from "../common/const";import { Label, Prefix, Suffix } from "./TreeNode";diff --git a/frontend/src/components/SchemaDiagram/Navigator/utils.ts b/frontend/src/components/SchemaDiagram/Navigator/utils.tsindex 0072852c5f..d89761b645 100644--- a/frontend/src/components/SchemaDiagram/Navigator/utils.ts+++ b/frontend/src/components/SchemaDiagram/Navigator/utils.ts@@ -1,4 +1,4 @@-import type { TreeNode, NodeType } from "./types";+import type { NodeType, TreeNode } from "./types";export const isTypedNode = <T extends NodeType>(node: TreeNode,diff --git a/frontend/src/components/SchemaDiagram/SchemaDiagram.vue b/frontend/src/components/SchemaDiagram/SchemaDiagram.vueindex d66682c0c4..1f3fcc03fb 100644--- a/frontend/src/components/SchemaDiagram/SchemaDiagram.vue+++ b/frontend/src/components/SchemaDiagram/SchemaDiagram.vue@@ -42,18 +42,18 @@ import type {TableMetadata,} from "@/types/proto-es/v1/database_service_pb";import Canvas from "./Canvas";-import type { GraphNodeItem, GraphEdgeItem } from "./ER";-import { ForeignKeyLine, TableNode, autoLayout } from "./ER";-import Navigator from "./Navigator";import { provideSchemaDiagramContext } from "./common";+import type { GraphEdgeItem, GraphNodeItem } from "./ER";+import { autoLayout, ForeignKeyLine, TableNode } from "./ER";+import Navigator from "./Navigator";import type {+ EditStatus,+ ForeignKey,+ Geometry,Point,Rect,- Size,SchemaDiagramContext,- ForeignKey,- EditStatus,- Geometry,+ Size,} from "./types";const props = withDefaults(diff --git a/frontend/src/components/SchemaDiagram/common/FocusButton.vue b/frontend/src/components/SchemaDiagram/common/FocusButton.vueindex ca7a005c44..af69d03c0c 100644--- a/frontend/src/components/SchemaDiagram/common/FocusButton.vue+++ b/frontend/src/components/SchemaDiagram/common/FocusButton.vue@@ -14,8 +14,8 @@ import { computed } from "vue";import type { TableMetadata } from "@/types/proto-es/v1/database_service_pb";import type { VueClass } from "@/utils";import { expectedZoomRange, useSchemaDiagramContext } from ".";-import FocusIcon from "./FocusIcon.vue";import { DEFAULT_PADDINGS } from "./const";+import FocusIcon from "./FocusIcon.vue";const props = withDefaults(defineProps<{diff --git a/frontend/src/components/SchemaEditorLite/Aside/NodePrefix.vue b/frontend/src/components/SchemaEditorLite/Aside/NodePrefix.vueindex c1eb67d76a..911868212b 100644--- a/frontend/src/components/SchemaEditorLite/Aside/NodePrefix.vue+++ b/frontend/src/components/SchemaEditorLite/Aside/NodePrefix.vue@@ -71,8 +71,8 @@ import {import { InstanceV1EngineIcon } from "@/components/v2";import { useEnvironmentV1Store } from "@/store";import { useSchemaEditorContext } from "../context";-import NodeCheckbox from "./NodeCheckbox";import type { TreeNode, TreeNodeForInstance } from "./common";+import NodeCheckbox from "./NodeCheckbox";const props = defineProps<{node: TreeNode;diff --git a/frontend/src/components/SchemaEditorLite/Aside/Tree.vue b/frontend/src/components/SchemaEditorLite/Aside/Tree.vueindex 74dcf16c5d..fb32194845 100644--- a/frontend/src/components/SchemaEditorLite/Aside/Tree.vue+++ b/frontend/src/components/SchemaEditorLite/Aside/Tree.vue@@ -94,21 +94,21 @@</template><script lang="ts" setup>-import { useElementSize, refDebounced } from "@vueuse/core";+import { refDebounced, useElementSize } from "@vueuse/core";import { MD5 } from "crypto-js";import { cloneDeep, debounce, escape, head } from "lodash-es";-import { MoreHorizontalIcon, CopyIcon } from "lucide-vue-next";+import { CopyIcon, MoreHorizontalIcon } from "lucide-vue-next";import type { TreeOption } from "naive-ui";-import { NDropdown, NTree, NPerformantEllipsis } from "naive-ui";+import { NDropdown, NPerformantEllipsis, NTree } from "naive-ui";import {computed,- onMounted,- watch,- ref,h,- reactive,nextTick,+ onMounted,+ reactive,+ ref,type VNode,+ watch,} from "vue";import { useI18n } from "vue-i18n";import { SearchBox } from "@/components/v2";@@ -128,24 +128,24 @@ import {getHighlightHTMLByKeyWords,isDescendantOf,} from "@/utils";+import { useSchemaEditorContext } from "../context";+import { keyForResource, keyForResourceName } from "../context/common";import FunctionNameModal from "../Modals/FunctionNameModal.vue";import ProcedureNameModal from "../Modals/ProcedureNameModal.vue";import SchemaNameModal from "../Modals/SchemaNameModal.vue";import TableNameModal from "../Modals/TableNameModal.vue";import ViewNameModal from "../Modals/ViewNameModal.vue";-import { useSchemaEditorContext } from "../context";-import { keyForResource, keyForResourceName } from "../context/common";import { engineSupportsMultiSchema } from "../spec";-import NodePrefix from "./NodePrefix.vue";import type {TreeNode,+ TreeNodeForGroup,TreeNodeForInstance,TreeNodeForSchema,TreeNodeForTable,- TreeNodeForGroup,} from "./common";import { useBuildTree } from "./common";import { useContextMenu } from "./context-menu";+import NodePrefix from "./NodePrefix.vue";interface LocalState {shouldRelocateTreeNode: boolean;diff --git a/frontend/src/components/SchemaEditorLite/Aside/context-menu.ts b/frontend/src/components/SchemaEditorLite/Aside/context-menu.tsindex 7cba045e10..ba7281d180 100644--- a/frontend/src/components/SchemaEditorLite/Aside/context-menu.ts+++ b/frontend/src/components/SchemaEditorLite/Aside/context-menu.ts@@ -1,6 +1,6 @@import Emittery from "emittery";import type { DropdownOption } from "naive-ui";-import { computed, reactive, type Ref } from "vue";+import { computed, type Ref, reactive } from "vue";import { useI18n } from "vue-i18n";import type { ComposedDatabase } from "@/types";import { Engine } from "@/types/proto-es/v1/common_pb";@@ -10,9 +10,9 @@ import { engineSupportsMultiSchema } from "../spec";import type {TreeNode,TreeNodeForDatabase,+ TreeNodeForFunction,TreeNodeForGroup,TreeNodeForProcedure,- TreeNodeForFunction,TreeNodeForSchema,TreeNodeForTable,TreeNodeForView,diff --git a/frontend/src/components/SchemaEditorLite/Editor.vue b/frontend/src/components/SchemaEditorLite/Editor.vueindex 670a6408d6..eb64ab2be8 100644--- a/frontend/src/components/SchemaEditorLite/Editor.vue+++ b/frontend/src/components/SchemaEditorLite/Editor.vue@@ -55,6 +55,7 @@</template><script lang="ts" setup>+import { useSchemaEditorContext } from "./context";import EmptyTips from "./EmptyTips.vue";import DatabaseEditor from "./Panels/DatabaseEditor.vue";import FunctionEditor from "./Panels/FunctionEditor.vue";@@ -62,7 +63,6 @@ import ProcedureEditor from "./Panels/ProcedureEditor.vue";import TableEditor from "./Panels/TableEditor.vue";import ViewEditor from "./Panels/ViewEditor.vue";import TabsContainer from "./TabsContainer.vue";-import { useSchemaEditorContext } from "./context";const { currentTab } = useSchemaEditorContext();</script>diff --git a/frontend/src/components/SchemaEditorLite/Modals/EditColumnForeignKeyModal.vue b/frontend/src/components/SchemaEditorLite/Modals/EditColumnForeignKeyModal.vueindex 9a59e19612..5da5cb3a8d 100644--- a/frontend/src/components/SchemaEditorLite/Modals/EditColumnForeignKeyModal.vue+++ b/frontend/src/components/SchemaEditorLite/Modals/EditColumnForeignKeyModal.vue@@ -80,17 +80,17 @@import { create } from "@bufbuild/protobuf";import { TrashIcon } from "lucide-vue-next";import type { SelectOption } from "naive-ui";-import { NButton, NSelect, NInputGroup, NInput } from "naive-ui";+import { NButton, NInput, NInputGroup, NSelect } from "naive-ui";import { computed, onMounted, reactive } from "vue";import { BBModal } from "@/bbkit";import type { ComposedDatabase } from "@/types";import type {ColumnMetadata,DatabaseMetadata,+ ForeignKeyMetadata,SchemaMetadata,TableMetadata,} from "@/types/proto-es/v1/database_service_pb";-import type { ForeignKeyMetadata } from "@/types/proto-es/v1/database_service_pb";import { ForeignKeyMetadataSchema } from "@/types/proto-es/v1/database_service_pb";import { hasSchemaProperty } from "@/utils";import { useSchemaEditorContext } from "../context";diff --git a/frontend/src/components/SchemaEditorLite/Modals/FunctionNameModal.vue b/frontend/src/components/SchemaEditorLite/Modals/FunctionNameModal.vueindex c5ae9fc22f..147bb6ad93 100644--- a/frontend/src/components/SchemaEditorLite/Modals/FunctionNameModal.vue+++ b/frontend/src/components/SchemaEditorLite/Modals/FunctionNameModal.vue@@ -39,9 +39,9 @@ import { useNotificationStore } from "@/store";import type { ComposedDatabase } from "@/types";import type {DatabaseMetadata,+ FunctionMetadata,SchemaMetadata,} from "@/types/proto-es/v1/database_service_pb";-import type { FunctionMetadata } from "@/types/proto-es/v1/database_service_pb";import { FunctionMetadataSchema } from "@/types/proto-es/v1/database_service_pb";import { useSchemaEditorContext } from "../context";diff --git a/frontend/src/components/SchemaEditorLite/Modals/ProcedureNameModal.vue b/frontend/src/components/SchemaEditorLite/Modals/ProcedureNameModal.vueindex 14e55d83b1..7e34e75832 100644--- a/frontend/src/components/SchemaEditorLite/Modals/ProcedureNameModal.vue+++ b/frontend/src/components/SchemaEditorLite/Modals/ProcedureNameModal.vue@@ -39,9 +39,9 @@ import { useNotificationStore } from "@/store";import type { ComposedDatabase } from "@/types";import type {DatabaseMetadata,+ ProcedureMetadata,SchemaMetadata,} from "@/types/proto-es/v1/database_service_pb";-import type { ProcedureMetadata } from "@/types/proto-es/v1/database_service_pb";import { ProcedureMetadataSchema } from "@/types/proto-es/v1/database_service_pb";import { useSchemaEditorContext } from "../context";diff --git a/frontend/src/components/SchemaEditorLite/Modals/TableNameModal.vue b/frontend/src/components/SchemaEditorLite/Modals/TableNameModal.vueindex 44442f1708..01b55f7d77 100644--- a/frontend/src/components/SchemaEditorLite/Modals/TableNameModal.vue+++ b/frontend/src/components/SchemaEditorLite/Modals/TableNameModal.vue@@ -41,8 +41,8 @@ import { Engine } from "@/types/proto-es/v1/common_pb";import type {DatabaseMetadata,SchemaMetadata,+ TableMetadata,} from "@/types/proto-es/v1/database_service_pb";-import type { TableMetadata } from "@/types/proto-es/v1/database_service_pb";import {ColumnMetadataSchema,TableMetadataSchema,diff --git a/frontend/src/components/SchemaEditorLite/Modals/ViewNameModal.vue b/frontend/src/components/SchemaEditorLite/Modals/ViewNameModal.vueindex 6d9c83dd5a..c97396787b 100644--- a/frontend/src/components/SchemaEditorLite/Modals/ViewNameModal.vue+++ b/frontend/src/components/SchemaEditorLite/Modals/ViewNameModal.vue@@ -40,8 +40,8 @@ import type { ComposedDatabase } from "@/types";import type {DatabaseMetadata,SchemaMetadata,+ ViewMetadata,} from "@/types/proto-es/v1/database_service_pb";-import type { ViewMetadata } from "@/types/proto-es/v1/database_service_pb";import { ViewMetadataSchema } from "@/types/proto-es/v1/database_service_pb";import { useSchemaEditorContext } from "../context";diff --git a/frontend/src/components/SchemaEditorLite/Panels/DatabaseEditor.vue b/frontend/src/components/SchemaEditorLite/Panels/DatabaseEditor.vueindex 1b7c411ff4..1dfb6f51c2 100644--- a/frontend/src/components/SchemaEditorLite/Panels/DatabaseEditor.vue+++ b/frontend/src/components/SchemaEditorLite/Panels/DatabaseEditor.vue@@ -154,21 +154,19 @@ import { Engine } from "@/types/proto-es/v1/common_pb";import type {ColumnMetadata,DatabaseMetadata,+ ColumnMetadata as NewColumnMetadata,+ TableMetadata as NewTableMetadata,SchemaMetadata,TableMetadata,} from "@/types/proto-es/v1/database_service_pb";-import type {- TableMetadata as NewTableMetadata,- ColumnMetadata as NewColumnMetadata,-} from "@/types/proto-es/v1/database_service_pb";import {- TableMetadataSchema,ColumnMetadataSchema,+ TableMetadataSchema,} from "@/types/proto-es/v1/database_service_pb";import type { SchemaTemplateSetting_TableTemplate } from "@/types/proto-es/v1/setting_service_pb";import TableTemplates from "@/views/SchemaTemplate/TableTemplates.vue";-import TableNameModal from "../Modals/TableNameModal.vue";import { useSchemaEditorContext } from "../context";+import TableNameModal from "../Modals/TableNameModal.vue";import TableList from "./TableList";import TableSelectionSummary from "./TableSelectionSummary.vue";diff --git a/frontend/src/components/SchemaEditorLite/Panels/PartitionsEditor/PartitionsEditor.vue b/frontend/src/components/SchemaEditorLite/Panels/PartitionsEditor/PartitionsEditor.vueindex c63b451def..cea843c867 100644--- a/frontend/src/components/SchemaEditorLite/Panels/PartitionsEditor/PartitionsEditor.vue+++ b/frontend/src/components/SchemaEditorLite/Panels/PartitionsEditor/PartitionsEditor.vue@@ -30,28 +30,28 @@ import { create } from "@bufbuild/protobuf";import { useElementSize } from "@vueuse/core";import { head, pull } from "lodash-es";import { ChevronDownIcon } from "lucide-vue-next";-import { NDataTable, type DataTableColumn } from "naive-ui";+import { type DataTableColumn, NDataTable } from "naive-ui";import { computed, ref } from "vue";import { useI18n } from "vue-i18n";import type { ComposedDatabase } from "@/types";import type {- TablePartitionMetadata,DatabaseMetadata,SchemaMetadata,TableMetadata,+ TablePartitionMetadata,} from "@/types/proto-es/v1/database_service_pb";import {- TablePartitionMetadataSchema,TablePartitionMetadata_Type,+ TablePartitionMetadataSchema,} from "@/types/proto-es/v1/database_service_pb";import type { EditStatus } from "../..";import { useSchemaEditorContext } from "../../context";import { markUUID } from "../common";import {- OperationCell,+ ExpressionCell,NameCell,+ OperationCell,TypeCell,- ExpressionCell,ValueCell,} from "./components";diff --git a/frontend/src/components/SchemaEditorLite/Panels/PreviewPane.vue b/frontend/src/components/SchemaEditorLite/Panels/PreviewPane.vueindex 2e511ae144..9d62ff082a 100644--- a/frontend/src/components/SchemaEditorLite/Panels/PreviewPane.vue+++ b/frontend/src/components/SchemaEditorLite/Panels/PreviewPane.vue@@ -45,13 +45,13 @@<script setup lang="ts">import { create } from "@bufbuild/protobuf";import {+ useDebounceFn,useElementSize,useLocalStorage,useParentElement,- useDebounceFn,} from "@vueuse/core";import { ChevronDownIcon } from "lucide-vue-next";-import { computed, toRef, ref, watch } from "vue";+import { computed, ref, toRef, watch } from "vue";import { MonacoEditor } from "@/components/MonacoEditor";import MaskSpinner from "@/components/misc/MaskSpinner.vue";import { useEmitteryEventListener } from "@/composables/useEmitteryEventListener";diff --git a/frontend/src/components/SchemaEditorLite/Panels/TableColumnEditor/TableColumnEditor.vue b/frontend/src/components/SchemaEditorLite/Panels/TableColumnEditor/TableColumnEditor.vueindex 56f47af282..ea9c39bf45 100644--- a/frontend/src/components/SchemaEditorLite/Panels/TableColumnEditor/TableColumnEditor.vue+++ b/frontend/src/components/SchemaEditorLite/Panels/TableColumnEditor/TableColumnEditor.vue@@ -58,14 +58,14 @@ import { useI18n } from "vue-i18n";import ClassificationCell from "@/components/ColumnDataTable/ClassificationCell.vue";import LabelEditorDrawer from "@/components/LabelEditorDrawer.vue";import {- removeColumnPrimaryKey,- upsertColumnPrimaryKey,changeColumnNameInPrimaryKey,removeColumnFromAllForeignKeys,+ removeColumnPrimaryKey,+ upsertColumnPrimaryKey,} from "@/components/SchemaEditorLite";import SemanticTypesDrawer from "@/components/SensitiveData/components/SemanticTypesDrawer.vue";import { InlineInput } from "@/components/v2";-import { useSettingV1Store, hasFeature, pushNotification } from "@/store";+import { hasFeature, pushNotification, useSettingV1Store } from "@/store";import type { ComposedDatabase } from "@/types";import { Engine } from "@/types/proto-es/v1/common_pb";import type { ColumnCatalog } from "@/types/proto-es/v1/database_catalog_service_pb";@@ -86,13 +86,13 @@ import type { DefaultValue } from "../../utils";import { markUUID } from "../common";import {DataTypeCell,+ DefaultValueCell,ForeignKeyCell,+ LabelsCell,OperationCell,ReorderCell,SelectionCell,- DefaultValueCell,SemanticTypeCell,- LabelsCell,} from "./components";interface LocalState {diff --git a/frontend/src/components/SchemaEditorLite/Panels/TableColumnEditor/components/DataTypeCell.vue b/frontend/src/components/SchemaEditorLite/Panels/TableColumnEditor/components/DataTypeCell.vueindex e5633871b1..8cb93105b3 100644--- a/frontend/src/components/SchemaEditorLite/Panels/TableColumnEditor/components/DataTypeCell.vue+++ b/frontend/src/components/SchemaEditorLite/Panels/TableColumnEditor/components/DataTypeCell.vue@@ -18,7 +18,7 @@<script lang="ts" setup>import type { SelectOption } from "naive-ui";import type { CSSProperties } from "vue";-import { computed, ref, onMounted } from "vue";+import { computed, onMounted, ref } from "vue";import { DropdownInput } from "@/components/v2";import type { Engine } from "@/types/proto-es/v1/common_pb";import type { ColumnMetadata } from "@/types/proto-es/v1/database_service_pb";diff --git a/frontend/src/components/SchemaEditorLite/Panels/TableEditor.vue b/frontend/src/components/SchemaEditorLite/Panels/TableEditor.vueindex 639716251c..66af914f32 100644--- a/frontend/src/components/SchemaEditorLite/Panels/TableEditor.vue+++ b/frontend/src/components/SchemaEditorLite/Panels/TableEditor.vue@@ -197,22 +197,22 @@ import type {ColumnMetadata,DatabaseMetadata,ForeignKeyMetadata,+ ColumnMetadata as NewColumnMetadata,SchemaMetadata,TableMetadata,} from "@/types/proto-es/v1/database_service_pb";import {- TablePartitionMetadata_Type,ColumnMetadataSchema,+ DatabaseMetadataSchema,IndexMetadataSchema,+ TablePartitionMetadata_Type,TablePartitionMetadataSchema,- DatabaseMetadataSchema,} from "@/types/proto-es/v1/database_service_pb";-import type { ColumnMetadata as NewColumnMetadata } from "@/types/proto-es/v1/database_service_pb";import type { SchemaTemplateSetting_FieldTemplate } from "@/types/proto-es/v1/setting_service_pb";import { instanceV1AllowsReorderColumns, randomString } from "@/utils";import FieldTemplates from "@/views/SchemaTemplate/FieldTemplates.vue";-import EditColumnForeignKeyModal from "../Modals/EditColumnForeignKeyModal.vue";import { useSchemaEditorContext } from "../context";+import EditColumnForeignKeyModal from "../Modals/EditColumnForeignKeyModal.vue";import {engineSupportsEditIndexes,engineSupportsEditTablePartitions,diff --git a/frontend/src/components/SchemaEditorLite/Panels/TableList/TableList.vue b/frontend/src/components/SchemaEditorLite/Panels/TableList/TableList.vueindex 60f4f24ba9..3546321747 100644--- a/frontend/src/components/SchemaEditorLite/Panels/TableList/TableList.vue+++ b/frontend/src/components/SchemaEditorLite/Panels/TableList/TableList.vue@@ -51,8 +51,8 @@ import ClassificationCell from "@/components/ColumnDataTable/ClassificationCell.import { Drawer, DrawerContent, InlineInput } from "@/components/v2";import type { ComposedDatabase } from "@/types";import {- TableCatalogSchema,TableCatalog_ColumnsSchema,+ TableCatalogSchema,} from "@/types/proto-es/v1/database_catalog_service_pb";import type {DatabaseMetadata,diff --git a/frontend/src/components/SchemaEditorLite/Panels/ViewEditor.vue b/frontend/src/components/SchemaEditorLite/Panels/ViewEditor.vueindex 37d12f53f5..3ff95a69c4 100644--- a/frontend/src/components/SchemaEditorLite/Panels/ViewEditor.vue+++ b/frontend/src/components/SchemaEditorLite/Panels/ViewEditor.vue@@ -25,8 +25,8 @@ import { computed } from "vue";import type { ComposedDatabase } from "@/types";import type {DatabaseMetadata,- ViewMetadata,SchemaMetadata,+ ViewMetadata,} from "@/types/proto-es/v1/database_service_pb";import { DatabaseMetadataSchema } from "@/types/proto-es/v1/database_service_pb";import { useSchemaEditorContext } from "../context";diff --git a/frontend/src/components/SchemaEditorLite/SchemaEditorLite.vue b/frontend/src/components/SchemaEditorLite/SchemaEditorLite.vueindex 5c6e3d4332..70d4510def 100644--- a/frontend/src/components/SchemaEditorLite/SchemaEditorLite.vue+++ b/frontend/src/components/SchemaEditorLite/SchemaEditorLite.vue@@ -22,7 +22,7 @@<script lang="ts" setup>import { cloneDeep } from "lodash-es";-import { Splitpanes, Pane } from "splitpanes";+import { Pane, Splitpanes } from "splitpanes";import "splitpanes/dist/splitpanes.css";import { computed, onMounted, toRef } from "vue";import MaskSpinner from "@/components/misc/MaskSpinner.vue";@@ -32,9 +32,9 @@ import type { DatabaseMetadata } from "@/types/proto-es/v1/database_service_pb";import type { Project } from "@/types/proto-es/v1/project_service_pb";import { Setting_SettingName } from "@/types/proto-es/v1/setting_service_pb";import Aside from "./Aside";-import Editor from "./Editor.vue";import { useAlgorithm } from "./algorithm";import { provideSchemaEditorContext } from "./context";+import Editor from "./Editor.vue";import type { EditTarget, RolloutObject } from "./types";const props = defineProps<{diff --git a/frontend/src/components/SchemaEditorLite/algorithm/diff-merge.ts b/frontend/src/components/SchemaEditorLite/algorithm/diff-merge.tsindex dc8bc4bb9a..bfeb722d72 100644--- a/frontend/src/components/SchemaEditorLite/algorithm/diff-merge.ts+++ b/frontend/src/components/SchemaEditorLite/algorithm/diff-merge.ts@@ -2,16 +2,16 @@ import { create } from "@bufbuild/protobuf";import { cloneDeep, isEqual, pick } from "lodash-es";import type { ComposedDatabase } from "@/types";import type {- DatabaseCatalog,ColumnCatalog,+ DatabaseCatalog,SchemaCatalog,TableCatalog,} from "@/types/proto-es/v1/database_catalog_service_pb";import {+ ColumnCatalogSchema,SchemaCatalogSchema,- TableCatalogSchema,TableCatalog_ColumnsSchema,- ColumnCatalogSchema,+ TableCatalogSchema,} from "@/types/proto-es/v1/database_catalog_service_pb";import type {FunctionMetadata,@@ -27,12 +27,14 @@ import {type SchemaMetadata,type TableMetadata,} from "@/types/proto-es/v1/database_service_pb";-import { ComparableTablePartitionFields, TinyTimer, keyBy } from "@/utils";import {ComparableColumnFields,ComparableForeignKeyFields,ComparableIndexFields,ComparableTableFields,+ ComparableTablePartitionFields,+ keyBy,+ TinyTimer,} from "@/utils";import type { SchemaEditorContext } from "../context";import { keyForResourceName } from "../context/common";diff --git a/frontend/src/components/SchemaEditorLite/algorithm/utils.ts b/frontend/src/components/SchemaEditorLite/algorithm/utils.tsindex 07cd87dcbf..b00480a744 100644--- a/frontend/src/components/SchemaEditorLite/algorithm/utils.ts+++ b/frontend/src/components/SchemaEditorLite/algorithm/utils.ts@@ -1,9 +1,9 @@import { create } from "@bufbuild/protobuf";import { cloneDeep } from "lodash-es";import type {- TableCatalog,- SchemaCatalog,DatabaseCatalog,+ SchemaCatalog,+ TableCatalog,} from "@/types/proto-es/v1/database_catalog_service_pb";import { TableCatalog_ColumnsSchema } from "@/types/proto-es/v1/database_catalog_service_pb";import type {diff --git a/frontend/src/components/SchemaEditorLite/context/config.ts b/frontend/src/components/SchemaEditorLite/context/config.tsindex e2414496c9..f1ffd29a3a 100644--- a/frontend/src/components/SchemaEditorLite/context/config.ts+++ b/frontend/src/components/SchemaEditorLite/context/config.ts@@ -2,17 +2,17 @@ import { create } from "@bufbuild/protobuf";import type { Ref } from "vue";import { reactive, watch } from "vue";import type {- TableCatalog,ColumnCatalog,+ DatabaseCatalog,+ TableCatalog,} from "@/types/proto-es/v1/database_catalog_service_pb";import {+ ColumnCatalogSchema,DatabaseCatalogSchema,SchemaCatalogSchema,- TableCatalogSchema,TableCatalog_ColumnsSchema,- ColumnCatalogSchema,+ TableCatalogSchema,} from "@/types/proto-es/v1/database_catalog_service_pb";-import type { DatabaseCatalog } from "@/types/proto-es/v1/database_catalog_service_pb";import { keyForResourceName } from "./common";export const useEditCatalogs = (diff --git a/frontend/src/components/SchemaEditorLite/context/selection.ts b/frontend/src/components/SchemaEditorLite/context/selection.tsindex fbdb0136a5..817aa63045 100644--- a/frontend/src/components/SchemaEditorLite/context/selection.ts+++ b/frontend/src/components/SchemaEditorLite/context/selection.ts@@ -11,8 +11,8 @@ import type {TableMetadata,ViewMetadata,} from "@/types/proto-es/v1/database_service_pb";-import type { SchemaEditorEvents } from ".";import type { RolloutObject } from "../types";+import type { SchemaEditorEvents } from ".";import { keyForResource } from "./common";export const useSelection = (diff --git a/frontend/src/components/SchemaEditorLite/context/tabs.ts b/frontend/src/components/SchemaEditorLite/context/tabs.tsindex 811da6f5a5..cfbe641dfd 100644--- a/frontend/src/components/SchemaEditorLite/context/tabs.ts+++ b/frontend/src/components/SchemaEditorLite/context/tabs.ts@@ -1,5 +1,5 @@import { v1 as uuidv1 } from "uuid";-import { computed, ref, type Ref } from "vue";+import { computed, type Ref, ref } from "vue";import { useEmitteryEventListener } from "@/composables/useEmitteryEventListener";import type { CoreTabContext, TabContext } from "../types";import type { SchemaEditorEvents } from "./index";diff --git a/frontend/src/components/SchemaTemplate/ClassificationTree.vue b/frontend/src/components/SchemaTemplate/ClassificationTree.vueindex 50670378d5..27d1491d72 100644--- a/frontend/src/components/SchemaTemplate/ClassificationTree.vue+++ b/frontend/src/components/SchemaTemplate/ClassificationTree.vue@@ -28,7 +28,7 @@<script lang="ts" setup>import type { TreeOption } from "naive-ui";import { NTree } from "naive-ui";-import { computed, reactive, h } from "vue";+import { computed, h, reactive } from "vue";import type { DataClassificationSetting_DataClassificationConfig } from "@/types/proto-es/v1/setting_service_pb";import { getHighlightHTMLByKeyWords } from "@/utils";import { SearchBox } from "../v2";diff --git a/frontend/src/components/SchemaTemplate/FieldTemplateForm.vue b/frontend/src/components/SchemaTemplate/FieldTemplateForm.vueindex 307f9cb8b9..7a8c724e8b 100644--- a/frontend/src/components/SchemaTemplate/FieldTemplateForm.vue+++ b/frontend/src/components/SchemaTemplate/FieldTemplateForm.vue@@ -230,8 +230,8 @@<script lang="ts" setup>import { create as createProto } from "@bufbuild/protobuf";-import { isEqual, cloneDeep } from "lodash-es";-import { XIcon, PencilIcon } from "lucide-vue-next";+import { cloneDeep, isEqual } from "lodash-es";+import { PencilIcon, XIcon } from "lucide-vue-next";import type { SelectOption } from "naive-ui";import { NButton, NInput, NSwitch } from "naive-ui";import { computed, reactive, watch } from "vue";@@ -247,11 +247,11 @@ import {InstanceEngineRadioGrid,MiniActionButton,} from "@/components/v2";-import { useSettingV1Store, useNotificationStore } from "@/store";+import { useNotificationStore, useSettingV1Store } from "@/store";import { ColumnCatalogSchema } from "@/types/proto-es/v1/database_catalog_service_pb";import {- ColumnMetadataSchema,type ColumnMetadata,+ ColumnMetadataSchema,} from "@/types/proto-es/v1/database_service_pb";import type { SchemaTemplateSetting_FieldTemplate } from "@/types/proto-es/v1/setting_service_pb";import {@@ -261,13 +261,13 @@ import {ValueSchema as SettingValueSchema,} from "@/types/proto-es/v1/setting_service_pb";import {- getDataTypeSuggestionList,convertKVListToLabels,convertLabelsToKVList,+ getDataTypeSuggestionList,} from "@/utils";import ClassificationLevelBadge from "./ClassificationLevelBadge.vue";import SelectClassificationDrawer from "./SelectClassificationDrawer.vue";-import { engineList, categoryList, classificationConfig } from "./utils";+import { categoryList, classificationConfig, engineList } from "./utils";const props = defineProps<{create: boolean;diff --git a/frontend/src/components/SchemaTemplate/FieldTemplateTable.vue b/frontend/src/components/SchemaTemplate/FieldTemplateTable.vueindex 3d2c62d4b4..bbe0d3b744 100644--- a/frontend/src/components/SchemaTemplate/FieldTemplateTable.vue+++ b/frontend/src/components/SchemaTemplate/FieldTemplateTable.vue@@ -13,8 +13,8 @@import { create as createProto } from "@bufbuild/protobuf";import { pullAt } from "lodash-es";import { PencilIcon, TrashIcon } from "lucide-vue-next";-import { NPopconfirm, NDataTable } from "naive-ui";import type { DataTableColumn } from "naive-ui";+import { NDataTable, NPopconfirm } from "naive-ui";import { computed } from "vue";import { useI18n } from "vue-i18n";import { getColumnDefaultValuePlaceholder } from "@/components/SchemaEditorLite";diff --git a/frontend/src/components/SchemaTemplate/FieldTemplateView.vue b/frontend/src/components/SchemaTemplate/FieldTemplateView.vueindex 17dfc92ff2..9cea1c7d1f 100644--- a/frontend/src/components/SchemaTemplate/FieldTemplateView.vue+++ b/frontend/src/components/SchemaTemplate/FieldTemplateView.vue@@ -46,7 +46,7 @@<script lang="ts" setup>import { NCheckbox, NEmpty } from "naive-ui";-import { reactive, computed } from "vue";+import { computed, reactive } from "vue";import { useI18n } from "vue-i18n";import type { Engine } from "@/types/proto-es/v1/common_pb";import type { SchemaTemplateSetting_FieldTemplate } from "@/types/proto-es/v1/setting_service_pb";diff --git a/frontend/src/components/SchemaTemplate/TableTemplateForm.vue b/frontend/src/components/SchemaTemplate/TableTemplateForm.vueindex 527b8dc299..c322f021d8 100644--- a/frontend/src/components/SchemaTemplate/TableTemplateForm.vue+++ b/frontend/src/components/SchemaTemplate/TableTemplateForm.vue@@ -180,10 +180,10 @@ import { computed, onMounted, reactive, ref, toRef } from "vue";import { useI18n } from "vue-i18n";import RequiredStar from "@/components/RequiredStar.vue";import {- TableColumnEditor,- provideSchemaEditorContext,type EditStatus,type EditTarget,+ provideSchemaEditorContext,+ TableColumnEditor,} from "@/components/SchemaEditorLite";import {Drawer,@@ -196,14 +196,14 @@ import { pushNotification, useSettingV1Store } from "@/store";import { unknownProject } from "@/types";import { TableCatalogSchema } from "@/types/proto-es/v1/database_catalog_service_pb";import {- ColumnMetadataSchema,type ColumnMetadata,+ ColumnMetadataSchema,} from "@/types/proto-es/v1/database_service_pb";import {- SchemaTemplateSettingSchema,- Setting_SettingName,type SchemaTemplateSetting_FieldTemplate,type SchemaTemplateSetting_TableTemplate,+ SchemaTemplateSettingSchema,+ Setting_SettingName,ValueSchema as SettingValueSchema,} from "@/types/proto-es/v1/setting_service_pb";import { instanceV1AllowsReorderColumns } from "@/utils";diff --git a/frontend/src/components/SchemaTemplate/TableTemplateTable.vue b/frontend/src/components/SchemaTemplate/TableTemplateTable.vueindex 5e6830843b..d13f0af1da 100644--- a/frontend/src/components/SchemaTemplate/TableTemplateTable.vue+++ b/frontend/src/components/SchemaTemplate/TableTemplateTable.vue@@ -13,8 +13,8 @@import { create as createProto } from "@bufbuild/protobuf";import { pullAt } from "lodash-es";import { PencilIcon, TrashIcon } from "lucide-vue-next";-import { NPopconfirm, NDataTable } from "naive-ui";import type { DataTableColumn } from "naive-ui";+import { NDataTable, NPopconfirm } from "naive-ui";import { computed } from "vue";import { useI18n } from "vue-i18n";import { MiniActionButton } from "@/components/v2";diff --git a/frontend/src/components/SchemaTemplate/TableTemplateView.vue b/frontend/src/components/SchemaTemplate/TableTemplateView.vueindex e816aed223..518e7f83a6 100644--- a/frontend/src/components/SchemaTemplate/TableTemplateView.vue+++ b/frontend/src/components/SchemaTemplate/TableTemplateView.vue@@ -40,7 +40,7 @@<script lang="ts" setup>import { NCheckbox, NEmpty } from "naive-ui";-import { reactive, computed } from "vue";+import { computed, reactive } from "vue";import { useI18n } from "vue-i18n";import type { Engine } from "@/types/proto-es/v1/common_pb";import type { SchemaTemplateSetting_TableTemplate } from "@/types/proto-es/v1/setting_service_pb";diff --git a/frontend/src/components/SchemaTemplate/utils.ts b/frontend/src/components/SchemaTemplate/utils.tsindex 3e37807ebe..96a4c1dda0 100644--- a/frontend/src/components/SchemaTemplate/utils.ts+++ b/frontend/src/components/SchemaTemplate/utils.ts@@ -2,14 +2,14 @@ import { create } from "@bufbuild/protobuf";import { cloneDeep } from "lodash-es";import { computed, reactive } from "vue";import { useSettingV1Store } from "@/store";-import { unknownDatabase, type ComposedDatabase } from "@/types";+import { type ComposedDatabase, unknownDatabase } from "@/types";import { Engine } from "@/types/proto-es/v1/common_pb";import {DatabaseCatalogSchema,SchemaCatalogSchema,type TableCatalog,- TableCatalogSchema,TableCatalog_ColumnsSchema,+ TableCatalogSchema,} from "@/types/proto-es/v1/database_catalog_service_pb";import {DatabaseMetadataSchema,@@ -18,8 +18,8 @@ import {TableMetadataSchema,} from "@/types/proto-es/v1/database_service_pb";import type {- SchemaTemplateSetting_TableTemplate,DataClassificationSetting_DataClassificationConfig,+ SchemaTemplateSetting_TableTemplate,} from "@/types/proto-es/v1/setting_service_pb";import {SchemaTemplateSetting_TableTemplateSchema,diff --git a/frontend/src/components/SensitiveData/ClassificationView.vue b/frontend/src/components/SensitiveData/ClassificationView.vueindex 75b6ebae3c..2a44b581dc 100644--- a/frontend/src/components/SensitiveData/ClassificationView.vue+++ b/frontend/src/components/SensitiveData/ClassificationView.vue@@ -93,22 +93,22 @@<script lang="ts" setup>import { create } from "@bufbuild/protobuf";-import { head, isEqual, isEmpty } from "lodash-es";+import { head, isEmpty, isEqual } from "lodash-es";import { UploadIcon } from "lucide-vue-next";-import { NSwitch, useDialog, NDivider, NButton } from "naive-ui";+import { NButton, NDivider, NSwitch, useDialog } from "naive-ui";import { v4 as uuidv4 } from "uuid";import { computed, reactive, ref, watchEffect } from "vue";import { useI18n } from "vue-i18n";-import { featureToRef, useSettingV1Store, pushNotification } from "@/store";+import { featureToRef, pushNotification, useSettingV1Store } from "@/store";import type {DataClassificationSetting_DataClassificationConfig_Level as ClassificationLevel,DataClassificationSetting_DataClassificationConfig_DataClassification as DataClassification,DataClassificationSetting_DataClassificationConfig,} from "@/types/proto-es/v1/setting_service_pb";import {- DataClassificationSetting_DataClassificationConfigSchema,- DataClassificationSetting_DataClassificationConfig_LevelSchema,DataClassificationSetting_DataClassificationConfig_DataClassificationSchema,+ DataClassificationSetting_DataClassificationConfig_LevelSchema,+ DataClassificationSetting_DataClassificationConfigSchema,DataClassificationSettingSchema,Setting_SettingName,ValueSchema as SettingValueSchema,diff --git a/frontend/src/components/SensitiveData/GlobalMaskingRulesView.vue b/frontend/src/components/SensitiveData/GlobalMaskingRulesView.vueindex 0a296ebed0..daaeb73807 100644--- a/frontend/src/components/SensitiveData/GlobalMaskingRulesView.vue+++ b/frontend/src/components/SensitiveData/GlobalMaskingRulesView.vue@@ -114,15 +114,15 @@<script lang="ts" setup>import { create } from "@bufbuild/protobuf";import {- PlusIcon,- PencilIcon,- ChevronUpIcon,ChevronDownIcon,+ ChevronUpIcon,ListOrderedIcon,+ PencilIcon,+ PlusIcon,} from "lucide-vue-next";import { NButton, NEmpty, type SelectOption } from "naive-ui";import { v4 as uuidv4 } from "uuid";-import { computed, reactive, nextTick, onMounted, ref } from "vue";+import { computed, nextTick, onMounted, reactive, ref } from "vue";import { useI18n } from "vue-i18n";import {getEnvironmentIdOptions,@@ -135,35 +135,35 @@ import type { Factor } from "@/plugins/cel";import {featureToRef,pushNotification,+ useDatabaseV1Store,+ useInstanceV1Store,usePolicyV1Store,useProjectV1Store,- useInstanceV1Store,- useDatabaseV1Store,} from "@/store";-import type { Policy } from "@/types/proto-es/v1/org_policy_service_pb";-import type { MaskingRulePolicy_MaskingRule } from "@/types/proto-es/v1/org_policy_service_pb";-import {- MaskingRulePolicySchema,- MaskingRulePolicy_MaskingRuleSchema,+import type {+ MaskingRulePolicy_MaskingRule,+ Policy,} from "@/types/proto-es/v1/org_policy_service_pb";import {- PolicyType,+ MaskingRulePolicy_MaskingRuleSchema,+ MaskingRulePolicySchema,PolicyResourceType,+ PolicyType,} from "@/types/proto-es/v1/org_policy_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import {arraySwap,- hasWorkspacePermissionV2,getDefaultPagination,+ hasWorkspacePermissionV2,} from "@/utils";import {+ CEL_ATTRIBUTE_RESOURCE_CLASSIFICATION_LEVEL,+ CEL_ATTRIBUTE_RESOURCE_COLUMN_NAME,+ CEL_ATTRIBUTE_RESOURCE_DATABASE_NAME,CEL_ATTRIBUTE_RESOURCE_ENVIRONMENT_ID,- CEL_ATTRIBUTE_RESOURCE_PROJECT_ID,CEL_ATTRIBUTE_RESOURCE_INSTANCE_ID,- CEL_ATTRIBUTE_RESOURCE_DATABASE_NAME,+ CEL_ATTRIBUTE_RESOURCE_PROJECT_ID,CEL_ATTRIBUTE_RESOURCE_TABLE_NAME,- CEL_ATTRIBUTE_RESOURCE_COLUMN_NAME,- CEL_ATTRIBUTE_RESOURCE_CLASSIFICATION_LEVEL,} from "@/utils/cel-attributes";import LearnMoreLink from "../LearnMoreLink.vue";import { MiniActionButton } from "../v2";diff --git a/frontend/src/components/SensitiveData/GrantAccessForm.vue b/frontend/src/components/SensitiveData/GrantAccessForm.vueindex f09c7739ad..91bb515bf4 100644--- a/frontend/src/components/SensitiveData/GrantAccessForm.vue+++ b/frontend/src/components/SensitiveData/GrantAccessForm.vue@@ -106,25 +106,25 @@ import DatabaseResourceForm from "@/components/GrantRequestPanel/DatabaseResourcimport MembersBindingSelect from "@/components/Member/MembersBindingSelect.vue";import RequiredStar from "@/components/RequiredStar.vue";import FormLayout from "@/components/v2/Form/FormLayout.vue";-import { usePolicyV1Store, pushNotification } from "@/store";+import { pushNotification, usePolicyV1Store } from "@/store";import type { DatabaseResource } from "@/types";import { ExprSchema } from "@/types/proto-es/google/type/expr_pb";import type {- Policy,MaskingExceptionPolicy_MaskingException,+ Policy,} from "@/types/proto-es/v1/org_policy_service_pb";import {- PolicyType,- PolicyResourceType,MaskingExceptionPolicy_MaskingException_Action,- MaskingExceptionPolicySchema,MaskingExceptionPolicy_MaskingExceptionSchema,+ MaskingExceptionPolicySchema,+ PolicyResourceType,+ PolicyType,} from "@/types/proto-es/v1/org_policy_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import type { SensitiveColumn } from "./types";import {- getExpressionsForDatabaseResource,convertSensitiveColumnToDatabaseResource,+ getExpressionsForDatabaseResource,} from "./utils";const props = defineProps<{diff --git a/frontend/src/components/SensitiveData/MaskingExceptionUserTable.vue b/frontend/src/components/SensitiveData/MaskingExceptionUserTable.vueindex 63012c7fdf..7d2a5121d1 100644--- a/frontend/src/components/SensitiveData/MaskingExceptionUserTable.vue+++ b/frontend/src/components/SensitiveData/MaskingExceptionUserTable.vue@@ -15,49 +15,53 @@<script lang="tsx" setup>import { create } from "@bufbuild/protobuf";import { orderBy } from "lodash-es";-import { TrashIcon, InfoIcon } from "lucide-vue-next";+import { InfoIcon, TrashIcon } from "lucide-vue-next";import type { DataTableColumn } from "naive-ui";import {NCheckbox,- NDatePicker,NDataTable,- useDialog,+ NDatePicker,NTooltip,+ useDialog,} from "naive-ui";-import { computed, reactive, h, watchEffect } from "vue";import type { VNodeChild } from "vue";+import { computed, h, reactive, watchEffect } from "vue";import { useI18n } from "vue-i18n";-import { RouterLink } from "vue-router";-import { useRouter } from "vue-router";+import { RouterLink, useRouter } from "vue-router";import GroupNameCell from "@/components/User/Settings/UserDataTableByGroup/cells/GroupNameCell.vue";-import { MiniActionButton } from "@/components/v2";-import { DatabaseV1Name, InstanceV1Name } from "@/components/v2";+import {+ DatabaseV1Name,+ InstanceV1Name,+ MiniActionButton,+} from "@/components/v2";import { WORKSPACE_ROUTE_USER_PROFILE } from "@/router/dashboard/workspaceRoutes";import {- usePolicyV1Store,+ extractGroupEmail,+ pushNotification,+ useDatabaseV1Store,+ useGroupStore,usePolicyByParentAndType,+ usePolicyV1Store,useUserStore,- useGroupStore,- useDatabaseV1Store,- pushNotification,- extractGroupEmail,} from "@/store";import {- getUserEmailInBinding,getGroupEmailInBinding,+ getUserEmailInBinding,groupBindingPrefix,isValidDatabaseName,} from "@/types";import { ExprSchema } from "@/types/proto-es/google/type/expr_pb";-import { MaskingExceptionPolicy_MaskingException_Action } from "@/types/proto-es/v1/org_policy_service_pb";import type { MaskingExceptionPolicy_MaskingException } from "@/types/proto-es/v1/org_policy_service_pb";-import { MaskingExceptionPolicySchema } from "@/types/proto-es/v1/org_policy_service_pb";-import { PolicyType } from "@/types/proto-es/v1/org_policy_service_pb";+import {+ MaskingExceptionPolicy_MaskingException_Action,+ MaskingExceptionPolicySchema,+ PolicyType,+} from "@/types/proto-es/v1/org_policy_service_pb";import type { Project } from "@/types/proto-es/v1/project_service_pb";import { autoDatabaseRoute, hasProjectPermissionV2 } from "@/utils";import {- type ConditionExpression,batchConvertFromCELString,+ type ConditionExpression,} from "@/utils/issue/cel";import UserAvatar from "../User/UserAvatar.vue";import { type AccessUser } from "./types";diff --git a/frontend/src/components/SensitiveData/SemanticTypesView.vue b/frontend/src/components/SensitiveData/SemanticTypesView.vueindex fe931998af..4dc07502e8 100644--- a/frontend/src/components/SensitiveData/SemanticTypesView.vue+++ b/frontend/src/components/SensitiveData/SemanticTypesView.vue@@ -41,7 +41,7 @@ import { create } from "@bufbuild/protobuf";import { PlusIcon } from "lucide-vue-next";import { NButton } from "naive-ui";import { v4 as uuidv4 } from "uuid";-import { computed, reactive, onMounted } from "vue";+import { computed, onMounted, reactive } from "vue";import { useI18n } from "vue-i18n";import { featureToRef, pushNotification, useSettingV1Store } from "@/store";import type { SemanticTypeSetting_SemanticType } from "@/types/proto-es/v1/setting_service_pb";diff --git a/frontend/src/components/SensitiveData/components/IconSelector.vue b/frontend/src/components/SensitiveData/components/IconSelector.vueindex 2dd196a741..64edf7d8d9 100644--- a/frontend/src/components/SensitiveData/components/IconSelector.vue+++ b/frontend/src/components/SensitiveData/components/IconSelector.vue@@ -67,8 +67,8 @@<script setup lang="ts">import { PencilIcon } from "lucide-vue-next";-import { NPopover, NButton } from "naive-ui";-import { ref, computed } from "vue";+import { NButton, NPopover } from "naive-ui";+import { computed, ref } from "vue";import SingleFileSelector from "@/components/SingleFileSelector.vue";import { MiniActionButton } from "@/components/v2";diff --git a/frontend/src/components/SensitiveData/components/MaskingAlgorithmsCreateDrawer.vue b/frontend/src/components/SensitiveData/components/MaskingAlgorithmsCreateDrawer.vueindex f900b16c5c..674a7770e4 100644--- a/frontend/src/components/SensitiveData/components/MaskingAlgorithmsCreateDrawer.vue+++ b/frontend/src/components/SensitiveData/components/MaskingAlgorithmsCreateDrawer.vue@@ -305,31 +305,31 @@ import {NRadioGroup,NTooltip,} from "naive-ui";-import { computed, watch, reactive } from "vue";+import { computed, reactive, watch } from "vue";import { useI18n } from "vue-i18n";import RequiredStar from "@/components/RequiredStar.vue";-import type { RadioGridOption, RadioGridItem } from "@/components/v2";+import type { RadioGridItem, RadioGridOption } from "@/components/v2";import {Drawer,DrawerContent,- RadioGrid,MiniActionButton,+ RadioGrid,} from "@/components/v2";import type {Algorithm,+ Algorithm_InnerOuterMask,Algorithm_FullMask as FullMask,- Algorithm_RangeMask as RangeMask,Algorithm_MD5Mask as MD5Mask,- Algorithm_InnerOuterMask,+ Algorithm_RangeMask as RangeMask,} from "@/types/proto-es/v1/setting_service_pb";import {+ Algorithm_InnerOuterMask_MaskType,+ Algorithm_InnerOuterMaskSchema,+ Algorithm_RangeMask_SliceSchema,AlgorithmSchema,Algorithm_FullMaskSchema as FullMaskSchema,- Algorithm_RangeMaskSchema as RangeMaskSchema,Algorithm_MD5MaskSchema as MD5MaskSchema,- Algorithm_InnerOuterMaskSchema,- Algorithm_RangeMask_SliceSchema,- Algorithm_InnerOuterMask_MaskType,+ Algorithm_RangeMaskSchema as RangeMaskSchema,} from "@/types/proto-es/v1/setting_service_pb";import type { MaskingType } from "./utils";import { getMaskingType } from "./utils";diff --git a/frontend/src/components/SensitiveData/components/MaskingRuleConfig.vue b/frontend/src/components/SensitiveData/components/MaskingRuleConfig.vueindex 131cd44b86..219fbe18da 100644--- a/frontend/src/components/SensitiveData/components/MaskingRuleConfig.vue+++ b/frontend/src/components/SensitiveData/components/MaskingRuleConfig.vue@@ -89,18 +89,18 @@ import { create } from "@bufbuild/protobuf";import { head } from "lodash-es";import { TrashIcon } from "lucide-vue-next";import type { SelectOption } from "naive-ui";-import { NSelect, NPopconfirm, NInput, NButton } from "naive-ui";-import { computed, reactive, onMounted, nextTick } from "vue";+import { NButton, NInput, NPopconfirm, NSelect } from "naive-ui";+import { computed, nextTick, onMounted, reactive } from "vue";import { useI18n } from "vue-i18n";import ExprEditor from "@/components/ExprEditor";import { type OptionConfig } from "@/components/ExprEditor/context";import type { ConditionGroupExpr, Factor, SimpleExpr } from "@/plugins/cel";import {- resolveCELExpr,- wrapAsGroup,buildCELExpr,- validateSimpleExpr,emptySimpleExpr,+ resolveCELExpr,+ validateSimpleExpr,+ wrapAsGroup,} from "@/plugins/cel";import { useSettingV1Store } from "@/store";import { ExprSchema } from "@/types/proto-es/google/type/expr_pb";diff --git a/frontend/src/components/SensitiveData/components/SemanticTypesTable.vue b/frontend/src/components/SensitiveData/components/SemanticTypesTable.vueindex 80ec988adc..27e10165f7 100644--- a/frontend/src/components/SensitiveData/components/SemanticTypesTable.vue+++ b/frontend/src/components/SensitiveData/components/SemanticTypesTable.vue@@ -29,13 +29,13 @@<script lang="tsx" setup>import {CheckIcon,+ InfoIcon,PencilIcon,TrashIcon,Undo2Icon,- InfoIcon,} from "lucide-vue-next";-import { NPopconfirm, NInput, NDataTable, NTooltip } from "naive-ui";import type { DataTableColumn } from "naive-ui";+import { NDataTable, NInput, NPopconfirm, NTooltip } from "naive-ui";import { computed, reactive } from "vue";import { useI18n } from "vue-i18n";import { MiniActionButton } from "@/components/v2";diff --git a/frontend/src/components/SensitiveData/components/SensitiveColumnTable.vue b/frontend/src/components/SensitiveData/components/SensitiveColumnTable.vueindex d766d8be88..79b1f4823c 100644--- a/frontend/src/components/SensitiveData/components/SensitiveColumnTable.vue+++ b/frontend/src/components/SensitiveData/components/SensitiveColumnTable.vue@@ -13,19 +13,19 @@<script lang="tsx" setup>import { create } from "@bufbuild/protobuf";import { TrashIcon } from "lucide-vue-next";-import { NDataTable, NPopconfirm, type DataTableColumn } from "naive-ui";+import { type DataTableColumn, NDataTable, NPopconfirm } from "naive-ui";import { computed, h, ref, watch, withModifiers } from "vue";import { useI18n } from "vue-i18n";-import { useRouter, RouterLink } from "vue-router";+import { RouterLink, useRouter } from "vue-router";import ClassificationCell from "@/components/ColumnDataTable/ClassificationCell.vue";import SemanticTypeCell from "@/components/ColumnDataTable/SemanticTypeCell.vue";import type { MaskData } from "@/components/SensitiveData/types";import { MiniActionButton } from "@/components/v2";import {pushNotification,+ useDatabaseCatalog,useDatabaseCatalogV1Store,useSettingV1Store,- useDatabaseCatalog,} from "@/store";import type { ComposedDatabase } from "@/types";import { DataClassificationSetting_DataClassificationConfigSchema } from "@/types/proto-es/v1/setting_service_pb";diff --git a/frontend/src/components/SensitiveData/components/utils.ts b/frontend/src/components/SensitiveData/components/utils.tsindex c66959efe8..d87d04f674 100644--- a/frontend/src/components/SensitiveData/components/utils.ts+++ b/frontend/src/components/SensitiveData/components/utils.ts@@ -5,13 +5,13 @@ import { h } from "vue";import { getRenderOptionFunc } from "@/components/CustomApproval/Settings/components/common";import { InstanceV1Name } from "@/components/v2";import type { Factor, Operator } from "@/plugins/cel";-import { EqualityOperatorList, CollectionOperatorList } from "@/plugins/cel";+import { CollectionOperatorList, EqualityOperatorList } from "@/plugins/cel";import { useSettingV1Store } from "@/store";import type { Instance } from "@/types/proto-es/v1/instance_service_pb";import type { Algorithm } from "@/types/proto-es/v1/setting_service_pb";import {- Setting_SettingName,AlgorithmSchema,+ Setting_SettingName,} from "@/types/proto-es/v1/setting_service_pb";import { extractInstanceResourceName } from "@/utils";import { CEL_ATTRIBUTE_RESOURCE_PROJECT_ID } from "@/utils/cel-attributes";diff --git a/frontend/src/components/SensitiveData/types.ts b/frontend/src/components/SensitiveData/types.tsindex 81207272ea..6527223b38 100644--- a/frontend/src/components/SensitiveData/types.ts+++ b/frontend/src/components/SensitiveData/types.ts@@ -1,8 +1,8 @@import type { ComposedDatabase, DatabaseResource } from "@/types";import type {- TableCatalog,ColumnCatalog,ObjectSchema,+ TableCatalog,} from "@/types/proto-es/v1/database_catalog_service_pb";import type { Group } from "@/types/proto-es/v1/group_service_pb";import type { MaskingExceptionPolicy_MaskingException_Action } from "@/types/proto-es/v1/org_policy_service_pb";diff --git a/frontend/src/components/SensitiveData/useSemanticType.ts b/frontend/src/components/SensitiveData/useSemanticType.tsindex 6bf6dad04a..63f9d091b8 100644--- a/frontend/src/components/SensitiveData/useSemanticType.ts+++ b/frontend/src/components/SensitiveData/useSemanticType.ts@@ -1,4 +1,4 @@-import { computed, unref, type MaybeRef } from "vue";+import { computed, type MaybeRef, unref } from "vue";import { useSettingV1Store } from "@/store";import { Setting_SettingName } from "@/types/proto-es/v1/setting_service_pb";diff --git a/frontend/src/components/SensitiveData/utils.ts b/frontend/src/components/SensitiveData/utils.tsindex 21acd34317..7d4746e317 100644--- a/frontend/src/components/SensitiveData/utils.ts+++ b/frontend/src/components/SensitiveData/utils.ts@@ -4,11 +4,11 @@ import type { MaskingExceptionPolicy_MaskingException } from "@/types/proto-es/vimport { extractDatabaseResourceName } from "@/utils";import {CEL_ATTRIBUTE_REQUEST_TIME,- CEL_ATTRIBUTE_RESOURCE_SCHEMA_NAME,- CEL_ATTRIBUTE_RESOURCE_INSTANCE_ID,+ CEL_ATTRIBUTE_RESOURCE_COLUMN_NAME,CEL_ATTRIBUTE_RESOURCE_DATABASE_NAME,+ CEL_ATTRIBUTE_RESOURCE_INSTANCE_ID,+ CEL_ATTRIBUTE_RESOURCE_SCHEMA_NAME,CEL_ATTRIBUTE_RESOURCE_TABLE_NAME,- CEL_ATTRIBUTE_RESOURCE_COLUMN_NAME,} from "@/utils/cel-attributes";import type { SensitiveColumn } from "./types";diff --git a/frontend/src/components/SingleFileSelector.vue b/frontend/src/components/SingleFileSelector.vueindex 2fed4b77d7..502a5054ee 100644--- a/frontend/src/components/SingleFileSelector.vue+++ b/frontend/src/components/SingleFileSelector.vue@@ -49,7 +49,7 @@<script lang="ts" setup>import { NEmpty } from "naive-ui";import type { PropType } from "vue";-import { ref, reactive } from "vue";+import { reactive, ref } from "vue";import { useI18n } from "vue-i18n";import { pushNotification } from "@/store";diff --git a/frontend/src/components/SyncDatabaseSchemaV1/DatabaseSchemaSelector.vue b/frontend/src/components/SyncDatabaseSchemaV1/DatabaseSchemaSelector.vueindex 473ca47aa0..4d81ef6979 100644--- a/frontend/src/components/SyncDatabaseSchemaV1/DatabaseSchemaSelector.vue+++ b/frontend/src/components/SyncDatabaseSchemaV1/DatabaseSchemaSelector.vue@@ -58,13 +58,13 @@ import { useI18n } from "vue-i18n";import { DatabaseSelect, EnvironmentSelect } from "@/components/v2";import {useChangelogStore,- useDBSchemaV1Store,useDatabaseV1Store,+ useDBSchemaV1Store,} from "@/store";import {- UNKNOWN_ID,getDateForPbTimestampProtoEs,isValidDatabaseName,+ UNKNOWN_ID,} from "@/types";import type { Changelog } from "@/types/proto-es/v1/database_service_pb";import {diff --git a/frontend/src/components/SyncDatabaseSchemaV1/DiffViewPanel.vue b/frontend/src/components/SyncDatabaseSchemaV1/DiffViewPanel.vueindex bd31536a8d..2decf6d401 100644--- a/frontend/src/components/SyncDatabaseSchemaV1/DiffViewPanel.vue+++ b/frontend/src/components/SyncDatabaseSchemaV1/DiffViewPanel.vue@@ -51,7 +51,7 @@</template><script lang="ts" setup>-import { NTabs, NTab } from "naive-ui";+import { NTab, NTabs } from "naive-ui";import { ref } from "vue";import { MonacoEditor } from "@/components/MonacoEditor";import { CopyButton } from "@/components/v2";diff --git a/frontend/src/components/SyncDatabaseSchemaV1/SelectTargetDatabasesView.vue b/frontend/src/components/SyncDatabaseSchemaV1/SelectTargetDatabasesView.vueindex 89a723644e..531e9b7682 100644--- a/frontend/src/components/SyncDatabaseSchemaV1/SelectTargetDatabasesView.vue+++ b/frontend/src/components/SyncDatabaseSchemaV1/SelectTargetDatabasesView.vue@@ -158,14 +158,14 @@<script lang="ts" setup>import { create } from "@bufbuild/protobuf";import { head } from "lodash-es";-import { NEllipsis, NTabs, NTabPane } from "naive-ui";+import { NEllipsis, NTabPane, NTabs } from "naive-ui";import { computed, nextTick, onMounted, reactive, ref, watch } from "vue";import { useI18n } from "vue-i18n";import { useRoute } from "vue-router";import { BBSpin } from "@/bbkit";import { InstanceV1EngineIcon } from "@/components/v2";import { useDatabaseV1Store, useEnvironmentV1Store } from "@/store";-import { isValidDatabaseName, type ComposedDatabase } from "@/types";+import { type ComposedDatabase, isValidDatabaseName } from "@/types";import { Engine } from "@/types/proto-es/v1/common_pb";import { DiffSchemaRequestSchema } from "@/types/proto-es/v1/database_service_pb";import type { Project } from "@/types/proto-es/v1/project_service_pb";diff --git a/frontend/src/components/SyncDatabaseSchemaV1/TargetDatabasesSelectPanel.vue b/frontend/src/components/SyncDatabaseSchemaV1/TargetDatabasesSelectPanel.vueindex 793517ccb7..206a1cec33 100644--- a/frontend/src/components/SyncDatabaseSchemaV1/TargetDatabasesSelectPanel.vue+++ b/frontend/src/components/SyncDatabaseSchemaV1/TargetDatabasesSelectPanel.vue@@ -71,12 +71,12 @@ import { computed, reactive, watch } from "vue";import { Drawer, DrawerContent } from "@/components/v2";import { useDatabaseV1Store } from "@/store";import {- instanceNamePrefix,environmentNamePrefix,+ instanceNamePrefix,} from "@/store/modules/v1/common";import type { Engine } from "@/types/proto-es/v1/common_pb";-import { CommonFilterScopeIdList, extractProjectResourceName } from "@/utils";import type { SearchParams, SearchScope } from "@/utils";+import { CommonFilterScopeIdList, extractProjectResourceName } from "@/utils";import AdvancedSearch from "../AdvancedSearch";import { useCommonSearchScopeOptions } from "../AdvancedSearch/useCommonSearchScopeOptions";import { PagedDatabaseTable } from "../v2/Model/DatabaseV1Table";diff --git a/frontend/src/components/SyncDatabaseSchemaV1/index.vue b/frontend/src/components/SyncDatabaseSchemaV1/index.vueindex 53ff47e17d..d3555a2a7d 100644--- a/frontend/src/components/SyncDatabaseSchemaV1/index.vue+++ b/frontend/src/components/SyncDatabaseSchemaV1/index.vue@@ -78,11 +78,11 @@<script lang="ts" setup>import { asyncComputed } from "@vueuse/core";import { isUndefined } from "lodash-es";-import { NRadioGroup, NRadio, useDialog } from "naive-ui";+import { NRadio, NRadioGroup, useDialog } from "naive-ui";import { v4 as uuidv4 } from "uuid";-import { computed, onMounted, reactive, ref, nextTick } from "vue";+import { computed, nextTick, onMounted, reactive, ref } from "vue";import { useI18n } from "vue-i18n";-import { useRoute, useRouter, type LocationQueryRaw } from "vue-router";+import { type LocationQueryRaw, useRoute, useRouter } from "vue-router";import { BBSpin } from "@/bbkit";import { StepTab } from "@/components/v2";import { useRouteChangeGuard } from "@/composables/useRouteChangeGuard";diff --git a/frontend/src/components/TableDetailDrawer.vue b/frontend/src/components/TableDetailDrawer.vueindex 13a020342b..7e20e0633e 100644--- a/frontend/src/components/TableDetailDrawer.vue+++ b/frontend/src/components/TableDetailDrawer.vue@@ -307,57 +307,57 @@ import { create } from "@bufbuild/protobuf";import { computedAsync } from "@vueuse/core";import { cloneDeep } from "lodash-es";import { CodeIcon } from "lucide-vue-next";-import { NButton, NPopover, NInput } from "naive-ui";+import { NButton, NInput, NPopover } from "naive-ui";import { computed, reactive, ref, watch } from "vue";import { useI18n } from "vue-i18n";import ClassificationCell from "@/components/ColumnDataTable/ClassificationCell.vue";import TableSchemaViewer from "@/components/TableSchemaViewer.vue";import {DatabaseV1Name,- InstanceV1Name,Drawer,DrawerContent,EnvironmentV1Name,+ InstanceV1Name,ProjectV1Name,SearchBox,} from "@/components/v2";import {- useDatabaseV1Store,- useDatabaseCatalog,- useDBSchemaV1Store,getTableCatalog,pushNotification,+ useDatabaseCatalog,useDatabaseCatalogV1Store,+ useDatabaseV1Store,+ useDBSchemaV1Store,} from "@/store";import { DEFAULT_PROJECT_NAME, defaultProject } from "@/types";import { Engine } from "@/types/proto-es/v1/common_pb";import type { TableCatalog } from "@/types/proto-es/v1/database_catalog_service_pb";import {- TableCatalogSchema,SchemaCatalogSchema,+ TableCatalogSchema,} from "@/types/proto-es/v1/database_catalog_service_pb";import { GetSchemaStringRequest_ObjectType } from "@/types/proto-es/v1/database_service_pb";import type { DataClassificationSetting_DataClassificationConfig } from "@/types/proto-es/v1/setting_service_pb";import {bytesToString,- instanceV1HasCollationAndCharacterSet,hasIndexSizeProperty,hasProjectPermissionV2,hasSchemaProperty,hasTableEngineProperty,- instanceV1SupportsTrigger,+ instanceV1HasCollationAndCharacterSet,+ instanceV1MaskingForNoSQL,instanceV1SupportsColumn,instanceV1SupportsIndex,- instanceV1MaskingForNoSQL,+ instanceV1SupportsTrigger,isDatabaseV1Queryable,supportGetStringSchema,} from "@/utils";import ColumnDataTable from "./ColumnDataTable/index.vue";import { SQLEditorButtonV1 } from "./DatabaseDetail";import IndexTable from "./IndexTable.vue";+import MaskSpinner from "./misc/MaskSpinner.vue";import PartitionTablesDataTable from "./PartitionTablesDataTable.vue";import TriggerDataTable from "./TriggerDataTable.vue";-import MaskSpinner from "./misc/MaskSpinner.vue";interface LocalState {columnNameSearchKeyword: string;diff --git a/frontend/src/components/TableSchemaViewer.vue b/frontend/src/components/TableSchemaViewer.vueindex 527f5f3e71..f259b02a77 100644--- a/frontend/src/components/TableSchemaViewer.vue+++ b/frontend/src/components/TableSchemaViewer.vue@@ -21,8 +21,7 @@<script lang="ts" setup>import { create } from "@bufbuild/protobuf";-import { onMounted, ref, computed } from "vue";-import { nextTick } from "vue";+import { computed, nextTick, onMounted, ref } from "vue";import { MonacoEditor } from "@/components/MonacoEditor";import { CopyButton } from "@/components/v2";import { databaseServiceClientConnect } from "@/grpcweb";diff --git a/frontend/src/components/TransferDatabaseForm/TransferDatabaseForm.vue b/frontend/src/components/TransferDatabaseForm/TransferDatabaseForm.vueindex 9362e8b838..ecf2b97042 100644--- a/frontend/src/components/TransferDatabaseForm/TransferDatabaseForm.vue+++ b/frontend/src/components/TransferDatabaseForm/TransferDatabaseForm.vue@@ -78,24 +78,23 @@import { create } from "@bufbuild/protobuf";import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";import { NButton, NTooltip } from "naive-ui";-import { computed, reactive, watchEffect } from "vue";-import { toRef } from "vue";+import { computed, reactive, toRef, watchEffect } from "vue";import {pushNotification,useDatabaseV1Store,useProjectByName,} from "@/store";import {+ type ComposedDatabase,DEFAULT_PROJECT_NAME,defaultProject,formatEnvironmentName,isValidProjectName,- type ComposedDatabase,} from "@/types";import {+ BatchUpdateDatabasesRequestSchema,DatabaseSchema$,UpdateDatabaseRequestSchema,- BatchUpdateDatabasesRequestSchema,} from "@/types/proto-es/v1/database_service_pb";import type { InstanceResource } from "@/types/proto-es/v1/instance_service_pb";import type { Project } from "@/types/proto-es/v1/project_service_pb";diff --git a/frontend/src/components/TransferOutDatabaseForm/TransferOutDatabaseForm.vue b/frontend/src/components/TransferOutDatabaseForm/TransferOutDatabaseForm.vueindex 2397d39c17..dfe5142c2f 100644--- a/frontend/src/components/TransferOutDatabaseForm/TransferOutDatabaseForm.vue+++ b/frontend/src/components/TransferOutDatabaseForm/TransferOutDatabaseForm.vue@@ -71,12 +71,12 @@<script setup lang="ts">import { create } from "@bufbuild/protobuf";import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";-import { NButton, NTooltip, NDivider, NRadioGroup, NRadio } from "naive-ui";+import { NButton, NDivider, NRadio, NRadioGroup, NTooltip } from "naive-ui";import { computed, ref, watch } from "vue";import { useI18n } from "vue-i18n";import { useRouter } from "vue-router";import { BBSpin } from "@/bbkit";-import { ProjectSelect, DrawerContent } from "@/components/v2";+import { DrawerContent, ProjectSelect } from "@/components/v2";import {pushNotification,useDatabaseV1Store,@@ -84,14 +84,14 @@ import {} from "@/store";import type { ComposedDatabase } from "@/types";import {- PresetRoleType,DEFAULT_PROJECT_NAME,isValidProjectName,+ PresetRoleType,} from "@/types";import {+ BatchUpdateDatabasesRequestSchema,DatabaseSchema$,UpdateDatabaseRequestSchema,- BatchUpdateDatabasesRequestSchema,} from "@/types/proto-es/v1/database_service_pb";import { autoProjectRoute } from "@/utils";import DatabaseV1Table from "../v2/Model/DatabaseV1Table/DatabaseV1Table.vue";diff --git a/frontend/src/components/User/Settings/AADSyncDrawer.vue b/frontend/src/components/User/Settings/AADSyncDrawer.vueindex c22e11c596..8f396d24fb 100644--- a/frontend/src/components/User/Settings/AADSyncDrawer.vue+++ b/frontend/src/components/User/Settings/AADSyncDrawer.vue@@ -129,13 +129,12 @@ import { useI18n } from "vue-i18n";import { useRouter } from "vue-router";import { BBAttention } from "@/bbkit";import LearnMoreLink from "@/components/LearnMoreLink.vue";-import { Drawer, DrawerContent } from "@/components/v2";-import { CopyButton } from "@/components/v2";+import { CopyButton, Drawer, DrawerContent } from "@/components/v2";import { SETTING_ROUTE_WORKSPACE_GENERAL } from "@/router/dashboard/workspaceSetting";import { pushNotification, useSettingV1Store } from "@/store";import {- Setting_SettingName,SCIMSettingSchema,+ Setting_SettingName,ValueSchema as SettingValueSchema,} from "@/types/proto-es/v1/setting_service_pb";import { hasWorkspacePermissionV2 } from "@/utils";diff --git a/frontend/src/components/User/Settings/CreateGroupDrawer.vue b/frontend/src/components/User/Settings/CreateGroupDrawer.vueindex 4febf83fb8..af206fa785 100644--- a/frontend/src/components/User/Settings/CreateGroupDrawer.vue+++ b/frontend/src/components/User/Settings/CreateGroupDrawer.vue@@ -155,23 +155,23 @@ import RequiredStar from "@/components/RequiredStar.vue";import { Drawer, DrawerContent, UserSelect } from "@/components/v2";import {extractGroupEmail,- useGroupStore,- useCurrentUserV1,pushNotification,+ useCurrentUserV1,+ useGroupStore,useUserStore,} from "@/store";import {- userNamePrefix,- groupNamePrefix,extractUserId,+ groupNamePrefix,+ userNamePrefix,} from "@/store/modules/v1/common";import type { Group, GroupMember } from "@/types/proto-es/v1/group_service_pb";import {- GroupSchema,- GroupMemberSchema,GroupMember_Role,+ GroupMemberSchema,+ GroupSchema,} from "@/types/proto-es/v1/group_service_pb";-import { isValidEmail, hasWorkspacePermissionV2 } from "@/utils";+import { hasWorkspacePermissionV2, isValidEmail } from "@/utils";import RemoveGroupButton from "./RemoveGroupButton.vue";import GroupMemberRoleSelect from "./UserDataTableByGroup/cells/GroupMemberRoleSelect.vue";diff --git a/frontend/src/components/User/Settings/CreateUserDrawer.vue b/frontend/src/components/User/Settings/CreateUserDrawer.vueindex e27b15f75e..585ceb43f5 100644--- a/frontend/src/components/User/Settings/CreateUserDrawer.vue+++ b/frontend/src/components/User/Settings/CreateUserDrawer.vue@@ -116,7 +116,7 @@</template><script lang="ts" setup>-import { NButton, NInput, NRadioGroup, NRadio } from "naive-ui";+import { NButton, NInput, NRadio, NRadioGroup } from "naive-ui";import { computed, reactive, ref } from "vue";import { useI18n } from "vue-i18n";import EmailInput from "@/components/EmailInput.vue";diff --git a/frontend/src/components/User/Settings/RemoveGroupButton.vue b/frontend/src/components/User/Settings/RemoveGroupButton.vueindex a6dc8de3a1..a93a47f3df 100644--- a/frontend/src/components/User/Settings/RemoveGroupButton.vue+++ b/frontend/src/components/User/Settings/RemoveGroupButton.vue@@ -30,13 +30,13 @@ import { computed, ref } from "vue";import { useI18n } from "vue-i18n";import ResourceOccupiedModal from "@/components/v2/ResourceOccupiedModal/ResourceOccupiedModal.vue";import {+ extractGroupEmail,+ pushNotification,useCurrentUserV1,useGroupStore,- useProjectV1Store,- useProjectIamPolicyStore,- pushNotification,- extractGroupEmail,usePolicyV1Store,+ useProjectIamPolicyStore,+ useProjectV1Store,} from "@/store";import { extractUserId } from "@/store/modules/v1/common";import { getGroupEmailInBinding } from "@/types";diff --git a/frontend/src/components/User/Settings/UserDataTable/cells/UserNameCell.vue b/frontend/src/components/User/Settings/UserDataTable/cells/UserNameCell.vueindex 91a4210ad9..e28547d62f 100644--- a/frontend/src/components/User/Settings/UserDataTable/cells/UserNameCell.vue+++ b/frontend/src/components/User/Settings/UserDataTable/cells/UserNameCell.vue@@ -78,14 +78,14 @@import { ReplyIcon } from "lucide-vue-next";import { NButton, NTag } from "naive-ui";import { computed } from "vue";-import UserAvatar from "@/components/User/UserAvatar.vue";import ServiceAccountTag from "@/components/misc/ServiceAccountTag.vue";import SystemBotTag from "@/components/misc/SystemBotTag.vue";import YouTag from "@/components/misc/YouTag.vue";+import UserAvatar from "@/components/User/UserAvatar.vue";import { CopyButton } from "@/components/v2";import { useCurrentUserV1, usePermissionStore } from "@/store";import { SYSTEM_BOT_USER_NAME } from "@/types";-import { UserType, type User } from "@/types/proto-es/v1/user_service_pb";+import { type User, UserType } from "@/types/proto-es/v1/user_service_pb";import { hasWorkspacePermissionV2 } from "@/utils";defineProps<{diff --git a/frontend/src/components/User/Settings/UserDataTable/cells/UserOperationsCell.vue b/frontend/src/components/User/Settings/UserDataTable/cells/UserOperationsCell.vueindex a7f7eccd25..166d4ec98c 100644--- a/frontend/src/components/User/Settings/UserDataTable/cells/UserOperationsCell.vue+++ b/frontend/src/components/User/Settings/UserDataTable/cells/UserOperationsCell.vue@@ -61,7 +61,7 @@ import { PencilIcon, Trash2Icon, Undo2Icon } from "lucide-vue-next";import { NButton, NPopconfirm } from "naive-ui";import { computed } from "vue";import { useI18n } from "vue-i18n";-import { useUserStore, pushNotification, useCurrentUserV1 } from "@/store";+import { pushNotification, useCurrentUserV1, useUserStore } from "@/store";import { State } from "@/types/proto-es/v1/common_pb";import { type User, UserType } from "@/types/proto-es/v1/user_service_pb";import { hasWorkspacePermissionV2 } from "@/utils";diff --git a/frontend/src/components/User/Settings/UserDataTable/index.vue b/frontend/src/components/User/Settings/UserDataTable/index.vueindex 0eb98dc562..d533c89d73 100644--- a/frontend/src/components/User/Settings/UserDataTable/index.vue+++ b/frontend/src/components/User/Settings/UserDataTable/index.vue@@ -25,19 +25,19 @@ import { create } from "@bufbuild/protobuf";import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";import type { DataTableColumn } from "naive-ui";import { NDataTable } from "naive-ui";-import { computed, reactive, h, watchEffect } from "vue";+import { computed, h, reactive, watchEffect } from "vue";import { useI18n } from "vue-i18n";import { BBAlert } from "@/bbkit";import {+ pushNotification,+ useGroupStore,useUserStore,useWorkspaceV1Store,- useGroupStore,- pushNotification,} from "@/store";import type { Group } from "@/types/proto-es/v1/group_service_pb";import {- type User,UpdateUserRequestSchema,+ type User,} from "@/types/proto-es/v1/user_service_pb";import { toClipboard } from "@/utils";import GroupsCell from "./cells/GroupsCell.vue";diff --git a/frontend/src/components/User/Settings/UserDataTableByGroup/cells/GroupMemberNameCell.vue b/frontend/src/components/User/Settings/UserDataTableByGroup/cells/GroupMemberNameCell.vueindex ed8fffd320..b7368d1d35 100644--- a/frontend/src/components/User/Settings/UserDataTableByGroup/cells/GroupMemberNameCell.vue+++ b/frontend/src/components/User/Settings/UserDataTableByGroup/cells/GroupMemberNameCell.vue@@ -56,14 +56,14 @@<script lang="ts" setup>import { NTag } from "naive-ui";-import UserAvatar from "@/components/User/UserAvatar.vue";import ServiceAccountTag from "@/components/misc/ServiceAccountTag.vue";import SystemBotTag from "@/components/misc/SystemBotTag.vue";import YouTag from "@/components/misc/YouTag.vue";+import UserAvatar from "@/components/User/UserAvatar.vue";import { useCurrentUserV1, usePermissionStore } from "@/store";import { SYSTEM_BOT_USER_NAME } from "@/types";import { GroupMember_Role } from "@/types/proto-es/v1/group_service_pb";-import { UserType, type User } from "@/types/proto-es/v1/user_service_pb";+import { type User, UserType } from "@/types/proto-es/v1/user_service_pb";withDefaults(defineProps<{diff --git a/frontend/src/components/User/Settings/UserPassword.vue b/frontend/src/components/User/Settings/UserPassword.vueindex 117d9bca62..56b61eb17a 100644--- a/frontend/src/components/User/Settings/UserPassword.vue+++ b/frontend/src/components/User/Settings/UserPassword.vue@@ -96,11 +96,11 @@<script lang="tsx" setup>import {+ CircleAlertIcon,+ CircleCheckIcon,CircleHelpIcon,EyeIcon,EyeOffIcon,- CircleCheckIcon,- CircleAlertIcon,} from "lucide-vue-next";import { NInput, NTooltip } from "naive-ui";import { computed, ref } from "vue";@@ -166,8 +166,7 @@ const passwordCheck = computed(() => {text: t("settings.general.workspace.password-restriction.require-special-character"),- // eslint-disable-next-line no-useless-escape- matched: /[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]+/.test(props.password),+ matched: /[!@#$%^&*()_+\-=[\]{};':"\\|,.<>/?]+/.test(props.password),});}diff --git a/frontend/src/components/misc/ErrorList.vue b/frontend/src/components/misc/ErrorList.vueindex 148098ca9c..e43a6f05e3 100644--- a/frontend/src/components/misc/ErrorList.vue+++ b/frontend/src/components/misc/ErrorList.vue@@ -12,8 +12,7 @@</template><script setup lang="tsx">-import { computed } from "vue";-import { isVNode } from "vue";+import { computed, isVNode } from "vue";import type { JSX } from "vue/jsx-runtime";export type NestedError = {diff --git a/frontend/src/components/misc/OverlayStackManager.vue b/frontend/src/components/misc/OverlayStackManager.vueindex f37484c6f2..5b1c6ba309 100644--- a/frontend/src/components/misc/OverlayStackManager.vue+++ b/frontend/src/components/misc/OverlayStackManager.vue@@ -6,7 +6,6 @@import { useEventListener } from "@vueuse/core";import Emittery from "emittery";import { last, pullAt } from "lodash-es";-import { unref } from "vue";import type { Ref } from "vue";import {computed,@@ -15,6 +14,7 @@ import {onUnmounted,provide,ref,+ unref,watch,} from "vue";import type { MaybeRef } from "@/types";diff --git a/frontend/src/components/misc/Version.vue b/frontend/src/components/misc/Version.vueindex c43b03264b..41a4a1c06d 100644--- a/frontend/src/components/misc/Version.vue+++ b/frontend/src/components/misc/Version.vue@@ -58,7 +58,7 @@</template><script lang="ts" setup>-import { Volume2Icon, SparklesIcon } from "lucide-vue-next";+import { SparklesIcon, Volume2Icon } from "lucide-vue-next";import { NTooltip, type TooltipProps } from "naive-ui";import { storeToRefs } from "pinia";import { computed, reactive } from "vue";diff --git a/frontend/src/components/misc/Watermark.vue b/frontend/src/components/misc/Watermark.vueindex ef755a1733..802374c729 100644--- a/frontend/src/components/misc/Watermark.vue+++ b/frontend/src/components/misc/Watermark.vue@@ -36,10 +36,10 @@import { NWatermark } from "naive-ui";import { computed } from "vue";import {- featureToRef,- useCurrentUserV1,extractUserId,+ featureToRef,useActuatorV1Store,+ useCurrentUserV1,} from "@/store";import { useSettingV1Store } from "@/store/modules/v1/setting";import { UNKNOWN_USER_NAME } from "@/types";diff --git a/frontend/src/components/v2/Button/ContextMenuButton.vue b/frontend/src/components/v2/Button/ContextMenuButton.vueindex 484ba54252..b4f8805b1c 100644--- a/frontend/src/components/v2/Button/ContextMenuButton.vue+++ b/frontend/src/components/v2/Button/ContextMenuButton.vue@@ -35,7 +35,7 @@ import { useLocalStorage } from "@vueuse/core";import { head } from "lodash-es";import type { ButtonGroupProps, SelectOption } from "naive-ui";import { NButton, NButtonGroup, NPopselect } from "naive-ui";-import { ref, computed } from "vue";+import { computed, ref } from "vue";import type { ContextMenuButtonAction } from "./types";const STORE_PREFIX = "bb.context-menu-button";diff --git a/frontend/src/components/v2/Button/ErrorTipsButton.vue b/frontend/src/components/v2/Button/ErrorTipsButton.vueindex f5a806c5c4..6edaddf655 100644--- a/frontend/src/components/v2/Button/ErrorTipsButton.vue+++ b/frontend/src/components/v2/Button/ErrorTipsButton.vue@@ -30,8 +30,8 @@</template><script setup lang="ts">-import type { TooltipProps, ButtonProps } from "naive-ui";-import { NTooltip, NButton } from "naive-ui";+import type { ButtonProps, TooltipProps } from "naive-ui";+import { NButton, NTooltip } from "naive-ui";import ErrorList from "@/components/misc/ErrorList.vue";import type { VueClass } from "@/utils";diff --git a/frontend/src/components/v2/Button/ResourceHardDeleteButton.vue b/frontend/src/components/v2/Button/ResourceHardDeleteButton.vueindex a19536e4ef..4368d95dc6 100644--- a/frontend/src/components/v2/Button/ResourceHardDeleteButton.vue+++ b/frontend/src/components/v2/Button/ResourceHardDeleteButton.vue@@ -42,7 +42,7 @@generic="T extends { name: string; title: string; state: State }">import { NInput } from "naive-ui";-import { ref, computed } from "vue";+import { computed, ref } from "vue";import { useI18n } from "vue-i18n";import { BBButtonConfirm } from "@/bbkit";import { pushNotification } from "@/store";diff --git a/frontend/src/components/v2/Form/ResourceIdField.vue b/frontend/src/components/v2/Form/ResourceIdField.vueindex 84365ef3ab..7ca20c54dd 100644--- a/frontend/src/components/v2/Form/ResourceIdField.vue+++ b/frontend/src/components/v2/Form/ResourceIdField.vue@@ -65,7 +65,7 @@<script lang="ts" setup>import { Code } from "@connectrpc/connect";-import { NInput, type InputProps } from "naive-ui";+import { type InputProps, NInput } from "naive-ui";import { computed, reactive, watch } from "vue";import { useI18n } from "vue-i18n";import { CopyButton } from "@/components/v2";diff --git a/frontend/src/components/v2/Form/SpinnerSwitch.vue b/frontend/src/components/v2/Form/SpinnerSwitch.vueindex 73bc895473..26cc38db2c 100644--- a/frontend/src/components/v2/Form/SpinnerSwitch.vue+++ b/frontend/src/components/v2/Form/SpinnerSwitch.vue@@ -3,7 +3,7 @@</template><script lang="ts" setup>-import { type SwitchProps, NSwitch } from "naive-ui";+import { NSwitch, type SwitchProps } from "naive-ui";import { ref } from "vue";export interface SpinnerSwitchProps extends /* @vue-ignore */ SwitchProps {diff --git a/frontend/src/components/v2/Form/StepTab.vue b/frontend/src/components/v2/Form/StepTab.vueindex e8f789be65..d647004e43 100644--- a/frontend/src/components/v2/Form/StepTab.vue+++ b/frontend/src/components/v2/Form/StepTab.vue@@ -78,7 +78,7 @@<script lang="ts" setup>import type { ButtonProps } from "naive-ui";-import { NSteps, NStep, NButton } from "naive-ui";+import { NButton, NStep, NSteps } from "naive-ui";import { t } from "@/plugins/i18n";import type { VueClass } from "@/utils/types";diff --git a/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseOperations.vue b/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseOperations.vueindex d170a9605c..db742ea246 100644--- a/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseOperations.vue+++ b/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseOperations.vue@@ -118,8 +118,8 @@ import { NButton, NScrollbar, NTooltip, useDialog } from "naive-ui";import type { VNode } from "vue";import { computed, h, reactive } from "vue";import { useI18n } from "vue-i18n";-import { useRouter } from "vue-router";import type { LocationQueryRaw } from "vue-router";+import { useRouter } from "vue-router";import { BBAlert } from "@/bbkit";import EditEnvironmentDrawer from "@/components/EditEnvironmentDrawer.vue";import LabelEditorDrawer from "@/components/LabelEditorDrawer.vue";@@ -141,9 +141,9 @@ import {import type { ComposedDatabase } from "@/types";import { DEFAULT_PROJECT_NAME } from "@/types";import {+ BatchUpdateDatabasesRequestSchema,DatabaseSchema$,UpdateDatabaseRequestSchema,- BatchUpdateDatabasesRequestSchema,} from "@/types/proto-es/v1/database_service_pb";import {extractProjectResourceName,diff --git a/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseV1Table.vue b/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseV1Table.vueindex b5ad050a4f..39deda3d29 100644--- a/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseV1Table.vue+++ b/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseV1Table.vue@@ -18,14 +18,14 @@</template><script setup lang="tsx">-import { NDataTable, type DataTableColumn } from "naive-ui";+import { type DataTableColumn, NDataTable } from "naive-ui";import { computed } from "vue";import { useI18n } from "vue-i18n";import { EnvironmentV1Name, InstanceV1Name } from "@/components/v2";import {DatabaseNameCell,- ProjectNameCell,LabelsCell,+ ProjectNameCell,} from "@/components/v2/Model/cells";import type { ComposedDatabase } from "@/types";import { hostPortOfInstanceV1 } from "@/utils";diff --git a/frontend/src/components/v2/Model/DatabaseV1Table/PagedDatabaseTable.vue b/frontend/src/components/v2/Model/DatabaseV1Table/PagedDatabaseTable.vueindex 572585a804..e2ed99234d 100644--- a/frontend/src/components/v2/Model/DatabaseV1Table/PagedDatabaseTable.vue+++ b/frontend/src/components/v2/Model/DatabaseV1Table/PagedDatabaseTable.vue@@ -24,7 +24,7 @@ import { ref, watch } from "vue";import type { ComponentExposed } from "vue-component-type-helpers";import { useRouter } from "vue-router";import PagedTable from "@/components/v2/Model/PagedTable.vue";-import { useDatabaseV1Store, type DatabaseFilter } from "@/store";+import { type DatabaseFilter, useDatabaseV1Store } from "@/store";import type { ComposedDatabase } from "@/types";import { autoDatabaseRoute } from "@/utils";import DatabaseV1Table from "./DatabaseV1Table.vue";diff --git a/frontend/src/components/v2/Model/EnvironmentV1Name.vue b/frontend/src/components/v2/Model/EnvironmentV1Name.vueindex b51e62659d..8428315a0c 100644--- a/frontend/src/components/v2/Model/EnvironmentV1Name.vue+++ b/frontend/src/components/v2/Model/EnvironmentV1Name.vue@@ -37,7 +37,7 @@<script lang="ts" setup>import { computed } from "vue";import { useRouter } from "vue-router";-import { UNKNOWN_ENVIRONMENT_NAME, NULL_ENVIRONMENT_NAME } from "@/types";+import { NULL_ENVIRONMENT_NAME, UNKNOWN_ENVIRONMENT_NAME } from "@/types";import type { Environment } from "@/types/v1/environment";import type { VueClass } from "@/utils";import { autoEnvironmentRoute, hexToRgb } from "@/utils";diff --git a/frontend/src/components/v2/Model/EnvironmentV1Table.vue b/frontend/src/components/v2/Model/EnvironmentV1Table.vueindex 7a00286450..2fe3f14655 100644--- a/frontend/src/components/v2/Model/EnvironmentV1Table.vue+++ b/frontend/src/components/v2/Model/EnvironmentV1Table.vue@@ -14,13 +14,13 @@</template><script lang="tsx" setup>-import { NDataTable, type DataTableColumn } from "naive-ui";+import { type DataTableColumn, NDataTable } from "naive-ui";import { computed } from "vue";import { useI18n } from "vue-i18n";import { useRouter } from "vue-router";import {- formatEnvironmentName,type Environment,+ formatEnvironmentName,} from "@/types/v1/environment";import { EnvironmentV1Name } from ".";diff --git a/frontend/src/components/v2/Model/Instance/InstanceRoleTable/InstanceRoleTable.vue b/frontend/src/components/v2/Model/Instance/InstanceRoleTable/InstanceRoleTable.vueindex c092a48cb3..925aa54d0f 100644--- a/frontend/src/components/v2/Model/Instance/InstanceRoleTable/InstanceRoleTable.vue+++ b/frontend/src/components/v2/Model/Instance/InstanceRoleTable/InstanceRoleTable.vue@@ -10,8 +10,8 @@</template><script lang="tsx" setup>-import { NDataTable } from "naive-ui";import type { DataTableColumn } from "naive-ui";+import { NDataTable } from "naive-ui";import { computed } from "vue";import { useI18n } from "vue-i18n";import type { InstanceRole } from "@/types/proto-es/v1/instance_role_service_pb";diff --git a/frontend/src/components/v2/Model/Instance/InstanceV1EngineIcon.vue b/frontend/src/components/v2/Model/Instance/InstanceV1EngineIcon.vueindex 1fdcba247c..e402fc8bb4 100644--- a/frontend/src/components/v2/Model/Instance/InstanceV1EngineIcon.vue+++ b/frontend/src/components/v2/Model/Instance/InstanceV1EngineIcon.vue@@ -16,8 +16,8 @@<script lang="ts" setup>import { NTooltip } from "naive-ui";-import { computed } from "vue";import type { PropType } from "vue";+import { computed } from "vue";import { EngineIcon } from "@/components/Icon";import type {Instance,diff --git a/frontend/src/components/v2/Model/Instance/InstanceV1Table/InstanceOperations.vue b/frontend/src/components/v2/Model/Instance/InstanceV1Table/InstanceOperations.vueindex 41dffaae34..cd6538a9cd 100644--- a/frontend/src/components/v2/Model/Instance/InstanceV1Table/InstanceOperations.vue+++ b/frontend/src/components/v2/Model/Instance/InstanceV1Table/InstanceOperations.vue@@ -54,9 +54,9 @@ import EditEnvironmentDrawer from "@/components/EditEnvironmentDrawer.vue";import InstanceSyncButton from "@/components/Instance/InstanceSyncButton.vue";import InstanceAssignment from "@/components/InstanceAssignment.vue";import {+ pushNotification,useInstanceV1Store,useSubscriptionV1Store,- pushNotification,} from "@/store";import type { Instance } from "@/types/proto-es/v1/instance_service_pb";import { UpdateInstanceRequestSchema } from "@/types/proto-es/v1/instance_service_pb";diff --git a/frontend/src/components/v2/Model/Instance/InstanceV1Table/InstanceV1Table.vue b/frontend/src/components/v2/Model/Instance/InstanceV1Table/InstanceV1Table.vueindex 3b191bd93a..517dcf34bb 100644--- a/frontend/src/components/v2/Model/Instance/InstanceV1Table/InstanceV1Table.vue+++ b/frontend/src/components/v2/Model/Instance/InstanceV1Table/InstanceV1Table.vue@@ -19,11 +19,11 @@<script setup lang="tsx">import {- ExternalLinkIcon,ChevronDownIcon,ChevronUpIcon,+ ExternalLinkIcon,} from "lucide-vue-next";-import { NButton, NDataTable, type DataTableColumn } from "naive-ui";+import { type DataTableColumn, NButton, NDataTable } from "naive-ui";import { computed, reactive, watch } from "vue";import { useI18n } from "vue-i18n";import { useRouter } from "vue-router";@@ -33,7 +33,7 @@ import { LabelsCell } from "@/components/v2/Model/cells";import { useEnvironmentV1Store } from "@/store";import { NULL_ENVIRONMENT_NAME } from "@/types";import type { Instance } from "@/types/proto-es/v1/instance_service_pb";-import { urlfy, hostPortOfInstanceV1, hostPortOfDataSource } from "@/utils";+import { hostPortOfDataSource, hostPortOfInstanceV1, urlfy } from "@/utils";import EnvironmentV1Name from "../../EnvironmentV1Name.vue";type InstanceDataTableColumn = DataTableColumn<Instance> & {diff --git a/frontend/src/components/v2/Model/Instance/PagedInstanceTable.vue b/frontend/src/components/v2/Model/Instance/PagedInstanceTable.vueindex f037bb033e..37eabd8fa4 100644--- a/frontend/src/components/v2/Model/Instance/PagedInstanceTable.vue+++ b/frontend/src/components/v2/Model/Instance/PagedInstanceTable.vue@@ -15,10 +15,10 @@</template><script lang="tsx" setup>-import { ref, watch, computed } from "vue";+import { computed, ref, watch } from "vue";import type { ComponentExposed } from "vue-component-type-helpers";import PagedTable from "@/components/v2/Model/PagedTable.vue";-import { useInstanceV1Store, type InstanceFilter } from "@/store";+import { type InstanceFilter, useInstanceV1Store } from "@/store";import { type Instance } from "@/types/proto-es/v1/instance_service_pb";import InstanceV1Table from "./InstanceV1Table";diff --git a/frontend/src/components/v2/Model/PagedProjectTable.vue b/frontend/src/components/v2/Model/PagedProjectTable.vueindex 301960e745..fdf523a64f 100644--- a/frontend/src/components/v2/Model/PagedProjectTable.vue+++ b/frontend/src/components/v2/Model/PagedProjectTable.vue@@ -23,7 +23,7 @@import { ref, watch } from "vue";import type { ComponentExposed } from "vue-component-type-helpers";import PagedTable from "@/components/v2/Model/PagedTable.vue";-import { useProjectV1Store, type ProjectFilter } from "@/store";+import { type ProjectFilter, useProjectV1Store } from "@/store";import type { Project } from "@/types/proto-es/v1/project_service_pb";import ProjectV1Table from "./ProjectV1Table.vue";diff --git a/frontend/src/components/v2/Model/PagedTable.vue b/frontend/src/components/v2/Model/PagedTable.vueindex 0b2019c6d7..a1795d5e4d 100644--- a/frontend/src/components/v2/Model/PagedTable.vue+++ b/frontend/src/components/v2/Model/PagedTable.vue@@ -34,10 +34,10 @@<script lang="ts" setup generic="T extends { name: string }">import { useDebounceFn } from "@vueuse/core";import { sortBy, uniq } from "lodash-es";-import { NSelect, NButton } from "naive-ui";-import { computed, reactive, watch, ref, type Ref } from "vue";+import { NButton, NSelect } from "naive-ui";+import { computed, type Ref, reactive, ref, watch } from "vue";import { useAuthStore, useCurrentUserV1 } from "@/store";-import { useDynamicLocalStorage, getDefaultPagination } from "@/utils";+import { getDefaultPagination, useDynamicLocalStorage } from "@/utils";type LocalState = {loading: boolean;diff --git a/frontend/src/components/v2/Model/Project/ProjectOperations.vue b/frontend/src/components/v2/Model/Project/ProjectOperations.vueindex 377cb560aa..59e6e4bb90 100644--- a/frontend/src/components/v2/Model/Project/ProjectOperations.vue+++ b/frontend/src/components/v2/Model/Project/ProjectOperations.vue@@ -89,14 +89,14 @@<script setup lang="tsx">import { ArchiveIcon, CheckIcon } from "lucide-vue-next";-import { NButton, NCheckbox, NAlert } from "naive-ui";+import { NAlert, NButton, NCheckbox } from "naive-ui";import type { VNode } from "vue";import { computed, h, reactive } from "vue";import { useI18n } from "vue-i18n";import { BBAlert } from "@/bbkit";import { pushNotification, useProjectV1Store } from "@/store";import type { Project } from "@/types/proto-es/v1/project_service_pb";-import { hasWorkspacePermissionV2, extractProjectResourceName } from "@/utils";+import { extractProjectResourceName, hasWorkspacePermissionV2 } from "@/utils";interface Action {icon?: VNode;diff --git a/frontend/src/components/v2/Model/ProjectV1Table.vue b/frontend/src/components/v2/Model/ProjectV1Table.vueindex a3926a0782..80e39369e2 100644--- a/frontend/src/components/v2/Model/ProjectV1Table.vue+++ b/frontend/src/components/v2/Model/ProjectV1Table.vue@@ -18,11 +18,11 @@<script lang="tsx" setup>import { CheckIcon } from "lucide-vue-next";-import { NDataTable, type DataTableColumn } from "naive-ui";+import { type DataTableColumn, NDataTable } from "naive-ui";import { computed } from "vue";import { useI18n } from "vue-i18n";import { useRouter } from "vue-router";-import { ProjectNameCell, LabelsCell } from "@/components/v2/Model/cells";+import { LabelsCell, ProjectNameCell } from "@/components/v2/Model/cells";import { PROJECT_V1_ROUTE_DETAIL } from "@/router/dashboard/projectV1";import { PROJECT_V1_ROUTE_DASHBOARD } from "@/router/dashboard/workspaceRoutes";import { getProjectName } from "@/store/modules/v1/common";diff --git a/frontend/src/components/v2/ResourceOccupiedModal/useResourceByName.ts b/frontend/src/components/v2/ResourceOccupiedModal/useResourceByName.tsindex 0ed6dc6a6a..fe0501d7f4 100644--- a/frontend/src/components/v2/ResourceOccupiedModal/useResourceByName.ts+++ b/frontend/src/components/v2/ResourceOccupiedModal/useResourceByName.ts@@ -1,24 +1,24 @@-import { type Ref, watchEffect, computed, h } from "vue";+import { computed, h, type Ref, watchEffect } from "vue";import { EnvironmentV1Name, RichDatabaseName } from "@/components/v2";import { ProjectNameCell } from "@/components/v2/Model/cells";import { t } from "@/plugins/i18n";import {- useEnvironmentV1Store,useDatabaseV1Store,+ useEnvironmentV1Store,useProjectV1Store,useUserStore,} from "@/store";import {environmentNamePrefix,+ isDatabaseName,projectNamePrefix,userNamePrefix,- isDatabaseName,} from "@/store/modules/v1/common";import {- isValidEnvironmentName,+ formatEnvironmentName,isValidDatabaseName,+ isValidEnvironmentName,isValidProjectName,- formatEnvironmentName,} from "@/types";import { hasWorkspacePermissionV2 } from "@/utils";diff --git a/frontend/src/components/v2/Select/DatabaseSelect.vue b/frontend/src/components/v2/Select/DatabaseSelect.vueindex f28c83cdef..8896d11ec9 100644--- a/frontend/src/components/v2/Select/DatabaseSelect.vue+++ b/frontend/src/components/v2/Select/DatabaseSelect.vue@@ -18,7 +18,7 @@<script lang="ts" setup>import { useDebounceFn } from "@vueuse/core";-import { computed, h, watch, reactive, watchEffect } from "vue";+import { computed, h, reactive, watch, watchEffect } from "vue";import { useI18n } from "vue-i18n";import { useDatabaseV1Store } from "@/store";import { workspaceNamePrefix } from "@/store/modules/v1/common";@@ -30,9 +30,9 @@ import {} from "@/types";import { type Engine } from "@/types/proto-es/v1/common_pb";import {+ getDefaultPagination,instanceV1Name,supportedEngineV1List,- getDefaultPagination,} from "@/utils";import { InstanceV1EngineIcon } from "../Model";import ResourceSelect from "./ResourceSelect.vue";diff --git a/frontend/src/components/v2/Select/InstanceSelect.vue b/frontend/src/components/v2/Select/InstanceSelect.vueindex 3017526785..7423eed9e6 100644--- a/frontend/src/components/v2/Select/InstanceSelect.vue+++ b/frontend/src/components/v2/Select/InstanceSelect.vue@@ -18,18 +18,18 @@<script lang="ts" setup>import { useDebounceFn } from "@vueuse/core";-import { computed, h, watch, reactive } from "vue";+import { computed, h, reactive, watch } from "vue";import { useI18n } from "vue-i18n";import { useInstanceV1Store } from "@/store";import {DEBOUNCE_SEARCH_DELAY,- UNKNOWN_INSTANCE_NAME,isValidInstanceName,+ UNKNOWN_INSTANCE_NAME,unknownInstance,} from "@/types";import { type Engine } from "@/types/proto-es/v1/common_pb";import type { Instance } from "@/types/proto-es/v1/instance_service_pb";-import { supportedEngineV1List, getDefaultPagination } from "@/utils";+import { getDefaultPagination, supportedEngineV1List } from "@/utils";import { InstanceV1EngineIcon } from "../Model/Instance";import ResourceSelect from "./ResourceSelect.vue";diff --git a/frontend/src/components/v2/Select/ProjectSelect.vue b/frontend/src/components/v2/Select/ProjectSelect.vueindex bb4fd5aaba..8cf96323f9 100644--- a/frontend/src/components/v2/Select/ProjectSelect.vue+++ b/frontend/src/components/v2/Select/ProjectSelect.vue@@ -24,20 +24,20 @@<script lang="tsx" setup>import { useDebounceFn } from "@vueuse/core";import { intersection } from "lodash-es";-import { computed, watchEffect, reactive, onMounted } from "vue";+import { computed, onMounted, reactive, watchEffect } from "vue";import { useI18n } from "vue-i18n";import { ProjectNameCell } from "@/components/v2/Model/cells";-import { useProjectV1Store, usePermissionStore } from "@/store";+import { usePermissionStore, useProjectV1Store } from "@/store";import {- unknownProject,- defaultProject,+ DEBOUNCE_SEARCH_DELAY,DEFAULT_PROJECT_NAME,- UNKNOWN_PROJECT_NAME,+ defaultProject,isValidProjectName,- DEBOUNCE_SEARCH_DELAY,+ UNKNOWN_PROJECT_NAME,+ unknownProject,} from "@/types";import type { Project } from "@/types/proto-es/v1/project_service_pb";-import { hasWorkspacePermissionV2, getDefaultPagination } from "@/utils";+import { getDefaultPagination, hasWorkspacePermissionV2 } from "@/utils";import ResourceSelect from "./ResourceSelect.vue";const props = withDefaults(diff --git a/frontend/src/components/v2/Select/ResourceSelect.vue b/frontend/src/components/v2/Select/ResourceSelect.vueindex 7612c32799..f48e4730b7 100644--- a/frontend/src/components/v2/Select/ResourceSelect.vue+++ b/frontend/src/components/v2/Select/ResourceSelect.vue@@ -28,7 +28,7 @@<script lang="tsx" setup generic="T extends { name: string }">import type { SelectOption, SelectProps } from "naive-ui";-import { NTag, NSelect, NCheckbox } from "naive-ui";+import { NCheckbox, NSelect, NTag } from "naive-ui";import type { SelectBaseOption } from "naive-ui/lib/select/src/interface";import { computed, type VNodeChild } from "vue";import EllipsisText from "@/components/EllipsisText.vue";diff --git a/frontend/src/components/v2/Select/RoleSelect.vue b/frontend/src/components/v2/Select/RoleSelect.vueindex bd105e76fa..cf8474ad9a 100644--- a/frontend/src/components/v2/Select/RoleSelect.vue+++ b/frontend/src/components/v2/Select/RoleSelect.vue@@ -22,11 +22,11 @@<script setup lang="tsx">import type { SelectGroupOption, SelectOption } from "naive-ui";import { NSelect } from "naive-ui";-import { computed, ref, h } from "vue";+import { computed, h, ref } from "vue";import FeatureBadge from "@/components/FeatureGuard/FeatureBadge.vue";import FeatureModal from "@/components/FeatureGuard/FeatureModal.vue";import { t } from "@/plugins/i18n";-import { useRoleStore, featureToRef } from "@/store";+import { featureToRef, useRoleStore } from "@/store";import {PRESET_PROJECT_ROLES,PRESET_ROLES,diff --git a/frontend/src/components/v2/Select/UserSelect.vue b/frontend/src/components/v2/Select/UserSelect.vueindex 950b27f748..3c232ff2e5 100644--- a/frontend/src/components/v2/Select/UserSelect.vue+++ b/frontend/src/components/v2/Select/UserSelect.vue@@ -21,21 +21,21 @@<script lang="tsx" setup>import { useDebounceFn } from "@vueuse/core";-import { computed, watch, reactive, onMounted } from "vue";+import { computed, onMounted, reactive, watch } from "vue";import { useI18n } from "vue-i18n";-import UserIcon from "~icons/heroicons-outline/user";-import UserAvatar from "@/components/User/UserAvatar.vue";import ServiceAccountTag from "@/components/misc/ServiceAccountTag.vue";-import { extractUserId, useUserStore, type UserFilter } from "@/store";+import UserAvatar from "@/components/User/UserAvatar.vue";+import { extractUserId, type UserFilter, useUserStore } from "@/store";import {+ allUsersUser,DEBOUNCE_SEARCH_DELAY,+ isValidUserName,SYSTEM_BOT_USER_NAME,UNKNOWN_USER_NAME,- allUsersUser,- isValidUserName,} from "@/types";-import { UserType, type User } from "@/types/proto-es/v1/user_service_pb";-import { getDefaultPagination, ensureUserFullName } from "@/utils";+import { type User, UserType } from "@/types/proto-es/v1/user_service_pb";+import { ensureUserFullName, getDefaultPagination } from "@/utils";+import UserIcon from "~icons/heroicons-outline/user";import ResourceSelect from "./ResourceSelect.vue";const props = withDefaults(diff --git a/frontend/src/composables/useEmitteryEventListener.ts b/frontend/src/composables/useEmitteryEventListener.tsindex 91484cf3eb..8a6c4e09f4 100644--- a/frontend/src/composables/useEmitteryEventListener.ts+++ b/frontend/src/composables/useEmitteryEventListener.ts@@ -1,9 +1,9 @@+import type Emittery from "emittery";import type {DatalessEventNames,EventName,OmnipresentEventData,} from "emittery";-import type Emittery from "emittery";import { onUnmounted } from "vue";export const useEmitteryEventListener = <diff --git a/frontend/src/composables/useExecuteSQL.ts b/frontend/src/composables/useExecuteSQL.tsindex 71dcd6b7c4..2ba016c1b1 100644--- a/frontend/src/composables/useExecuteSQL.ts+++ b/frontend/src/composables/useExecuteSQL.ts@@ -1,36 +1,36 @@import { create } from "@bufbuild/protobuf";import { Code } from "@connectrpc/connect";-import { isEmpty, cloneDeep } from "lodash-es";+import { cloneDeep, isEmpty } from "lodash-es";import { v4 as uuidv4 } from "uuid";import { markRaw, reactive } from "vue";import { t } from "@/plugins/i18n";import {+ batchGetOrFetchDatabases,+ hasFeature,pushNotification,+ useDatabaseV1Store,useDBGroupStore,+ useSQLEditorQueryHistoryStore,useSQLEditorStore,useSQLEditorTabStore,useSQLStore,- useSQLEditorQueryHistoryStore,- hasFeature,- batchGetOrFetchDatabases,- useDatabaseV1Store,} from "@/store";import type {- ComposedDatabase,- SQLResultSetV1,BBNotificationStyle,- SQLEditorQueryParams,- SQLEditorConnection,+ ComposedDatabase,QueryContextStatus,- SQLEditorDatabaseQueryContext,QueryDataSourceType,+ SQLEditorConnection,+ SQLEditorDatabaseQueryContext,+ SQLEditorQueryParams,+ SQLResultSetV1,} from "@/types";import { isValidDatabaseName } from "@/types";import { Engine } from "@/types/proto-es/v1/common_pb";import { DatabaseGroupView } from "@/types/proto-es/v1/database_group_service_pb";import {- QueryRequestSchema,QueryOptionSchema,+ QueryRequestSchema,QueryResult_PermissionDenied_CommandType,} from "@/types/proto-es/v1/sql_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";diff --git a/frontend/src/grpcweb/middlewares/authInterceptorMiddleware.ts b/frontend/src/grpcweb/middlewares/authInterceptorMiddleware.tsindex 47c49ef5c0..0afac43ed2 100644--- a/frontend/src/grpcweb/middlewares/authInterceptorMiddleware.ts+++ b/frontend/src/grpcweb/middlewares/authInterceptorMiddleware.ts@@ -1,8 +1,8 @@import { Code, ConnectError, type Interceptor } from "@connectrpc/connect";import { t } from "@/plugins/i18n";import { router } from "@/router";-import { useAuthStore, pushNotification } from "@/store";-import { silentContextKey, ignoredCodesContextKey } from "../context-key";+import { pushNotification, useAuthStore } from "@/store";+import { ignoredCodesContextKey, silentContextKey } from "../context-key";export type IgnoreErrorsOptions = {/**diff --git a/frontend/src/layouts/BodyLayout.vue b/frontend/src/layouts/BodyLayout.vueindex 486a3aef46..0b3fe87940 100644--- a/frontend/src/layouts/BodyLayout.vue+++ b/frontend/src/layouts/BodyLayout.vue@@ -135,10 +135,10 @@ import ReleaseRemindModal from "@/components/ReleaseRemindModal.vue";import { t } from "@/plugins/i18n";import { WORKSPACE_ROOT_MODULE } from "@/router/dashboard/workspaceRoutes";import {+ pushNotification,useActuatorV1Store,- useSubscriptionV1Store,usePermissionStore,- pushNotification,+ useSubscriptionV1Store,} from "@/store";import { PresetRoleType } from "@/types";import { PlanType } from "@/types/proto-es/v1/subscription_service_pb";diff --git a/frontend/src/layouts/ProjectV1Layout.vue b/frontend/src/layouts/ProjectV1Layout.vueindex 443f51af65..9c6274e912 100644--- a/frontend/src/layouts/ProjectV1Layout.vue+++ b/frontend/src/layouts/ProjectV1Layout.vue@@ -37,8 +37,8 @@ import { useRouter } from "vue-router";import { BBAttention } from "@/bbkit";import ArchiveBanner from "@/components/ArchiveBanner.vue";import IAMRemindModal from "@/components/IAMRemindModal.vue";-import { useRecentProjects } from "@/components/Project/useRecentProjects";import NoPermissionPlaceholder from "@/components/misc/NoPermissionPlaceholder.vue";+import { useRecentProjects } from "@/components/Project/useRecentProjects";import { PROJECT_V1_ROUTE_DETAIL } from "@/router/dashboard/projectV1";import { WORKSPACE_ROUTE_LANDING } from "@/router/dashboard/workspaceRoutes";import { useRecentVisit } from "@/router/useRecentVisit";diff --git a/frontend/src/layouts/SQLEditorLayout.vue b/frontend/src/layouts/SQLEditorLayout.vueindex 899d5e56a0..bf87c9c601 100644--- a/frontend/src/layouts/SQLEditorLayout.vue+++ b/frontend/src/layouts/SQLEditorLayout.vue@@ -13,8 +13,7 @@</template><script lang="ts" setup>-import { ref } from "vue";-import { onMounted } from "vue";+import { onMounted, ref } from "vue";import { useRouter } from "vue-router";import BannersWrapper from "@/components/BannersWrapper.vue";import ProvideSQLEditorContext from "@/components/ProvideSQLEditorContext.vue";@@ -24,8 +23,8 @@ import {useSettingV1Store,} from "@/store";import { PolicyResourceType } from "@/types/proto-es/v1/org_policy_service_pb";-import { provideSheetContext } from "@/views/sql-editor/Sheet";import { provideSQLEditorContext } from "@/views/sql-editor/context";+import { provideSheetContext } from "@/views/sql-editor/Sheet";const router = useRouter();diff --git a/frontend/src/layouts/common.ts b/frontend/src/layouts/common.tsindex 1e36aa14b8..df2273ce08 100644--- a/frontend/src/layouts/common.ts+++ b/frontend/src/layouts/common.ts@@ -1,4 +1,4 @@-import { type InjectionKey, type Ref, inject, provide } from "vue";+import { type InjectionKey, inject, provide, type Ref } from "vue";import { useClassStack } from "@/utils";export type BodyLayoutContext = ReturnType<typeof provideBodyLayoutContext>;diff --git a/frontend/src/locales/dynamic/en-US.json b/frontend/src/locales/dynamic/en-US.jsonindex d7d1cc8fcc..ffe8793d9d 100644--- a/frontend/src/locales/dynamic/en-US.json+++ b/frontend/src/locales/dynamic/en-US.json@@ -358,4 +358,4 @@"review-config": "Review Config","role": "Role"}-}\ No newline at end of file+}diff --git a/frontend/src/locales/dynamic/es-ES.json b/frontend/src/locales/dynamic/es-ES.jsonindex e5b56bd115..4999bdedf8 100644--- a/frontend/src/locales/dynamic/es-ES.json+++ b/frontend/src/locales/dynamic/es-ES.json@@ -358,4 +358,4 @@"review-config": "Revisar configuración","role": "Rol"}-}\ No newline at end of file+}diff --git a/frontend/src/locales/dynamic/ja-JP.json b/frontend/src/locales/dynamic/ja-JP.jsonindex 21ccc9e9e1..0aa129f874 100644--- a/frontend/src/locales/dynamic/ja-JP.json+++ b/frontend/src/locales/dynamic/ja-JP.json@@ -358,4 +358,4 @@"review-config": "設定を確認する","role": "役割"}-}\ No newline at end of file+}diff --git a/frontend/src/locales/dynamic/vi-VN.json b/frontend/src/locales/dynamic/vi-VN.jsonindex 45b9484539..42b3dbd0d0 100644--- a/frontend/src/locales/dynamic/vi-VN.json+++ b/frontend/src/locales/dynamic/vi-VN.json@@ -358,4 +358,4 @@"review-config": "Cấu hình đánh giá","role": "Vai trò"}-}\ No newline at end of file+}diff --git a/frontend/src/locales/dynamic/zh-CN.json b/frontend/src/locales/dynamic/zh-CN.jsonindex 1bb3e97356..5f0645d623 100644--- a/frontend/src/locales/dynamic/zh-CN.json+++ b/frontend/src/locales/dynamic/zh-CN.json@@ -358,4 +358,4 @@"review-config": "审查配置","role": "角色"}-}\ No newline at end of file+}diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.jsonindex 96e02d0248..b98aa4e84a 100644--- a/frontend/src/locales/es-ES.json+++ b/frontend/src/locales/es-ES.json@@ -246,7 +246,7 @@"collapse": "Colapsar","line": "Línea","column": "Columna",- "apply-to-database": "Aplicar a la base de datos",+ "apply-to-database": "Aplicar a la base de datos"},"error-page": {"go-back-home": "Volver al inicio"diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.jsonindex 81a70093a6..edfb1e8de0 100644--- a/frontend/src/locales/ja-JP.json+++ b/frontend/src/locales/ja-JP.json@@ -246,7 +246,7 @@"collapse": "閉じる","line": "行","column": "列",- "apply-to-database": "データベースに適用",+ "apply-to-database": "データベースに適用"},"error-page": {"go-back-home": "ホームページに戻る"diff --git a/frontend/src/locales/sql-review/es-ES.json b/frontend/src/locales/sql-review/es-ES.jsonindex d1f8636bce..aa5c4e8b2f 100644--- a/frontend/src/locales/sql-review/es-ES.json+++ b/frontend/src/locales/sql-review/es-ES.json@@ -729,4 +729,4 @@"warning": "Advertencia","disabled": "Deshabilitado"}-}\ No newline at end of file+}diff --git a/frontend/src/locales/sql-review/ja-JP.json b/frontend/src/locales/sql-review/ja-JP.jsonindex cf9e653471..e9cab59d42 100644--- a/frontend/src/locales/sql-review/ja-JP.json+++ b/frontend/src/locales/sql-review/ja-JP.json@@ -729,4 +729,4 @@"warning": "警告","disabled": "無効化"}-}\ No newline at end of file+}diff --git a/frontend/src/locales/sql-review/vi-VN.json b/frontend/src/locales/sql-review/vi-VN.jsonindex 7c5e7f93cd..bbb389bc80 100644--- a/frontend/src/locales/sql-review/vi-VN.json+++ b/frontend/src/locales/sql-review/vi-VN.json@@ -729,4 +729,4 @@"warning": "Cảnh báo","disabled": "Đã tắt"}-}\ No newline at end of file+}diff --git a/frontend/src/locales/sql-review/zh-CN.json b/frontend/src/locales/sql-review/zh-CN.jsonindex 0f54205287..d29cfab788 100644--- a/frontend/src/locales/sql-review/zh-CN.json+++ b/frontend/src/locales/sql-review/zh-CN.json@@ -729,4 +729,4 @@"warning": "警告","disabled": "禁用"}-}\ No newline at end of file+}diff --git a/frontend/src/locales/subscription/es-ES.json b/frontend/src/locales/subscription/es-ES.jsonindex b5755b1b0e..be64d71833 100644--- a/frontend/src/locales/subscription/es-ES.json+++ b/frontend/src/locales/subscription/es-ES.json@@ -50,4 +50,4 @@"desc": "Funciones adicionales de seguridad, cumplimiento y permisos. Soporte dedicado con SLA."}}-}\ No newline at end of file+}diff --git a/frontend/src/locales/subscription/ja-JP.json b/frontend/src/locales/subscription/ja-JP.jsonindex b1ed8fc667..62d3438003 100644--- a/frontend/src/locales/subscription/ja-JP.json+++ b/frontend/src/locales/subscription/ja-JP.json@@ -50,4 +50,4 @@"desc": "追加のセキュリティ、コンプライアンス、および権限機能。SLA付きの専任サポート。"}}-}\ No newline at end of file+}diff --git a/frontend/src/locales/subscription/vi-VN.json b/frontend/src/locales/subscription/vi-VN.jsonindex 4c29d445fb..c93bc6ad92 100644--- a/frontend/src/locales/subscription/vi-VN.json+++ b/frontend/src/locales/subscription/vi-VN.json@@ -50,4 +50,4 @@"desc": "Các tính năng bảo mật, tuân thủ và quyền bổ sung. Hỗ trợ chuyên dụng với SLA."}}-}\ No newline at end of file+}diff --git a/frontend/src/locales/subscription/zh-CN.json b/frontend/src/locales/subscription/zh-CN.jsonindex 19ed30a59d..dbbbd429b1 100644--- a/frontend/src/locales/subscription/zh-CN.json+++ b/frontend/src/locales/subscription/zh-CN.json@@ -50,4 +50,4 @@"desc": "额外的安全,合规,权限功能,SLA 支持。"}}-}\ No newline at end of file+}diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.jsonindex 2252b51c37..c5530febb3 100644--- a/frontend/src/locales/vi-VN.json+++ b/frontend/src/locales/vi-VN.json@@ -246,7 +246,7 @@"collapse": "Sụp đổ","line": "Dòng","column": "Cột",- "apply-to-database": "Áp dụng cho cơ sở dữ liệu",+ "apply-to-database": "Áp dụng cho cơ sở dữ liệu"},"error-page": {"go-back-home": "Về trang chủ"diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.jsonindex 15562224f6..bfb5ae50ec 100644--- a/frontend/src/locales/zh-CN.json+++ b/frontend/src/locales/zh-CN.json@@ -246,7 +246,7 @@"collapse": "收起","line": "行","column": "列",- "apply-to-database": "应用到数据库",+ "apply-to-database": "应用到数据库"},"error-page": {"go-back-home": "回到主页"diff --git a/frontend/src/main.ts b/frontend/src/main.tsindex 4f4d52b8fa..8309ad9554 100644--- a/frontend/src/main.ts+++ b/frontend/src/main.ts@@ -4,7 +4,6 @@ import "regenerator-runtime/runtime";import { createApp } from "vue";import App from "./App.vue";import "./assets/css/github-markdown-style.css";-import "./assets/css/inter.css";import "./assets/css/tailwind.css";import dayjs from "./plugins/dayjs";import highlight from "./plugins/highlight";diff --git a/frontend/src/plugins/ai/components/ChatView/ChatView.vue b/frontend/src/plugins/ai/components/ChatView/ChatView.vueindex cb792fb616..70b05a5a1b 100644--- a/frontend/src/plugins/ai/components/ChatView/ChatView.vue+++ b/frontend/src/plugins/ai/components/ChatView/ChatView.vue@@ -50,10 +50,10 @@ import { ref, toRef, watch } from "vue";import { useAIContext } from "../../logic";import type { Conversation } from "../../types";import AIMessageView from "./AIMessageView.vue";-import EmptyView from "./EmptyView.vue";-import UserMessageView from "./UserMessageView.vue";import { provideChatViewContext } from "./context";+import EmptyView from "./EmptyView.vue";import type { Mode } from "./types";+import UserMessageView from "./UserMessageView.vue";const props = withDefaults(defineProps<{diff --git a/frontend/src/plugins/ai/components/ChatView/Markdown/AstToVNode.vue b/frontend/src/plugins/ai/components/ChatView/Markdown/AstToVNode.vueindex e91068e8e4..02f228fa11 100644--- a/frontend/src/plugins/ai/components/ChatView/Markdown/AstToVNode.vue+++ b/frontend/src/plugins/ai/components/ChatView/Markdown/AstToVNode.vue@@ -4,7 +4,7 @@<script setup lang="ts">import type { Root } from "mdast";-import { mdastToVNode, type CustomRender, type State } from "./utils";+import { type CustomRender, mdastToVNode, type State } from "./utils";const props = defineProps<{ast: Root;diff --git a/frontend/src/plugins/ai/components/ChatView/Markdown/utils.ts b/frontend/src/plugins/ai/components/ChatView/Markdown/utils.tsindex 73f51eede8..cf7f610396 100644--- a/frontend/src/plugins/ai/components/ChatView/Markdown/utils.ts+++ b/frontend/src/plugins/ai/components/ChatView/Markdown/utils.ts@@ -1,10 +1,10 @@import type {+ AlignType,+ Definition,Root,RootContent,RootContentMap,Text,- Definition,- AlignType,} from "mdast";import { normalizeUri } from "micromark-util-sanitize-uri";import { h, type VNode } from "vue";diff --git a/frontend/src/plugins/ai/components/PromptInput.vue b/frontend/src/plugins/ai/components/PromptInput.vueindex 368d9d9498..5c50181361 100644--- a/frontend/src/plugins/ai/components/PromptInput.vue+++ b/frontend/src/plugins/ai/components/PromptInput.vue@@ -48,7 +48,7 @@</template><script lang="ts" setup>-import { NButton, NInput, NPopover, type InputInst } from "naive-ui";+import { type InputInst, NButton, NInput, NPopover } from "naive-ui";import { onMounted, reactive, ref, watch } from "vue";import { useEmitteryEventListener } from "@/composables/useEmitteryEventListener";import { keyboardShortcutStr, nextAnimationFrame } from "@/utils";diff --git a/frontend/src/plugins/ai/logic/context.ts b/frontend/src/plugins/ai/logic/context.tsindex 06de318cb0..5327cdb108 100644--- a/frontend/src/plugins/ai/logic/context.ts+++ b/frontend/src/plugins/ai/logic/context.ts@@ -1,4 +1,4 @@-import { inject, provide, type InjectionKey } from "vue";+import { type InjectionKey, inject, provide } from "vue";import type { AIContext } from "../types";export const KEY = Symbol("bb.plugin.ai") as InjectionKey<AIContext>;diff --git a/frontend/src/plugins/cel/logic/build.ts b/frontend/src/plugins/cel/logic/build.tsindex 4716992882..192302f971 100644--- a/frontend/src/plugins/cel/logic/build.ts+++ b/frontend/src/plugins/cel/logic/build.ts@@ -14,14 +14,14 @@ import {import { BatchParseRequestSchema } from "@/types/proto-es/v1/cel_service_pb";import type { ConditionExpr, ConditionGroupExpr, SimpleExpr } from "../types";import {- isEqualityExpr,+ ExprType,isCollectionExpr,+ isCompareExpr,isConditionExpr,isConditionGroupExpr,- isCompareExpr,- isStringExpr,- ExprType,+ isEqualityExpr,isRawStringExpr,+ isStringExpr,} from "../types";const seq = {diff --git a/frontend/src/plugins/cel/logic/resolve.ts b/frontend/src/plugins/cel/logic/resolve.tsindex e62dd89620..d08a9d9405 100644--- a/frontend/src/plugins/cel/logic/resolve.ts+++ b/frontend/src/plugins/cel/logic/resolve.ts@@ -1,32 +1,32 @@import type { Expr as CELExpr } from "@/types/proto-es/google/api/expr/v1alpha1/syntax_pb";import type {- StringFactor,- Operator,+ CollectionExpr,CollectionOperator,+ CompareExpr,CompareOperator,- StringOperator,- EqualityOperator,- SimpleExpr,- CollectionExpr,ConditionGroupExpr,- CompareExpr,EqualityExpr,- StringExpr,+ EqualityOperator,LogicalOperator,+ Operator,RawStringExpr,+ SimpleExpr,+ StringExpr,+ StringFactor,+ StringOperator,} from "../types";import {- isEqualityOperator,- isConditionGroupExpr,+ ExprType,isCollectionOperator,- isLogicalOperator,isCompareOperator,- isStringOperator,+ isConditionGroupExpr,+ isEqualityOperator,+ isLogicalOperator,+ isNegativeOperator,isNumberFactor,isStringFactor,+ isStringOperator,isTimestampFactor,- isNegativeOperator,- ExprType,} from "../types";import stringifyExpr from "./stringify";diff --git a/frontend/src/plugins/cel/logic/validate.ts b/frontend/src/plugins/cel/logic/validate.tsindex 8db9b21b75..9212aec6e4 100644--- a/frontend/src/plugins/cel/logic/validate.ts+++ b/frontend/src/plugins/cel/logic/validate.ts@@ -5,18 +5,16 @@ import type {RawStringExpr,SimpleExpr,} from "../types";-import {- isEqualityExpr,- isNumberFactor,- isRawStringExpr,- isStringFactor,-} from "../types";import {isCollectionExpr,+ isCompareExpr,isConditionExpr,isConditionGroupExpr,- isCompareExpr,+ isEqualityExpr,+ isNumberFactor,+ isRawStringExpr,isStringExpr,+ isStringFactor,} from "../types";const validateString = (str: unknown): boolean => {diff --git a/frontend/src/plugins/cel/types/factor.ts b/frontend/src/plugins/cel/types/factor.tsindex e4ad92d37c..2bbd3d461b 100644--- a/frontend/src/plugins/cel/types/factor.ts+++ b/frontend/src/plugins/cel/types/factor.ts@@ -1,23 +1,23 @@import {- CEL_ATTRIBUTE_STATEMENT_AFFECTED_ROWS,- CEL_ATTRIBUTE_STATEMENT_TABLE_ROWS,CEL_ATTRIBUTE_LEVEL,CEL_ATTRIBUTE_REQUEST_EXPIRATION_DAYS,- CEL_ATTRIBUTE_SOURCE,+ CEL_ATTRIBUTE_REQUEST_ROLE,+ CEL_ATTRIBUTE_REQUEST_TIME,+ CEL_ATTRIBUTE_RESOURCE_CLASSIFICATION_LEVEL,+ CEL_ATTRIBUTE_RESOURCE_COLUMN_NAME,+ CEL_ATTRIBUTE_RESOURCE_DATABASE,+ CEL_ATTRIBUTE_RESOURCE_DATABASE_NAME,+ CEL_ATTRIBUTE_RESOURCE_DB_ENGINE,CEL_ATTRIBUTE_RESOURCE_ENVIRONMENT_ID,+ CEL_ATTRIBUTE_RESOURCE_INSTANCE_ID,CEL_ATTRIBUTE_RESOURCE_PROJECT_ID,- CEL_ATTRIBUTE_RESOURCE_DATABASE_NAME,CEL_ATTRIBUTE_RESOURCE_SCHEMA_NAME,CEL_ATTRIBUTE_RESOURCE_TABLE_NAME,- CEL_ATTRIBUTE_RESOURCE_INSTANCE_ID,- CEL_ATTRIBUTE_RESOURCE_DB_ENGINE,+ CEL_ATTRIBUTE_SOURCE,+ CEL_ATTRIBUTE_STATEMENT_AFFECTED_ROWS,CEL_ATTRIBUTE_STATEMENT_SQL_TYPE,+ CEL_ATTRIBUTE_STATEMENT_TABLE_ROWS,CEL_ATTRIBUTE_STATEMENT_TEXT,- CEL_ATTRIBUTE_REQUEST_ROLE,- CEL_ATTRIBUTE_RESOURCE_DATABASE,- CEL_ATTRIBUTE_RESOURCE_COLUMN_NAME,- CEL_ATTRIBUTE_RESOURCE_CLASSIFICATION_LEVEL,- CEL_ATTRIBUTE_REQUEST_TIME,} from "@/utils/cel-attributes";export const NumberFactorList = [diff --git a/frontend/src/plugins/cel/types/operator.ts b/frontend/src/plugins/cel/types/operator.tsindex df5f238544..bfd61d947f 100644--- a/frontend/src/plugins/cel/types/operator.ts+++ b/frontend/src/plugins/cel/types/operator.ts@@ -1,24 +1,24 @@import { uniq } from "lodash-es";import {- CEL_ATTRIBUTE_STATEMENT_AFFECTED_ROWS,- CEL_ATTRIBUTE_STATEMENT_TABLE_ROWS,- CEL_ATTRIBUTE_STATEMENT_SQL_TYPE,- CEL_ATTRIBUTE_STATEMENT_TEXT,+ CEL_ATTRIBUTE_LEVEL,+ CEL_ATTRIBUTE_REQUEST_EXPIRATION_DAYS,+ CEL_ATTRIBUTE_REQUEST_ROLE,+ CEL_ATTRIBUTE_REQUEST_TIME,+ CEL_ATTRIBUTE_RESOURCE_CLASSIFICATION_LEVEL,+ CEL_ATTRIBUTE_RESOURCE_COLUMN_NAME,+ CEL_ATTRIBUTE_RESOURCE_DATABASE,+ CEL_ATTRIBUTE_RESOURCE_DATABASE_NAME,+ CEL_ATTRIBUTE_RESOURCE_DB_ENGINE,CEL_ATTRIBUTE_RESOURCE_ENVIRONMENT_ID,- CEL_ATTRIBUTE_RESOURCE_PROJECT_ID,CEL_ATTRIBUTE_RESOURCE_INSTANCE_ID,- CEL_ATTRIBUTE_RESOURCE_DATABASE_NAME,- CEL_ATTRIBUTE_RESOURCE_TABLE_NAME,+ CEL_ATTRIBUTE_RESOURCE_PROJECT_ID,CEL_ATTRIBUTE_RESOURCE_SCHEMA_NAME,- CEL_ATTRIBUTE_RESOURCE_COLUMN_NAME,- CEL_ATTRIBUTE_RESOURCE_DB_ENGINE,- CEL_ATTRIBUTE_RESOURCE_DATABASE,- CEL_ATTRIBUTE_RESOURCE_CLASSIFICATION_LEVEL,- CEL_ATTRIBUTE_LEVEL,+ CEL_ATTRIBUTE_RESOURCE_TABLE_NAME,CEL_ATTRIBUTE_SOURCE,- CEL_ATTRIBUTE_REQUEST_TIME,- CEL_ATTRIBUTE_REQUEST_EXPIRATION_DAYS,- CEL_ATTRIBUTE_REQUEST_ROLE,+ CEL_ATTRIBUTE_STATEMENT_AFFECTED_ROWS,+ CEL_ATTRIBUTE_STATEMENT_SQL_TYPE,+ CEL_ATTRIBUTE_STATEMENT_TABLE_ROWS,+ CEL_ATTRIBUTE_STATEMENT_TEXT,} from "@/utils/cel-attributes";import type { Factor } from "./factor";diff --git a/frontend/src/plugins/cel/types/simple.ts b/frontend/src/plugins/cel/types/simple.tsindex 18c7fb3735..cf793cea58 100644--- a/frontend/src/plugins/cel/types/simple.ts+++ b/frontend/src/plugins/cel/types/simple.ts@@ -2,15 +2,15 @@/// Convenient for local editing.import type { NumberFactor, StringFactor, TimestampFactor } from "./factor";import {- type LogicalOperator,- type EqualityOperator,- type CompareOperator,- type StringOperator,type CollectionOperator,- isStringOperator,+ type CompareOperator,+ type EqualityOperator,isCollectionOperator,isCompareOperator,isEqualityOperator,+ isStringOperator,+ type LogicalOperator,+ type StringOperator,} from "./operator";export enum ExprType {diff --git a/frontend/src/plugins/i18n.test.ts b/frontend/src/plugins/i18n.test.tsindex 6e1329df71..82c7a1440e 100644--- a/frontend/src/plugins/i18n.test.ts+++ b/frontend/src/plugins/i18n.test.ts@@ -1,7 +1,7 @@import { describe, expect, test } from "vitest";import { Engine } from "@/types/proto-es/v1/common_pb";import { SQLReviewRuleLevel } from "@/types/proto-es/v1/org_policy_service_pb";-import { TEMPLATE_LIST_V2, getRuleLocalizationKey } from "../types/sqlReview";+import { getRuleLocalizationKey, TEMPLATE_LIST_V2 } from "../types/sqlReview";import { mergedLocalMessage } from "./i18n-messages";describe("Test i18n messages", () => {diff --git a/frontend/src/plugins/i18n.ts b/frontend/src/plugins/i18n.tsindex 45a3d5c557..6d5728343e 100644--- a/frontend/src/plugins/i18n.ts+++ b/frontend/src/plugins/i18n.ts@@ -1,5 +1,5 @@import { useLocalStorage } from "@vueuse/core";-import { createI18n, type Composer } from "vue-i18n";+import { type Composer, createI18n } from "vue-i18n";import { mergedLocalMessage } from "./i18n-messages";export interface LanguageStorage {diff --git a/frontend/src/plugins/naive-ui.ts b/frontend/src/plugins/naive-ui.tsindex 2f06e3fd36..4a503a689a 100644--- a/frontend/src/plugins/naive-ui.ts+++ b/frontend/src/plugins/naive-ui.ts@@ -11,19 +11,19 @@ import {NInputGroupLabel,NMessageProvider,NModal,+ NPopconfirm,NPopover,NPopselect,- NPopconfirm,NRadio,NRadioGroup,+ NSelect,NSpace,NTab,- NTabs,NTabPane,+ NTabs,NTag,NTooltip,NTree,- NSelect,NUpload,NUploadDragger,} from "naive-ui";diff --git a/frontend/src/router/dashboard/workspace.ts b/frontend/src/router/dashboard/workspace.tsindex dc320e5714..dfaa08c2c8 100644--- a/frontend/src/router/dashboard/workspace.ts+++ b/frontend/src/router/dashboard/workspace.ts@@ -12,6 +12,8 @@ import {WORKSPACE_ROUTE_CUSTOM_APPROVAL,WORKSPACE_ROUTE_DATA_CLASSIFICATION,WORKSPACE_ROUTE_GLOBAL_MASKING,+ WORKSPACE_ROUTE_IDENTITY_PROVIDER_DETAIL,+ WORKSPACE_ROUTE_IDENTITY_PROVIDERS,WORKSPACE_ROUTE_IM,WORKSPACE_ROUTE_LANDING,WORKSPACE_ROUTE_MEMBERS,@@ -22,8 +24,6 @@ import {WORKSPACE_ROUTE_SQL_REVIEW,WORKSPACE_ROUTE_SQL_REVIEW_CREATE,WORKSPACE_ROUTE_SQL_REVIEW_DETAIL,- WORKSPACE_ROUTE_IDENTITY_PROVIDERS,- WORKSPACE_ROUTE_IDENTITY_PROVIDER_DETAIL,WORKSPACE_ROUTE_USER_PROFILE,WORKSPACE_ROUTE_USERS,} from "./workspaceRoutes";diff --git a/frontend/src/store/modules/dbGroup.ts b/frontend/src/store/modules/dbGroup.tsindex 895c14195e..65fc1f664d 100644--- a/frontend/src/store/modules/dbGroup.ts+++ b/frontend/src/store/modules/dbGroup.ts@@ -12,12 +12,12 @@ import { ExprSchema } from "@/types/proto-es/google/type/expr_pb";import type { DatabaseGroup } from "@/types/proto-es/v1/database_group_service_pb";import {CreateDatabaseGroupRequestSchema,+ DatabaseGroupSchema,+ DatabaseGroupView,DeleteDatabaseGroupRequestSchema,GetDatabaseGroupRequestSchema,ListDatabaseGroupsRequestSchema,UpdateDatabaseGroupRequestSchema,- DatabaseGroupView,- DatabaseGroupSchema,} from "@/types/proto-es/v1/database_group_service_pb";import { batchConvertParsedExprToCELString } from "@/utils";import { useCache } from "../cache";diff --git a/frontend/src/store/modules/idp.ts b/frontend/src/store/modules/idp.tsindex c9b28a4226..032fc0d41c 100644--- a/frontend/src/store/modules/idp.ts+++ b/frontend/src/store/modules/idp.ts@@ -2,7 +2,7 @@ import { create } from "@bufbuild/protobuf";import { createContextValues } from "@connectrpc/connect";import { isEqual, isUndefined } from "lodash-es";import { defineStore } from "pinia";-import { ref, computed } from "vue";+import { computed, ref } from "vue";import { identityProviderServiceClientConnect } from "@/grpcweb";import { silentContextKey } from "@/grpcweb/context-key";import type { IdentityProvider } from "@/types/proto-es/v1/idp_service_pb";diff --git a/frontend/src/store/modules/quickLink.ts b/frontend/src/store/modules/quickLink.tsindex acc086513e..c8d1babea3 100644--- a/frontend/src/store/modules/quickLink.ts+++ b/frontend/src/store/modules/quickLink.ts@@ -1,21 +1,21 @@import { flatten } from "lodash-es";import {+ CircleDotIcon,GalleryHorizontalEndIcon,SettingsIcon,- CircleDotIcon,} from "lucide-vue-next";import { computed, h, type VNode } from "vue";import { t } from "@/plugins/i18n";import {WORKSPACE_ROUTE_LANDING,- WORKSPACE_ROUTE_USERS,WORKSPACE_ROUTE_SQL_REVIEW,+ WORKSPACE_ROUTE_USERS,} from "@/router/dashboard/workspaceRoutes";import { useCurrentUserV1 } from "@/store";import {- useDynamicLocalStorage,- useDashboardSidebar,type DashboardSidebarItem,+ useDashboardSidebar,+ useDynamicLocalStorage,} from "@/utils";export interface QuickLink {diff --git a/frontend/src/store/modules/release.ts b/frontend/src/store/modules/release.tsindex d7e179f3d2..23ce7905b6 100644--- a/frontend/src/store/modules/release.ts+++ b/frontend/src/store/modules/release.ts@@ -8,13 +8,13 @@ import type { MaybeRef, Pagination } from "@/types";import { isValidReleaseName, unknownRelease } from "@/types";import { State } from "@/types/proto-es/v1/common_pb";import type { Release } from "@/types/proto-es/v1/release_service_pb";-import { ReleaseSchema } from "@/types/proto-es/v1/release_service_pb";import {+ DeleteReleaseRequestSchema,GetReleaseRequestSchema,ListReleasesRequestSchema,- UpdateReleaseRequestSchema,- DeleteReleaseRequestSchema,+ ReleaseSchema,UndeleteReleaseRequestSchema,+ UpdateReleaseRequestSchema,} from "@/types/proto-es/v1/release_service_pb";import { DEFAULT_PAGE_SIZE } from "./common";diff --git a/frontend/src/store/modules/revision.ts b/frontend/src/store/modules/revision.tsindex ff23a69b24..08c0648b6a 100644--- a/frontend/src/store/modules/revision.ts+++ b/frontend/src/store/modules/revision.ts@@ -5,9 +5,9 @@ import { revisionServiceClientConnect } from "@/grpcweb";import type { Pagination } from "@/types";import type { Revision } from "@/types/proto-es/v1/revision_service_pb";import {- ListRevisionsRequestSchema,- GetRevisionRequestSchema,DeleteRevisionRequestSchema,+ GetRevisionRequestSchema,+ ListRevisionsRequestSchema,} from "@/types/proto-es/v1/revision_service_pb";import { DEFAULT_PAGE_SIZE } from "./common";import { revisionNamePrefix } from "./v1/common";diff --git a/frontend/src/store/modules/risk.ts b/frontend/src/store/modules/risk.tsindex e5cdb9056c..fce80f073b 100644--- a/frontend/src/store/modules/risk.ts+++ b/frontend/src/store/modules/risk.ts@@ -1,6 +1,6 @@import { create } from "@bufbuild/protobuf";import { defineStore } from "pinia";-import { ref, computed } from "vue";+import { computed, ref } from "vue";import { riskServiceClientConnect } from "@/grpcweb";import type { Risk } from "@/types/proto-es/v1/risk_service_pb";import {diff --git a/frontend/src/store/modules/role.ts b/frontend/src/store/modules/role.tsindex bb60bb8d06..678e228bcc 100644--- a/frontend/src/store/modules/role.ts+++ b/frontend/src/store/modules/role.ts@@ -4,9 +4,9 @@ import { ref } from "vue";import { roleServiceClientConnect } from "@/grpcweb";import type { Role } from "@/types/proto-es/v1/role_service_pb";import {+ DeleteRoleRequestSchema,ListRolesRequestSchema,UpdateRoleRequestSchema,- DeleteRoleRequestSchema,} from "@/types/proto-es/v1/role_service_pb";import { useGracefulRequest } from "./utils";diff --git a/frontend/src/store/modules/rollout.ts b/frontend/src/store/modules/rollout.tsindex 88429e689e..9245fba089 100644--- a/frontend/src/store/modules/rollout.ts+++ b/frontend/src/store/modules/rollout.ts@@ -7,13 +7,11 @@ import { rolloutServiceClientConnect } from "@/grpcweb";import { silentContextKey } from "@/grpcweb/context-key";import type { MaybeRef } from "@/types";import { isValidRolloutName, unknownRollout } from "@/types";-import {- Task_Type,- type Rollout,-} from "@/types/proto-es/v1/rollout_service_pb";import {GetRolloutRequestSchema,ListRolloutsRequestSchema,+ type Rollout,+ Task_Type,} from "@/types/proto-es/v1/rollout_service_pb";import {getTsRangeFromSearchParams,diff --git a/frontend/src/store/modules/sqlEditor/editor.ts b/frontend/src/store/modules/sqlEditor/editor.tsindex 6d6f23782a..35ec114399 100644--- a/frontend/src/store/modules/sqlEditor/editor.ts+++ b/frontend/src/store/modules/sqlEditor/editor.ts@@ -2,7 +2,7 @@ import { useLocalStorage } from "@vueuse/core";import { includes } from "lodash-es";import { defineStore } from "pinia";import { computed, ref, watch } from "vue";-import { isValidProjectName, type ComposedDatabase } from "@/types";+import { type ComposedDatabase, isValidProjectName } from "@/types";import { QueryOption_RedisRunCommandsOn } from "@/types/proto-es/v1/sql_service_pb";import { hasWorkspacePermissionV2 } from "@/utils";diff --git a/frontend/src/store/modules/sqlEditor/queryHistory.ts b/frontend/src/store/modules/sqlEditor/queryHistory.tsindex 0d6d025b14..2e5e221cb3 100644--- a/frontend/src/store/modules/sqlEditor/queryHistory.ts+++ b/frontend/src/store/modules/sqlEditor/queryHistory.ts@@ -2,9 +2,9 @@ import { create } from "@bufbuild/protobuf";import { defineStore } from "pinia";import { reactive } from "vue";import { sqlServiceClientConnect } from "@/grpcweb";-import { isValidProjectName, isValidDatabaseName } from "@/types";-import { SearchQueryHistoriesRequestSchema } from "@/types/proto-es/v1/sql_service_pb";+import { isValidDatabaseName, isValidProjectName } from "@/types";import type { QueryHistory } from "@/types/proto-es/v1/sql_service_pb";+import { SearchQueryHistoriesRequestSchema } from "@/types/proto-es/v1/sql_service_pb";export interface QueryHistoryFilter {statement?: string;diff --git a/frontend/src/store/modules/sqlEditor/tab.ts b/frontend/src/store/modules/sqlEditor/tab.tsindex b248d5d5d7..85456cfec6 100644--- a/frontend/src/store/modules/sqlEditor/tab.ts+++ b/frontend/src/store/modules/sqlEditor/tab.ts@@ -4,36 +4,36 @@ import { head, omit, pick } from "lodash-es";import { defineStore, storeToRefs } from "pinia";import { computed, nextTick, reactive, ref, unref, watch } from "vue";import type {- SQLEditorConnection,+ BatchQueryContext,CoreSQLEditorTab,- SQLEditorTab,+ SQLEditorConnection,SQLEditorDatabaseQueryContext,- BatchQueryContext,+ SQLEditorTab,} from "@/types";import { DEFAULT_SQL_EDITOR_TAB_MODE, isValidDatabaseName } from "@/types";import { DataSourceType } from "@/types/proto-es/v1/instance_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import {- WebStorageHelper,defaultSQLEditorTab,emptySQLEditorConnection,isDisconnectedSQLEditorTab,isSimilarSQLEditorTab,useDynamicLocalStorage,+ WebStorageHelper,} from "@/utils";import {- useDatabaseV1Store,- useDatabaseV1ByName,- useEnvironmentV1Store,extractUserId,hasFeature,+ useDatabaseV1ByName,+ useDatabaseV1Store,+ useEnvironmentV1Store,} from "../v1";import { useCurrentUserV1 } from "../v1/auth";import { useSQLEditorStore } from "./editor";import {EXTENDED_TAB_FIELDS,- useExtendedTabStore,type ExtendedTab,+ useExtendedTabStore,} from "./extendedTab";import { useTabViewStateStore } from "./tabViewState";import { useWebTerminalStore } from "./webTerminal";diff --git a/frontend/src/store/modules/sqlEditor/tabViewState.ts b/frontend/src/store/modules/sqlEditor/tabViewState.tsindex f20fed1e72..b8d4a08fa0 100644--- a/frontend/src/store/modules/sqlEditor/tabViewState.ts+++ b/frontend/src/store/modules/sqlEditor/tabViewState.ts@@ -1,7 +1,7 @@import { cloneDeep } from "lodash-es";import { defineStore } from "pinia";import { computed } from "vue";-import { useCurrentUserV1, extractUserId } from "@/store";+import { extractUserId, useCurrentUserV1 } from "@/store";import {defaultViewState,type EditorPanelViewState as ViewState,diff --git a/frontend/src/store/modules/sqlEditor/tree.ts b/frontend/src/store/modules/sqlEditor/tree.tsindex f75abd2b93..55edf0be47 100644--- a/frontend/src/store/modules/sqlEditor/tree.ts+++ b/frontend/src/store/modules/sqlEditor/tree.ts@@ -1,19 +1,19 @@-import { orderBy, uniq, flatten } from "lodash-es";+import { flatten, orderBy, uniq } from "lodash-es";import { defineStore } from "pinia";import { computed, reactive, ref } from "vue";import type {ComposedDatabase,SQLEditorTreeFactor as Factor,- SQLEditorTreeNode as TreeNode,SQLEditorTreeNodeTarget as NodeTarget,SQLEditorTreeNodeType as NodeType,+ SQLEditorTreeNode as TreeNode,SQLEditorTreeState as TreeState,} from "@/types";import {extractSQLEditorLabelFactor as extractLabelFactor,- unknownEnvironment,- LeafTreeNodeTypes,formatEnvironmentName,+ LeafTreeNodeTypes,+ unknownEnvironment,} from "@/types";import type { InstanceResource } from "@/types/proto-es/v1/instance_service_pb";import type { Project } from "@/types/proto-es/v1/project_service_pb";diff --git a/frontend/src/store/modules/sqlEditor/webTerminal.ts b/frontend/src/store/modules/sqlEditor/webTerminal.tsindex a0583be4ee..2c1a9dd670 100644--- a/frontend/src/store/modules/sqlEditor/webTerminal.ts+++ b/frontend/src/store/modules/sqlEditor/webTerminal.ts@@ -1,7 +1,7 @@import { create, fromJson, toJson } from "@bufbuild/protobuf";import { Code, ConnectError } from "@connectrpc/connect";import Emittery from "emittery";-import { uniqueId, cloneDeep } from "lodash-es";+import { cloneDeep, uniqueId } from "lodash-es";import { defineStore } from "pinia";import type { Subscription } from "rxjs";import { fromEventPattern, map, Observable } from "rxjs";@@ -9,24 +9,24 @@ import { markRaw, ref, shallowRef } from "vue";import { useCancelableTimeout } from "@/composables/useCancelableTimeout";import { pushNotification, useDatabaseV1Store } from "@/store";import type {+ SQLEditorQueryParams,+ SQLEditorTab,SQLResultSetV1,StreamingQueryController,- SQLEditorTab,WebTerminalQueryItemV1,WebTerminalQueryState,- SQLEditorQueryParams,} from "@/types";+import type {+ AdminExecuteRequest,+ AdminExecuteResponse,+ QueryResult,+} from "@/types/proto-es/v1/sql_service_pb";import {AdminExecuteRequestSchema,AdminExecuteResponseSchema,QueryResult_Message_Level,QueryResultSchema,} from "@/types/proto-es/v1/sql_service_pb";-import type {- AdminExecuteRequest,- AdminExecuteResponse,- QueryResult,-} from "@/types/proto-es/v1/sql_service_pb";import {extractGrpcErrorMessage,getErrorCode as extractGrpcStatusCode,diff --git a/frontend/src/store/modules/sqlReview.ts b/frontend/src/store/modules/sqlReview.tsindex 4a7f86ffcc..9635b6ddf2 100644--- a/frontend/src/store/modules/sqlReview.ts+++ b/frontend/src/store/modules/sqlReview.ts@@ -7,24 +7,24 @@ import { reviewConfigServiceClientConnect } from "@/grpcweb";import { silentContextKey } from "@/grpcweb/context-key";import { policyNamePrefix } from "@/store/modules/v1/common";import type {+ ComposedDatabase,+ MaybeRef,SchemaPolicyRule,SQLReviewPolicy,- MaybeRef,- ComposedDatabase,} from "@/types";import {PolicyType,- TagPolicySchema,SQLReviewRuleSchema,+ TagPolicySchema,} from "@/types/proto-es/v1/org_policy_service_pb";+import type { ReviewConfig } from "@/types/proto-es/v1/review_config_service_pb";import {DeleteReviewConfigRequestSchema,- UpdateReviewConfigRequestSchema,- ListReviewConfigsRequestSchema,GetReviewConfigRequestSchema,+ ListReviewConfigsRequestSchema,+ ReviewConfigSchema,+ UpdateReviewConfigRequestSchema,} from "@/types/proto-es/v1/review_config_service_pb";-import type { ReviewConfig } from "@/types/proto-es/v1/review_config_service_pb";-import { ReviewConfigSchema } from "@/types/proto-es/v1/review_config_service_pb";import { usePolicyV1Store } from "./v1/policy";const reviewConfigTagName = "bb.tag.review_config";diff --git a/frontend/src/store/modules/user.ts b/frontend/src/store/modules/user.tsindex 0136fbb70b..2ad68b41db 100644--- a/frontend/src/store/modules/user.ts+++ b/frontend/src/store/modules/user.ts@@ -7,10 +7,10 @@ import { computed, ref } from "vue";import { userServiceClientConnect } from "@/grpcweb";import { silentContextKey } from "@/grpcweb/context-key";import {- isValidProjectName,allUsersUser,- SYSTEM_BOT_USER_NAME,+ isValidProjectName,isValidUserName,+ SYSTEM_BOT_USER_NAME,unknownUser,userBindingPrefix,} from "@/types";@@ -19,19 +19,19 @@ import type {UpdateUserRequest,User,} from "@/types/proto-es/v1/user_service_pb";-import { UserType } from "@/types/proto-es/v1/user_service_pb";import {- GetUserRequestSchema,- ListUsersRequestSchema,+ BatchGetUsersRequestSchema,CreateUserRequestSchema,- UpdateUserRequestSchema,DeleteUserRequestSchema,+ GetUserRequestSchema,+ ListUsersRequestSchema,UndeleteUserRequestSchema,- BatchGetUsersRequestSchema,+ UpdateUserRequestSchema,+ UserType,} from "@/types/proto-es/v1/user_service_pb";import { ensureUserFullName } from "@/utils";import { useActuatorV1Store } from "./v1/actuator";-import { userNamePrefix, extractUserId } from "./v1/common";+import { extractUserId, userNamePrefix } from "./v1/common";import { usePermissionStore } from "./v1/permission";export interface UserFilter {diff --git a/frontend/src/store/modules/v1/actuator.ts b/frontend/src/store/modules/v1/actuator.tsindex ed4e166104..416fc498dc 100644--- a/frontend/src/store/modules/v1/actuator.ts+++ b/frontend/src/store/modules/v1/actuator.ts@@ -7,9 +7,9 @@ import { computed } from "vue";import { actuatorServiceClientConnect } from "@/grpcweb";import { useSilentRequest } from "@/plugins/silent-request";import {- defaultAppProfile,type AppFeatures,type AppProfile,+ defaultAppProfile,type Release,type ReleaseInfo,} from "@/types";diff --git a/frontend/src/store/modules/v1/auth.ts b/frontend/src/store/modules/v1/auth.tsindex 773c659d0c..6ca6303b88 100644--- a/frontend/src/store/modules/v1/auth.ts+++ b/frontend/src/store/modules/v1/auth.ts@@ -1,6 +1,5 @@import { create } from "@bufbuild/protobuf";-import { createContextValues } from "@connectrpc/connect";-import { Code } from "@connectrpc/connect";+import { Code, createContextValues } from "@connectrpc/connect";import { useLocalStorage } from "@vueuse/core";import { uniqueId } from "lodash-es";import { defineStore } from "pinia";@@ -9,33 +8,33 @@ import { authServiceClientConnect, userServiceClientConnect } from "@/grpcweb";import { ignoredCodesContextKey } from "@/grpcweb/context-key";import { router } from "@/router";import {- AUTH_SIGNIN_MODULE,- AUTH_PASSWORD_RESET_MODULE,AUTH_MFA_MODULE,+ AUTH_PASSWORD_RESET_MODULE,+ AUTH_SIGNIN_MODULE,} from "@/router/auth";import { SETUP_MODULE } from "@/router/setup";import { SQL_EDITOR_HOME_MODULE } from "@/router/sqlEditor";import {- useAppFeature,useActuatorV1Store,+ useAppFeature,useSettingV1Store,useUserStore,} from "@/store";import { UNKNOWN_USER_NAME, unknownUser } from "@/types";import {- LoginRequestSchema,type LoginRequest,+ LoginRequestSchema,} from "@/types/proto-es/v1/auth_service_pb";import {DatabaseChangeMode,Setting_SettingName,} from "@/types/proto-es/v1/setting_service_pb";+import type { User } from "@/types/proto-es/v1/user_service_pb";import {CreateUserRequestSchema,UserSchema,+ UserType,} from "@/types/proto-es/v1/user_service_pb";-import type { User } from "@/types/proto-es/v1/user_service_pb";-import { UserType } from "@/types/proto-es/v1/user_service_pb";export const useAuthStore = defineStore("auth_v1", () => {const userStore = useUserStore();diff --git a/frontend/src/store/modules/v1/changelog.ts b/frontend/src/store/modules/v1/changelog.tsindex b625cbd32d..930c961e32 100644--- a/frontend/src/store/modules/v1/changelog.ts+++ b/frontend/src/store/modules/v1/changelog.ts@@ -5,14 +5,12 @@ import { databaseServiceClientConnect } from "@/grpcweb";import { useCache } from "@/store/cache";import { UNKNOWN_ID } from "@/types";import {- ListChangelogsRequestSchema,- GetChangelogRequestSchema,-} from "@/types/proto-es/v1/database_service_pb";-import {+ type Changelog,ChangelogView,type GetChangelogRequest,+ GetChangelogRequestSchema,type ListChangelogsRequest,- type Changelog,+ ListChangelogsRequestSchema,} from "@/types/proto-es/v1/database_service_pb";import { extractChangelogUID } from "@/utils/v1/changelog";import { DEFAULT_PAGE_SIZE } from "../common";diff --git a/frontend/src/store/modules/v1/database.ts b/frontend/src/store/modules/v1/database.tsindex f6ee3d542f..2190920809 100644--- a/frontend/src/store/modules/v1/database.ts+++ b/frontend/src/store/modules/v1/database.ts@@ -2,35 +2,35 @@ import { create } from "@bufbuild/protobuf";import { createContextValues } from "@connectrpc/connect";import { uniq } from "lodash-es";import { defineStore } from "pinia";-import { computed, reactive, ref, unref, watch, markRaw } from "vue";+import { computed, markRaw, reactive, ref, unref, watch } from "vue";import { databaseServiceClientConnect } from "@/grpcweb";import { silentContextKey } from "@/grpcweb/context-key";import type { ComposedDatabase, MaybeRef } from "@/types";import {- isValidProjectName,- isValidInstanceName,isValidDatabaseName,isValidEnvironmentName,+ isValidInstanceName,+ isValidProjectName,unknownDatabase,unknownInstanceResource,} from "@/types";import { Engine } from "@/types/proto-es/v1/common_pb";+import type {+ BatchUpdateDatabasesRequest,+ Database,+ DiffSchemaRequest,+ UpdateDatabaseRequest,+} from "@/types/proto-es/v1/database_service_pb";import {- GetDatabaseRequestSchema,- ListDatabasesRequestSchema,BatchGetDatabasesRequestSchema,- BatchUpdateDatabasesRequestSchema,- UpdateDatabaseRequestSchema,BatchSyncDatabasesRequestSchema,- SyncDatabaseRequestSchema,- GetDatabaseSchemaRequestSchema,+ BatchUpdateDatabasesRequestSchema,DiffSchemaRequestSchema,-} from "@/types/proto-es/v1/database_service_pb";-import type {- Database,- UpdateDatabaseRequest,- DiffSchemaRequest,- BatchUpdateDatabasesRequest,+ GetDatabaseRequestSchema,+ GetDatabaseSchemaRequestSchema,+ ListDatabasesRequestSchema,+ SyncDatabaseRequestSchema,+ UpdateDatabaseRequestSchema,} from "@/types/proto-es/v1/database_service_pb";import type { Instance } from "@/types/proto-es/v1/instance_service_pb";import { extractDatabaseResourceName, isNullOrUndefined } from "@/utils";diff --git a/frontend/src/store/modules/v1/databaseCatalog.ts b/frontend/src/store/modules/v1/databaseCatalog.tsindex 62f5a7b16c..a5503a8082 100644--- a/frontend/src/store/modules/v1/databaseCatalog.ts+++ b/frontend/src/store/modules/v1/databaseCatalog.ts@@ -6,15 +6,15 @@ import { databaseCatalogServiceClientConnect } from "@/grpcweb";import { silentContextKey } from "@/grpcweb/context-key";import { useCache } from "@/store/cache";import type { MaybeRef } from "@/types";-import { UNKNOWN_ID, EMPTY_ID, UNKNOWN_INSTANCE_NAME } from "@/types";+import { EMPTY_ID, UNKNOWN_ID, UNKNOWN_INSTANCE_NAME } from "@/types";import type { DatabaseCatalog } from "@/types/proto-es/v1/database_catalog_service_pb";import {- GetDatabaseCatalogRequestSchema,- UpdateDatabaseCatalogRequestSchema,+ ColumnCatalogSchema,DatabaseCatalogSchema,- TableCatalogSchema,+ GetDatabaseCatalogRequestSchema,TableCatalog_ColumnsSchema,- ColumnCatalogSchema,+ TableCatalogSchema,+ UpdateDatabaseCatalogRequestSchema,} from "@/types/proto-es/v1/database_catalog_service_pb";import { extractDatabaseResourceName, hasProjectPermissionV2 } from "@/utils";import { useDatabaseV1Store } from "./database";diff --git a/frontend/src/store/modules/v1/dbSchema.ts b/frontend/src/store/modules/v1/dbSchema.tsindex 820984e59f..d811a8ec71 100644--- a/frontend/src/store/modules/v1/dbSchema.ts+++ b/frontend/src/store/modules/v1/dbSchema.ts@@ -7,15 +7,15 @@ import { silentContextKey } from "@/grpcweb/context-key";// Removed conversion imports as part of Bold Migration Strategyimport { useCache } from "@/store/cache";import type { MaybeRef } from "@/types";-import { UNKNOWN_ID, EMPTY_ID, UNKNOWN_INSTANCE_NAME } from "@/types";-import { GetDatabaseMetadataRequestSchema } from "@/types/proto-es/v1/database_service_pb";+import { EMPTY_ID, UNKNOWN_ID, UNKNOWN_INSTANCE_NAME } from "@/types";import type { DatabaseMetadata } from "@/types/proto-es/v1/database_service_pb";import {- TableMetadataSchema,DatabaseMetadataSchema,ExternalTableMetadataSchema,- ViewMetadataSchema,+ GetDatabaseMetadataRequestSchema,SchemaMetadataSchema,+ TableMetadataSchema,+ ViewMetadataSchema,} from "@/types/proto-es/v1/database_service_pb";import { extractDatabaseResourceName } from "@/utils";diff --git a/frontend/src/store/modules/v1/environment.ts b/frontend/src/store/modules/v1/environment.tsindex 6779844ca6..f36db4992a 100644--- a/frontend/src/store/modules/v1/environment.ts+++ b/frontend/src/store/modules/v1/environment.ts@@ -7,9 +7,9 @@ import { settingServiceClientConnect } from "@/grpcweb";import { silentContextKey } from "@/grpcweb/context-key";import type { ResourceId } from "@/types";import {- unknownEnvironment,- nullEnvironment,NULL_ENVIRONMENT_NAME,+ nullEnvironment,+ unknownEnvironment,} from "@/types";import type {EnvironmentSetting,@@ -19,9 +19,9 @@ import {EnvironmentSetting_EnvironmentSchema,EnvironmentSettingSchema,GetSettingRequestSchema,- UpdateSettingRequestSchema,- SettingSchema,Setting_SettingName,+ SettingSchema,+ UpdateSettingRequestSchema,} from "@/types/proto-es/v1/setting_service_pb";import type { Environment } from "@/types/v1/environment";import { environmentNamePrefix } from "./common";diff --git a/frontend/src/store/modules/v1/experimental-issue.ts b/frontend/src/store/modules/v1/experimental-issue.tsindex 51d02f00db..4fec342ca3 100644--- a/frontend/src/store/modules/v1/experimental-issue.ts+++ b/frontend/src/store/modules/v1/experimental-issue.ts@@ -7,29 +7,29 @@ import {} from "@/grpcweb";import { useProjectV1Store } from "@/store";import {+ type ComposedIssue,+ EMPTY_ID,emptyIssue,emptyRollout,- EMPTY_ID,- unknownIssue,UNKNOWN_ID,- type ComposedIssue,+ unknownIssue,} from "@/types";+import type { Issue } from "@/types/proto-es/v1/issue_service_pb";import {CreateIssueRequestSchema,GetIssueRequestSchema,} from "@/types/proto-es/v1/issue_service_pb";-import type { Issue } from "@/types/proto-es/v1/issue_service_pb";+import type { Plan } from "@/types/proto-es/v1/plan_service_pb";import {+ CreatePlanRequestSchema,GetPlanRequestSchema,ListPlanCheckRunsRequestSchema,- CreatePlanRequestSchema,} from "@/types/proto-es/v1/plan_service_pb";-import type { Plan } from "@/types/proto-es/v1/plan_service_pb";import type { Project } from "@/types/proto-es/v1/project_service_pb";import {+ CreateRolloutRequestSchema,GetRolloutRequestSchema,ListTaskRunsRequestSchema,- CreateRolloutRequestSchema,} from "@/types/proto-es/v1/rollout_service_pb";import { extractProjectResourceName, hasProjectPermissionV2 } from "@/utils";diff --git a/frontend/src/store/modules/v1/group.ts b/frontend/src/store/modules/v1/group.tsindex daa7334428..84ff93681b 100644--- a/frontend/src/store/modules/v1/group.ts+++ b/frontend/src/store/modules/v1/group.ts@@ -8,12 +8,12 @@ import { silentContextKey } from "@/grpcweb/context-key";import { isValidProjectName } from "@/types";import type { Group } from "@/types/proto-es/v1/group_service_pb";import {+ BatchGetGroupsRequestSchema,CreateGroupRequestSchema,DeleteGroupRequestSchema,GetGroupRequestSchema,ListGroupsRequestSchema,UpdateGroupRequestSchema,- BatchGetGroupsRequestSchema,} from "@/types/proto-es/v1/group_service_pb";import { hasWorkspacePermissionV2 } from "@/utils";import { groupNamePrefix } from "./common";diff --git a/frontend/src/store/modules/v1/instance.ts b/frontend/src/store/modules/v1/instance.tsindex d1d2a2ba79..9819917618 100644--- a/frontend/src/store/modules/v1/instance.ts+++ b/frontend/src/store/modules/v1/instance.ts@@ -6,34 +6,33 @@ import { instanceServiceClientConnect } from "@/grpcweb";// Removed conversion imports - using proto-es types directlyimport { silentContextKey } from "@/grpcweb/context-key";import {- unknownInstance,- isValidProjectName,- isValidInstanceName,isValidEnvironmentName,+ isValidInstanceName,+ isValidProjectName,+ unknownInstance,} from "@/types";-import { Engine } from "@/types/proto-es/v1/common_pb";-import { State } from "@/types/proto-es/v1/common_pb";-import {- CreateInstanceRequestSchema,- UpdateInstanceRequestSchema,- DeleteInstanceRequestSchema,- UndeleteInstanceRequestSchema,- SyncInstanceRequestSchema,- ListInstanceDatabaseRequestSchema,- BatchSyncInstancesRequestSchema,- BatchUpdateInstancesRequestSchema,- GetInstanceRequestSchema,- AddDataSourceRequestSchema,- UpdateDataSourceRequestSchema,- RemoveDataSourceRequestSchema,- ListInstancesRequestSchema,-} from "@/types/proto-es/v1/instance_service_pb";+import { Engine, State } from "@/types/proto-es/v1/common_pb";// Using proto-es types directly, no conversions needed for internal operationsimport type {DataSource,Instance,UpdateInstanceRequest,} from "@/types/proto-es/v1/instance_service_pb";+import {+ AddDataSourceRequestSchema,+ BatchSyncInstancesRequestSchema,+ BatchUpdateInstancesRequestSchema,+ CreateInstanceRequestSchema,+ DeleteInstanceRequestSchema,+ GetInstanceRequestSchema,+ ListInstanceDatabaseRequestSchema,+ ListInstancesRequestSchema,+ RemoveDataSourceRequestSchema,+ SyncInstanceRequestSchema,+ UndeleteInstanceRequestSchema,+ UpdateDataSourceRequestSchema,+ UpdateInstanceRequestSchema,+} from "@/types/proto-es/v1/instance_service_pb";import { extractInstanceResourceName, hasWorkspacePermissionV2 } from "@/utils";export interface InstanceFilter {diff --git a/frontend/src/store/modules/v1/instanceResource.ts b/frontend/src/store/modules/v1/instanceResource.tsindex 3d50dc89f8..0bdf5b1ded 100644--- a/frontend/src/store/modules/v1/instanceResource.ts+++ b/frontend/src/store/modules/v1/instanceResource.ts@@ -1,5 +1,5 @@import { uniqBy } from "lodash-es";-import { ref, unref, watchEffect, computed, type MaybeRef } from "vue";+import { computed, type MaybeRef, ref, unref, watchEffect } from "vue";import { isValidInstanceName } from "@/types";import type { InstanceResource } from "@/types/proto-es/v1/instance_service_pb";import { useDatabaseV1Store } from "./database";diff --git a/frontend/src/store/modules/v1/issue.ts b/frontend/src/store/modules/v1/issue.tsindex 575da556f2..4fc5c6198d 100644--- a/frontend/src/store/modules/v1/issue.ts+++ b/frontend/src/store/modules/v1/issue.ts@@ -7,19 +7,17 @@ import type { WatchCallback } from "vue";import { ref, watch } from "vue";import { issueServiceClientConnect } from "@/grpcweb";import { silentContextKey } from "@/grpcweb/context-key";-import { SYSTEM_BOT_EMAIL, type IssueFilter } from "@/types";+import { type IssueFilter, SYSTEM_BOT_EMAIL } from "@/types";+import type { Issue } from "@/types/proto-es/v1/issue_service_pb";import {GetIssueRequestSchema,+ Issue_ApprovalStatus,Issue_Type,IssueSchema,+ IssueStatus,SearchIssuesRequestSchema,UpdateIssueRequestSchema,} from "@/types/proto-es/v1/issue_service_pb";-import type { Issue } from "@/types/proto-es/v1/issue_service_pb";-import {- IssueStatus,- Issue_ApprovalStatus,-} from "@/types/proto-es/v1/issue_service_pb";import {extractProjectResourceName,memberMapToRolesInProjectIAM,@@ -27,8 +25,8 @@ import {import { useUserStore } from "../user";import { projectNamePrefix, userNamePrefix } from "./common";import {- shallowComposeIssue,type ComposeIssueConfig,+ shallowComposeIssue,} from "./experimental-issue";import { useProjectV1Store } from "./project";import { useProjectIamPolicyStore } from "./projectIamPolicy";diff --git a/frontend/src/store/modules/v1/issueComment.ts b/frontend/src/store/modules/v1/issueComment.tsindex 05a8f88234..bc4a85d50c 100644--- a/frontend/src/store/modules/v1/issueComment.ts+++ b/frontend/src/store/modules/v1/issueComment.ts@@ -2,16 +2,16 @@ import { create } from "@bufbuild/protobuf";import { defineStore } from "pinia";import { reactive } from "vue";import { issueServiceClientConnect } from "@/grpcweb";+import type {+ IssueComment,+ ListIssueCommentsRequest,+} from "@/types/proto-es/v1/issue_service_pb";import {CreateIssueCommentRequestSchema,IssueCommentSchema,ListIssueCommentsRequestSchema,UpdateIssueCommentRequestSchema,} from "@/types/proto-es/v1/issue_service_pb";-import type {- IssueComment,- ListIssueCommentsRequest,-} from "@/types/proto-es/v1/issue_service_pb";import {getProjectIdIssueIdIssueCommentId,issueNamePrefix,diff --git a/frontend/src/store/modules/v1/permission.ts b/frontend/src/store/modules/v1/permission.tsindex 856c4153dd..e31cc1f9c0 100644--- a/frontend/src/store/modules/v1/permission.ts+++ b/frontend/src/store/modules/v1/permission.ts@@ -1,10 +1,10 @@import { uniq } from "lodash-es";import { defineStore } from "pinia";-import { shallowReactive, computed } from "vue";+import { computed, shallowReactive } from "vue";import {- PresetRoleType,- PRESET_WORKSPACE_ROLES,type Permission,+ PRESET_WORKSPACE_ROLES,+ PresetRoleType,} from "@/types";import type { Project } from "@/types/proto-es/v1/project_service_pb";import { type User } from "@/types/proto-es/v1/user_service_pb";diff --git a/frontend/src/store/modules/v1/plan.ts b/frontend/src/store/modules/v1/plan.tsindex b63b570ff8..d806df3e44 100644--- a/frontend/src/store/modules/v1/plan.ts+++ b/frontend/src/store/modules/v1/plan.ts@@ -3,12 +3,12 @@ import dayjs from "dayjs";import { uniq } from "lodash-es";import { defineStore } from "pinia";import { planServiceClientConnect } from "@/grpcweb";+import type { Plan } from "@/types/proto-es/v1/plan_service_pb";import {- SearchPlansRequestSchema,GetPlanRequestSchema,+ SearchPlansRequestSchema,UpdatePlanRequestSchema,} from "@/types/proto-es/v1/plan_service_pb";-import type { Plan } from "@/types/proto-es/v1/plan_service_pb";import {getTsRangeFromSearchParams,getValueFromSearchParams,diff --git a/frontend/src/store/modules/v1/policy.ts b/frontend/src/store/modules/v1/policy.tsindex af91135989..b43e9abde6 100644--- a/frontend/src/store/modules/v1/policy.ts+++ b/frontend/src/store/modules/v1/policy.ts@@ -1,8 +1,7 @@import { create } from "@bufbuild/protobuf";-import { createContextValues } from "@connectrpc/connect";-import { Code, ConnectError } from "@connectrpc/connect";+import { Code, ConnectError, createContextValues } from "@connectrpc/connect";import { defineStore } from "pinia";-import { computed, ref, unref, watchEffect, reactive } from "vue";+import { computed, reactive, ref, unref, watchEffect } from "vue";import { orgPolicyServiceClientConnect } from "@/grpcweb";import { silentContextKey } from "@/grpcweb/context-key";import { policyNamePrefix } from "@/store/modules/v1/common";@@ -10,16 +9,16 @@ import type { MaybeRef } from "@/types";import { UNKNOWN_USER_NAME } from "@/types";import type { Policy } from "@/types/proto-es/v1/org_policy_service_pb";import {- PolicyResourceType,- PolicyType,- QueryDataPolicySchema,+ DeletePolicyRequestSchema,GetPolicyRequestSchema,ListPoliciesRequestSchema,+ PolicyResourceType,PolicySchema,- UpdatePolicyRequestSchema,- DeletePolicyRequestSchema,- RolloutPolicySchema,+ PolicyType,+ QueryDataPolicySchema,RolloutPolicy_Checkers_PlanCheckEnforcement,+ RolloutPolicySchema,+ UpdatePolicyRequestSchema,} from "@/types/proto-es/v1/org_policy_service_pb";import { useCurrentUserV1 } from "./auth";diff --git a/frontend/src/store/modules/v1/project.ts b/frontend/src/store/modules/v1/project.tsindex 8523c4bb24..7d87671e15 100644--- a/frontend/src/store/modules/v1/project.ts+++ b/frontend/src/store/modules/v1/project.ts@@ -8,25 +8,25 @@ import { projectServiceClientConnect } from "@/grpcweb";import { silentContextKey } from "@/grpcweb/context-key";import type { MaybeRef, ResourceId } from "@/types";import {- emptyProject,- EMPTY_PROJECT_NAME,- unknownProject,- defaultProject,- UNKNOWN_PROJECT_NAME,DEFAULT_PROJECT_NAME,+ defaultProject,+ EMPTY_PROJECT_NAME,+ emptyProject,isValidProjectName,+ UNKNOWN_PROJECT_NAME,+ unknownProject,} from "@/types";import { State } from "@/types/proto-es/v1/common_pb";import {+ BatchDeleteProjectsRequestSchema,+ CreateProjectRequestSchema,+ DeleteProjectRequestSchema,GetProjectRequestSchema,ListProjectsRequestSchema,+ type Project,SearchProjectsRequestSchema,- CreateProjectRequestSchema,- UpdateProjectRequestSchema,- DeleteProjectRequestSchema,- BatchDeleteProjectsRequestSchema,UndeleteProjectRequestSchema,- type Project,+ UpdateProjectRequestSchema,} from "@/types/proto-es/v1/project_service_pb";import { hasWorkspacePermissionV2 } from "@/utils";import { projectNamePrefix } from "./common";diff --git a/frontend/src/store/modules/v1/projectIamPolicy.ts b/frontend/src/store/modules/v1/projectIamPolicy.tsindex 0079595bb7..5bac86e69d 100644--- a/frontend/src/store/modules/v1/projectIamPolicy.ts+++ b/frontend/src/store/modules/v1/projectIamPolicy.ts@@ -5,20 +5,20 @@ import { computed, ref, unref, watch } from "vue";import { projectServiceClientConnect } from "@/grpcweb";import {ALL_USERS_USER_EMAIL,- QueryPermissionQueryAny,type ComposedDatabase,type MaybeRef,type QueryPermission,+ QueryPermissionQueryAny,} from "@/types";import type { Expr } from "@/types/proto-es/google/api/expr/v1alpha1/syntax_pb";+import type { IamPolicy } from "@/types/proto-es/v1/iam_policy_pb";import {GetIamPolicyRequestSchema,- SetIamPolicyRequestSchema,IamPolicySchema,+ SetIamPolicyRequestSchema,} from "@/types/proto-es/v1/iam_policy_pb";-import type { IamPolicy } from "@/types/proto-es/v1/iam_policy_pb";-import { BatchGetIamPolicyRequestSchema } from "@/types/proto-es/v1/project_service_pb";import type { Project } from "@/types/proto-es/v1/project_service_pb";+import { BatchGetIamPolicyRequestSchema } from "@/types/proto-es/v1/project_service_pb";import type { User } from "@/types/proto-es/v1/user_service_pb";import { getUserEmailListInBinding } from "@/utils";import { convertFromExpr } from "@/utils/issue/cel";diff --git a/frontend/src/store/modules/v1/projectWebhook.ts b/frontend/src/store/modules/v1/projectWebhook.tsindex d5ce9f7bf9..2dd9e65728 100644--- a/frontend/src/store/modules/v1/projectWebhook.ts+++ b/frontend/src/store/modules/v1/projectWebhook.ts@@ -4,10 +4,10 @@ import { projectServiceClientConnect } from "@/grpcweb";import type { IdType } from "@/types";import {AddWebhookRequestSchema,- UpdateWebhookRequestSchema,+ type Project,RemoveWebhookRequestSchema,TestWebhookRequestSchema,- type Project,+ UpdateWebhookRequestSchema,type Webhook,} from "@/types/proto-es/v1/project_service_pb";import { extractProjectWebhookID } from "@/utils";diff --git a/frontend/src/store/modules/v1/setting.ts b/frontend/src/store/modules/v1/setting.tsindex 47596cf454..324e528c15 100644--- a/frontend/src/store/modules/v1/setting.ts+++ b/frontend/src/store/modules/v1/setting.ts@@ -7,19 +7,19 @@ import { settingServiceClientConnect } from "@/grpcweb";import { silentContextKey } from "@/grpcweb/context-key";import { settingNamePrefix } from "@/store/modules/v1/common";import {+ type DataClassificationSetting_DataClassificationConfig,GetSettingRequestSchema,- UpdateSettingRequestSchema,ListSettingsRequestSchema,- type Setting,- SettingSchema,- Setting_SettingName,- type WorkspaceProfileSetting,- WorkspaceProfileSettingSchema,- type DataClassificationSetting_DataClassificationConfig,type PasswordRestrictionSetting,PasswordRestrictionSettingSchema,+ type Setting,+ Setting_SettingName,+ SettingSchema,type Value as SettingValue,ValueSchema as SettingValueSchema,+ UpdateSettingRequestSchema,+ type WorkspaceProfileSetting,+ WorkspaceProfileSettingSchema,} from "@/types/proto-es/v1/setting_service_pb";import { useActuatorV1Store } from "./actuator";diff --git a/frontend/src/store/modules/v1/sheet.ts b/frontend/src/store/modules/v1/sheet.tsindex e6a3c8eaf9..93e4965dfa 100644--- a/frontend/src/store/modules/v1/sheet.ts+++ b/frontend/src/store/modules/v1/sheet.ts@@ -7,10 +7,10 @@ import type { MaybeRef } from "@/types";import { UNKNOWN_ID } from "@/types";import { Engine } from "@/types/proto-es/v1/common_pb";import type { Sheet } from "@/types/proto-es/v1/sheet_service_pb";-import { SheetSchema } from "@/types/proto-es/v1/sheet_service_pb";import {CreateSheetRequestSchema,GetSheetRequestSchema,+ SheetSchema,UpdateSheetRequestSchema,} from "@/types/proto-es/v1/sheet_service_pb";import { extractSheetUID, getSheetStatement } from "@/utils";diff --git a/frontend/src/store/modules/v1/sql.ts b/frontend/src/store/modules/v1/sql.tsindex ba1e0823bc..303a724dba 100644--- a/frontend/src/store/modules/v1/sql.ts+++ b/frontend/src/store/modules/v1/sql.ts@@ -2,8 +2,8 @@ import { Code, ConnectError, createContextValues } from "@connectrpc/connect";import { defineStore } from "pinia";import { sqlServiceClientConnect } from "@/grpcweb";import {- silentContextKey,ignoredCodesContextKey,+ silentContextKey,} from "@/grpcweb/context-key";import type { SQLResultSetV1 } from "@/types";import type {diff --git a/frontend/src/store/modules/v1/subscription.ts b/frontend/src/store/modules/v1/subscription.tsindex d51262db53..fe45b1832a 100644--- a/frontend/src/store/modules/v1/subscription.ts+++ b/frontend/src/store/modules/v1/subscription.ts@@ -5,12 +5,12 @@ import type { Ref } from "vue";import { computed } from "vue";import { subscriptionServiceClientConnect } from "@/grpcweb";import {- PLANS,hasFeature as checkFeature,hasInstanceFeature as checkInstanceFeature,getDateForPbTimestampProtoEs,getMinimumRequiredPlan,instanceLimitFeature,+ PLANS,} from "@/types";import type {Instance,@@ -19,9 +19,9 @@ import type {import type { Subscription } from "@/types/proto-es/v1/subscription_service_pb";import {GetSubscriptionRequestSchema,- UpdateSubscriptionRequestSchema,PlanFeature,PlanType,+ UpdateSubscriptionRequestSchema,} from "@/types/proto-es/v1/subscription_service_pb";// The threshold of days before the license expiration date to show the warning.diff --git a/frontend/src/store/modules/v1/taskRunLog.ts b/frontend/src/store/modules/v1/taskRunLog.tsindex 6cb8f53b19..027fe2a55a 100644--- a/frontend/src/store/modules/v1/taskRunLog.ts+++ b/frontend/src/store/modules/v1/taskRunLog.ts@@ -2,11 +2,11 @@ import { create } from "@bufbuild/protobuf";import { defineStore } from "pinia";import { reactive } from "vue";import { rolloutServiceClientConnect } from "@/grpcweb";+import type { TaskRunLog } from "@/types/proto-es/v1/rollout_service_pb";import {GetTaskRunLogRequestSchema,TaskRunLogSchema,} from "@/types/proto-es/v1/rollout_service_pb";-import type { TaskRunLog } from "@/types/proto-es/v1/rollout_service_pb";export const useTaskRunLogStore = defineStore("taskRunLog", () => {// Map from taskRun name to TaskRunLogdiff --git a/frontend/src/store/modules/v1/worksheet.ts b/frontend/src/store/modules/v1/worksheet.tsindex 618dca82e3..aed431812e 100644--- a/frontend/src/store/modules/v1/worksheet.ts+++ b/frontend/src/store/modules/v1/worksheet.ts@@ -7,29 +7,31 @@ import { worksheetServiceClientConnect } from "@/grpcweb";import { silentContextKey } from "@/grpcweb/context-key";import { useCache } from "@/store/cache";import { UNKNOWN_ID } from "@/types";+import type {+ Worksheet,+ WorksheetOrganizer,+} from "@/types/proto-es/v1/worksheet_service_pb";import {+ BatchUpdateWorksheetOrganizerRequestSchema,CreateWorksheetRequestSchema,- GetWorksheetRequestSchema,- UpdateWorksheetRequestSchema,DeleteWorksheetRequestSchema,+ GetWorksheetRequestSchema,SearchWorksheetsRequestSchema,UpdateWorksheetOrganizerRequestSchema,- BatchUpdateWorksheetOrganizerRequestSchema,+ UpdateWorksheetRequestSchema,} from "@/types/proto-es/v1/worksheet_service_pb";-import type { WorksheetOrganizer } from "@/types/proto-es/v1/worksheet_service_pb";-import type { Worksheet } from "@/types/proto-es/v1/worksheet_service_pb";import {extractWorksheetUID,getSheetStatement,- isWorksheetWritableV1,getStatementSize,+ isWorksheetWritableV1,} from "@/utils";import { useSQLEditorTabStore } from "../sqlEditor";import { useUserStore } from "../user";import { useCurrentUserV1 } from "./auth";import { extractUserId } from "./common";-import { useDatabaseV1Store, batchGetOrFetchDatabases } from "./database";-import { useProjectV1Store, batchGetOrFetchProjects } from "./project";+import { batchGetOrFetchDatabases, useDatabaseV1Store } from "./database";+import { batchGetOrFetchProjects, useProjectV1Store } from "./project";type WorksheetView = "FULL" | "BASIC";type WorksheetCacheKey = [string /* uid */, WorksheetView];diff --git a/frontend/src/store/modules/v1/workspace.ts b/frontend/src/store/modules/v1/workspace.tsindex 0fb70a85d1..32794f641f 100644--- a/frontend/src/store/modules/v1/workspace.ts+++ b/frontend/src/store/modules/v1/workspace.ts@@ -1,15 +1,15 @@import { create } from "@bufbuild/protobuf";import { cloneDeep } from "lodash-es";import { defineStore } from "pinia";-import { ref, computed } from "vue";+import { computed, ref } from "vue";import { workspaceServiceClientConnect } from "@/grpcweb";import { userNamePrefix } from "@/store/modules/v1/common";-import { groupBindingPrefix, ALL_USERS_USER_EMAIL } from "@/types";+import { ALL_USERS_USER_EMAIL, groupBindingPrefix } from "@/types";import type { IamPolicy } from "@/types/proto-es/v1/iam_policy_pb";import {- IamPolicySchema,BindingSchema,GetIamPolicyRequestSchema,+ IamPolicySchema,SetIamPolicyRequestSchema,} from "@/types/proto-es/v1/iam_policy_pb";import { bindingListInIAM, getUserEmailListInBinding } from "@/utils";diff --git a/frontend/src/store/modules/workspaceApprovalSetting.ts b/frontend/src/store/modules/workspaceApprovalSetting.tsindex 4ef1a304fe..c325ab3156 100644--- a/frontend/src/store/modules/workspaceApprovalSetting.ts+++ b/frontend/src/store/modules/workspaceApprovalSetting.ts@@ -5,10 +5,10 @@ import { v4 as uuidv4 } from "uuid";import { ref } from "vue";import { settingServiceClientConnect } from "@/grpcweb";import {- type LocalApprovalConfig,- type LocalApprovalRule,getBuiltinFlow,isBuiltinFlowId,+ type LocalApprovalConfig,+ type LocalApprovalRule,} from "@/types";import type { ApprovalTemplate } from "@/types/proto-es/v1/issue_service_pb";import {@@ -19,14 +19,14 @@ import type { Risk_Source } from "@/types/proto-es/v1/risk_service_pb";import type { Setting } from "@/types/proto-es/v1/setting_service_pb";import {GetSettingRequestSchema,- UpdateSettingRequestSchema,- SettingSchema,Setting_SettingName,+ SettingSchema,ValueSchema as SettingValueSchema,+ UpdateSettingRequestSchema,} from "@/types/proto-es/v1/setting_service_pb";import {- resolveLocalApprovalConfig,buildWorkspaceApprovalSetting,+ resolveLocalApprovalConfig,} from "@/utils";import { useGracefulRequest } from "./utils";diff --git a/frontend/src/types/plan.ts b/frontend/src/types/plan.tsindex 1811d07eae..9a3f80cc4f 100644--- a/frontend/src/types/plan.ts+++ b/frontend/src/types/plan.ts@@ -1,7 +1,7 @@import {PlanFeature,- PlanType,type PlanLimitConfig,+ PlanType,} from "@/types/proto-es/v1/subscription_service_pb";import planData from "./plan.yaml";diff --git a/frontend/src/types/proto-es/google/api/annotations_pb.js b/frontend/src/types/proto-es/google/api/annotations_pb.jsindex abacf4b2c7..5b8259184d 100644--- a/frontend/src/types/proto-es/google/api/annotations_pb.js+++ b/frontend/src/types/proto-es/google/api/annotations_pb.js@@ -17,8 +17,8 @@/* eslint-disable */import { extDesc, fileDesc } from "@bufbuild/protobuf/codegenv2";-import { file_google_api_http } from "./http_pb";import { file_google_protobuf_descriptor } from "@bufbuild/protobuf/wkt";+import { file_google_api_http } from "./http_pb";/*** Describes the file google/api/annotations.proto.diff --git a/frontend/src/types/proto-es/v1/actuator_service_pb.js b/frontend/src/types/proto-es/v1/actuator_service_pb.jsindex 004c06ee63..3a3311ba16 100644--- a/frontend/src/types/proto-es/v1/actuator_service_pb.js+++ b/frontend/src/types/proto-es/v1/actuator_service_pb.js@@ -3,10 +3,10 @@/* eslint-disable */import { fileDesc, messageDesc, serviceDesc } from "@bufbuild/protobuf/codegenv2";+import { file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";import { file_google_api_annotations } from "../google/api/annotations_pb";import { file_google_api_client } from "../google/api/client_pb";import { file_google_api_field_behavior } from "../google/api/field_behavior_pb";-import { file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";import { file_v1_annotation } from "./annotation_pb";import { file_v1_common } from "./common_pb";import { file_v1_setting_service } from "./setting_service_pb";diff --git a/frontend/src/types/proto-es/v1/audit_log_service_pb.js b/frontend/src/types/proto-es/v1/audit_log_service_pb.jsindex f389e9c79d..434c5844c8 100644--- a/frontend/src/types/proto-es/v1/audit_log_service_pb.js+++ b/frontend/src/types/proto-es/v1/audit_log_service_pb.js@@ -3,10 +3,10 @@/* eslint-disable */import { enumDesc, fileDesc, messageDesc, serviceDesc, tsEnum } from "@bufbuild/protobuf/codegenv2";+import { file_google_protobuf_any, file_google_protobuf_duration, file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";import { file_google_api_annotations } from "../google/api/annotations_pb";import { file_google_api_field_behavior } from "../google/api/field_behavior_pb";import { file_google_api_resource } from "../google/api/resource_pb";-import { file_google_protobuf_any, file_google_protobuf_duration, file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";import { file_google_rpc_status } from "../google/rpc/status_pb";import { file_v1_annotation } from "./annotation_pb";import { file_v1_common } from "./common_pb";diff --git a/frontend/src/types/proto-es/v1/auth_service_pb.js b/frontend/src/types/proto-es/v1/auth_service_pb.jsindex d5643a393f..af1aaa9655 100644--- a/frontend/src/types/proto-es/v1/auth_service_pb.js+++ b/frontend/src/types/proto-es/v1/auth_service_pb.js@@ -3,8 +3,8 @@/* eslint-disable */import { fileDesc, messageDesc, serviceDesc } from "@bufbuild/protobuf/codegenv2";-import { file_google_api_annotations } from "../google/api/annotations_pb";import { file_google_protobuf_empty } from "@bufbuild/protobuf/wkt";+import { file_google_api_annotations } from "../google/api/annotations_pb";import { file_v1_annotation } from "./annotation_pb";import { file_v1_user_service } from "./user_service_pb";diff --git a/frontend/src/types/proto-es/v1/database_group_service_pb.js b/frontend/src/types/proto-es/v1/database_group_service_pb.jsindex 1f3e9b43bd..21cb9b8566 100644--- a/frontend/src/types/proto-es/v1/database_group_service_pb.js+++ b/frontend/src/types/proto-es/v1/database_group_service_pb.js@@ -3,12 +3,12 @@/* eslint-disable */import { enumDesc, fileDesc, messageDesc, serviceDesc, tsEnum } from "@bufbuild/protobuf/codegenv2";+import { file_google_protobuf_empty, file_google_protobuf_field_mask } from "@bufbuild/protobuf/wkt";import { file_buf_validate_validate } from "../buf/validate/validate_pb";import { file_google_api_annotations } from "../google/api/annotations_pb";import { file_google_api_client } from "../google/api/client_pb";import { file_google_api_field_behavior } from "../google/api/field_behavior_pb";import { file_google_api_resource } from "../google/api/resource_pb";-import { file_google_protobuf_empty, file_google_protobuf_field_mask } from "@bufbuild/protobuf/wkt";import { file_google_type_expr } from "../google/type/expr_pb";import { file_v1_annotation } from "./annotation_pb";diff --git a/frontend/src/types/proto-es/v1/database_service_pb.js b/frontend/src/types/proto-es/v1/database_service_pb.jsindex 8b86d73e54..d182649d6d 100644--- a/frontend/src/types/proto-es/v1/database_service_pb.js+++ b/frontend/src/types/proto-es/v1/database_service_pb.js@@ -3,11 +3,11 @@/* eslint-disable */import { enumDesc, fileDesc, messageDesc, serviceDesc, tsEnum } from "@bufbuild/protobuf/codegenv2";+import { file_google_protobuf_field_mask, file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";import { file_google_api_annotations } from "../google/api/annotations_pb";import { file_google_api_client } from "../google/api/client_pb";import { file_google_api_field_behavior } from "../google/api/field_behavior_pb";import { file_google_api_resource } from "../google/api/resource_pb";-import { file_google_protobuf_field_mask, file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";import { file_v1_annotation } from "./annotation_pb";import { file_v1_common } from "./common_pb";import { file_v1_instance_service } from "./instance_service_pb";diff --git a/frontend/src/types/proto-es/v1/group_service_pb.js b/frontend/src/types/proto-es/v1/group_service_pb.jsindex 5eb1b626e8..9c2028cc68 100644--- a/frontend/src/types/proto-es/v1/group_service_pb.js+++ b/frontend/src/types/proto-es/v1/group_service_pb.js@@ -3,12 +3,12 @@/* eslint-disable */import { enumDesc, fileDesc, messageDesc, serviceDesc, tsEnum } from "@bufbuild/protobuf/codegenv2";+import { file_google_protobuf_empty, file_google_protobuf_field_mask } from "@bufbuild/protobuf/wkt";import { file_buf_validate_validate } from "../buf/validate/validate_pb";import { file_google_api_annotations } from "../google/api/annotations_pb";import { file_google_api_client } from "../google/api/client_pb";import { file_google_api_field_behavior } from "../google/api/field_behavior_pb";import { file_google_api_resource } from "../google/api/resource_pb";-import { file_google_protobuf_empty, file_google_protobuf_field_mask } from "@bufbuild/protobuf/wkt";import { file_v1_annotation } from "./annotation_pb";/**diff --git a/frontend/src/types/proto-es/v1/idp_service_pb.js b/frontend/src/types/proto-es/v1/idp_service_pb.jsindex 2123093c25..03008ec6a2 100644--- a/frontend/src/types/proto-es/v1/idp_service_pb.js+++ b/frontend/src/types/proto-es/v1/idp_service_pb.js@@ -3,12 +3,12 @@/* eslint-disable */import { enumDesc, fileDesc, messageDesc, serviceDesc, tsEnum } from "@bufbuild/protobuf/codegenv2";+import { file_google_protobuf_empty, file_google_protobuf_field_mask } from "@bufbuild/protobuf/wkt";import { file_buf_validate_validate } from "../buf/validate/validate_pb";import { file_google_api_annotations } from "../google/api/annotations_pb";import { file_google_api_client } from "../google/api/client_pb";import { file_google_api_field_behavior } from "../google/api/field_behavior_pb";import { file_google_api_resource } from "../google/api/resource_pb";-import { file_google_protobuf_empty, file_google_protobuf_field_mask } from "@bufbuild/protobuf/wkt";import { file_v1_annotation } from "./annotation_pb";/**diff --git a/frontend/src/types/proto-es/v1/instance_service_pb.js b/frontend/src/types/proto-es/v1/instance_service_pb.jsindex aecf36144b..dbf768152c 100644--- a/frontend/src/types/proto-es/v1/instance_service_pb.js+++ b/frontend/src/types/proto-es/v1/instance_service_pb.js@@ -3,12 +3,12 @@/* eslint-disable */import { enumDesc, fileDesc, messageDesc, serviceDesc, tsEnum } from "@bufbuild/protobuf/codegenv2";+import { file_google_protobuf_duration, file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";import { file_buf_validate_validate } from "../buf/validate/validate_pb";import { file_google_api_annotations } from "../google/api/annotations_pb";import { file_google_api_client } from "../google/api/client_pb";import { file_google_api_field_behavior } from "../google/api/field_behavior_pb";import { file_google_api_resource } from "../google/api/resource_pb";-import { file_google_protobuf_duration, file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";import { file_v1_annotation } from "./annotation_pb";import { file_v1_common } from "./common_pb";import { file_v1_instance_role_service } from "./instance_role_service_pb";diff --git a/frontend/src/types/proto-es/v1/issue_service_pb.js b/frontend/src/types/proto-es/v1/issue_service_pb.jsindex 9e49b48675..0bc09bdf85 100644--- a/frontend/src/types/proto-es/v1/issue_service_pb.js+++ b/frontend/src/types/proto-es/v1/issue_service_pb.js@@ -3,12 +3,12 @@/* eslint-disable */import { enumDesc, fileDesc, messageDesc, serviceDesc, tsEnum } from "@bufbuild/protobuf/codegenv2";+import { file_google_protobuf_duration, file_google_protobuf_field_mask, file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";import { file_buf_validate_validate } from "../buf/validate/validate_pb";import { file_google_api_annotations } from "../google/api/annotations_pb";import { file_google_api_client } from "../google/api/client_pb";import { file_google_api_field_behavior } from "../google/api/field_behavior_pb";import { file_google_api_resource } from "../google/api/resource_pb";-import { file_google_protobuf_duration, file_google_protobuf_field_mask, file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";import { file_google_type_expr } from "../google/type/expr_pb";import { file_v1_annotation } from "./annotation_pb";import { file_v1_common } from "./common_pb";diff --git a/frontend/src/types/proto-es/v1/org_policy_service_pb.js b/frontend/src/types/proto-es/v1/org_policy_service_pb.jsindex 387e0aff61..446fb59d40 100644--- a/frontend/src/types/proto-es/v1/org_policy_service_pb.js+++ b/frontend/src/types/proto-es/v1/org_policy_service_pb.js@@ -3,11 +3,11 @@/* eslint-disable */import { enumDesc, fileDesc, messageDesc, serviceDesc, tsEnum } from "@bufbuild/protobuf/codegenv2";+import { file_google_protobuf_duration, file_google_protobuf_empty, file_google_protobuf_field_mask } from "@bufbuild/protobuf/wkt";import { file_google_api_annotations } from "../google/api/annotations_pb";import { file_google_api_client } from "../google/api/client_pb";import { file_google_api_field_behavior } from "../google/api/field_behavior_pb";import { file_google_api_resource } from "../google/api/resource_pb";-import { file_google_protobuf_duration, file_google_protobuf_empty, file_google_protobuf_field_mask } from "@bufbuild/protobuf/wkt";import { file_google_type_expr } from "../google/type/expr_pb";import { file_v1_annotation } from "./annotation_pb";import { file_v1_common } from "./common_pb";diff --git a/frontend/src/types/proto-es/v1/plan_service_pb.js b/frontend/src/types/proto-es/v1/plan_service_pb.jsindex 24298d4a6e..1a14b01926 100644--- a/frontend/src/types/proto-es/v1/plan_service_pb.js+++ b/frontend/src/types/proto-es/v1/plan_service_pb.js@@ -3,12 +3,12 @@/* eslint-disable */import { enumDesc, fileDesc, messageDesc, serviceDesc, tsEnum } from "@bufbuild/protobuf/codegenv2";+import { file_google_protobuf_field_mask, file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";import { file_buf_validate_validate } from "../buf/validate/validate_pb";import { file_google_api_annotations } from "../google/api/annotations_pb";import { file_google_api_client } from "../google/api/client_pb";import { file_google_api_field_behavior } from "../google/api/field_behavior_pb";import { file_google_api_resource } from "../google/api/resource_pb";-import { file_google_protobuf_field_mask, file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";import { file_v1_annotation } from "./annotation_pb";import { file_v1_common } from "./common_pb";import { file_v1_database_service } from "./database_service_pb";diff --git a/frontend/src/types/proto-es/v1/project_service_pb.js b/frontend/src/types/proto-es/v1/project_service_pb.jsindex c6e2c693ad..0c2e596ca2 100644--- a/frontend/src/types/proto-es/v1/project_service_pb.js+++ b/frontend/src/types/proto-es/v1/project_service_pb.js@@ -3,12 +3,12 @@/* eslint-disable */import { enumDesc, fileDesc, messageDesc, serviceDesc, tsEnum } from "@bufbuild/protobuf/codegenv2";+import { file_google_protobuf_empty, file_google_protobuf_field_mask } from "@bufbuild/protobuf/wkt";import { file_buf_validate_validate } from "../buf/validate/validate_pb";import { file_google_api_annotations } from "../google/api/annotations_pb";import { file_google_api_client } from "../google/api/client_pb";import { file_google_api_field_behavior } from "../google/api/field_behavior_pb";import { file_google_api_resource } from "../google/api/resource_pb";-import { file_google_protobuf_empty, file_google_protobuf_field_mask } from "@bufbuild/protobuf/wkt";import { file_v1_annotation } from "./annotation_pb";import { file_v1_common } from "./common_pb";import { file_v1_iam_policy } from "./iam_policy_pb";diff --git a/frontend/src/types/proto-es/v1/release_service_pb.js b/frontend/src/types/proto-es/v1/release_service_pb.jsindex 17ec434efe..24dfeb7806 100644--- a/frontend/src/types/proto-es/v1/release_service_pb.js+++ b/frontend/src/types/proto-es/v1/release_service_pb.js@@ -3,12 +3,12 @@/* eslint-disable */import { enumDesc, fileDesc, messageDesc, serviceDesc, tsEnum } from "@bufbuild/protobuf/codegenv2";+import { file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";import { file_buf_validate_validate } from "../buf/validate/validate_pb";import { file_google_api_annotations } from "../google/api/annotations_pb";import { file_google_api_client } from "../google/api/client_pb";import { file_google_api_field_behavior } from "../google/api/field_behavior_pb";import { file_google_api_resource } from "../google/api/resource_pb";-import { file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";import { file_v1_annotation } from "./annotation_pb";import { file_v1_common } from "./common_pb";import { file_v1_sql_service } from "./sql_service_pb";diff --git a/frontend/src/types/proto-es/v1/review_config_service_pb.js b/frontend/src/types/proto-es/v1/review_config_service_pb.jsindex b6de103c47..6f5307f381 100644--- a/frontend/src/types/proto-es/v1/review_config_service_pb.js+++ b/frontend/src/types/proto-es/v1/review_config_service_pb.js@@ -3,12 +3,12 @@/* eslint-disable */import { fileDesc, messageDesc, serviceDesc } from "@bufbuild/protobuf/codegenv2";+import { file_google_protobuf_empty, file_google_protobuf_field_mask } from "@bufbuild/protobuf/wkt";import { file_buf_validate_validate } from "../buf/validate/validate_pb";import { file_google_api_annotations } from "../google/api/annotations_pb";import { file_google_api_client } from "../google/api/client_pb";import { file_google_api_field_behavior } from "../google/api/field_behavior_pb";import { file_google_api_resource } from "../google/api/resource_pb";-import { file_google_protobuf_empty, file_google_protobuf_field_mask } from "@bufbuild/protobuf/wkt";import { file_v1_annotation } from "./annotation_pb";import { file_v1_org_policy_service } from "./org_policy_service_pb";diff --git a/frontend/src/types/proto-es/v1/revision_service_pb.js b/frontend/src/types/proto-es/v1/revision_service_pb.jsindex 215b530ee3..bf54b2f363 100644--- a/frontend/src/types/proto-es/v1/revision_service_pb.js+++ b/frontend/src/types/proto-es/v1/revision_service_pb.js@@ -3,11 +3,11 @@/* eslint-disable */import { enumDesc, fileDesc, messageDesc, serviceDesc, tsEnum } from "@bufbuild/protobuf/codegenv2";+import { file_google_protobuf_empty, file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";import { file_google_api_annotations } from "../google/api/annotations_pb";import { file_google_api_client } from "../google/api/client_pb";import { file_google_api_field_behavior } from "../google/api/field_behavior_pb";import { file_google_api_resource } from "../google/api/resource_pb";-import { file_google_protobuf_empty, file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";import { file_v1_annotation } from "./annotation_pb";/**diff --git a/frontend/src/types/proto-es/v1/risk_service_pb.js b/frontend/src/types/proto-es/v1/risk_service_pb.jsindex 3db2547044..dacc4d8d7c 100644--- a/frontend/src/types/proto-es/v1/risk_service_pb.js+++ b/frontend/src/types/proto-es/v1/risk_service_pb.js@@ -3,12 +3,12 @@/* eslint-disable */import { enumDesc, fileDesc, messageDesc, serviceDesc, tsEnum } from "@bufbuild/protobuf/codegenv2";+import { file_google_protobuf_empty, file_google_protobuf_field_mask } from "@bufbuild/protobuf/wkt";import { file_buf_validate_validate } from "../buf/validate/validate_pb";import { file_google_api_annotations } from "../google/api/annotations_pb";import { file_google_api_client } from "../google/api/client_pb";import { file_google_api_field_behavior } from "../google/api/field_behavior_pb";import { file_google_api_resource } from "../google/api/resource_pb";-import { file_google_protobuf_empty, file_google_protobuf_field_mask } from "@bufbuild/protobuf/wkt";import { file_google_type_expr } from "../google/type/expr_pb";import { file_v1_annotation } from "./annotation_pb";import { file_v1_common } from "./common_pb";diff --git a/frontend/src/types/proto-es/v1/role_service_pb.js b/frontend/src/types/proto-es/v1/role_service_pb.jsindex b1a4edbd02..9536bfde74 100644--- a/frontend/src/types/proto-es/v1/role_service_pb.js+++ b/frontend/src/types/proto-es/v1/role_service_pb.js@@ -3,12 +3,12 @@/* eslint-disable */import { enumDesc, fileDesc, messageDesc, serviceDesc, tsEnum } from "@bufbuild/protobuf/codegenv2";+import { file_google_protobuf_empty, file_google_protobuf_field_mask } from "@bufbuild/protobuf/wkt";import { file_buf_validate_validate } from "../buf/validate/validate_pb";import { file_google_api_annotations } from "../google/api/annotations_pb";import { file_google_api_client } from "../google/api/client_pb";import { file_google_api_field_behavior } from "../google/api/field_behavior_pb";import { file_google_api_resource } from "../google/api/resource_pb";-import { file_google_protobuf_empty, file_google_protobuf_field_mask } from "@bufbuild/protobuf/wkt";import { file_v1_annotation } from "./annotation_pb";/**diff --git a/frontend/src/types/proto-es/v1/rollout_service_pb.js b/frontend/src/types/proto-es/v1/rollout_service_pb.jsindex 6c60a1c714..1d1b362600 100644--- a/frontend/src/types/proto-es/v1/rollout_service_pb.js+++ b/frontend/src/types/proto-es/v1/rollout_service_pb.js@@ -3,12 +3,12 @@/* eslint-disable */import { enumDesc, fileDesc, messageDesc, serviceDesc, tsEnum } from "@bufbuild/protobuf/codegenv2";+import { file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";import { file_buf_validate_validate } from "../buf/validate/validate_pb";import { file_google_api_annotations } from "../google/api/annotations_pb";import { file_google_api_client } from "../google/api/client_pb";import { file_google_api_field_behavior } from "../google/api/field_behavior_pb";import { file_google_api_resource } from "../google/api/resource_pb";-import { file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";import { file_v1_annotation } from "./annotation_pb";import { file_v1_common } from "./common_pb";import { file_v1_plan_service } from "./plan_service_pb";diff --git a/frontend/src/types/proto-es/v1/setting_service_pb.js b/frontend/src/types/proto-es/v1/setting_service_pb.jsindex 10b0afc1c1..6a2d6a037f 100644--- a/frontend/src/types/proto-es/v1/setting_service_pb.js+++ b/frontend/src/types/proto-es/v1/setting_service_pb.js@@ -3,11 +3,11 @@/* eslint-disable */import { enumDesc, fileDesc, messageDesc, serviceDesc, tsEnum } from "@bufbuild/protobuf/codegenv2";+import { file_google_protobuf_duration, file_google_protobuf_field_mask } from "@bufbuild/protobuf/wkt";import { file_google_api_annotations } from "../google/api/annotations_pb";import { file_google_api_client } from "../google/api/client_pb";import { file_google_api_field_behavior } from "../google/api/field_behavior_pb";import { file_google_api_resource } from "../google/api/resource_pb";-import { file_google_protobuf_duration, file_google_protobuf_field_mask } from "@bufbuild/protobuf/wkt";import { file_google_type_expr } from "../google/type/expr_pb";import { file_v1_annotation } from "./annotation_pb";import { file_v1_common } from "./common_pb";diff --git a/frontend/src/types/proto-es/v1/sheet_service_pb.js b/frontend/src/types/proto-es/v1/sheet_service_pb.jsindex 37831efe2e..7585c6c8b8 100644--- a/frontend/src/types/proto-es/v1/sheet_service_pb.js+++ b/frontend/src/types/proto-es/v1/sheet_service_pb.js@@ -3,12 +3,12 @@/* eslint-disable */import { enumDesc, fileDesc, messageDesc, serviceDesc, tsEnum } from "@bufbuild/protobuf/codegenv2";+import { file_google_protobuf_field_mask, file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";import { file_buf_validate_validate } from "../buf/validate/validate_pb";import { file_google_api_annotations } from "../google/api/annotations_pb";import { file_google_api_client } from "../google/api/client_pb";import { file_google_api_field_behavior } from "../google/api/field_behavior_pb";import { file_google_api_resource } from "../google/api/resource_pb";-import { file_google_protobuf_field_mask, file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";import { file_v1_annotation } from "./annotation_pb";import { file_v1_common } from "./common_pb";diff --git a/frontend/src/types/proto-es/v1/sql_service_pb.js b/frontend/src/types/proto-es/v1/sql_service_pb.jsindex a8882c3f29..c4921d76dc 100644--- a/frontend/src/types/proto-es/v1/sql_service_pb.js+++ b/frontend/src/types/proto-es/v1/sql_service_pb.js@@ -3,10 +3,10 @@/* eslint-disable */import { enumDesc, fileDesc, messageDesc, serviceDesc, tsEnum } from "@bufbuild/protobuf/codegenv2";+import { file_google_protobuf_duration, file_google_protobuf_struct, file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";import { file_google_api_annotations } from "../google/api/annotations_pb";import { file_google_api_field_behavior } from "../google/api/field_behavior_pb";import { file_google_api_resource } from "../google/api/resource_pb";-import { file_google_protobuf_duration, file_google_protobuf_struct, file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";import { file_v1_annotation } from "./annotation_pb";import { file_v1_common } from "./common_pb";import { file_v1_database_catalog_service } from "./database_catalog_service_pb";diff --git a/frontend/src/types/proto-es/v1/subscription_service_pb.js b/frontend/src/types/proto-es/v1/subscription_service_pb.jsindex 6dcadbbd79..073bb31cb0 100644--- a/frontend/src/types/proto-es/v1/subscription_service_pb.js+++ b/frontend/src/types/proto-es/v1/subscription_service_pb.js@@ -3,10 +3,10 @@/* eslint-disable */import { enumDesc, fileDesc, messageDesc, serviceDesc, tsEnum } from "@bufbuild/protobuf/codegenv2";+import { file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";import { file_google_api_annotations } from "../google/api/annotations_pb";import { file_google_api_client } from "../google/api/client_pb";import { file_google_api_field_behavior } from "../google/api/field_behavior_pb";-import { file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";import { file_v1_annotation } from "./annotation_pb";/**diff --git a/frontend/src/types/proto-es/v1/user_service_pb.js b/frontend/src/types/proto-es/v1/user_service_pb.jsindex 93ff04bfae..549b5bc94a 100644--- a/frontend/src/types/proto-es/v1/user_service_pb.js+++ b/frontend/src/types/proto-es/v1/user_service_pb.js@@ -3,12 +3,12 @@/* eslint-disable */import { enumDesc, fileDesc, messageDesc, serviceDesc, tsEnum } from "@bufbuild/protobuf/codegenv2";+import { file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";import { file_buf_validate_validate } from "../buf/validate/validate_pb";import { file_google_api_annotations } from "../google/api/annotations_pb";import { file_google_api_client } from "../google/api/client_pb";import { file_google_api_field_behavior } from "../google/api/field_behavior_pb";import { file_google_api_resource } from "../google/api/resource_pb";-import { file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";import { file_v1_annotation } from "./annotation_pb";import { file_v1_common } from "./common_pb";diff --git a/frontend/src/types/proto-es/v1/worksheet_service_pb.js b/frontend/src/types/proto-es/v1/worksheet_service_pb.jsindex 8873cf5dfb..9b8def7a73 100644--- a/frontend/src/types/proto-es/v1/worksheet_service_pb.js+++ b/frontend/src/types/proto-es/v1/worksheet_service_pb.js@@ -3,11 +3,11 @@/* eslint-disable */import { enumDesc, fileDesc, messageDesc, serviceDesc, tsEnum } from "@bufbuild/protobuf/codegenv2";+import { file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";import { file_buf_validate_validate } from "../buf/validate/validate_pb";import { file_google_api_annotations } from "../google/api/annotations_pb";import { file_google_api_client } from "../google/api/client_pb";import { file_google_api_field_behavior } from "../google/api/field_behavior_pb";-import { file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";import { file_v1_annotation } from "./annotation_pb";/**diff --git a/frontend/src/types/sqlReview.test.ts b/frontend/src/types/sqlReview.test.tsindex bd1f59ad1a..ac5570ff52 100644--- a/frontend/src/types/sqlReview.test.ts+++ b/frontend/src/types/sqlReview.test.ts@@ -1,9 +1,9 @@import { describe, expect, test } from "vitest";import { SQLReviewRuleLevel } from "@/types/proto-es/v1/org_policy_service_pb";-import sqlReviewSchema from "./sql-review-schema.yaml";import sqlReviewDevTemplate from "./sql-review.dev.yaml";import sqlReviewProdTemplate from "./sql-review.prod.yaml";import sqlReviewSampleTemplate from "./sql-review.sample.yaml";+import sqlReviewSchema from "./sql-review-schema.yaml";describe("SQL Review YAML Templates Validation", () => {const templates = [diff --git a/frontend/src/types/sqlReview.ts b/frontend/src/types/sqlReview.tsindex 177e122de4..36e8480beb 100644--- a/frontend/src/types/sqlReview.ts+++ b/frontend/src/types/sqlReview.ts@@ -2,10 +2,10 @@ import { t, te } from "@/plugins/i18n";import { Engine } from "@/types/proto-es/v1/common_pb";import { SQLReviewRuleLevel } from "@/types/proto-es/v1/org_policy_service_pb";import { engineToString } from "@/utils/v1/common-conversions";-import sqlReviewSchema from "./sql-review-schema.yaml";import sqlReviewDevTemplate from "./sql-review.dev.yaml";import sqlReviewProdTemplate from "./sql-review.prod.yaml";import sqlReviewSampleTemplate from "./sql-review.sample.yaml";+import sqlReviewSchema from "./sql-review-schema.yaml";// NumberPayload is the number type payload configuration options and default value.// Used by the frontend.diff --git a/frontend/src/types/v1/dataSource.ts b/frontend/src/types/v1/dataSource.tsindex 9d61ef5249..a8e50664cb 100644--- a/frontend/src/types/v1/dataSource.ts+++ b/frontend/src/types/v1/dataSource.ts@@ -2,9 +2,9 @@ import { create } from "@bufbuild/protobuf";import { v4 as uuidv4 } from "uuid";// DataSource type used in function signatures, imported in value importsimport {+ DataSource_AuthenticationType,DataSourceSchema,DataSourceType,- DataSource_AuthenticationType,} from "../proto-es/v1/instance_service_pb";export const DATASOURCE_ADMIN_USER_NAME = "bytebase";diff --git a/frontend/src/types/v1/environment.ts b/frontend/src/types/v1/environment.tsindex 5f928a6466..3a1cf0a972 100644--- a/frontend/src/types/v1/environment.ts+++ b/frontend/src/types/v1/environment.ts@@ -2,8 +2,8 @@ import { create } from "@bufbuild/protobuf";import { environmentNamePrefix } from "@/store";import { EMPTY_ID, UNKNOWN_ID } from "../const";import {- EnvironmentSetting_EnvironmentSchema,type EnvironmentSetting_Environment,+ EnvironmentSetting_EnvironmentSchema,} from "../proto-es/v1/setting_service_pb";export const EMPTY_ENVIRONMENT_NAME = `environments/${EMPTY_ID}`;diff --git a/frontend/src/types/v1/instance.ts b/frontend/src/types/v1/instance.tsindex c52f65503d..f73950f59a 100644--- a/frontend/src/types/v1/instance.ts+++ b/frontend/src/types/v1/instance.ts@@ -6,8 +6,8 @@ import type {InstanceResource,} from "../proto-es/v1/instance_service_pb";import {- InstanceSchema,InstanceResourceSchema,+ InstanceSchema,} from "../proto-es/v1/instance_service_pb";export const EMPTY_INSTANCE_NAME = `instances/${EMPTY_ID}`;diff --git a/frontend/src/types/v1/issue/issue.ts b/frontend/src/types/v1/issue/issue.tsindex 750c2b4126..6592e955ab 100644--- a/frontend/src/types/v1/issue/issue.ts+++ b/frontend/src/types/v1/issue/issue.ts@@ -7,13 +7,12 @@ import {} from "@/types";import type { Issue } from "@/types/proto-es/v1/issue_service_pb";import {+ Issue_Type,IssueSchema,IssueStatus,- Issue_Type,} from "@/types/proto-es/v1/issue_service_pb";import type { Plan, PlanCheckRun } from "@/types/proto-es/v1/plan_service_pb";-import type { TaskRun } from "@/types/proto-es/v1/rollout_service_pb";-import type { Rollout } from "@/types/proto-es/v1/rollout_service_pb";+import type { Rollout, TaskRun } from "@/types/proto-es/v1/rollout_service_pb";import { EMPTY_ID, UNKNOWN_ID } from "../../const";// For grant request issue, it has no plan and rollout.diff --git a/frontend/src/types/v1/issue/plan.ts b/frontend/src/types/v1/issue/plan.tsindex 2961a0643a..7b87a2fc34 100644--- a/frontend/src/types/v1/issue/plan.ts+++ b/frontend/src/types/v1/issue/plan.ts@@ -2,8 +2,8 @@ import { create as createProto } from "@bufbuild/protobuf";import { EMPTY_ID, UNKNOWN_ID } from "@/types/const";import type { Plan } from "@/types/proto-es/v1/plan_service_pb";import {- PlanSchema,Plan_SpecSchema,+ PlanSchema,} from "@/types/proto-es/v1/plan_service_pb";export const EMPTY_PLAN_NAME = `projects/${EMPTY_ID}/plans/${EMPTY_ID}`;diff --git a/frontend/src/types/v1/issue/rollout.ts b/frontend/src/types/v1/issue/rollout.tsindex 502bae6006..690b9c4ae5 100644--- a/frontend/src/types/v1/issue/rollout.ts+++ b/frontend/src/types/v1/issue/rollout.ts@@ -2,8 +2,8 @@ import { create } from "@bufbuild/protobuf";import { EMPTY_ID, UNKNOWN_ID } from "@/types/const";import {StageSchema,- TaskSchema,Task_Type,+ TaskSchema,} from "@/types/proto-es/v1/rollout_service_pb";import { EMPTY_ROLLOUT_NAME, UNKNOWN_ROLLOUT_NAME } from "@/types/rollout";import {diff --git a/frontend/src/types/v1/projectWebhook.ts b/frontend/src/types/v1/projectWebhook.tsindex 148c8c3d63..ee1c078724 100644--- a/frontend/src/types/v1/projectWebhook.ts+++ b/frontend/src/types/v1/projectWebhook.ts@@ -2,8 +2,8 @@ import { create as createProto } from "@bufbuild/protobuf";import { t } from "@/plugins/i18n";import {Activity_Type,- WebhookSchema,Webhook_Type,+ WebhookSchema,} from "../proto-es/v1/project_service_pb";export const emptyProjectWebhook = () => {diff --git a/frontend/src/types/v1/user.ts b/frontend/src/types/v1/user.tsindex 9879a207b0..30e29a0cfa 100644--- a/frontend/src/types/v1/user.ts+++ b/frontend/src/types/v1/user.ts@@ -4,7 +4,7 @@ import { SYSTEM_BOT_ID } from "../common";import { EMPTY_ID, UNKNOWN_ID } from "../const";import { State } from "../proto-es/v1/common_pb";import type { User } from "../proto-es/v1/user_service_pb";-import { UserType, UserSchema } from "../proto-es/v1/user_service_pb";+import { UserSchema, UserType } from "../proto-es/v1/user_service_pb";export const UNKNOWN_USER_NAME = `users/${UNKNOWN_ID}`;export const SYSTEM_BOT_USER_NAME = `users/${SYSTEM_BOT_ID}`;diff --git a/frontend/src/utils/auto-route.ts b/frontend/src/utils/auto-route.tsindex 74f828d17b..d230b615ee 100644--- a/frontend/src/utils/auto-route.ts+++ b/frontend/src/utils/auto-route.ts@@ -16,8 +16,8 @@ import type {import type { Project } from "@/types/proto-es/v1/project_service_pb";import type { User } from "@/types/proto-es/v1/user_service_pb";import {- formatEnvironmentName,type Environment,+ formatEnvironmentName,} from "@/types/v1/environment";import {extractDatabaseResourceName,diff --git a/frontend/src/utils/css.ts b/frontend/src/utils/css.tsindex 5779d8cde9..bb8336c486 100644--- a/frontend/src/utils/css.ts+++ b/frontend/src/utils/css.ts@@ -1,5 +1,5 @@import { pullAt } from "lodash-es";-import { type Raw, watchEffect, computed, ref, unref } from "vue";+import { computed, type Raw, ref, unref, watchEffect } from "vue";import type { MaybeRef } from "@/types";import type { VueClass } from "./types";diff --git a/frontend/src/utils/customTheme.ts b/frontend/src/utils/customTheme.tsindex 91498c9a12..e6790c4e8c 100644--- a/frontend/src/utils/customTheme.ts+++ b/frontend/src/utils/customTheme.ts@@ -1,4 +1,4 @@-import { watch, type Ref } from "vue";+import { type Ref, watch } from "vue";import { hexToRgb } from "./css";export const useCustomTheme = (diff --git a/frontend/src/utils/dom.ts b/frontend/src/utils/dom.tsindex ffae482a10..f4aab6f3e2 100644--- a/frontend/src/utils/dom.ts+++ b/frontend/src/utils/dom.ts@@ -1,4 +1,4 @@-import { onBeforeUnmount, unref, watch, type Ref } from "vue";+import { onBeforeUnmount, type Ref, unref, watch } from "vue";export const isDescendantOf = (node: Element | null | undefined,diff --git a/frontend/src/utils/issue/cel.ts b/frontend/src/utils/issue/cel.tsindex d27d9b8bec..d2dafebaa0 100644--- a/frontend/src/utils/issue/cel.ts+++ b/frontend/src/utils/issue/cel.ts@@ -18,12 +18,12 @@ import {} from "@/utils";import {CEL_ATTRIBUTE_REQUEST_TIME,+ CEL_ATTRIBUTE_RESOURCE_COLUMN_NAME,CEL_ATTRIBUTE_RESOURCE_DATABASE,+ CEL_ATTRIBUTE_RESOURCE_DATABASE_NAME,+ CEL_ATTRIBUTE_RESOURCE_INSTANCE_ID,CEL_ATTRIBUTE_RESOURCE_SCHEMA_NAME,CEL_ATTRIBUTE_RESOURCE_TABLE_NAME,- CEL_ATTRIBUTE_RESOURCE_COLUMN_NAME,- CEL_ATTRIBUTE_RESOURCE_INSTANCE_ID,- CEL_ATTRIBUTE_RESOURCE_DATABASE_NAME,} from "@/utils/cel-attributes";interface DatabaseLevelCondition {diff --git a/frontend/src/utils/naive-ui.ts b/frontend/src/utils/naive-ui.tsindex 139560f762..a3161f2e1b 100644--- a/frontend/src/utils/naive-ui.ts+++ b/frontend/src/utils/naive-ui.ts@@ -1,6 +1,6 @@import { pausableWatch, useElementSize } from "@vueuse/core";import type { DataTableInst, VirtualListInst } from "naive-ui";-import { computed, ref, unref, type MaybeRef } from "vue";+import { computed, type MaybeRef, ref, unref } from "vue";import { nextAnimationFrame } from "./dom";export type AutoHeightDataTableOptions = {diff --git a/frontend/src/utils/role.ts b/frontend/src/utils/role.tsindex 668502e641..3520ee1048 100644--- a/frontend/src/utils/role.ts+++ b/frontend/src/utils/role.ts@@ -1,6 +1,6 @@import { t } from "@/plugins/i18n";import { useRoleStore } from "@/store";-import { PresetRoleType, type Permission } from "@/types";+import { type Permission, PresetRoleType } from "@/types";export const checkRoleContainsAnyPermission = (roleName: string,diff --git a/frontend/src/utils/slug.ts b/frontend/src/utils/slug.tsindex 5914447223..ea7c6046d7 100644--- a/frontend/src/utils/slug.ts+++ b/frontend/src/utils/slug.ts@@ -1,8 +1,8 @@import {- worksheetNamePrefix,- projectNamePrefix,getReviewConfigId,+ projectNamePrefix,reviewConfigNamePrefix,+ worksheetNamePrefix,} from "@/store/modules/v1/common";import type { SQLReviewPolicy } from "../types";import type { IdType } from "../types/id";diff --git a/frontend/src/utils/sqlEditor.ts b/frontend/src/utils/sqlEditor.tsindex c4f3c731e9..97b7d8a5c9 100644--- a/frontend/src/utils/sqlEditor.ts+++ b/frontend/src/utils/sqlEditor.ts@@ -10,9 +10,9 @@ import {import type {ComposedDatabase,CoreSQLEditorTab,+ QueryDataSourceType,SQLEditorConnection,SQLEditorTab,- QueryDataSourceType,} from "@/types";import {DEFAULT_SQL_EDITOR_TAB_MODE,@@ -24,11 +24,11 @@ import {DataSourceType,type InstanceResource,} from "@/types/proto-es/v1/instance_service_pb";+import type { Policy } from "@/types/proto-es/v1/org_policy_service_pb";import {DataSourceQueryPolicy_Restriction,PolicyType,} from "@/types/proto-es/v1/org_policy_service_pb";-import type { Policy } from "@/types/proto-es/v1/org_policy_service_pb";import { instanceV1AllowsCrossDatabaseQuery } from "./v1/instance";export const defaultSQLEditorTab = (): SQLEditorTab => {diff --git a/frontend/src/utils/useDashboardSidebar.ts b/frontend/src/utils/useDashboardSidebar.tsindex 2548e584ae..c0403b38c3 100644--- a/frontend/src/utils/useDashboardSidebar.ts+++ b/frontend/src/utils/useDashboardSidebar.ts@@ -25,6 +25,7 @@ import {WORKSPACE_ROUTE_CUSTOM_APPROVAL,WORKSPACE_ROUTE_DATA_CLASSIFICATION,WORKSPACE_ROUTE_GLOBAL_MASKING,+ WORKSPACE_ROUTE_IDENTITY_PROVIDERS,WORKSPACE_ROUTE_IM,WORKSPACE_ROUTE_LANDING,WORKSPACE_ROUTE_MEMBERS,@@ -33,7 +34,6 @@ import {WORKSPACE_ROUTE_SCHEMA_TEMPLATE,WORKSPACE_ROUTE_SEMANTIC_TYPES,WORKSPACE_ROUTE_SQL_REVIEW,- WORKSPACE_ROUTE_IDENTITY_PROVIDERS,WORKSPACE_ROUTE_USER_PROFILE,WORKSPACE_ROUTE_USERS,} from "@/router/dashboard/workspaceRoutes";diff --git a/frontend/src/utils/util.ts b/frontend/src/utils/util.tsindex 9d9d3a335b..0a298a2b5a 100644--- a/frontend/src/utils/util.ts+++ b/frontend/src/utils/util.ts@@ -7,7 +7,7 @@ import utc from "dayjs/plugin/utc";import DOMPurify from "dompurify";import { escape as escapeHtml, escapeRegExp, round } from "lodash-es";import semver from "semver";-import { watchEffect, type Ref } from "vue";+import { type Ref, watchEffect } from "vue";dayjs.extend(dayOfYear);dayjs.extend(duration);diff --git a/frontend/src/utils/v1/advanced-search/issue/utils.ts b/frontend/src/utils/v1/advanced-search/issue/utils.tsindex 7cd7e29ebc..29da0d7f09 100644--- a/frontend/src/utils/v1/advanced-search/issue/utils.ts+++ b/frontend/src/utils/v1/advanced-search/issue/utils.ts@@ -1,18 +1,18 @@-import { useDatabaseV1Store } from "@/store";import {environmentNamePrefix,instanceNamePrefix,- userNamePrefix,projectNamePrefix,+ useDatabaseV1Store,+ userNamePrefix,} from "@/store";import type { IssueFilter } from "@/types";import { unknownDatabase } from "@/types";import { IssueStatus } from "@/types/proto-es/v1/issue_service_pb";import type { SearchParams, SemanticIssueStatus } from "../common";import {- type SearchScopeId,getTsRangeFromSearchParams,getValueFromSearchParams,+ type SearchScopeId,} from "../common";const getValuesFromSearchParams = (diff --git a/frontend/src/utils/v1/cel.ts b/frontend/src/utils/v1/cel.tsindex 4fb906fc6f..e3b76f6add 100644--- a/frontend/src/utils/v1/cel.ts+++ b/frontend/src/utils/v1/cel.ts@@ -5,8 +5,8 @@ import { silentContextKey } from "@/grpcweb/context-key";import type { Expr } from "@/types/proto-es/google/api/expr/v1alpha1/syntax_pb";import { ExprSchema } from "@/types/proto-es/google/api/expr/v1alpha1/syntax_pb";import {- BatchParseRequestSchema,BatchDeparseRequestSchema,+ BatchParseRequestSchema,} from "@/types/proto-es/v1/cel_service_pb";export const batchConvertCELStringToParsedExpr = async (diff --git a/frontend/src/utils/v1/changelog.ts b/frontend/src/utils/v1/changelog.tsindex 24abf9fd5e..29698f9974 100644--- a/frontend/src/utils/v1/changelog.ts+++ b/frontend/src/utils/v1/changelog.ts@@ -1,16 +1,15 @@import { create } from "@bufbuild/protobuf";import { isEqual, isUndefined, orderBy, uniqBy } from "lodash-es";import { t } from "@/plugins/i18n";-import { useDBSchemaV1Store, useDatabaseV1Store } from "@/store";+import { useDatabaseV1Store, useDBSchemaV1Store } from "@/store";import type { ComposedDatabase } from "@/types";-import { UNKNOWN_ID } from "@/types";-import { type AffectedTable, EmptyAffectedTable } from "@/types";+import { type AffectedTable, EmptyAffectedTable, UNKNOWN_ID } from "@/types";+import type { Changelog } from "@/types/proto-es/v1/database_service_pb";import {Changelog_MigrationType,Changelog_Type,ChangelogSchema,} from "@/types/proto-es/v1/database_service_pb";-import type { Changelog } from "@/types/proto-es/v1/database_service_pb";import { databaseV1Url, extractDatabaseResourceName } from "./database";export const extractChangelogUID = (name: string) => {diff --git a/frontend/src/utils/v1/common.ts b/frontend/src/utils/v1/common.tsindex a8f2144d2d..520cade9cd 100644--- a/frontend/src/utils/v1/common.ts+++ b/frontend/src/utils/v1/common.ts@@ -1,4 +1,4 @@-import { snakeCase, isEqual } from "lodash-es";+import { isEqual, snakeCase } from "lodash-es";import { humanizeTs } from "../util";export const calcUpdateMask = (a: any, b: any, toSnakeCase = false) => {diff --git a/frontend/src/utils/v1/iam.ts b/frontend/src/utils/v1/iam.tsindex 6ea117d5c2..03db5e4b4a 100644--- a/frontend/src/utils/v1/iam.ts+++ b/frontend/src/utils/v1/iam.ts@@ -1,8 +1,8 @@import { uniq } from "lodash-es";import { extractUserId, useGroupStore, useWorkspaceV1Store } from "@/store";import { userNamePrefix } from "@/store/modules/v1/common";-import { groupBindingPrefix, ALL_USERS_USER_EMAIL } from "@/types";-import type { IamPolicy, Binding } from "@/types/proto-es/v1/iam_policy_pb";+import { ALL_USERS_USER_EMAIL, groupBindingPrefix } from "@/types";+import type { Binding, IamPolicy } from "@/types/proto-es/v1/iam_policy_pb";import { convertFromExpr } from "@/utils/issue/cel";export const isBindingPolicyExpired = (binding: Binding): boolean => {diff --git a/frontend/src/utils/v1/instance.ts b/frontend/src/utils/v1/instance.tsindex 73f8e2b923..989cc2f9f5 100644--- a/frontend/src/utils/v1/instance.ts+++ b/frontend/src/utils/v1/instance.ts@@ -1,5 +1,5 @@import { computed, unref } from "vue";-import { t, locale } from "@/plugins/i18n";+import { locale, t } from "@/plugins/i18n";import { useSubscriptionV1Store } from "@/store";import type { MaybeRef } from "@/types";import {@@ -7,16 +7,15 @@ import {languageOfEngineV1,unknownInstance,} from "@/types";-import { Engine } from "@/types/proto-es/v1/common_pb";-import { State } from "@/types/proto-es/v1/common_pb";+import { Engine, State } from "@/types/proto-es/v1/common_pb";// Using proto-es types directly, no conversions neededimport type {Instance,InstanceResource,} from "@/types/proto-es/v1/instance_service_pb";import {- DataSourceType,type DataSource,+ DataSourceType,} from "@/types/proto-es/v1/instance_service_pb";import { PlanType } from "@/types/proto-es/v1/subscription_service_pb";diff --git a/frontend/src/utils/v1/issue/issue.ts b/frontend/src/utils/v1/issue/issue.tsindex 4e02d39ad6..2d0e21501e 100644--- a/frontend/src/utils/v1/issue/issue.ts+++ b/frontend/src/utils/v1/issue/issue.ts@@ -5,7 +5,7 @@ import {PROJECT_V1_ROUTE_ISSUE_DETAIL,PROJECT_V1_ROUTE_ISSUE_DETAIL_V1,} from "@/router/dashboard/projectV1";-import { EMPTY_ID, UNKNOWN_ID, type ComposedIssue } from "@/types";+import { type ComposedIssue, EMPTY_ID, UNKNOWN_ID } from "@/types";import { Issue_Type } from "@/types/proto-es/v1/issue_service_pb";import type { Plan } from "@/types/proto-es/v1/plan_service_pb";import type { Rollout } from "@/types/proto-es/v1/rollout_service_pb";diff --git a/frontend/src/utils/v1/issue/rollout.ts b/frontend/src/utils/v1/issue/rollout.tsindex 9dd9078eb5..bba2b88b17 100644--- a/frontend/src/utils/v1/issue/rollout.ts+++ b/frontend/src/utils/v1/issue/rollout.ts@@ -4,25 +4,25 @@ import { extractCoreDatabaseInfoFromDatabaseCreateTask } from "@/components/Issuimport { mockDatabase } from "@/components/IssueV1/logic/utils";import { useDatabaseV1Store } from "@/store";import {+ EMPTY_ID,EMPTY_TASK_NAME,emptyStage,emptyTask,- unknownTask,- unknownStage,- EMPTY_ID,- UNKNOWN_ID,isValidDatabaseName,+ UNKNOWN_ID,unknownDatabase,+ unknownStage,+ unknownTask,} from "@/types";import type { Project } from "@/types/proto-es/v1/project_service_pb";import {- Task_Type,- TaskRun_Status,type Rollout,type Stage,type Task,+ Task_Status,+ Task_Type,+ TaskRun_Status,} from "@/types/proto-es/v1/rollout_service_pb";-import { Task_Status } from "@/types/proto-es/v1/rollout_service_pb";import { flattenTaskV1List } from "./issue";export const extractRolloutUID = (name: string) => {diff --git a/frontend/src/utils/v1/user.ts b/frontend/src/utils/v1/user.tsindex b16a23b40c..d00b52b1f2 100644--- a/frontend/src/utils/v1/user.ts+++ b/frontend/src/utils/v1/user.ts@@ -1,4 +1,4 @@-import { userNamePrefix, extractUserId } from "@/store/modules/v1/common";+import { extractUserId, userNamePrefix } from "@/store/modules/v1/common";import { ALL_USERS_USER_EMAIL } from "@/types";export const ensureUserFullName = (identifier: string) => {diff --git a/frontend/src/utils/web-storage.ts b/frontend/src/utils/web-storage.tsindex 41b8eddf8e..4e0b8c1bc0 100644--- a/frontend/src/utils/web-storage.ts+++ b/frontend/src/utils/web-storage.ts@@ -1,19 +1,19 @@import {- StorageSerializers,customStorageEventName,defaultWindow,getSSRHandler,- pausableWatch,- toValue,- tryOnMounted,- useEventListener,type MaybeRefOrGetter,+ pausableWatch,type RemovableRef,type StorageEventLike,type StorageLike,+ StorageSerializers,+ toValue,+ tryOnMounted,type UseStorageOptions,+ useEventListener,} from "@vueuse/core";-import { nextTick, ref, shallowRef, watch, type Ref } from "vue";+import { nextTick, type Ref, ref, shallowRef, watch } from "vue";export class WebStorageHelper {storage: Storage;diff --git a/frontend/src/utils/workspaceApprovalSetting.ts b/frontend/src/utils/workspaceApprovalSetting.tsindex 623355c0f9..bbc26854a9 100644--- a/frontend/src/utils/workspaceApprovalSetting.ts+++ b/frontend/src/utils/workspaceApprovalSetting.ts@@ -9,32 +9,40 @@ import {isConditionGroupExpr,resolveCELExpr,} from "@/plugins/cel";-import type { ParsedApprovalRule, UnrecognizedApprovalRule } from "@/types";-import { DEFAULT_RISK_LEVEL } from "@/types";-import type { LocalApprovalConfig, LocalApprovalRule } from "@/types";-import { PresetRiskLevelList, useSupportedSourceList } from "@/types";-import { getBuiltinFlow, isBuiltinFlowId } from "@/types";+import type {+ LocalApprovalConfig,+ LocalApprovalRule,+ ParsedApprovalRule,+ UnrecognizedApprovalRule,+} from "@/types";+import {+ DEFAULT_RISK_LEVEL,+ getBuiltinFlow,+ isBuiltinFlowId,+ PresetRiskLevelList,+ useSupportedSourceList,+} from "@/types";import type { Expr as CELExpr } from "@/types/proto-es/google/api/expr/v1alpha1/syntax_pb";import { ExprSchema as CELExprSchema } from "@/types/proto-es/google/api/expr/v1alpha1/syntax_pb";import type { Expr as _Expr } from "@/types/proto-es/google/type/expr_pb";import { ExprSchema } from "@/types/proto-es/google/type/expr_pb";import { RiskLevel } from "@/types/proto-es/v1/common_pb";import type {- ApprovalTemplate as _ProtoEsApprovalTemplate,ApprovalFlow as _ProtoEsApprovalFlow,+ ApprovalTemplate as _ProtoEsApprovalTemplate,} from "@/types/proto-es/v1/issue_service_pb";import {- ApprovalTemplateSchema as _ProtoEsApprovalTemplateSchema,ApprovalFlowSchema as _ProtoEsApprovalFlowSchema,+ ApprovalTemplateSchema as _ProtoEsApprovalTemplateSchema,} from "@/types/proto-es/v1/issue_service_pb";import { Risk_Source } from "@/types/proto-es/v1/risk_service_pb";import type {- WorkspaceApprovalSetting,WorkspaceApprovalSetting_Rule as ApprovalRule,+ WorkspaceApprovalSetting,} from "@/types/proto-es/v1/setting_service_pb";import {- WorkspaceApprovalSettingSchema,WorkspaceApprovalSetting_RuleSchema as ApprovalRuleSchema,+ WorkspaceApprovalSettingSchema,} from "@/types/proto-es/v1/setting_service_pb";import {batchConvertCELStringToParsedExpr,diff --git a/frontend/src/views/Archive.vue b/frontend/src/views/Archive.vueindex 80cc3ee8a8..d2cdae4d94 100644--- a/frontend/src/views/Archive.vue+++ b/frontend/src/views/Archive.vue@@ -41,12 +41,12 @@<script lang="ts" setup>import { computed, reactive, watch } from "vue";import { useI18n } from "vue-i18n";-import { useRouter, useRoute } from "vue-router";+import { useRoute, useRouter } from "vue-router";import {+ PagedInstanceTable,+ PagedProjectTable,SearchBox,TabFilter,- PagedProjectTable,- PagedInstanceTable,} from "@/components/v2";import { State } from "@/types/proto-es/v1/common_pb";import { hasWorkspacePermissionV2 } from "@/utils";diff --git a/frontend/src/views/BannerAnnouncement.vue b/frontend/src/views/BannerAnnouncement.vueindex 25402e5f02..9547f6088d 100644--- a/frontend/src/views/BannerAnnouncement.vue+++ b/frontend/src/views/BannerAnnouncement.vue@@ -19,7 +19,7 @@<script lang="ts" setup>import { computed } from "vue";-import { useSettingV1Store, hasFeature } from "@/store";+import { hasFeature, useSettingV1Store } from "@/store";import { Announcement_AlertLevel } from "@/types/proto-es/v1/setting_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import { urlfy } from "@/utils";diff --git a/frontend/src/views/BannerExternalUrl.vue b/frontend/src/views/BannerExternalUrl.vueindex 413efd1fd8..4f0c86895e 100644--- a/frontend/src/views/BannerExternalUrl.vue+++ b/frontend/src/views/BannerExternalUrl.vue@@ -37,7 +37,7 @@<script lang="ts" setup>import { NButton } from "naive-ui";-import { ref, computed } from "vue";+import { computed, ref } from "vue";import { SETTING_ROUTE_WORKSPACE_GENERAL } from "@/router/dashboard/workspaceSetting";import { hasWorkspacePermissionV2 } from "@/utils";diff --git a/frontend/src/views/DashboardHeader.vue b/frontend/src/views/DashboardHeader.vueindex 16dc55f1e2..54258f25eb 100644--- a/frontend/src/views/DashboardHeader.vue+++ b/frontend/src/views/DashboardHeader.vue@@ -62,8 +62,8 @@import { computedAsync, useLocalStorage, useWindowSize } from "@vueuse/core";import {CircleDotIcon,- SquareTerminalIcon,MessagesSquareIcon,+ SquareTerminalIcon,} from "lucide-vue-next";import { NButton } from "naive-ui";import { storeToRefs } from "pinia";@@ -73,8 +73,8 @@ import { useRoute, useRouter } from "vue-router";import ProjectSwitchPopover from "@/components/Project/ProjectSwitch/ProjectSwitchPopover.vue";import WeChatQRModal from "@/components/WeChatQRModal.vue";import {- WORKSPACE_ROUTE_MY_ISSUES,WORKSPACE_ROUTE_LANDING,+ WORKSPACE_ROUTE_MY_ISSUES,} from "@/router/dashboard/workspaceRoutes";import {SQL_EDITOR_DATABASE_MODULE,diff --git a/frontend/src/views/DashboardLanding.vue b/frontend/src/views/DashboardLanding.vueindex 14a048d843..a9245d6167 100644--- a/frontend/src/views/DashboardLanding.vue+++ b/frontend/src/views/DashboardLanding.vue@@ -129,7 +129,7 @@<script lang="tsx" setup>import { computedAsync } from "@vueuse/core";-import { Volume2Icon, SettingsIcon, GripVerticalIcon } from "lucide-vue-next";+import { GripVerticalIcon, SettingsIcon, Volume2Icon } from "lucide-vue-next";import { NButton, NCheckbox, NDivider } from "naive-ui";import { computed, reactive } from "vue";import { useRouter } from "vue-router";@@ -139,10 +139,10 @@ import { Drawer, DrawerContent } from "@/components/v2";import { WORKSPACE_ROUTE_MY_ISSUES } from "@/router/dashboard/workspaceRoutes";import { useRecentVisit } from "@/router/useRecentVisit";import {- useProjectV1Store,+ type QuickLink,useActuatorV1Store,+ useProjectV1Store,useQuickLink,- type QuickLink,} from "@/store";import { projectNamePrefix } from "@/store/modules/v1/common";import { UNKNOWN_PROJECT_NAME } from "@/types";diff --git a/frontend/src/views/DatabaseDashboard.vue b/frontend/src/views/DatabaseDashboard.vueindex 4297d34db8..c267b829b3 100644--- a/frontend/src/views/DatabaseDashboard.vue+++ b/frontend/src/views/DatabaseDashboard.vue@@ -59,14 +59,14 @@ import { useCommonSearchScopeOptions } from "@/components/AdvancedSearch/useCommimport { CreateDatabasePrepPanel } from "@/components/CreateDatabasePrepForm";import { Drawer } from "@/components/v2";import {- PagedDatabaseTable,DatabaseOperations,+ PagedDatabaseTable,} from "@/components/v2/Model/DatabaseV1Table";import { useDatabaseV1Store, useUIStateStore } from "@/store";import {+ environmentNamePrefix,instanceNamePrefix,projectNamePrefix,- environmentNamePrefix,} from "@/store/modules/v1/common";import type { ComposedDatabase } from "@/types";import { DEFAULT_PROJECT_NAME, isValidDatabaseName } from "@/types";diff --git a/frontend/src/views/DatabaseDetail/DatabaseDetail.vue b/frontend/src/views/DatabaseDetail/DatabaseDetail.vueindex 4f286bd8d4..980b578d77 100644--- a/frontend/src/views/DatabaseDetail/DatabaseDetail.vue+++ b/frontend/src/views/DatabaseDetail/DatabaseDetail.vue@@ -202,18 +202,17 @@ import { useTitle } from "@vueuse/core";import { ArrowRightLeftIcon } from "lucide-vue-next";import { NButton, NTabPane, NTabs } from "naive-ui";import { computed, reactive, watch, watchEffect } from "vue";-import { useRouter, useRoute } from "vue-router";-import { BBModal } from "@/bbkit";-import { BBAttention } from "@/bbkit";+import { useRoute, useRouter } from "vue-router";+import { BBAttention, BBModal } from "@/bbkit";+import { useDatabaseDetailContext } from "@/components/Database/context";import DatabaseChangelogPanel from "@/components/Database/DatabaseChangelogPanel.vue";import DatabaseOverviewPanel from "@/components/Database/DatabaseOverviewPanel.vue";import DatabaseRevisionPanel from "@/components/Database/DatabaseRevisionPanel.vue";import DatabaseSensitiveDataPanel from "@/components/Database/DatabaseSensitiveDataPanel.vue";-import { useDatabaseDetailContext } from "@/components/Database/context";import {DatabaseSettingsPanel,- SQLEditorButtonV1,SchemaDiagramButton,+ SQLEditorButtonV1,} from "@/components/DatabaseDetail";import DriftedDatabaseAlert from "@/components/DatabaseDetail/DriftedDatabaseAlert.vue";import ExportSchemaButton from "@/components/DatabaseDetail/ExportSchemaButton.vue";@@ -221,24 +220,24 @@ import SyncDatabaseButton from "@/components/DatabaseDetail/SyncDatabaseButton.vimport EllipsisText from "@/components/EllipsisText.vue";import { AddSpecDrawer } from "@/components/Plan";import TransferOutDatabaseForm from "@/components/TransferOutDatabaseForm";-import { Drawer } from "@/components/v2";import {+ CopyButton,+ Drawer,EnvironmentV1Name,InstanceV1Name,ProductionEnvironmentV1Icon,} from "@/components/v2";-import { CopyButton } from "@/components/v2";import { PROJECT_V1_ROUTE_DATABASE_DETAIL } from "@/router/dashboard/projectV1";-import { useEnvironmentV1Store, useDatabaseV1ByName } from "@/store";+import { useDatabaseV1ByName, useEnvironmentV1Store } from "@/store";import {databaseNamePrefix,instanceNamePrefix,} from "@/store/modules/v1/common";import { UNKNOWN_PROJECT_NAME } from "@/types";import {+ extractProjectResourceName,instanceV1HasAlterSchema,isDatabaseV1Queryable,- extractProjectResourceName,} from "@/utils";const databaseHashList = [diff --git a/frontend/src/views/EnvironmentDashboard.vue b/frontend/src/views/EnvironmentDashboard.vueindex ef4f103690..08c0276fde 100644--- a/frontend/src/views/EnvironmentDashboard.vue+++ b/frontend/src/views/EnvironmentDashboard.vue@@ -111,9 +111,9 @@<script lang="ts" setup>import { create } from "@bufbuild/protobuf";import { isEqual } from "lodash-es";-import { PlusIcon, ListOrderedIcon, GripVerticalIcon } from "lucide-vue-next";-import { NTabs, NTabPane, NButton } from "naive-ui";-import { onMounted, computed, reactive, watch, h, ref } from "vue";+import { GripVerticalIcon, ListOrderedIcon, PlusIcon } from "lucide-vue-next";+import { NButton, NTabPane, NTabs } from "naive-ui";+import { computed, h, onMounted, reactive, ref, watch } from "vue";import { useI18n } from "vue-i18n";import { useRouter } from "vue-router";import Draggable from "vuedraggable";@@ -123,27 +123,25 @@ import {Form as EnvironmentFormBody,Buttons as EnvironmentFormButtons,} from "@/components/EnvironmentForm";-import { Drawer, DrawerContent } from "@/components/v2";-import { EnvironmentV1Name } from "@/components/v2";+import { Drawer, DrawerContent, EnvironmentV1Name } from "@/components/v2";import { useRouteChangeGuard } from "@/composables/useRouteChangeGuard";import {- useUIStateStore,- useEnvironmentV1Store,- useEnvironmentV1List,environmentNamePrefix,pushNotification,+ useEnvironmentV1List,+ useEnvironmentV1Store,+ useUIStateStore,} from "@/store";import {- usePolicyV1Store,getEmptyRolloutPolicy,+ usePolicyV1Store,} from "@/store/modules/v1/policy";import { formatEnvironmentName } from "@/types";import type { Policy } from "@/types/proto-es/v1/org_policy_service_pb";import { PolicyResourceType } from "@/types/proto-es/v1/org_policy_service_pb";import { EnvironmentSetting_EnvironmentSchema } from "@/types/proto-es/v1/setting_service_pb";import type { Environment } from "@/types/v1/environment";-import { hasWorkspacePermissionV2 } from "@/utils";-import { type VueClass } from "@/utils";+import { hasWorkspacePermissionV2, type VueClass } from "@/utils";import EnvironmentDetail from "@/views/EnvironmentDetail.vue";const DEFAULT_NEW_ROLLOUT_POLICY: Policy = getEmptyRolloutPolicy(diff --git a/frontend/src/views/EnvironmentDetail.vue b/frontend/src/views/EnvironmentDetail.vueindex 90d7ed5dba..d60311fdd3 100644--- a/frontend/src/views/EnvironmentDetail.vue+++ b/frontend/src/views/EnvironmentDetail.vue@@ -18,7 +18,7 @@<script lang="ts" setup>import { cloneDeep, isEqual } from "lodash-es";-import { computed, reactive, watch, watchEffect, ref } from "vue";+import { computed, reactive, ref, watch, watchEffect } from "vue";import {EnvironmentForm,Form as EnvironmentFormBody,diff --git a/frontend/src/views/ExportCenter/index.vue b/frontend/src/views/ExportCenter/index.vueindex e834115706..b3516b727a 100644--- a/frontend/src/views/ExportCenter/index.vue+++ b/frontend/src/views/ExportCenter/index.vue@@ -70,8 +70,8 @@ import IssueTableV1 from "@/components/IssueV1/components/IssueTableV1.vue";import { Drawer } from "@/components/v2";import PagedTable from "@/components/v2/Model/PagedTable.vue";import {- useProjectByName,useIssueV1Store,+ useProjectByName,useRefreshIssueList,} from "@/store";import { projectNamePrefix } from "@/store/modules/v1/common";diff --git a/frontend/src/views/InstanceDashboard.vue b/frontend/src/views/InstanceDashboard.vueindex f4a3b0a087..dda3b2d91b 100644--- a/frontend/src/views/InstanceDashboard.vue+++ b/frontend/src/views/InstanceDashboard.vue@@ -98,7 +98,7 @@ import { environmentNamePrefix } from "@/store/modules/v1/common";import { isValidInstanceName } from "@/types";import { Engine } from "@/types/proto-es/v1/common_pb";import type { Instance } from "@/types/proto-es/v1/instance_service_pb";-import { type SearchParams, hasWorkspacePermissionV2 } from "@/utils";+import { hasWorkspacePermissionV2, type SearchParams } from "@/utils";interface LocalState {params: SearchParams;diff --git a/frontend/src/views/InstanceDetail.vue b/frontend/src/views/InstanceDetail.vueindex 163ab3c8b1..f53691c49d 100644--- a/frontend/src/views/InstanceDetail.vue+++ b/frontend/src/views/InstanceDetail.vue@@ -95,9 +95,9 @@ import { useTitle } from "@vueuse/core";import { cloneDeep } from "lodash-es";import { PlusIcon } from "lucide-vue-next";import { NButton, NTabPane, NTabs } from "naive-ui";-import { computed, reactive, watch, ref } from "vue";+import { computed, reactive, ref, watch } from "vue";import { useI18n } from "vue-i18n";-import { useRouter, useRoute } from "vue-router";+import { useRoute, useRouter } from "vue-router";import { BBAttention } from "@/bbkit";import AdvancedSearch from "@/components/AdvancedSearch";import { useCommonSearchScopeOptions } from "@/components/AdvancedSearch/useCommonSearchScopeOptions";@@ -110,23 +110,23 @@ import {Form as InstanceFormBody,Buttons as InstanceFormButtons,} from "@/components/InstanceForm/";-import { InstanceRoleTable, Drawer } from "@/components/v2";+import { Drawer, InstanceRoleTable } from "@/components/v2";import {- PagedDatabaseTable,DatabaseOperations,+ PagedDatabaseTable,} from "@/components/v2/Model/DatabaseV1Table";import { useRouteChangeGuard } from "@/composables/useRouteChangeGuard";import { useBodyLayoutContext } from "@/layouts/common";import {pushNotification,useDatabaseV1Store,- useInstanceV1Store,useEnvironmentV1Store,+ useInstanceV1Store,} from "@/store";import {+ environmentNamePrefix,instanceNamePrefix,projectNamePrefix,- environmentNamePrefix,} from "@/store/modules/v1/common";import {type ComposedDatabase,@@ -134,12 +134,12 @@ import {isValidDatabaseName,} from "@/types";import { State } from "@/types/proto-es/v1/common_pb";+import type { SearchParams, SearchScope } from "@/utils";import {+ CommonFilterScopeIdList,instanceV1HasCreateDatabase,instanceV1Name,- CommonFilterScopeIdList,} from "@/utils";-import type { SearchParams, SearchScope } from "@/utils";const instanceHashList = ["overview", "databases", "users"] as const;export type InstanceHash = (typeof instanceHashList)[number];diff --git a/frontend/src/views/MyIssues.vue b/frontend/src/views/MyIssues.vueindex 072fc57a9d..24795aec5f 100644--- a/frontend/src/views/MyIssues.vue+++ b/frontend/src/views/MyIssues.vue@@ -27,8 +27,8 @@</template><script lang="ts" setup>-import { useLocalStorage, type UseStorageOptions } from "@vueuse/core";-import { reactive, computed, watch, ref, onMounted } from "vue";+import { type UseStorageOptions, useLocalStorage } from "@vueuse/core";+import { computed, onMounted, reactive, ref, watch } from "vue";import type { ComponentExposed } from "vue-component-type-helpers";import { useRoute, useRouter } from "vue-router";import { IssueSearch } from "@/components/IssueV1/components";@@ -43,13 +43,13 @@ import {import { type ComposedIssue } from "@/types";import type { SearchParams, SemanticIssueStatus } from "@/utils";import {+ applyUIIssueFilter,buildIssueFilterBySearchParams,+ buildSearchParamsBySearchText,+ buildSearchTextBySearchParams,buildUIIssueFilterBySearchParams,getSemanticIssueStatusFromSearchParams,useDynamicLocalStorage,- applyUIIssueFilter,- buildSearchTextBySearchParams,- buildSearchParamsBySearchText,} from "@/utils";import { getComponentIdLocalStorageKey } from "@/utils/localStorage";diff --git a/frontend/src/views/OAuthCallback.vue b/frontend/src/views/OAuthCallback.vueindex 2cee3da686..ffe2f2bd81 100644--- a/frontend/src/views/OAuthCallback.vue+++ b/frontend/src/views/OAuthCallback.vue@@ -21,7 +21,7 @@ import { AUTH_SIGNIN_MODULE } from "@/router/auth";import { useAuthStore } from "@/store";import { LoginRequestSchema } from "@/types/proto-es/v1/auth_service_pb";import { IdentityProviderType } from "@/types/proto-es/v1/idp_service_pb";-import { retrieveOAuthState, clearOAuthState } from "@/utils/sso";+import { clearOAuthState, retrieveOAuthState } from "@/utils/sso";import type { OAuthState, OAuthWindowEventPayload } from "../types";interface LocalState {diff --git a/frontend/src/views/ProfileDashboard.vue b/frontend/src/views/ProfileDashboard.vueindex 0b3a564a09..110fa29ba7 100644--- a/frontend/src/views/ProfileDashboard.vue+++ b/frontend/src/views/ProfileDashboard.vue@@ -233,12 +233,12 @@ import EmailInput from "@/components/EmailInput.vue";import { FeatureModal } from "@/components/FeatureGuard";import FeatureBadge from "@/components/FeatureGuard/FeatureBadge.vue";import LearnMoreLink from "@/components/LearnMoreLink.vue";+import NoPermissionPlaceholder from "@/components/misc/NoPermissionPlaceholder.vue";+import ServiceAccountTag from "@/components/misc/ServiceAccountTag.vue";import RegenerateRecoveryCodesView from "@/components/RegenerateRecoveryCodesView.vue";import { ActionConfirmModal } from "@/components/SchemaEditorLite";import UserPassword from "@/components/User/Settings/UserPassword.vue";import UserAvatar from "@/components/User/UserAvatar.vue";-import NoPermissionPlaceholder from "@/components/misc/NoPermissionPlaceholder.vue";-import ServiceAccountTag from "@/components/misc/ServiceAccountTag.vue";import { useRouteChangeGuard } from "@/composables/useRouteChangeGuard";import { WORKSPACE_ROUTE_USER_PROFILE } from "@/router/dashboard/workspaceRoutes";import {diff --git a/frontend/src/views/ProjectDashboard.vue b/frontend/src/views/ProjectDashboard.vueindex 5eebb740d4..f2d45a5932 100644--- a/frontend/src/views/ProjectDashboard.vue+++ b/frontend/src/views/ProjectDashboard.vue@@ -57,11 +57,11 @@ import { NButton } from "naive-ui";import { computed, onMounted, reactive, ref } from "vue";import type { ComponentExposed } from "vue-component-type-helpers";import { useRouter } from "vue-router";-import AdvancedSearch from "@/components/AdvancedSearch";-import { useCommonSearchScopeOptions } from "@/components/AdvancedSearch";+import AdvancedSearch, {+ useCommonSearchScopeOptions,+} from "@/components/AdvancedSearch";import ProjectCreatePanel from "@/components/Project/ProjectCreatePanel.vue";-import { PagedProjectTable } from "@/components/v2";-import { Drawer } from "@/components/v2";+import { Drawer, PagedProjectTable } from "@/components/v2";import ProjectOperations from "@/components/v2/Model/Project/ProjectOperations.vue";import { useProjectV1Store, useUIStateStore } from "@/store";import type { Project } from "@/types/proto-es/v1/project_service_pb";diff --git a/frontend/src/views/SchemaTemplate/ColumnTypes.vue b/frontend/src/views/SchemaTemplate/ColumnTypes.vueindex 085b268f61..4dc52638f5 100644--- a/frontend/src/views/SchemaTemplate/ColumnTypes.vue+++ b/frontend/src/views/SchemaTemplate/ColumnTypes.vue@@ -118,14 +118,14 @@<script lang="ts" setup>import { create } from "@bufbuild/protobuf";import { cloneDeep, isEqual, uniq, uniqBy } from "lodash-es";-import { NButton, NDivider, NInput, NRadioGroup, NRadio } from "naive-ui";+import { NButton, NDivider, NInput, NRadio, NRadioGroup } from "naive-ui";import { computed, onMounted, ref } from "vue";import EngineIcon from "@/components/Icon/EngineIcon.vue";import { pushNotification, useSettingV1Store } from "@/store";import { Engine } from "@/types/proto-es/v1/common_pb";import type {- SchemaTemplateSetting_FieldTemplate,SchemaTemplateSetting_ColumnType,+ SchemaTemplateSetting_FieldTemplate,} from "@/types/proto-es/v1/setting_service_pb";import {SchemaTemplateSetting_ColumnTypeSchema,diff --git a/frontend/src/views/SchemaTemplate/FieldTemplates.vue b/frontend/src/views/SchemaTemplate/FieldTemplates.vueindex 11ab8048a9..d2402e43f0 100644--- a/frontend/src/views/SchemaTemplate/FieldTemplates.vue+++ b/frontend/src/views/SchemaTemplate/FieldTemplates.vue@@ -70,7 +70,7 @@ import { create } from "@bufbuild/protobuf";import { PlusIcon } from "lucide-vue-next";import { NButton, NCheckbox } from "naive-ui";import { v1 as uuidv1 } from "uuid";-import { reactive, computed, onMounted } from "vue";+import { computed, onMounted, reactive } from "vue";import { EngineIcon } from "@/components/Icon";import FieldTemplateForm from "@/components/SchemaTemplate/FieldTemplateForm.vue";import FieldTemplateView from "@/components/SchemaTemplate/FieldTemplateView.vue";@@ -82,8 +82,8 @@ import { ColumnCatalogSchema } from "@/types/proto-es/v1/database_catalog_servicimport { ColumnMetadataSchema } from "@/types/proto-es/v1/database_service_pb";import type { SchemaTemplateSetting_FieldTemplate } from "@/types/proto-es/v1/setting_service_pb";import {- Setting_SettingName,SchemaTemplateSetting_FieldTemplateSchema,+ Setting_SettingName,} from "@/types/proto-es/v1/setting_service_pb";interface LocalState {diff --git a/frontend/src/views/SchemaTemplate/TableTemplates.vue b/frontend/src/views/SchemaTemplate/TableTemplates.vueindex f472d88cc0..b478337838 100644--- a/frontend/src/views/SchemaTemplate/TableTemplates.vue+++ b/frontend/src/views/SchemaTemplate/TableTemplates.vue@@ -70,7 +70,7 @@ import { create as createProto } from "@bufbuild/protobuf";import { PlusIcon } from "lucide-vue-next";import { NButton, NCheckbox } from "naive-ui";import { v1 as uuidv1 } from "uuid";-import { reactive, computed, onMounted } from "vue";+import { computed, onMounted, reactive } from "vue";import { EngineIcon } from "@/components/Icon";import TableTemplateForm from "@/components/SchemaTemplate/TableTemplateForm.vue";import TableTemplateView from "@/components/SchemaTemplate/TableTemplateView.vue";@@ -80,8 +80,8 @@ import { useSettingV1Store } from "@/store";import { Engine } from "@/types/proto-es/v1/common_pb";import type { SchemaTemplateSetting_TableTemplate } from "@/types/proto-es/v1/setting_service_pb";import {- Setting_SettingName,SchemaTemplateSetting_TableTemplateSchema,+ Setting_SettingName,} from "@/types/proto-es/v1/setting_service_pb";interface LocalState {diff --git a/frontend/src/views/SettingWorkspaceAuditLog.vue b/frontend/src/views/SettingWorkspaceAuditLog.vueindex 18dd171807..9f01208aef 100644--- a/frontend/src/views/SettingWorkspaceAuditLog.vue+++ b/frontend/src/views/SettingWorkspaceAuditLog.vue@@ -39,23 +39,23 @@<script lang="ts" setup>import dayjs from "dayjs";import { NEmpty } from "naive-ui";-import { reactive, computed, watch, ref } from "vue";+import { computed, reactive, ref, watch } from "vue";import type { ComponentExposed } from "vue-component-type-helpers";import { useI18n } from "vue-i18n";import AuditLogDataTable from "@/components/AuditLog/AuditLogDataTable.vue";import AuditLogSearch from "@/components/AuditLog/AuditLogSearch";import { buildSearchAuditLogParams } from "@/components/AuditLog/AuditLogSearch/utils";import type {- ExportOption,DownloadContent,+ ExportOption,} from "@/components/DataExportButton.vue";import DataExportButton from "@/components/DataExportButton.vue";import { FeatureAttention } from "@/components/FeatureGuard";import PagedTable from "@/components/v2/Model/PagedTable.vue";import {+ batchGetOrFetchProjects,featureToRef,useAuditLogStore,- batchGetOrFetchProjects,useUserStore,} from "@/store";import { projectNamePrefix } from "@/store/modules/v1/common";@@ -63,7 +63,7 @@ import { type SearchAuditLogsParams } from "@/types";import type { AuditLog } from "@/types/proto-es/v1/audit_log_service_pb";import { ExportFormat } from "@/types/proto-es/v1/common_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";-import { type SearchParams, extractProjectResourceName } from "@/utils";+import { extractProjectResourceName, type SearchParams } from "@/utils";interface LocalState {params: SearchParams;diff --git a/frontend/src/views/SettingWorkspaceCustomApproval.vue b/frontend/src/views/SettingWorkspaceCustomApproval.vueindex 119b62c30f..7da7de6280 100644--- a/frontend/src/views/SettingWorkspaceCustomApproval.vue+++ b/frontend/src/views/SettingWorkspaceCustomApproval.vue@@ -21,8 +21,8 @@import { onMounted, reactive, ref, toRef } from "vue";import { BBSpin } from "@/bbkit";import {- CustomApproval,ApprovalRuleDialog,+ CustomApproval,provideCustomApprovalContext,TabValueList,} from "@/components/CustomApproval/Settings/components/CustomApproval/";@@ -30,8 +30,8 @@ import { FeatureAttention, FeatureModal } from "@/components/FeatureGuard";import { useRouteHash } from "@/composables/useRouteHash";import {featureToRef,- useWorkspaceApprovalSettingStore,useRiskStore,+ useWorkspaceApprovalSettingStore,} from "@/store";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";diff --git a/frontend/src/views/SettingWorkspaceGeneral.vue b/frontend/src/views/SettingWorkspaceGeneral.vueindex 519c48e555..238aa5ccbb 100644--- a/frontend/src/views/SettingWorkspaceGeneral.vue+++ b/frontend/src/views/SettingWorkspaceGeneral.vue@@ -56,18 +56,18 @@<script lang="ts" setup>import { NButton } from "naive-ui";-import { onMounted, ref, computed } from "vue";+import { computed, onMounted, ref } from "vue";import { useI18n } from "vue-i18n";import { useRoute } from "vue-router";import {- BrandingSetting,- SecuritySetting,AccountSetting,AIAugmentationSetting,AnnouncementSetting,AuditLogStdoutSetting,+ BrandingSetting,GeneralSetting,ProductImprovementSetting,+ SecuritySetting,} from "@/components/GeneralSetting";import { useRouteChangeGuard } from "@/composables/useRouteChangeGuard";import { pushNotification } from "@/store";diff --git a/frontend/src/views/SettingWorkspaceIM.vue b/frontend/src/views/SettingWorkspaceIM.vueindex 7f0ed4c6b8..7ba240b813 100644--- a/frontend/src/views/SettingWorkspaceIM.vue+++ b/frontend/src/views/SettingWorkspaceIM.vue@@ -222,29 +222,29 @@ import { create } from "@bufbuild/protobuf";import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";import { cloneDeep, isEqual } from "lodash-es";import { Trash2Icon } from "lucide-vue-next";-import { NButton, NEmpty, NSelect, NPopconfirm } from "naive-ui";-import { computed, watch, reactive } from "vue";+import { NButton, NEmpty, NPopconfirm, NSelect } from "naive-ui";+import { computed, reactive, watch } from "vue";import { useI18n } from "vue-i18n";import BBTextField from "@/bbkit/BBTextField.vue";import LearnMoreLink from "@/components/LearnMoreLink.vue";import WebhookTypeIcon from "@/components/Project/WebhookTypeIcon.vue";-import { useSettingV1Store, pushNotification } from "@/store";+import { pushNotification, useSettingV1Store } from "@/store";import { Webhook_Type } from "@/types/proto-es/v1/project_service_pb";import {type AppIMSetting,- type AppIMSetting_Slack,- type AppIMSetting_Feishu,- type AppIMSetting_Wecom,- type AppIMSetting_Lark,type AppIMSetting_DingTalk,+ AppIMSetting_DingTalkSchema,+ type AppIMSetting_Feishu,+ AppIMSetting_FeishuSchema,type AppIMSetting_IMSetting,AppIMSetting_IMSettingSchema,- AppIMSettingSchema,- AppIMSetting_FeishuSchema,- AppIMSetting_SlackSchema,+ type AppIMSetting_Lark,AppIMSetting_LarkSchema,+ type AppIMSetting_Slack,+ AppIMSetting_SlackSchema,+ type AppIMSetting_Wecom,AppIMSetting_WecomSchema,- AppIMSetting_DingTalkSchema,+ AppIMSettingSchema,Setting_SettingName,ValueSchema as SettingValueSchema,} from "@/types/proto-es/v1/setting_service_pb";diff --git a/frontend/src/views/SettingWorkspaceRiskCenter.vue b/frontend/src/views/SettingWorkspaceRiskCenter.vueindex a090d2fbc6..8bcd8c44fa 100644--- a/frontend/src/views/SettingWorkspaceRiskCenter.vue+++ b/frontend/src/views/SettingWorkspaceRiskCenter.vue@@ -29,12 +29,12 @@<script lang="ts" setup>import { computed, onMounted, reactive, ref, toRef } from "vue";import { BBSpin } from "@/bbkit";+import { provideRiskFilter } from "@/components/CustomApproval/Settings/components/common";import {+ provideRiskCenterContext,RiskCenter,RiskDialog,- provideRiskCenterContext,} from "@/components/CustomApproval/Settings/components/RiskCenter";-import { provideRiskFilter } from "@/components/CustomApproval/Settings/components/common";import { FeatureAttention, FeatureModal } from "@/components/FeatureGuard";import LearnMoreLink from "@/components/LearnMoreLink.vue";import { featureToRef, useRiskStore } from "@/store";diff --git a/frontend/src/views/SettingWorkspaceSQLReview.vue b/frontend/src/views/SettingWorkspaceSQLReview.vueindex 15e563ea72..2d0be332d7 100644--- a/frontend/src/views/SettingWorkspaceSQLReview.vue+++ b/frontend/src/views/SettingWorkspaceSQLReview.vue@@ -48,9 +48,8 @@<script lang="ts" setup>import { PlusIcon } from "lucide-vue-next";-import { NButton } from "naive-ui";-import { NEmpty } from "naive-ui";-import { watchEffect, ref, computed } from "vue";+import { NButton, NEmpty } from "naive-ui";+import { computed, ref, watchEffect } from "vue";import { useRouter } from "vue-router";import LearnMoreLink from "@/components/LearnMoreLink.vue";import SQLReviewPolicyTable from "@/components/SQLReview/components/SQLReviewPolicyTable.vue";diff --git a/frontend/src/views/SettingWorkspaceSQLReviewDetail.vue b/frontend/src/views/SettingWorkspaceSQLReviewDetail.vueindex 92b7c5ba96..2bcc7f8b46 100644--- a/frontend/src/views/SettingWorkspaceSQLReviewDetail.vue+++ b/frontend/src/views/SettingWorkspaceSQLReviewDetail.vue@@ -175,8 +175,8 @@ import type { RuleTemplateV2 } from "@/types";import {convertRuleMapToPolicyRuleList,getRuleMapByEngine,- unknown,UNKNOWN_ID,+ unknown,} from "@/types";import type { Engine } from "@/types/proto-es/v1/common_pb";import { hasWorkspacePermissionV2, sqlReviewNameFromSlug } from "@/utils";diff --git a/frontend/src/views/SettingWorkspaceSSO.vue b/frontend/src/views/SettingWorkspaceSSO.vueindex a34b9077af..fdf9b4fb35 100644--- a/frontend/src/views/SettingWorkspaceSSO.vue+++ b/frontend/src/views/SettingWorkspaceSSO.vue@@ -49,8 +49,8 @@ import { computed, onMounted, reactive } from "vue";import { useRouter } from "vue-router";import { FeatureBadge, FeatureModal } from "@/components/FeatureGuard";import {- IdentityProviderTable,IdentityProviderCreateWizard,+ IdentityProviderTable,} from "@/components/IdentityProvider";import LearnMoreLink from "@/components/LearnMoreLink.vue";import { WORKSPACE_ROUTE_IDENTITY_PROVIDER_DETAIL } from "@/router/dashboard/workspaceRoutes";diff --git a/frontend/src/views/SettingWorkspaceSchemaTemplate.vue b/frontend/src/views/SettingWorkspaceSchemaTemplate.vueindex ef917352b8..cc65e59160 100644--- a/frontend/src/views/SettingWorkspaceSchemaTemplate.vue+++ b/frontend/src/views/SettingWorkspaceSchemaTemplate.vue@@ -31,7 +31,7 @@</template><script lang="ts" setup>-import { NTabs, NTabPane } from "naive-ui";+import { NTabPane, NTabs } from "naive-ui";import { reactive, watch } from "vue";import { useRoute, useRouter } from "vue-router";import { FeatureAttention } from "@/components/FeatureGuard";diff --git a/frontend/src/views/SettingWorkspaceSubscription.vue b/frontend/src/views/SettingWorkspaceSubscription.vueindex 16d707e32d..19ed18eeaa 100644--- a/frontend/src/views/SettingWorkspaceSubscription.vue+++ b/frontend/src/views/SettingWorkspaceSubscription.vue@@ -155,8 +155,8 @@ import { computed, reactive, ref } from "vue";import { useI18n } from "vue-i18n";import LearnMoreLink from "@/components/LearnMoreLink.vue";import RequireEnterpriseButton from "@/components/RequireEnterpriseButton.vue";-import WorkspaceInstanceLicenseStats from "@/components/WorkspaceInstanceLicenseStats.vue";import { CopyButton } from "@/components/v2";+import WorkspaceInstanceLicenseStats from "@/components/WorkspaceInstanceLicenseStats.vue";import {pushNotification,useActuatorV1Store,diff --git a/frontend/src/views/Setup/AdminSetup.vue b/frontend/src/views/Setup/AdminSetup.vueindex 9967701f26..8b90a24a86 100644--- a/frontend/src/views/Setup/AdminSetup.vue+++ b/frontend/src/views/Setup/AdminSetup.vue@@ -98,16 +98,16 @@import { create } from "@bufbuild/protobuf";import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";import { NRadio, NRadioGroup, NSpace } from "naive-ui";-import { ref, computed, reactive, onMounted } from "vue";+import { computed, onMounted, reactive, ref } from "vue";import { useI18n } from "vue-i18n";-import { useRouter, type RouteLocationRaw } from "vue-router";+import { type RouteLocationRaw, useRouter } from "vue-router";import { BBTextField } from "@/bbkit";import { StepTab } from "@/components/v2";import ResourceIdField from "@/components/v2/Form/ResourceIdField.vue";import { SQL_EDITOR_HOME_MODULE } from "@/router/sqlEditor";import {- useProjectV1Store,useActuatorV1Store,+ useProjectV1Store,useSettingV1Store,} from "@/store";import { projectNamePrefix } from "@/store/modules/v1/common";diff --git a/frontend/src/views/Setup/Setup.vue b/frontend/src/views/Setup/Setup.vueindex f248fa4ac9..4f8ad36c0a 100644--- a/frontend/src/views/Setup/Setup.vue+++ b/frontend/src/views/Setup/Setup.vue@@ -5,10 +5,10 @@</template><script lang="ts" setup>-import { ref, onMounted, watch } from "vue";+import { onMounted, ref, watch } from "vue";import {- useRouter,type RouteLocationNormalizedLoadedGeneric,+ useRouter,} from "vue-router";import MaskSpinner from "@/components/misc/MaskSpinner.vue";import { useRoleStore, useWorkspaceV1Store } from "@/store";diff --git a/frontend/src/views/auth/PasswordReset.vue b/frontend/src/views/auth/PasswordReset.vueindex b1d541e57b..1b1616c739 100644--- a/frontend/src/views/auth/PasswordReset.vue+++ b/frontend/src/views/auth/PasswordReset.vue@@ -37,16 +37,16 @@import { create as createProto } from "@bufbuild/protobuf";import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";import { NButton } from "naive-ui";-import { computed, reactive, ref, onMounted } from "vue";+import { computed, onMounted, reactive, ref } from "vue";import { useI18n } from "vue-i18n";import { useRouter } from "vue-router";import UserPassword from "@/components/User/Settings/UserPassword.vue";import {pushNotification,- useSettingV1Store,- useUserStore,useAuthStore,useCurrentUserV1,+ useSettingV1Store,+ useUserStore,} from "@/store";import { Setting_SettingName } from "@/types/proto-es/v1/setting_service_pb";import type { User } from "@/types/proto-es/v1/user_service_pb";diff --git a/frontend/src/views/project/CICDLayout.vue b/frontend/src/views/project/CICDLayout.vueindex fb726d093a..50c3417163 100644--- a/frontend/src/views/project/CICDLayout.vue+++ b/frontend/src/views/project/CICDLayout.vue@@ -52,22 +52,22 @@ import { NSpin, NTab, NTabs } from "naive-ui";import { computed, ref, toRef } from "vue";import { useI18n } from "vue-i18n";import {- useRoute,- useRouter,onBeforeRouteLeave,onBeforeRouteUpdate,+ useRoute,+ useRouter,} from "vue-router";import {providePlanContext,useBasePlanContext,useInitializePlan,} from "@/components/Plan";-import PollerProvider from "@/components/Plan/PollerProvider.vue";import { BannerSection, HeaderSection } from "@/components/Plan/components";import RefreshIndicator from "@/components/Plan/components/RefreshIndicator.vue";import { provideSidebarContext } from "@/components/Plan/logic/sidebar";import { useCICDTabNavigation } from "@/components/Plan/logic/useCICDTabNavigation.tsx";import { useNavigationGuard } from "@/components/Plan/logic/useNavigationGuard";+import PollerProvider from "@/components/Plan/PollerProvider.vue";import { useIssueLayoutVersion } from "@/composables/useIssueLayoutVersion";import { useBodyLayoutContext } from "@/layouts/common";diff --git a/frontend/src/views/project/ProjectAuditLogDashboard.vue b/frontend/src/views/project/ProjectAuditLogDashboard.vueindex 04da24d0ce..d18c242b6c 100644--- a/frontend/src/views/project/ProjectAuditLogDashboard.vue+++ b/frontend/src/views/project/ProjectAuditLogDashboard.vue@@ -48,8 +48,8 @@ import AuditLogDataTable from "@/components/AuditLog/AuditLogDataTable.vue";import AuditLogSearch from "@/components/AuditLog/AuditLogSearch";import { buildSearchAuditLogParams } from "@/components/AuditLog/AuditLogSearch/utils";import type {- ExportOption,DownloadContent,+ ExportOption,} from "@/components/DataExportButton.vue";import DataExportButton from "@/components/DataExportButton.vue";import { FeatureAttention } from "@/components/FeatureGuard";diff --git a/frontend/src/views/project/ProjectDatabaseGroupDashboard.vue b/frontend/src/views/project/ProjectDatabaseGroupDashboard.vueindex fa34ebe5dc..37244312c8 100644--- a/frontend/src/views/project/ProjectDatabaseGroupDashboard.vue+++ b/frontend/src/views/project/ProjectDatabaseGroupDashboard.vue@@ -51,12 +51,12 @@ import { useRouter } from "vue-router";import ProjectDatabaseGroupPanel from "@/components/DatabaseGroup/ProjectDatabaseGroupPanel.vue";import {FeatureAttention,- FeatureModal,FeatureBadge,+ FeatureModal,} from "@/components/FeatureGuard";import { SearchBox } from "@/components/v2";import { PROJECT_V1_ROUTE_DATABASE_GROUPS_CREATE } from "@/router/dashboard/projectV1";-import { useProjectByName, hasFeature } from "@/store";+import { hasFeature, useProjectByName } from "@/store";import { projectNamePrefix } from "@/store/modules/v1/common";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import { hasProjectPermissionV2 } from "@/utils";diff --git a/frontend/src/views/project/ProjectDatabaseGroupDetail.vue b/frontend/src/views/project/ProjectDatabaseGroupDetail.vueindex 6af21d191b..19de14a69a 100644--- a/frontend/src/views/project/ProjectDatabaseGroupDetail.vue+++ b/frontend/src/views/project/ProjectDatabaseGroupDetail.vue@@ -59,7 +59,7 @@ import { computed, reactive, watchEffect } from "vue";import DatabaseGroupForm from "@/components/DatabaseGroup/DatabaseGroupForm.vue";import FeatureAttention from "@/components/FeatureGuard/FeatureAttention.vue";import { AddSpecDrawer } from "@/components/Plan";-import { useDBGroupStore, useProjectByName, featureToRef } from "@/store";+import { featureToRef, useDBGroupStore, useProjectByName } from "@/store";import {databaseGroupNamePrefix,projectNamePrefix,diff --git a/frontend/src/views/project/ProjectDatabaseLayout.vue b/frontend/src/views/project/ProjectDatabaseLayout.vueindex 80dcd0830c..4755131600 100644--- a/frontend/src/views/project/ProjectDatabaseLayout.vue+++ b/frontend/src/views/project/ProjectDatabaseLayout.vue@@ -7,9 +7,9 @@</template><script lang="ts" setup>-import { onMounted, computed } from "vue";+import { computed, onMounted } from "vue";import { provideDatabaseDetailContext } from "@/components/Database/context";-import { useDBSchemaV1Store, useDatabaseV1Store } from "@/store";+import { useDatabaseV1Store, useDBSchemaV1Store } from "@/store";import {databaseNamePrefix,instanceNamePrefix,diff --git a/frontend/src/views/project/ProjectIssueDetail.vue b/frontend/src/views/project/ProjectIssueDetail.vueindex 6c87a75a1c..742c0ebbf0 100644--- a/frontend/src/views/project/ProjectIssueDetail.vue+++ b/frontend/src/views/project/ProjectIssueDetail.vue@@ -19,14 +19,14 @@ import { useI18n } from "vue-i18n";import { useRoute, useRouter } from "vue-router";import {GrantRequestIssueDetailPage,+ IssueDetailPage,provideIssueContext,useBaseIssueContext,useInitializeIssue,- IssueDetailPage,} from "@/components/IssueV1";import {- providePlanCheckRunContext,type PlanCheckRunEvents,+ providePlanCheckRunContext,} from "@/components/PlanCheckRun/context";import { useIssueLayoutVersion } from "@/composables/useIssueLayoutVersion";import { useBodyLayoutContext } from "@/layouts/common";diff --git a/frontend/src/views/project/ProjectLandingPage.vue b/frontend/src/views/project/ProjectLandingPage.vueindex 493d988ee1..ea2e290ffe 100644--- a/frontend/src/views/project/ProjectLandingPage.vue+++ b/frontend/src/views/project/ProjectLandingPage.vue@@ -3,11 +3,11 @@</template><script lang="ts" setup>-import { watchEffect, computed } from "vue";+import { computed, watchEffect } from "vue";import { useRouter } from "vue-router";import {- PROJECT_V1_ROUTE_ISSUES,PROJECT_V1_ROUTE_DATABASES,+ PROJECT_V1_ROUTE_ISSUES,} from "@/router/dashboard/projectV1";import { useProjectV1Store } from "@/store";import { projectNamePrefix } from "@/store/modules/v1/common";diff --git a/frontend/src/views/project/ProjectMaskingExemption.vue b/frontend/src/views/project/ProjectMaskingExemption.vueindex c6660840ce..9e58091617 100644--- a/frontend/src/views/project/ProjectMaskingExemption.vue+++ b/frontend/src/views/project/ProjectMaskingExemption.vue@@ -69,16 +69,16 @@<script lang="tsx" setup>import { ShieldCheckIcon } from "lucide-vue-next";-import { NInputGroup, NButton } from "naive-ui";+import { NButton, NInputGroup } from "naive-ui";import { computed, reactive } from "vue";import { useRouter } from "vue-router";-import { FeatureModal, FeatureBadge } from "@/components/FeatureGuard";-import MaskingExceptionUserTable from "@/components/SensitiveData/MaskingExceptionUserTable.vue";+import { FeatureBadge, FeatureModal } from "@/components/FeatureGuard";import MaskingActionDropdown from "@/components/SensitiveData/components/MaskingActionDropdown.vue";+import MaskingExceptionUserTable from "@/components/SensitiveData/MaskingExceptionUserTable.vue";import { type AccessUser } from "@/components/SensitiveData/types";-import { SearchBox, DatabaseSelect } from "@/components/v2";+import { DatabaseSelect, SearchBox } from "@/components/v2";import { PROJECT_V1_ROUTE_MASKING_EXEMPTION_CREATE } from "@/router/dashboard/projectV1";-import { useProjectByName, hasFeature } from "@/store";+import { hasFeature, useProjectByName } from "@/store";import { projectNamePrefix } from "@/store/modules/v1/common";import { MaskingExceptionPolicy_MaskingException_Action as Action } from "@/types/proto-es/v1/org_policy_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";diff --git a/frontend/src/views/project/ProjectPlanDashboard.vue b/frontend/src/views/project/ProjectPlanDashboard.vueindex 22c9a44ee5..c71450e64e 100644--- a/frontend/src/views/project/ProjectPlanDashboard.vue+++ b/frontend/src/views/project/ProjectPlanDashboard.vue@@ -47,10 +47,10 @@ import { head } from "lodash-es";import { PlusIcon } from "lucide-vue-next";import { NButton } from "naive-ui";import { v4 as uuidv4 } from "uuid";-import { computed, reactive, watch, ref, h } from "vue";+import { computed, h, reactive, ref, watch } from "vue";import type { ComponentExposed } from "vue-component-type-helpers";import { useI18n } from "vue-i18n";-import { useRouter, type LocationQuery } from "vue-router";+import { type LocationQuery, useRouter } from "vue-router";import BBAvatar from "@/bbkit/BBAvatar.vue";import AdvancedSearch from "@/components/AdvancedSearch";import type {@@ -58,11 +58,11 @@ import type {ValueOption,} from "@/components/AdvancedSearch/types";import { useCommonSearchScopeOptions } from "@/components/AdvancedSearch/useCommonSearchScopeOptions";-import { targetsForSpec, getLocalSheetByName } from "@/components/Plan";-import AddSpecDrawer from "@/components/Plan/components/AddSpecDrawer.vue";-import PlanDataTable from "@/components/Plan/components/PlanDataTable";import SystemBotTag from "@/components/misc/SystemBotTag.vue";import YouTag from "@/components/misc/YouTag.vue";+import { getLocalSheetByName, targetsForSpec } from "@/components/Plan";+import AddSpecDrawer from "@/components/Plan/components/AddSpecDrawer.vue";+import PlanDataTable from "@/components/Plan/components/PlanDataTable";import PagedTable from "@/components/v2/Model/PagedTable.vue";import { useIssueLayoutVersion } from "@/composables/useIssueLayoutVersion";import { PROJECT_V1_ROUTE_PLAN_DETAIL_SPEC_DETAIL } from "@/router/dashboard/projectV1";@@ -72,8 +72,10 @@ import {useStorageStore,useUserStore,} from "@/store";-import { usePlanStore } from "@/store/modules/v1/plan";-import { buildPlanFindBySearchParams } from "@/store/modules/v1/plan";+import {+ buildPlanFindBySearchParams,+ usePlanStore,+} from "@/store/modules/v1/plan";import { isValidDatabaseGroupName, SYSTEM_BOT_USER_NAME } from "@/types";import {DatabaseChangeType,diff --git a/frontend/src/views/project/ProjectRolloutDashboard.vue b/frontend/src/views/project/ProjectRolloutDashboard.vueindex 76dc50be1e..3a4b1e2bd4 100644--- a/frontend/src/views/project/ProjectRolloutDashboard.vue+++ b/frontend/src/views/project/ProjectRolloutDashboard.vue@@ -36,20 +36,20 @@</template><script lang="ts" setup>-import { computed, reactive, ref, watch, h } from "vue";+import { computed, h, reactive, ref, watch } from "vue";import type { ComponentExposed } from "vue-component-type-helpers";import { useI18n } from "vue-i18n";import BBAvatar from "@/bbkit/BBAvatar.vue";import AdvancedSearch from "@/components/AdvancedSearch";-import UpdatedTimeRange from "@/components/AdvancedSearch/UpdatedTimeRange.vue";import type {ScopeOption,ValueOption,} from "@/components/AdvancedSearch/types";+import UpdatedTimeRange from "@/components/AdvancedSearch/UpdatedTimeRange.vue";import { useCommonSearchScopeOptions } from "@/components/AdvancedSearch/useCommonSearchScopeOptions";-import RolloutDataTable from "@/components/Rollout/RolloutDataTable.vue";import SystemBotTag from "@/components/misc/SystemBotTag.vue";import YouTag from "@/components/misc/YouTag.vue";+import RolloutDataTable from "@/components/Rollout/RolloutDataTable.vue";import PagedTable from "@/components/v2/Model/PagedTable.vue";import {useCurrentUserV1,@@ -64,8 +64,8 @@ import {import { projectNamePrefix } from "@/store/modules/v1/common";import { SYSTEM_BOT_USER_NAME } from "@/types";import {- Task_Type,type Rollout,+ Task_Type,} from "@/types/proto-es/v1/rollout_service_pb";import { UserType } from "@/types/proto-es/v1/user_service_pb";import {diff --git a/frontend/src/views/sql-editor/AsidePanel/ActionBar/TabItem.vue b/frontend/src/views/sql-editor/AsidePanel/ActionBar/TabItem.vueindex 1e1e8649d9..96c446193a 100644--- a/frontend/src/views/sql-editor/AsidePanel/ActionBar/TabItem.vue+++ b/frontend/src/views/sql-editor/AsidePanel/ActionBar/TabItem.vue@@ -19,8 +19,8 @@<script setup lang="ts">import { NButton, NTooltip } from "naive-ui";-import { computed, toRef } from "vue";import type { VNodeChild } from "vue";+import { computed, toRef } from "vue";import { useConnectionOfCurrentSQLEditorTab } from "@/store";import type { EditorPanelView } from "@/types";import { useActions } from "../../AsidePanel/SchemaPane/actions";diff --git a/frontend/src/views/sql-editor/AsidePanel/ActionBar/common.ts b/frontend/src/views/sql-editor/AsidePanel/ActionBar/common.tsindex 8afe9676d0..b033eb16ae 100644--- a/frontend/src/views/sql-editor/AsidePanel/ActionBar/common.ts+++ b/frontend/src/views/sql-editor/AsidePanel/ActionBar/common.ts@@ -1,5 +1,5 @@import type { ButtonProps } from "naive-ui";-import { computed, unref, type MaybeRef } from "vue";+import { computed, type MaybeRef, unref } from "vue";export const useButton = (options: {active: MaybeRef<boolean>;diff --git a/frontend/src/views/sql-editor/AsidePanel/GutterBar/GutterBar.vue b/frontend/src/views/sql-editor/AsidePanel/GutterBar/GutterBar.vueindex 8f88ce2bd8..aed6f2998c 100644--- a/frontend/src/views/sql-editor/AsidePanel/GutterBar/GutterBar.vue+++ b/frontend/src/views/sql-editor/AsidePanel/GutterBar/GutterBar.vue@@ -32,9 +32,9 @@ import { computed } from "vue";import { useRoute } from "vue-router";import { PROJECT_V1_ROUTE_DETAIL } from "@/router/dashboard/projectV1";import { WORKSPACE_ROUTE_LANDING } from "@/router/dashboard/workspaceRoutes";-import { useSQLEditorContext, type AsidePanelTab } from "../../context";-import TabItem from "./TabItem.vue";+import { type AsidePanelTab, useSQLEditorContext } from "../../context";import { type Size } from "./common";+import TabItem from "./TabItem.vue";withDefaults(defineProps<{diff --git a/frontend/src/views/sql-editor/AsidePanel/GutterBar/TabItem.vue b/frontend/src/views/sql-editor/AsidePanel/GutterBar/TabItem.vueindex 031349471d..ccdc31b93e 100644--- a/frontend/src/views/sql-editor/AsidePanel/GutterBar/TabItem.vue+++ b/frontend/src/views/sql-editor/AsidePanel/GutterBar/TabItem.vue@@ -21,7 +21,7 @@ import { NButton, NTooltip } from "naive-ui";import { computed, toRef } from "vue";import { useI18n } from "vue-i18n";import DatabaseIcon from "@/components/Icon/DatabaseIcon.vue";-import { useSQLEditorContext, type AsidePanelTab } from "../../context";+import { type AsidePanelTab, useSQLEditorContext } from "../../context";import { type Size, useButton } from "./common";const props = defineProps<{diff --git a/frontend/src/views/sql-editor/AsidePanel/GutterBar/common.ts b/frontend/src/views/sql-editor/AsidePanel/GutterBar/common.tsindex 749b65ad96..629cec786d 100644--- a/frontend/src/views/sql-editor/AsidePanel/GutterBar/common.ts+++ b/frontend/src/views/sql-editor/AsidePanel/GutterBar/common.ts@@ -1,5 +1,5 @@import type { ButtonProps } from "naive-ui";-import { computed, unref, type MaybeRef } from "vue";+import { computed, type MaybeRef, unref } from "vue";export type Size = "small" | "medium" | "large";diff --git a/frontend/src/views/sql-editor/AsidePanel/HistoryPane/HistoryPane.vue b/frontend/src/views/sql-editor/AsidePanel/HistoryPane/HistoryPane.vueindex 8e950a5883..f5f1ddef50 100644--- a/frontend/src/views/sql-editor/AsidePanel/HistoryPane/HistoryPane.vue+++ b/frontend/src/views/sql-editor/AsidePanel/HistoryPane/HistoryPane.vue@@ -71,13 +71,12 @@ import { escape } from "lodash-es";import { NButton } from "naive-ui";import { computed, reactive, watch } from "vue";import MaskSpinner from "@/components/misc/MaskSpinner.vue";-import { SearchBox } from "@/components/v2";-import { CopyButton } from "@/components/v2";+import { CopyButton, SearchBox } from "@/components/v2";import {+ type QueryHistoryFilter,useSQLEditorQueryHistoryStore,- useSQLEditorTabStore,useSQLEditorStore,- type QueryHistoryFilter,+ useSQLEditorTabStore,} from "@/store";import { DEBOUNCE_SEARCH_DELAY, getDateForPbTimestampProtoEs } from "@/types";import type { QueryHistory } from "@/types/proto-es/v1/sql_service_pb";diff --git a/frontend/src/views/sql-editor/AsidePanel/SchemaPane/FlatTableList.vue b/frontend/src/views/sql-editor/AsidePanel/SchemaPane/FlatTableList.vueindex 98cffea556..0ad6e2f85f 100644--- a/frontend/src/views/sql-editor/AsidePanel/SchemaPane/FlatTableList.vue+++ b/frontend/src/views/sql-editor/AsidePanel/SchemaPane/FlatTableList.vue@@ -132,10 +132,10 @@</template><script setup lang="ts">-import { ChevronRightIcon, ChevronDownIcon } from "lucide-vue-next";-import { NVirtualList, NIcon, NButton, NEmpty } from "naive-ui";+import { ChevronDownIcon, ChevronRightIcon } from "lucide-vue-next";+import { NButton, NEmpty, NIcon, NVirtualList } from "naive-ui";import { computed, nextTick, ref, watch } from "vue";-import { TableIcon, ColumnIcon, IndexIcon } from "@/components/Icon";+import { ColumnIcon, IndexIcon, TableIcon } from "@/components/Icon";import type {DatabaseMetadata,TableMetadata,diff --git a/frontend/src/views/sql-editor/AsidePanel/SchemaPane/HoverPanel/ColumnInfo.vue b/frontend/src/views/sql-editor/AsidePanel/SchemaPane/HoverPanel/ColumnInfo.vueindex 89e93ea23a..4a5139bf04 100644--- a/frontend/src/views/sql-editor/AsidePanel/SchemaPane/HoverPanel/ColumnInfo.vue+++ b/frontend/src/views/sql-editor/AsidePanel/SchemaPane/HoverPanel/ColumnInfo.vue@@ -32,7 +32,7 @@ import { create } from "@bufbuild/protobuf";import { CheckIcon, XIcon } from "lucide-vue-next";import { computed } from "vue";import { getColumnDefaultValuePlaceholder } from "@/components/SchemaEditorLite";-import { useDBSchemaV1Store, useDatabaseV1Store } from "@/store";+import { useDatabaseV1Store, useDBSchemaV1Store } from "@/store";import { Engine } from "@/types/proto-es/v1/common_pb";import { ColumnMetadataSchema } from "@/types/proto-es/v1/database_service_pb";import InfoItem from "./InfoItem.vue";diff --git a/frontend/src/views/sql-editor/AsidePanel/SchemaPane/HoverPanel/HoverPanel.vue b/frontend/src/views/sql-editor/AsidePanel/SchemaPane/HoverPanel/HoverPanel.vueindex 9900decc95..24d0f4c851 100644--- a/frontend/src/views/sql-editor/AsidePanel/SchemaPane/HoverPanel/HoverPanel.vue+++ b/frontend/src/views/sql-editor/AsidePanel/SchemaPane/HoverPanel/HoverPanel.vue@@ -54,10 +54,10 @@ import type { Position } from "@/types";import { minmax } from "@/utils";import ColumnInfo from "./ColumnInfo.vue";import ExternalTableInfo from "./ExternalTableInfo.vue";+import { useHoverStateContext } from "./hover-state";import TableInfo from "./TableInfo.vue";import TablePartitionInfo from "./TablePartitionInfo.vue";import ViewInfo from "./ViewInfo.vue";-import { useHoverStateContext } from "./hover-state";const props = defineProps<{offsetX: number;diff --git a/frontend/src/views/sql-editor/AsidePanel/SchemaPane/HoverPanel/TableInfo.vue b/frontend/src/views/sql-editor/AsidePanel/SchemaPane/HoverPanel/TableInfo.vueindex b66fcaa3dc..4de641e2b9 100644--- a/frontend/src/views/sql-editor/AsidePanel/SchemaPane/HoverPanel/TableInfo.vue+++ b/frontend/src/views/sql-editor/AsidePanel/SchemaPane/HoverPanel/TableInfo.vue@@ -27,7 +27,7 @@<script setup lang="ts">import { computed } from "vue";import { RichEngineName } from "@/components/v2";-import { useDBSchemaV1Store, useDatabaseV1Store } from "@/store";+import { useDatabaseV1Store, useDBSchemaV1Store } from "@/store";import { Engine } from "@/types/proto-es/v1/common_pb";import { bytesToString } from "@/utils";import InfoItem from "./InfoItem.vue";diff --git a/frontend/src/views/sql-editor/AsidePanel/SchemaPane/HoverPanel/hover-state.ts b/frontend/src/views/sql-editor/AsidePanel/SchemaPane/HoverPanel/hover-state.tsindex dcdb920a37..c74eeb6582 100644--- a/frontend/src/views/sql-editor/AsidePanel/SchemaPane/HoverPanel/hover-state.ts+++ b/frontend/src/views/sql-editor/AsidePanel/SchemaPane/HoverPanel/hover-state.ts@@ -1,6 +1,6 @@import {- useHoverStateContext as _useHoverStateContext,provideHoverStateContext as _provideHoverStateContext,+ useHoverStateContext as _useHoverStateContext,} from "../../../EditorCommon";export const KEY = "schema-pane";diff --git a/frontend/src/views/sql-editor/AsidePanel/SchemaPane/SchemaPane.vue b/frontend/src/views/sql-editor/AsidePanel/SchemaPane/SchemaPane.vueindex f351cba8d0..b363a51547 100644--- a/frontend/src/views/sql-editor/AsidePanel/SchemaPane/SchemaPane.vue+++ b/frontend/src/views/sql-editor/AsidePanel/SchemaPane/SchemaPane.vue@@ -104,11 +104,10 @@ import {type TreeOption,} from "naive-ui";import { storeToRefs } from "pinia";-import { computed, h, nextTick, ref, watch } from "vue";-import { watchEffect } from "vue";+import { computed, h, nextTick, ref, watch, watchEffect } from "vue";import { BBModal } from "@/bbkit";-import TableSchemaViewer from "@/components/TableSchemaViewer.vue";import MaskSpinner from "@/components/misc/MaskSpinner.vue";+import TableSchemaViewer from "@/components/TableSchemaViewer.vue";import { RichDatabaseName, SearchBox } from "@/components/v2";import { useEmitteryEventListener } from "@/composables/useEmitteryEventListener";import {@@ -124,19 +123,19 @@ import {findAncestor,isDescendantOf,} from "@/utils";-import { useCurrentTabViewStateContext } from "../../EditorPanel";import { useSQLEditorContext } from "../../context";+import { useCurrentTabViewStateContext } from "../../EditorPanel";+import { useActions, useDropdown } from "./actions";+import { useClickEvents } from "./click";import FlatTableList from "./FlatTableList.vue";import HoverPanel, { provideHoverStateContext } from "./HoverPanel";import SyncSchemaButton from "./SyncSchemaButton.vue";import { Label } from "./TreeNode";-import { useDropdown, useActions } from "./actions";-import { useClickEvents } from "./click";import {- type NodeTarget,- type TreeNode,buildDatabaseSchemaTree,ExpandableNodeTypes,+ type NodeTarget,+ type TreeNode,} from "./tree";const mounted = useMounted();diff --git a/frontend/src/views/sql-editor/AsidePanel/SchemaPane/SyncSchemaButton.vue b/frontend/src/views/sql-editor/AsidePanel/SchemaPane/SyncSchemaButton.vueindex 0e59260309..efdac3b37c 100644--- a/frontend/src/views/sql-editor/AsidePanel/SchemaPane/SyncSchemaButton.vue+++ b/frontend/src/views/sql-editor/AsidePanel/SchemaPane/SyncSchemaButton.vue@@ -38,8 +38,8 @@ import { computed, ref } from "vue";import HumanizeDate from "@/components/misc/HumanizeDate.vue";import {useConnectionOfCurrentSQLEditorTab,- useDBSchemaV1Store,useDatabaseV1Store,+ useDBSchemaV1Store,} from "@/store";import { getDateForPbTimestampProtoEs, isValidDatabaseName } from "@/types";diff --git a/frontend/src/views/sql-editor/AsidePanel/SchemaPane/actions.tsx b/frontend/src/views/sql-editor/AsidePanel/SchemaPane/actions.tsxindex f559a7256e..3e2807bc51 100644--- a/frontend/src/views/sql-editor/AsidePanel/SchemaPane/actions.tsx+++ b/frontend/src/views/sql-editor/AsidePanel/SchemaPane/actions.tsx@@ -1,4 +1,4 @@-import { head, cloneDeep } from "lodash-es";+import { cloneDeep, head } from "lodash-es";import {CodeIcon,CopyIcon,@@ -21,20 +21,20 @@ import { t } from "@/plugins/i18n";import { SQL_EDITOR_DATABASE_MODULE } from "@/router/sqlEditor";import {pushNotification,+ useDatabaseV1Store,+ useDBSchemaV1Store,useSQLEditorTabStore,useTabViewStateStore,- useDBSchemaV1Store,- useDatabaseV1Store,} from "@/store";import {+ type ComposedDatabase,DEFAULT_SQL_EDITOR_TAB_MODE,dialectOfEngineV1,+ type EditorPanelView,+ type EditorPanelViewState,languageOfEngineV1,- type ComposedDatabase,type Position,type SQLEditorConnection,- type EditorPanelView,- type EditorPanelViewState,typeToView,} from "@/types";import { Engine } from "@/types/proto-es/v1/common_pb";@@ -42,6 +42,7 @@ import { GetSchemaStringRequest_ObjectType } from "@/types/proto-es/v1/database_import type { DataSource } from "@/types/proto-es/v1/instance_service_pb";import { DataSourceType } from "@/types/proto-es/v1/instance_service_pb";import {+ defaultSQLEditorTab,extractInstanceResourceName,extractProjectResourceName,generateSimpleDeleteStatement,@@ -49,15 +50,14 @@ import {generateSimpleSelectAllStatement,generateSimpleUpdateStatement,instanceV1HasAlterSchema,+ isSimilarSQLEditorTab,sortByDictionary,supportGetStringSchema,toClipboard,- defaultSQLEditorTab,- isSimilarSQLEditorTab,} from "@/utils";+import { type SQLEditorEvents, useSQLEditorContext } from "../../context";import { keyWithPosition } from "../../EditorCommon";import { useCurrentTabViewStateContext } from "../../EditorPanel";-import { useSQLEditorContext, type SQLEditorEvents } from "../../context";import type { NodeTarget, NodeType, TreeNode } from "./tree";import { readableTextForNodeTarget } from "./tree";diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/DraftTree.vue b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/DraftTree.vueindex 6d7d722ba7..2f69f404ab 100644--- a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/DraftTree.vue+++ b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/DraftTree.vue@@ -22,22 +22,22 @@<script lang="tsx" setup>import {- XIcon,- FolderPenIcon,FilePenIcon,FolderOpenIcon,+ FolderPenIcon,+ XIcon,} from "lucide-vue-next";import {NTree,type TreeOption,type TreeOverrideNodeClickBehavior,} from "naive-ui";-import { ref, computed, watch } from "vue";+import { computed, ref, watch } from "vue";import { HighlightLabelText } from "@/components/v2";import { t } from "@/plugins/i18n";import {- useSQLEditorTabStore,useCurrentUserV1,+ useSQLEditorTabStore,useTabViewStateStore,} from "@/store";import { isDescendantOf, useDynamicLocalStorage } from "@/utils";diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/SheetTree.vue b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/SheetTree.vueindex b41cbbd8a6..71841d2691 100644--- a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/SheetTree.vue+++ b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/SheetTree.vue@@ -61,48 +61,48 @@import { create } from "@bufbuild/protobuf";import { useDebounceFn } from "@vueuse/core";import {- NTree,- NInput,+ type DialogReactive,NDropdown,+ NInput,NPopover,- useDialog,- type TreeOption,+ NTree,type TreeDropInfo,- type DialogReactive,+ type TreeOption,+ useDialog,} from "naive-ui";import { storeToRefs } from "pinia";-import { nextTick, watch, computed } from "vue";+import { computed, nextTick, watch } from "vue";import { BBSpin } from "@/bbkit";import { HighlightLabelText } from "@/components/v2";import { useEmitteryEventListener } from "@/composables/useEmitteryEventListener";import { t } from "@/plugins/i18n";import {- useSQLEditorTabStore,- useSQLEditorStore,- useWorkSheetStore,pushNotification,+ useSQLEditorStore,+ useSQLEditorTabStore,useTabViewStateStore,+ useWorkSheetStore,} from "@/store";import { DEBOUNCE_SEARCH_DELAY } from "@/types";import {- WorksheetSchema,- Worksheet_Visibility,type Worksheet,+ Worksheet_Visibility,+ WorksheetSchema,} from "@/types/proto-es/v1/worksheet_service_pb";-import { isDescendantOf, defer } from "@/utils";+import { defer, isDescendantOf } from "@/utils";+import { useSQLEditorContext } from "@/views/sql-editor/context";import SharePopover from "@/views/sql-editor/EditorCommon/SharePopover.vue";import {- useSheetContextByView,- type SheetViewMode,- type WorsheetFolderNode,openWorksheetByName,- useSheetContext,revealWorksheets,+ type SheetViewMode,+ useSheetContext,+ useSheetContextByView,+ type WorsheetFolderNode,} from "@/views/sql-editor/Sheet";-import { useSQLEditorContext } from "@/views/sql-editor/context";-import { TreeNodePrefix, TreeNodeSuffix } from "./TreeNodeRenders";import { filterNode } from "./common";-import { useDropdown, type DropdownOptionType } from "./dropdown";+import { type DropdownOptionType, useDropdown } from "./dropdown";+import { TreeNodePrefix, TreeNodeSuffix } from "./TreeNodeRenders";const props = defineProps<{view: SheetViewMode;diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/TreeNodeRenders.tsx b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/TreeNodeRenders.tsxindex a7e27d1134..943cea97a9 100644--- a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/TreeNodeRenders.tsx+++ b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/TreeNodeRenders.tsx@@ -1,11 +1,11 @@import {- StarIcon,- MoreHorizontalIcon,- FolderSyncIcon,+ FileCodeIcon,FolderCodeIcon,FolderMinusIcon,- FileCodeIcon,FolderOpenIcon,+ FolderSyncIcon,+ MoreHorizontalIcon,+ StarIcon,UsersIcon,} from "lucide-vue-next";import { NTooltip } from "naive-ui";@@ -13,8 +13,8 @@ import { defineComponent, type PropType } from "vue";import { t } from "@/plugins/i18n";import { useUserStore } from "@/store";import {- Worksheet_Visibility,type Worksheet,+ Worksheet_Visibility,} from "@/types/proto-es/v1/worksheet_service_pb";import type { WorsheetFolderNode } from "@/views/sql-editor/Sheet";diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/dropdown.ts b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/dropdown.tsindex d7c3a8894f..bff9637feb 100644--- a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/dropdown.ts+++ b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/dropdown.ts@@ -1,13 +1,13 @@import {- FilesIcon,FileCodeIcon,+ FilesIcon,FolderIcon,+ PencilLineIcon,Share2Icon,TrashIcon,- PencilLineIcon,} from "lucide-vue-next";import { type DropdownOption } from "naive-ui";-import { computed, reactive, watch, h } from "vue";+import { computed, h, reactive, watch } from "vue";import { t } from "@/plugins/i18n";import { useCurrentUserV1 } from "@/store";import { type Position } from "@/types";diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/WorksheetPane.vue b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/WorksheetPane.vueindex 7d480c70e0..985f532bbf 100644--- a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/WorksheetPane.vue+++ b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/WorksheetPane.vue@@ -35,13 +35,13 @@<script setup lang="tsx">import { FunnelIcon } from "lucide-vue-next";-import { NButton, NDropdown, type DropdownOption } from "naive-ui";-import { ref, computed } from "vue";+import { type DropdownOption, NButton, NDropdown } from "naive-ui";+import { computed, ref } from "vue";import { SearchBox } from "@/components/v2";import { t } from "@/plugins/i18n";import { useSheetContext } from "../../Sheet";import FilterMenuItem from "./FilterMenuItem.vue";-import { SheetTree, DraftTree } from "./SheetList";+import { DraftTree, SheetTree } from "./SheetList";const { filter, filterChanged } = useSheetContext();const showDropdown = ref<boolean>(false);diff --git a/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/BatchQueryDatabaseGroupSelector.vue b/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/BatchQueryDatabaseGroupSelector.vueindex 6ad9164d8f..fe2a35523b 100644--- a/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/BatchQueryDatabaseGroupSelector.vue+++ b/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/BatchQueryDatabaseGroupSelector.vue@@ -54,7 +54,7 @@<script lang="ts" setup>import { BoxesIcon } from "lucide-vue-next";-import { NPopover, NButton } from "naive-ui";+import { NButton, NPopover } from "naive-ui";import { computed, reactive, watch } from "vue";import DatabaseGroupDataTable from "@/components/DatabaseGroup/DatabaseGroupDataTable.vue";import { FeatureModal } from "@/components/FeatureGuard";@@ -62,9 +62,9 @@ import { SearchBox } from "@/components/v2";import {featureToRef,useConnectionOfCurrentSQLEditorTab,+ useDBGroupListByProject,useSQLEditorStore,useSQLEditorTabStore,- useDBGroupListByProject,} from "@/store/modules";import { isValidDatabaseName } from "@/types";import { DatabaseGroupView } from "@/types/proto-es/v1/database_group_service_pb";diff --git a/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/ConnectionPane.vue b/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/ConnectionPane.vueindex 59b6e15457..367d6df368 100644--- a/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/ConnectionPane.vue+++ b/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/ConnectionPane.vue@@ -179,18 +179,18 @@ import { useElementSize } from "@vueuse/core";import { isEqual } from "lodash-es";import { InfoIcon } from "lucide-vue-next";import {- NTag,NButton,- NTree,- NDropdown,+ NCheckbox,NDivider,- NRadioGroup,+ NDropdown,NRadio,+ NRadioGroup,+ NTag,NTooltip,- NCheckbox,+ NTree,type TreeOption,} from "naive-ui";-import { ref, shallowRef, nextTick, watch, h, computed, reactive } from "vue";+import { computed, h, nextTick, reactive, ref, shallowRef, watch } from "vue";import { useI18n } from "vue-i18n";import AdvancedSearch from "@/components/AdvancedSearch";import { useCommonSearchScopeOptions } from "@/components/AdvancedSearch/useCommonSearchScopeOptions";@@ -199,32 +199,32 @@ import MaskSpinner from "@/components/misc/MaskSpinner.vue";import { RichDatabaseName } from "@/components/v2";import { useEmitteryEventListener } from "@/composables/useEmitteryEventListener";import {- featureToRef,batchGetOrFetchDatabases,- useProjectV1Store,+ type DatabaseFilter,+ featureToRef,+ idForSQLEditorTreeNodeTarget,+ resolveOpeningDatabaseListFromSQLEditorTabList,+ useCurrentUserV1,useDatabaseV1Store,useDBGroupStore,+ useEnvironmentV1List,+ useInstanceResourceByName,+ useProjectV1Store,+ useSQLEditorStore,useSQLEditorTabStore,- useCurrentUserV1,- resolveOpeningDatabaseListFromSQLEditorTabList,useSQLEditorTreeStore,- useSQLEditorStore,- idForSQLEditorTreeNodeTarget,- useInstanceResourceByName,- useEnvironmentV1List,- type DatabaseFilter,} from "@/store";import { instanceNamePrefix } from "@/store/modules/v1/common";import type {ComposedDatabase,- SQLEditorTreeNode,CoreSQLEditorTab,QueryDataSourceType,+ SQLEditorTreeNode,} from "@/types";import {DEFAULT_SQL_EDITOR_TAB_MODE,- isValidDatabaseName,getDataSourceTypeI18n,+ isValidDatabaseName,isValidProjectName,UNKNOWN_ENVIRONMENT_NAME,unknownEnvironment,@@ -232,18 +232,19 @@ import {import { Engine } from "@/types/proto-es/v1/common_pb";import { DataSourceType } from "@/types/proto-es/v1/instance_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";+import type { SearchParams } from "@/utils";import {- findAncestor,- isDescendantOf,- isDatabaseV1Queryable,CommonFilterScopeIdList,- extractProjectResourceName,emptySQLEditorConnection,+ extractProjectResourceName,+ findAncestor,+ isDatabaseV1Queryable,+ isDescendantOf,tryConnectToCoreSQLEditorTab,useDynamicLocalStorage,} from "@/utils";-import type { SearchParams } from "@/utils";import { useSQLEditorContext } from "../../context";+import { setConnection, useDropdown } from "./actions";import BatchQueryDatabaseGroupSelector from "./BatchQueryDatabaseGroupSelector.vue";import DatabaseGroupTag from "./DatabaseGroupTag.vue";import {@@ -251,8 +252,7 @@ import {provideHoverStateContext,} from "./DatabaseHoverPanel";import { Label } from "./TreeNode";-import { setConnection, useDropdown } from "./actions";-import { useSQLEditorTreeByEnvironment, type TreeByEnvironment } from "./tree";+import { type TreeByEnvironment, useSQLEditorTreeByEnvironment } from "./tree";interface LocalState {selectedDatabases: Set<string>;diff --git a/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/DatabaseHoverPanel/hover-state.ts b/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/DatabaseHoverPanel/hover-state.tsindex e3c9cfd1c5..413343b2b3 100644--- a/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/DatabaseHoverPanel/hover-state.ts+++ b/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/DatabaseHoverPanel/hover-state.ts@@ -1,7 +1,7 @@import type { SQLEditorTreeNode } from "@/types";import {- useHoverStateContext as _useHoverStateContext,provideHoverStateContext as _provideHoverStateContext,+ useHoverStateContext as _useHoverStateContext,} from "../../../EditorCommon";export const KEY = "connection-pane";diff --git a/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/actions.tsx b/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/actions.tsxindex 7dc8d06639..5e5cf62a9f 100644--- a/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/actions.tsx+++ b/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/actions.tsx@@ -10,11 +10,11 @@ import { useRouter } from "vue-router";import { t } from "@/plugins/i18n";import { PROJECT_V1_ROUTE_DATABASE_DETAIL } from "@/router/dashboard/projectV1";import {+ type ComposedDatabase,+ type CoreSQLEditorTab,DEFAULT_SQL_EDITOR_TAB_MODE,instanceOfSQLEditorTreeNode,isConnectableSQLEditorTreeNode,- type ComposedDatabase,- type CoreSQLEditorTab,type Position,type SQLEditorTabMode as TabMode,type SQLEditorTreeNode as TreeNode,@@ -28,8 +28,8 @@ import {instanceV1HasReadonlyMode,tryConnectToCoreSQLEditorTab,} from "@/utils";+import { type SQLEditorContext, useSQLEditorContext } from "../../context";import { setDefaultDataSourceForConn } from "../../EditorCommon";-import { useSQLEditorContext, type SQLEditorContext } from "../../context";type DropdownOptionWithTreeNode = DropdownOption & {onSelect: () => void;diff --git a/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/tree.ts b/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/tree.tsindex 5e9e16a24d..1a5ec55b84 100644--- a/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/tree.ts+++ b/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/tree.ts@@ -1,27 +1,27 @@import { useDebounceFn } from "@vueuse/core";import { NCheckbox } from "naive-ui";import { storeToRefs } from "pinia";-import { computed, ref, watch, h } from "vue";import type { ComputedRef, Ref } from "vue";+import { computed, h, ref, watch } from "vue";import { t } from "@/plugins/i18n";import {- useSQLEditorStore,+ buildTreeImpl,+ type DatabaseFilter,+ mapTreeNodeByType,useCurrentUserV1,useDatabaseV1Store,useEnvironmentV1Store,- type DatabaseFilter,- buildTreeImpl,- mapTreeNodeByType,+ useSQLEditorStore,} from "@/store";import type {ComposedDatabase,- SQLEditorTreeNode as TreeNode,StatefulSQLEditorTreeFactor as StatefulFactor,+ SQLEditorTreeNode as TreeNode,} from "@/types";import { DEBOUNCE_SEARCH_DELAY } from "@/types";import {- isDatabaseV1Queryable,getDefaultPagination,+ isDatabaseV1Queryable,useDynamicLocalStorage,} from "@/utils";diff --git a/frontend/src/views/sql-editor/EditorCommon/AdminModeButton.vue b/frontend/src/views/sql-editor/EditorCommon/AdminModeButton.vueindex eabdc5afd6..1ad7b741bd 100644--- a/frontend/src/views/sql-editor/EditorCommon/AdminModeButton.vue+++ b/frontend/src/views/sql-editor/EditorCommon/AdminModeButton.vue@@ -16,10 +16,10 @@<script lang="ts" setup>import { WrenchIcon } from "lucide-vue-next";-import { NButton, type ButtonProps } from "naive-ui";+import { type ButtonProps, NButton } from "naive-ui";import { storeToRefs } from "pinia";-import { computed } from "vue";import type { PropType } from "vue";+import { computed } from "vue";import { useSQLEditorTabStore } from "@/store";import { hasWorkspacePermissionV2 } from "@/utils";diff --git a/frontend/src/views/sql-editor/EditorCommon/DatabaseChooser.vue b/frontend/src/views/sql-editor/EditorCommon/DatabaseChooser.vueindex 42a2fafbcf..ad6f8a69d3 100644--- a/frontend/src/views/sql-editor/EditorCommon/DatabaseChooser.vue+++ b/frontend/src/views/sql-editor/EditorCommon/DatabaseChooser.vue@@ -59,7 +59,7 @@ import { ChevronRightIcon, SquareStackIcon } from "lucide-vue-next";import { NButton, NPopover } from "naive-ui";import { storeToRefs } from "pinia";import { DatabaseIcon } from "@/components/Icon";-import { InstanceV1EngineIcon, EnvironmentV1Name } from "@/components/v2";+import { EnvironmentV1Name, InstanceV1EngineIcon } from "@/components/v2";import {useConnectionOfCurrentSQLEditorTab,useSQLEditorStore,diff --git a/frontend/src/views/sql-editor/EditorCommon/EditorAction.vue b/frontend/src/views/sql-editor/EditorCommon/EditorAction.vueindex 6715d16862..9b88a85f6f 100644--- a/frontend/src/views/sql-editor/EditorCommon/EditorAction.vue+++ b/frontend/src/views/sql-editor/EditorCommon/EditorAction.vue@@ -159,8 +159,8 @@ import {useSQLEditorStore,useSQLEditorTabStore,useUIStateStore,- useWorkSheetStore,useWorkSheetAndTabStore,+ useWorkSheetStore,} from "@/store";import {DEFAULT_SQL_EDITOR_TAB_MODE,diff --git a/frontend/src/views/sql-editor/EditorCommon/OpenAIButton/Button.vue b/frontend/src/views/sql-editor/EditorCommon/OpenAIButton/Button.vueindex bffb6f5ee9..ac85ceb6be 100644--- a/frontend/src/views/sql-editor/EditorCommon/OpenAIButton/Button.vue+++ b/frontend/src/views/sql-editor/EditorCommon/OpenAIButton/Button.vue@@ -26,7 +26,7 @@</template><script setup lang="ts">-import { NButton, type ButtonProps } from "naive-ui";+import { type ButtonProps, NButton } from "naive-ui";import { computed } from "vue";import { useSQLEditorContext } from "../../context";diff --git a/frontend/src/views/sql-editor/EditorCommon/OpenAIButton/OpenAIButton.vue b/frontend/src/views/sql-editor/EditorCommon/OpenAIButton/OpenAIButton.vueindex 0cf0f26583..1228746677 100644--- a/frontend/src/views/sql-editor/EditorCommon/OpenAIButton/OpenAIButton.vue+++ b/frontend/src/views/sql-editor/EditorCommon/OpenAIButton/OpenAIButton.vue@@ -50,7 +50,7 @@</template><script setup lang="ts">-import { NPopselect, NPopover, type SelectOption, NButton } from "naive-ui";+import { NButton, NPopover, NPopselect, type SelectOption } from "naive-ui";import { computed } from "vue";import { useI18n } from "vue-i18n";import { useRouter } from "vue-router";diff --git a/frontend/src/views/sql-editor/EditorCommon/QueryContextSettingPopover.vue b/frontend/src/views/sql-editor/EditorCommon/QueryContextSettingPopover.vueindex c6d98dd129..ab47e3840f 100644--- a/frontend/src/views/sql-editor/EditorCommon/QueryContextSettingPopover.vue+++ b/frontend/src/views/sql-editor/EditorCommon/QueryContextSettingPopover.vue@@ -117,30 +117,33 @@<script lang="ts" setup>import { orderBy } from "lodash-es";import { ChevronDown, ChevronRight } from "lucide-vue-next";-import { NButton, NPopover, NRadioGroup, NRadio, NTooltip } from "naive-ui";+import { NButton, NPopover, NRadio, NRadioGroup, NTooltip } from "naive-ui";import { storeToRefs } from "pinia";import { computed, watch, watchEffect } from "vue";import { useI18n } from "vue-i18n";import {useConnectionOfCurrentSQLEditorTab,usePolicyV1Store,- useSQLEditorTabStore,useSQLEditorStore,+ useSQLEditorTabStore,} from "@/store";import { isValidDatabaseName } from "@/types";import { Engine } from "@/types/proto-es/v1/common_pb";import type { DataSource } from "@/types/proto-es/v1/instance_service_pb";import {- DataSourceType,DataSource_RedisType,+ DataSourceType,} from "@/types/proto-es/v1/instance_service_pb";import {DataSourceQueryPolicy_Restriction,PolicyType,} from "@/types/proto-es/v1/org_policy_service_pb";import { QueryOption_RedisRunCommandsOn } from "@/types/proto-es/v1/sql_service_pb";-import { getValidDataSourceByPolicy, readableDataSourceType } from "@/utils";-import { getAdminDataSourceRestrictionOfDatabase } from "@/utils";+import {+ getAdminDataSourceRestrictionOfDatabase,+ getValidDataSourceByPolicy,+ readableDataSourceType,+} from "@/utils";import ResultLimitSelect from "./ResultLimitSelect.vue";defineProps<{@@ -152,8 +155,9 @@ const tabStore = useSQLEditorTabStore();const { connection, database } = useConnectionOfCurrentSQLEditorTab();const policyStore = usePolicyV1Store();-const { redisCommandOption, resultRowsLimit } =- storeToRefs(useSQLEditorStore());+const { redisCommandOption, resultRowsLimit } = storeToRefs(+ useSQLEditorStore()+);const show = computed(() => {return tabStore.currentTab?.mode !== "ADMIN";diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/TableCell.vue b/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/TableCell.vueindex f65a2b77e1..e9e56a23f3 100644--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/TableCell.vue+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/TableCell.vue@@ -60,10 +60,10 @@ import type { QueryRow, RowValue } from "@/types/proto-es/v1/sql_service_pb";import { extractSQLRowValuePlain, getHighlightHTMLByRegExp } from "@/utils";import { useSQLResultViewContext } from "../context";import {- useBinaryFormatContext,- formatBinaryValue,- detectBinaryFormat,type BinaryFormat,+ detectBinaryFormat,+ formatBinaryValue,+ useBinaryFormatContext,} from "./binary-format-store";import BinaryFormatButton from "./common/BinaryFormatButton.vue";import { useSelectionContext } from "./common/selection-logic";diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/VirtualDataTable.vue b/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/VirtualDataTable.vueindex 760ce13def..2f44fae500 100644--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/VirtualDataTable.vue+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/VirtualDataTable.vue@@ -203,11 +203,10 @@ import {type RowValue,} from "@/types/proto-es/v1/sql_service_pb";import { useSQLResultViewContext } from "../context";-import TableCell from "./TableCell.vue";import {- useBinaryFormatContext,- getBinaryFormatByColumnType,type BinaryFormat,+ getBinaryFormatByColumnType,+ useBinaryFormatContext,} from "./binary-format-store";import BinaryFormatButton from "./common/BinaryFormatButton.vue";import ColumnSortedIcon from "./common/ColumnSortedIcon.vue";@@ -215,6 +214,7 @@ import MaskingReasonPopover from "./common/MaskingReasonPopover.vue";import SensitiveDataIcon from "./common/SensitiveDataIcon.vue";import { useSelectionContext } from "./common/selection-logic";import { getColumnType } from "./common/utils";+import TableCell from "./TableCell.vue";import useTableColumnWidthLogic from "./useTableResize";const props = defineProps<{diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/binary-format-store.ts b/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/binary-format-store.tsindex 9f77118c9b..b47127e920 100644--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/binary-format-store.ts+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/binary-format-store.ts@@ -1,5 +1,5 @@import type { InjectionKey, Ref } from "vue";-import { provide, inject, ref } from "vue";+import { inject, provide, ref } from "vue";export type BinaryFormat = "DEFAULT" | "BINARY" | "HEX" | "TEXT" | "BOOLEAN";interface ColumnKeyParams {diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/common/BinaryFormatButton.vue b/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/common/BinaryFormatButton.vueindex a178648b9e..42e09a444c 100644--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/common/BinaryFormatButton.vue+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/common/BinaryFormatButton.vue@@ -50,7 +50,7 @@<script setup lang="ts">import { CodeIcon } from "lucide-vue-next";-import { NButton, NPopover, NRadioGroup, NRadio } from "naive-ui";+import { NButton, NPopover, NRadio, NRadioGroup } from "naive-ui";import { computed } from "vue";import { type BinaryFormat } from "../binary-format-store";diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/common/ColumnSortedIcon.vue b/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/common/ColumnSortedIcon.vueindex 1c0cf7e486..c0b121cc55 100644--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/common/ColumnSortedIcon.vue+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/common/ColumnSortedIcon.vue@@ -11,7 +11,7 @@<script lang="ts" setup>import type { SortDirection } from "@tanstack/vue-table";-import { ArrowUpWideNarrow, ArrowDownWideNarrow } from "lucide-vue-next";+import { ArrowDownWideNarrow, ArrowUpWideNarrow } from "lucide-vue-next";defineProps<{isSorted: false | SortDirection;diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/common/selection-logic.ts b/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/common/selection-logic.tsindex 0f069cf651..dce1a3074f 100644--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/common/selection-logic.ts+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/common/selection-logic.ts@@ -3,13 +3,13 @@ import { useEventListener } from "@vueuse/core";import { sortBy } from "lodash-es";import {computed,+ type InjectionKey,inject,nextTick,provide,+ type Ref,ref,watch,- type InjectionKey,- type Ref,} from "vue";import { useI18n } from "vue-i18n";import { pushNotification } from "@/store";@@ -17,8 +17,8 @@ import type { QueryRow, RowValue } from "@/types/proto-es/v1/sql_service_pb";import { extractSQLRowValuePlain, isDescendantOf, toClipboard } from "@/utils";import { useSQLResultViewContext } from "../../context";import {- formatBinaryValue,detectBinaryFormat,+ formatBinaryValue,useBinaryFormatContext,} from "../binary-format-store";import { getColumnType } from "./utils";diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/DetailPanel/DetailPanel.vue b/frontend/src/views/sql-editor/EditorCommon/ResultView/DetailPanel/DetailPanel.vueindex 807845056f..2cf5f5ba50 100644--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/DetailPanel/DetailPanel.vue+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/DetailPanel/DetailPanel.vue@@ -146,24 +146,23 @@<script setup lang="ts">import { onKeyStroke, useLocalStorage } from "@vueuse/core";import {+ BracesIcon,ChevronDownIcon,ChevronUpIcon,- BracesIcon,WrapTextIcon,} from "lucide-vue-next";import { NButton, NPopover, NScrollbar, NTooltip } from "naive-ui";import { computed } from "vue";-import { DrawerContent } from "@/components/v2";-import { CopyButton } from "@/components/v2";+import { CopyButton, DrawerContent } from "@/components/v2";import type { RowValue } from "@/types/proto-es/v1/sql_service_pb";import { extractSQLRowValuePlain } from "@/utils";+import { useSQLResultViewContext } from "../context";import {- useBinaryFormatContext,- formatBinaryValue,type BinaryFormat,+ formatBinaryValue,+ useBinaryFormatContext,} from "../DataTable/binary-format-store";import BinaryFormatButton from "../DataTable/common/BinaryFormatButton.vue";-import { useSQLResultViewContext } from "../context";import PrettyJSON from "./PrettyJSON.vue";const { dark, detail, disallowCopyingData } = useSQLResultViewContext();diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/ErrorView/AdviceItem.vue b/frontend/src/views/sql-editor/EditorCommon/ResultView/ErrorView/AdviceItem.vueindex 9d261dedfc..ee2df550e2 100644--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/ErrorView/AdviceItem.vue+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/ErrorView/AdviceItem.vue@@ -38,7 +38,7 @@ import { NButton } from "naive-ui";import { computed } from "vue";import { positionWithOffset } from "@/components/MonacoEditor/utils";import type { SQLEditorQueryParams } from "@/types";-import { Advice_Level, type Advice } from "@/types/proto-es/v1/sql_service_pb";+import { type Advice, Advice_Level } from "@/types/proto-es/v1/sql_service_pb";import { useSQLEditorContext } from "@/views/sql-editor/context";const props = defineProps<{diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/RequestQueryButton.vue b/frontend/src/views/sql-editor/EditorCommon/ResultView/RequestQueryButton.vueindex d2e6b01507..07a0153570 100644--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/RequestQueryButton.vue+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/RequestQueryButton.vue@@ -21,9 +21,9 @@ import { computed, ref } from "vue";import GrantRequestPanel from "@/components/GrantRequestPanel";import { useDatabaseV1ByName } from "@/store";import {+ type DatabaseResource,isValidDatabaseName,PresetRoleType,- type DatabaseResource,} from "@/types";import { hasPermissionToCreateRequestGrantIssue } from "@/utils";diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/ResultViewV1.vue b/frontend/src/views/sql-editor/EditorCommon/ResultView/ResultViewV1.vueindex 1359970074..cbd9c5639c 100644--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/ResultViewV1.vue+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/ResultViewV1.vue@@ -165,30 +165,30 @@ import { Info } from "lucide-vue-next";import {darkTheme,NConfigProvider,+ NFormItem,NTabPane,NTabs,NTooltip,- NFormItem,} from "naive-ui";import { computed, ref, toRef } from "vue";import { useI18n } from "vue-i18n";import { darkThemeOverrides } from "@/../naive-ui.config";import { BBSpin } from "@/bbkit";-import DataExportButton from "@/components/DataExportButton.vue";+import SyncDatabaseButton from "@/components/DatabaseDetail/SyncDatabaseButton.vue";+import DatabaseInfo from "@/components/DatabaseInfo.vue";import type {DownloadContent,ExportOption,} from "@/components/DataExportButton.vue";-import SyncDatabaseButton from "@/components/DatabaseDetail/SyncDatabaseButton.vue";-import DatabaseInfo from "@/components/DatabaseInfo.vue";+import DataExportButton from "@/components/DataExportButton.vue";import { parseStringToResource } from "@/components/GrantRequestPanel/DatabaseResourceForm/common";import { Drawer } from "@/components/v2";import {useConnectionOfCurrentSQLEditorTab,usePolicyV1Store,+ useSQLEditorStore,useSQLEditorTabStore,useSQLStore,- useSQLEditorStore,} from "@/store";import type {ComposedDatabase,@@ -199,19 +199,19 @@ import type {import { ExportFormat } from "@/types/proto-es/v1/common_pb";import {PolicyType,- QueryDataPolicySchema,type QueryDataPolicy,+ QueryDataPolicySchema,} from "@/types/proto-es/v1/org_policy_service_pb";import { ExportRequestSchema } from "@/types/proto-es/v1/sql_service_pb";import { hasWorkspacePermissionV2 } from "@/utils";+import type { SQLResultViewContext } from "./context";+import { provideSQLResultViewContext } from "./context";import { provideBinaryFormatContext } from "./DataTable/binary-format-store";import DetailPanel from "./DetailPanel";import EmptyView from "./EmptyView.vue";import ErrorView from "./ErrorView";import RequestQueryButton from "./RequestQueryButton.vue";import SingleResultViewV1 from "./SingleResultViewV1.vue";-import type { SQLResultViewContext } from "./context";-import { provideSQLResultViewContext } from "./context";type ViewMode = "SINGLE-RESULT" | "MULTI-RESULT" | "EMPTY" | "ERROR";diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/SingleResultViewV1.vue b/frontend/src/views/sql-editor/EditorCommon/ResultView/SingleResultViewV1.vueindex 8b48e9c0de..19a7925eb6 100644--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/SingleResultViewV1.vue+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/SingleResultViewV1.vue@@ -190,8 +190,7 @@ import {getSortedRowModel,useVueTable,} from "@tanstack/vue-table";-import { useClipboard } from "@vueuse/core";-import { useDebounceFn, useLocalStorage } from "@vueuse/core";+import { useClipboard, useDebounceFn, useLocalStorage } from "@vueuse/core";import { isEmpty } from "lodash-es";import {NButton,@@ -206,19 +205,19 @@ import {import { computed, reactive } from "vue";import { useI18n } from "vue-i18n";import { BBAttention } from "@/bbkit";+import DatabaseInfo from "@/components/DatabaseInfo.vue";import type {DownloadContent,ExportOption,} from "@/components/DataExportButton.vue";import DataExportButton from "@/components/DataExportButton.vue";-import DatabaseInfo from "@/components/DatabaseInfo.vue";import { RichDatabaseName } from "@/components/v2";import { DISMISS_PLACEHOLDER } from "@/plugins/ai/components/state";import {+ pushNotification,useConnectionOfCurrentSQLEditorTab,useSQLEditorStore,useSQLEditorTabStore,- pushNotification,} from "@/store";import type { ComposedDatabase, SQLEditorQueryParams } from "@/types";import { DEBOUNCE_SEARCH_DELAY, isValidInstanceName } from "@/types";@@ -235,13 +234,13 @@ import {instanceV1HasStructuredQueryResult,isNullOrUndefined,} from "@/utils";-import VirtualDataTable from "./DataTable/VirtualDataTable.vue";+import { useSQLResultViewContext } from "./context";import { provideSelectionContext } from "./DataTable/common/selection-logic";+import VirtualDataTable from "./DataTable/VirtualDataTable.vue";import EmptyView from "./EmptyView.vue";import ErrorView from "./ErrorView";import SelectionCopyTooltips from "./SelectionCopyTooltips.vue";import VirtualDataBlock from "./VirtualDataBlock.vue";-import { useSQLResultViewContext } from "./context";// Using conversion function from common-conversions.tsdiff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/VirtualDataBlock.vue b/frontend/src/views/sql-editor/EditorCommon/ResultView/VirtualDataBlock.vueindex 918bee958c..98243368db 100644--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/VirtualDataBlock.vue+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/VirtualDataBlock.vue@@ -90,11 +90,11 @@ import { useVirtualizer } from "@tanstack/vue-virtual";import { computed, ref, watch } from "vue";import { CopyButton } from "@/components/v2";import type { QueryRow, RowValue } from "@/types/proto-es/v1/sql_service_pb";-import TableCell from "./DataTable/TableCell.vue";+import { useSQLResultViewContext } from "./context";import MaskingReasonPopover from "./DataTable/common/MaskingReasonPopover.vue";import SensitiveDataIcon from "./DataTable/common/SensitiveDataIcon.vue";import { getColumnType } from "./DataTable/common/utils";-import { useSQLResultViewContext } from "./context";+import TableCell from "./DataTable/TableCell.vue";const props = defineProps<{table: Table<QueryRow>;diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/context.ts b/frontend/src/views/sql-editor/EditorCommon/ResultView/context.tsindex 27ebea237b..9baff97af9 100644--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/context.ts+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/context.ts@@ -1,5 +1,5 @@import { type Table } from "@tanstack/vue-table";-import { type Ref, type InjectionKey, provide, inject } from "vue";+import { type InjectionKey, inject, provide, type Ref } from "vue";import type { QueryRow } from "@/types/proto-es/v1/sql_service_pb";export type SQLResultViewContext = {diff --git a/frontend/src/views/sql-editor/EditorCommon/SaveSheetModal.vue b/frontend/src/views/sql-editor/EditorCommon/SaveSheetModal.vueindex 3432350e97..3e6d8d2238 100644--- a/frontend/src/views/sql-editor/EditorCommon/SaveSheetModal.vue+++ b/frontend/src/views/sql-editor/EditorCommon/SaveSheetModal.vue@@ -50,25 +50,25 @@import { create } from "@bufbuild/protobuf";import {FolderCodeIcon,- FolderOpenIcon,FolderMinusIcon,+ FolderOpenIcon,} from "lucide-vue-next";-import { NInput, NButton, NTreeSelect, type TreeOption } from "naive-ui";+import { NButton, NInput, NTreeSelect, type TreeOption } from "naive-ui";import { ref } from "vue";import { BBModal } from "@/bbkit";import RequiredStar from "@/components/RequiredStar.vue";import { useEmitteryEventListener } from "@/composables/useEmitteryEventListener";-import { useWorkSheetStore, useSQLEditorTabStore } from "@/store";+import { useSQLEditorTabStore, useWorkSheetStore } from "@/store";import type { SQLEditorTab } from "@/types";import { UNKNOWN_ID } from "@/types";import {- WorksheetSchema,- Worksheet_Visibility,type Worksheet,+ Worksheet_Visibility,+ WorksheetSchema,} from "@/types/proto-es/v1/worksheet_service_pb";import { extractWorksheetUID } from "@/utils";-import { useSheetContextByView } from "@/views/sql-editor/Sheet";import type { WorsheetFolderNode } from "@/views/sql-editor/Sheet";+import { useSheetContextByView } from "@/views/sql-editor/Sheet";import { useSQLEditorContext } from "../context";const tabStore = useSQLEditorTabStore();diff --git a/frontend/src/views/sql-editor/EditorCommon/SharePopover.vue b/frontend/src/views/sql-editor/EditorCommon/SharePopover.vueindex 42a983601b..ec725bf0c3 100644--- a/frontend/src/views/sql-editor/EditorCommon/SharePopover.vue+++ b/frontend/src/views/sql-editor/EditorCommon/SharePopover.vue@@ -86,22 +86,22 @@<script lang="ts" setup>import { LockKeyholeIcon, UsersIcon } from "lucide-vue-next";import { NInput, NInputGroup, NInputGroupLabel, NPopover } from "naive-ui";-import { ref, computed, onMounted, h } from "vue";+import { computed, h, onMounted, ref } from "vue";import { useI18n } from "vue-i18n";import { useRouter } from "vue-router";import { CopyButton } from "@/components/v2";import { SQL_EDITOR_WORKSHEET_MODULE } from "@/router/sqlEditor";import {pushNotification,+ useCurrentUserV1,+ useSettingV1Store,useSQLEditorTabStore,useWorkSheetStore,- useSettingV1Store,- useCurrentUserV1,} from "@/store";import type { AccessOption } from "@/types";import {- Worksheet_Visibility,type Worksheet,+ Worksheet_Visibility,} from "@/types/proto-es/v1/worksheet_service_pb";import {extractProjectResourceName,diff --git a/frontend/src/views/sql-editor/EditorCommon/SheetConnectionIcon.vue b/frontend/src/views/sql-editor/EditorCommon/SheetConnectionIcon.vueindex bef1957b66..b788b1f704 100644--- a/frontend/src/views/sql-editor/EditorCommon/SheetConnectionIcon.vue+++ b/frontend/src/views/sql-editor/EditorCommon/SheetConnectionIcon.vue@@ -9,7 +9,7 @@import { UnlinkIcon } from "lucide-vue-next";import { computed } from "vue";import { EngineIcon } from "@/components/Icon";-import { type SQLEditorTab, isValidInstanceName } from "@/types";+import { isValidInstanceName, type SQLEditorTab } from "@/types";import { connectionForSQLEditorTab } from "@/utils";const props = defineProps<{diff --git a/frontend/src/views/sql-editor/EditorPanel/Panels/ExternalTablesPanel/ExternalTableColumnsTable.vue b/frontend/src/views/sql-editor/EditorPanel/Panels/ExternalTablesPanel/ExternalTableColumnsTable.vueindex ffd0ccc080..01902de6ef 100644--- a/frontend/src/views/sql-editor/EditorPanel/Panels/ExternalTablesPanel/ExternalTableColumnsTable.vue+++ b/frontend/src/views/sql-editor/EditorPanel/Panels/ExternalTablesPanel/ExternalTableColumnsTable.vue@@ -27,8 +27,8 @@ import type { ComposedDatabase } from "@/types";import type {ColumnMetadata,DatabaseMetadata,- SchemaMetadata,ExternalTableMetadata,+ SchemaMetadata,} from "@/types/proto-es/v1/database_service_pb";import { getHighlightHTMLByRegExp, useAutoHeightDataTable } from "@/utils";import { EllipsisCell } from "../../common";diff --git a/frontend/src/views/sql-editor/EditorPanel/Panels/ExternalTablesPanel/ExternalTablesPanel.vue b/frontend/src/views/sql-editor/EditorPanel/Panels/ExternalTablesPanel/ExternalTablesPanel.vueindex 7b0f0fc739..23383b5df1 100644--- a/frontend/src/views/sql-editor/EditorPanel/Panels/ExternalTablesPanel/ExternalTablesPanel.vue+++ b/frontend/src/views/sql-editor/EditorPanel/Panels/ExternalTablesPanel/ExternalTablesPanel.vue@@ -67,8 +67,8 @@ import {} from "@/store";import type {DatabaseMetadata,- SchemaMetadata,ExternalTableMetadata,+ SchemaMetadata,} from "@/types/proto-es/v1/database_service_pb";import { useCurrentTabViewStateContext } from "../../context/viewState";import ExternalTableColumnsTable from "./ExternalTableColumnsTable.vue";diff --git a/frontend/src/views/sql-editor/EditorPanel/Panels/ExternalTablesPanel/ExternalTablesTable.vue b/frontend/src/views/sql-editor/EditorPanel/Panels/ExternalTablesPanel/ExternalTablesTable.vueindex e0b9409a50..c354c11dd1 100644--- a/frontend/src/views/sql-editor/EditorPanel/Panels/ExternalTablesPanel/ExternalTablesTable.vue+++ b/frontend/src/views/sql-editor/EditorPanel/Panels/ExternalTablesPanel/ExternalTablesTable.vue@@ -19,14 +19,14 @@</template><script setup lang="tsx">-import { NDataTable, type DataTableColumn } from "naive-ui";+import { type DataTableColumn, NDataTable } from "naive-ui";import { computed, h, watch } from "vue";import { useI18n } from "vue-i18n";import type { ComposedDatabase } from "@/types";import type {DatabaseMetadata,- SchemaMetadata,ExternalTableMetadata,+ SchemaMetadata,} from "@/types/proto-es/v1/database_service_pb";import { getHighlightHTMLByRegExp, useAutoHeightDataTable } from "@/utils";import { useCurrentTabViewStateContext } from "../../context/viewState";diff --git a/frontend/src/views/sql-editor/EditorPanel/Panels/FunctionsPanel/FunctionsTable.vue b/frontend/src/views/sql-editor/EditorPanel/Panels/FunctionsPanel/FunctionsTable.vueindex a7ac07d726..6d6e3e3cc1 100644--- a/frontend/src/views/sql-editor/EditorPanel/Panels/FunctionsPanel/FunctionsTable.vue+++ b/frontend/src/views/sql-editor/EditorPanel/Panels/FunctionsPanel/FunctionsTable.vue@@ -19,7 +19,7 @@</template><script setup lang="tsx">-import { NDataTable, type DataTableColumn } from "naive-ui";+import { type DataTableColumn, NDataTable } from "naive-ui";import { computed, h, watch } from "vue";import { useI18n } from "vue-i18n";import type { ComposedDatabase } from "@/types";diff --git a/frontend/src/views/sql-editor/EditorPanel/Panels/PackagesPanel/PackagesTable.vue b/frontend/src/views/sql-editor/EditorPanel/Panels/PackagesPanel/PackagesTable.vueindex 8979a7e802..f4ce99ddae 100644--- a/frontend/src/views/sql-editor/EditorPanel/Panels/PackagesPanel/PackagesTable.vue+++ b/frontend/src/views/sql-editor/EditorPanel/Panels/PackagesPanel/PackagesTable.vue@@ -21,7 +21,7 @@</template><script setup lang="tsx">-import { NDataTable, type DataTableColumn } from "naive-ui";+import { type DataTableColumn, NDataTable } from "naive-ui";import { computed, h, watch } from "vue";import { useI18n } from "vue-i18n";import type { ComposedDatabase } from "@/types";diff --git a/frontend/src/views/sql-editor/EditorPanel/Panels/Panels.vue b/frontend/src/views/sql-editor/EditorPanel/Panels/Panels.vueindex f6b070d886..d01d801d45 100644--- a/frontend/src/views/sql-editor/EditorPanel/Panels/Panels.vue+++ b/frontend/src/views/sql-editor/EditorPanel/Panels/Panels.vue@@ -72,6 +72,7 @@ import {} from "@/utils";import DatabaseChooser from "@/views/sql-editor/EditorCommon/DatabaseChooser.vue";import { useCurrentTabViewStateContext } from "../context/viewState.tsx";+import { SchemaSelectToolbar } from "./common";import DiagramPanel from "./DiagramPanel";import ExternalTablesPanel from "./ExternalTablesPanel";import FunctionsPanel from "./FunctionsPanel";@@ -82,7 +83,6 @@ import SequencesPanel from "./SequencesPanel";import TablesPanel from "./TablesPanel";import TriggersPanel from "./TriggersPanel/TriggersPanel.vue";import ViewsPanel from "./ViewsPanel";-import { SchemaSelectToolbar } from "./common";defineProps<{contentClass?: VueClass;diff --git a/frontend/src/views/sql-editor/EditorPanel/Panels/ProceduresPanel/ProceduresTable.vue b/frontend/src/views/sql-editor/EditorPanel/Panels/ProceduresPanel/ProceduresTable.vueindex d36d42f3ca..d8b9c3fe36 100644--- a/frontend/src/views/sql-editor/EditorPanel/Panels/ProceduresPanel/ProceduresTable.vue+++ b/frontend/src/views/sql-editor/EditorPanel/Panels/ProceduresPanel/ProceduresTable.vue@@ -21,7 +21,7 @@</template><script setup lang="tsx">-import { NDataTable, type DataTableColumn } from "naive-ui";+import { type DataTableColumn, NDataTable } from "naive-ui";import { computed, h, watch } from "vue";import { useI18n } from "vue-i18n";import type { ComposedDatabase } from "@/types";diff --git a/frontend/src/views/sql-editor/EditorPanel/Panels/SequencesPanel/SequencesTable.vue b/frontend/src/views/sql-editor/EditorPanel/Panels/SequencesPanel/SequencesTable.vueindex 9060590228..a4f8910f0f 100644--- a/frontend/src/views/sql-editor/EditorPanel/Panels/SequencesPanel/SequencesTable.vue+++ b/frontend/src/views/sql-editor/EditorPanel/Panels/SequencesPanel/SequencesTable.vue@@ -21,14 +21,14 @@</template><script setup lang="tsx">-import { NCheckbox, NDataTable, type DataTableColumn } from "naive-ui";+import { type DataTableColumn, NCheckbox, NDataTable } from "naive-ui";import { computed, h, watch } from "vue";import { useI18n } from "vue-i18n";import type { ComposedDatabase } from "@/types";import type {DatabaseMetadata,- SequenceMetadata,SchemaMetadata,+ SequenceMetadata,} from "@/types/proto-es/v1/database_service_pb";import { useAutoHeightDataTable } from "@/utils";import { keyWithPosition } from "@/views/sql-editor/EditorCommon";diff --git a/frontend/src/views/sql-editor/EditorPanel/Panels/TablesPanel/PartitionsTable.vue b/frontend/src/views/sql-editor/EditorPanel/Panels/TablesPanel/PartitionsTable.vueindex 78d5003331..10c0dd5b66 100644--- a/frontend/src/views/sql-editor/EditorPanel/Panels/TablesPanel/PartitionsTable.vue+++ b/frontend/src/views/sql-editor/EditorPanel/Panels/TablesPanel/PartitionsTable.vue@@ -19,15 +19,15 @@<script setup lang="tsx">import { ChevronDownIcon } from "lucide-vue-next";-import { NDataTable, type DataTableColumn } from "naive-ui";+import { type DataTableColumn, NDataTable } from "naive-ui";import { computed, h, watch } from "vue";import { useI18n } from "vue-i18n";import type { ComposedDatabase } from "@/types";import type {- TablePartitionMetadata,DatabaseMetadata,SchemaMetadata,TableMetadata,+ TablePartitionMetadata,} from "@/types/proto-es/v1/database_service_pb";import { getHighlightHTMLByRegExp, useAutoHeightDataTable } from "@/utils";import { useCurrentTabViewStateContext } from "../../context/viewState";diff --git a/frontend/src/views/sql-editor/EditorPanel/Panels/TablesPanel/TablesTable.vue b/frontend/src/views/sql-editor/EditorPanel/Panels/TablesPanel/TablesTable.vueindex fa32ab2e89..5e95c9e884 100644--- a/frontend/src/views/sql-editor/EditorPanel/Panels/TablesPanel/TablesTable.vue+++ b/frontend/src/views/sql-editor/EditorPanel/Panels/TablesPanel/TablesTable.vue@@ -19,7 +19,7 @@</template><script setup lang="tsx">-import { NDataTable, type DataTableColumn } from "naive-ui";+import { type DataTableColumn, NDataTable } from "naive-ui";import { computed, h, watch } from "vue";import { useI18n } from "vue-i18n";import type { ComposedDatabase } from "@/types";@@ -31,9 +31,9 @@ import type {import {bytesToString,getHighlightHTMLByRegExp,- instanceV1HasCollationAndCharacterSet,hasIndexSizeProperty,hasTableEngineProperty,+ instanceV1HasCollationAndCharacterSet,useAutoHeightDataTable,} from "@/utils";import { EllipsisCell } from "../../common";diff --git a/frontend/src/views/sql-editor/EditorPanel/Panels/TablesPanel/TriggersTable.vue b/frontend/src/views/sql-editor/EditorPanel/Panels/TablesPanel/TriggersTable.vueindex bf322a8bf7..c1f6419cf7 100644--- a/frontend/src/views/sql-editor/EditorPanel/Panels/TablesPanel/TriggersTable.vue+++ b/frontend/src/views/sql-editor/EditorPanel/Panels/TablesPanel/TriggersTable.vue@@ -51,7 +51,7 @@<script setup lang="tsx">import { ChevronDownIcon } from "lucide-vue-next";-import { NButton, NDataTable, type DataTableColumn } from "naive-ui";+import { type DataTableColumn, NButton, NDataTable } from "naive-ui";import { Pane, Splitpanes } from "splitpanes";import { computed, ref, watch } from "vue";import { useI18n } from "vue-i18n";@@ -59,9 +59,9 @@ import { TriggerIcon } from "@/components/Icon";import type { ComposedDatabase } from "@/types";import type {DatabaseMetadata,- TriggerMetadata,SchemaMetadata,TableMetadata,+ TriggerMetadata,} from "@/types/proto-es/v1/database_service_pb";import { useAutoHeightDataTable } from "@/utils";import {diff --git a/frontend/src/views/sql-editor/EditorPanel/Panels/TriggersPanel/TriggersTable.vue b/frontend/src/views/sql-editor/EditorPanel/Panels/TriggersPanel/TriggersTable.vueindex f67e6aa291..7ae5d1b027 100644--- a/frontend/src/views/sql-editor/EditorPanel/Panels/TriggersPanel/TriggersTable.vue+++ b/frontend/src/views/sql-editor/EditorPanel/Panels/TriggersPanel/TriggersTable.vue@@ -21,15 +21,15 @@</template><script setup lang="tsx">-import { NDataTable, type DataTableColumn } from "naive-ui";+import { type DataTableColumn, NDataTable } from "naive-ui";import { computed, h, watch } from "vue";import { useI18n } from "vue-i18n";import type { ComposedDatabase } from "@/types";import type {DatabaseMetadata,- TriggerMetadata,SchemaMetadata,TableMetadata,+ TriggerMetadata,} from "@/types/proto-es/v1/database_service_pb";import { getHighlightHTMLByRegExp, useAutoHeightDataTable } from "@/utils";import { keyWithPosition } from "@/views/sql-editor/EditorCommon";diff --git a/frontend/src/views/sql-editor/EditorPanel/Panels/ViewsPanel/DefinitionViewer.vue b/frontend/src/views/sql-editor/EditorPanel/Panels/ViewsPanel/DefinitionViewer.vueindex 2b7a5a99f9..f2cfcba586 100644--- a/frontend/src/views/sql-editor/EditorPanel/Panels/ViewsPanel/DefinitionViewer.vue+++ b/frontend/src/views/sql-editor/EditorPanel/Panels/ViewsPanel/DefinitionViewer.vue@@ -37,8 +37,8 @@ import { Pane, Splitpanes } from "splitpanes";import { computed, ref } from "vue";import { BBSpin } from "@/bbkit";import {- MonacoEditor,type IStandaloneCodeEditor,+ MonacoEditor,type MonacoModule,} from "@/components/MonacoEditor";import formatSQL from "@/components/MonacoEditor/sqlFormatter";diff --git a/frontend/src/views/sql-editor/EditorPanel/Panels/ViewsPanel/ViewsPanel.vue b/frontend/src/views/sql-editor/EditorPanel/Panels/ViewsPanel/ViewsPanel.vueindex ab19166730..25e9ef7465 100644--- a/frontend/src/views/sql-editor/EditorPanel/Panels/ViewsPanel/ViewsPanel.vue+++ b/frontend/src/views/sql-editor/EditorPanel/Panels/ViewsPanel/ViewsPanel.vue@@ -40,8 +40,8 @@ import {} from "@/store";import type {DatabaseMetadata,- ViewMetadata,SchemaMetadata,+ ViewMetadata,} from "@/types/proto-es/v1/database_service_pb";import { useCurrentTabViewStateContext } from "../../context/viewState";import ViewDetail from "./ViewDetail.vue";diff --git a/frontend/src/views/sql-editor/EditorPanel/Panels/ViewsPanel/ViewsTable.vue b/frontend/src/views/sql-editor/EditorPanel/Panels/ViewsPanel/ViewsTable.vueindex 5c0c4e6c8d..20d3c70fb0 100644--- a/frontend/src/views/sql-editor/EditorPanel/Panels/ViewsPanel/ViewsTable.vue+++ b/frontend/src/views/sql-editor/EditorPanel/Panels/ViewsPanel/ViewsTable.vue@@ -19,14 +19,14 @@</template><script setup lang="tsx">-import { NDataTable, type DataTableColumn } from "naive-ui";+import { type DataTableColumn, NDataTable } from "naive-ui";import { computed, h, watch } from "vue";import { useI18n } from "vue-i18n";import type { ComposedDatabase } from "@/types";import type {DatabaseMetadata,- ViewMetadata,SchemaMetadata,+ ViewMetadata,} from "@/types/proto-es/v1/database_service_pb";import { getHighlightHTMLByRegExp, useAutoHeightDataTable } from "@/utils";import { EllipsisCell } from "../../common";diff --git a/frontend/src/views/sql-editor/EditorPanel/Panels/common/CodeViewer.vue b/frontend/src/views/sql-editor/EditorPanel/Panels/common/CodeViewer.vueindex fd5c443dde..bb3d5997e2 100644--- a/frontend/src/views/sql-editor/EditorPanel/Panels/common/CodeViewer.vue+++ b/frontend/src/views/sql-editor/EditorPanel/Panels/common/CodeViewer.vue@@ -71,8 +71,8 @@ import { Pane, Splitpanes } from "splitpanes";import { computed, ref } from "vue";import { BBSpin } from "@/bbkit";import {- MonacoEditor,type IStandaloneCodeEditor,+ MonacoEditor,type MonacoModule,} from "@/components/MonacoEditor";import formatSQL from "@/components/MonacoEditor/sqlFormatter";@@ -82,8 +82,8 @@ import * as promptUtils from "@/plugins/ai/logic/prompt";import type { ComposedDatabase } from "@/types";import { dialectOfEngineV1 } from "@/types";import { nextAnimationFrame, type VueClass } from "@/utils";-import { OpenAIButton } from "@/views/sql-editor/EditorCommon";import { useSQLEditorContext } from "@/views/sql-editor/context";+import { OpenAIButton } from "@/views/sql-editor/EditorCommon";const props = defineProps<{db: ComposedDatabase;diff --git a/frontend/src/views/sql-editor/EditorPanel/ResultPanel/BatchQuerySelect.vue b/frontend/src/views/sql-editor/EditorPanel/ResultPanel/BatchQuerySelect.vueindex 34a2cb5a2f..fb931a3fe4 100644--- a/frontend/src/views/sql-editor/EditorPanel/ResultPanel/BatchQuerySelect.vue+++ b/frontend/src/views/sql-editor/EditorPanel/ResultPanel/BatchQuerySelect.vue@@ -104,13 +104,13 @@import { create } from "@bufbuild/protobuf";import dayjs from "dayjs";import { head } from "lodash-es";-import { EyeIcon, EyeOffIcon, CircleAlertIcon, XIcon } from "lucide-vue-next";-import { NButton, NTooltip, NScrollbar } from "naive-ui";+import { CircleAlertIcon, EyeIcon, EyeOffIcon, XIcon } from "lucide-vue-next";+import { NButton, NScrollbar, NTooltip } from "naive-ui";import { storeToRefs } from "pinia";-import { computed, watch, ref } from "vue";+import { computed, ref, watch } from "vue";import type {- ExportOption,DownloadContent,+ ExportOption,} from "@/components/DataExportButton.vue";import DataExportButton from "@/components/DataExportButton.vue";import RequiredStar from "@/components/RequiredStar.vue";diff --git a/frontend/src/views/sql-editor/EditorPanel/ResultPanel/DatabaseQueryContext.vue b/frontend/src/views/sql-editor/EditorPanel/ResultPanel/DatabaseQueryContext.vueindex 01ce7c4d12..082dd0d252 100644--- a/frontend/src/views/sql-editor/EditorPanel/ResultPanel/DatabaseQueryContext.vue+++ b/frontend/src/views/sql-editor/EditorPanel/ResultPanel/DatabaseQueryContext.vue@@ -45,10 +45,10 @@ import { useCurrentTimestamp } from "@/composables/useCurrentTimestamp";import { useExecuteSQL } from "@/composables/useExecuteSQL";import { useSQLEditorTabStore } from "@/store";import type {+ ComposedDatabase,SQLEditorDatabaseQueryContext,SQLEditorQueryParams,} from "@/types";-import type { ComposedDatabase } from "@/types";import { ResultViewV1 } from "../../EditorCommon/";const props = defineProps<{diff --git a/frontend/src/views/sql-editor/EditorPanel/ResultPanel/ResultPanel.vue b/frontend/src/views/sql-editor/EditorPanel/ResultPanel/ResultPanel.vueindex 6651f6ec8c..c62b653963 100644--- a/frontend/src/views/sql-editor/EditorPanel/ResultPanel/ResultPanel.vue+++ b/frontend/src/views/sql-editor/EditorPanel/ResultPanel/ResultPanel.vue@@ -91,14 +91,13 @@import dayjs from "dayjs";import { CircleAlertIcon, XIcon } from "lucide-vue-next";import type { DropdownOption } from "naive-ui";-import { NTabs, NTabPane, NTooltip, NDropdown } from "naive-ui";-import { computed, ref, watch, nextTick } from "vue";+import { NDropdown, NTabPane, NTabs, NTooltip } from "naive-ui";+import { computed, nextTick, ref, watch } from "vue";import { useI18n } from "vue-i18n";-import { BBSpin } from "@/bbkit";-import { BBAttention } from "@/bbkit";+import { BBAttention, BBSpin } from "@/bbkit";import { useSQLEditorTabStore } from "@/store";-import { getDataSourceTypeI18n } from "@/types";import type { ComposedDatabase, SQLEditorDatabaseQueryContext } from "@/types";+import { getDataSourceTypeI18n } from "@/types";import BatchQuerySelect from "./BatchQuerySelect.vue";import DatabaseQueryContext from "./DatabaseQueryContext.vue";diff --git a/frontend/src/views/sql-editor/EditorPanel/StandardPanel/SQLEditor.vue b/frontend/src/views/sql-editor/EditorPanel/StandardPanel/SQLEditor.vueindex 1caf79342d..9c04a9fc8a 100644--- a/frontend/src/views/sql-editor/EditorPanel/StandardPanel/SQLEditor.vue+++ b/frontend/src/views/sql-editor/EditorPanel/StandardPanel/SQLEditor.vue@@ -32,17 +32,16 @@</template><script lang="ts" setup>-import { type IDisposable } from "monaco-editor";-import { type IRange, Selection } from "monaco-editor";+import { type IDisposable, type IRange, Selection } from "monaco-editor";import { storeToRefs } from "pinia";import { v1 as uuidv1 } from "uuid";-import { computed, onBeforeUnmount, ref, watch, nextTick } from "vue";+import { computed, nextTick, onBeforeUnmount, ref, watch } from "vue";import type {AdviceOption,IStandaloneCodeEditor,MonacoModule,+ Selection as MonacoSelection,} from "@/components/MonacoEditor";-import type { Selection as MonacoSelection } from "@/components/MonacoEditor";import MonacoEditor from "@/components/MonacoEditor/MonacoEditor.vue";import {extensionNameOfLanguage,@@ -53,22 +52,22 @@ import { useAIActions } from "@/plugins/ai";import { useAIContext } from "@/plugins/ai/logic";import * as promptUtils from "@/plugins/ai/logic/prompt";import {+ useConnectionOfCurrentSQLEditorTab,+ useSQLEditorTabStore,useUIStateStore,useWorkSheetAndTabStore,- useSQLEditorTabStore,- useConnectionOfCurrentSQLEditorTab,} from "@/store";import type { SQLDialect, SQLEditorQueryParams } from "@/types";import { dialectOfEngineV1 } from "@/types";import { Engine } from "@/types/proto-es/v1/common_pb";import {+ instanceV1AllowsExplain,nextAnimationFrame,useInstanceV1EditorLanguage,- instanceV1AllowsExplain,} from "@/utils";import { useSQLEditorContext } from "../../context";-import UploadFileButton from "./UploadFileButton.vue";import { activeSQLEditorRef } from "./state";+import UploadFileButton from "./UploadFileButton.vue";const emit = defineEmits<{(e: "execute", params: SQLEditorQueryParams): void;diff --git a/frontend/src/views/sql-editor/EditorPanel/StandardPanel/StandardPanel.vue b/frontend/src/views/sql-editor/EditorPanel/StandardPanel/StandardPanel.vueindex 4e0ff4eaa1..587ba2e267 100644--- a/frontend/src/views/sql-editor/EditorPanel/StandardPanel/StandardPanel.vue+++ b/frontend/src/views/sql-editor/EditorPanel/StandardPanel/StandardPanel.vue@@ -88,12 +88,12 @@ import {instanceV1HasReadonlyMode,suggestedTabTitleForSQLEditorConnection,} from "@/utils";+import { useSQLEditorContext } from "../../context";import {EditorAction,ExecutingHintModal,SaveSheetModal,} from "../../EditorCommon";-import { useSQLEditorContext } from "../../context";import ReadonlyModeNotSupported from "../ReadonlyModeNotSupported.vue";import ResultPanel from "../ResultPanel";import Welcome from "../Welcome";diff --git a/frontend/src/views/sql-editor/EditorPanel/TerminalPanel/CompactSQLEditor.vue b/frontend/src/views/sql-editor/EditorPanel/TerminalPanel/CompactSQLEditor.vueindex b71a5004f7..27ea72b027 100644--- a/frontend/src/views/sql-editor/EditorPanel/TerminalPanel/CompactSQLEditor.vue+++ b/frontend/src/views/sql-editor/EditorPanel/TerminalPanel/CompactSQLEditor.vue@@ -39,18 +39,18 @@ import type {} from "@/components/MonacoEditor";import MonacoEditor from "@/components/MonacoEditor/MonacoEditor.vue";import {- useEditorContextKey,formatEditorContent,+ useEditorContextKey,} from "@/components/MonacoEditor/utils";import { useEmitteryEventListener } from "@/composables/useEmitteryEventListener";import {- useSQLEditorTabStore,useConnectionOfCurrentSQLEditorTab,+ useSQLEditorTabStore,} from "@/store";import type { SQLDialect, SQLEditorQueryParams } from "@/types";import { dialectOfEngineV1 } from "@/types";import { Engine } from "@/types/proto-es/v1/common_pb";-import { useInstanceV1EditorLanguage, instanceV1AllowsExplain } from "@/utils";+import { instanceV1AllowsExplain, useInstanceV1EditorLanguage } from "@/utils";import { useSQLEditorContext } from "../../context";import {checkCursorAtFirstLine,diff --git a/frontend/src/views/sql-editor/EditorPanel/TerminalPanel/TerminalPanel.vue b/frontend/src/views/sql-editor/EditorPanel/TerminalPanel/TerminalPanel.vueindex 80b45204e8..9913d9ccf6 100644--- a/frontend/src/views/sql-editor/EditorPanel/TerminalPanel/TerminalPanel.vue+++ b/frontend/src/views/sql-editor/EditorPanel/TerminalPanel/TerminalPanel.vue@@ -79,20 +79,26 @@<script lang="ts" setup>import { useElementSize } from "@vueuse/core";-import { computed, defineAsyncComponent, ref, unref, watch } from "vue";-import { watchEffect } from "vue";+import {+ computed,+ defineAsyncComponent,+ ref,+ unref,+ watch,+ watchEffect,+} from "vue";import { BBSpin } from "@/bbkit";import type { IStandaloneCodeEditor } from "@/components/MonacoEditor";import {- useSQLEditorTabStore,+ batchGetOrFetchDatabases,useDatabaseV1Store,+ useSQLEditorTabStore,useWebTerminalStore,- batchGetOrFetchDatabases,} from "@/store";import type { SQLEditorQueryParams, WebTerminalQueryItemV1 } from "@/types";import {- EditorAction,ConnectionHolder,+ EditorAction,ResultViewV1,} from "../../EditorCommon";import { useHistory } from "./useHistory";diff --git a/frontend/src/views/sql-editor/EditorPanel/context/viewState.tsx b/frontend/src/views/sql-editor/EditorPanel/context/viewState.tsxindex cefda1741b..f5070fb751 100644--- a/frontend/src/views/sql-editor/EditorPanel/context/viewState.tsx+++ b/frontend/src/views/sql-editor/EditorPanel/context/viewState.tsx@@ -1,15 +1,15 @@import { InfoIcon } from "lucide-vue-next";import { storeToRefs } from "pinia";-import { computed, inject, provide, watch, type InjectionKey } from "vue";import type { VNodeChild } from "vue";+import { computed, type InjectionKey, inject, provide, watch } from "vue";import {- FunctionIcon,- TableIcon,- ViewIcon,- ProcedureIcon,ExternalTableIcon,+ FunctionIcon,PackageIcon,+ ProcedureIcon,SequenceIcon,+ TableIcon,+ ViewIcon,} from "@/components/Icon";import { SchemaDiagramIcon } from "@/components/SchemaDiagram";import { t } from "@/plugins/i18n";diff --git a/frontend/src/views/sql-editor/SQLEditorHomePage.vue b/frontend/src/views/sql-editor/SQLEditorHomePage.vueindex 92c36606a4..159d545cb7 100644--- a/frontend/src/views/sql-editor/SQLEditorHomePage.vue+++ b/frontend/src/views/sql-editor/SQLEditorHomePage.vue@@ -59,7 +59,7 @@<script lang="ts" setup>import { useWindowSize } from "@vueuse/core";import { storeToRefs } from "pinia";-import { Splitpanes, Pane } from "splitpanes";+import { Pane, Splitpanes } from "splitpanes";import { reactive } from "vue";import { useRouter } from "vue-router";import IAMRemindModal from "@/components/IAMRemindModal.vue";@@ -68,18 +68,18 @@ import { Drawer } from "@/components/v2";import { useEmitteryEventListener } from "@/composables/useEmitteryEventListener";import { PROJECT_V1_ROUTE_ISSUE_DETAIL } from "@/router/dashboard/projectV1";import {+ useActuatorV1Store,useDatabaseV1Store,- useSQLEditorTabStore,useSQLEditorStore,- useActuatorV1Store,+ useSQLEditorTabStore,} from "@/store";import { extractProjectResourceName } from "@/utils";import AsidePanel from "./AsidePanel";import ConnectionPanel from "./ConnectionPanel";+import { useSQLEditorContext } from "./context";import EditorPanel from "./EditorPanel";import { provideCurrentTabViewStateContext } from "./EditorPanel/context/viewState";import TabList from "./TabList";-import { useSQLEditorContext } from "./context";type LocalState = {sidebarExpanded: boolean;diff --git a/frontend/src/views/sql-editor/Sheet/context.ts b/frontend/src/views/sql-editor/Sheet/context.tsindex 6b20f732df..3baa1cc640 100644--- a/frontend/src/views/sql-editor/Sheet/context.ts+++ b/frontend/src/views/sql-editor/Sheet/context.ts@@ -1,34 +1,34 @@import { useDebounceFn } from "@vueuse/core";import Emittery from "emittery";-import { orderBy, isEqual } from "lodash-es";+import { isEqual, orderBy } from "lodash-es";import type { TreeOption } from "naive-ui";import scrollIntoView from "scroll-into-view-if-needed";-import type { InjectionKey, Ref, ComputedRef } from "vue";-import { inject, provide, ref, computed, watch, nextTick } from "vue";+import type { ComputedRef, InjectionKey, Ref } from "vue";+import { computed, inject, nextTick, provide, ref, watch } from "vue";import { t } from "@/plugins/i18n";import {pushNotification,+ useCurrentUserV1,useDatabaseV1Store,useSQLEditorTabStore,useWorkSheetStore,- useCurrentUserV1,} from "@/store";-import { DEBOUNCE_SEARCH_DELAY } from "@/types";import type { SQLEditorTab } from "@/types";+import { DEBOUNCE_SEARCH_DELAY } from "@/types";import {- Worksheet_Visibility,type Worksheet,+ Worksheet_Visibility,} from "@/types/proto-es/v1/worksheet_service_pb";import {emptySQLEditorConnection,+ extractWorksheetUID,getSheetStatement,isWorksheetReadableV1,- extractWorksheetUID,suggestedTabTitleForSQLEditorConnection,+ useDynamicLocalStorage,} from "@/utils";-import { useDynamicLocalStorage } from "@/utils";-import { setDefaultDataSourceForConn } from "../EditorCommon";import type { SQLEditorContext } from "../context";+import { setDefaultDataSourceForConn } from "../EditorCommon";import { useFolderByView } from "./folder";import type { SheetViewMode } from "./types";diff --git a/frontend/src/views/sql-editor/TabList/TabItem/AdminLabel.vue b/frontend/src/views/sql-editor/TabList/TabItem/AdminLabel.vueindex 32040aa65c..10fc0c01ec 100644--- a/frontend/src/views/sql-editor/TabList/TabItem/AdminLabel.vue+++ b/frontend/src/views/sql-editor/TabList/TabItem/AdminLabel.vue@@ -22,8 +22,12 @@ import { ChevronRightIcon } from "lucide-vue-next";import { computed } from "vue";import { EnvironmentV1Name } from "@/components/v2";import { useDatabaseV1ByName } from "@/store";-import { type SQLEditorTab, UNKNOWN_ID } from "@/types";-import { isValidInstanceName, isValidDatabaseName } from "@/types";+import {+ isValidDatabaseName,+ isValidInstanceName,+ type SQLEditorTab,+ UNKNOWN_ID,+} from "@/types";const props = defineProps<{tab: SQLEditorTab;diff --git a/frontend/src/views/sql-editor/TabList/TabItem/Label.vue b/frontend/src/views/sql-editor/TabList/TabItem/Label.vueindex 51eaac1a10..a3bb519a1f 100644--- a/frontend/src/views/sql-editor/TabList/TabItem/Label.vue+++ b/frontend/src/views/sql-editor/TabList/TabItem/Label.vue@@ -31,8 +31,8 @@ import { computed, nextTick, reactive, ref, watch } from "vue";import { useEmitteryEventListener } from "@/composables/useEmitteryEventListener";import {useSQLEditorTabStore,- useWorkSheetStore,useTabViewStateStore,+ useWorkSheetStore,} from "@/store";import type { SQLEditorTab } from "@/types";import { WorksheetSchema } from "@/types/proto-es/v1/worksheet_service_pb";diff --git a/frontend/src/views/sql-editor/TabList/TabItem/Prefix.vue b/frontend/src/views/sql-editor/TabList/TabItem/Prefix.vueindex 36ee6d639f..6ebc1403b0 100644--- a/frontend/src/views/sql-editor/TabList/TabItem/Prefix.vue+++ b/frontend/src/views/sql-editor/TabList/TabItem/Prefix.vue@@ -13,7 +13,7 @@</template><script lang="ts" setup>-import { WrenchIcon, UsersIcon } from "lucide-vue-next";+import { UsersIcon, WrenchIcon } from "lucide-vue-next";import { computed } from "vue";import { useWorkSheetStore } from "@/store";import type { SQLEditorTab } from "@/types";diff --git a/frontend/src/views/sql-editor/TabList/TabList.vue b/frontend/src/views/sql-editor/TabList/TabList.vueindex ecf0dc7d92..fa565c878a 100644--- a/frontend/src/views/sql-editor/TabList/TabList.vue+++ b/frontend/src/views/sql-editor/TabList/TabList.vue@@ -68,7 +68,7 @@ import { useResizeObserver } from "@vueuse/core";import { PlusIcon } from "lucide-vue-next";import { NScrollbar, useDialog } from "naive-ui";import scrollIntoView from "scroll-into-view-if-needed";-import { ref, reactive, nextTick, computed, onMounted, watch } from "vue";+import { computed, nextTick, onMounted, reactive, ref, watch } from "vue";import { useI18n } from "vue-i18n";import Draggable from "vuedraggable";import ProfileDropdown from "@/components/ProfileDropdown.vue";@@ -79,8 +79,8 @@ import { defer, usePreventBackAndForward } from "@/utils";import { useSQLEditorContext } from "../context";import BrandingLogoWrapper from "./BrandingLogoWrapper.vue";import ContextMenu from "./ContextMenu.vue";-import TabItem from "./TabItem";import { provideTabListContext } from "./context";+import TabItem from "./TabItem";type LocalState = {dragging: boolean;diff --git a/frontend/tailwind.config.js b/frontend/tailwind.config.jsindex 9e95794581..1c0afec26b 100644--- a/frontend/tailwind.config.js+++ b/frontend/tailwind.config.js@@ -80,7 +80,7 @@ module.exports = {"rgb(var(--color-matrix-green-hover) / <alpha-value>)",},fontFamily: {- sans: ["Inter var", ...defaultTheme.fontFamily.sans],+ sans: [...defaultTheme.fontFamily.sans],},spacing: {112: "28rem",diff --git a/frontend/vite-plugin-export-csp-hashes.ts b/frontend/vite-plugin-export-csp-hashes.tsindex e2ca2bd4e1..985d5c28f5 100644--- a/frontend/vite-plugin-export-csp-hashes.ts+++ b/frontend/vite-plugin-export-csp-hashes.ts@@ -1,6 +1,6 @@import { createHash } from "crypto";-import { writeFileSync, readFileSync, readdirSync, statSync } from "fs";-import { resolve, dirname, join } from "path";+import { readdirSync, readFileSync, statSync, writeFileSync } from "fs";+import { dirname, join, resolve } from "path";import { fileURLToPath } from "url";import type { Plugin } from "vite";diff --git a/frontend/vite.config.ts b/frontend/vite.config.tsindex 6d2bbf8c67..88d039f308 100644--- a/frontend/vite.config.ts+++ b/frontend/vite.config.ts@@ -1,3 +1,4 @@+import { fileURLToPath, URL } from "node:url";import importMetaUrlPlugin from "@codingame/esbuild-import-meta-url-plugin";import VueI18nPlugin from "@intlify/unplugin-vue-i18n/vite";import yaml from "@rollup/plugin-yaml";@@ -6,7 +7,6 @@ import legacy from "@vitejs/plugin-legacy";import vue from "@vitejs/plugin-vue";import vueJsx from "@vitejs/plugin-vue-jsx";import { CodeInspectorPlugin } from "code-inspector-plugin";-import { fileURLToPath, URL } from "node:url";import { resolve } from "path";import IconsResolver from "unplugin-icons/resolver";import Icons from "unplugin-icons/vite";diff --git a/frontend/vitest.config.ts b/frontend/vitest.config.tsindex 08c971b83c..a1151d72ef 100644--- a/frontend/vitest.config.ts+++ b/frontend/vitest.config.ts@@ -1,5 +1,5 @@import { fileURLToPath } from "node:url";-import { mergeConfig, defineConfig, configDefaults } from "vitest/config";+import { configDefaults, defineConfig, mergeConfig } from "vitest/config";import viteConfig from "./vite.config";export default mergeConfig(