diff --git a/ui/web-v2/src/modules/apiKeys.ts b/ui/web-v2/src/modules/apiKeys.ts index 09f4b0677..0abfdc387 100644 --- a/ui/web-v2/src/modules/apiKeys.ts +++ b/ui/web-v2/src/modules/apiKeys.ts @@ -40,6 +40,7 @@ export const listAPIKeys = createAsyncThunk< { state: AppState } >(`${MODULE_NAME}/list`, async (params) => { const request = new ListAPIKeysRequest(); + request.setOrganizationId(params.organizationId); request.setEnvironmentIdsList(params.environmentIds); request.setPageSize(params.pageSize); request.setCursor(params.cursor); @@ -59,6 +60,7 @@ export type OrderDirection = ListAPIKeysRequest.OrderDirectionMap[keyof ListAPIKeysRequest.OrderDirectionMap]; interface APIKeyParams { + organizationId: string; environmentIds: string[]; pageSize: number; cursor: string; diff --git a/ui/web-v2/src/pages/apiKey/index.tsx b/ui/web-v2/src/pages/apiKey/index.tsx index 78703ba55..9195ee2dd 100644 --- a/ui/web-v2/src/pages/apiKey/index.tsx +++ b/ui/web-v2/src/pages/apiKey/index.tsx @@ -42,6 +42,7 @@ import { APIKey } from '../../proto/account/api_key_pb'; import { ListAPIKeysRequest } from '../../proto/account/service_pb'; import { AppDispatch } from '../../store'; import { APIKeySortOption, isAPIKeySortOption } from '../../types/apiKey'; +import { getOrganizationId } from '../../storage/organizationId'; import { SORT_OPTIONS_CREATED_AT_ASC, SORT_OPTIONS_CREATED_AT_DESC, @@ -134,6 +135,7 @@ export const APIKeyIndexPage: FC = memo(() => { options && options.enabled ? options.enabled === 'false' : null; dispatch( listAPIKeys({ + organizationId: getOrganizationId(), environmentIds: [currentEnvironment.id], pageSize: APIKEY_LIST_PAGE_SIZE, cursor: String(cursor),