feat: strict null checks #4

johannesjo · Jul 3, 2020 · d0ff43b · d0ff43b
1 parent 15824ec
commit d0ff43b
Show file tree

Hide file tree

Showing 9 changed files with 89 additions and 65 deletions.
diff --git a/src/app/core-ui/main-header/main-header.component.ts b/src/app/core-ui/main-header/main-header.component.ts
@@ -38,9 +38,9 @@ export class MainHeaderComponent implements OnInit, OnDestroy {
   progressCircleRadius: number = 10;
   circumference: number = this.progressCircleRadius * Math.PI * 2;
 
-  @ViewChild('circleSvg', {static: true}) circleSvg: ElementRef;
+  @ViewChild('circleSvg', {static: true}) circleSvg?: ElementRef;
 
-  currentTaskContext$: Observable<Project | Tag> = this.taskService.currentTaskParentOrCurrent$.pipe(
+  currentTaskContext$: Observable<Project | Tag | null> = this.taskService.currentTaskParentOrCurrent$.pipe(
     filter(ct => !!ct),
     switchMap((currentTask) => this.workContextService.activeWorkContextId$.pipe(
       switchMap((activeWorkContextId) => {
@@ -77,12 +77,14 @@ export class MainHeaderComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
     this.taskService.currentTaskProgress$.subscribe((progressIN) => {
-      let progress = progressIN || 1;
-      if (progress > 1) {
-        progress = 1;
+      if (this.circleSvg) {
+        let progress = progressIN || 1;
+        if (progress > 1) {
+          progress = 1;
+        }
+        const dashOffset = this.circumference * -1 * progress;
+        this._renderer.setStyle(this.circleSvg.nativeElement, 'stroke-dashoffset', dashOffset);
       }
-      const dashOffset = this.circumference * -1 * progress;
-      this._renderer.setStyle(this.circleSvg.nativeElement, 'stroke-dashoffset', dashOffset);
     });
   }
 

diff --git a/src/app/features/bookmark/bookmark-bar/bookmark-bar.component.ts b/src/app/features/bookmark/bookmark-bar/bookmark-bar.component.ts
@@ -22,7 +22,7 @@ import { T } from '../../../t.const';
 export class BookmarkBarComponent implements OnDestroy {
   isDragOver: boolean = false;
   isEditMode: boolean = false;
-  dragEnterTarget: HTMLElement;
+  dragEnterTarget?: HTMLElement;
   LIST_ID: string = 'BOOKMARKS';
   T: any = T;
   isContextMenuDisabled: boolean = false;
@@ -44,7 +44,7 @@ export class BookmarkBarComponent implements OnDestroy {
     this._subs.add(this._dragulaService.dropModel(this.LIST_ID)
       .subscribe((params: any) => {
         const {target, source, targetModel, item} = params;
-        const newIds = targetModel.map(m => m.id);
+        const newIds = targetModel.map((m: Bookmark) => m.id);
         this.bookmarkService.reorderBookmarks(newIds);
       })
     );

diff --git a/src/app/features/bookmark/bookmark-link/bookmark-link.directive.ts b/src/app/features/bookmark/bookmark-link/bookmark-link.directive.ts
@@ -5,14 +5,15 @@ import { SnackService } from '../../../core/snack/snack.service';
 import { IPC } from '../../../../../electron/ipc-events.const';
 import { T } from '../../../t.const';
 import { ElectronService } from '../../../core/electron/electron.service';
+import { ipcRenderer, shell } from 'electron';
 
 @Directive({
   selector: '[bookmarkLink]'
 })
 export class BookmarkLinkDirective {
 
-  @Input() type: BookmarkType;
-  @Input() href: BookmarkType;
+  @Input() type?: BookmarkType;
+  @Input() href?: BookmarkType;
 
   constructor(
     private _electronService: ElectronService,
@@ -21,6 +22,10 @@ export class BookmarkLinkDirective {
   }
 
   @HostListener('click', ['$event']) onClick(ev: Event) {
+    if (!this.type || !this.href) {
+      return;
+    }
+
     if (ev.target) {
       const el = ev.target as HTMLElement;
       el.blur();
@@ -30,7 +35,7 @@ export class BookmarkLinkDirective {
       if (!this.type || this.type === 'LINK') {
         this._openExternalUrl(this.href);
       } else if (this.type === 'FILE') {
-        this._electronService.shell.openPath(this.href);
+        (this._electronService.shell as typeof shell).openPath(this.href);
       } else if (this.type === 'COMMAND') {
         this._snackService.open({
           msg: T.GLOBAL_SNACK.RUNNING_X,
@@ -51,14 +56,16 @@ export class BookmarkLinkDirective {
       .replace('http://http://', 'http://');
 
     if (IS_ELECTRON) {
-      this._electronService.shell.openExternal(url);
+      (this._electronService.shell as typeof shell).openExternal(url);
     } else {
       const win = window.open(url, '_blank');
-      win.focus();
+      if (win) {
+        win.focus();
+      }
     }
   }
 
   private _exec(command: string) {
-    this._electronService.ipcRenderer.send(IPC.EXEC, command);
+    (this._electronService.ipcRenderer as typeof ipcRenderer).send(IPC.EXEC, command);
   }
 }
diff --git a/src/app/features/pomodoro/pomodoro.service.ts b/src/app/features/pomodoro/pomodoro.service.ts
@@ -48,7 +48,7 @@ export class PomodoroService {
     this.currentCycle$,
     this.cfg$,
   ]).pipe(map(([isBreak, currentCycle, cfg]) => {
-    return isBreak && cfg.cyclesBeforeLongerBreak && Number.isInteger(((currentCycle + 1) / cfg.cyclesBeforeLongerBreak));
+    return isBreak && !!cfg.cyclesBeforeLongerBreak && Number.isInteger(((currentCycle + 1) / cfg.cyclesBeforeLongerBreak));
   }));
 
   isShortBreak$: Observable<boolean> = combineLatest([
@@ -91,6 +91,8 @@ export class PomodoroService {
         return cfg.breakDuration || DEFAULT_GLOBAL_CONFIG.pomodoro.breakDuration;
       } else if (isLong) {
         return cfg.longerBreakDuration || DEFAULT_GLOBAL_CONFIG.pomodoro.longerBreakDuration;
+      } else {
+        throw new Error('Pomodoro: nextSession$');
       }
     }),
     shareReplay(1),

diff --git a/src/app/features/pomodoro/store/pomodoro.effects.ts b/src/app/features/pomodoro/store/pomodoro.effects.ts
@@ -15,19 +15,20 @@ import { MatDialog } from '@angular/material/dialog';
 import { DialogPomodoroBreakComponent } from '../dialog-pomodoro-break/dialog-pomodoro-break.component';
 import { select, Store } from '@ngrx/store';
 import { selectCurrentTaskId } from '../../tasks/store/task.selectors';
-import { Observable, of } from 'rxjs';
+import { EMPTY, Observable, of } from 'rxjs';
 import { NotifyService } from '../../../core/notify/notify.service';
 import { IS_ELECTRON } from '../../../app.constants';
 import { IPC } from '../../../../../electron/ipc-events.const';
 import { T } from '../../../t.const';
 import { SnackService } from '../../../core/snack/snack.service';
 import { ElectronService } from '../../../core/electron/electron.service';
+import { ipcRenderer } from 'electron';
 
-const isEnabled = ([action, cfg, ...v]) => cfg && cfg.isEnabled;
+const isEnabled = ([action, cfg, ...v]: any[] | any): boolean => !!cfg && !!cfg.isEnabled;
 
 @Injectable()
 export class PomodoroEffects {
-  currentTaskId$: Observable<string> = this._store$.pipe(select(selectCurrentTaskId));
+  currentTaskId$: Observable<string | null> = this._store$.pipe(select(selectCurrentTaskId));
 
   @Effect()
   playPauseOnCurrentUpdate$: Observable<unknown> = this._actions$.pipe(
@@ -48,7 +49,7 @@ export class PomodoroEffects {
       || (isBreak && currentSessionTime <= 0 && action.type === TaskActionTypes.SetCurrentTask)),
     concatMap(([action, , isBreak, currentSessionTime]) => {
       // tslint:disable-next-line
-      const payload = action['payload'];
+      const payload = (action as any)['payload'];
 
       if (payload && action.type !== TaskActionTypes.UnsetCurrentTask) {
         if (isBreak && currentSessionTime <= 0) {
@@ -178,15 +179,15 @@ export class PomodoroEffects {
   );
 
   @Effect({dispatch: false})
-  setTaskBarIconProgress$: Observable<unknown> = this._pomodoroService.sessionProgress$.pipe(
-    filter(() => IS_ELECTRON),
-    withLatestFrom(this._pomodoroService.cfg$),
-    // we display pomodoro progress for pomodoro
-    filter(([progress, cfg]: [number, PomodoroConfig]) => cfg && cfg.isEnabled),
-    tap(([progress, cfg]) => {
-      this._electronService.ipcRenderer.send(IPC.SET_PROGRESS_BAR, {progress});
-    }),
-  );
+  setTaskBarIconProgress$: Observable<unknown> = IS_ELECTRON
+    ? this._pomodoroService.sessionProgress$.pipe(
+      withLatestFrom(this._pomodoroService.cfg$),
+      // we display pomodoro progress for pomodoro
+      filter(([progress, cfg]: [number, PomodoroConfig]) => cfg && cfg.isEnabled),
+      tap(([progress, cfg]) => {
+        (this._electronService.ipcRenderer as typeof ipcRenderer).send(IPC.SET_PROGRESS_BAR, {progress});
+      }),
+    ) : EMPTY;
 
   constructor(
     private _pomodoroService: PomodoroService,

diff --git a/src/app/features/pomodoro/store/pomodoro.reducer.ts b/src/app/features/pomodoro/store/pomodoro.reducer.ts
@@ -11,7 +11,7 @@ export interface PomodoroState {
 
 export const initialPomodoroState: PomodoroState = {
   isManualPause: true,
-  isBreak: undefined,
+  isBreak: false,
   currentCycle: 0,
 };
 

diff --git a/src/app/features/time-tracking/take-a-break/take-a-break.service.ts b/src/app/features/time-tracking/take-a-break/take-a-break.service.ts
@@ -29,6 +29,8 @@ import { NotifyService } from '../../../core/notify/notify.service';
 import { ElectronService } from '../../../core/electron/electron.service';
 import { UiHelperService } from '../../ui-helper/ui-helper.service';
 import { WorkContextService } from '../../work-context/work-context.service';
+import { Tick } from '../time-tracking';
+import { ipcRenderer } from 'electron';
 
 const BREAK_TRIGGER_DURATION = 10 * 60 * 1000;
 const PING_UPDATE_BANNER_INTERVAL = 60 * 1000;
@@ -37,7 +39,7 @@ const LOCK_SCREEN_THROTTLE = 5 * 60 * 1000;
 const LOCK_SCREEN_DELAY = 30 * 1000;
 
 // required because typescript freaks out
-const reduceBreak = (acc, tick) => {
+const reduceBreak = (acc: number, tick: Tick) => {
   return acc + tick.duration;
 };
 
@@ -181,7 +183,7 @@ export class TakeABreakService {
 
     this._triggerLockScreenThrottledAndDelayed$.subscribe(() => {
       if (IS_ELECTRON) {
-        this._electronService.ipcRenderer.send(IPC.LOCK_SCREEN);
+        (this._electronService.ipcRenderer as typeof ipcRenderer).send(IPC.LOCK_SCREEN);
       }
     });
 
@@ -193,7 +195,7 @@ export class TakeABreakService {
     });
 
     this._triggerBanner$.subscribe(([timeWithoutBreak, cfg]) => {
-      const msg = this._createMessage(timeWithoutBreak, cfg.takeABreak);
+      const msg: string = this._createMessage(timeWithoutBreak, cfg.takeABreak) as string;
       if (IS_ELECTRON && cfg.takeABreak.isLockScreen) {
         this._triggerLockScreenCounter$.next(true);
       }
@@ -239,7 +241,7 @@ export class TakeABreakService {
     this._triggerLockScreenCounter$.next(false);
   }
 
-  private _createMessage(duration: number, cfg: TakeABreakConfig) {
+  private _createMessage(duration: number, cfg: TakeABreakConfig): string | undefined {
     if (cfg && cfg.takeABreakMessage) {
       const durationStr = msToString(duration);
       return cfg.takeABreakMessage

diff --git a/src/app/features/work-view/work-view.component.ts b/src/app/features/work-view/work-view.component.ts
@@ -21,7 +21,6 @@ import { fadeAnimation } from '../../ui/animations/fade.ani';
 import { PlanningModeService } from '../planning-mode/planning-mode.service';
 import { T } from '../../t.const';
 import { ImprovementService } from '../metric/improvement/improvement.service';
-import { ProjectService } from '../project/project.service';
 import { workViewProjectChangeAnimation } from '../../ui/animations/work-view-project-change.ani';
 import { WorkContextService } from '../work-context/work-context.service';
 
@@ -36,9 +35,9 @@ const PARENT = 'PARENT';
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class WorkViewComponent implements OnInit, OnDestroy, AfterContentInit {
-  @Input() undoneTasks: TaskWithSubTasks[];
-  @Input() doneTasks: TaskWithSubTasks[];
-  @Input() backlogTasks: TaskWithSubTasks[];
+  @Input() undoneTasks: TaskWithSubTasks[] = [];
+  @Input() doneTasks: TaskWithSubTasks[] = [];
+  @Input() backlogTasks: TaskWithSubTasks[] = [];
   @Input() isShowBacklog: boolean = false;
 
   isShowTimeWorkedWithoutBreak: boolean = true;
@@ -66,7 +65,7 @@ export class WorkViewComponent implements OnInit, OnDestroy, AfterContentInit {
     switchMap((el) => fromEvent(el, 'scroll')),
   );
   private _subs: Subscription = new Subscription();
-  private _switchListAnimationTimeout: number;
+  private _switchListAnimationTimeout?: number;
 
   constructor(
     public taskService: TaskService,
@@ -95,15 +94,15 @@ export class WorkViewComponent implements OnInit, OnDestroy, AfterContentInit {
       this._dragulaService.createGroup(SUB, {
         direction: 'vertical',
         moves: (el, container, handle) => {
-          return handle.className.indexOf && handle.className.indexOf('handle-sub') > -1;
+          return !!handle && handle.className.indexOf && handle.className.indexOf('handle-sub') > -1;
         }
       });
     }
     if (!par) {
       this._dragulaService.createGroup(PARENT, {
         direction: 'vertical',
         moves: (el, container, handle) => {
-          return handle.className.indexOf && handle.className.indexOf('handle-par') > -1;
+          return !!handle && handle.className.indexOf && handle.className.indexOf('handle-par') > -1;
         }
       });
     }