Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

chore: ui fix (#18466)

ecmadaoa862733c1760
diff --git a/frontend/src/components/GeneralSetting/BrandingSetting.vue b/frontend/src/components/GeneralSetting/BrandingSetting.vue
index c87c91b530..ee22a69235 100644
--- a/frontend/src/components/GeneralSetting/BrandingSetting.vue
+++ b/frontend/src/components/GeneralSetting/BrandingSetting.vue
@@ -34,6 +34,7 @@
:max-file-size-in-mi-b="maxFileSizeInMiB"
:support-file-extensions="supportImageExtensions"
:disabled="!allowEdit || !hasBrandingFeature"
+ :show-no-data-placeholder="!state.logoUrl"
@on-select="onLogoSelect"
/>
</div>
diff --git a/frontend/src/components/GeneralSetting/GeneralSetting.vue b/frontend/src/components/GeneralSetting/GeneralSetting.vue
index 8008d89f8b..c634960899 100644
--- a/frontend/src/components/GeneralSetting/GeneralSetting.vue
+++ b/frontend/src/components/GeneralSetting/GeneralSetting.vue
@@ -7,7 +7,7 @@
</h1>
</div>
</div>
- <div class="flex-1 mt-4 lg:px-4 lg:mt-0 flex flex-col gap-y-7">
+ <div class="flex-1 mt-4 lg:px-4 lg:mt-0 flex flex-col gap-y-6">
<WorkspaceMode
v-model:mode="state.databaseChangeMode"
:disabled="!allowEdit"
diff --git a/frontend/src/components/GeneralSetting/MaximumSQLResultSizeSetting.vue b/frontend/src/components/GeneralSetting/MaximumSQLResultSizeSetting.vue
index f0e6d12781..42bd0449ce 100644
--- a/frontend/src/components/GeneralSetting/MaximumSQLResultSizeSetting.vue
+++ b/frontend/src/components/GeneralSetting/MaximumSQLResultSizeSetting.vue
@@ -1,5 +1,5 @@
<template>
- <div class="flex flex-col gap-y-7">
+ <div class="flex flex-col gap-y-6">
<div>
<p class="font-medium flex flex-row justify-start items-center">
<span class="mr-2">
diff --git a/frontend/src/components/GeneralSetting/QueryDataPolicySetting.vue b/frontend/src/components/GeneralSetting/QueryDataPolicySetting.vue
index 70ae299eb2..0ed673362d 100644
--- a/frontend/src/components/GeneralSetting/QueryDataPolicySetting.vue
+++ b/frontend/src/components/GeneralSetting/QueryDataPolicySetting.vue
@@ -1,5 +1,5 @@
<template>
- <div class="flex-1 flex flex-col gap-y-7">
+ <div class="flex-1 flex flex-col gap-y-6">
<div>
<div class="flex items-center gap-x-2">
<Switch
diff --git a/frontend/src/components/GeneralSetting/SecuritySetting.vue b/frontend/src/components/GeneralSetting/SecuritySetting.vue
index 42134e7e5f..c14ddf4c0e 100644
--- a/frontend/src/components/GeneralSetting/SecuritySetting.vue
+++ b/frontend/src/components/GeneralSetting/SecuritySetting.vue
@@ -11,7 +11,7 @@
</span>
</div>
- <div class="flex-1 lg:px-4 flex flex-col gap-y-7">
+ <div class="flex-1 lg:px-4 flex flex-col gap-y-6">
<div>
<div class="flex items-center gap-x-2">
<Switch
diff --git a/frontend/src/components/Project/Settings/ProjectIssueRelatedSettingPanel.vue b/frontend/src/components/Project/Settings/ProjectIssueRelatedSettingPanel.vue
index dc7bfe99bb..49732164ce 100644
--- a/frontend/src/components/Project/Settings/ProjectIssueRelatedSettingPanel.vue
+++ b/frontend/src/components/Project/Settings/ProjectIssueRelatedSettingPanel.vue
@@ -1,5 +1,5 @@
<template>
- <div class="w-full flex flex-col justify-start items-start gap-y-4">
+ <div class="w-full flex flex-col justify-start items-start gap-y-6">
<div class="flex flex-col gap-y-2">
<div class="font-medium">
{{ $t("project.settings.issue-related.labels.self") }}
@@ -20,307 +20,305 @@
@update:value="onLabelsUpdate"
/>
</div>
- <div class="w-full flex flex-col justify-start items-start gap-2">
- <div>
- <div class="flex items-center gap-x-2">
- <Switch
- v-model:value="state.allowModifyStatement"
- :text="true"
- :disabled="!allowUpdateIssueProjectSetting || loading"
- />
- <span class="textlabel">
- {{
- $t("project.settings.issue-related.allow-modify-statement.self")
- }}
- </span>
- </div>
- <div class="mt-1 mb-3 text-sm text-gray-400">
+ <div>
+ <div class="flex items-center gap-x-2">
+ <Switch
+ v-model:value="state.allowModifyStatement"
+ :text="true"
+ :disabled="!allowUpdateIssueProjectSetting || loading"
+ />
+ <span class="textlabel">
{{
- $t(
- "project.settings.issue-related.allow-modify-statement.description"
- )
+ $t("project.settings.issue-related.allow-modify-statement.self")
}}
- </div>
+ </span>
</div>
- <div>
- <div class="flex items-center gap-x-2">
- <Switch
- v-model:value="state.autoResolveIssue"
- :text="true"
- :disabled="!allowUpdateIssueProjectSetting || loading"
- />
- <span class="textlabel">
- {{ $t("project.settings.issue-related.auto-resolve-issue.self") }}
- </span>
- </div>
- <div class="mt-1 mb-3 text-sm text-gray-400">
+ <div class="mt-1 text-sm text-gray-400">
+ {{
+ $t(
+ "project.settings.issue-related.allow-modify-statement.description"
+ )
+ }}
+ </div>
+ </div>
+ <div>
+ <div class="flex items-center gap-x-2">
+ <Switch
+ v-model:value="state.autoResolveIssue"
+ :text="true"
+ :disabled="!allowUpdateIssueProjectSetting || loading"
+ />
+ <span class="textlabel">
+ {{ $t("project.settings.issue-related.auto-resolve-issue.self") }}
+ </span>
+ </div>
+ <div class="mt-1 text-sm text-gray-400">
+ {{
+ $t("project.settings.issue-related.auto-resolve-issue.description")
+ }}
+ </div>
+ </div>
+ <div>
+ <div class="flex items-center gap-x-2">
+ <Switch
+ v-model:value="state.forceIssueLabels"
+ :text="true"
+ :disabled="
+ !allowUpdateIssueProjectSetting ||
+ state.issueLabels.length === 0 ||
+ loading
+ "
+ />
+ <div class="textlabel flex items-center gap-x-2">
{{
- $t("project.settings.issue-related.auto-resolve-issue.description")
+ $t(
+ "project.settings.issue-related.labels.force-issue-labels.self"
+ )
}}
- </div>
- </div>
- <div>
- <div class="flex items-center gap-x-2">
- <Switch
- v-model:value="state.forceIssueLabels"
- :text="true"
- :disabled="
- !allowUpdateIssueProjectSetting ||
- state.issueLabels.length === 0 ||
- loading
- "
- />
- <div class="textlabel flex items-center gap-x-2">
+ <NTooltip v-if="allowEdit && state.issueLabels.length === 0">
+ <template #trigger>
+ <TriangleAlertIcon class="w-4 text-warning" />
+ </template>
{{
$t(
- "project.settings.issue-related.labels.force-issue-labels.self"
+ "project.settings.issue-related.labels.force-issue-labels.warning"
)
}}
- <NTooltip v-if="allowEdit && state.issueLabels.length === 0">
- <template #trigger>
- <TriangleAlertIcon class="w-4 text-warning" />
- </template>
- {{
- $t(
- "project.settings.issue-related.labels.force-issue-labels.warning"
- )
- }}
- </NTooltip>
- </div>
- </div>
- <div class="mt-1 mb-3 text-sm text-gray-400">
- {{
- $t(
- "project.settings.issue-related.labels.force-issue-labels.description"
- )
- }}
+ </NTooltip>
</div>
</div>
- <div>
- <div class="flex items-center gap-x-2">
- <Switch
- v-model:value="state.enforceIssueTitle"
- :text="true"
- :disabled="!allowUpdateIssueProjectSetting || loading"
- />
- <span class="textlabel">
- {{ $t("project.settings.issue-related.enforce-issue-title.self") }}
- </span>
- </div>
- <div class="mt-1 mb-3 text-sm text-gray-400">
- {{
- $t("project.settings.issue-related.enforce-issue-title.description")
- }}
- </div>
+ <div class="mt-1 text-sm text-gray-400">
+ {{
+ $t(
+ "project.settings.issue-related.labels.force-issue-labels.description"
+ )
+ }}
</div>
- <div>
- <div class="flex items-center gap-x-2">
- <Switch
- v-model:value="state.enforceSqlReview"
- :text="true"
- :disabled="!allowUpdateIssueProjectSetting || loading"
- />
- <span class="textlabel">
- {{ $t("project.settings.issue-related.enforce-sql-review.self") }}
- </span>
- </div>
- <div class="mt-1 mb-3 text-sm text-gray-400">
- {{
- $t("project.settings.issue-related.enforce-sql-review.description")
- }}
- </div>
+ </div>
+ <div>
+ <div class="flex items-center gap-x-2">
+ <Switch
+ v-model:value="state.enforceIssueTitle"
+ :text="true"
+ :disabled="!allowUpdateIssueProjectSetting || loading"
+ />
+ <span class="textlabel">
+ {{ $t("project.settings.issue-related.enforce-issue-title.self") }}
+ </span>
</div>
- <div>
- <div class="flex items-center gap-x-2">
- <Switch
- v-model:value="state.allowSelfApproval"
- :text="true"
- :disabled="!allowUpdateIssueProjectSetting || loading"
- />
- <span class="textlabel">
- {{ $t("project.settings.issue-related.allow-self-approval.self") }}
- </span>
- </div>
- <div class="mt-1 mb-3 text-sm text-gray-400">
- {{
- $t("project.settings.issue-related.allow-self-approval.description")
- }}
- </div>
+ <div class="mt-1 text-sm text-gray-400">
+ {{
+ $t("project.settings.issue-related.enforce-issue-title.description")
+ }}
</div>
- <div>
- <div class="flex items-center gap-x-2">
- <Switch
- v-model:value="state.requireIssueApproval"
- :text="true"
- :disabled="!allowUpdateIssueProjectSetting || loading"
- />
- <span class="textlabel">
- {{
- $t("project.settings.issue-related.require-issue-approval.self")
- }}
- </span>
- </div>
- <div class="mt-1 mb-3 text-sm text-gray-400">
+ </div>
+ <div>
+ <div class="flex items-center gap-x-2">
+ <Switch
+ v-model:value="state.enforceSqlReview"
+ :text="true"
+ :disabled="!allowUpdateIssueProjectSetting || loading"
+ />
+ <span class="textlabel">
+ {{ $t("project.settings.issue-related.enforce-sql-review.self") }}
+ </span>
+ </div>
+ <div class="mt-1 text-sm text-gray-400">
+ {{
+ $t("project.settings.issue-related.enforce-sql-review.description")
+ }}
+ </div>
+ </div>
+ <div>
+ <div class="flex items-center gap-x-2">
+ <Switch
+ v-model:value="state.allowSelfApproval"
+ :text="true"
+ :disabled="!allowUpdateIssueProjectSetting || loading"
+ />
+ <span class="textlabel">
+ {{ $t("project.settings.issue-related.allow-self-approval.self") }}
+ </span>
+ </div>
+ <div class="mt-1 text-sm text-gray-400">
+ {{
+ $t("project.settings.issue-related.allow-self-approval.description")
+ }}
+ </div>
+ </div>
+ <div>
+ <div class="flex items-center gap-x-2">
+ <Switch
+ v-model:value="state.requireIssueApproval"
+ :text="true"
+ :disabled="!allowUpdateIssueProjectSetting || loading"
+ />
+ <span class="textlabel">
{{
- $t(
- "project.settings.issue-related.require-issue-approval.description"
- )
+ $t("project.settings.issue-related.require-issue-approval.self")
}}
- </div>
+ </span>
</div>
- <div>
- <div class="flex items-center gap-x-2">
- <Switch
- v-model:value="state.requirePlanCheckNoError"
- :text="true"
- :disabled="!allowUpdateIssueProjectSetting || loading"
- />
- <span class="textlabel">
- {{
- $t(
- "project.settings.issue-related.require-plan-check-no-error.self"
- )
- }}
- </span>
- </div>
- <div class="mt-1 mb-3 text-sm text-gray-400">
+ <div class="mt-1 text-sm text-gray-400">
+ {{
+ $t(
+ "project.settings.issue-related.require-issue-approval.description"
+ )
+ }}
+ </div>
+ </div>
+ <div>
+ <div class="flex items-center gap-x-2">
+ <Switch
+ v-model:value="state.requirePlanCheckNoError"
+ :text="true"
+ :disabled="!allowUpdateIssueProjectSetting || loading"
+ />
+ <span class="textlabel">
{{
$t(
- "project.settings.issue-related.require-plan-check-no-error.description"
+ "project.settings.issue-related.require-plan-check-no-error.self"
)
}}
- </div>
+ </span>
</div>
- <div>
- <div class="flex items-center gap-x-2">
- <Switch
- v-model:value="state.autoEnableBackup"
- :text="true"
- :disabled="!allowUpdateIssueProjectSetting || loading"
- />
- <span class="textlabel">
- {{ $t("project.settings.issue-related.auto-enable-backup.self") }}
- </span>
- </div>
- <div class="mt-1 mb-3 text-sm text-gray-400">
- {{
- $t("project.settings.issue-related.auto-enable-backup.description")
- }}
- </div>
+ <div class="mt-1 text-sm text-gray-400">
+ {{
+ $t(
+ "project.settings.issue-related.require-plan-check-no-error.description"
+ )
+ }}
</div>
- <div>
- <div class="flex items-center gap-x-2">
- <Switch
- v-model:value="state.skipBackupErrors"
- :text="true"
- :disabled="!allowUpdateIssueProjectSetting || loading"
- />
- <span class="textlabel">
- {{ $t("project.settings.issue-related.skip-backup-errors.self") }}
- </span>
- </div>
- <div class="mt-1 mb-3 text-sm text-gray-400">
- {{
- $t("project.settings.issue-related.skip-backup-errors.description")
- }}
- </div>
+ </div>
+ <div>
+ <div class="flex items-center gap-x-2">
+ <Switch
+ v-model:value="state.autoEnableBackup"
+ :text="true"
+ :disabled="!allowUpdateIssueProjectSetting || loading"
+ />
+ <span class="textlabel">
+ {{ $t("project.settings.issue-related.auto-enable-backup.self") }}
+ </span>
</div>
- <div>
- <div class="flex items-center gap-x-2">
- <Switch
- v-model:value="state.postgresDatabaseTenantMode"
- :text="true"
- :disabled="!allowUpdateIssueProjectSetting || loading"
- />
- <span class="textlabel">
- {{
- $t(
- "project.settings.issue-related.postgres-database-tenant-mode.self"
- )
- }}
- </span>
- </div>
- <div class="mt-1 mb-3 text-sm text-gray-400">
+ <div class="mt-1 text-sm text-gray-400">
+ {{
+ $t("project.settings.issue-related.auto-enable-backup.description")
+ }}
+ </div>
+ </div>
+ <div>
+ <div class="flex items-center gap-x-2">
+ <Switch
+ v-model:value="state.skipBackupErrors"
+ :text="true"
+ :disabled="!allowUpdateIssueProjectSetting || loading"
+ />
+ <span class="textlabel">
+ {{ $t("project.settings.issue-related.skip-backup-errors.self") }}
+ </span>
+ </div>
+ <div class="mt-1 text-sm text-gray-400">
+ {{
+ $t("project.settings.issue-related.skip-backup-errors.description")
+ }}
+ </div>
+ </div>
+ <div>
+ <div class="flex items-center gap-x-2">
+ <Switch
+ v-model:value="state.postgresDatabaseTenantMode"
+ :text="true"
+ :disabled="!allowUpdateIssueProjectSetting || loading"
+ />
+ <span class="textlabel">
{{
$t(
- "project.settings.issue-related.postgres-database-tenant-mode.description"
+ "project.settings.issue-related.postgres-database-tenant-mode.self"
)
}}
- </div>
+ </span>
</div>
- <div>
- <p class="">
- <span class="textlabel">
- {{ $t("project.settings.issue-related.max-retries.self") }}
- </span>
- </p>
- <p class="mb-3 text-sm text-gray-400">
- {{ $t("project.settings.issue-related.max-retries.description") }}
- </p>
- <div class="mt-3 w-full flex flex-row justify-start items-center gap-4">
- <NInputNumber
- :value="state.executionRetryPolicy?.maximumRetries ?? 0"
- :disabled="!allowUpdateIssueProjectSetting || loading"
- class="w-60"
- :min="0"
- :precision="0"
- @update:value="handleInput"
- >
- <template #suffix> Times </template>
- </NInputNumber>
- </div>
+ <div class="mt-1 text-sm text-gray-400">
+ {{
+ $t(
+ "project.settings.issue-related.postgres-database-tenant-mode.description"
+ )
+ }}
</div>
- <div>
- <p class="">
- <span class="textlabel">
- {{ $t("project.settings.issue-related.ci-sampling-size.self") }}
- </span>
- </p>
- <p class="mb-3 text-sm text-gray-400">
- {{
- $t("project.settings.issue-related.ci-sampling-size.description")
- }}
- </p>
- <div class="mt-3 w-full flex flex-row justify-start items-center gap-4">
- <NInputNumber
- :value="state.ciSamplingSize"
- :disabled="!allowUpdateIssueProjectSetting || loading"
- class="w-60"
- :min="0"
- :precision="0"
- @update:value="handleCiSamplingSizeInput"
- >
- </NInputNumber>
- </div>
+ </div>
+ <div>
+ <p class="">
+ <span class="textlabel">
+ {{ $t("project.settings.issue-related.max-retries.self") }}
+ </span>
+ </p>
+ <p class="mb-3 text-sm text-gray-400">
+ {{ $t("project.settings.issue-related.max-retries.description") }}
+ </p>
+ <div class="mt-3 w-full flex flex-row justify-start items-center gap-4">
+ <NInputNumber
+ :value="state.executionRetryPolicy?.maximumRetries ?? 0"
+ :disabled="!allowUpdateIssueProjectSetting || loading"
+ class="w-60"
+ :min="0"
+ :precision="0"
+ @update:value="handleInput"
+ >
+ <template #suffix> Times </template>
+ </NInputNumber>
</div>
- <div>
- <p class="">
- <span class="textlabel">
- {{
- $t(
- "project.settings.issue-related.parallel_tasks_per_rollout.self"
- )
- }}
- </span>
- </p>
- <p class="mb-3 text-sm text-gray-400">
+ </div>
+ <div>
+ <p class="">
+ <span class="textlabel">
+ {{ $t("project.settings.issue-related.ci-sampling-size.self") }}
+ </span>
+ </p>
+ <p class="mb-3 text-sm text-gray-400">
+ {{
+ $t("project.settings.issue-related.ci-sampling-size.description")
+ }}
+ </p>
+ <div class="mt-3 w-full flex flex-row justify-start items-center gap-4">
+ <NInputNumber
+ :value="state.ciSamplingSize"
+ :disabled="!allowUpdateIssueProjectSetting || loading"
+ class="w-60"
+ :min="0"
+ :precision="0"
+ @update:value="handleCiSamplingSizeInput"
+ >
+ </NInputNumber>
+ </div>
+ </div>
+ <div>
+ <p class="">
+ <span class="textlabel">
{{
$t(
- "project.settings.issue-related.parallel_tasks_per_rollout.description"
+ "project.settings.issue-related.parallel_tasks_per_rollout.self"
)
}}
- </p>
- <div class="mt-3 w-full flex flex-row justify-start items-center gap-4">
- <NInputNumber
- :value="state.parallelTasksPerRollout"
- :disabled="!allowUpdateIssueProjectSetting || loading"
- class="w-60"
- :min="0"
- :precision="0"
- @update:value="handleParallelTasksPerRolloutInput"
- >
- </NInputNumber>
- </div>
+ </span>
+ </p>
+ <p class="mb-3 text-sm text-gray-400">
+ {{
+ $t(
+ "project.settings.issue-related.parallel_tasks_per_rollout.description"
+ )
+ }}
+ </p>
+ <div class="mt-3 w-full flex flex-row justify-start items-center gap-4">
+ <NInputNumber
+ :value="state.parallelTasksPerRollout"
+ :disabled="!allowUpdateIssueProjectSetting || loading"
+ class="w-60"
+ :min="0"
+ :precision="0"
+ @update:value="handleParallelTasksPerRolloutInput"
+ >
+ </NInputNumber>
</div>
</div>
</div>
diff --git a/frontend/src/components/Project/Settings/ProjectSecuritySettingPanel.vue b/frontend/src/components/Project/Settings/ProjectSecuritySettingPanel.vue
index f4fb691b22..70834ec66c 100644
--- a/frontend/src/components/Project/Settings/ProjectSecuritySettingPanel.vue
+++ b/frontend/src/components/Project/Settings/ProjectSecuritySettingPanel.vue
@@ -1,5 +1,5 @@
<template>
- <div class="w-full flex flex-col justify-start items-start gap-y-7">
+ <div class="w-full flex flex-col justify-start items-start gap-y-6">
<SQLReviewForResource
ref="sqlReviewForResourceRef"
:resource="project.name"
diff --git a/frontend/src/components/SensitiveData/ClassificationView.vue b/frontend/src/components/SensitiveData/ClassificationView.vue
index 19b0b91c76..8f0747111f 100644
--- a/frontend/src/components/SensitiveData/ClassificationView.vue
+++ b/frontend/src/components/SensitiveData/ClassificationView.vue
@@ -19,7 +19,17 @@
</span>
</div>
- <div class="flex items-center justify-end gap-2">
+ <div class="flex items-center justify-end gap-x-2">
+ <BBButtonConfirm
+ :tertiary="true"
+ :text="false"
+ :type="'DELETE'"
+ :ok-text="$t('common.delete')"
+ :require-confirm="true"
+ :hide-icon="true"
+ :button-text="$t('common.clear')"
+ @confirm="clearSetting"
+ />
<NButton
type="primary"
:disabled="!allowEdit || !hasClassificationFeature"
@@ -50,6 +60,7 @@
:support-file-extensions="['.json']"
:max-file-size-in-mi-b="maxFileSizeInMiB"
:disabled="!allowEdit || !hasClassificationFeature"
+ :show-no-data-placeholder="true"
@on-select="onFileSelect"
>
</SingleFileSelector>
@@ -74,6 +85,7 @@ import { NButton, useDialog } from "naive-ui";
import { v4 as uuidv4 } from "uuid";
import { computed, reactive, ref, watchEffect } from "vue";
import { useI18n } from "vue-i18n";
+import { BBButtonConfirm } from "@/bbkit";
import { featureToRef, pushNotification, useSettingV1Store } from "@/store";
import type {
DataClassificationSetting_DataClassificationConfig_Level as ClassificationLevel,
@@ -170,22 +182,28 @@ const saveChanges = async () => {
"settings.sensitive-data.classification.override-confirm"
),
onPositiveClick: async () => {
- await upsertSetting();
+ await upsertSetting([state.classification]);
},
});
return;
}
- await upsertSetting();
+ await upsertSetting([state.classification]);
+};
+
+const clearSetting = async () => {
+ await upsertSetting([]);
};
-const upsertSetting = async () => {
+const upsertSetting = async (
+ configs: DataClassificationSetting_DataClassificationConfig[]
+) => {
await settingStore.upsertSetting({
name: Setting_SettingName.DATA_CLASSIFICATION,
value: create(SettingSettingValueSchema, {
value: {
case: "dataClassification",
value: create(DataClassificationSettingSchema, {
- configs: [state.classification],
+ configs,
}),
},
}),
diff --git a/frontend/src/components/SensitiveData/components/IconSelector.vue b/frontend/src/components/SensitiveData/components/IconSelector.vue
index 64edf7d8d9..e742176eed 100644
--- a/frontend/src/components/SensitiveData/components/IconSelector.vue
+++ b/frontend/src/components/SensitiveData/components/IconSelector.vue
@@ -1,9 +1,9 @@
<template>
<div class="w-full">
<div v-if="!isEditing" class="flex items-center justify-center gap-1">
- <template v-if="modelValue">
+ <template v-if="value">
<!-- Display uploaded image -->
- <img :src="modelValue" class="w-6 h-6 object-contain" alt="" />
+ <img :src="value" class="w-6 h-6 object-contain" alt="" />
<MiniActionButton v-if="!readonly" @click="startEditing">
<PencilIcon class="w-4 h-4" />
</MiniActionButton>
@@ -25,29 +25,21 @@
<template #trigger>
<div class="w-full" />
</template>
- <div class="p-2 flex flex-col gap-y-2">
- <SingleFileSelector
- class="w-48 h-32"
- :max-file-size-in-mi-b="2"
- :support-file-extensions="supportImageExtensions"
- @on-select="onFileSelect"
- >
- <template #default>
- <div
- class="w-full h-full flex flex-col items-center justify-center border-2 border-dashed border-gray-300 rounded-md hover:border-gray-400 transition-colors"
- >
- <heroicons-outline:upload class="w-8 h-8 text-gray-400" />
- <span class="text-xs text-gray-500 mt-1">
- {{ $t("settings.general.workspace.drag-logo") }}
- </span>
- <span class="text-xs text-gray-400">
- {{ supportedFormatsText }}
- </span>
- </div>
- </template>
- </SingleFileSelector>
- <div v-if="tempValue" class="mt-2">
- <img :src="tempValue" class="w-8 h-8 object-contain mx-auto" alt="" />
+ <div class="p-2 flex flex-col gap-y-4">
+ <div class="w-48 h-48 flex justify-center items-center border border-gray-300 border-dashed rounded-md relative">
+ <div
+ class="w-1/3 h-1/3 bg-no-repeat bg-contain bg-center rounded-md pointer-events-none"
+ :style="`background-image: url(${tempValue});`"
+ ></div>
+
+ <SingleFileSelector
+ class="flex flex-col gap-y-1 text-center justify-center items-center absolute top-0 bottom-0 left-0 right-0"
+ :class="[tempValue ? 'opacity-0 hover:opacity-90' : '']"
+ :max-file-size-in-mi-b="2"
+ :support-file-extensions="supportImageExtensions"
+ :show-no-data-placeholder="!tempValue"
+ @on-select="onFileSelect"
+ />
</div>
<div class="flex justify-end gap-2">
<NButton size="tiny" @click="clearIcon">
@@ -68,41 +60,44 @@
<script setup lang="ts">
import { PencilIcon } from "lucide-vue-next";
import { NButton, NPopover } from "naive-ui";
-import { computed, ref } from "vue";
+import { ref, watch } from "vue";
import SingleFileSelector from "@/components/SingleFileSelector.vue";
import { MiniActionButton } from "@/components/v2";
const props = defineProps<{
- modelValue?: string;
+ value?: string;
readonly?: boolean;
}>();
const emit = defineEmits<{
- (event: "update:modelValue", value: string): void;
+ (event: "update:value", value: string): void;
}>();
const isEditing = ref(false);
const tempValue = ref("");
-const supportImageExtensions = [".jpg", ".jpeg", ".png", ".webp", ".svg"];
+watch(
+ () => isEditing.value,
+ (editing) => {
+ if (editing) {
+ tempValue.value = props.value ?? "";
+ }
+ }
+);
-const supportedFormatsText = computed(() => {
- return supportImageExtensions.join(", ") + " (max 2MB)";
-});
+const supportImageExtensions = [".jpg", ".jpeg", ".png", ".webp", ".svg"];
const startEditing = () => {
if (props.readonly) return;
isEditing.value = true;
- tempValue.value = props.modelValue || "";
};
const confirmEdit = () => {
- emit("update:modelValue", tempValue.value);
+ emit("update:value", tempValue.value);
isEditing.value = false;
};
const cancelEdit = () => {
- tempValue.value = "";
isEditing.value = false;
};
diff --git a/frontend/src/components/SensitiveData/components/SemanticTypesTable.vue b/frontend/src/components/SensitiveData/components/SemanticTypesTable.vue
index 27e10165f7..e0419c52d1 100644
--- a/frontend/src/components/SensitiveData/components/SemanticTypesTable.vue
+++ b/frontend/src/components/SensitiveData/components/SemanticTypesTable.vue
@@ -140,8 +140,8 @@ const columnList = computed(() => {
// For edit mode, show IconSelector
return (
<IconSelector
- modelValue={item.item.icon || ""}
- onUpdate:modelValue={(val: string) =>
+ value={item.item.icon || ""}
+ onUpdate:value={(val: string) =>
onInput(row, (data) => (data.item.icon = val))
}
/>
@@ -151,6 +151,7 @@ const columnList = computed(() => {
{
key: "id",
title: "ID",
+ width: 150,
resizable: true,
ellipsis: {
tooltip: true,
@@ -162,9 +163,12 @@ const columnList = computed(() => {
title: t("settings.sensitive-data.semantic-types.table.semantic-type"),
width: "minmax(min-content, auto)",
resizable: true,
+ ellipsis: {
+ tooltip: true,
+ },
render: (item, row) => {
if (item.mode === "NORMAL") {
- return <h3 class="break-normal">{item.item.title}</h3>;
+ return item.item.title;
}
return (
<NInput
@@ -184,11 +188,11 @@ const columnList = computed(() => {
{
key: "description",
title: t("settings.sensitive-data.semantic-types.table.description"),
+ width: 200,
resizable: true,
ellipsis: {
tooltip: true,
},
- width: "minmax(min-content, auto)",
render: (item, row) => {
if (item.mode === "NORMAL") {
return item.item.description;
@@ -213,8 +217,8 @@ const columnList = computed(() => {
columns.push({
key: "algorithm",
title: t("settings.sensitive-data.semantic-types.table.masking-algorithm"),
- resizable: true,
width: "minmax(min-content, auto)",
+ resizable: true,
render: (item, row) => {
return (
<div class="flex items-center gap-x-1">
@@ -264,9 +268,10 @@ const columnList = computed(() => {
if (!props.readonly) {
// operation.
columns.push({
+ align: "right",
key: "operation",
title: t("common.edit"),
- width: "minmax(min-content, auto)",
+ width: 100,
render: (item, row) => {
if (isBuiltinSemanticType(item.item)) {
return (
@@ -290,7 +295,7 @@ const columnList = computed(() => {
}
return (
- <div class="flex gap-x-2">
+ <div class="flex shrink gap-x-2 items-center justify-end">
{item.mode !== "NORMAL" && (
<MiniActionButton onClick={() => emit("cancel", row)}>
<Undo2Icon class="w-4 h-4" />
diff --git a/frontend/src/components/SingleFileSelector.vue b/frontend/src/components/SingleFileSelector.vue
index 502a5054ee..3495610f98 100644
--- a/frontend/src/components/SingleFileSelector.vue
+++ b/frontend/src/components/SingleFileSelector.vue
@@ -21,9 +21,7 @@
@input="onFileChange"
/>
<slot>
- <slot name="no-data">
- <NEmpty class="py-6"></NEmpty>
- </slot>
+ <NEmpty v-if="showNoDataPlaceholder" class="py-4"></NEmpty>
<div class="text-sm text-gray-600 inline-flex pointer-events-none">
<span
class="relative cursor-pointer rounded-md font-medium text-indigo-600 hover:text-indigo-500 focus-within:outline-hidden focus-within:ring-2 focus-within:ring-offset-2 focus-within:ring-indigo-500"
@@ -48,7 +46,6 @@
<script lang="ts" setup>
import { NEmpty } from "naive-ui";
-import type { PropType } from "vue";
import { reactive, ref } from "vue";
import { useI18n } from "vue-i18n";
import { pushNotification } from "@/store";
@@ -57,21 +54,12 @@ interface LocalState {
dropAreaActive: boolean;
}
-const props = defineProps({
- maxFileSizeInMiB: {
- required: true,
- type: Number,
- },
- disabled: {
- required: false,
- type: Boolean,
- default: false,
- },
- supportFileExtensions: {
- required: true,
- type: Object as PropType<string[]>,
- },
-});
+const props = defineProps<{
+ maxFileSizeInMiB: number;
+ disabled?: boolean;
+ supportFileExtensions: string[];
+ showNoDataPlaceholder: boolean;
+}>();
const emit = defineEmits(["on-select"]);
@@ -81,7 +69,7 @@ const state = reactive<LocalState>({
dropAreaActive: false,
});
-const uploader = ref<HTMLInputElement | null>(null);
+const uploader = ref<HTMLInputElement>();
const onUploaderClick = () => {
uploader.value?.click();
@@ -114,6 +102,9 @@ const selectFile = (files: File[]) => {
return;
}
emit("on-select", file);
+ if (uploader.value) {
+ uploader.value.value = "";
+ }
};
const validFile = (file: File): boolean => {
diff --git a/frontend/src/views/SettingWorkspaceMCP.vue b/frontend/src/views/SettingWorkspaceMCP.vue
index c11338a705..f6408352d3 100644
--- a/frontend/src/views/SettingWorkspaceMCP.vue
+++ b/frontend/src/views/SettingWorkspaceMCP.vue
@@ -90,7 +90,7 @@ const hasExternalUrl = computed(() => {
const mcpEndpointUrl = computed(() => {
const url = actuatorStore.serverInfo?.externalUrl ?? "";
if (!hasExternalUrl.value || !url) {
- return "https://your-bytebase-url.com/mcp";
+ return "{https://your-bytebase-url.com}/mcp";
}
const base = url.replace(/\/$/, "");
return `${base}/mcp`;
diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/SingleResultViewV1.vue b/frontend/src/views/sql-editor/EditorCommon/ResultView/SingleResultViewV1.vue
index ba9308b193..d360301b26 100644
--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/SingleResultViewV1.vue
+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/SingleResultViewV1.vue
@@ -125,7 +125,7 @@
</template>
</NEmpty>
- <div class="absolute bottom-2 right-2 flex items-end gap-x-2">
+ <div class="absolute bottom-2 right-4 flex items-end gap-x-2">
<div v-if="state.searchCandidateRowIndexs.length > 0" class="flex flex-row gap-x-2 border shadow rounded bg-white py-1 px-2">
<NButton
quaternary