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: improve webhook UI with action menus and clickable rows (#18952)
Danny Xu5bb0f63414bb
diff --git a/frontend/src/components/DatabaseGroup/DatabaseGroupDataTable.vue b/frontend/src/components/DatabaseGroup/DatabaseGroupDataTable.vueindex 127b5b82b5..e3bcd4dd2a 100644--- a/frontend/src/components/DatabaseGroup/DatabaseGroupDataTable.vue+++ b/frontend/src/components/DatabaseGroup/DatabaseGroupDataTable.vue@@ -19,9 +19,10 @@</template><script lang="tsx" setup>-import { ExternalLinkIcon } from "lucide-vue-next";-import { type DataTableColumn, NDataTable, NEllipsis } from "naive-ui";-import { computed } from "vue";+import { EllipsisVerticalIcon, ExternalLinkIcon } from "lucide-vue-next";+import type { DataTableColumn, DropdownOption } from "naive-ui";+import { NButton, NDataTable, NDropdown, NEllipsis } from "naive-ui";+import { computed, h } from "vue";import { useI18n } from "vue-i18n";import { useRouter } from "vue-router";import { PROJECT_V1_ROUTE_DATABASE_GROUP_DETAIL } from "@/router/dashboard/projectV1";@@ -40,6 +41,7 @@ const props = withDefaults(customClick?: boolean;showSelection?: boolean;showExternalLink?: boolean;+ showActions?: boolean;singleSelection?: boolean;pageSize?: number;selectedDatabaseGroupNames?: string[];@@ -54,6 +56,7 @@ const props = withDefaults(const emit = defineEmits<{(event: "row-click", e: MouseEvent, databaseGroup: DatabaseGroup): void;(event: "update:selected-database-group-names", val: string[]): void;+ (event: "delete", databaseGroup: DatabaseGroup): void;}>();const { t } = useI18n();@@ -122,6 +125,56 @@ const columnList = computed((): DatabaseGroupDataTableColumn[] => {);},},+ {+ key: "actions",+ title: "",+ width: 48,+ hide: !props.showActions,+ render: (data) => {+ const dropdownOptions: DropdownOption[] = [+ {+ key: "delete",+ label: t("common.delete"),+ },+ ];++ return h(+ "div",+ {+ class: "flex justify-end",+ onClick: (e: Event) => {+ e.stopPropagation();+ },+ },+ h(+ NDropdown,+ {+ trigger: "click",+ options: dropdownOptions,+ onSelect: (key: string) => {+ if (key === "delete") {+ emit("delete", data);+ }+ },+ },+ {+ default: () =>+ h(+ NButton,+ {+ size: "small",+ quaternary: true,+ class: "px-1!",+ },+ {+ icon: () => h(EllipsisVerticalIcon, { class: "w-4 h-4" }),+ }+ ),+ }+ )+ );+ },+ },];return rawColumnList.filter((column) => !column.hide);diff --git a/frontend/src/components/DatabaseGroup/DatabaseGroupForm.vue b/frontend/src/components/DatabaseGroup/DatabaseGroupForm.vueindex 86599db3cc..e02706ce8d 100644--- a/frontend/src/components/DatabaseGroup/DatabaseGroupForm.vue+++ b/frontend/src/components/DatabaseGroup/DatabaseGroupForm.vue@@ -45,19 +45,6 @@</div></div>- <div v-if="!isCreating && allowDelete" class="py-6 border-t">- <BBButtonConfirm- :type="'DELETE'"- :button-text="$t('database-group.delete-group')"- :ok-text="$t('common.delete')"- :confirm-title="- $t('database-group.delete-group', { name: databaseGroup?.title })- "- :require-confirm="true"- @confirm="doDelete"- />- </div>-<div v-if="!readonly" class="sticky bottom-0 z-10"><divclass="flex justify-end w-full py-4 border-t border-block-border bg-white gap-x-3"@@ -77,8 +64,6 @@ import { cloneDeep, head, isEqual } from "lodash-es";import { NButton, NDivider, NInput } from "naive-ui";import { computed, reactive, ref, watchEffect } from "vue";import { useI18n } from "vue-i18n";-import { useRouter } from "vue-router";-import { BBButtonConfirm } from "@/bbkit";import ExprEditor from "@/components/ExprEditor";import type { ConditionGroupExpr } from "@/plugins/cel";import {@@ -88,10 +73,6 @@ import {validateSimpleExpr,wrapAsGroup,} from "@/plugins/cel";-import {- PROJECT_V1_ROUTE_DATABASE_GROUP_DETAIL,- PROJECT_V1_ROUTE_DATABASE_GROUPS,-} from "@/router/dashboard/projectV1";import { pushNotification, useDBGroupStore } from "@/store";import {databaseGroupNamePrefix,@@ -109,7 +90,6 @@ import type { Project } from "@/types/proto-es/v1/project_service_pb";import {batchConvertCELStringToParsedExpr,batchConvertParsedExprToCELString,- hasProjectPermissionV2,} from "@/utils";import { ResourceIdField } from "../v2";import MatchedDatabaseView from "./MatchedDatabaseView.vue";@@ -141,14 +121,9 @@ const state = reactive<LocalState>({expr: wrapAsGroup(emptySimpleExpr()),});const resourceIdField = ref<InstanceType<typeof ResourceIdField>>();-const router = useRouter();const isCreating = computed(() => props.databaseGroup === undefined);-const allowDelete = computed(() => {- return hasProjectPermissionV2(props.project, "bb.databaseGroups.delete");-});-watchEffect(async () => {const databaseGroup = props.databaseGroup;if (!databaseGroup || !isValidDatabaseGroupName(databaseGroup.name)) {@@ -173,19 +148,6 @@ watchEffect(async () => {}});-const doDelete = async () => {- const databaseGroup = props.databaseGroup as DatabaseGroup;- await dbGroupStore.deleteDatabaseGroup(databaseGroup.name);- if (- router.currentRoute.value.name === PROJECT_V1_ROUTE_DATABASE_GROUP_DETAIL- ) {- router.replace({- name: PROJECT_V1_ROUTE_DATABASE_GROUPS,- });- }- emit("dismiss");-};-const allowConfirm = computed(() => {return (resourceIdField.value?.resourceId &&diff --git a/frontend/src/components/DatabaseGroup/ProjectDatabaseGroupPanel.vue b/frontend/src/components/DatabaseGroup/ProjectDatabaseGroupPanel.vueindex 0dcea303b1..ad4693426c 100644--- a/frontend/src/components/DatabaseGroup/ProjectDatabaseGroupPanel.vue+++ b/frontend/src/components/DatabaseGroup/ProjectDatabaseGroupPanel.vue@@ -3,19 +3,28 @@:database-group-list="filteredDbGroupList":custom-click="true":loading="!ready"+ :show-actions="allowDelete"@row-click="handleDatabaseGroupClick"+ @delete="handleDelete"/></template><script lang="ts" setup>+import { useDialog } from "naive-ui";import { computed } from "vue";+import { useI18n } from "vue-i18n";import { useRouter } from "vue-router";import DatabaseGroupDataTable from "@/components/DatabaseGroup/DatabaseGroupDataTable.vue";import { PROJECT_V1_ROUTE_DATABASE_GROUP_DETAIL } from "@/router/dashboard/projectV1";-import { useDBGroupListByProject } from "@/store";+import {+ useDBGroupListByProject,+ useDBGroupStore,+ useGracefulRequest,+} from "@/store";import { getProjectNameAndDatabaseGroupName } from "@/store/modules/v1/common";import type { DatabaseGroup } from "@/types/proto-es/v1/database_group_service_pb";import type { Project } from "@/types/proto-es/v1/project_service_pb";+import { hasProjectPermissionV2 } from "@/utils";const props = defineProps<{project: Project;@@ -23,10 +32,18 @@ const props = defineProps<{}>();const router = useRouter();+const { t } = useI18n();+const dialog = useDialog();+const dbGroupStore = useDBGroupStore();+const { dbGroupList, ready } = useDBGroupListByProject(computed(() => props.project.name));+const allowDelete = computed(() => {+ return hasProjectPermissionV2(props.project, "bb.databaseGroups.delete");+});+const filteredDbGroupList = computed(() => {const filter = props.filter.trim().toLowerCase();if (!filter) {@@ -60,4 +77,18 @@ const handleDatabaseGroupClick = (router.push(url);}};++const handleDelete = (databaseGroup: DatabaseGroup) => {+ dialog.warning({+ title: t("database-group.delete-group", { name: databaseGroup.title }),+ content: t("common.cannot-undo-this-action"),+ negativeText: t("common.cancel"),+ positiveText: t("common.delete"),+ onPositiveClick: () => {+ useGracefulRequest(() =>+ dbGroupStore.deleteDatabaseGroup(databaseGroup.name)+ );+ },+ });+};</script>diff --git a/frontend/src/components/IssueV1/components/Sidebar/ReleaseInfo.vue b/frontend/src/components/IssueV1/components/Sidebar/ReleaseInfo.vueindex f443040aeb..f17cbfc8ec 100644--- a/frontend/src/components/IssueV1/components/Sidebar/ReleaseInfo.vue+++ b/frontend/src/components/IssueV1/components/Sidebar/ReleaseInfo.vue@@ -1,24 +1,25 @@<template><divv-if="isValidReleaseName(release.name) && ready"- class="w-full text-sm text-control-light flex gap-x-1 items-center"+ class="w-full text-sm text-control-light flex gap-x-2 items-center"><PackageIcon class="w-5 h-auto shrink-0" /><a:href="`/${release.name}`"target="_blank"class="normal-link truncate"- :class="{- 'line-through opacity-60': release.state === State.DELETED,- }">{{ releaseId }}</a>+ <NTag v-if="release.state === State.DELETED" size="small" type="default">+ {{ $t("common.abandoned") }}+ </NTag></div></template><script setup lang="ts">import { PackageIcon } from "lucide-vue-next";+import { NTag } from "naive-ui";import { computed } from "vue";import { specForTask, useIssueContext } from "@/components/IssueV1";import { useReleaseByName } from "@/store";diff --git a/frontend/src/components/ProjectWebhookForm.vue b/frontend/src/components/ProjectWebhookForm.vueindex e1dc67efad..cf264d7fba 100644--- a/frontend/src/components/ProjectWebhookForm.vue+++ b/frontend/src/components/ProjectWebhookForm.vue@@ -1,11 +1,25 @@<template><FormLayout :title="create ? $t('project.webhook.creation.title') : ''"><template v-if="!create" #title>- <div class="flex flex-row gap-x-2 items-center">- <WebhookTypeIcon :type="props.webhook.type" class="h-6 w-6" />- <h3 class="text-lg leading-6 font-medium text-main">- {{ props.webhook.title }}- </h3>+ <div class="flex flex-row justify-between items-center">+ <div class="flex flex-row gap-x-2 items-center">+ <WebhookTypeIcon :type="props.webhook.type" class="h-6 w-6" />+ <h3 class="text-lg leading-6 font-medium text-main">+ {{ props.webhook.title }}+ </h3>+ </div>+ <NDropdown+ v-if="allowEdit"+ trigger="click"+ :options="dropdownOptions"+ @select="handleDropdownSelect"+ >+ <NButton size="small" quaternary class="px-1!">+ <template #icon>+ <EllipsisVerticalIcon class="w-4 h-4" />+ </template>+ </NButton>+ </NDropdown></div><NDivider /></template>@@ -186,24 +200,7 @@</div></template><template #footer>- <div- class="flex"- :class="!create && allowEdit ? 'justify-between' : 'justify-end'"- >- <BBButtonConfirm- v-if="!create && allowEdit"- :type="'DELETE'"- :button-text="$t('project.webhook.deletion.btn-text')"- :ok-text="$t('common.delete')"- :confirm-title="- $t('project.webhook.deletion.confirm-title', {- title: webhook.title,- })- "- :confirm-description="$t('common.cannot-undo-this-action')"- :require-confirm="true"- @confirm="deleteWebhook"- />+ <div class="flex justify-end"><div class="flex items-center gap-x-3"><NButton v-if="create" @click.prevent="cancel">{{ $t("common.cancel") }}@@ -239,20 +236,23 @@<script lang="ts" setup>import { cloneDeep, isEmpty, isEqual } from "lodash-es";-import { InfoIcon } from "lucide-vue-next";+import { EllipsisVerticalIcon, InfoIcon } from "lucide-vue-next";+import type { DropdownOption } from "naive-ui";import {NButton,NCheckbox,NDivider,+ NDropdown,NInput,NRadio,NRadioGroup,NTooltip,+ useDialog,} from "naive-ui";import { computed, onMounted, reactive, watch } from "vue";import { useI18n } from "vue-i18n";import { useRouter } from "vue-router";-import { BBAttention, BBButtonConfirm } from "@/bbkit";+import { BBAttention } from "@/bbkit";import RequiredStar from "@/components/RequiredStar.vue";import { MissingExternalURLAttention } from "@/components/v2/Form";import FormLayout from "@/components/v2/Form/FormLayout.vue";@@ -300,6 +300,7 @@ const props = withDefaults(const router = useRouter();const { t } = useI18n();+const dialog = useDialog();const settingStore = useSettingV1Store();const projectStore = useProjectV1Store();@@ -401,6 +402,31 @@ const toggleEvent = (type: Activity_Type, on: boolean) => {state.webhook.notificationTypes.sort();};+const dropdownOptions = computed((): DropdownOption[] => {+ return [+ {+ key: "delete",+ label: t("common.delete"),+ },+ ];+});++const handleDropdownSelect = (key: string) => {+ if (key === "delete") {+ dialog.warning({+ title: t("project.webhook.deletion.confirm-title", {+ title: state.webhook.title,+ }),+ content: t("common.cannot-undo-this-action"),+ negativeText: t("common.cancel"),+ positiveText: t("common.delete"),+ onPositiveClick: () => {+ deleteWebhook();+ },+ });+ }+};+const cancel = () => {router.push({name: PROJECT_V1_ROUTE_WEBHOOKS,diff --git a/frontend/src/components/Release/ReleaseDataTable.vue b/frontend/src/components/Release/ReleaseDataTable.vueindex e988e08b3b..8be7716312 100644--- a/frontend/src/components/Release/ReleaseDataTable.vue+++ b/frontend/src/components/Release/ReleaseDataTable.vue@@ -76,11 +76,11 @@ const columnList = computed(const parts = release.name.split("/");const releaseName = parts[parts.length - 1] || release.name;return (- <p class="inline-flex w-full">+ <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="warning" size="small" round>- {t("common.archived")}+ <NTag class="shrink-0" type="default" size="small">+ {t("common.abandoned")}</NTag>)}</p>diff --git a/frontend/src/components/Release/ReleaseDetail/NavBar/NavBar.vue b/frontend/src/components/Release/ReleaseDetail/NavBar/NavBar.vueindex d334884f03..75c30d701b 100644--- a/frontend/src/components/Release/ReleaseDetail/NavBar/NavBar.vue+++ b/frontend/src/components/Release/ReleaseDetail/NavBar/NavBar.vue@@ -6,21 +6,76 @@</div><div class="flex items-center justify-end gap-x-3"><ApplyToDatabaseButton v-if="release.state === State.ACTIVE" />+ <NDropdown+ v-if="dropdownOptions.length > 0"+ trigger="click"+ :options="dropdownOptions"+ @select="handleDropdownSelect"+ >+ <NButton size="small" quaternary class="px-1!">+ <template #icon>+ <EllipsisVerticalIcon class="w-4 h-4" />+ </template>+ </NButton>+ </NDropdown></div></div></template><script setup lang="ts">+import { EllipsisVerticalIcon } from "lucide-vue-next";+import type { DropdownOption } from "naive-ui";+import { NButton, NDropdown, useDialog } from "naive-ui";import { computed } from "vue";+import { useI18n } from "vue-i18n";import ArchiveBanner from "@/components/ArchiveBanner.vue";+import { useReleaseStore } from "@/store";import { State } from "@/types/proto-es/v1/common_pb";import { useReleaseDetailContext } from "../context";import ApplyToDatabaseButton from "./ApplyToDatabaseButton.vue";const { release } = useReleaseDetailContext();+const { t } = useI18n();+const dialog = useDialog();+const releaseStore = useReleaseStore();const releaseName = computed(() => {const parts = release.value.name.split("/");return parts[parts.length - 1] || release.value.name;});++const dropdownOptions = computed((): DropdownOption[] => {+ if (release.value.state === State.ACTIVE) {+ return [+ {+ key: "abandon",+ label: t("common.abandon"),+ },+ ];+ } else if (release.value.state === State.DELETED) {+ return [+ {+ key: "restore",+ label: t("common.restore"),+ },+ ];+ }+ return [];+});++const handleDropdownSelect = async (key: string) => {+ if (key === "abandon") {+ dialog.warning({+ title: t("bbkit.confirm-button.sure-to-abandon"),+ content: t("bbkit.confirm-button.can-undo"),+ negativeText: t("common.cancel"),+ positiveText: t("common.confirm"),+ onPositiveClick: async () => {+ await releaseStore.deleteRelease(release.value.name);+ },+ });+ } else if (key === "restore") {+ await releaseStore.undeleteRelease(release.value.name);+ }+};</script>diff --git a/frontend/src/components/Release/ReleaseDetail/ReleaseArchiveRestoreButton.vue b/frontend/src/components/Release/ReleaseDetail/ReleaseArchiveRestoreButton.vuedeleted file mode 100644index 19ad70cb1a..0000000000--- a/frontend/src/components/Release/ReleaseDetail/ReleaseArchiveRestoreButton.vue+++ /dev/null@@ -1,39 +0,0 @@-<template>- <BBButtonConfirm- v-if="release.state === State.ACTIVE"- :type="'ARCHIVE'"- :button-text="$t('release.archive-this-release')"- :require-confirm="true"- :confirm-title="$t('bbkit.confirm-button.sure-to-archive')"- :confirm-description="$t('bbkit.confirm-button.can-undo')"- :ok-text="$t('common.confirm')"- class="border-none!"- @confirm="archiveOrRestoreRelease(true)"- />- <BBButtonConfirm- v-else-if="release.state === State.DELETED"- :type="'RESTORE'"- :button-text="$t('common.restore')"- :require-confirm="false"- class="border-none!"- @confirm="archiveOrRestoreRelease(false)"- />-</template>--<script setup lang="ts">-import { BBButtonConfirm } from "@/bbkit";-import { useReleaseStore } from "@/store";-import { State } from "@/types/proto-es/v1/common_pb";-import { useReleaseDetailContext } from "./context";--const { release } = useReleaseDetailContext();-const releaseStore = useReleaseStore();--const archiveOrRestoreRelease = async (archive: boolean) => {- if (archive) {- await releaseStore.deleteRelease(release.value.name);- } else {- await releaseStore.undeleteRelease(release.value.name);- }-};-</script>diff --git a/frontend/src/components/Release/ReleaseDetail/ReleaseDetail.vue b/frontend/src/components/Release/ReleaseDetail/ReleaseDetail.vueindex 1de2a1c976..054bb535bd 100644--- a/frontend/src/components/Release/ReleaseDetail/ReleaseDetail.vue+++ b/frontend/src/components/Release/ReleaseDetail/ReleaseDetail.vue@@ -8,9 +8,6 @@:show-selection="false"@row-click="(_, file) => (state.selectedReleaseFile = file)"/>- <div class="pl-2 opacity-80">- <ReleaseArchiveRestoreButton />- </div></div><Drawer@@ -39,7 +36,6 @@ 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";diff --git a/frontend/src/components/RolloutV1/components/ReleaseInfoCard.vue b/frontend/src/components/RolloutV1/components/ReleaseInfoCard.vueindex e9d748643f..0f6527828b 100644--- a/frontend/src/components/RolloutV1/components/ReleaseInfoCard.vue+++ b/frontend/src/components/RolloutV1/components/ReleaseInfoCard.vue@@ -1,9 +1,16 @@<template><div class="flex flex-col gap-y-2"><div class="flex items-center justify-between">- <div class="flex items-center gap-x-1 text-sm font-medium">+ <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></div><NButtonv-if="release && isValidReleaseName(release.name)"@@ -139,13 +146,13 @@<script setup lang="ts">import dayjs from "dayjs";import { ExternalLinkIcon, PackageIcon } from "lucide-vue-next";-import { NButton } from "naive-ui";+import { NButton, NTag } from "naive-ui";import { computed } from "vue";import { useI18n } from "vue-i18n";import { BBSpin } from "@/bbkit";import { useReleaseByName } from "@/store";import { getDateForPbTimestampProtoEs, isValidReleaseName } from "@/types";-import { VCSType } from "@/types/proto-es/v1/common_pb";+import { State, VCSType } from "@/types/proto-es/v1/common_pb";import { Release_Type } from "@/types/proto-es/v1/release_service_pb";const props = withDefaults(diff --git a/frontend/src/components/v2/Model/Instance/InstanceV1Name.vue b/frontend/src/components/v2/Model/Instance/InstanceV1Name.vueindex 5c1f04993f..c6334d24b8 100644--- a/frontend/src/components/v2/Model/Instance/InstanceV1Name.vue+++ b/frontend/src/components/v2/Model/Instance/InstanceV1Name.vue@@ -1,35 +1,42 @@<template>- <component- :is="showLink ? 'router-link' : tag"- v-bind="bindings"- class="inline-flex items-center gap-x-1"- :class="[- showLink && !plain && 'normal-link',- showLink && 'hover:underline',- ]"- >- <InstanceV1EngineIcon- v-if="icon && iconPosition === 'prefix'"- :instance="instance"- />+ <div class="inline-flex items-center gap-x-2">+ <component+ :is="showLink ? 'router-link' : tag"+ v-bind="bindings"+ class="inline-flex items-center gap-x-1"+ :class="[+ showLink && !plain && 'normal-link',+ showLink && 'hover:underline',+ ]"+ >+ <InstanceV1EngineIcon+ v-if="icon && iconPosition === 'prefix'"+ :instance="instance"+ />- <slot name="prefix" />+ <slot name="prefix" />- <NEllipsis :disabled="!tooltip" :line-clamp="1" :class="textClass">- <HighlightLabelText :text="instanceV1Name(instance)" :keyword="keyword" />- </NEllipsis>+ <NEllipsis :disabled="!tooltip" :line-clamp="1" :class="textClass">+ <HighlightLabelText :text="instanceV1Name(instance)" :keyword="keyword" />+ </NEllipsis>- <InstanceV1EngineIcon- v-if="icon && iconPosition === 'suffix'"- :instance="instance"- />- </component>+ <InstanceV1EngineIcon+ v-if="icon && iconPosition === 'suffix'"+ :instance="instance"+ />+ </component>++ <NTag v-if="isArchived" size="small" type="default">+ {{ $t("common.archived") }}+ </NTag>+ </div></template><script lang="ts" setup>-import { NEllipsis } from "naive-ui";+import { NEllipsis, NTag } from "naive-ui";import { computed } from "vue";import { useRouter } from "vue-router";+import { State } from "@/types/proto-es/v1/common_pb";import type {Instance,InstanceResource,@@ -67,6 +74,10 @@ const props = withDefaults();const router = useRouter();+const isArchived = computed(() => {+ return "state" in props.instance && props.instance.state === State.DELETED;+});+const bindings = computed(() => {if (props.link) {return {diff --git a/frontend/src/components/v2/Model/cells/ProjectNameCell.vue b/frontend/src/components/v2/Model/cells/ProjectNameCell.vueindex 5bf5bf6764..d69ec2f9d1 100644--- a/frontend/src/components/v2/Model/cells/ProjectNameCell.vue+++ b/frontend/src/components/v2/Model/cells/ProjectNameCell.vue@@ -1,30 +1,24 @@<template><div class="flex flex-row gap-x-2 items-center"><ProjectV1Name- class="flex-1 max-w-full":project="project":link="link"tag="div":keyword="keyword"/>+ <NTag v-if="project.state === State.DELETED" size="small" type="default">+ {{ $t("common.archived") }}+ </NTag>+<slot name="suffix">{{ suffix }}</slot>-- <NTooltip v-if="project.state === State.DELETED">- <template #trigger>- <heroicons-outline:archive class="w-4 h-4 text-control" />- </template>- <span class="whitespace-nowrap">- {{ $t("common.archived") }}- </span>- </NTooltip></div></template><script setup lang="ts">-import { NTooltip } from "naive-ui";+import { NTag } from "naive-ui";import { ProjectV1Name } from "@/components/v2";import { State } from "@/types/proto-es/v1/common_pb";import type { Project } from "@/types/proto-es/v1/project_service_pb";diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.jsonindex 9bc92888c4..d5ef83d2f3 100644--- a/frontend/src/locales/en-US.json+++ b/frontend/src/locales/en-US.json@@ -41,6 +41,8 @@"environment-name": "Environment Name","archive": "Archive","archived": "Archived",+ "abandon": "Abandon",+ "abandoned": "Abandoned","restored": "Restored","no-license": "No license","logout": "Logout",@@ -420,7 +422,7 @@"bbkit": {"confirm-button": {"sure-to-delete": "Are you sure to delete?",- "sure-to-archive": "Are you sure to archive?",+ "sure-to-abandon": "Are you sure to abandon?","cannot-undo": "You cannot undo this action.","can-undo": "You can undo this action later."}@@ -1826,8 +1828,7 @@"view-doc": "View {destination}'s doc"},"deletion": {- "btn-text": "Delete this webhook",- "confirm-title": "Delete webhook '{title}' and all its execution history?"+ "confirm-title": "Delete webhook '{title}'?"},"direct-messages": "Direct messages","direct-messages-tip": "Bytebase will fall back to posting webhook messages if no users are matched or the delivery of the message fails.",@@ -2810,7 +2811,6 @@"title": "Release","releases": "Releases","files": "Files",- "archive-this-release": "Archive this release","total-files": "Total {count} files","change-tip": "This change is configured to use a release. Database changes will be executed using the SQL statements from the selected release files.","not-found": "Not found",diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.jsonindex a3f994dd43..d94c591d0f 100644--- a/frontend/src/locales/es-ES.json+++ b/frontend/src/locales/es-ES.json@@ -41,6 +41,8 @@"environment-name": "Nombre del entorno","archive": "Archivo","archived": "Archivada",+ "abandon": "Abandonar",+ "abandoned": "Abandonado","restored": "Restored","no-license": "Sin licencia","logout": "Cerrar sesión",@@ -420,7 +422,7 @@"bbkit": {"confirm-button": {"sure-to-delete": "¿Estás seguro de que deseas eliminar?",- "sure-to-archive": "¿Estás seguro de archivar?",+ "sure-to-abandon": "¿Estás seguro de abandonar?","cannot-undo": "Esta acción no se puede deshacer.","can-undo": "Podrás deshacer esta acción más tarde."}@@ -1826,8 +1828,7 @@"view-doc": "Ver documentación de {destination}"},"deletion": {- "btn-text": "Eliminar este webhook",- "confirm-title": "¿Eliminar el '{title}' del webhook y todo su historial de ejecución?"+ "confirm-title": "¿Eliminar el webhook '{title}'?"},"direct-messages": "Mensajes directos","direct-messages-tip": "Bytebase recurrirá a la publicación de mensajes de webhook si no hay usuarios coincidentes o si falla la entrega del mensaje.",@@ -2810,7 +2811,6 @@"title": "Liberar","releases": "Lanzamientos","files": "Archivos",- "archive-this-release": "Archivar este comunicado","total-files": "Total de {count} archivos","change-tip": "Este cambio está configurado para usar una versión. Los cambios en la base de datos se ejecutarán mediante las sentencias SQL de los archivos de la versión seleccionada.","not-found": "Extraviado",diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.jsonindex 350db4ae58..0bc406c8fa 100644--- a/frontend/src/locales/ja-JP.json+++ b/frontend/src/locales/ja-JP.json@@ -41,6 +41,8 @@"environment-name": "環境名","archive": "アーカイブ","archived": "アーカイブ済み",+ "abandon": "破棄",+ "abandoned": "破棄済み","restored": "Restored","no-license": "ライセンスがありません","logout": "サインアウト",@@ -420,7 +422,7 @@"bbkit": {"confirm-button": {"sure-to-delete": "本当に削除してもよろしいですか?",- "sure-to-archive": "本当にアーカイブしますか?",+ "sure-to-abandon": "本当に破棄しますか?","cannot-undo": "この操作は元に戻すことができません。","can-undo": "この操作は後で元に戻すことができます。"}@@ -1826,8 +1828,7 @@"view-doc": "{destination} の公式ドキュメント"},"deletion": {- "btn-text": "この Webhook を削除します",- "confirm-title": "Webhook '{title}' とすべての実行履歴を削除しますか?"+ "confirm-title": "Webhook '{title}' を削除しますか?"},"direct-messages": "プライベートメッセージ通知","direct-messages-tip": "一致するユーザーがいない場合、またはメッセージの配信が失敗した場合、Bytebase は webhook メッセージの投稿にフォールバックします。",@@ -2810,7 +2811,6 @@"title": "リリース","releases": "リリース","files": "ファイル",- "archive-this-release": "このリリースをアーカイブする","total-files": "合計 {count} ファイル","change-tip": "この変更はリリースを使用するように設定されています。データベースの変更は、選択したリリースファイルのSQL文を使用して実行されます。","not-found": "配信パケットが到着していません",diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.jsonindex 07a443544a..6ce7751fd2 100644--- a/frontend/src/locales/vi-VN.json+++ b/frontend/src/locales/vi-VN.json@@ -41,6 +41,8 @@"environment-name": "Tên môi trường","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",@@ -420,7 +422,7 @@"bbkit": {"confirm-button": {"sure-to-delete": "Bạn có chắc chắn muốn xóa?",- "sure-to-archive": "Bạn có chắc chắn muốn lưu trữ?",+ "sure-to-abandon": "Bạn có chắc chắn muốn hủy bỏ?","cannot-undo": "Bạn không thể hoàn tác hành động này.","can-undo": "Bạn có thể hoàn tác hành động này sau."}@@ -1826,8 +1828,7 @@"view-doc": "Xem tài liệu của {destination}"},"deletion": {- "btn-text": "Xóa webhook này",- "confirm-title": "Xóa webhook '{title}' và tất cả lịch sử thực thi của nó?"+ "confirm-title": "Xóa webhook '{title}'?"},"direct-messages": "Tin nhắn trực tiếp","direct-messages-tip": "Bytebase sẽ quay lại đăng tin nhắn webhook nếu không có người dùng nào khớp hoặc việc gửi tin nhắn không thành công.",@@ -2810,7 +2811,6 @@"title": "Giải phóng","releases": "Bản phát hành","files": "Tệp",- "archive-this-release": "Lưu trữ bản phát hành này","total-files": "Tổng số {count} tệp","change-tip": "Kế hoạch này được cấu hình để sử dụng bản phát hành. Các thay đổi cơ sở dữ liệu sẽ được thực hiện bằng các câu lệnh SQL từ các tệp phát hành đã chọn.","not-found": "Không tìm thấy",diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.jsonindex 8f2b9aa2ac..00e6bac056 100644--- a/frontend/src/locales/zh-CN.json+++ b/frontend/src/locales/zh-CN.json@@ -41,6 +41,8 @@"environment-name": "环境名","archive": "归档","archived": "已归档",+ "abandon": "废弃",+ "abandoned": "已废弃","restored": "Restored","no-license": "无证书","logout": "登出",@@ -420,7 +422,7 @@"bbkit": {"confirm-button": {"sure-to-delete": "确定要删除吗?",- "sure-to-archive": "确定要归档吗?",+ "sure-to-abandon": "确定要废弃吗?","cannot-undo": "此操作无法撤销。","can-undo": "此操作可以撤销。"}@@ -1826,8 +1828,7 @@"view-doc": "{destination} 的官方文档"},"deletion": {- "btn-text": "删除这个 webhook",- "confirm-title": "删除 webhook '{title}' 以及所有的执行历史?"+ "confirm-title": "删除 webhook '{title}'?"},"direct-messages": "私信通知","direct-messages-tip": "如果没有匹配的用户或者消息发送失败,Bytebase 将回退发布 webhook 消息。",@@ -2810,7 +2811,6 @@"title": "发布包","releases": "发布包","files": "文件",- "archive-this-release": "归档此发布","total-files": "共 {count} 个文件","change-tip": "此变更项已配置为使用发布包。数据库变更将使用所选发布包文件中的 SQL 语句执行。","not-found": "未找到",diff --git a/frontend/src/utils/v1/instance.ts b/frontend/src/utils/v1/instance.tsindex b1dda2ace0..c91cedf19d 100644--- a/frontend/src/utils/v1/instance.ts+++ b/frontend/src/utils/v1/instance.ts@@ -7,7 +7,7 @@ import {languageOfEngineV1,unknownInstance,} from "@/types";-import { Engine, State } from "@/types/proto-es/v1/common_pb";+import { Engine } from "@/types/proto-es/v1/common_pb";// Using proto-es types directly, no conversions neededimport type {Instance,@@ -26,9 +26,7 @@ export function instanceV1Name(instance: Instance | InstanceResource) {if (instance.title === unknownInstance().title) {name = extractInstanceResourceName(instance.name);}- if ((instance as Instance).state === State.DELETED) {- name += ` (${t("common.archived")})`;- } else if (+ if (isValidInstanceName(instance.name) &&!instance.activation &&store.currentPlan !== PlanType.FREEdiff --git a/frontend/src/utils/v1/project.ts b/frontend/src/utils/v1/project.tsindex 6f0d8eb563..3bd47cfa0f 100644--- a/frontend/src/utils/v1/project.ts+++ b/frontend/src/utils/v1/project.ts@@ -1,5 +1,4 @@import { DEFAULT_PROJECT_NAME } from "@/types";-import { State } from "@/types/proto-es/v1/common_pb";import type { Project } from "@/types/proto-es/v1/project_service_pb";export const extractProjectResourceName = (name: string) => {@@ -13,11 +12,7 @@ export function projectV1Name(project: Project) {return "Unassigned";}- const parts = [project.title];- if (project.state === State.DELETED) {- parts.push("(Archived)");- }- return parts.join(" ");+ return project.title;}export function filterProjectV1ListByKeyword<T extends Project>(diff --git a/frontend/src/views/project/ProjectDatabaseGroupDetail.vue b/frontend/src/views/project/ProjectDatabaseGroupDetail.vueindex 4fb0e435fe..9e0792b3f8 100644--- a/frontend/src/views/project/ProjectDatabaseGroupDetail.vue+++ b/frontend/src/views/project/ProjectDatabaseGroupDetail.vue@@ -51,6 +51,19 @@{{ $t("common.configure") }}</NButton></PermissionGuardWrapper>++ <NDropdown+ v-if="dropdownOptions.length > 0"+ trigger="click"+ :options="dropdownOptions"+ @select="handleDropdownSelect"+ >+ <NButton size="small" quaternary class="px-1!">+ <template #icon>+ <EllipsisVerticalIcon class="w-4 h-4" />+ </template>+ </NButton>+ </NDropdown></div><DatabaseGroupForm@@ -63,22 +76,34 @@</template><script lang="ts" setup>-import { EditIcon } from "lucide-vue-next";-import { NButton, NTooltip } from "naive-ui";+import { EditIcon, EllipsisVerticalIcon } from "lucide-vue-next";+import type { DropdownOption } from "naive-ui";+import { NButton, NDropdown, NTooltip, useDialog } from "naive-ui";import { computed, reactive, watchEffect } from "vue";+import { useI18n } from "vue-i18n";+import { useRouter } from "vue-router";import DatabaseGroupForm from "@/components/DatabaseGroup/DatabaseGroupForm.vue";import FeatureAttention from "@/components/FeatureGuard/FeatureAttention.vue";import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";import { preCreateIssue } from "@/components/Plan/logic/issue";import { useBodyLayoutContext } from "@/layouts/common";-import { featureToRef, useDBGroupStore, useProjectByName } from "@/store";+import { PROJECT_V1_ROUTE_DATABASE_GROUPS } from "@/router/dashboard/projectV1";+import {+ featureToRef,+ useDBGroupStore,+ useGracefulRequest,+ useProjectByName,+} from "@/store";import {databaseGroupNamePrefix,projectNamePrefix,} from "@/store/modules/v1/common";import { DatabaseGroupView } from "@/types/proto-es/v1/database_group_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";-import { PERMISSIONS_FOR_DATABASE_CHANGE_ISSUE } from "@/utils";+import {+ hasProjectPermissionV2,+ PERMISSIONS_FOR_DATABASE_CHANGE_ISSUE,+} from "@/utils";interface LocalState {editing: boolean;@@ -94,6 +119,9 @@ const dbGroupStore = useDBGroupStore();const { project } = useProjectByName(computed(() => `${projectNamePrefix}${props.projectId}`));+const { t } = useI18n();+const dialog = useDialog();+const router = useRouter();const state = reactive<LocalState>({editing: false,});@@ -114,6 +142,45 @@ const hasDatabaseGroupFeature = featureToRef(PlanFeature.FEATURE_DATABASE_GROUPS);+const allowDelete = computed(() => {+ return hasProjectPermissionV2(project.value, "bb.databaseGroups.delete");+});++const dropdownOptions = computed((): DropdownOption[] => {+ if (!allowDelete.value) {+ return [];+ }+ return [+ {+ key: "delete",+ label: t("common.delete"),+ },+ ];+});++const handleDropdownSelect = (key: string) => {+ if (key === "delete" && databaseGroup.value) {+ dialog.warning({+ title: t("database-group.delete-group", {+ name: databaseGroup.value.title,+ }),+ content: t("common.cannot-undo-this-action"),+ negativeText: t("common.cancel"),+ positiveText: t("common.delete"),+ onPositiveClick: () => {+ useGracefulRequest(async () => {+ await dbGroupStore.deleteDatabaseGroup(+ databaseGroupResourceName.value+ );+ router.push({+ name: PROJECT_V1_ROUTE_DATABASE_GROUPS,+ });+ });+ },+ });+ }+};+watchEffect(async () => {await dbGroupStore.getOrFetchDBGroupByName(databaseGroupResourceName.value, {skipCache: true,diff --git a/frontend/src/views/project/ProjectWebhookDashboard.vue b/frontend/src/views/project/ProjectWebhookDashboard.vueindex 36733e44eb..ea5f694d27 100644--- a/frontend/src/views/project/ProjectWebhookDashboard.vue+++ b/frontend/src/views/project/ProjectWebhookDashboard.vue@@ -24,14 +24,15 @@:striped="true":row-key="(webhook: Webhook) => webhook.name":bordered="true"+ :row-props="rowProps"/></div></template><script setup lang="tsx">-import { PlusIcon } from "lucide-vue-next";-import type { DataTableColumn } from "naive-ui";-import { NButton, NDataTable, NTag } from "naive-ui";+import { EllipsisVerticalIcon, PlusIcon } from "lucide-vue-next";+import type { DataTableColumn, DropdownOption } from "naive-ui";+import { NButton, NDataTable, NDropdown, NTag, useDialog } from "naive-ui";import { computed, h } from "vue";import { useI18n } from "vue-i18n";import { useRouter } from "vue-router";@@ -41,7 +42,13 @@ import {PROJECT_V1_ROUTE_WEBHOOK_CREATE,PROJECT_V1_ROUTE_WEBHOOK_DETAIL,} from "@/router/dashboard/projectV1";-import { useProjectByName } from "@/store";+import {+ pushNotification,+ useGracefulRequest,+ useProjectByName,+ useProjectV1Store,+ useProjectWebhookV1Store,+} from "@/store";import { projectNamePrefix } from "@/store/modules/v1/common";import { projectWebhookV1ActivityItemList } from "@/types";import type { Webhook } from "@/types/proto-es/v1/project_service_pb";@@ -55,6 +62,10 @@ const props = defineProps<{const router = useRouter();const { t } = useI18n();+const dialog = useDialog();++const projectStore = useProjectV1Store();+const projectWebhookV1Store = useProjectWebhookV1Store();const { project } = useProjectByName(computed(() => `${projectNamePrefix}${props.projectId}`)@@ -66,6 +77,49 @@ const addProjectWebhook = () => {});};+const rowProps = (webhook: Webhook) => {+ return {+ style: "cursor: pointer;",+ onClick: () => {+ router.push({+ name: PROJECT_V1_ROUTE_WEBHOOK_DETAIL,+ params: {+ projectWebhookSlug: projectWebhookV1Slug(webhook),+ },+ });+ },+ };+};++const deleteWebhook = (webhook: Webhook) => {+ dialog.warning({+ title: t("project.webhook.deletion.confirm-title", {+ title: webhook.title,+ }),+ content: t("common.cannot-undo-this-action"),+ negativeText: t("common.cancel"),+ positiveText: t("common.delete"),+ onPositiveClick: () => {+ useGracefulRequest(async () => {+ const name = webhook.title;+ const updatedProject =+ await projectWebhookV1Store.deleteProjectWebhook(webhook);+ projectStore.updateProjectCache({+ ...project.value,+ ...updatedProject,+ });+ pushNotification({+ module: "bytebase",+ style: "SUCCESS",+ title: t("project.webhook.success-deleted-prompt", {+ name,+ }),+ });+ });+ },+ });+};+const columnList = computed((): DataTableColumn<Webhook>[] => {return [{@@ -111,31 +165,60 @@ const columnList = computed((): DataTableColumn<Webhook>[] => {);},},- {- key: "actions",- title: "",- width: "5rem",- render: (webhook) =>- h(- "div",- { class: "flex justify-end" },- h(- NButton,- {- size: "small",- onClick: () => {- router.push({- name: PROJECT_V1_ROUTE_WEBHOOK_DETAIL,- params: {- projectWebhookSlug: projectWebhookV1Slug(webhook),+ ...(props.allowEdit+ ? [+ {+ key: "actions",+ title: "",+ width: "3rem",+ render: (webhook: Webhook) => {+ const dropdownOptions: DropdownOption[] = [+ {+ key: "delete",+ label: t("common.delete"),+ },+ ];++ return h(+ "div",+ {+ class: "flex justify-end",+ onClick: (e: Event) => {+ e.stopPropagation();},- });- },+ },+ h(+ NDropdown,+ {+ trigger: "click",+ options: dropdownOptions,+ onSelect: (key: string) => {+ if (key === "delete") {+ deleteWebhook(webhook);+ }+ },+ },+ {+ default: () =>+ h(+ NButton,+ {+ size: "small",+ quaternary: true,+ class: "px-1!",+ },+ {+ icon: () =>+ h(EllipsisVerticalIcon, { class: "w-4 h-4" }),+ }+ ),+ }+ )+ );},- { default: () => t("common.view") }- )- ),- },+ },+ ]+ : []),];});</script>