Remove idName

ehmicky · Sep 12, 2021 · de3f105 · de3f105
1 parent ea7ee42
commit de3f105
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 19 deletions.
diff --git a/src/combination/dimensions.js b/src/combination/dimensions.js
@@ -14,8 +14,6 @@ export const DIMENSIONS = [
     propName: 'task',
     // Name used in output and error messages
     messageName: 'task',
-    // Property name for the identifier
-    idName: 'id',
     // Property name for the title
     titleName: 'taskTitle',
     // Whether dimension was created by users or by plugins
@@ -24,14 +22,12 @@ export const DIMENSIONS = [
   {
     propName: 'runner',
     messageName: 'runner',
-    idName: 'id',
     titleName: 'runnerTitle',
     createdByUser: false,
   },
   {
     propName: 'system',
     messageName: 'system',
-    idName: 'id',
     titleName: 'systemTitle',
     createdByUser: true,
   },

diff --git a/src/combination/ids.js b/src/combination/ids.js
@@ -28,18 +28,15 @@ const isNotDuplicate = function ({ dimension, id }, index, combinationIds) {
 }
 
 // Retrieve each dimension's id of a given combination
-export const getCombinationIds = function (combination) {
+export const getCombinationIds = function ({ dimensions }) {
   return DIMENSIONS.map((dimension) => ({
     dimension,
-    id: combination.dimensions[dimension.propName][dimension.idName],
+    id: dimensions[dimension.propName].id,
   }))
 }
 
 export const getDimensionId = function (propName, { dimensions }) {
-  const { idName } = DIMENSIONS.find(
-    (dimension) => dimension.propName === propName,
-  )
-  return dimensions[propName][idName]
+  return dimensions[propName].id
 }
 
 export const getDimensionTitle = function (propName, { dimensions }) {

diff --git a/src/report/normalize/titles_add.js b/src/report/normalize/titles_add.js
@@ -24,14 +24,10 @@ const addCombinationTitles = function (combination, titles) {
 const addCombinationTitle = function ({
   combination,
   combination: { dimensions },
-  dimension: { propName, idName, titleName },
+  dimension: { propName, titleName },
   titles,
 }) {
-  const dimension = addTitle(dimensions[propName], {
-    idName,
-    titleName,
-    titles,
-  })
+  const dimension = addTitle(dimensions[propName], { titleName, titles })
   return {
     ...combination,
     dimensions: { ...dimensions, [propName]: dimension },
@@ -42,7 +38,7 @@ const addCombinationTitle = function ({
 export const addFooterTitles = function (footer, titles, showTitles) {
   const titlesA = showTitles ? titles : {}
   const systems = footer.systems.map((system) =>
-    addTitle(system, { idName: 'id', titleName: 'title', titles: titlesA }),
+    addTitle(system, { titleName: 'title', titles: titlesA }),
   )
   return { ...footer, systems }
 }
@@ -63,8 +59,8 @@ export const addFooterTitles = function (footer, titles, showTitles) {
 //   - provides a single place for all identifiers, which is simpler
 //   - removes the need for runners to handle this
 // We do this by adding a `title` property for every `id` property.
-const addTitle = function (obj, { idName, titleName, titles }) {
-  const id = obj[idName]
+const addTitle = function (obj, { titleName, titles }) {
+  const { id } = obj
   const { [id]: title = id } = titles
   return title === undefined ? obj : { ...obj, [titleName]: title }
 }