fix types / revert util change

Author: davidlougheed

src/modules/reference/reducers.ts

@@ -29,13 +29,15 @@ export const referenceGenomes: Reducer<ReferenceGenomesState> = (
     // FETCH_REFERENCE_GENOMES
     case FETCH_REFERENCE_GENOMES.REQUEST:
       return { ...state, isFetching: true };
-    case FETCH_REFERENCE_GENOMES.RECEIVE:
+    case FETCH_REFERENCE_GENOMES.RECEIVE: {
+      const genomesByID = arrayToObjectByProperty(action.data, "id") as Record<string, Genome>;
       return {
         ...state,
         items: action.data,
-        itemsByID: arrayToObjectByProperty(action.data, "id"),
-        itemsByIDLower: arrayToObjectByProperty(action.data, "id", (k) => (k as string).toLowerCase()),
+        itemsByID: genomesByID,
+        itemsByIDLower: Object.fromEntries(Object.entries(genomesByID).map(([k, v]) => [k.toLowerCase(), v])),
       };
+    }
     case FETCH_REFERENCE_GENOMES.FINISH:
       return { ...state, isFetching: false, hasAttempted: true };
 

src/utils/misc.ts

@@ -18,11 +18,8 @@ export const simpleDeepCopy = (o: object) => JSON.parse(JSON.stringify(o));
 export const objectWithoutProps = (o: object, ps: RecordKey[]) =>
   Object.fromEntries(Object.entries(o).filter(([p2]) => !ps.includes(p2)));
 export const objectWithoutProp = (o: object, p: RecordKey) => objectWithoutProps(o, [p]);
-export const arrayToObjectByProperty = <T extends Record<RecordKey, unknown>>(
-  l: T[],
-  p: RecordKey,
-  keyMapper: (key: RecordKey) => RecordKey = id,
-) => Object.fromEntries(l.map((item) => [keyMapper(item[p] as RecordKey), item]));
+export const arrayToObjectByProperty = <T extends Record<RecordKey, unknown>>(l: T[], p: RecordKey) =>
+  Object.fromEntries(l.map((item) => [item[p], item]));
 
 // REGEX
 export const notAlleleCharactersRegex = new RegExp("[^ACGTN]", "g");