Skip to content

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

chore: allow expression raw string by default (#18507)

ecmadao4e74a25b38d0
diff --git a/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/RuleEditModal.vue b/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/RuleEditModal.vue
index 075dc59aa2..57d6888561 100644
--- a/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/RuleEditModal.vue
+++ b/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/RuleEditModal.vue
@@ -85,7 +85,6 @@
<ExprEditor
:expr="state.conditionExpr"
:allow-admin="allowAdmin"
- :enable-raw-expression="true"
:factor-list="factorList"
:option-config-map="optionConfigMap"
@update="handleUpdate"
diff --git a/frontend/src/components/DatabaseGroup/DatabaseGroupForm.vue b/frontend/src/components/DatabaseGroup/DatabaseGroupForm.vue
index 73b4384331..f060ecd6aa 100644
--- a/frontend/src/components/DatabaseGroup/DatabaseGroupForm.vue
+++ b/frontend/src/components/DatabaseGroup/DatabaseGroupForm.vue
@@ -35,7 +35,6 @@
<ExprEditor
:expr="state.expr"
:allow-admin="!readonly"
- :enable-raw-expression="true"
:factor-list="FactorList"
:option-config-map="getDatabaseGroupOptionConfigMap(project.name)"
/>
diff --git a/frontend/src/components/ExprEditor/ExprEditor.vue b/frontend/src/components/ExprEditor/ExprEditor.vue
index f48149887e..8492aa9ebd 100644
--- a/frontend/src/components/ExprEditor/ExprEditor.vue
+++ b/frontend/src/components/ExprEditor/ExprEditor.vue
@@ -21,7 +21,7 @@ const props = withDefaults(
}>(),
{
allowAdmin: false,
- enableRawExpression: false,
+ enableRawExpression: true,
factorOperatorOverrideMap: undefined,
optionConfigMap: () => new Map(),
}
diff --git a/frontend/src/components/SensitiveData/GlobalMaskingRulesView.vue b/frontend/src/components/SensitiveData/GlobalMaskingRulesView.vue
index daaeb73807..b8d95c8f41 100644
--- a/frontend/src/components/SensitiveData/GlobalMaskingRulesView.vue
+++ b/frontend/src/components/SensitiveData/GlobalMaskingRulesView.vue
@@ -185,9 +185,6 @@ interface LocalState {
processing: boolean;
reorderRules: boolean;
}
-const props = defineProps<{
- embedded?: boolean;
-}>();
const { t } = useI18n();
const state = reactive<LocalState>({
maskingRuleItemList: [],
@@ -203,9 +200,7 @@ const hasSensitiveDataFeature = featureToRef(PlanFeature.FEATURE_DATA_MASKING);
const layout = {
mainContainerRef: ref<HTMLDivElement>(),
};
-if (!props.embedded) {
- layout.mainContainerRef = useBodyLayoutContext().mainContainerRef;
-}
+layout.mainContainerRef = useBodyLayoutContext().mainContainerRef;
const updateList = async () => {
const policy = await policyStore.getOrFetchPolicyByParentAndType({
diff --git a/frontend/src/views/InstanceDetail.vue b/frontend/src/views/InstanceDetail.vue
index 92dfc1677e..9ada44aa69 100644
--- a/frontend/src/views/InstanceDetail.vue
+++ b/frontend/src/views/InstanceDetail.vue
@@ -9,7 +9,7 @@
{{ $t("instance.no-environment") }}
</BBAttention>
- <div v-if="!embedded" class="flex items-center justify-between">
+ <div class="flex items-center justify-between">
<div class="flex items-center gap-x-2">
<EngineIcon :engine="instance.engine" custom-class="h-6!" />
<span class="text-lg font-medium">{{ instanceV1Name(instance) }}</span>
@@ -158,7 +158,6 @@ interface LocalState {
const props = defineProps<{
instanceId: string;
- embedded?: boolean;
hideArchiveRestore?: boolean;
}>();
@@ -166,10 +165,8 @@ defineOptions({
inheritAttrs: false,
});
-if (!props.embedded) {
- const { overrideMainContainerClass } = useBodyLayoutContext();
- overrideMainContainerClass("pb-0!");
-}
+const { overrideMainContainerClass } = useBodyLayoutContext();
+overrideMainContainerClass("pb-0!");
const { t } = useI18n();
const router = useRouter();
diff --git a/frontend/src/views/SettingWorkspaceDataMasking.vue b/frontend/src/views/SettingWorkspaceDataMasking.vue
index b3a8c7bfd4..09c3cca0fc 100644
--- a/frontend/src/views/SettingWorkspaceDataMasking.vue
+++ b/frontend/src/views/SettingWorkspaceDataMasking.vue
@@ -1,22 +1,19 @@
<template>
<div class="w-full flex flex-col gap-y-4">
<FeatureAttention
- v-if="!hasSensitiveDataFeature"
:feature="PlanFeature.FEATURE_DATA_MASKING"
/>
- <GlobalMaskingRulesView :embedded="embedded" />
+ <BBAttention v-if="hasSensitiveDataFeature" type="info" :description="$t('custom-approval.rule.first-match-wins')" />
+ <GlobalMaskingRulesView />
</div>
</template>
<script lang="ts" setup>
+import { BBAttention } from "@/bbkit";
import { FeatureAttention } from "@/components/FeatureGuard";
import { GlobalMaskingRulesView } from "@/components/SensitiveData";
import { featureToRef } from "@/store";
import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";
-defineProps<{
- embedded?: boolean;
-}>();
-
const hasSensitiveDataFeature = featureToRef(PlanFeature.FEATURE_DATA_MASKING);
</script>