Fixed NG01002 in settings.component.ts.

Author: Tristan-H11

src/app/api/setting/setting.service.ts

@@ -23,7 +23,7 @@ export class SettingService {
     // requestMany and key check because non-ms requests don't have tags yet
     return this.websocketService.requestMany({action: 'setting', key: key}).pipe(
       first(setting => setting.key === key && typeof setting.value === 'string'),
-      map(setting => setting.value)
+      map(setting => setting.value),
     );
   }
 

src/app/desktop/desktop.component.ts

@@ -50,7 +50,7 @@ export class DesktopComponent implements OnInit {
   ngOnInit(): void {
     this.linkages = this.programService.loadCached();
     this.programService.loadFresh().then(programs => this.linkages = programs);
-    this.settings.backgroundImage.getFresh().then();
+    this.settings.backgroundImage.getFresh().subscribe();
   }
 
   onDesktop(): Program[] {

src/app/desktop/windows/settings/settings-entry.ts

@@ -1,4 +1,6 @@
 import {SettingService} from '../../../api/setting/setting.service';
+import {Observable, of} from "rxjs";
+import {catchError, map} from "rxjs/operators";
 
 export abstract class SettingsEntry<T> {
   protected cached: T;
@@ -18,28 +20,28 @@ export abstract class SettingsEntry<T> {
     }
   }
 
-  async get(): Promise<T> {
+  get(): Observable<T> {
     if (this.cached == null) {
       return this.getFresh();
     } else {
-      return this.cached;
+      return of(this.cached);
     }
   }
 
-  async getFresh(): Promise<T> {
-    this.settingService.get(this.key).subscribe({
-      next: (data: string) => {
-        this.cached = this.deserialize(data);
-      },
-      error: (e: Error) => {
+  getFresh(): Observable<T> {
+    return this.settingService.get(this.key).pipe(
+      map((data: string) => {
+        return this.cached = this.deserialize(data);
+      }),
+      catchError((e) => {
         // @ts-ignore
         if (e.message !== 'unknown setting') {
           console.warn(e);
         }
         this.cached = this.defaultValue;
-      }
-    })
-    return this.cached;
+        return of(this.cached);
+      })
+    );
   }
 
   set(value: T) {

src/app/desktop/windows/settings/settings.component.ts

@@ -3,6 +3,8 @@ import {WindowComponent, WindowConstraints, WindowDelegate} from '../../window/w
 import {SettingsService} from './settings.service';
 import {FormBuilder, FormGroup} from '@angular/forms';
 import {SettingsEntry} from './settings-entry';
+import {forkJoin} from "rxjs";
+import {map} from "rxjs/operators";
 
 @Component({
   selector: 'app-settings',
@@ -37,11 +39,15 @@ export class SettingsComponent extends WindowComponent implements OnInit {
   }
 
   async loadForm() {
-    const value: { [name: string]: unknown } = {};
-    for (const [name, setting] of this.settingEntries) {
-      value[name] = await setting.getFresh();
-    }
-    this.form.setValue(value);
+    forkJoin(this.settingEntries.map(
+      ([name, setting]) => setting.getFresh().pipe(
+        map(value => ({name, value: value ?? setting.defaultValue}))
+      )
+    )).subscribe(values => {
+      const result: { [name: string]: unknown } = {};
+      values.forEach(x => result[x.name] = x.value)
+      this.form.setValue(result);
+    })
   }
 
   async resetSettings() {
@@ -52,6 +58,8 @@ export class SettingsComponent extends WindowComponent implements OnInit {
   }
 
   async saveSettings() {
+    console.log(this.form.value)
+    console.log(this.settingEntries)
     await Promise.all(
       this.settingEntries.map(([name, setting]) => setting.set(this.form.value[name]))
     );

src/app/desktop/windows/terminal/terminal-states.ts

@@ -6,7 +6,7 @@ import {SecurityContext} from '@angular/core';
 import {SettingsService} from '../settings/settings.service';
 import {FileService} from '../../../api/files/file.service';
 import {Path} from '../../../api/files/path';
-import {EMPTY, of} from 'rxjs';
+import {EMPTY, forkJoin, of} from 'rxjs';
 import {Device} from '../../../api/devices/device';
 import {WindowDelegate} from '../../window/window-delegate';
 import {File} from '../../../api/files/file';
@@ -208,7 +208,7 @@ export class DefaultTerminalState extends CommandTerminalState {
               private domSanitizer: DomSanitizer, protected windowDelegate: WindowDelegate, protected activeDevice: Device,
               protected terminal: TerminalAPI, public promptColor: string | null = null) {
     super();
-    this.settings.terminalPromptColor.getFresh().then(() => this.refreshPrompt());
+    this.settings.terminalPromptColor.getFresh().subscribe(() => this.refreshPrompt());
   }
 
   static registerPromptAppenders(element: HTMLElement) {
@@ -461,16 +461,16 @@ export class DefaultTerminalState extends CommandTerminalState {
     files.filter((file) => {
       return file.is_directory;
     }).sort().forEach(folder => {
-      Promise.all([this.settings.terminalLsFolderColor.get(), this.settings.terminalLsPrefix.get()])
-        .then(([folderColor, lsPrefix]) => {
+      forkJoin([this.settings.terminalLsFolderColor.get(), this.settings.terminalLsPrefix.get()])
+        .subscribe(([folderColor, lsPrefix]) => {
           this.terminal.output(`<span style="color: ${folderColor};">${lsPrefix ? '[Folder] ' : ''}${folder.filename}</span>`);
         });
     });
 
     files.filter((file) => {
       return !file.is_directory;
     }).sort().forEach(file => {
-      this.settings.terminalLsPrefix.get().then(lsPrefix =>
+      this.settings.terminalLsPrefix.get().subscribe(lsPrefix =>
         this.terminal.outputText(`${(lsPrefix ? '[File] ' : '')}${file.filename}`)
       );
     });

src/app/websocket.service.ts

@@ -1,6 +1,6 @@
 import {Injectable} from '@angular/core';
 import {webSocket, WebSocketSubject} from 'rxjs/webSocket';
-import {catchError, filter, first, map, mergeMap, switchMap, tap} from 'rxjs/operators';
+import {catchError, first, map, mergeMap, switchMap, tap} from 'rxjs/operators';
 import {firstValueFrom, interval, Observable, of, Subject, throwError} from 'rxjs';
 import {environment} from '../environments/environment';
 import {v4 as randomUUID} from 'uuid';
@@ -111,14 +111,8 @@ export class WebsocketService {
   requestMany(data: any): Observable<any> {
     return interval(50)
       .pipe(
-        filter(() => Boolean(this.socketSubject)),
-        tap(() => {
-          if (this.socketSubject) {
-            this.socketSubject.next(data);
-          } else {
-            this.queue.push(data);
-          }
-        }),
+        first(() => Boolean(this.socketSubject)),
+        tap(() => this.socketSubject.next(data)),
         switchMap(() => this.socketSubject),
         map(checkResponseError),
       );