Repository navigation
feat(dashboard): add search and filters to /dashboard/api-manager #2628
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| export const ACTIVE_ONLY_STORAGE_KEY = "omniroute-api-manager-active-only"; | ||
|
|
||
| interface StorageReader { | ||
| getItem(key: string): string | null; | ||
| } | ||
|
|
||
| interface StorageWriter extends StorageReader { | ||
| setItem(key: string, value: string): void; | ||
| removeItem(key: string): void; | ||
| } | ||
|
|
||
| function getBrowserStorage(): StorageWriter | null { | ||
| try { | ||
| return globalThis.localStorage ?? null; | ||
| } catch { | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| export function parseActiveOnlyPreference(value: string | null | undefined): boolean { | ||
| return value === "true"; | ||
| } | ||
|
|
||
| export function readActiveOnlyPreference( | ||
| storage: StorageReader | null = getBrowserStorage() | ||
| ): boolean { | ||
| if (!storage) return false; | ||
| return parseActiveOnlyPreference(storage.getItem(ACTIVE_ONLY_STORAGE_KEY)); | ||
| } | ||
|
|
||
| export function writeActiveOnlyPreference( | ||
| enabled: boolean, | ||
| storage: StorageWriter | null = getBrowserStorage() | ||
| ): void { | ||
| if (!storage) return; | ||
| if (enabled) { | ||
| storage.setItem(ACTIVE_ONLY_STORAGE_KEY, "true"); | ||
| return; | ||
| } | ||
| storage.removeItem(ACTIVE_ONLY_STORAGE_KEY); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| export type KeyStatus = "active" | "disabled" | "banned" | "expired"; | ||
|
|
||
| // "manage" scope = management key; "restricted" = has model/connection allowlists; | ||
| // "standard" = no manage scope and no allowlists. | ||
| // Note: a "manage" key with allowlists is still classified as "manage" (manage takes priority). | ||
| export type KeyType = "standard" | "manage" | "restricted"; | ||
|
|
||
| export interface ApiKeyShape { | ||
| isActive?: boolean; | ||
| isBanned?: boolean; | ||
| expiresAt?: string | null; | ||
| scopes?: string[]; | ||
| allowedModels?: string[] | null; | ||
| allowedConnections?: string[] | null; | ||
| } | ||
|
|
||
| export function isKeyActive(k: ApiKeyShape): boolean { | ||
| if (k.isBanned === true) return false; | ||
| if (k.isActive === false) return false; | ||
| if (k.expiresAt) { | ||
| return new Date(k.expiresAt).getTime() > Date.now(); | ||
| } | ||
| return true; | ||
| } | ||
|
Comment on lines
+17
to
+24
Contributor
There was a problem hiding this comment. The Refactor to reuse export function isKeyActive(k: ApiKeyShape): boolean {
if (k.isBanned === true) return false;
if (k.isActive === false) return false;
if (isExpired(k)) return false;
return true;
} |
||
|
|
||
| export function isExpired(k: ApiKeyShape): boolean { | ||
| if (!k.expiresAt) return false; | ||
| const ts = new Date(k.expiresAt).getTime(); | ||
| if (Number.isNaN(ts)) return false; | ||
| return ts < Date.now(); | ||
| } | ||
|
|
||
| export function isRestricted(k: ApiKeyShape): boolean { | ||
| const hasModelRestrictions = Array.isArray(k.allowedModels) && k.allowedModels.length > 0; | ||
| const hasConnectionRestrictions = | ||
| Array.isArray(k.allowedConnections) && k.allowedConnections.length > 0; | ||
| return hasModelRestrictions || hasConnectionRestrictions; | ||
| } | ||
|
|
||
| export function classifyKeyStatus(k: ApiKeyShape): KeyStatus { | ||
| if (k.isBanned === true) return "banned"; | ||
| if (isExpired(k)) return "expired"; | ||
| if (k.isActive === false) return "disabled"; | ||
| return "active"; | ||
| } | ||
|
|
||
| export function classifyKeyType(k: ApiKeyShape): KeyType { | ||
| if (Array.isArray(k.scopes) && k.scopes.includes("manage")) return "manage"; | ||
| if (isRestricted(k)) return "restricted"; | ||
| return "standard"; | ||
| } | ||
|
|
||
| export interface ApiKeyCounts { | ||
| total: number; | ||
| active: number; | ||
| disabled: number; | ||
| banned: number; | ||
| expired: number; | ||
| standard: number; | ||
| manage: number; | ||
| restricted: number; | ||
| } | ||
|
|
||
| export function computeApiKeyCounts(keys: ApiKeyShape[]): ApiKeyCounts { | ||
| const counts: ApiKeyCounts = { | ||
| total: keys.length, | ||
| active: 0, | ||
| disabled: 0, | ||
| banned: 0, | ||
| expired: 0, | ||
| standard: 0, | ||
| manage: 0, | ||
| restricted: 0, | ||
| }; | ||
|
|
||
| for (const k of keys) { | ||
| const status = classifyKeyStatus(k); | ||
| counts[status] += 1; | ||
|
|
||
| const type = classifyKeyType(k); | ||
| counts[type] += 1; | ||
| } | ||
|
|
||
| return counts; | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The current persistence logic for
activeOnlyhas a race condition. On the initial render,activeOnlyisfalse. The seconduseEffect(line 151) will trigger and writefalsetolocalStoragebefore the firstuseEffect(line 147) can read the saved value and update the state. This effectively overwrites the user's preference with the default value on every page load.Consider using a
refto skip the initial write or initializing the state fromlocalStorageusing a lazy initializer (though the latter requires careful handling of hydration in Next.js).