From 5a94aa760b6e24f88f50a1ee3eb2c72997de7822 Mon Sep 17 00:00:00 2001 From: Tom Date: Wed, 15 Jan 2025 19:48:15 +0000 Subject: [PATCH] Fixed Twitch redemptions being stored when switching users. Added form valid check when clicking on save for redemptions. --- .../redemption-item-edit.component.ts | 3 +++ .../shared/services/twitch-redemption.service.ts | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/app/redemptions/redemption-item-edit/redemption-item-edit.component.ts b/src/app/redemptions/redemption-item-edit/redemption-item-edit.component.ts index 254edbc..15d9467 100644 --- a/src/app/redemptions/redemption-item-edit/redemption-item-edit.component.ts +++ b/src/app/redemptions/redemption-item-edit/redemption-item-edit.component.ts @@ -100,6 +100,9 @@ export class RedemptionItemEditComponent implements OnInit { } save() { + if (this.formGroups.invalid) + return; + this.responseError = undefined; const order = this.orderFormControl.value; if (order == null) { diff --git a/src/app/shared/services/twitch-redemption.service.ts b/src/app/shared/services/twitch-redemption.service.ts index b62c55c..4eeb2e1 100644 --- a/src/app/shared/services/twitch-redemption.service.ts +++ b/src/app/shared/services/twitch-redemption.service.ts @@ -3,14 +3,24 @@ import { inject, Injectable } from '@angular/core'; import { environment } from '../../../environments/environment'; import TwitchRedemption from '../models/twitch-redemption'; import { of } from 'rxjs'; +import EventService from './EventService'; @Injectable({ providedIn: 'root' }) export class TwitchRedemptionService { - private http = inject(HttpClient); + private readonly http = inject(HttpClient); + private readonly events = inject(EventService); private twitchRedemptions: TwitchRedemption[] = []; - private loaded = false + private loaded = false; + + + constructor() { + this.events.listen('logoff', () => { + this.twitchRedemptions = []; + this.loaded = false; + }); + } fetch(force: boolean = false) { if (!force && this.loaded)