Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
fix: should return ttl for access (#19345)
ecmadaoe2dd6d0655f8
diff --git a/backend/api/v1/access_grant_service.go b/backend/api/v1/access_grant_service.goindex 0aaeb8605e..7eeaf9b389 100644--- a/backend/api/v1/access_grant_service.go+++ b/backend/api/v1/access_grant_service.go@@ -407,6 +407,11 @@ func convertToAccessGrant(msg *store.AccessGrantMessage) *v1pb.AccessGrant {if p.IssueId != 0 {ag.Issue = common.FormatIssue(msg.ProjectID, int(p.IssueId))}+ if ag.Expiration == nil && p.RequestedDuration != nil {+ ag.Expiration = &v1pb.AccessGrant_Ttl{+ Ttl: p.RequestedDuration,+ }+ }}return ag}diff --git a/frontend/src/components/Plan/components/IssueReviewView/AccessGrantView/AccessGrantDetailsSection.vue b/frontend/src/components/Plan/components/IssueReviewView/AccessGrantView/AccessGrantDetailsSection.vueindex 81f54437e5..a8c599beea 100644--- a/frontend/src/components/Plan/components/IssueReviewView/AccessGrantView/AccessGrantDetailsSection.vue+++ b/frontend/src/components/Plan/components/IssueReviewView/AccessGrantView/AccessGrantDetailsSection.vue@@ -45,17 +45,26 @@</NCheckbox></div>- <!-- Expiration Time -->+ <!-- Expiration --><div class="flex flex-col gap-y-2"><span class="text-sm text-control-light">- {{ $t("issue.grant-request.expired-at") }}+ <template v-if="expirationInfo.type === 'duration'">+ {{ $t("common.duration") }}+ </template>+ <template v-else>+ {{ $t("issue.grant-request.expired-at") }}+ </template></span><div class="text-base">- {{- expireTime- ? dayjs(expireTime).format("LLL")- : $t("project.members.never-expires")- }}+ <template v-if="expirationInfo.type === 'datetime'">+ {{ expirationInfo.value }}+ </template>+ <template v-else-if="expirationInfo.type === 'duration'">+ {{ expirationInfo.value }}+ </template>+ <template v-else>+ {{ $t("project.members.never-expires") }}+ </template></div></div></div>@@ -63,15 +72,15 @@</template><script lang="ts" setup>-import dayjs from "dayjs";import { NCheckbox } from "naive-ui";import { computed, ref, watchEffect } from "vue";import { BBSpin } from "@/bbkit";import DatabaseDisplay from "@/components/Plan/components/common/DatabaseDisplay.vue";import { useAccessGrantStore, useDatabaseV1Store } from "@/store";-import { getDateForPbTimestampProtoEs, isValidDatabaseName } from "@/types";+import { isValidDatabaseName } from "@/types";import type { AccessGrant } from "@/types/proto-es/v1/access_grant_service_pb";import { extractProjectResourceName, hasProjectPermissionV2 } from "@/utils";+import { getAccessGrantExpirationText } from "@/utils/accessGrant";import { usePlanContextWithIssue } from "../../../logic";const { issue, project } = usePlanContextWithIssue();@@ -81,11 +90,9 @@ const accessGrantStore = useAccessGrantStore();const isLoading = ref(true);const accessGrant = ref<AccessGrant>();-const expireTime = computed(() => {- if (accessGrant.value?.expiration.case === "expireTime") {- return getDateForPbTimestampProtoEs(accessGrant.value.expiration.value);- }- return undefined;+const expirationInfo = computed(() => {+ if (!accessGrant.value) return { type: "never" as const };+ return getAccessGrantExpirationText(accessGrant.value);});watchEffect(async () => {diff --git a/frontend/src/utils/accessGrant.ts b/frontend/src/utils/accessGrant.tsindex 5d514c108d..47b204217b 100644--- a/frontend/src/utils/accessGrant.ts+++ b/frontend/src/utils/accessGrant.ts@@ -1,3 +1,4 @@+import dayjs from "dayjs";import { getTimeForPbTimestampProtoEs } from "@/types";import {type AccessGrant,@@ -17,9 +18,37 @@ export const getAccessGrantExpireTimeMs = (if (grant.expiration.case === "expireTime") {return getTimeForPbTimestampProtoEs(grant.expiration.value);}+ if (grant.expiration.case === "ttl") {+ return Date.now() + Number(grant.expiration.value.seconds) * 1000;+ }return undefined;};+export const getAccessGrantExpirationText = (+ grant: AccessGrant+):+ | { type: "datetime"; value: string }+ | { type: "duration"; value: string }+ | { type: "never" } => {+ if (grant.expiration.case === "expireTime") {+ const ms = getTimeForPbTimestampProtoEs(grant.expiration.value);+ return { type: "datetime", value: dayjs(ms).format("LLL") };+ }+ if (grant.expiration.case === "ttl") {+ const totalSeconds = Number(grant.expiration.value.seconds);+ const dur = dayjs.duration(totalSeconds, "seconds");+ const days = Math.floor(dur.asDays());+ const hours = dur.hours();+ const minutes = dur.minutes();+ const parts: string[] = [];+ if (days > 0) parts.push(`${days}d`);+ if (hours > 0) parts.push(`${hours}h`);+ if (minutes > 0) parts.push(`${minutes}m`);+ return { type: "duration", value: parts.join("") || "<1m" };+ }+ return { type: "never" };+};+export const getAccessGrantDisplayStatus = (grant: AccessGrant): AccessGrantDisplayStatus => {diff --git a/frontend/src/views/sql-editor/AsidePanel/AccessPane/AccessGrantItem.vue b/frontend/src/views/sql-editor/AsidePanel/AccessPane/AccessGrantItem.vueindex 0aefa5b413..1deef5cc61 100644--- a/frontend/src/views/sql-editor/AsidePanel/AccessPane/AccessGrantItem.vue+++ b/frontend/src/views/sql-editor/AsidePanel/AccessPane/AccessGrantItem.vue@@ -76,6 +76,7 @@ import {} from "@/types/proto-es/v1/access_grant_service_pb";import {getAccessGrantDisplayStatus,+ getAccessGrantExpirationText,getAccessGrantExpireTimeMs,getAccessGrantStatusTagType,} from "@/utils/accessGrant";@@ -116,20 +117,25 @@ const statusLabel = computed(() => {return displayStatus.value;});+const expirationInfo = computed(() =>+ getAccessGrantExpirationText(props.grant)+);+const expirationText = computed(() => {- if (expireTimeMs.value === undefined) return "";- const dateStr = new Date(expireTimeMs.value).toLocaleString();- if (isActive.value && !isExpired.value) {+ 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) {const diff = expireTimeMs.value - Date.now();const hours = Math.floor(diff / (1000 * 60 * 60));if (hours >= 24) {- return t("sql-editor.expire-at", { time: dateStr });+ return t("sql-editor.expire-at", { time: info.value });}const minutes = Math.floor((diff % (1000 * 60 * 60)) / (1000 * 60));- const duration = hours > 0 ? `${hours}h${minutes}m` : `${minutes}m`;- return t("sql-editor.expire-in", { time: duration });+ 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: dateStr });+ return t("sql-editor.expire-at", { time: info.value });});const allDatabaseNames = computed(() => {