Skip to content

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

fix: change "Max export rows" to "Max query rows" and add unlimited option (#17670)

Danny Xuc7ca560d6064
diff --git a/frontend/src/components/GrantRequestPanel/MaxRowCountSelect.vue b/frontend/src/components/GrantRequestPanel/MaxRowCountSelect.vue
index 6978b12917..38777f1d10 100644
--- a/frontend/src/components/GrantRequestPanel/MaxRowCountSelect.vue
+++ b/frontend/src/components/GrantRequestPanel/MaxRowCountSelect.vue
@@ -1,17 +1,17 @@
<template>
<NPopselect
- :value="value"
+ :value="value ?? 0"
:options="options"
trigger="click"
placement="bottom-start"
scrollable
- @update:value="$emit('update:value', $event)"
+ @update:value="handleUpdateValue"
>
<NButton class="bb-overlay-stack-ignore-esc">
{{
- value
+ value !== undefined
? $t("common.rows.n-rows", { n: value })
- : $t("issue.grant-request.select-export-rows")
+ : $t("issue.grant-request.unlimited-query-rows")
}}
</NButton>
<template #action>
@@ -43,15 +43,15 @@ defineProps<{
}>();
const emit = defineEmits<{
- (event: "update:value", value: number): void;
+ (event: "update:value", value: number | undefined): void;
}>();
const { t } = useI18n();
const policyStore = usePolicyV1Store();
const rowCountOptions = computed(() => {
- const list = [1, 100, 500, 1000, 5000, 10000, 100000].filter(
- (num) => num <= policyStore.maximumResultRows
+ const list = [0, 1, 100, 500, 1000, 5000, 10000, 100000].filter(
+ (num) => num === 0 || num <= policyStore.maximumResultRows
);
if (
policyStore.maximumResultRows !== Number.MAX_VALUE &&
@@ -64,17 +64,24 @@ const rowCountOptions = computed(() => {
const options = computed((): SelectOption[] => {
return rowCountOptions.value.map((n) => ({
- label: t("common.rows.n-rows", { n }),
+ label:
+ n === 0
+ ? t("issue.grant-request.unlimited-query-rows")
+ : t("common.rows.n-rows", { n }),
value: n,
}));
});
+const handleUpdateValue = (value: number) => {
+ emit("update:value", value === 0 ? undefined : value);
+};
+
const handleInput = (value: number | null) => {
const normalizedValue = minmax(
value ?? 0,
first(rowCountOptions.value)!,
last(rowCountOptions.value)!
);
- emit("update:value", normalizedValue);
+ emit("update:value", normalizedValue === 0 ? undefined : normalizedValue);
};
</script>
diff --git a/frontend/src/components/IssueV1/GrantRequestIssueDetailPage.vue b/frontend/src/components/IssueV1/GrantRequestIssueDetailPage.vue
index a1e6f72268..e141d03be6 100644
--- a/frontend/src/components/IssueV1/GrantRequestIssueDetailPage.vue
+++ b/frontend/src/components/IssueV1/GrantRequestIssueDetailPage.vue
@@ -44,15 +44,16 @@
/>
</div>
</div>
- <div
- v-if="condition?.rowLimit"
- class="w-full flex flex-col justify-start items-start"
- >
+ <div class="w-full flex flex-col justify-start items-start">
<span class="flex items-center textinfolabel mb-2">
- {{ $t("issue.grant-request.export-rows") }}
+ {{ $t("issue.grant-request.query-rows") }}
</span>
<div class="flex flex-row justify-start items-start">
- {{ condition?.rowLimit }}
+ {{
+ condition?.rowLimit
+ ? condition.rowLimit
+ : $t("issue.grant-request.unlimited-query-rows")
+ }}
</div>
</div>
<div class="w-full flex flex-col justify-start items-start">
diff --git a/frontend/src/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vue b/frontend/src/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vue
index 13cdda6d39..a5f49bebf5 100644
--- a/frontend/src/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vue
+++ b/frontend/src/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vue
@@ -61,7 +61,7 @@
<template v-if="roleSupportExport">
<div class="w-full flex flex-col justify-start items-start space-y-2">
<div class="flex items-center gap-x-1">
- <span>{{ $t("issue.grant-request.export-rows") }}</span>
+ <span>{{ $t("issue.grant-request.query-rows") }}</span>
<RequiredStar />
</div>
<MaxRowCountSelect v-model:value="state.maxRowCount" />
@@ -139,7 +139,6 @@ const getInitialState = (): LocalState => {
role: props.binding.role,
memberList: props.binding.members,
reason: "",
- // Default to never expire.
maxRowCount: undefined,
databaseResources: props.databaseResource
? [{ ...props.databaseResource }]
@@ -199,11 +198,6 @@ defineExpose({
if (!state.role) {
return false;
}
- if (roleSupportExport.value) {
- if (!state.maxRowCount) {
- return false;
- }
- }
if (state.memberList.length <= 0) {
return false;
}
diff --git a/frontend/src/components/ProjectMember/ProjectMemberRolePanel/EditProjectRolePanel.vue b/frontend/src/components/ProjectMember/ProjectMemberRolePanel/EditProjectRolePanel.vue
index 7b3c29518d..29162029c1 100644
--- a/frontend/src/components/ProjectMember/ProjectMemberRolePanel/EditProjectRolePanel.vue
+++ b/frontend/src/components/ProjectMember/ProjectMemberRolePanel/EditProjectRolePanel.vue
@@ -50,7 +50,7 @@
>
<div class="w-full flex flex-col justify-start items-start">
<p class="mb-2">
- {{ $t("issue.grant-request.export-rows") }}
+ {{ $t("issue.grant-request.query-rows") }}
</p>
<MaxRowCountSelect v-model:value="state.maxRowCount" />
</div>
diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.json
index f87b42b884..cc110517bc 100644
--- a/frontend/src/locales/en-US.json
+++ b/frontend/src/locales/en-US.json
@@ -982,8 +982,8 @@
"waiting-for-review": "Waiting for review",
"issue-name": "Issue name",
"grant-request": {
- "export-rows": "Max export rows",
- "select-export-rows": "Select maximum export rows",
+ "query-rows": "Max query rows",
+ "unlimited-query-rows": "Unlimited",
"expired-at": "Expired at",
"all-databases": "All",
"all-databases-tip": "All current and future databases in this project.",
diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.json
index 28131d2482..67ff872939 100644
--- a/frontend/src/locales/es-ES.json
+++ b/frontend/src/locales/es-ES.json
@@ -982,8 +982,8 @@
"waiting-for-review": "Esperando revisión",
"issue-name": "Nombre de la incidencia",
"grant-request": {
- "export-rows": "número máximo de filas",
- "select-export-rows": "Seleccionar el máximo de filas de exportación",
+ "query-rows": "Máximo de filas de consulta",
+ "unlimited-query-rows": "Ilimitado",
"expired-at": "tiempo de caducidad",
"all-databases": "todas las bases de datos",
"all-databases-tip": "Todas las bases de datos actuales y futuras de este proyecto.",
diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.json
index ad87560b9c..cdb6610bbc 100644
--- a/frontend/src/locales/ja-JP.json
+++ b/frontend/src/locales/ja-JP.json
@@ -982,8 +982,8 @@
"waiting-for-review": "モデレート済み",
"issue-name": "イシュー名",
"grant-request": {
- "export-rows": "エクスポート行の最大数",
- "select-export-rows": "最大エクスポート行数を選択",
+ "query-rows": "最大クエリ行数",
+ "unlimited-query-rows": "無制限",
"expired-at": "有効期限",
"all-databases": "すべてのデータベース",
"all-databases-tip": "このプロジェクトに属する現在および将来のすべてのデータベース。",
diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.json
index b3cd0ea917..fcc85237c7 100644
--- a/frontend/src/locales/vi-VN.json
+++ b/frontend/src/locales/vi-VN.json
@@ -982,8 +982,8 @@
"waiting-for-review": "Đang chờ xem xét",
"issue-name": "Tên vấn đề",
"grant-request": {
- "export-rows": "Số dòng xuất tối đa",
- "select-export-rows": "Chọn số hàng xuất tối đa",
+ "query-rows": "Số hàng truy vấn tối đa",
+ "unlimited-query-rows": "Không giới hạn",
"expired-at": "Hết hạn vào",
"all-databases": "Tất cả",
"all-databases-tip": "Tất cả cơ sở dữ liệu hiện tại và tương lai trong dự án này.",
diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.json
index ad38e6d8bf..ecb752c02d 100644
--- a/frontend/src/locales/zh-CN.json
+++ b/frontend/src/locales/zh-CN.json
@@ -982,8 +982,8 @@
"waiting-for-review": "等待审核",
"issue-name": "工单名称",
"grant-request": {
- "export-rows": "最大导出行数",
- "select-export-rows": "选择最大导出行数",
+ "query-rows": "最大查询行数",
+ "unlimited-query-rows": "无限制",
"expired-at": "过期时间",
"all-databases": "所有数据库",
"all-databases-tip": "所有当前和未来属于这个项目的数据库。",