Skip to content

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

chore: clean code (#18695)

ecmadao1c73bb7dcab6
diff --git a/frontend/src/bbkit/BBAvatar.vue b/frontend/src/bbkit/BBAvatar.vue
index d4c2833328..e88213a286 100644
--- a/frontend/src/bbkit/BBAvatar.vue
+++ b/frontend/src/bbkit/BBAvatar.vue
@@ -63,7 +63,7 @@ const props = withDefaults(
defineProps<{
username?: string;
email?: string;
- size: BBAvatarSizeType;
+ size?: BBAvatarSizeType;
rounded?: boolean;
backgroundColor?: string;
overrideClass?: VueClass;
diff --git a/frontend/src/bbkit/BBBadge.vue b/frontend/src/bbkit/BBBadge.vue
deleted file mode 100644
index df9a371a80..0000000000
--- a/frontend/src/bbkit/BBBadge.vue
+++ /dev/null
@@ -1,69 +0,0 @@
-<template>
- <component
- :is="link ? 'router-link' : 'span'"
- :class="[
- 'inline-flex rounded-full items-center',
- `bg-${color}-100 text-${color}-800`,
- canRemove ? 'pr-1' : '',
- size === 'normal' && 'py-0.5 px-2.5 text-sm font-medium',
- size === 'small' && 'px-[6px] py-[2px] text-xs font-normal',
- ]"
- :to="link"
- >
- <slot name="default">
- {{ text }}
- </slot>
-
- <button
- v-if="canRemove"
- type="button"
- :class="[
- 'shrink-0 ml-1 p-0.5 rounded-full inline-flex items-center justify-center focus:outline-hidden',
- `text-${color}-400 hover:bg-${color}-200 hover:text-${color}-500 focus:bg-${color}-500`,
- ]"
- @click="$emit('remove')"
- >
- <heroicons-outline:x class="h-3 w-3" />
- </button>
- </component>
-</template>
-
-<script lang="ts" setup>
-import { computed } from "vue";
-
-export type BBBadgeStyle = "INFO" | "WARN" | "CRITICAL" | "DISABLED";
-export type BBBadgeSize = "normal" | "small";
-
-const props = withDefaults(
- defineProps<{
- text?: string;
- canRemove?: boolean;
- badgeStyle?: BBBadgeStyle;
- size?: BBBadgeSize;
- link?: string;
- }>(),
- {
- badgeStyle: "INFO",
- text: "",
- canRemove: true,
- size: "normal",
- link: "",
- }
-);
-
-const color = computed(() => {
- switch (props.badgeStyle) {
- case "INFO":
- return "indigo";
- case "WARN":
- return "yellow";
- case "CRITICAL":
- return "red";
- case "DISABLED":
- return "gray";
- }
- throw new Error("should never reach this line");
-});
-
-defineEmits(["remove"]);
-</script>
diff --git a/frontend/src/bbkit/BBBetaBadge.vue b/frontend/src/bbkit/BBBetaBadge.vue
deleted file mode 100644
index f6a9d90048..0000000000
--- a/frontend/src/bbkit/BBBetaBadge.vue
+++ /dev/null
@@ -1,20 +0,0 @@
-<template>
- <span
- class="text-white text-[10px] leading-4 px-[6px] py-[2px] rounded-lg select-none bg-control"
- :class="
- corner
- ? 'absolute top-0 right-0 translate-x-[50%] translate-y-[-50%]'
- : ''
- "
- >Beta</span
- >
-</template>
-
-<script lang="ts" setup>
-defineProps({
- corner: {
- type: Boolean,
- default: false,
- },
-});
-</script>
diff --git a/frontend/src/bbkit/BBButtonConfirm.vue b/frontend/src/bbkit/BBButtonConfirm.vue
index cf8d5ef2c0..63d3309be9 100644
--- a/frontend/src/bbkit/BBButtonConfirm.vue
+++ b/frontend/src/bbkit/BBButtonConfirm.vue
@@ -49,7 +49,8 @@ import { type ButtonProps, NButton } from "naive-ui";
import { computed, reactive } from "vue";
import { useI18n } from "vue-i18n";
import BBAlert from "./BBAlert.vue";
-import type { BBButtonConfirmType } from "./types";
+
+type BBButtonConfirmType = "NORMAL" | "DELETE" | "ARCHIVE" | "RESTORE";
const props = withDefaults(
defineProps<{
diff --git a/frontend/src/bbkit/BBUtil.ts b/frontend/src/bbkit/BBUtil.ts
index bd1c9d518f..cdc4e010fc 100644
--- a/frontend/src/bbkit/BBUtil.ts
+++ b/frontend/src/bbkit/BBUtil.ts
@@ -6,15 +6,3 @@ export function hashCode(s: string): number {
}
return hash;
}
-
-export function isAncestorOf(
- maybeAncestor: HTMLElement,
- maybeDescendant: HTMLElement
-): boolean {
- let element: HTMLElement | null = maybeDescendant;
- while (element) {
- if (element === maybeAncestor) return true;
- element = element.parentElement;
- }
- return false;
-}
diff --git a/frontend/src/bbkit/index.ts b/frontend/src/bbkit/index.ts
index e492aacabf..5345018c57 100644
--- a/frontend/src/bbkit/index.ts
+++ b/frontend/src/bbkit/index.ts
@@ -1,8 +1,6 @@
import BBAlert from "./BBAlert.vue";
import BBAttention from "./BBAttention.vue";
import BBAvatar from "./BBAvatar.vue";
-import BBBadge from "./BBBadge.vue";
-import BBBetaBadge from "./BBBetaBadge.vue";
import BBButtonConfirm from "./BBButtonConfirm.vue";
import BBModal from "./BBModal.vue";
import BBSpin from "./BBSpin.vue";
@@ -18,6 +16,4 @@ export {
BBModal,
BBSpin,
BBTextField,
- BBBadge,
- BBBetaBadge,
};
diff --git a/frontend/src/bbkit/types.ts b/frontend/src/bbkit/types.ts
index 6a6da3428e..eea861339f 100644
--- a/frontend/src/bbkit/types.ts
+++ b/frontend/src/bbkit/types.ts
@@ -1,19 +1,3 @@
-export type BBButtonType =
- | "NORMAL"
- | "PRIMARY"
- | "SECONDARY"
- | "DANGER"
- | "SUCCESS";
-
-export type BBButtonConfirmType = "NORMAL" | "DELETE" | "ARCHIVE" | "RESTORE";
-
-export type BBTabItem<T = unknown> = {
- title: string;
- // Used as the anchor
- id: string;
- data?: T;
-};
-
export type BBAvatarSizeType =
| "MINI"
| "TINY"
diff --git a/frontend/src/components/DatabaseDetail/Settings/DatabaseSettingsPanel.vue b/frontend/src/components/DatabaseDetail/Settings/DatabaseSettingsPanel.vue
index 6914c3c631..cda83663da 100644
--- a/frontend/src/components/DatabaseDetail/Settings/DatabaseSettingsPanel.vue
+++ b/frontend/src/components/DatabaseDetail/Settings/DatabaseSettingsPanel.vue
@@ -11,8 +11,8 @@
:disabled="!allowUpdateDatabase"
:clearable="!database.instanceResource.environment"
:render-suffix="
- (env: string) =>
- database.instanceResource.environment === env
+ (env: Environment) =>
+ database.instanceResource.environment === env.name
? `(${$t('common.default')})`
: ''
"
@@ -44,6 +44,7 @@ import {
} from "@/store";
import { type ComposedDatabase } from "@/types";
import { UpdateDatabaseRequestSchema } from "@/types/proto-es/v1/database_service_pb";
+import type { Environment } from "@/types/v1/environment";
import Labels from "./components/Labels.vue";
const props = defineProps<{
diff --git a/frontend/src/components/InputWithTemplate/AutoWidthInput.vue b/frontend/src/components/InputWithTemplate/AutoWidthInput.vue
index 35c5aa0d02..ff3fd53e81 100644
--- a/frontend/src/components/InputWithTemplate/AutoWidthInput.vue
+++ b/frontend/src/components/InputWithTemplate/AutoWidthInput.vue
@@ -8,7 +8,7 @@
v-model="state.data"
:style="`width: ${state.width}px;`"
:disabled="disabled"
- class="px-0 m-0 py-1 shadow-none ring-0 border-0 border-none outline-hidden focus:shadow-none focus:ring-0 focus:border-0 focus:border-none"
+ class="px-0 m-0 py-1 bg-transparent shadow-none ring-0 border-0 border-none outline-hidden focus:shadow-none focus:ring-0 focus:border-0 focus:border-none"
type="text"
@keyup="(e) => $emit('keyup', e)"
@keydown="(e) => $emit('keydown', e)"
diff --git a/frontend/src/components/InputWithTemplate/InputWithTemplate.vue b/frontend/src/components/InputWithTemplate/InputWithTemplate.vue
index 728e28e4a6..3102ed2f9c 100644
--- a/frontend/src/components/InputWithTemplate/InputWithTemplate.vue
+++ b/frontend/src/components/InputWithTemplate/InputWithTemplate.vue
@@ -24,12 +24,13 @@
:key="i"
:ref="(el) => (itemRefs[i] = el as HTMLElement)"
>
- <BBBadge
+ <NTag
v-if="data.type == 'template'"
- :text="data.value"
- :can-remove="!disabled"
- @remove="() => onTemplateRemove(i)"
- />
+ :closable="!disabled"
+ @close="() => onTemplateRemove(i)"
+ >
+ {{ data.value }}
+ </NTag>
<AutoWidthInput
v-else
:value="data.value"
@@ -44,7 +45,7 @@
<input
ref="inputRef"
v-model="state.inputData"
- class="flex-1 px-0 m-0 py-1 shadow-none ring-0 border-0 border-none outline-hidden focus:shadow-none focus:ring-0 focus:border-0 focus:border-none"
+ class="flex-1 px-0 m-0 py-1 bg-transparent shadow-none ring-0 border-0 border-none outline-hidden focus:shadow-none focus:ring-0 focus:border-0 focus:border-none"
type="text"
:disabled="disabled"
@keydown.delete="onInputDataDeleteEnter"
@@ -59,10 +60,9 @@
</template>
<script lang="ts" setup>
-import { NTooltip } from "naive-ui";
+import { NTag, NTooltip } from "naive-ui";
import type { PropType } from "vue";
import { onMounted, onUnmounted, reactive, ref, watch, watchEffect } from "vue";
-import { BBBadge } from "@/bbkit";
import AutoWidthInput from "./AutoWidthInput.vue";
import type { Template, TemplateInput } from "./types";
import { InputType } from "./types";
diff --git a/frontend/src/components/InstanceForm/Form.vue b/frontend/src/components/InstanceForm/Form.vue
index bab3417354..53266f6146 100644
--- a/frontend/src/components/InstanceForm/Form.vue
+++ b/frontend/src/components/InstanceForm/Form.vue
@@ -9,10 +9,14 @@
@update:engine="(newEngine: Engine) => changeInstanceEngine(newEngine)"
>
<template #suffix="{ engine }">
- <BBBetaBadge
+ <NTag
v-if="isEngineBeta(engine as Engine)"
- class="absolute -top-1.5 -right-1 rounded-sm text-xs bg-gray-500! px-1 py-0! z-10"
- />
+ round
+ size="small"
+ type="info"
+ >
+ Beta
+ </NTag>
</template>
</InstanceEngineRadioGrid>
@@ -513,10 +517,11 @@ import {
NRadio,
NRadioGroup,
NSwitch,
+ NTag,
} from "naive-ui";
import { computed, ref } from "vue";
import { useI18n } from "vue-i18n";
-import { BBAttention, BBBetaBadge } from "@/bbkit";
+import { BBAttention } from "@/bbkit";
import { InstanceArchiveRestoreButton } from "@/components/Instance";
import { LabelListEditor } from "@/components/Label";
import RequiredStar from "@/components/RequiredStar.vue";
diff --git a/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/ActionIcon.vue b/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/ActionIcon.vue
index 7314edf74e..14e8576b91 100644
--- a/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/ActionIcon.vue
+++ b/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/ActionIcon.vue
@@ -11,7 +11,7 @@
<div
class="w-7 h-7 bg-white rounded-full ring-4 ring-white flex items-center justify-center"
>
- <PrincipalAvatar
+ <UserAvatar
:user="user"
override-class="w-7 h-7 font-medium"
override-text-size="0.8rem"
@@ -116,7 +116,7 @@ import {
} from "lucide-vue-next";
import { computed } from "vue";
import { SkipIcon } from "@/components/Icon";
-import PrincipalAvatar from "@/components/PrincipalAvatar.vue";
+import UserAvatar from "@/components/User/UserAvatar.vue";
import {
extractUserId,
getIssueCommentType,
diff --git a/frontend/src/components/Plan/components/IssueReviewView/ActivitySection/IssueCommentView/ActionIcon.vue b/frontend/src/components/Plan/components/IssueReviewView/ActivitySection/IssueCommentView/ActionIcon.vue
index bf9b801754..3c9363606b 100644
--- a/frontend/src/components/Plan/components/IssueReviewView/ActivitySection/IssueCommentView/ActionIcon.vue
+++ b/frontend/src/components/Plan/components/IssueReviewView/ActivitySection/IssueCommentView/ActionIcon.vue
@@ -11,7 +11,7 @@
<div
class="w-7 h-7 bg-white rounded-full ring-4 ring-white flex items-center justify-center"
>
- <PrincipalAvatar
+ <UserAvatar
:user="user"
override-class="w-7 h-7 font-medium"
override-text-size="0.8rem"
@@ -45,7 +45,7 @@ import {
import type { Component } from "vue";
import { computed } from "vue";
import { SkipIcon } from "@/components/Icon";
-import PrincipalAvatar from "@/components/PrincipalAvatar.vue";
+import UserAvatar from "@/components/User/UserAvatar.vue";
import {
extractUserId,
getIssueCommentType,
diff --git a/frontend/src/components/PrincipalAvatar.vue b/frontend/src/components/PrincipalAvatar.vue
deleted file mode 100644
index ba02a11477..0000000000
--- a/frontend/src/components/PrincipalAvatar.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-<template>
- <BBAvatar
- :username="name"
- :email="email"
- :size="size"
- :override-class="overrideClass"
- :override-text-size="overrideTextSize"
- />
-</template>
-
-<script lang="ts" setup>
-import type { PropType } from "vue";
-import { computed } from "vue";
-import { BBAvatar } from "@/bbkit";
-import type { BBAvatarSizeType } from "@/bbkit/types";
-import { extractUserId } from "@/store";
-import { UNKNOWN_ID, unknownUser } from "@/types";
-import type { User } from "@/types/proto-es/v1/user_service_pb";
-import type { VueClass } from "@/utils";
-
-const props = defineProps({
- user: {
- type: Object as PropType<User>,
- default: () => unknownUser(),
- },
- username: {
- type: String,
- default: "?",
- },
- size: {
- type: String as PropType<BBAvatarSizeType>,
- default: "NORMAL",
- },
- overrideClass: {
- type: [String, Object, Array] as PropType<VueClass>,
- default: undefined,
- },
- overrideTextSize: {
- type: String,
- default: undefined,
- },
-});
-
-const name = computed((): string => {
- const uid = extractUserId(props.user.name);
- if (uid === String(UNKNOWN_ID)) {
- return props.username;
- }
- return props.user.title;
-});
-const email = computed((): string => {
- const uid = extractUserId(props.user.name);
- if (uid === String(UNKNOWN_ID)) {
- return "";
- }
- return props.user.email;
-});
-</script>
diff --git a/frontend/src/components/ProfileDropdown.vue b/frontend/src/components/ProfileDropdown.vue
index cfb5d8cafb..881cad2613 100644
--- a/frontend/src/components/ProfileDropdown.vue
+++ b/frontend/src/components/ProfileDropdown.vue
@@ -53,18 +53,6 @@ const uiStateStore = useUIStateStore();
const { setLocale, locale } = useLanguage();
const currentUserV1 = useCurrentUserV1();
const showDropdown = ref(false);
-const hideQuickstart = computed(() => {
- if (useAppFeature("bb.feature.hide-quick-start").value) {
- return true;
- }
- // Hide quickstart if there are more than 1 active users.
- return (
- actuatorStore.getActiveUserCount({
- includeBot: false,
- includeServiceAccount: false,
- }) > 1
- );
-});
const hideHelp = useAppFeature("bb.feature.hide-help");
// For now, debug mode is a global setting and will affect all users.
@@ -282,7 +270,7 @@ const options = computed((): DropdownOption[] => [
{
key: "quick-start",
type: "render",
- show: !hideQuickstart.value,
+ show: actuatorStore.quickStartEnabled,
render() {
return (
<div class="menu-item" onClick={resetQuickstart}>
diff --git a/frontend/src/components/Project/ProjectSwitch/ProjectSwitchPopover.vue b/frontend/src/components/Project/ProjectSwitch/ProjectSwitchPopover.vue
index 7182797b4e..90b8b19596 100644
--- a/frontend/src/components/Project/ProjectSwitch/ProjectSwitchPopover.vue
+++ b/frontend/src/components/Project/ProjectSwitch/ProjectSwitchPopover.vue
@@ -18,7 +18,6 @@
<div class="min-w-32 text-left">
<ProjectNameCell
v-if="isValidProjectName(project.name)"
- mode="ALL_SHORT"
:project="project"
/>
<span v-else class="text-control-placeholder text-sm">
diff --git a/frontend/src/components/Quickstart.vue b/frontend/src/components/Quickstart.vue
index 77ae3888ad..57c8e44601 100644
--- a/frontend/src/components/Quickstart.vue
+++ b/frontend/src/components/Quickstart.vue
@@ -99,7 +99,6 @@ import { SQL_EDITOR_WORKSHEET_MODULE } from "@/router/sqlEditor";
import {
pushNotification,
useActuatorV1Store,
- useAppFeature,
useIssueV1Store,
useProjectIamPolicyStore,
useProjectV1Store,
@@ -136,9 +135,11 @@ const actuatorStore = useActuatorV1Store();
const issueStore = useIssueV1Store();
const worksheetStore = useWorkSheetStore();
const projectIamPolicyStore = useProjectIamPolicyStore();
-const hideQuickStart = useAppFeature("bb.feature.hide-quick-start");
const sampleProject = computedAsync(async () => {
+ if (!actuatorStore.quickStartEnabled) {
+ return;
+ }
const project = await projectStore.getOrFetchProjectByName(
`${projectNamePrefix}${SAMPLE_PROJECT_NAME}`,
true /* silent */
@@ -266,27 +267,11 @@ const introList = computed(() => {
);
});
-const isFirstUser = computed(() => {
- return (
- actuatorStore.getActiveUserCount({
- includeBot: false,
- includeServiceAccount: false,
- }) === 1
- );
-});
-
const showQuickstart = computed(() => {
- if (hideQuickStart.value) {
- return false;
- }
- if (uiStateStore.getIntroStateByKey("hidden")) {
- return false;
- }
- // Only show quickstart for the first user.
- if (!isFirstUser.value) {
+ if (!actuatorStore.quickStartEnabled) {
return false;
}
- return true;
+ return !uiStateStore.getIntroStateByKey("hidden");
});
const currentStep = computed(() => {
diff --git a/frontend/src/components/SQLReview/components/SQLReviewAttachResourcesPanel.vue b/frontend/src/components/SQLReview/components/SQLReviewAttachResourcesPanel.vue
index 4f3f6b568a..3da64b143f 100644
--- a/frontend/src/components/SQLReview/components/SQLReviewAttachResourcesPanel.vue
+++ b/frontend/src/components/SQLReview/components/SQLReviewAttachResourcesPanel.vue
@@ -196,8 +196,14 @@ const upsertReviewResource = async () => {
emit("close");
};
-const getResourceAttachedConfigName = (resource: string) => {
+const getResourceAttachedConfigName = ({
+ name: resource,
+}: {
+ name: string;
+}) => {
const config = sqlReviewStore.getReviewPolicyByResouce(resource)?.name;
- return config ? `(${config})` : "";
+ return config ? (
+ <span class="opacity-60 textinfolabel">{`(${config})`}</span>
+ ) : null;
};
</script>
diff --git a/frontend/src/components/SQLReview/components/SQLReviewPolicyTable.vue b/frontend/src/components/SQLReview/components/SQLReviewPolicyTable.vue
index 141a9e9d56..8b2633fcc3 100644
--- a/frontend/src/components/SQLReview/components/SQLReviewPolicyTable.vue
+++ b/frontend/src/components/SQLReview/components/SQLReviewPolicyTable.vue
@@ -22,19 +22,18 @@
{{ review.name }}
</div>
<div class="flex flex-wrap gap-y-2 gap-x-2">
- <BBBadge
+ <NTag
v-for="resource in review.resources"
:key="resource"
- :can-remove="false"
>
<Resource :show-prefix="true" :resource="resource" />
- </BBBadge>
- <BBBadge
+ </NTag>
+ <NTag
v-if="!review.enforce"
- :text="$t('common.disable')"
- :can-remove="false"
- :badge-style="'DISABLED'"
- />
+ type="warning"
+ >
+ {{ $t('common.disable') }}
+ </NTag>
</div>
<div class="flex items-center gap-x-2 mt-4">
<NButton size="small" @click.prevent="handleClickEdit(review)">
@@ -63,11 +62,11 @@
</template>
<script setup lang="tsx">
-import { NButton } from "naive-ui";
+import { NButton, NTag } from "naive-ui";
import { computed } from "vue";
import { useI18n } from "vue-i18n";
import { useRouter } from "vue-router";
-import { BBBadge, BBButtonConfirm } from "@/bbkit";
+import { BBButtonConfirm } from "@/bbkit";
import Resource from "@/components/v2/ResourceOccupiedModal/Resource.vue";
import { WORKSPACE_ROUTE_SQL_REVIEW_DETAIL } from "@/router/dashboard/workspaceRoutes";
import { pushNotification, useSQLReviewStore } from "@/store";
diff --git a/frontend/src/components/SQLReview/components/SQLReviewTemplateSelector.vue b/frontend/src/components/SQLReview/components/SQLReviewTemplateSelector.vue
index 2c9f84738f..1f04a74674 100644
--- a/frontend/src/components/SQLReview/components/SQLReviewTemplateSelector.vue
+++ b/frontend/src/components/SQLReview/components/SQLReviewTemplateSelector.vue
@@ -23,14 +23,14 @@
<span class="text-base font-medium">
{{ template.review.name }}
</span>
- <div class="flex flex-col gap-y-2">
- <BBBadge
+ <div class="flex flex-wrap gap-2">
+ <NTag
v-for="resource in template.review.resources"
:key="resource"
- :can-remove="false"
+ type="primary"
>
<Resource :resource="resource" :show-prefix="true" />
- </BBBadge>
+ </NTag>
</div>
<p class="text-sm">
<span class="mr-2">{{ $t("sql-review.enabled-rules") }}:</span>
@@ -91,9 +91,8 @@
</template>
<script lang="ts" setup>
-import { NDivider } from "naive-ui";
+import { NDivider, NTag } from "naive-ui";
import { computed } from "vue";
-import { BBBadge } from "@/bbkit";
import Resource from "@/components/v2/ResourceOccupiedModal/Resource.vue";
import { useSQLReviewPolicyList } from "@/store";
import type { SQLReviewPolicyTemplateV2 } from "@/types";
diff --git a/frontend/src/components/SQLReview/components/SQLRuleLevelBadge.vue b/frontend/src/components/SQLReview/components/SQLRuleLevelBadge.vue
index b7c33c08c5..5a92b2d366 100644
--- a/frontend/src/components/SQLReview/components/SQLRuleLevelBadge.vue
+++ b/frontend/src/components/SQLReview/components/SQLRuleLevelBadge.vue
@@ -1,17 +1,16 @@
<template>
- <BBBadge
- :text="text"
- :can-remove="false"
- :badge-style="style"
+ <NTag
+ :type="style"
:size="'small'"
- />
+ >
+ {{ text }}
+ </NTag>
</template>
<script lang="ts" setup>
+import { NTag } from "naive-ui";
import { computed } from "vue";
import { useI18n } from "vue-i18n";
-import { BBBadge } from "@/bbkit";
-import type { BBBadgeStyle } from "@/bbkit/BBBadge.vue";
import { SQLReviewRule_Level } from "@/types/proto-es/v1/review_config_service_pb";
const props = withDefaults(
@@ -26,14 +25,14 @@ const props = withDefaults(
const { t } = useI18n();
-const style = computed((): BBBadgeStyle => {
+const style = computed(() => {
switch (props.level) {
case SQLReviewRule_Level.ERROR:
- return "CRITICAL";
+ return "error";
case SQLReviewRule_Level.WARNING:
- return "WARN";
+ return "warning";
default:
- return "DISABLED";
+ return "default";
}
});
diff --git a/frontend/src/components/User/UserAvatar.vue b/frontend/src/components/User/UserAvatar.vue
index 582aecff4e..ef2c7bd320 100644
--- a/frontend/src/components/User/UserAvatar.vue
+++ b/frontend/src/components/User/UserAvatar.vue
@@ -25,9 +25,6 @@ const props = withDefaults(
}>(),
{
user: () => unknownUser(),
- size: "NORMAL",
- overrideClass: undefined,
- overrideTextSize: undefined,
}
);
diff --git a/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseV1Table.vue b/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseV1Table.vue
index a43e4f14f5..0aa6ebb443 100644
--- a/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseV1Table.vue
+++ b/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseV1Table.vue
@@ -140,11 +140,7 @@ const columnList = computed((): DatabaseDataTableColumn[] => {
resizable: true,
ellipsis: true,
render: (data) => (
- <ProjectNameCell
- project={data.projectEntity}
- mode={props.mode}
- keyword={props.keyword}
- />
+ <ProjectNameCell project={data.projectEntity} keyword={props.keyword} />
),
};
const INSTANCE: DatabaseDataTableColumn = {
diff --git a/frontend/src/components/v2/Model/cells/ProjectNameCell.vue b/frontend/src/components/v2/Model/cells/ProjectNameCell.vue
index 7c57403c0d..5bf5bf6764 100644
--- a/frontend/src/components/v2/Model/cells/ProjectNameCell.vue
+++ b/frontend/src/components/v2/Model/cells/ProjectNameCell.vue
@@ -28,18 +28,15 @@ import { NTooltip } 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";
-import type { Mode } from "../DatabaseV1Table/DatabaseV1Table.vue";
withDefaults(
defineProps<{
project: Project;
- mode?: Mode;
link?: boolean;
keyword?: string;
suffix?: string;
}>(),
{
- mode: "ALL",
link: false,
keyword: undefined,
suffix: "",
diff --git a/frontend/src/components/v2/Select/EnvironmentSelect.vue b/frontend/src/components/v2/Select/EnvironmentSelect.vue
index 6c8fbe8c6c..d9ebe12bfd 100644
--- a/frontend/src/components/v2/Select/EnvironmentSelect.vue
+++ b/frontend/src/components/v2/Select/EnvironmentSelect.vue
@@ -48,11 +48,10 @@ const props = withDefaults(
disabled?: boolean;
size?: SelectSize;
filter?: (environment: Environment) => boolean;
- renderSuffix?: (environment: string) => VNodeChild;
+ renderSuffix?: (environment: Environment) => VNodeChild;
}>(),
{
showProductionIcon: true,
- renderSuffix: () => null,
}
);
@@ -96,7 +95,7 @@ const customLabel = (environment: Environment) => {
showIcon={props.showProductionIcon}
link={false}
/>
- {props.renderSuffix(environment.name)}
+ {props.renderSuffix ? props.renderSuffix(environment) : null}
</div>
);
};
diff --git a/frontend/src/components/v2/Select/ProjectSelect.vue b/frontend/src/components/v2/Select/ProjectSelect.vue
index 88a62e2c4e..3f3a5b7179 100644
--- a/frontend/src/components/v2/Select/ProjectSelect.vue
+++ b/frontend/src/components/v2/Select/ProjectSelect.vue
@@ -21,7 +21,7 @@
<script lang="tsx" setup>
import { computedAsync } from "@vueuse/core";
-import { computed } from "vue";
+import { computed, type VNodeChild } from "vue";
import { useI18n } from "vue-i18n";
import { ProjectNameCell } from "@/components/v2/Model/cells";
import { useProjectV1Store } from "@/store";
@@ -41,21 +41,16 @@ import {
getRenderTagFunc,
} from "./RemoteResourceSelector/utils";
-const props = withDefaults(
- defineProps<{
- disabled?: boolean;
- value?: string[] | string | undefined; // UNKNOWN_PROJECT_NAME to "ALL"
- includeAll?: boolean;
- includeDefaultProject?: boolean;
- multiple?: boolean;
- size?: SelectSize;
- renderSuffix?: (project: string) => string;
- filter?: (project: Project) => boolean;
- }>(),
- {
- renderSuffix: () => "",
- }
-);
+const props = defineProps<{
+ disabled?: boolean;
+ value?: string[] | string | undefined; // UNKNOWN_PROJECT_NAME to "ALL"
+ includeAll?: boolean;
+ includeDefaultProject?: boolean;
+ multiple?: boolean;
+ size?: SelectSize;
+ renderSuffix?: (project: Project) => VNodeChild;
+ filter?: (project: Project) => boolean;
+}>();
defineEmits<{
(event: "update:value", name: string[] | string | undefined): void;
@@ -120,16 +115,9 @@ const handleSearch = async (params: {
const customLabel = (project: Project, keyword: string) => {
if (!project) return null;
return (
- <ProjectNameCell
- project={project}
- mode="ALL_SHORT"
- keyword={keyword}
- suffix={props.renderSuffix(project.name)}
- >
+ <ProjectNameCell project={project} keyword={keyword}>
{{
- suffix: () => (
- <span class="opacity-60">{props.renderSuffix(project.name)}</span>
- ),
+ suffix: () => (props.renderSuffix ? props.renderSuffix(project) : null),
}}
</ProjectNameCell>
);
diff --git a/frontend/src/layouts/BodyLayout.vue b/frontend/src/layouts/BodyLayout.vue
index 0b3fe87940..74c8cef428 100644
--- a/frontend/src/layouts/BodyLayout.vue
+++ b/frontend/src/layouts/BodyLayout.vue
@@ -118,7 +118,7 @@
</div>
</div>
- <Quickstart v-if="actuatorStore.info?.enableSample" />
+ <Quickstart />
</div>
<ReleaseRemindModal
diff --git a/frontend/src/layouts/IssuesLayout.vue b/frontend/src/layouts/IssuesLayout.vue
index 4022490e34..78a18d1c8d 100644
--- a/frontend/src/layouts/IssuesLayout.vue
+++ b/frontend/src/layouts/IssuesLayout.vue
@@ -28,19 +28,16 @@
</div>
</div>
- <Quickstart v-if="actuatorStore.info?.enableSample" />
+ <Quickstart />
</div>
</template>
<script lang="ts" setup>
import { ref } from "vue";
-import { useActuatorV1Store } from "@/store";
import DashboardHeader from "@/views/DashboardHeader.vue";
import Quickstart from "../components/Quickstart.vue";
import { provideBodyLayoutContext } from "./common";
-const actuatorStore = useActuatorV1Store();
-
const mainContainerRef = ref<HTMLDivElement>();
const { mainContainerClasses } = provideBodyLayoutContext({
diff --git a/frontend/src/store/modules/v1/actuator.ts b/frontend/src/store/modules/v1/actuator.ts
index 56d33934b7..64ec3e4619 100644
--- a/frontend/src/store/modules/v1/actuator.ts
+++ b/frontend/src/store/modules/v1/actuator.ts
@@ -1,9 +1,8 @@
import { create } from "@bufbuild/protobuf";
-import type { RemovableRef } from "@vueuse/core";
import { useLocalStorage } from "@vueuse/core";
import { defineStore } from "pinia";
import semver from "semver";
-import { computed } from "vue";
+import { computed, ref } from "vue";
import { actuatorServiceClientConnect } from "@/grpcweb";
import { useSilentRequest } from "@/plugins/silent-request";
import {
@@ -27,252 +26,306 @@ const EXTERNAL_URL_PLACEHOLDER =
const GITHUB_API_LIST_BYTEBASE_RELEASE =
"https://api.github.com/repos/bytebase/bytebase/releases";
-interface ActuatorState {
- // Whether the app is initialized or not.
- initialized: boolean;
- serverInfo?: ActuatorInfo;
- // Last time when we fetched the server info.
- serverInfoTs: number;
- resourcePackage?: ResourcePackage;
- releaseInfo: RemovableRef<ReleaseInfo>;
- appProfile: AppProfile;
- onboardingState: RemovableRef<{
+export const useActuatorV1Store = defineStore("actuator_v1", () => {
+ // State
+ const initialized = ref(false);
+ const serverInfo = ref<ActuatorInfo | undefined>(undefined);
+ const serverInfoTs = ref(0);
+ const resourcePackage = ref<ResourcePackage | undefined>(undefined);
+ const releaseInfo = useLocalStorage<ReleaseInfo>("bytebase_release", {
+ ignoreRemindModalTillNextRelease: false,
+ nextCheckTs: 0,
+ });
+ const appProfile = ref<AppProfile>(defaultAppProfile());
+ const onboardingState = useLocalStorage<{
isOnboarding: boolean;
consumed: string[];
- }>;
-}
-
-export const useActuatorV1Store = defineStore("actuator_v1", {
- state: (): ActuatorState => ({
- initialized: false,
- serverInfo: undefined,
- serverInfoTs: 0,
- resourcePackage: undefined,
- releaseInfo: useLocalStorage("bytebase_release", {
- ignoreRemindModalTillNextRelease: false,
- nextCheckTs: 0,
- }),
- appProfile: defaultAppProfile(),
- onboardingState: useLocalStorage<{
- isOnboarding: boolean;
- consumed: string[];
- }>("bb.onboarding-state", {
- isOnboarding: false,
- consumed: [],
- }),
- }),
- getters: {
- changelogURL: (state) => {
- // valid version should following semantic version like 3.1.0
- const version = semver.valid(state.serverInfo?.version);
- if (!version) {
- return "";
- }
- return `https://docs.bytebase.com/changelog/bytebase-${version.split(".").join("-")}/`;
- },
- info: (state) => {
- return state.serverInfo;
- },
- brandingLogo: (state) => {
- if (!state.resourcePackage?.logo) {
- return "";
- }
- return new TextDecoder().decode(state.resourcePackage?.logo);
- },
- version: (state) => {
- return state.serverInfo?.version || "";
- },
- gitCommitBE: (state) => {
- const commit = state.serverInfo?.gitCommit ?? "";
- return commit === "" ? "unknown" : commit;
- },
- gitCommitFE: () => {
- const commit = import.meta.env.GIT_COMMIT ?? "";
- return commit === "" ? "unknown" : commit;
- },
- isDemo: (state) => {
- return state.serverInfo?.demo;
- },
- isDebug: (state) => {
- return state.serverInfo?.debug || false;
- },
- isDocker: (state) => {
- return state.serverInfo?.docker || false;
- },
- isSaaSMode: (state) => {
- return state.serverInfo?.saas || false;
- },
- needAdminSetup: (state) => {
- return state.serverInfo?.needAdminSetup || false;
- },
- needConfigureExternalUrl: (state) => {
- if (!state.serverInfo) return false;
- const url = state.serverInfo?.externalUrl ?? "";
- return url === "" || url === EXTERNAL_URL_PLACEHOLDER;
- },
- disallowSignup: (state) => {
- return state.serverInfo?.disallowSignup || false;
- },
- disallowPasswordSignin: (state) => {
- return state.serverInfo?.disallowPasswordSignin || false;
- },
- hasNewRelease: (state) => {
- return (
- (state.serverInfo?.version === "development" &&
- !!state.releaseInfo.latest?.tag_name) ||
- semverCompare(
- state.releaseInfo.latest?.tag_name ?? "",
- state.serverInfo?.version ?? ""
- )
- );
- },
- passwordRestriction: (state) => {
- return (
- state.serverInfo?.passwordRestriction ??
- create(WorkspaceProfileSetting_PasswordRestrictionSchema, {
- minLength: 8,
- requireLetter: true,
- })
- );
- },
- activatedInstanceCount: (state) => {
- return state.serverInfo?.activatedInstanceCount ?? 0;
- },
- totalInstanceCount: (state) => {
- return state.serverInfo?.totalInstanceCount ?? 0;
- },
- inactiveUserCount: (state) => {
- return (state.serverInfo?.userStats ?? []).reduce((count, stat) => {
- if (stat.state === State.DELETED) {
- count += stat.count;
- }
- return count;
- }, 0);
- },
- },
- actions: {
- getActiveUserCount({
- includeBot,
- includeServiceAccount,
- }: {
- includeBot: boolean;
- includeServiceAccount: boolean;
- }) {
- return (this.serverInfo?.userStats ?? []).reduce((count, stat) => {
- if (stat.state !== State.ACTIVE) {
- return count;
- }
- if (!includeBot && stat.userType === UserType.SYSTEM_BOT) {
- return count;
- }
- if (
- !includeServiceAccount &&
- stat.userType === UserType.SERVICE_ACCOUNT
- ) {
- return count;
- }
+ }>("bb.onboarding-state", {
+ isOnboarding: false,
+ consumed: [],
+ });
+
+ // Getters
+ const changelogURL = computed(() => {
+ const version = semver.valid(serverInfo.value?.version);
+ if (!version) {
+ return "";
+ }
+ return `https://docs.bytebase.com/changelog/bytebase-${version.split(".").join("-")}/`;
+ });
+
+ const info = computed(() => serverInfo.value);
+
+ const brandingLogo = computed(() => {
+ if (!resourcePackage.value?.logo) {
+ return "";
+ }
+ return new TextDecoder().decode(resourcePackage.value?.logo);
+ });
+
+ const version = computed(() => serverInfo.value?.version || "");
+
+ const gitCommitBE = computed(() => {
+ const commit = serverInfo.value?.gitCommit ?? "";
+ return commit === "" ? "unknown" : commit;
+ });
+
+ const gitCommitFE = computed(() => {
+ const commit = import.meta.env.GIT_COMMIT ?? "";
+ return commit === "" ? "unknown" : commit;
+ });
+
+ const isDemo = computed(() => serverInfo.value?.demo);
+
+ const isDebug = computed(() => serverInfo.value?.debug || false);
+
+ const isDocker = computed(() => serverInfo.value?.docker || false);
+
+ const isSaaSMode = computed(() => serverInfo.value?.saas || false);
+
+ const needAdminSetup = computed(
+ () => serverInfo.value?.needAdminSetup || false
+ );
+
+ const needConfigureExternalUrl = computed(() => {
+ if (!serverInfo.value) return false;
+ const url = serverInfo.value?.externalUrl ?? "";
+ return url === "" || url === EXTERNAL_URL_PLACEHOLDER;
+ });
+
+ const disallowSignup = computed(
+ () => serverInfo.value?.disallowSignup || false
+ );
+
+ const disallowPasswordSignin = computed(
+ () => serverInfo.value?.disallowPasswordSignin || false
+ );
+
+ const hasNewRelease = computed(() => {
+ return (
+ (serverInfo.value?.version === "development" &&
+ !!releaseInfo.value.latest?.tag_name) ||
+ semverCompare(
+ releaseInfo.value.latest?.tag_name ?? "",
+ serverInfo.value?.version ?? ""
+ )
+ );
+ });
+
+ const passwordRestriction = computed(() => {
+ return (
+ serverInfo.value?.passwordRestriction ??
+ create(WorkspaceProfileSetting_PasswordRestrictionSchema, {
+ minLength: 8,
+ requireLetter: true,
+ })
+ );
+ });
+
+ const activatedInstanceCount = computed(
+ () => serverInfo.value?.activatedInstanceCount ?? 0
+ );
+
+ const totalInstanceCount = computed(
+ () => serverInfo.value?.totalInstanceCount ?? 0
+ );
+
+ const inactiveUserCount = computed(() => {
+ return (serverInfo.value?.userStats ?? []).reduce((count, stat) => {
+ if (stat.state === State.DELETED) {
count += stat.count;
- return count;
- }, 0);
- },
- setLogo(logo: string) {
- if (this.resourcePackage) {
- this.resourcePackage.logo = new TextEncoder().encode(logo);
}
- },
- setServerInfo(serverInfo: ActuatorInfo) {
- this.serverInfo = serverInfo;
- this.serverInfoTs = Date.now();
- },
- async fetchServerInfo() {
- const [serverInfo, resourcePackage] = await Promise.all([
- actuatorServiceClientConnect.getActuatorInfo({}),
- actuatorServiceClientConnect.getResourcePackage({}),
- ]);
- this.setServerInfo(serverInfo);
- this.resourcePackage = resourcePackage;
- return serverInfo;
- },
- async patchDebug({ debug }: { debug: boolean }) {
- const serverInfo = await actuatorServiceClientConnect.updateActuatorInfo({
- actuator: {
- debug,
- },
- updateMask: {
- paths: ["debug"],
- },
- });
- this.setServerInfo(serverInfo);
- },
- async tryToRemindRelease(): Promise<boolean> {
- if (this.serverInfo?.saas ?? false) {
- return false;
+ return count;
+ }, 0);
+ });
+
+ // Actions
+ const getActiveUserCount = ({
+ includeBot,
+ includeServiceAccount,
+ }: {
+ includeBot: boolean;
+ includeServiceAccount: boolean;
+ }) => {
+ return (serverInfo.value?.userStats ?? []).reduce((count, stat) => {
+ if (stat.state !== State.ACTIVE) {
+ return count;
}
- if (!this.releaseInfo.latest) {
- const release = await this.fetchLatestRelease();
- this.releaseInfo.latest = release;
+ if (!includeBot && stat.userType === UserType.SYSTEM_BOT) {
+ return count;
}
- if (!this.releaseInfo.latest) {
- return false;
+ if (
+ !includeServiceAccount &&
+ stat.userType === UserType.SERVICE_ACCOUNT
+ ) {
+ return count;
}
+ count += stat.count;
+ return count;
+ }, 0);
+ };
- // It's time to fetch the release
- if (Date.now() >= this.releaseInfo.nextCheckTs) {
- const release = await this.fetchLatestRelease();
- if (!release) {
- return false;
- }
+ const quickStartEnabled = computed(() => {
+ if (useAppFeature("bb.feature.hide-quick-start").value) {
+ return false;
+ }
+ if (!serverInfo.value?.enableSample) {
+ return false;
+ }
+
+ // Hide quickstart if there are more than 1 active users.
+ return (
+ getActiveUserCount({
+ includeBot: false,
+ includeServiceAccount: false,
+ }) <= 1
+ );
+ });
+
+ const setLogo = (logo: string) => {
+ if (resourcePackage.value) {
+ resourcePackage.value.logo = new TextEncoder().encode(logo);
+ }
+ };
+
+ const setServerInfo = (info: ActuatorInfo) => {
+ serverInfo.value = info;
+ serverInfoTs.value = Date.now();
+ };
+
+ const fetchServerInfo = async () => {
+ const [info, pkg] = await Promise.all([
+ actuatorServiceClientConnect.getActuatorInfo({}),
+ actuatorServiceClientConnect.getResourcePackage({}),
+ ]);
+ setServerInfo(info);
+ resourcePackage.value = pkg;
+ return info;
+ };
- // check till 24 hours later
- this.releaseInfo.nextCheckTs = Date.now() + 24 * 60 * 60 * 1000;
+ const patchDebug = async ({ debug }: { debug: boolean }) => {
+ const info = await actuatorServiceClientConnect.updateActuatorInfo({
+ actuator: {
+ debug,
+ },
+ updateMask: {
+ paths: ["debug"],
+ },
+ });
+ setServerInfo(info);
+ };
- if (semverCompare(release.tag_name, this.releaseInfo.latest.tag_name)) {
- this.releaseInfo.ignoreRemindModalTillNextRelease = false;
+ const fetchLatestRelease = async (): Promise<Release | undefined> => {
+ try {
+ const releaseList = await useSilentRequest(async () => {
+ const response = await fetch(
+ `${GITHUB_API_LIST_BYTEBASE_RELEASE}?per_page=1`
+ );
+ if (!response.ok) {
+ throw new Error(`HTTP error! status: ${response.status}`);
}
+ return response.json() as Promise<Release[]>;
+ });
+ return releaseList[0];
+ } catch {
+ return;
+ }
+ };
- this.releaseInfo.latest = release;
- }
+ const tryToRemindRelease = async (): Promise<boolean> => {
+ if (serverInfo.value?.saas ?? false) {
+ return false;
+ }
+ if (!releaseInfo.value.latest) {
+ const release = await fetchLatestRelease();
+ releaseInfo.value.latest = release;
+ }
+ if (!releaseInfo.value.latest) {
+ return false;
+ }
- if (this.releaseInfo.ignoreRemindModalTillNextRelease) {
+ if (Date.now() >= releaseInfo.value.nextCheckTs) {
+ const release = await fetchLatestRelease();
+ if (!release) {
return false;
}
- return this.hasNewRelease;
- },
- async tryToRemindRefresh(): Promise<boolean> {
- // refetch after 30 minutes to keep the info fresh.
- if (Date.now() - this.serverInfoTs >= 1000 * 60 * 30) {
- await this.fetchServerInfo();
- }
- if (this.gitCommitBE === "unknown" || this.gitCommitFE === "unknown") {
- return false;
- }
- return this.gitCommitBE !== this.gitCommitFE;
- },
- async fetchLatestRelease(): Promise<Release | undefined> {
- try {
- const releaseList = await useSilentRequest(async () => {
- const response = await fetch(
- `${GITHUB_API_LIST_BYTEBASE_RELEASE}?per_page=1`
- );
- if (!response.ok) {
- throw new Error(`HTTP error! status: ${response.status}`);
- }
- return response.json() as Promise<Release[]>;
- });
- return releaseList[0];
- } catch {
- // It's okay to ignore the failure and just return undefined.
- return;
+ releaseInfo.value.nextCheckTs = Date.now() + 24 * 60 * 60 * 1000;
+
+ if (semverCompare(release.tag_name, releaseInfo.value.latest.tag_name)) {
+ releaseInfo.value.ignoreRemindModalTillNextRelease = false;
}
- },
- async setupSample() {
- await actuatorServiceClientConnect.setupSample({});
- },
- overrideAppFeatures(overrides: Partial<AppFeatures>) {
- Object.assign(this.appProfile.features, overrides);
- },
- },
+
+ releaseInfo.value.latest = release;
+ }
+
+ if (releaseInfo.value.ignoreRemindModalTillNextRelease) {
+ return false;
+ }
+
+ return hasNewRelease.value;
+ };
+
+ const tryToRemindRefresh = async (): Promise<boolean> => {
+ if (Date.now() - serverInfoTs.value >= 1000 * 60 * 30) {
+ await fetchServerInfo();
+ }
+ if (gitCommitBE.value === "unknown" || gitCommitFE.value === "unknown") {
+ return false;
+ }
+ return gitCommitBE.value !== gitCommitFE.value;
+ };
+
+ const setupSample = async () => {
+ await actuatorServiceClientConnect.setupSample({});
+ };
+
+ const overrideAppFeatures = (overrides: Partial<AppFeatures>) => {
+ Object.assign(appProfile.value.features, overrides);
+ };
+
+ return {
+ // State
+ initialized,
+ serverInfo,
+ serverInfoTs,
+ resourcePackage,
+ releaseInfo,
+ appProfile,
+ onboardingState,
+ // Getters
+ changelogURL,
+ info,
+ brandingLogo,
+ version,
+ gitCommitBE,
+ gitCommitFE,
+ isDemo,
+ isDebug,
+ isDocker,
+ isSaaSMode,
+ needAdminSetup,
+ needConfigureExternalUrl,
+ disallowSignup,
+ disallowPasswordSignin,
+ hasNewRelease,
+ passwordRestriction,
+ activatedInstanceCount,
+ totalInstanceCount,
+ inactiveUserCount,
+ quickStartEnabled,
+ // Actions
+ getActiveUserCount,
+ setLogo,
+ setServerInfo,
+ fetchServerInfo,
+ patchDebug,
+ fetchLatestRelease,
+ tryToRemindRelease,
+ tryToRemindRefresh,
+ setupSample,
+ overrideAppFeatures,
+ };
});
export const useAppFeature = <T extends keyof AppFeatures>(feature: T) => {
diff --git a/frontend/src/views/EnvironmentDashboard.vue b/frontend/src/views/EnvironmentDashboard.vue
index 08718dad83..5ec986b208 100644
--- a/frontend/src/views/EnvironmentDashboard.vue
+++ b/frontend/src/views/EnvironmentDashboard.vue
@@ -115,7 +115,6 @@ import { computed, h, onMounted, reactive, ref, watch } from "vue";
import { useI18n } from "vue-i18n";
import { useRouter } from "vue-router";
import Draggable from "vuedraggable";
-import type { BBTabItem } from "@/bbkit/types";
import {
EnvironmentForm,
Form as EnvironmentFormBody,
@@ -225,14 +224,12 @@ watch(
{ immediate: true }
);
-const tabItemList = computed((): BBTabItem<Environment>[] => {
- return environmentList.value.map(
- (item, index: number): BBTabItem<Environment> => {
- const title = `${index + 1}. ${item.title}`;
- const id = item.id;
- return { title, id, data: item };
- }
- );
+const tabItemList = computed(() => {
+ return environmentList.value.map((item, index: number) => {
+ const title = `${index + 1}. ${item.title}`;
+ const id = item.id;
+ return { title, id, data: item };
+ });
});
const getEnvironmentCreate = () => {
diff --git a/frontend/src/views/SettingWorkspaceRiskCenter.vue b/frontend/src/views/SettingWorkspaceRiskCenter.vue
index 0074e2d749..eada2bb8d3 100644
--- a/frontend/src/views/SettingWorkspaceRiskCenter.vue
+++ b/frontend/src/views/SettingWorkspaceRiskCenter.vue
@@ -25,34 +25,34 @@
</h3>
<div class="space-y-3">
<div class="flex items-start gap-x-3">
- <BBBadge
- :text="$t('custom-approval.risk-rule.risk.risk-level.high')"
- :can-remove="false"
- badge-style="CRITICAL"
+ <NTag
+ type="error"
size="small"
- />
+ >
+ {{ $t('custom-approval.risk-rule.risk.risk-level.high') }}
+ </NTag>
<p class="text-control-light">
{{ $t("custom-approval.risk.risk-level-high") }}
</p>
</div>
<div class="flex items-start gap-x-3">
- <BBBadge
- :text="$t('custom-approval.risk-rule.risk.risk-level.moderate')"
- :can-remove="false"
- badge-style="WARN"
+ <NTag
+ type="warning"
size="small"
- />
+ >
+ {{ $t('custom-approval.risk-rule.risk.risk-level.moderate') }}
+ </NTag>
<p class="text-control-light">
{{ $t("custom-approval.risk.risk-level-moderate") }}
</p>
</div>
<div class="flex items-start gap-x-3">
- <BBBadge
- :text="$t('custom-approval.risk-rule.risk.risk-level.low')"
- :can-remove="false"
- badge-style="INFO"
+ <NTag
+ type="info"
size="small"
- />
+ >
+ {{ $t('custom-approval.risk-rule.risk.risk-level.low') }}
+ </NTag>
<p class="text-control-light">
{{ $t("custom-approval.risk.risk-level-low") }}
</p>
@@ -73,7 +73,7 @@
</template>
<script lang="ts" setup>
-import BBBadge from "@/bbkit/BBBadge.vue";
+import { NTag } from "naive-ui";
import { FeatureAttention } from "@/components/FeatureGuard";
import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";
</script>
diff --git a/frontend/src/views/SettingWorkspaceSQLReviewDetail.vue b/frontend/src/views/SettingWorkspaceSQLReviewDetail.vue
index b1898096b9..022119d39d 100644
--- a/frontend/src/views/SettingWorkspaceSQLReviewDetail.vue
+++ b/frontend/src/views/SettingWorkspaceSQLReviewDetail.vue
@@ -57,14 +57,14 @@
:action-text="$t('sql-review.attach-resource.self')"
@click="state.showResourcePanel = true"
/>
- <div class="flex flex-col gap-y-2 gap-x-2">
- <BBBadge
+ <div class="flex flex-wrap gap-y-2 gap-x-2">
+ <NTag
v-for="resource in reviewPolicy.resources"
:key="resource"
- :can-remove="false"
+ type="primary"
>
<Resource :resource="resource" :show-prefix="true" />
- </BBBadge>
+ </NTag>
</div>
</div>
@@ -146,7 +146,7 @@
<script lang="tsx" setup>
import { useTitle } from "@vueuse/core";
-import { NButton, NDivider } from "naive-ui";
+import { NButton, NDivider, NTag } from "naive-ui";
import {
computed,
nextTick,
@@ -157,13 +157,7 @@ import {
} from "vue";
import { useI18n } from "vue-i18n";
import { useRoute, useRouter } from "vue-router";
-import {
- BBAlert,
- BBAttention,
- BBBadge,
- BBButtonConfirm,
- BBTextField,
-} from "@/bbkit";
+import { BBAlert, BBAttention, BBButtonConfirm, BBTextField } from "@/bbkit";
import { SQLReviewCreation } from "@/components/SQLReview";
import SQLReviewAttachResourcesPanel from "@/components/SQLReview/components/SQLReviewAttachResourcesPanel.vue";
import SQLReviewTabsByEngine from "@/components/SQLReview/components/SQLReviewTabsByEngine.vue";
diff --git a/frontend/src/views/sql-editor/SQLEditorHomePage.vue b/frontend/src/views/sql-editor/SQLEditorHomePage.vue
index 92304a1efe..cf13c4158c 100644
--- a/frontend/src/views/sql-editor/SQLEditorHomePage.vue
+++ b/frontend/src/views/sql-editor/SQLEditorHomePage.vue
@@ -46,7 +46,7 @@
</template>
</NSplit>
- <Quickstart v-if="actuatorStore.info?.enableSample" />
+ <Quickstart />
<teleport to="#sql-editor-debug">
<li>[Page]isDisconnected: {{ isDisconnected }}</li>
@@ -76,7 +76,6 @@ import {
PROJECT_V1_ROUTE_PLAN_DETAIL_SPEC_DETAIL,
} from "@/router/dashboard/projectV1";
import {
- useActuatorV1Store,
useDatabaseV1Store,
useSQLEditorStore,
useSQLEditorTabStore,
@@ -100,7 +99,6 @@ const state = reactive<LocalState>({
});
const router = useRouter();
-const actuatorStore = useActuatorV1Store();
const databaseStore = useDatabaseV1Store();
const tabStore = useSQLEditorTabStore();
const editorStore = useSQLEditorStore();