Allow isTheoreticalScale to be calculated with a modeMap input to remove the need to pass around a scale [] of strings

Author: Salma Alam-Naylor

apps/fretonator-web/src/app/common/fretonator/fretonator.component.html

@@ -64,7 +64,7 @@ <h4 class="fretonator__playCta">
 <div class="infoContainer">
   <app-scale-map [mode]="mode"
                  [modeMap]="modeMap"
-                 [isTheoretical]="scale | isTheoreticalScale"
+                 [isTheoretical]="modeMap | isTheoreticalScale"
                  [modeDisplayString]="modeDisplayString"
                  [note]="note"
                  [noteExtenderString]="noteExtenderString"></app-scale-map>

apps/fretonator-web/src/app/common/fretonator/fretonator.component.spec.ts

@@ -8,7 +8,14 @@ describe('FretonatorComponent', () => {
   @Component({
     selector: 'app-fretonator-spec',
     template: `
-      <app-fretonator [scale]="['C', 'D', 'E']"
+      <app-fretonator [modeMap]="[{
+                                  name: 'f',
+                                  sharp: false,
+                                  flat: false,
+                                  doubleFlat: false,
+                                  doubleSharp: false,
+                                  displayName: 'F'
+                                }]"
                       [fretMap]="[
                       { string: 'A', fret: 0, displayName: 'A', degree: 'dominant' },
                       { string: 'A', fret: 2, displayName: 'B', degree: 'submediant' }]">

apps/fretonator-web/src/app/common/fretonator/fretonator.component.ts

@@ -1,5 +1,5 @@
 import { Component, Input } from '@angular/core';
-import { ChordMap, FretMap, Mode, ModeMap, Scale } from '../../util/types';
+import { ChordMap, FretMap, Mode, ModeMap } from '../../util/types';
 import { NotePlaybackService } from '../playback/note-playback.service';
 
 @Component({
@@ -10,7 +10,6 @@ import { NotePlaybackService } from '../playback/note-playback.service';
 export class FretonatorComponent {
   @Input() fretMap: FretMap;
   @Input() modeMap: ModeMap;
-  @Input() scale: Scale;
   @Input() intervalMap: [];
   @Input() chordMap: ChordMap;
   @Input() mode: Mode;

apps/fretonator-web/src/app/common/fretonator/is-theoretical-scale.pipe.spec.ts

@@ -1,4 +1,9 @@
 import { IsTheoreticalScalePipe } from './is-theoretical-scale.pipe';
+import {
+  aSharpPentatonicMajor,
+  fMinorPentatonic,
+  gFlatMinorPentatonic
+} from '../fret-map/fret-map.service.testConstants';
 
 describe('IsTheoreticalScalePipe', () => {
   let pipe: IsTheoreticalScalePipe;
@@ -11,14 +16,14 @@ describe('IsTheoreticalScalePipe', () => {
   });
 
   it('returns true for a scale with a double flat in', () => {
-    expect(pipe.transform(['C', 'D𝄫'])).toBe(true);
+    expect(pipe.transform(gFlatMinorPentatonic)).toBe(true);
   });
 
   it('returns true for a scale with a double sharp in', () => {
-    expect(pipe.transform(['Cx', 'D'])).toBe(true);
+    expect(pipe.transform(aSharpPentatonicMajor)).toBe(true);
   });
 
   it('returns false for scales without double flat or double sharp', () => {
-    expect(pipe.transform(['C', 'D'])).toBe(false);
+    expect(pipe.transform(fMinorPentatonic)).toBe(false);
   });
 });

apps/fretonator-web/src/app/common/fretonator/is-theoretical-scale.pipe.ts

@@ -1,14 +1,14 @@
 import { Pipe, PipeTransform } from '@angular/core';
-import { Scale } from '../../util/types';
+import { ModeMap } from '../../util/types';
 
 @Pipe({
   name: 'isTheoreticalScale'
 })
 export class IsTheoreticalScalePipe implements PipeTransform {
 
-  transform(scale: Scale): boolean {
-    for (const note of scale) {
-      if(note.indexOf('x') !== -1 || note.indexOf('𝄫') !== -1) {
+  transform(modeMap: ModeMap): boolean {
+    for (const note of modeMap) {
+      if(note.displayName.indexOf('x') !== -1 || note.displayName.indexOf('𝄫') !== -1) {
         return true;
       }
     }

apps/fretonator-web/src/app/common/fretonator/scale-map/get-enharmonic-router-link.pipe.ts

@@ -1,5 +1,4 @@
 import { Pipe, PipeTransform } from '@angular/core';
-import { RouterLink } from '@angular/router';
 import { Enharmonics } from '../../../util/constants';
 
 @Pipe({

apps/fretonator-web/src/app/common/svgs/cross/cross.module.ts

@@ -3,7 +3,6 @@ import { CommonModule } from '@angular/common';
 import { CrossComponent } from './cross.component';
 
 
-
 @NgModule({
   declarations: [CrossComponent],
   exports: [

apps/fretonator-web/src/app/common/svgs/speaker/speaker.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component } from '@angular/core';
 
 @Component({
   selector: 'app-speaker-svg',

apps/fretonator-web/src/app/common/svgs/speaker/speaker.module.ts

@@ -3,7 +3,6 @@ import { CommonModule } from '@angular/common';
 import { SpeakerComponent } from './speaker.component';
 
 
-
 @NgModule({
   declarations: [SpeakerComponent],
   exports: [

apps/fretonator-web/src/app/pages/home/home-index/generate-mode-map.pipe.spec.ts

@@ -1,9 +1,8 @@
 import { TestBed } from '@angular/core/testing';
 
 import { GenerateModeMapPipe } from './generate-mode-map.pipe';
-import { Mode, ModeMap } from '../../../util/types';
+import { Mode } from '../../../util/types';
 import { FretMapService } from '../../../common/fret-map/fret-map.service';
-import { GenerateFretMapPipe } from './generate-fret-map.pipe';
 
 describe('GenerateModeMapPipe', () => {
   let pipe: GenerateModeMapPipe;