amigan/stillbox
amigan/stillbox
1
1
Fork 0
Code Issues 33 Pull requests Projects Releases Packages Wiki Activity Actions

Shares #109

Merged
amigan merged 59 commits from shareUI into trunk 2025-02-14 00:25:03 -05:00
Conversation 0 Commits 59 Files changed 82 +2 -9
3 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 5ac0af92f1 - Show all commits

2
client/stillbox/src/app/incidents/incident/incident.component.ts
View file

@ -1,4 +1,4 @@
import { Component, inject } from '@angular/core'; import { Component, inject, Sanitizer } from '@angular/core';
import { tap } from 'rxjs/operators'; import { tap } from 'rxjs/operators';
import { CommonModule, Location } from '@angular/common'; import { CommonModule, Location } from '@angular/common';
import { BehaviorSubject, merge, Subscription } from 'rxjs'; import { BehaviorSubject, merge, Subscription } from 'rxjs';

4
client/stillbox/src/app/talkgroup.ts
View file

@ -91,10 +91,6 @@ export class Talkgroup {
icon?: string, icon?: string,
) { ) {
this.iconSvg = this.iconMap(this.metadata?.icon!); this.iconSvg = this.iconMap(this.metadata?.icon!);
this.alert_rules = this.alert_rules.map((x) =>
Object.assign(new AlertRule(), x),
);
console.log(this.alert_rules);
} }
iconMap(icon: string): string { iconMap(icon: string): string {

5
client/stillbox/src/app/talkgroups/talkgroups.service.ts
View file

@ -33,10 +33,7 @@ export class TalkgroupService {
private subscriptions = new Subscription(); private subscriptions = new Subscription();
constructor(private http: HttpClient) { constructor(private http: HttpClient) {
this.tgs$ = this.fetchAll.pipe(switchMap(() => this.getTalkgroups())); this.tgs$ = this.fetchAll.pipe(switchMap(() => this.getTalkgroups()));
this.tags$ = this.fetchAll.pipe( this.tags$ = this.fetchAll.pipe(switchMap(() => this.getAllTags()), shareReplay());
switchMap(() => this.getAllTags()),
shareReplay(),
);
this.fillTgMap(); this.fillTgMap();
} }