created getStandardModesInOrder to clean up getSimilarModes

Author: Salma Alam-Naylor

apps/fretonator-web/src/app/common/fret-map/fret-map.service.spec.ts

@@ -1398,6 +1398,29 @@ describe('FretMapService:getNoteExtenderStringFromNoteObject', () => {
   });
 });
 
+describe('FretMapService:getStandardModesInOrder', () => {
+  let service: FretMapService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(FretMapService);
+  });
+
+  it('returns a set of modes correctly for starting mode dorian', () => {
+    const result = service.getStandardModesInOrder(1);
+    expect(result).toEqual([
+      Mode.dorian,
+      Mode.phrygian,
+      Mode.lydian,
+      Mode.mixolydian,
+      Mode.aolian,
+      Mode.locrian,
+      Mode.ionian,
+    ])
+  })
+});
+
+
 describe('FretMapService:getSimilarModes', () => {
   let service: FretMapService;
 

apps/fretonator-web/src/app/common/fret-map/fret-map.service.ts

@@ -426,19 +426,31 @@ export class FretMapService {
     }
   };
 
+  getStandardModesInOrder = (startModeIndex: number): Mode[] => {
+    const before = [...StandardModePatterns];
+    const after = before.splice(startModeIndex);
+
+    return [
+      ...after,
+      ...before
+    ];
+  };
+
   getSimilarModes = (modeMap: ModeMap, inputMode: Mode): SimilarModes => {
     const firstModeInPattern = StandardModePatterns.indexOf(inputMode);
 
     if (firstModeInPattern === -1) {
       return [];
     }
 
+    const nextModes = this.getStandardModesInOrder(firstModeInPattern);
+
     const similarModes = modeMap
       .map((noteObject, index) => (
         {
           noteDisplayName: noteObject.displayName,
           note: noteObject.name,
-          mode: StandardModePatterns[firstModeInPattern + index],
+          mode: nextModes[index],
           noteExtender: this.getNoteExtenderStringFromNoteObject(noteObject)
         }
       ));

apps/fretonator-web/src/app/util/constants.ts

@@ -628,13 +628,6 @@ export const StringFrequencies = {
 }
 
 export const StandardModePatterns = [
-  Mode.ionian,
-  Mode.dorian,
-  Mode.phrygian,
-  Mode.lydian,
-  Mode.mixolydian,
-  Mode.aolian,
-  Mode.locrian,
   Mode.ionian,
   Mode.dorian,
   Mode.phrygian,