Remove arbitrary numeric keys from OxQL timeseries data (#2890)

* Remove arbitrary numeric keys from timeseries data

* remove Object.values calls on timeseries data

Author: charliepark

OMICRON_VERSION

@@ -1 +1 @@
-19e9f75ba5fe26df6ac3ada2f3a3bb8fa032186c
+a9d9f1e1a17736aecc8d644c8d8c6174c1a5bc14

app/api/__generated__/Api.ts

@@ -47,7 +47,7 @@ if (typeof window !== 'undefined') {
       const data = handleResult(result).tables
       logHeading(data.length + ' timeseries returned')
       for (const table of data) {
-        for (const ts of Object.values(table.timeseries)) {
+        for (const ts of table.timeseries) {
           const fields = Object.entries(ts.fields)
             .map(([k, v]) => `${k}: ${v.value}`)
             .join(', ')

app/api/__generated__/OMICRON_VERSION

@@ -131,8 +131,8 @@ const utilizationQueryResult1: OxqlQueryResult = {
   tables: [
     {
       name: 'virtual_machine:vcpu_usage',
-      timeseries: {
-        '16671618930358432507': {
+      timeseries: [
+        {
           fields: {
             vcpuId: {
               type: 'u32',
@@ -157,12 +157,12 @@ const utilizationQueryResult1: OxqlQueryResult = {
             ],
           },
         },
-      },
+      ],
     },
   ],
 }
 
-const timeseries1 = utilizationQueryResult1.tables[0].timeseries['16671618930358432507']
+const timeseries1 = utilizationQueryResult1.tables[0].timeseries[0]
 
 test('sumValues', () => {
   expect(sumValues([], 0)).toEqual([])

app/api/__generated__/msw-handlers.ts

@@ -129,7 +129,7 @@ export const sumValues = (timeseries: Timeseries[], arrLen: number): (number | n
 export const composeOxqlData = (data: OxqlQueryResult | undefined) => {
   let timeseriesCount = 0
   if (!data) return { chartData: [], timeseriesCount }
-  const timeseriesData = Object.values(data.tables[0].timeseries)
+  const timeseriesData = data.tables[0].timeseries
   timeseriesCount = timeseriesData.length
   if (!timeseriesCount) return { chartData: [], timeseriesCount }
   // Extract timestamps (all series should have the same timestamps)

app/api/__generated__/validate.ts

@@ -1633,7 +1633,7 @@ export const handlers = makeHandlers({
     // we use other-project to test certain response cases
     if (query.project === 'other-project') {
       // 1. return only one data point
-      const points = Object.values(data.tables[0].timeseries)[0].points
+      const points = data.tables[0].timeseries[0].points
       if (body.query.includes('state == "run"')) {
         points.timestamps = points.timestamps.slice(0, 2)
         points.values = points.values.slice(0, 2)
@@ -1836,6 +1836,7 @@ export const handlers = makeHandlers({
   networkingAddressLotCreate: NotImplemented,
   networkingAddressLotDelete: NotImplemented,
   networkingAddressLotList: NotImplemented,
+  networkingAddressLotView: NotImplemented,
   networkingAllowListUpdate: NotImplemented,
   networkingAllowListView: NotImplemented,
   networkingBfdDisable: NotImplemented,

app/api/window.ts

@@ -286,9 +286,9 @@ export const getMockOxqlInstanceData = (
     tables: [
       {
         name: name,
-        timeseries: {
+        timeseries: [
           // This is a fake metric ID
-          '10607783231231666598': {
+          {
             fields: {
               instanceId: {
                 type: 'uuid',
@@ -309,7 +309,7 @@ export const getMockOxqlInstanceData = (
               ],
             },
           },
-        },
+        ],
       },
     ],
   })