improve fe typings (#2154)

* improve fe typings * one more hotfix
Brain-up · Jan 21, 2022 · c468a07 · c468a07
1 parent bfd571a
commit c468a07
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/frontend/app/components/task-player/single-simple-words/component.ts b/frontend/app/components/task-player/single-simple-words/component.ts
@@ -9,14 +9,17 @@ import { MODES } from 'brn/utils/task-modes';
 import { task, Task as TaskGenerator } from 'ember-concurrency';
 import { StatEvents } from 'brn/services/stats';
 import AnswerOption from 'brn/utils/answer-option';
-
-export default class SingleSimpleWordsComponent extends Component {
+import SingleSimpleWordTask from 'brn/models/task/single-simple-words';
+export default class SingleSimpleWordsComponent extends Component<SingleSimpleWordTask> {
   @tracked currentAnswer = null;
   get audioFileUrl() {
     const task = this.firstUncompletedTask;
     if (!task) {
       return null;
     }
+    if (!this.args.task) {
+      return null;
+    }
     const answer = (task as any).answer[0] as AnswerOption;
     const useGeneratedUrl =
       this.args.task.usePreGeneratedAudio && answer.audioFileUrl;

diff --git a/frontend/app/components/task-player/single-words/component.ts b/frontend/app/components/task-player/single-words/component.ts
@@ -10,20 +10,21 @@ import { TIMINGS } from 'brn/utils/audio-api';
 import { tracked } from '@glimmer/tracking';
 import AudioService from 'brn/services/audio';
 import StatsService, { StatEvents } from 'brn/services/stats';
+import SingleWordTask from 'brn/models/task/single-words';
 
 interface ITaskPlayerSingleWordsComponent {
-  task: any;
+  task: SingleWordTask;
   onShuffled(items: string[]): void;
   onRightAnswer(): void;
   onWrongAnswer(): void;
 }
 
 export default class TaskPlayerSingleWordsComponent extends Component<ITaskPlayerSingleWordsComponent> {
-  @tracked shuffledWords: null | string[] = null;
+  @tracked shuffledWords: string[] = [];
   @tracked lastAnswer: null | string = null;
   @tracked exerciseResultIsVisible = false;
   @tracked taskResultIsVisible = false;
-  @tracked previousTaskWords = null;
+  @tracked previousTaskWords: string[] = [];
 
   @service('audio') audio!: AudioService;
   @service('stats') stats!: StatsService;
@@ -56,7 +57,7 @@ export default class TaskPlayerSingleWordsComponent extends Component<ITaskPlaye
   }
 
   shuffle() {
-    this.shuffledWords = A(shuffleArray(this.task.words, 10));
+    this.shuffledWords = A(shuffleArray(this.task.words, 10)) as string[];
     if (typeof this.args.onShuffled === 'function') {
       this.args.onShuffled(this.shuffledWords);
     }

diff --git a/frontend/app/components/task-player/words-sequences/component.ts b/frontend/app/components/task-player/words-sequences/component.ts
@@ -10,6 +10,7 @@ import { MODES } from 'brn/utils/task-modes';
 import { task, Task as TaskGenerator } from 'ember-concurrency';
 import AudioService from 'brn/services/audio';
 import StatsService, { StatEvents } from 'brn/services/stats';
+import WordsSequences from 'brn/models/task/words-sequences';
 
 function getEmptyTemplate(selectedItemsOrder = []): any {
   return selectedItemsOrder.reduce((result, currentKey) => {
@@ -18,8 +19,8 @@ function getEmptyTemplate(selectedItemsOrder = []): any {
   }, {});
 }
 
-interface IWordsSequencesComponentArgs {
-  task: any;
+export interface IWordsSequencesComponentArgs<T> {
+  task: T;
   mode: keyof typeof MODES;
   disableAnswers: boolean;
   activeWord: string;
@@ -29,7 +30,9 @@ interface IWordsSequencesComponentArgs {
   onWrongAnswer(params?: { skipRetry: true }): void;
 }
 
-export default class WordsSequencesComponent extends Component<IWordsSequencesComponentArgs> {
+export default class WordsSequencesComponent<
+  T = WordsSequences,
+> extends Component<IWordsSequencesComponentArgs<T>> {
   @action onInsert() {
     this.updateLocalTasks();
     this.startTask();