Skip to content

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

chore: clear legacy todos (#18686)

ecmadaofc7de3beab97
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index f4815d73e2..45506e4af9 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -1,6 +1,5 @@
<template>
<NConfigProvider
- :key="key"
:locale="generalLang"
:date-locale="dateLang"
:theme-overrides="themeOverrides"
@@ -36,7 +35,6 @@ import { onErrorCaptured, watch, watchEffect } from "vue";
import { useRoute, useRouter } from "vue-router";
import Watermark from "@/components/misc/Watermark.vue";
import { dateLang, generalLang, themeOverrides } from "../naive-ui.config";
-import { provideAppRootContext } from "./AppRootContext";
import AuthContext from "./AuthContext.vue";
import OverlayStackManager from "./components/misc/OverlayStackManager.vue";
import { overrideAppProfile } from "./customAppProfile";
@@ -50,8 +48,6 @@ const MAX_NOTIFICATION_DISPLAY_COUNT = 3;
const route = useRoute();
const router = useRouter();
-// TODO(ed): can we remove it?
-const { key } = provideAppRootContext();
const notificationStore = useNotificationStore();
watchEffect(async () => {
diff --git a/frontend/src/AppRootContext.ts b/frontend/src/AppRootContext.ts
deleted file mode 100644
index 03d70ded3a..0000000000
--- a/frontend/src/AppRootContext.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import type { InjectionKey, Ref } from "vue";
-import { inject, provide, ref } from "vue";
-
-export type AppRootContext = {
- key: Ref<number>;
-};
-
-const appRootContextSingleton: AppRootContext = {
- key: ref(0),
-};
-
-export const KEY = Symbol("bb.app.root") as InjectionKey<AppRootContext>;
-
-export const useAppRootContext = () => {
- return inject(KEY)!;
-};
-
-export const provideAppRootContext = () => {
- provide(KEY, appRootContextSingleton);
-
- return appRootContextSingleton;
-};
diff --git a/frontend/src/components/AdvancedSearch/useCommonSearchScopeOptions.ts b/frontend/src/components/AdvancedSearch/useCommonSearchScopeOptions.ts
index 235fef744a..794dabda73 100644
--- a/frontend/src/components/AdvancedSearch/useCommonSearchScopeOptions.ts
+++ b/frontend/src/components/AdvancedSearch/useCommonSearchScopeOptions.ts
@@ -23,7 +23,6 @@ import {
extractInstanceResourceName,
extractProjectResourceName,
getDefaultPagination,
- hasWorkspacePermissionV2,
supportedEngineV1List,
} from "@/utils";
import type { ScopeOption, ValueOption } from "./types";
@@ -218,12 +217,6 @@ export const useCommonSearchScopeOptions = (
const scopes: ScopeOption[] = [];
for (const id of unref(supportOptionIdList)) {
- // TODO(ed): optimize it.
- if (id === "instance") {
- if (!hasWorkspacePermissionV2("bb.instances.list")) {
- continue;
- }
- }
const create = scopeCreators[id];
if (create) {
scopes.push(create());
diff --git a/frontend/src/components/AuditLog/PagedAuditLogDataTable.vue b/frontend/src/components/AuditLog/PagedAuditLogDataTable.vue
index bc9d54123e..5a3eaa0986 100644
--- a/frontend/src/components/AuditLog/PagedAuditLogDataTable.vue
+++ b/frontend/src/components/AuditLog/PagedAuditLogDataTable.vue
@@ -87,7 +87,7 @@ const handleExport = async ({
search: {
parent: props.parent,
filter: props.filter,
- // TODO(ed): how to support order by?
+ orderBy: auditPagedTable.value?.orderBy,
pageSize: 5000, // The maximum page size is 5000
pageToken,
},
diff --git a/frontend/src/components/ProjectMember/ProjectMemberRolePanel/EditProjectRolePanel.vue b/frontend/src/components/ProjectMember/ProjectMemberRolePanel/EditProjectRolePanel.vue
index eabda921cf..6bdc1c09f4 100644
--- a/frontend/src/components/ProjectMember/ProjectMemberRolePanel/EditProjectRolePanel.vue
+++ b/frontend/src/components/ProjectMember/ProjectMemberRolePanel/EditProjectRolePanel.vue
@@ -178,7 +178,6 @@ const allowConfirm = computed(() => {
props.binding.members.length === 1 &&
expirationSelectorRef.value?.isValid &&
databaseResourceFormRef.value?.isValid
- // TODO(ed): check if expression changed
);
});
diff --git a/frontend/src/components/SensitiveData/MaskingExceptionUserTable.vue b/frontend/src/components/SensitiveData/MaskingExceptionUserTable.vue
index e00e6b09ef..f866f9cdc5 100644
--- a/frontend/src/components/SensitiveData/MaskingExceptionUserTable.vue
+++ b/frontend/src/components/SensitiveData/MaskingExceptionUserTable.vue
@@ -28,23 +28,17 @@ import {
InstanceV1Name,
MiniActionButton,
} from "@/components/v2";
-import { UserNameCell } from "@/components/v2/Model/cells";
+import { UserLink } from "@/components/v2/Model/cells";
import {
composePolicyBindings,
- extractGroupEmail,
+ extractUserId,
pushNotification,
useDatabaseV1Store,
useGroupStore,
usePolicyByParentAndType,
usePolicyV1Store,
- useUserStore,
} from "@/store";
-import {
- getGroupEmailInBinding,
- getUserEmailInBinding,
- groupBindingPrefix,
- isValidDatabaseName,
-} from "@/types";
+import { groupBindingPrefix, isValidDatabaseName } from "@/types";
import { ExprSchema } from "@/types/proto-es/google/type/expr_pb";
import type { MaskingExemptionPolicy_Exemption } from "@/types/proto-es/v1/org_policy_service_pb";
import {
@@ -80,7 +74,6 @@ const state = reactive<LocalState>({
});
const { t } = useI18n();
const router = useRouter();
-const userStore = useUserStore();
const groupStore = useGroupStore();
const databaseStore = useDatabaseV1Store();
const policyStore = usePolicyV1Store();
@@ -216,26 +209,12 @@ const getAccessUsers = (
: undefined,
};
- if (member.startsWith(groupBindingPrefix)) {
- access.group = groupStore.getGroupByIdentifier(member);
- } else {
- access.user = userStore.getUserByIdentifier(member);
- }
-
result.push(access);
}
return result;
};
-const getMemberBinding = (access: AccessUser): string => {
- if (access.type === "user") {
- return getUserEmailInBinding(access.user!.email);
- }
- const email = extractGroupEmail(access.group!.name);
- return getGroupEmailInBinding(email);
-};
-
const updateAccessUserList = async () => {
if (!ready.value) {
return;
@@ -254,7 +233,7 @@ const updateAccessUserList = async () => {
);
const conditionList = await batchConvertFromCELString(expressionList);
- await composePolicyBindings(exemptions);
+ await composePolicyBindings(exemptions, true);
for (let i = 0; i < exemptions.length; i++) {
const exception = exemptions[i];
const condition = conditionList[i];
@@ -267,17 +246,7 @@ const updateAccessUserList = async () => {
state.rawAccessList = orderBy(
[...memberMap.values()],
- [
- (access) => (access.type === "user" ? 1 : 0),
- (access) => {
- if (access.group) {
- return access.group.name;
- } else if (access.user) {
- return access.user.name;
- }
- return "";
- },
- ],
+ [(access) => (access.type === "user" ? 1 : 0), (access) => access.member],
["desc", "desc"]
);
state.loading = false;
@@ -301,18 +270,14 @@ const accessTableColumns = computed(
title: t("common.members"),
resizable: true,
render: (item: AccessUser) => {
- if (item.group) {
- return <GroupNameCell group={item.group} />;
- } else if (item.user) {
- return (
- <UserNameCell
- user={item.user}
- size="small"
- allowEdit={false}
- showMfaEnabled={false}
- showSource={false}
- />
- );
+ if (item.member.startsWith(groupBindingPrefix)) {
+ const group = groupStore.getGroupByIdentifier(item.member);
+ if (group) {
+ return <GroupNameCell group={group} />;
+ }
+ } else {
+ const email = extractUserId(item.member);
+ return <UserLink title={email} email={email} />;
}
return <span>{item.member}</span>;
},
@@ -387,7 +352,7 @@ const revokeAccessAlert = (item: AccessUser) => {
<div class="flex flex-col gap-y-3">
<div class="textlabel text-base!">
{t("project.masking-exemption.revoke-exemption-title", {
- member: getMemberBinding(item),
+ member: item.member,
})}
</div>
{getDatabaseAccessResource(item)}
@@ -486,9 +451,7 @@ const updateExceptionPolicy = async () => {
members: [],
});
}
- expressionsMap
- .get(finalExpression)!
- .members.push(getMemberBinding(accessUser));
+ expressionsMap.get(finalExpression)!.members.push(accessUser.member);
}
const exceptions = [];
diff --git a/frontend/src/components/SensitiveData/types.ts b/frontend/src/components/SensitiveData/types.ts
index e9a9b11ae3..3f3b81ffdb 100644
--- a/frontend/src/components/SensitiveData/types.ts
+++ b/frontend/src/components/SensitiveData/types.ts
@@ -4,8 +4,6 @@ import type {
ObjectSchema,
TableCatalog,
} from "@/types/proto-es/v1/database_catalog_service_pb";
-import type { Group } from "@/types/proto-es/v1/group_service_pb";
-import type { User } from "@/types/proto-es/v1/user_service_pb";
export type MaskDataTarget = TableCatalog | ColumnCatalog | ObjectSchema;
@@ -29,8 +27,6 @@ export interface AccessUser {
type: "user" | "group";
key: string;
member: string;
- group?: Group;
- user?: User;
expirationTimestamp?: number;
rawExpression: string;
description: string;
diff --git a/frontend/src/components/v2/Model/PagedTable.vue b/frontend/src/components/v2/Model/PagedTable.vue
index 306b767725..ced55d1ff4 100644
--- a/frontend/src/components/v2/Model/PagedTable.vue
+++ b/frontend/src/components/v2/Model/PagedTable.vue
@@ -97,7 +97,6 @@ const onSortersUpdate = (
sortStates: DataTableSortState[] | DataTableSortState | null
) => {
if (!sortStates) {
- // TODO(ed): should reset the sorters?
return;
}
let states: DataTableSortState[] = [];
@@ -255,5 +254,6 @@ defineExpose({
updateCache,
removeCache,
dataList,
+ orderBy,
});
</script>
diff --git a/frontend/src/store/modules/v1/projectIamPolicy.ts b/frontend/src/store/modules/v1/projectIamPolicy.ts
index 63261ceeb1..a6044d2b98 100644
--- a/frontend/src/store/modules/v1/projectIamPolicy.ts
+++ b/frontend/src/store/modules/v1/projectIamPolicy.ts
@@ -29,7 +29,8 @@ import { useGroupStore } from "./group";
import { usePermissionStore } from "./permission";
export const composePolicyBindings = async (
- bindings: { members: string[] }[]
+ bindings: { members: string[] }[],
+ skipFetchUsers = false
) => {
const users: string[] = [];
const groups: string[] = [];
@@ -42,10 +43,14 @@ export const composePolicyBindings = async (
}
}
}
- await Promise.all([
- useUserStore().batchGetOrFetchUsers(users),
+
+ const requests: Promise<unknown>[] = [
useGroupStore().batchGetOrFetchGroups(groups),
- ]);
+ ];
+ if (!skipFetchUsers) {
+ requests.push(useUserStore().batchGetOrFetchUsers(users));
+ }
+ await Promise.allSettled(requests);
};
export const useProjectIamPolicyStore = defineStore(