UI WIP

client/stillbox/src/app/prefs/prefs.service.ts

@@ -1,16 +1,18 @@
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import {
-  BehaviorSubject,
+  map,
-  concatMap,
   Observable,
   ReplaySubject,
-  share,
   shareReplay,
   Subscription,
   switchMap,
 } from 'rxjs';
 
+export interface UserSysPreferences {
+  userPrefs: Preferences;
+  sysPrefs: Preferences;
+}
 export interface Preferences {
   [key: string]: any;
 }
@@ -28,8 +30,8 @@ function mapToObj(map: Map<any, any>): { [key: string]: any } {
 })
 export class PrefsService {
   private readonly _getPref = new Map<string, ReplaySubject<any>>();
-  prefs$: Observable<Preferences>;
+  prefs$: Observable<UserSysPreferences>;
-  last!: Preferences;
+  last!: UserSysPreferences;
   subscriptions = new Subscription();
 
   constructor(private http: HttpClient) {
@@ -57,19 +59,23 @@ export class PrefsService {
             }
           });
         } else {
-          this.last = {};
+          this.last = <UserSysPreferences>{};
         }
       }),
     );
   }
 
-  fetch(): Observable<Preferences> {
+  fetch(): Observable<UserSysPreferences> {
-    return this.http.get<Preferences>('/api/user/prefs/stillbox');
+    return this.http.get<UserSysPreferences>('/api/prefs/stillbox');
   }
 
   get(k: string): Observable<any> {
     if (!this._getPref.get(k)) {
       return this.prefs$.pipe(
+        map((res) => {
+          let rv = <Preferences>res.sysPrefs;
+          return <Preferences>mergeDeep(rv, res.userPrefs);
+        }),
         switchMap((pref) => {
           let ns = new ReplaySubject<any>(1);
           ns.next(pref ? pref[k] : null);
@@ -82,14 +88,48 @@ export class PrefsService {
   }
 
   set(pref: string, value: any) {
-    this.last[pref] = value;
+    this.last.userPrefs[pref] = value;
     let ex = this._getPref.get(pref);
-    if (!ex) {
+    if (ex == null) {
       ex = new ReplaySubject<any>(1);
       this._getPref.set(pref, ex);
     }
+    console.log("set", pref, value);
     this.http
-      .put<Preferences>('/api/user/prefs/stillbox', this.last)
+      .put<Preferences>('/api/prefs/stillbox', this.last.userPrefs)
       .subscribe((ev) => {});
+    console.log("set", pref, value);
   }
 }
+
+/**
+ * Simple object check.
+ * @param item
+ * @returns {boolean}
+ */
+export function isObject(item: any): boolean {
+  return (item && typeof item === 'object' && !Array.isArray(item));
+}
+
+/**
+ * Deep merge two objects.
+ * @param target
+ * @param ...sources
+ */
+export function mergeDeep(target: any, ...sources: any): any {
+  if (!sources.length) return target;
+  const source = sources.shift();
+
+  if (isObject(target) && isObject(source)) {
+    for (const key in source) {
+      if (isObject(source[key])) {
+        if (!target[key]) Object.assign(target, { [key]: {} });
+        mergeDeep(target[key], source[key]);
+      } else {
+        Object.assign(target, { [key]: source[key] });
+      }
+    }
+  }
+
+  return mergeDeep(target, ...sources);
+}

client/stillbox/src/app/talkgroups/talkgroup-record/talkgroup-record.component.html

@@ -26,7 +26,7 @@
             <mat-label>Group</mat-label
             ><input
               matInput
-              name="tgTroup"
+              name="tgGroup"
               type="text"
               formControlName="tgGroup"
             />