Refactoring

ehmicky · Sep 12, 2021 · 6e6febd · 6e6febd
1 parent cfdb908
commit 6e6febd
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/combination/dimensions.js b/src/combination/dimensions.js
@@ -9,7 +9,7 @@
 //  - The order of dimensions when printing:
 //     - combinationName in previews, `dev` and error messages
 //     - combinationTitle in reporters
-export const DIMENSIONS = [
+const DIMENSIONS_ARRAY = [
   {
     // Name used as property internally and when saving
     propName: 'task',
@@ -29,3 +29,14 @@ export const DIMENSIONS = [
     createdByUser: true,
   },
 ]
+
+// Turn dimensions array into an object
+const getDimensions = function () {
+  return Object.fromEntries(DIMENSIONS_ARRAY.map(getDimensionPair))
+}
+
+const getDimensionPair = function (dimension) {
+  return [dimension.propName, dimension]
+}
+
+export const DIMENSIONS = getDimensions()
diff --git a/src/combination/ids.js b/src/combination/ids.js
@@ -29,8 +29,8 @@ const isNotDuplicate = function ({ dimension, id }, index, combinationIds) {
 
 // Retrieve each dimension's id of a given combination
 export const getCombinationIds = function ({ dimensions }) {
-  return DIMENSIONS.map((dimension) => ({
-    dimension,
-    id: dimensions[dimension.propName].id,
+  return Object.entries(dimensions).map(([propName, { id }]) => ({
+    id,
+    dimension: DIMENSIONS[propName],
   }))
 }