🔬 #20

BryanWilhite · Jan 8, 2020 · a099c01 · a099c01
1 parent 1decab6
commit a099c01
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 12 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -31,6 +31,19 @@
             "script": "version:patch",
             "problemMatcher": []
         },
+        {
+            "label": "npx: jest [current open file]",
+            "type": "shell",
+            "command": "npx",
+            "args": [
+                "jest",
+                "${relativeFile}"
+            ],
+            "options": {
+                "cwd": "${workspaceFolder}"
+            },
+            "problemMatcher": []
+        },
         {
             "label": "typedoc: generate docs",
             "type": "shell",

diff --git a/src/utilities/array.utility.ts b/src/utilities/array.utility.ts
@@ -43,7 +43,8 @@ export class ArrayUtility {
                 i: number,
                 dataRef: any,
                 k: any = keyGetter(current)
-            ) => ((accumulator[k] || (accumulator[k] = [])).push(current), accumulator), initialValue
+            ) => ((accumulator[k] || (accumulator[k] = [])).push(current), accumulator),
+            initialValue
         );
         const groupByModels: ReducedGroup[] = [];
 

diff --git a/src/utilities/display-item.utility.spec.ts b/src/utilities/display-item.utility.spec.ts
@@ -1,7 +1,7 @@
 import items from '../mocks/app-songhay-blog-q2-2018-items.json';
 import { MenuDisplayItemModel } from '../models/menu-display-item.model';
 
-import { DisplayItemUtility, DISPLAY_ITEM_GROUP_NONE } from './display-item.utility';
+import { DISPLAY_ITEM_GROUP_NONE, DisplayItemUtility } from './display-item.utility';
 import { MapObjectUtility } from './map-object.utility';
 
 it('should group flat set for display [empty or null Selectable map pairs]', () => {
@@ -139,7 +139,7 @@ it('should get a mapped pair or return a default pair', () => {
     );
 });
 
-fit('should sort fallback group to the end', () => {
+it('should sort fallback group to the end', () => {
 
     const mapForG1 = new Map<string, any>([['topic-one', 'First Topic'], ['group-one', 'Group One']]);
     const mapForG2 = new Map<string, any>([['group-two', 'Group Two']]);

diff --git a/src/utilities/display-item.utility.ts b/src/utilities/display-item.utility.ts
@@ -111,10 +111,8 @@ export class DisplayItemUtility {
             throw new Error('The expected items are not here.');
         }
 
-        DisplayItemUtility.setGrouping(items, groupId);
-
-        const grouped = ArrayUtility.groupBy(items, (i: MenuDisplayItemModel) => i.groupId);
-        const reduced = ReducedGroupUtility.reduceToObject<MenuDisplayItemModel>(grouped);
+        const groups = ArrayUtility.groupBy(items, (i: MenuDisplayItemModel) => i.groupId);
+        const reduced = ReducedGroupUtility.reduceToObject<MenuDisplayItemModel>(groups);
 
         return reduced;
     }
@@ -185,6 +183,7 @@ export class DisplayItemUtility {
             .filter(i => i ? true : false)
             .forEach(i => {
                 const pair = DisplayItemUtility.getItemMapPair(i, groupId);
+
                 if (!pair) {
                     if (!i.groupId || !i.displayText) { doGroupPairWarning(i); }
                 } else {

diff --git a/src/utilities/reduced-group-utility.ts b/src/utilities/reduced-group-utility.ts
@@ -11,18 +11,25 @@ export class ReducedGroupUtility {
      *
      */
     public static reduceToObject<T>(groups: ReducedGroup[]): { [key: string]: T[] } {
-        const keyGetter = (datum: ReducedGroup) => datum.key;
+        const keyGetter = (datum: {[key: string]: any}) => Object.getOwnPropertyNames(datum)[0];
         const initialValue: { [key: string]: T[] } = {};
-        const reduction = groups.reduce(
+        const reduction = groups
+            .map(i => {
+                const o = {} as { [key: string]: T[] };
+                const k = i.key as string;
+                o[k] = i.values;
+                return o;
+            })
+            .reduce(
             (
                 accumulator: { [key: string]: T[] },
-                current: ReducedGroup,
+                current: { [key: string]: T[] },
                 i: number,
                 dataRef: any,
-                k: any = keyGetter(current)
+                k: string = keyGetter(current)
             ) => ({...current, ...accumulator}),
             initialValue
-        );
+        ); console.log({reduction});
 
         return reduction;
     }