Skip to content

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

chore: keep expanded group (#18617)

ecmadaocab3ba38faa6
diff --git a/frontend/src/components/SQLReview/components/RuleConfigComponents/StringArrayComponent.vue b/frontend/src/components/SQLReview/components/RuleConfigComponents/StringArrayComponent.vue
index ec98992fce..e9664b257e 100644
--- a/frontend/src/components/SQLReview/components/RuleConfigComponents/StringArrayComponent.vue
+++ b/frontend/src/components/SQLReview/components/RuleConfigComponents/StringArrayComponent.vue
@@ -3,31 +3,24 @@
<div v-if="!disabled" class="textinfolabel mb-1">
{{ $t('sql-review.input-then-press-enter') }}
</div>
- <BBTextField
- v-model:value="inputValue"
- pattern="[a-z]+"
+ <NDynamicTags
+ :size="'large'"
:disabled="disabled"
- :placeholder="$t('sql-review.input-then-press-enter')"
- @keyup.enter="push($event)"
+ :value="value"
+ :input-props="{
+ clearable: true,
+ }"
+ :input-style="'min-width: 20rem;'"
+ @update:value="onUpdate"
/>
- <div v-if="value.length > 0" class="flex flex-wrap gap-4 mt-4">
- <BBBadge
- v-for="(val, i) in value"
- :key="i"
- :text="`${val}`"
- :can-remove="!disabled"
- @remove="remove(val)"
- />
- </div>
</div>
</template>
<script lang="ts" setup>
-import { ref } from "vue";
-import { BBBadge, BBTextField } from "@/bbkit";
+import { NDynamicTags } from "naive-ui";
import type { RuleConfigComponent } from "@/types";
-const props = defineProps<{
+defineProps<{
config: RuleConfigComponent;
value: string[];
disabled: boolean;
@@ -37,26 +30,10 @@ const emit = defineEmits<{
(event: "update:value", value: string[]): void;
}>();
-const inputValue = ref("");
-
-const push = (_: Event) => {
- const array = [...props.value];
- const val = inputValue.value.trim();
- if (val) {
- if (!array.includes(val)) {
- array.push(val);
- inputValue.value = "";
- emit("update:value", array);
- }
- }
-};
-
-const remove = (val: string) => {
- const array = [...props.value];
- const index = array.indexOf(val);
- if (index >= 0) {
- array.splice(index, 1);
- emit("update:value", array);
- }
+const onUpdate = (arr: string[]) => {
+ emit(
+ "update:value",
+ arr.map((v) => v.trim()).filter((v) => v)
+ );
};
</script>
diff --git a/frontend/src/components/User/Settings/UserDataTableByGroup/index.vue b/frontend/src/components/User/Settings/UserDataTableByGroup/index.vue
index 30002b6164..49ea3626d2 100644
--- a/frontend/src/components/User/Settings/UserDataTableByGroup/index.vue
+++ b/frontend/src/components/User/Settings/UserDataTableByGroup/index.vue
@@ -8,8 +8,9 @@
:loading="loading"
:cascade="false"
allow-checking-not-loaded
- @load="onGroupLoad"
- v-model:expanded-row-keys="expandedRowKeys"
+ :expanded-row-keys="expandedKeys"
+ @update:expanded-row-keys="$emit('update:expanded-keys', $event as string[])"
+ @load="onExpand"
/>
</template>
@@ -17,7 +18,7 @@
import { orderBy } from "lodash-es";
import type { DataTableColumn, DataTableRowData } from "naive-ui";
import { NDataTable } from "naive-ui";
-import { computed, h, ref } from "vue";
+import { computed, h, watchEffect } from "vue";
import { useI18n } from "vue-i18n";
import { useUserStore } from "@/store";
import type { Group } from "@/types/proto-es/v1/group_service_pb";
@@ -47,33 +48,37 @@ const props = withDefaults(
groups: Group[];
loading: boolean;
showGroupRole?: boolean;
+ expandedKeys?: string[];
onClickUser?: (user: User, event: MouseEvent) => void;
}>(),
{
showGroupRole: true,
groupRoleMap: () => new Map(),
onClickUser: undefined,
+ expandedKeys: () => [],
}
);
const emit = defineEmits<{
(event: "update-group", group: Group): void;
(event: "remove-group", group: Group): void;
+ (event: "update:expanded-keys", keys: string[]): void;
}>();
const { t } = useI18n();
const userStore = useUserStore();
-const expandedRowKeys = ref<string[]>([]);
-const onGroupLoad = async (row: DataTableRowData) => {
+const onExpand = async (row: DataTableRowData) => {
if (row.type !== "group") {
return;
}
- const group = (row as GroupRowData).group;
+ await onGroupLoad(row as GroupRowData);
+};
+
+const onGroupLoad = async (row: GroupRowData) => {
+ const { group } = row;
const memberUserIds = group.members.map((m) => m.member);
- if (memberUserIds.length > 0) {
- await userStore.batchGetOrFetchUsers(memberUserIds);
- }
+ await userStore.batchGetOrFetchUsers(memberUserIds);
const members: UserRowData[] = [];
for (const member of group.members) {
@@ -156,4 +161,14 @@ const userListByGroup = computed(() => {
return rowDataList;
});
+
+watchEffect(async () => {
+ for (const expandKey of props.expandedKeys) {
+ const data = userListByGroup.value.find((row) => row.name === expandKey);
+ if (!data) {
+ continue;
+ }
+ await onGroupLoad(data);
+ }
+});
</script>
diff --git a/frontend/src/views/SettingWorkspaceUsers.vue b/frontend/src/views/SettingWorkspaceUsers.vue
index a7f1e7267a..692bf625af 100644
--- a/frontend/src/views/SettingWorkspaceUsers.vue
+++ b/frontend/src/views/SettingWorkspaceUsers.vue
@@ -56,6 +56,7 @@
:groups="list"
:loading="loading"
:on-click-user="onUserClick"
+ v-model:expanded-keys="expandedKeys"
@update-group="handleUpdateGroup"
@remove-group="handleRemoveGroup"
/>
@@ -273,6 +274,7 @@ const subscriptionV1Store = useSubscriptionV1Store();
const userPagedTable = ref<ComponentExposed<typeof PagedTable<User>>>();
const groupPagedTable = ref<ComponentExposed<typeof PagedTable<Group>>>();
const deletedUserPagedTable = ref<ComponentExposed<typeof PagedTable<User>>>();
+const expandedKeys = ref<string[]>([]);
watch(
() => route.hash,
@@ -480,8 +482,10 @@ const handleUserRestore = (user: User) => {
};
const handleGroupUpdated = (group: Group) => {
- groupPagedTable.value?.refresh().then(() => {
- groupPagedTable.value?.updateCache([group]);
+ const expanded = [...expandedKeys.value];
+ groupPagedTable.value?.updateCache([group]);
+ requestAnimationFrame(() => {
+ expandedKeys.value = [...expanded];
});
};