Website: Use 'Name' key in metadata for size (#112)

Author: jacek-oet

website-nextjs/src/components/admin/benchmark-detail/InstancesTableResult.tsx

@@ -12,7 +12,6 @@ import {
   getFacetedUniqueValues,
   useReactTable,
 } from "@tanstack/react-table"
-import { getInstance } from "@/utils/meta-data"
 import { MetaDataEntry } from "@/types/meta-data"
 
 const InstancesTableResult = ({
@@ -72,10 +71,7 @@ const InstancesTableResult = ({
         temporalResolution: sizeData.temporalResolution,
         nOfVariables: sizeData.nOfVariables,
         nOfConstraints: sizeData.nOfConstraints,
-        instance: getInstance(
-          sizeData.temporalResolution.toString(),
-          sizeData.spatialResolution.toString()
-        ),
+        instance: sizeData.name,
       })),
     [benchmarkDetail.sizes.length]
   )

website-nextjs/src/pages/_app.tsx

@@ -11,7 +11,7 @@ import resultActions from "@/redux/results/actions"
 import filterActions from "@/redux/filters/actions"
 import AdminLayout from "@/pages/AdminLayout"
 import { getBenchmarkResults, getLatestBenchmarkResult } from "@/utils/results"
-import { getInstance, getMetaData } from "@/utils/meta-data"
+import { getMetaData } from "@/utils/meta-data"
 import { BenchmarkResult } from "@/types/benchmark"
 import { IFilterState } from "@/types/state"
 
@@ -29,10 +29,7 @@ function App({ Component, pageProps }: AppProps) {
       Object.keys(metaData).forEach((metaDataKey) => {
         metaData[metaDataKey].sizes.forEach((s) => {
           problemSizeResult[
-            `${metaDataKey}'-'${getInstance(
-              s.temporalResolution.toString(),
-              s.spatialResolution.toString()
-            )}`
+            `${metaDataKey}'-'${s.name}`
           ] = s.size
         })
       })

website-nextjs/src/redux/filters/actions.ts

@@ -6,7 +6,6 @@ import { BenchmarkResult } from "@/types/benchmark"
 import { MetaData, MetaDataEntry, Size } from "@/types/meta-data"
 import { getLatestBenchmarkResult } from "@/utils/results"
 import { IFilterState } from "@/types/state"
-import { getInstance } from "@/utils/meta-data"
 
 const toggleFilter = (category: string, value: string, only: boolean) => {
   return {
@@ -56,10 +55,7 @@ const actions = {
         }
         results.rawMetaData[metaDataKey].sizes.forEach((s: Size) => {
           problemSizeResult[
-            `${metaDataKey}'-'${getInstance(
-              s.temporalResolution.toString(),
-              s.spatialResolution.toString()
-            )}`
+            `${metaDataKey}'-'${s.name}`
           ] = s.size
         })
       })
@@ -68,12 +64,8 @@ const actions = {
         results.rawBenchmarkResults.filter((benchmark: BenchmarkResult) =>
           (metaData[benchmark.benchmark] as MetaDataEntry)?.sizes?.find(
             (size) => {
-              const temporalResolution =
-                size.temporalResolution === "NA"
-                  ? size.temporalResolution
-                  : `${size.temporalResolution}h`
               return (
-                `${size.spatialResolution}-${temporalResolution}` ===
+                size.name ===
                   benchmark.size &&
                 filters.problemSize.includes(
                   problemSizeResult[

website-nextjs/src/types/meta-data.ts

@@ -1,5 +1,6 @@
 
 type Size = {
+  name: string
   spatialResolution: number
   temporalResolution: number | string
   nOfConstraints: number

website-nextjs/src/utils/meta-data.ts

@@ -35,14 +35,8 @@ const getMetaData = async () => {
   return toCamelCase(rawData) as MetaData
 }
 
-const getInstance = (temporalResolution: string, spatialResolution: string) => {
-  const tempResolution =
-    temporalResolution === "NA" ? temporalResolution : `${temporalResolution}h`
-  return `${spatialResolution}-${tempResolution}`
-}
-
 const getUniqueValues = <T, K extends keyof T>(data: T[], key: K): T[K][] =>
   Array.from(new Set(data.map(item => item[key])));
 
 
-export { getMetaData, getInstance, getUniqueValues }
+export { getMetaData, getUniqueValues }