From 931046cbb3f105e2cdee15fa27d7ab93082805bb Mon Sep 17 00:00:00 2001
From: Tom <mail@goblincaves.com>
Date: Tue, 8 Apr 2025 12:57:08 +0000
Subject: [PATCH] Cleaned up code for redeemable actions.

---
 .../action-item-edit.component.ts             | 22 ++++---
 .../action-list/action-list.component.html    |  2 +-
 .../action-list/action-list.component.ts      | 31 ++-------
 .../actions/actions/actions.component.html    |  8 +--
 src/app/actions/actions/actions.component.ts  | 63 +++++--------------
 .../connection-list.component.scss            | 14 ++---
 src/app/hermes-client.service.ts              |  8 +--
 src/app/keys/key-list/key-list.component.scss | 14 ++---
 .../permission-list.component.scss            | 14 ++---
 src/app/shared/models/redeemable-action.ts    |  1 +
 .../services/redeemable-action.service.ts     |  2 +-
 .../twitch-user-list.component.scss           | 14 ++---
 12 files changed, 72 insertions(+), 121 deletions(-)

diff --git a/src/app/actions/action-item-edit/action-item-edit.component.ts b/src/app/actions/action-item-edit/action-item-edit.component.ts
index fb7c9da..f4b4978 100644
--- a/src/app/actions/action-item-edit/action-item-edit.component.ts
+++ b/src/app/actions/action-item-edit/action-item-edit.component.ts
@@ -28,10 +28,12 @@ import { MatIconModule } from '@angular/material/icon';
 })
 export class ActionItemEditComponent implements OnInit {
   private readonly client = inject(HermesClientService);
-  readonly dialogRef = inject(MatDialogRef<ActionItemEditComponent>);
   private readonly data = inject<{ action: RedeemableAction, actions: RedeemableAction[] }>(MAT_DIALOG_DATA);
+  readonly dialogRef = inject(MatDialogRef<ActionItemEditComponent>);
+
   action = this.data.action;
   actions = this.data.actions;
+
   readonly actionEntries: ({ [key: string]: any[] }) = {
     'SLEEP': [
       {
@@ -272,18 +274,18 @@ export class ActionItemEditComponent implements OnInit {
       return;
     }
 
-    this.action.name = this.formGroup.get('name')!.value!;
-    this.action.type = this.formGroup.get('type')!.value!;
-    this.action.data = {}
-    for (const entry of this.actionEntries[this.action.type]) {
-      this.action.data[entry.key] = entry.control.value!.toString();
-    }
-
     if (!(this.action.type in this.actionEntries)) {
       this.waitForResponse = false;
       return;
     }
 
+    this.action.name = this.formGroup.get('name')!.value!;
+    this.action.type = this.formGroup.get('type')!.value!;
+    this.action.data = {};
+    for (const entry of this.actionEntries[this.action.type]) {
+      this.action.data[entry.key] = entry.control.value!.toString();
+    }
+
     const isNewAction = !this.action.user_id;
     const requestType = isNewAction ? 'create_redeemable_action' : 'update_redeemable_action';
     this.client.first((d: any) => d.op == 4 && d.d.request.type == requestType && d.d.data.name == this.action.name)
@@ -299,8 +301,8 @@ export class ActionItemEditComponent implements OnInit {
         complete: () => this.waitForResponse = false,
       });
     if (isNewAction)
-      this.client.createRedeemableAction(this.action.name, this.action.type, this.action.data);
+      this.client.createRedeemableAction(this.action.name, this.action.type, false, this.action.data);
     else
-      this.client.updateRedeemableAction(this.action.name, this.action.type, this.action.data);
+      this.client.updateRedeemableAction(this.action.name, this.action.type, false, this.action.data);
   }
 }
diff --git a/src/app/actions/action-list/action-list.component.html b/src/app/actions/action-list/action-list.component.html
index 28b824c..a4657e4 100644
--- a/src/app/actions/action-list/action-list.component.html
+++ b/src/app/actions/action-list/action-list.component.html
@@ -1,5 +1,5 @@
 <main>
-  @for (action of actions; track action.name) {
+  @for (action of actions(); track action.name) {
   <button type="button"
           class="container"
           (click)="modify(action)">
diff --git a/src/app/actions/action-list/action-list.component.ts b/src/app/actions/action-list/action-list.component.ts
index 4f23e80..99d32d7 100644
--- a/src/app/actions/action-list/action-list.component.ts
+++ b/src/app/actions/action-list/action-list.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, inject, Input, Output } from '@angular/core';
+import { Component, inject, input } from '@angular/core';
 import { MatListModule } from '@angular/material/list';
 import RedeemableAction from '../../shared/models/redeemable-action';
 import { MatButtonModule } from '@angular/material/button';
@@ -23,16 +23,14 @@ import { MatSelectModule } from '@angular/material/select';
   styleUrl: './action-list.component.scss'
 })
 export class ActionListComponent {
-  @Input() actions: RedeemableAction[] = []
-  @Output() actionsChange = new EventEmitter<RedeemableAction>();
+  actions = input.required<RedeemableAction[]>({ alias: 'actions' });
 
   readonly dialog = inject(MatDialog);
   readonly client = inject(HermesClientService);
 
-  opened = false;
 
   create(): void {
-    this.openDialog({ user_id: '', name: '', type: '', data: {} });
+    this.openDialog({ user_id: '', name: '', type: '', has_message: false, data: {} });
   }
 
   modify(action: RedeemableAction): void {
@@ -40,27 +38,8 @@ export class ActionListComponent {
   }
 
   private openDialog(action: RedeemableAction): void {
-    if (this.opened)
-      return;
-
-    this.opened = true;
-
-    const dialogRef = this.dialog.open(ActionItemEditComponent, {
-      data: { action: { user_id: action.user_id, name: action.name, type: action.type, data: action.data }, actions: this.actions },
-    });
-
-    const isNewAction = action.name.length <= 0;
-    dialogRef.afterClosed().subscribe((result: RedeemableAction | undefined) => {
-      this.opened = false;
-      if (!result)
-        return;
-
-      if (isNewAction) {
-        this.actionsChange.emit(result);
-      } else {
-        action.type = result.type;
-        action.data = result.data;
-      }
+    this.dialog.open(ActionItemEditComponent, {
+      data: { action: { user_id: action.user_id, name: action.name, type: action.type, data: action.data }, actions: this.actions() },
     });
   }
 }
diff --git a/src/app/actions/actions/actions.component.html b/src/app/actions/actions/actions.component.html
index 3e6187f..d7f508a 100644
--- a/src/app/actions/actions/actions.component.html
+++ b/src/app/actions/actions/actions.component.html
@@ -6,7 +6,7 @@
       <mat-form-field subscriptSizing="dynamic">
         <mat-label>Filter by type</mat-label>
         <mat-select value="0"
-                    (selectionChange)="onFilterChange($event.value)">
+                    (selectionChange)="filter = filters[$event.value]">
           <mat-select-trigger>
             <mat-icon matPrefix>filter_list</mat-icon>&nbsp;{{filter.name}}
           </mat-select-trigger>
@@ -22,13 +22,11 @@
         <input matInput
                type="text"
                placeholder="Name of action"
-               [formControl]="searchControl"
-               [(ngModel)]="search">
+               [formControl]="searchControl" />
         <mat-icon matPrefix>search</mat-icon>
       </mat-form-field>
     </article>
   </section>
   <action-list class="list center"
-               [actions]="actions"
-               (actionsChange)="items.push($event)" />
+               [actions]="actions" />
 </content>
\ No newline at end of file
diff --git a/src/app/actions/actions/actions.component.ts b/src/app/actions/actions/actions.component.ts
index dbd4a7f..06eea2f 100644
--- a/src/app/actions/actions/actions.component.ts
+++ b/src/app/actions/actions/actions.component.ts
@@ -1,4 +1,4 @@
-import { Component, Inject, inject, OnInit } from '@angular/core';
+import { Component, inject, OnDestroy, OnInit } from '@angular/core';
 import { ActionListComponent } from "../action-list/action-list.component";
 import { MatSelectModule } from '@angular/material/select';
 import { MatFormFieldModule } from '@angular/material/form-field';
@@ -10,7 +10,8 @@ import { FormControl, ReactiveFormsModule } from '@angular/forms';
 import { ActivatedRoute } from '@angular/router';
 import RedeemableActionService from '../../shared/services/redeemable-action.service';
 import { MatButtonModule } from '@angular/material/button';
-import { DOCUMENT } from '@angular/common';
+import { containsLettersInOrder } from '../../shared/utils/string-compare';
+import { Subscription } from 'rxjs';
 
 interface IActionFilter {
   name: string
@@ -32,7 +33,7 @@ interface IActionFilter {
   templateUrl: './actions.component.html',
   styleUrl: './actions.component.scss'
 })
-export class ActionsComponent implements OnInit {
+export class ActionsComponent implements OnInit, OnDestroy {
   filters: IActionFilter[] = [
     { name: 'All', filter: _ => true },
     { name: 'Local File', filter: data => data.type.includes('_FILE') },
@@ -47,58 +48,28 @@ export class ActionsComponent implements OnInit {
   private readonly redeemableActionService = inject(RedeemableActionService);
   private readonly route = inject(ActivatedRoute);
 
-  filter = this.filters[0];
-  searchControl = new FormControl('');
-  search = '';
-  items: RedeemableAction[] = [];
+  private readonly subscriptions: (Subscription | undefined)[] = [];
 
-  constructor(@Inject(DOCUMENT) private document: Document) { }
+  filter = this.filters[0];
+  searchControl = new FormControl<string>('');
+  _actions: RedeemableAction[] = [];
 
 
   ngOnInit(): void {
-    this.route.data.subscribe(data => {
-      if (!data['redeemableActions'])
-        return;
+    this.route.data.subscribe(data => this._actions = data['redeemableActions'] || []);
 
-      this.actions = [...data['redeemableActions']];
-    });
-    this.redeemableActionService.create$?.subscribe(d => {
-      if (d.error || d.request.nounce != null && d.request.nounce.startsWith(this.client.session_id))
-        return;
-
-      this.actions.push(d.data);
-    });
-    this.redeemableActionService.update$?.subscribe(d => {
-      if (d.error || d.request.nounce != null && d.request.nounce.startsWith(this.client.session_id))
-        return;
-
-      const action = this.actions.find(a => a.name == d.data.name);
-      if (action) {
-        action.type = d.data.type;
-        action.data = d.data.data;
-      }
-    });
-    this.redeemableActionService.delete$?.subscribe(d => {
-      if (d.error)
-        return;
-
-      this.items = this.actions.filter(a => a.name != d.request.data.name);
-    });
+    this.subscriptions.push(this.redeemableActionService.delete$?.subscribe(_ => this.redeemableActionService.fetch().subscribe(a => this._actions = a)));
 
     this.client.fetchRedeemableActions();
   }
 
+  ngOnDestroy(): void {
+    this.subscriptions.filter(s => s).forEach(s => s?.unsubscribe());
+  }
+
   get actions(): RedeemableAction[] {
-    const searchLower = this.search.toLowerCase();
-    return this.items.filter(this.filter.filter)
-      .filter((action) => action.name.toLowerCase().includes(searchLower));
-  }
-
-  set actions(value) {
-    this.items = value;
-  }
-
-  onFilterChange(event: any): void {
-    this.filter = this.filters[event];
+    const searchLower = this.searchControl.value!.toLowerCase();
+    return this._actions.filter(this.filter.filter)
+      .filter((action) => containsLettersInOrder(action.name.toLowerCase(), searchLower));
   }
 }
diff --git a/src/app/connections/connection-list/connection-list.component.scss b/src/app/connections/connection-list/connection-list.component.scss
index e3e4013..482135a 100644
--- a/src/app/connections/connection-list/connection-list.component.scss
+++ b/src/app/connections/connection-list/connection-list.component.scss
@@ -1,6 +1,13 @@
 @use '@angular/material' as mat;
 
 ul {
+  background-color: rgb(202, 68, 255);
+  border-radius: 15px;
+  margin: 0 0;
+  padding: 0;
+  max-width: 500px;
+  overflow: hidden;
+
   @include mat.all-component-densities(-5);
 
   @include mat.form-field-overrides((
@@ -8,13 +15,6 @@ ul {
     outlined-focus-label-text-color: rgb(155, 57, 194),
     outlined-focus-outline-color: rgb(155, 57, 194),
   ));
-
-  background-color: rgb(202, 68, 255);
-  border-radius: 15px;
-  margin: 0 0;
-  padding: 0;
-  max-width: 500px;
-  overflow: hidden;
 }
 
 ul li {
diff --git a/src/app/hermes-client.service.ts b/src/app/hermes-client.service.ts
index d32be0c..d872e90 100644
--- a/src/app/hermes-client.service.ts
+++ b/src/app/hermes-client.service.ts
@@ -156,14 +156,14 @@ export class HermesClientService {
     });
   }
 
-  public createRedeemableAction(name: string, type: string, d: { [key: string]: any }) {
+  public createRedeemableAction(name: string, type: string, has_message: boolean, d: { [key: string]: any }) {
     if (!this.logged_in)
       return;
 
     this.send(3, {
       request_id: null,
       type: "create_redeemable_action",
-      data: { name, type, data: d },
+      data: { name, type, has_message, data: d },
       nounce: this.session_id,
     });
   }
@@ -439,14 +439,14 @@ export class HermesClientService {
     });
   }
 
-  public updateRedeemableAction(name: string, type: string, d: { [key: string]: any }) {
+  public updateRedeemableAction(name: string, type: string, has_message: boolean, d: { [key: string]: any }) {
     if (!this.logged_in)
       return;
 
     this.send(3, {
       request_id: null,
       type: "update_redeemable_action",
-      data: { name, type, data: d },
+      data: { name, type, has_message, data: d },
       nounce: this.session_id,
     });
   }
diff --git a/src/app/keys/key-list/key-list.component.scss b/src/app/keys/key-list/key-list.component.scss
index 7d3fc2c..3bb7d8d 100644
--- a/src/app/keys/key-list/key-list.component.scss
+++ b/src/app/keys/key-list/key-list.component.scss
@@ -1,6 +1,13 @@
 @use '@angular/material' as mat;
 
 ul {
+  background-color: rgb(202, 68, 255);
+  border-radius: 15px;
+  margin: 0 0;
+  padding: 0;
+  max-width: 600px;
+  overflow: hidden;
+
   @include mat.all-component-densities(-5);
 
   @include mat.form-field-overrides((
@@ -8,13 +15,6 @@ ul {
     outlined-focus-label-text-color: rgb(155, 57, 194),
     outlined-focus-outline-color: rgb(155, 57, 194),
   ));
-
-  background-color: rgb(202, 68, 255);
-  border-radius: 15px;
-  margin: 0 0;
-  padding: 0;
-  max-width: 600px;
-  overflow: hidden;
 }
 
 ul li {
diff --git a/src/app/permissions/permission-list/permission-list.component.scss b/src/app/permissions/permission-list/permission-list.component.scss
index e3e4013..482135a 100644
--- a/src/app/permissions/permission-list/permission-list.component.scss
+++ b/src/app/permissions/permission-list/permission-list.component.scss
@@ -1,6 +1,13 @@
 @use '@angular/material' as mat;
 
 ul {
+  background-color: rgb(202, 68, 255);
+  border-radius: 15px;
+  margin: 0 0;
+  padding: 0;
+  max-width: 500px;
+  overflow: hidden;
+
   @include mat.all-component-densities(-5);
 
   @include mat.form-field-overrides((
@@ -8,13 +15,6 @@ ul {
     outlined-focus-label-text-color: rgb(155, 57, 194),
     outlined-focus-outline-color: rgb(155, 57, 194),
   ));
-
-  background-color: rgb(202, 68, 255);
-  border-radius: 15px;
-  margin: 0 0;
-  padding: 0;
-  max-width: 500px;
-  overflow: hidden;
 }
 
 ul li {
diff --git a/src/app/shared/models/redeemable-action.ts b/src/app/shared/models/redeemable-action.ts
index 7a0d1f3..4e961b9 100644
--- a/src/app/shared/models/redeemable-action.ts
+++ b/src/app/shared/models/redeemable-action.ts
@@ -2,5 +2,6 @@ export default interface RedeemableAction {
   user_id: string;
   name: string;
   type: string;
+  has_message: boolean;
   data: any;
 }
\ No newline at end of file
diff --git a/src/app/shared/services/redeemable-action.service.ts b/src/app/shared/services/redeemable-action.service.ts
index b1e33e2..ee5ca6c 100644
--- a/src/app/shared/services/redeemable-action.service.ts
+++ b/src/app/shared/services/redeemable-action.service.ts
@@ -22,7 +22,7 @@ export default class RedeemableActionService {
     this.update$ = this.client.filterByRequestType('update_redeemable_action');
     this.delete$ = this.client.filterByRequestType('delete_redeemable_action');
 
-    this.create$?.subscribe(d => this.data.push(d.data));
+    this.create$?.subscribe(d =>  {this.data.push(d.data); console.log('action service add:', d.data) });
     this.update$?.subscribe(d => {
       const action = this.data.find(r => r.name == d.data.name);
       if (action) {
diff --git a/src/app/twitch-users/twitch-user-list/twitch-user-list.component.scss b/src/app/twitch-users/twitch-user-list/twitch-user-list.component.scss
index e3e4013..482135a 100644
--- a/src/app/twitch-users/twitch-user-list/twitch-user-list.component.scss
+++ b/src/app/twitch-users/twitch-user-list/twitch-user-list.component.scss
@@ -1,6 +1,13 @@
 @use '@angular/material' as mat;
 
 ul {
+  background-color: rgb(202, 68, 255);
+  border-radius: 15px;
+  margin: 0 0;
+  padding: 0;
+  max-width: 500px;
+  overflow: hidden;
+
   @include mat.all-component-densities(-5);
 
   @include mat.form-field-overrides((
@@ -8,13 +15,6 @@ ul {
     outlined-focus-label-text-color: rgb(155, 57, 194),
     outlined-focus-outline-color: rgb(155, 57, 194),
   ));
-
-  background-color: rgb(202, 68, 255);
-  border-radius: 15px;
-  margin: 0 0;
-  padding: 0;
-  max-width: 500px;
-  overflow: hidden;
 }
 
 ul li {