From f9dec3c56b885b6d03e5d15cf580b69f7ab45b08 Mon Sep 17 00:00:00 2001 From: Christopher Kolstad Date: Wed, 21 Jan 2026 16:00:51 +0100 Subject: [PATCH] chore(nit): fix nitpicks from Nuno --- .../EnterpriseEdgeApiKeyRevisionData.tsx | 32 ++++++++++--------- ...i-key-revision-id-to-edge-observability.js | 4 +-- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/frontend/src/component/admin/enterprise-edge/EnterpriseEdgeInstances/EnterpriseEdgeInstance/EnterpriseEdgeApiKeyRevisionData.tsx b/frontend/src/component/admin/enterprise-edge/EnterpriseEdgeInstances/EnterpriseEdgeInstance/EnterpriseEdgeApiKeyRevisionData.tsx index 22f60870bc..cad3cfe1ef 100644 --- a/frontend/src/component/admin/enterprise-edge/EnterpriseEdgeInstances/EnterpriseEdgeInstance/EnterpriseEdgeApiKeyRevisionData.tsx +++ b/frontend/src/component/admin/enterprise-edge/EnterpriseEdgeInstances/EnterpriseEdgeInstance/EnterpriseEdgeApiKeyRevisionData.tsx @@ -5,10 +5,6 @@ import { formatDateYMDHMS } from '../../../../../utils/formatDate.ts'; import { useLocationSettings } from '../../../../../hooks/useLocationSettings.ts'; import { Truncator } from '../../../../common/Truncator/Truncator.tsx'; -interface IEnterpriseEdgeApiKeyRevisionProps { - apiKeys?: EdgeApiKeyRevisionId[]; -} - const StyledTable = styled('table')(({ theme }) => ({ width: '100%', borderCollapse: 'collapse', @@ -35,6 +31,21 @@ const StyledTableCell = styled('td')(({ theme }) => ({ }, })); +interface IEnterpriseEdgeApiKeyRevisionProps { + apiKeys?: EdgeApiKeyRevisionId[]; +} + +const projectKey = (projects: string[]): string => { + return projects.length === 1 ? projects[0] : `[]`; +}; + +const apiToken = (revInfo: EdgeApiKeyRevisionId): string => { + return `${projectKey(revInfo.projects)}:${revInfo.environment}.***`; +}; + +const listKey = (revInfo: EdgeApiKeyRevisionId): string => { + return `[${revInfo.projects.join(',')}]:${revInfo.environment}`; +}; export const EnterpriseEdgeApiKeyRevisionData = ({ apiKeys, }: IEnterpriseEdgeApiKeyRevisionProps) => { @@ -52,10 +63,9 @@ export const EnterpriseEdgeApiKeyRevisionData = ({ {apiKeys?.map((apiKey) => { + const token = apiToken(apiKey); return ( - + {apiToken(apiKey)} @@ -79,11 +89,3 @@ export const EnterpriseEdgeApiKeyRevisionData = ({ ); }; - -function projectKey(projects: string[]): string { - return projects.length === 1 ? projects[0] : `[]`; -} - -function apiToken(revInfo: EdgeApiKeyRevisionId): string { - return `${projectKey(revInfo.projects)}:${revInfo.environment}.***`; -} diff --git a/src/migrations/20260119100647-add-api-key-revision-id-to-edge-observability.js b/src/migrations/20260119100647-add-api-key-revision-id-to-edge-observability.js index d7665d4836..914a25e740 100644 --- a/src/migrations/20260119100647-add-api-key-revision-id-to-edge-observability.js +++ b/src/migrations/20260119100647-add-api-key-revision-id-to-edge-observability.js @@ -1,7 +1,7 @@ exports.up = function(db, cb) { - db.runSql(`ALTER TABLE stat_edge_observability ADD COLUMN api_key_revision_ids JSONB`, cb); + db.runSql(`ALTER TABLE stat_edge_observability ADD COLUMN api_key_revision_ids JSONB;`, cb); }; exports.down = function(db, cb) { - db.runSql(`ALTER TABLE stat_edge_observability DROP COLUMN api_key_revision_ids`, cb); + db.runSql(`ALTER TABLE stat_edge_observability DROP COLUMN api_key_revision_ids;`, cb); };