Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
chore: several fix and optimize (#19404)
ecmadao3034d2d5af01
diff --git a/backend/store/access_grant.go b/backend/store/access_grant.goindex 36f5425069..322e25b73d 100644--- a/backend/store/access_grant.go+++ b/backend/store/access_grant.go@@ -307,6 +307,15 @@ func GetListAccessGrantFilter(filter string) (*qb.Query, error) {case celast.CallKind:functionName := expr.AsCall().FunctionName()switch functionName {+ case celoperators.LogicalOr:+ for _, arg := range expr.AsCall().Args() {+ qq, err := getFilter(arg)+ if err != nil {+ return nil, err+ }+ q.Or("?", qq)+ }+ return qb.Q().Space("(?)", q), nilcase celoperators.LogicalAnd:for _, arg := range expr.AsCall().Args() {qq, err := getFilter(arg)diff --git a/frontend/src/components/ProjectMember/ProjectMemberRolePanel/index.vue b/frontend/src/components/ProjectMember/ProjectMemberRolePanel/index.vueindex e5a197bac9..f20a292d9d 100644--- a/frontend/src/components/ProjectMember/ProjectMemberRolePanel/index.vue+++ b/frontend/src/components/ProjectMember/ProjectMemberRolePanel/index.vue@@ -49,8 +49,8 @@>{{ $t("project.members.project-level-roles") }}</p>- <div v-for="(b, index) in binding.projectRoleBindings" :key="index" class="mb-4">- <div class="py-2">+ <div v-for="(b, index) in binding.projectRoleBindings" :key="index" class="mb-4 flex flex-col gap-y-2">+ <div><divclass="w-full flex flex-row justify-start items-center gap-x-1">@@ -74,6 +74,21 @@{{ b.condition?.description }}</span></div>+ <BBAttention v-if="roleHasEnvironmentLimitation(b.role)" :type="'info'">+ <div v-if="getEnvironmentLimitation(b).length > 0">+ <p>+ {{ $t("project.members.allow-ddl") }}+ </p>+ <ul class="list-disc pl-4">+ <li v-for="env in getEnvironmentLimitation(b)" :key="env">+ {{ env }}+ </li>+ </ul>+ </div>+ <div v-else>+ {{ $t("project.members.disallow-ddl") }}+ </div>+ </BBAttention><NDataTablesize="small":columns="getDataTableColumns(b.role)"@@ -146,7 +161,7 @@ import {} from "naive-ui";import { computed, reactive, ref } from "vue";import { useI18n } from "vue-i18n";-import { BBButtonConfirm } from "@/bbkit";+import { BBAttention, BBButtonConfirm } from "@/bbkit";import type { MemberBinding } from "@/components/Member/types";import GroupMemberNameCell from "@/components/User/Settings/UserDataTableByGroup/cells/GroupMemberNameCell.vue";import GroupNameCell from "@/components/User/Settings/UserDataTableByGroup/cells/GroupNameCell.vue";@@ -167,7 +182,10 @@ import type { Project } from "@/types/proto-es/v1/project_service_pb";import { displayRoleTitle, hasProjectPermissionV2 } from "@/utils";import { convertFromExpr } from "@/utils/issue/cel";import AddProjectMembersPanel from "../AddProjectMember/AddProjectMembersPanel.vue";-import { roleHasDatabaseLimitation } from "../utils";+import {+ roleHasDatabaseLimitation,+ roleHasEnvironmentLimitation,+} from "../utils";import EditProjectRolePanel from "./EditProjectRolePanel.vue";import RoleExpiredTip from "./RoleExpiredTip.vue";@@ -351,6 +369,14 @@ const checkRoleExpired = (role: SingleBinding) => {return role.expiration < new Date();};+const getEnvironmentLimitation = (rawBinding: Binding): string[] => {+ if (!rawBinding.parsedExpr) {+ return [];+ }+ const conditionExpr = convertFromExpr(rawBinding.parsedExpr);+ return conditionExpr.environments ?? [];+};+const getSingleBindingList = (rawBinding: Binding): SingleBinding[] => {const singleBindingList = [];const singleBinding: SingleBinding = {};diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.jsonindex ead52e2f3c..824c836316 100644--- a/frontend/src/locales/en-US.json+++ b/frontend/src/locales/en-US.json@@ -1909,7 +1909,8 @@"workspace-level-roles": "Workspace level roles","project-level-roles": "Project level roles","roles-are-filtered-by-permissions": "Roles are filtered by the permissions",- "allow-ddl": "Allow running DDL/DML statement in the selected environments"+ "allow-ddl": "Allow running DDL/DML statements in the selected environments.",+ "disallow-ddl": "Disallow running DDL/DML statements for all environments."},"select": "Select Project","all": "All projects",diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.jsonindex 82c768bbea..90cadb5a4f 100644--- a/frontend/src/locales/es-ES.json+++ b/frontend/src/locales/es-ES.json@@ -1909,7 +1909,8 @@"workspace-level-roles": "Roles a nivel de espacio de trabajo","project-level-roles": "Roles a nivel de proyecto","roles-are-filtered-by-permissions": "Roles are filtered by the permissions",- "allow-ddl": "Permitir ejecutar sentencias DDL/DML en los entornos seleccionados"+ "allow-ddl": "Permitir ejecutar sentencias DDL/DML en los entornos seleccionados.",+ "disallow-ddl": "No permitir ejecutar sentencias DDL/DML en ningún entorno."},"select": "Seleccionar Proyecto","all": "Todos los proyectos",diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.jsonindex 7adca7b6bf..2e3b797be1 100644--- a/frontend/src/locales/ja-JP.json+++ b/frontend/src/locales/ja-JP.json@@ -1909,7 +1909,8 @@"workspace-level-roles": "ワークスペースレベルのロール","project-level-roles": "プロジェクトレベルのロール","roles-are-filtered-by-permissions": "Roles are filtered by the permissions",- "allow-ddl": "選択した環境で DDL/DML ステートメントの実行を許可する"+ "allow-ddl": "選択した環境で DDL/DML ステートメントの実行を許可する。",+ "disallow-ddl": "すべての環境で DDL/DML ステートメントの実行を禁止する。"},"select": "アイテムを選択","all": "全てのアイテム",diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.jsonindex ade7ca9286..9f524b447b 100644--- a/frontend/src/locales/vi-VN.json+++ b/frontend/src/locales/vi-VN.json@@ -1909,7 +1909,8 @@"workspace-level-roles": "Vai trò cấp độ không gian làm việc","project-level-roles": "Vai trò cấp độ dự án","roles-are-filtered-by-permissions": "Roles are filtered by the permissions",- "allow-ddl": "Cho phép chạy câu lệnh DDL/DML trong các môi trường đã chọn"+ "allow-ddl": "Cho phép chạy câu lệnh DDL/DML trong các môi trường đã chọn.",+ "disallow-ddl": "Không cho phép chạy câu lệnh DDL/DML trong tất cả các môi trường."},"select": "Chọn Dự án","all": "Tất cả dự án",diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.jsonindex 3f7a83b5c3..8f9609c397 100644--- a/frontend/src/locales/zh-CN.json+++ b/frontend/src/locales/zh-CN.json@@ -1909,7 +1909,8 @@"workspace-level-roles": "工作空间级别角色","project-level-roles": "项目级别角色","roles-are-filtered-by-permissions": "角色已按权限筛选",- "allow-ddl": "允许在所选环境中执行 DDL/DML 语句"+ "allow-ddl": "允许在所选环境中执行 DDL/DML 语句。",+ "disallow-ddl": "禁止在所有环境中执行 DDL/DML 语句。"},"select": "选择项目","all": "所有项目",diff --git a/frontend/src/store/modules/accessGrant.ts b/frontend/src/store/modules/accessGrant.tsindex 04d6cdc7b5..1d2b88634a 100644--- a/frontend/src/store/modules/accessGrant.ts+++ b/frontend/src/store/modules/accessGrant.ts@@ -11,18 +11,17 @@ import {RevokeAccessGrantRequestSchema,SearchMyAccessGrantsRequestSchema,} from "@/types/proto-es/v1/access_grant_service_pb";+import { type AccessGrantFilterStatus } from "@/utils";export interface AccessFilter {name?: string;statement?: string;creator?: string;- status?: AccessGrant_Status[];+ status?: AccessGrantFilterStatus[];issue?: string;target?: string;createdTsAfter?: number;createdTsBefore?: number;- expireTsAfter?: number;- expireTsBefore?: number;}const getListAccessFilter = (filter: AccessFilter | undefined): string => {@@ -33,9 +32,24 @@ const getListAccessFilter = (filter: AccessFilter | undefined): string => {parts.push(`name == "${filter.name}"`);}if (filter.status !== undefined && filter.status.length > 0) {- parts.push(- `status in [${filter.status.map((s) => `"${AccessGrant_Status[s]}"`).join(", ")}]`- );+ const statusFilter: string[] = [];+ for (const status of filter.status) {+ switch (status) {+ case "ACTIVE":+ statusFilter.push(+ `(status == "${AccessGrant_Status[AccessGrant_Status.ACTIVE]}" && expire_time > "${new Date().toISOString()}")`+ );+ break;+ case "EXPIRED":+ statusFilter.push(`expire_time <= "${new Date().toISOString()}"`);+ break;+ default:+ statusFilter.push(+ `status == "${status as keyof typeof AccessGrant_Status}"`+ );+ }+ }+ parts.push(`(${statusFilter.join(" || ")})`);}if (filter.statement) {parts.push(`query.matches("${filter.statement.trim()}")`);@@ -59,16 +73,6 @@ const getListAccessFilter = (filter: AccessFilter | undefined): string => {`create_time <= "${new Date(filter.createdTsBefore).toISOString()}"`);}- if (filter.expireTsAfter !== undefined) {- parts.push(- `expire_time >= "${new Date(filter.expireTsAfter).toISOString()}"`- );- }- if (filter.expireTsBefore !== undefined) {- parts.push(- `expire_time <= "${new Date(filter.expireTsBefore).toISOString()}"`- );- }return parts.join(" && ");};diff --git a/frontend/src/utils/accessGrant.ts b/frontend/src/utils/accessGrant.tsindex 8da198ba1c..d7f55106b1 100644--- a/frontend/src/utils/accessGrant.ts+++ b/frontend/src/utils/accessGrant.ts@@ -1,4 +1,5 @@import dayjs from "dayjs";+import { t } from "@/plugins/i18n";import { getTimeForPbTimestampProtoEs } from "@/types";import {type AccessGrant,@@ -10,11 +11,14 @@ import {IssueStatus,} from "@/types/proto-es/v1/issue_service_pb";-export type AccessGrantDisplayStatus =+export type AccessGrantFilterStatus =| "ACTIVE"| "PENDING"- | "EXPIRED"| "REVOKED"+ | "EXPIRED";++export type AccessGrantDisplayStatus =+ | AccessGrantFilterStatus| "REJECTED"| "CANCELED"| "UNKNOWN";@@ -88,6 +92,29 @@ export const getAccessGrantDisplayStatus = (}};+export const getAccessGrantDisplayStatusText = (+ grant: AccessGrant,+ issue?: Issue+) => {+ const displayStatus = getAccessGrantDisplayStatus(grant, issue);+ switch (displayStatus) {+ case "ACTIVE":+ return t("common.active");+ case "PENDING":+ return t("common.pending");+ case "EXPIRED":+ return t("sql-editor.expired");+ case "REVOKED":+ return t("common.revoked");+ case "REJECTED":+ return t("common.rejected");+ case "CANCELED":+ return t("common.canceled");+ default:+ return displayStatus;+ }+};+export const getAccessGrantStatusTagType = (status: AccessGrantDisplayStatus): "success" | "warning" | "error" | "default" => {diff --git a/frontend/src/views/project/ProjectAccessGrantDashboard.vue b/frontend/src/views/project/ProjectAccessGrantDashboard.vueindex 14ec17317d..588f0c3f6d 100644--- a/frontend/src/views/project/ProjectAccessGrantDashboard.vue+++ b/frontend/src/views/project/ProjectAccessGrantDashboard.vue@@ -16,6 +16,11 @@:autofocus="false":cache-query="true"/>+ <TimeRange+ v-model:show="showTimeRange"+ v-model:params="searchParams"+ @update:params="$emit('update:params', $event)"+ /></div><PagedTable@@ -77,7 +82,7 @@ import { useI18n } from "vue-i18n";import { useRouter } from "vue-router";import { BBAttention } from "@/bbkit";import BBAvatar from "@/bbkit/BBAvatar.vue";-import AdvancedSearch from "@/components/AdvancedSearch";+import AdvancedSearch, { TimeRange } from "@/components/AdvancedSearch";import type {ScopeOption,ValueOption,@@ -106,11 +111,14 @@ import {} from "@/types/proto-es/v1/access_grant_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import {+ type AccessGrantFilterStatus,extractDatabaseResourceName,getAccessGrantDisplayStatus,+ getAccessGrantDisplayStatusText,getAccessGrantExpirationText,getAccessGrantStatusTagType,getDefaultPagination,+ getTsRangeFromSearchParams,hasProjectPermissionV2,type SearchParams,} from "@/utils";@@ -133,6 +141,7 @@ const me = useCurrentUserV1();const userStore = useUserStore();const databaseStore = useDatabaseV1Store();const accessGrantStore = useAccessGrantStore();+const showTimeRange = ref(false);const projectName = computed(() => `${projectNamePrefix}${props.projectId}`);const { project } = useProjectByName(projectName);@@ -243,15 +252,12 @@ const scopeOptions = computed((): ScopeOption[] => [const filter = computed((): AccessFilter => {const f: AccessFilter = {};- const statuses = getValuesFromSearchParams(searchParams.value, "status");- f.status = statuses- .filter((s) => s !== "EXPIRED")- .map((s) => AccessGrant_Status[s as keyof typeof AccessGrant_Status]);- if (statuses.includes("EXPIRED")) {- f.expireTsBefore = Date.now();- } else if (f.status.includes(AccessGrant_Status.ACTIVE)) {- f.expireTsAfter = Date.now();- }+ const statuses = getValuesFromSearchParams(+ searchParams.value,+ "status"+ ) as AccessGrantFilterStatus[];+ f.status = statuses;+const creator = getValueFromSearchParams(searchParams.value,"creator",@@ -272,6 +278,15 @@ const filter = computed((): AccessFilter => {if (queryText) {f.statement = queryText;}++ const createdTsRange = getTsRangeFromSearchParams(+ searchParams.value,+ "created"+ );+ if (createdTsRange) {+ f.createdTsAfter = createdTsRange[0];+ f.createdTsBefore = createdTsRange[1];+ }return f;});@@ -359,7 +374,7 @@ const columns = computed((): DataTableColumn<AccessGrant>[] => [size: "small",bordered: false,},- { default: () => status }+ { default: () => getAccessGrantDisplayStatusText(grant) });},},diff --git a/frontend/src/views/sql-editor/AsidePanel/AccessPane/AccessGrantItem.vue b/frontend/src/views/sql-editor/AsidePanel/AccessPane/AccessGrantItem.vueindex f3d9441c60..63c7b1efd0 100644--- a/frontend/src/views/sql-editor/AsidePanel/AccessPane/AccessGrantItem.vue+++ b/frontend/src/views/sql-editor/AsidePanel/AccessPane/AccessGrantItem.vue@@ -1,6 +1,6 @@<template><div- class="w-full p-2 gap-y-2 border-b flex flex-col justify-start items-start cursor-pointer hover:bg-gray-50"+ class="w-full p-2 gap-y-2 border-b flex flex-col justify-start items-start hover:bg-gray-50":class="highlight ? 'highlight-pulse' : 'transition-colors duration-1000'"><div class="w-full flex flex-row justify-between items-center gap-x-2">@@ -12,16 +12,22 @@{{ $t("sql-editor.grant-type-unmask") }}</NTag></div>- <span class="text-xs text-gray-500 shrink-0">- {{ expirationText }}- </span>+ <NEllipsis+ v-if="expirationText"+ :line-clamp="1"+ :tooltip="true"+ >+ <span class="text-xs text-gray-500 shrink-0">+ {{ expirationText }}+ </span>+ </NEllipsis></div><NTooltip placement="right"><template #trigger><pclass="max-w-full text-xs wrap-break-word whitespace-pre-wrap font-mono line-clamp-2"- :class="{ 'line-through text-gray-400': isExpired || isRevoked || isRejectedOrCanceled }"+ :class="{ 'line-through text-gray-400': isExpired || isRejectedOrCanceled }">{{ grant.query }}</p>@@ -40,51 +46,53 @@<span v-for="name in allDatabaseNames" :key="name">{{ name }}</span></div></NTooltip>- <div class="flex items-center gap-x-1">- <NButton- v-if="isActive && !isExpired"- tertiary- size="tiny"- type="primary"- @click.stop="$emit('run', grant)"- >- {{ $t("common.run") }}- </NButton>- <NButton- v-else-if="grant.status !== AccessGrant_Status.PENDING"- tertiary- size="tiny"- @click.stop="$emit('request', grant)"- >- {{ $t("sql-editor.re-request") }}- </NButton>- <NButton- v-if="grant.issue"- tertiary- size="tiny"- tag="a"- :href="issueLink"- target="_blank"- @click.stop- >- {{ $t("sql-editor.view-issue") }}- </NButton>+ <div class="flex items-center justify-between gap-x-1">+ <div>+ <NButton+ v-if="isActive"+ size="tiny"+ secondary+ type="primary"+ @click.stop="$emit('run', grant)"+ >+ {{ $t("common.run") }}+ </NButton>+ </div>+ <div class="flex items-center gap-x-1">+ <NButton+ v-if="isRejectedOrCanceled"+ tertiary+ size="tiny"+ @click.stop="$emit('request', grant)"+ >+ {{ $t("sql-editor.re-request") }}+ </NButton>+ <NButton+ v-if="grant.issue"+ tertiary+ size="tiny"+ tag="a"+ :href="issueLink"+ target="_blank"+ @click.stop+ >+ {{ $t("sql-editor.view-issue") }}+ </NButton>+ </div></div></div></div></template><script setup lang="ts">-import { NButton, NTag, NTooltip } from "naive-ui";+import { NButton, NEllipsis, NTag, NTooltip } from "naive-ui";import { computed } from "vue";import { useI18n } from "vue-i18n";-import {- type AccessGrant,- AccessGrant_Status,-} from "@/types/proto-es/v1/access_grant_service_pb";+import { type AccessGrant } from "@/types/proto-es/v1/access_grant_service_pb";import type { Issue } from "@/types/proto-es/v1/issue_service_pb";import {getAccessGrantDisplayStatus,+ getAccessGrantDisplayStatusText,getAccessGrantExpirationText,getAccessGrantExpireTimeMs,getAccessGrantStatusTagType,@@ -103,50 +111,28 @@ defineEmits<{const { t } = useI18n();-const isActive = computed(- () => props.grant.status === AccessGrant_Status.ACTIVE-);+const expireTimeMs = computed(() => getAccessGrantExpireTimeMs(props.grant));-const isRevoked = computed(- () => props.grant.status === AccessGrant_Status.REVOKED+const displayStatus = computed(() =>+ getAccessGrantDisplayStatus(props.grant, props.issue));-const expireTimeMs = computed(() => getAccessGrantExpireTimeMs(props.grant));+const isActive = computed(() => displayStatus.value === "ACTIVE");const isExpired = computed(() => {- if (!isActive.value || expireTimeMs.value === undefined) return false;- return expireTimeMs.value < Date.now();+ return displayStatus.value === "EXPIRED";});-const displayStatus = computed(() =>- getAccessGrantDisplayStatus(props.grant, props.issue)-);-const statusTagType = computed(() =>getAccessGrantStatusTagType(displayStatus.value));const isRejectedOrCanceled = computed(- () => displayStatus.value === "REJECTED" || displayStatus.value === "CANCELED"+ () => displayStatus.value !== "ACTIVE" && displayStatus.value !== "PENDING");const statusLabel = computed(() => {- switch (displayStatus.value) {- case "ACTIVE":- return t("common.active");- case "PENDING":- return t("common.pending");- case "EXPIRED":- return t("sql-editor.expired");- case "REVOKED":- return t("common.revoked");- case "REJECTED":- return t("common.rejected");- case "CANCELED":- return t("common.canceled");- default:- return displayStatus.value;- }+ return getAccessGrantDisplayStatusText(props.grant, props.issue);});const expirationInfo = computed(() =>@@ -154,10 +140,17 @@ const expirationInfo = computed(() =>);const expirationText = computed(() => {+ // Only show the expiration for ACTIVE/EXPIRED+ if (displayStatus.value !== "ACTIVE" && displayStatus.value !== "EXPIRED") {+ return;+ }+const info = expirationInfo.value;- if (info.type === "never") return t("project.members.never-expires");- if (info.type === "duration") return info.value;- if (isActive.value && !isExpired.value && expireTimeMs.value !== undefined) {+ if (info.type === "never" || info.type === "duration") {+ return;+ }++ if (!isExpired.value && expireTimeMs.value !== undefined) {const diff = expireTimeMs.value - Date.now();const hours = Math.floor(diff / (1000 * 60 * 60));if (hours >= 24) {@@ -167,7 +160,7 @@ const expirationText = computed(() => {const dur = hours > 0 ? `${hours}h${minutes}m` : `${minutes}m`;return t("sql-editor.expire-in", { time: dur });}- return t("sql-editor.expire-at", { time: info.value });+ return `${t("issue.grant-request.expired-at")} ${info.value}`;});const allDatabaseNames = computed(() => {diff --git a/frontend/src/views/sql-editor/AsidePanel/AccessPane/AccessGrantRequestDrawer.vue b/frontend/src/views/sql-editor/AsidePanel/AccessPane/AccessGrantRequestDrawer.vueindex 77d597f87c..3b55e0b2f0 100644--- a/frontend/src/views/sql-editor/AsidePanel/AccessPane/AccessGrantRequestDrawer.vue+++ b/frontend/src/views/sql-editor/AsidePanel/AccessPane/AccessGrantRequestDrawer.vue@@ -55,7 +55,7 @@<div class="flex flex-col gap-y-2"><div class="text-sm font-medium text-control">- {{ $t("common.duration") }}+ {{ $t("common.expiration") }}<RequiredStar class="ml-0.5" /></div><NSelect@@ -68,6 +68,7 @@type="datetime":is-date-disabled="isDateDisabled"clearable+ :actions="['clear', 'confirm']"/></div>@@ -106,7 +107,8 @@<script lang="ts" setup>import { create } from "@bufbuild/protobuf";-import { DurationSchema } from "@bufbuild/protobuf/wkt";+import { DurationSchema, TimestampSchema } from "@bufbuild/protobuf/wkt";+import dayjs from "dayjs";import { NButton, NCheckbox, NDatePicker, NInput, NSelect } from "naive-ui";import { computed, reactive, ref } from "vue";import { useI18n } from "vue-i18n";@@ -195,8 +197,11 @@ const durationOptions = computed(() => [{ label: t("common.custom"), value: -1 },]);-const isDateDisabled = (ts: number) => {- return ts < Date.now();+const isDateDisabled = (date: number) => {+ if (date < dayjs().startOf("day").valueOf()) {+ return true;+ }+ return false;};const allowSubmit = computed(() => {@@ -211,21 +216,27 @@ const handleSubmit = async () => {if (isRequesting.value) return;isRequesting.value = true;try {- const ttlSeconds =- form.duration === -1- ? BigInt(Math.floor((form.customExpireTime! - Date.now()) / 1000))- : BigInt(form.duration * 3600);-const accessGrant = create(AccessGrantSchema, {creator: `users/${currentUser.value.email}`,targets: form.targets,query: form.query,unmask: form.unmask,reason: form.reason,- expiration: {- case: "ttl",- value: create(DurationSchema, { seconds: ttlSeconds }),- },+ expiration:+ form.duration === -1+ ? {+ case: "expireTime" as const,+ value: create(TimestampSchema, {+ seconds: BigInt(Math.floor(form.customExpireTime! / 1000)),+ nanos: (form.customExpireTime! % 1000) * 1000000,+ }),+ }+ : {+ case: "ttl" as const,+ value: create(DurationSchema, {+ seconds: BigInt(form.duration * 3600),+ }),+ },});const response = await accessGrantServiceClientConnect.createAccessGrant(diff --git a/frontend/src/views/sql-editor/AsidePanel/AccessPane/AccessPane.vue b/frontend/src/views/sql-editor/AsidePanel/AccessPane/AccessPane.vueindex fc1d393f0f..2f73bf9886 100644--- a/frontend/src/views/sql-editor/AsidePanel/AccessPane/AccessPane.vue+++ b/frontend/src/views/sql-editor/AsidePanel/AccessPane/AccessPane.vue@@ -119,6 +119,7 @@ import {import type { Issue } from "@/types/proto-es/v1/issue_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import {+ type AccessGrantFilterStatus,extractDatabaseResourceName,getDefaultPagination,type SearchParams,@@ -250,23 +251,19 @@ const scopeOptions = computed((): ScopeOption[] => {return options;});-const selectedStatuses = computed(() =>- getValuesFromSearchParams(searchParams.value, "status")+const selectedStatuses = computed(+ () =>+ getValuesFromSearchParams(+ searchParams.value,+ "status"+ ) as AccessGrantFilterStatus[]);// Build AccessFilter from search params.const filter = computed((): AccessFilter => {- const f: AccessFilter = {};-- const statuses = selectedStatuses.value;- f.status = statuses- .filter((s) => s !== "EXPIRED")- .map((s) => AccessGrant_Status[s as keyof typeof AccessGrant_Status]);- if (statuses.includes("EXPIRED")) {- f.expireTsBefore = Date.now();- } else if (f.status.includes(AccessGrant_Status.ACTIVE)) {- f.expireTsAfter = Date.now();- }+ const f: AccessFilter = {+ status: selectedStatuses.value,+ };const database = getValueFromSearchParams(searchParams.value,diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/ResultViewV1.vue b/frontend/src/views/sql-editor/EditorCommon/ResultView/ResultViewV1.vueindex 43ffe77956..142035c471 100644--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/ResultViewV1.vue+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/ResultViewV1.vue@@ -18,7 +18,7 @@<RequestQueryButtonv-if="!!permissionDeniedError":text="false"- :statement="resultSet.results[0]?.statement"+ :statement="executeParams.statement":permission-denied-detail="permissionDeniedError"/></template>