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(frontend): unify deleted resource display with consistent visual treatment (#19372)
boojacke102940d1b3f
diff --git a/frontend/src/components/DatabaseDetail/Settings/DatabaseSettingsPanel.vue b/frontend/src/components/DatabaseDetail/Settings/DatabaseSettingsPanel.vueindex a5d90e97ab..09767ec162 100644--- a/frontend/src/components/DatabaseDetail/Settings/DatabaseSettingsPanel.vue+++ b/frontend/src/components/DatabaseDetail/Settings/DatabaseSettingsPanel.vue@@ -7,7 +7,7 @@</p><EnvironmentSelectclass="mt-1 max-w-md"- :value="`${environmentNamePrefix}${environment.id}`"+ :value="environmentSelectValue":disabled="!allowUpdateDatabase":clearable="!getInstanceResource(database).environment":render-suffix="@@ -35,12 +35,7 @@ import { cloneDeep } from "lodash-es";import { computed } from "vue";import { useI18n } from "vue-i18n";import { EnvironmentSelect } from "@/components/v2";-import {- environmentNamePrefix,- pushNotification,- useDatabaseV1Store,- useEnvironmentV1Store,-} from "@/store";+import { pushNotification, useDatabaseV1Store } from "@/store";import type { Database } from "@/types/proto-es/v1/database_service_pb";import { UpdateDatabaseRequestSchema } from "@/types/proto-es/v1/database_service_pb";import type { Environment } from "@/types/v1/environment";@@ -56,14 +51,11 @@ const props = defineProps<{}>();const databaseStore = useDatabaseV1Store();-const envStore = useEnvironmentV1Store();const { t } = useI18n();-const environment = computed(() => {- return envStore.getEnvironmentByName(- props.database.effectiveEnvironment ?? ""- );-});+const environmentSelectValue = computed(+ () => props.database.effectiveEnvironment || undefined+);const allowUpdateDatabase = computed(() =>hasProjectPermissionV2(diff --git a/frontend/src/components/DatabaseInfo.vue b/frontend/src/components/DatabaseInfo.vueindex 5e69a7c84d..5075c0a0db 100644--- a/frontend/src/components/DatabaseInfo.vue+++ b/frontend/src/components/DatabaseInfo.vue@@ -19,7 +19,6 @@:show-icon="false":link="link":text-class="`text-control-light ${link ? 'hover:underline' : ''}`"- :null-environment-placeholder="'Null'"/></template></InstanceV1Name>@@ -36,7 +35,6 @@:show-icon="false":link="link":text-class="`text-control-light ${link ? 'hover:underline' : ''}`"- :null-environment-placeholder="'Null'"/><DatabaseV1Namediff --git a/frontend/src/components/Plan/components/IssueReviewView/OverviewSection.vue b/frontend/src/components/Plan/components/IssueReviewView/OverviewSection.vueindex 192dc9ed49..2747990d9d 100644--- a/frontend/src/components/Plan/components/IssueReviewView/OverviewSection.vue+++ b/frontend/src/components/Plan/components/IssueReviewView/OverviewSection.vue@@ -40,7 +40,6 @@<EnvironmentV1Name:environment="getEnvironmentEntity(stage.environment)":link="false"- :null-environment-placeholder="'Null'"/></div><spandiff --git a/frontend/src/components/Plan/components/IssueReviewView/Sidebar/StagesSection.vue b/frontend/src/components/Plan/components/IssueReviewView/Sidebar/StagesSection.vueindex f2f071447a..6eeed0d127 100644--- a/frontend/src/components/Plan/components/IssueReviewView/Sidebar/StagesSection.vue+++ b/frontend/src/components/Plan/components/IssueReviewView/Sidebar/StagesSection.vue@@ -14,7 +14,6 @@<EnvironmentV1Name:environment="getEnvironmentEntity(stage.environment)":link="false"- :null-environment-placeholder="'Null'"/></div><spandiff --git a/frontend/src/components/Plan/components/SpecDetailView/DatabaseGroupTargetDisplay.vue b/frontend/src/components/Plan/components/SpecDetailView/DatabaseGroupTargetDisplay.vueindex 4a06ac15eb..f00f9cf925 100644--- a/frontend/src/components/Plan/components/SpecDetailView/DatabaseGroupTargetDisplay.vue+++ b/frontend/src/components/Plan/components/SpecDetailView/DatabaseGroupTargetDisplay.vue@@ -99,6 +99,12 @@ const databases = ref<string[]>([]);// Fetch database group and populate databaseswatchEffect(async () => {+ const cached = dbGroupStore.getDBGroupByName(props.target);+ if (!isValidDatabaseGroupName(cached.name)) {+ databases.value = [];+ return;+ }+try {const dbGroup = await dbGroupStore.getOrFetchDBGroupByName(props.target, {view: DatabaseGroupView.FULL,diff --git a/frontend/src/components/Plan/components/common/DatabaseDisplay.vue b/frontend/src/components/Plan/components/common/DatabaseDisplay.vueindex 31304b95a9..0abcdf9536 100644--- a/frontend/src/components/Plan/components/common/DatabaseDisplay.vue+++ b/frontend/src/components/Plan/components/common/DatabaseDisplay.vue@@ -10,10 +10,9 @@<EnvironmentV1Name:link="false":environment="environment"- :null-environment-placeholder="'Null'"/></span>- <span class="truncate text-gray-600">+ <span :class="isInstanceMissing ? 'truncate text-control-light line-through' : 'truncate text-gray-600'">{{ instanceDisplayName }}</span><ChevronRightIcon :class="chevronClass" />@@ -77,6 +76,13 @@ const instanceResource = computed(() => {return null; // Don't show instance icon if we can't resolve it});+const isInstanceMissing = computed(() => {+ return (+ instanceResource.value === null &&+ !!extractInstanceResourceName(props.database)+ );+});+const instanceDisplayName = computed(() => {if (instanceResource.value) {return instanceResource.value.title;diff --git a/frontend/src/components/Release/ReleaseDataTable.vue b/frontend/src/components/Release/ReleaseDataTable.vueindex 8be7716312..d476c26004 100644--- a/frontend/src/components/Release/ReleaseDataTable.vue+++ b/frontend/src/components/Release/ReleaseDataTable.vue@@ -77,12 +77,15 @@ const columnList = computed(const releaseName = parts[parts.length - 1] || release.name;return (<p class="inline-flex w-full items-center gap-x-2">- <span class="shrink truncate">{releaseName}</span>- {release.state === State.DELETED && (- <NTag class="shrink-0" type="default" size="small">- {t("common.abandoned")}- </NTag>- )}+ <span+ class={[+ "shrink truncate",+ release.state === State.DELETED &&+ "text-control-light line-through",+ ]}+ >+ {releaseName}+ </span></p>);},diff --git a/frontend/src/components/RolloutV1/components/Rollout/ReleaseInfoCard.vue b/frontend/src/components/RolloutV1/components/Rollout/ReleaseInfoCard.vueindex d1766e695d..a8c3eb062d 100644--- a/frontend/src/components/RolloutV1/components/Rollout/ReleaseInfoCard.vue+++ b/frontend/src/components/RolloutV1/components/Rollout/ReleaseInfoCard.vue@@ -3,14 +3,7 @@<div class="flex items-center justify-between"><div class="flex items-center gap-x-2 text-sm font-medium"><PackageIcon class="w-4 h-4" />- <span :class="compact ? '' : 'text-base'">{{ releaseTitle }}</span>- <NTag- v-if="release && release.state === State.DELETED"- size="small"- type="default"- >- {{ $t("common.abandoned") }}- </NTag>+ <span :class="[compact ? '' : 'text-base', isDeleted && 'text-control-light line-through']">{{ releaseTitle }}</span></div><NButtonv-if="release && isValidReleaseName(release.name)"@@ -143,7 +136,7 @@<script setup lang="ts">import dayjs from "dayjs";import { ExternalLinkIcon, PackageIcon } from "lucide-vue-next";-import { NButton, NTag } from "naive-ui";+import { NButton } from "naive-ui";import { computed } from "vue";import { useI18n } from "vue-i18n";import { BBSpin } from "@/bbkit";@@ -167,6 +160,8 @@ const { release, ready: releaseReady } = useReleaseByName(computed(() => props.releaseName));+const isDeleted = computed(() => release.value?.state === State.DELETED);+const maxDisplayedFiles = computed(() => (props.compact ? 4 : 6));const releaseTitle = computed(() => {diff --git a/frontend/src/components/RolloutV1/components/Rollout/RolloutDataTable.vue b/frontend/src/components/RolloutV1/components/Rollout/RolloutDataTable.vueindex d9b3520dbd..9ec83c83ee 100644--- a/frontend/src/components/RolloutV1/components/Rollout/RolloutDataTable.vue+++ b/frontend/src/components/RolloutV1/components/Rollout/RolloutDataTable.vue@@ -135,7 +135,6 @@ const columnList = computed(<EnvironmentV1Nameenvironment={environment}link={false}- nullEnvironmentPlaceholder="Null"/>)}</div>diff --git a/frontend/src/components/v2/Model/DatabaseV1Name.vue b/frontend/src/components/v2/Model/DatabaseV1Name.vueindex f17162c248..e42a7ed591 100644--- a/frontend/src/components/v2/Model/DatabaseV1Name.vue+++ b/frontend/src/components/v2/Model/DatabaseV1Name.vue@@ -6,15 +6,10 @@:class="[shouldShowLink && !plain && 'normal-link',shouldShowLink && 'hover:underline',+ isDeleted && 'text-control-light line-through',]"><HighlightLabelText :text="extractDatabaseResourceName(database.name).databaseName" :keyword="keyword" />- <span- v-if="showNotFound && database.state === State.DELETED"- class="text-control-placeholder"- >- (NOT_FOUND)- </span></component></template>@@ -31,17 +26,17 @@ const props = withDefaults(database: Database;link?: boolean;plain?: boolean;- showNotFound?: boolean;keyword?: string;}>(),{link: true,plain: false,- showNotFound: false,keyword: "",});+const isDeleted = computed(() => props.database.state === State.DELETED);+const shouldShowLink = computed(() => {return props.link && props.database.state === State.ACTIVE;});diff --git a/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseV1Table.vue b/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseV1Table.vueindex 2be3286a4e..8f94215818 100644--- a/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseV1Table.vue+++ b/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseV1Table.vue@@ -144,7 +144,6 @@ const columnList = computed((): DatabaseDataTableColumn[] => {link={false}showColor={true}keyword={props.keyword}- nullEnvironmentPlaceholder="Null"/>),};diff --git a/frontend/src/components/v2/Model/EnvironmentV1Name.vue b/frontend/src/components/v2/Model/EnvironmentV1Name.vueindex 553afb0dba..89ab083029 100644--- a/frontend/src/components/v2/Model/EnvironmentV1Name.vue+++ b/frontend/src/components/v2/Model/EnvironmentV1Name.vue@@ -5,7 +5,7 @@class="inline-flex items-center gap-x-1":class="[isLink && !plain && 'normal-link', isLink && 'hover:underline']":style="- showColor && backgroundColorRgb+ showColor && !isMissing && backgroundColorRgb? {backgroundColor: `rgba(${backgroundColorRgb}, 0.1)`,borderTopColor: `rgb(${backgroundColorRgb})`,@@ -17,8 +17,9 @@"><span class="select-none inline-block truncate" :class="textClass">- <span v-if="isUnknown" class="text-gray-400 italic">- {{ nullEnvironmentPlaceholder }}+ <span v-if="isUnset" class="text-control-light italic">{{ t("common.unassigned") }}</span>+ <span v-else-if="isDeleted" class="text-control-light line-through">+ {{ environment.title }}</span><HighlightLabelText v-else :text="environment.title" :keyword="keyword" /><slot name="suffix">@@ -26,7 +27,7 @@</slot></span><ProductionEnvironmentV1Icon- v-if="showIcon"+ v-if="showIcon && !isMissing":environment="environment":class="iconClass ?? 'text-current!'":tooltip="tooltip"@@ -36,8 +37,11 @@<script lang="ts" setup>import { computed } from "vue";+import { useI18n } from "vue-i18n";+import { useEnvironmentV1Store } from "@/store";import {formatEnvironmentName,+ isValidEnvironmentName,NULL_ENVIRONMENT_NAME,UNKNOWN_ENVIRONMENT_NAME,} from "@/types";@@ -60,7 +64,6 @@ const props = withDefaults(textClass?: string;keyword?: string;showColor?: boolean;- nullEnvironmentPlaceholder?: string; // Placeholder for null/unknown environment.}>(),{tag: "span",@@ -69,22 +72,34 @@ const props = withDefaults(iconClass: undefined,tooltip: false,suffix: "",- prefix: "",showIcon: true,textClass: "",keyword: "",showColor: true,- nullEnvironmentPlaceholder: "NULL ENVIRONMENT",});-const isUnknown = computed(+const { t } = useI18n();+const environmentStore = useEnvironmentV1Store();++const isUnset = computed(() =>props.environment.name === UNKNOWN_ENVIRONMENT_NAME ||props.environment.name === NULL_ENVIRONMENT_NAME);-const isLink = computed(() => props.link && !isUnknown.value);+const isDeleted = computed(() => {+ if (isUnset.value) return false;+ const real = environmentStore.getEnvironmentByName(+ props.environment.name,+ false+ );+ return !isValidEnvironmentName(real.name);+});++const isMissing = computed(() => isUnset.value || isDeleted.value);++const isLink = computed(() => props.link && !isMissing.value);const bindings = computed(() => {if (isLink.value) {diff --git a/frontend/src/components/v2/Model/Instance/InstanceV1Table/InstanceV1Table.vue b/frontend/src/components/v2/Model/Instance/InstanceV1Table/InstanceV1Table.vueindex a1e3be3e29..90d8c82a76 100644--- a/frontend/src/components/v2/Model/Instance/InstanceV1Table/InstanceV1Table.vue+++ b/frontend/src/components/v2/Model/Instance/InstanceV1Table/InstanceV1Table.vue@@ -143,7 +143,6 @@ const columnList = computed((): InstanceDataTableColumn[] => {)}link={false}showColor={true}- nullEnvironmentPlaceholder="Null"/>),};diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.jsonindex 80aae7b612..b09915918e 100644--- a/frontend/src/locales/en-US.json+++ b/frontend/src/locales/en-US.json@@ -43,7 +43,6 @@"archive": "Archive","archived": "Archived","abandon": "Abandon",- "abandoned": "Abandoned","restored": "Restored","no-license": "No license","logout": "Logout",diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.jsonindex c27c000a07..f4cd0c3a7b 100644--- a/frontend/src/locales/es-ES.json+++ b/frontend/src/locales/es-ES.json@@ -43,7 +43,6 @@"archive": "Archivo","archived": "Archivada","abandon": "Abandonar",- "abandoned": "Abandonado","restored": "Restored","no-license": "Sin licencia","logout": "Cerrar sesión",diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.jsonindex 809ab0c8b8..cf4070310f 100644--- a/frontend/src/locales/ja-JP.json+++ b/frontend/src/locales/ja-JP.json@@ -43,7 +43,6 @@"archive": "アーカイブ","archived": "アーカイブ済み","abandon": "破棄",- "abandoned": "破棄済み","restored": "Restored","no-license": "ライセンスがありません","logout": "サインアウト",diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.jsonindex f741700d2c..6fc12a25d5 100644--- a/frontend/src/locales/vi-VN.json+++ b/frontend/src/locales/vi-VN.json@@ -43,7 +43,6 @@"archive": "Lưu trữ","archived": "Đã lưu trữ","abandon": "Hủy bỏ",- "abandoned": "Đã hủy bỏ","restored": "Restored","no-license": "Không có giấy phép","logout": "Đăng xuất",diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.jsonindex 17a3ae5198..cf5dddb661 100644--- a/frontend/src/locales/zh-CN.json+++ b/frontend/src/locales/zh-CN.json@@ -43,7 +43,6 @@"archive": "归档","archived": "已归档","abandon": "废弃",- "abandoned": "已废弃","restored": "已恢复","no-license": "无证书","logout": "登出",@@ -91,7 +90,7 @@"stage": "阶段","task": "任务","sql": "SQL",- "unassigned": "未指派",+ "unassigned": "未分配","new": "创建","add": "添加","confirm-and-update": "确认并更新",diff --git a/frontend/src/store/modules/v1/environment.ts b/frontend/src/store/modules/v1/environment.tsindex 8aba98dcbc..22a8a4ae03 100644--- a/frontend/src/store/modules/v1/environment.ts+++ b/frontend/src/store/modules/v1/environment.ts@@ -217,7 +217,7 @@ export const useEnvironmentV1Store = defineStore("environment_v1", {...environment,id,name,- title: name,+ title: id,};}return environment;