From 2bea0979a775b63d7954f9854bb34a2216ca5461 Mon Sep 17 00:00:00 2001
From: pabloFuente <pablofuenteperez@gmail.com>
Date: Sat, 4 Jul 2026 14:55:50 +0200
Subject: [PATCH] openvidu-testapp: allow removing instances entirely

---
 .../openvidu-instance.component.html          |  3 +++
 .../openvidu-instance.component.ts            | 12 ++++++++-
 .../test-sessions.component.html              |  4 +--
 .../test-sessions/test-sessions.component.ts  | 26 ++++++++++++++++---
 4 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/openvidu-testapp/src/app/components/openvidu-instance/openvidu-instance.component.html b/openvidu-testapp/src/app/components/openvidu-instance/openvidu-instance.component.html
index 893c259d1..fd0f02691 100644
--- a/openvidu-testapp/src/app/components/openvidu-instance/openvidu-instance.component.html
+++ b/openvidu-testapp/src/app/components/openvidu-instance/openvidu-instance.component.html
@@ -67,6 +67,9 @@
               <button class="disconnect-btn" (click)="disconnectRoom()" title="Disconnect room">
                 <mat-icon aria-label="Disconnect button">clear</mat-icon>
               </button>
+              <button class="remove-instance-btn" (click)="remove.emit()" title="Remove instance">
+                <mat-icon aria-label="Remove instance button">delete</mat-icon>
+              </button>
             </div>
           </div>
         </mat-card-header>
diff --git a/openvidu-testapp/src/app/components/openvidu-instance/openvidu-instance.component.ts b/openvidu-testapp/src/app/components/openvidu-instance/openvidu-instance.component.ts
index fb93a30f2..d9710e054 100644
--- a/openvidu-testapp/src/app/components/openvidu-instance/openvidu-instance.component.ts
+++ b/openvidu-testapp/src/app/components/openvidu-instance/openvidu-instance.component.ts
@@ -1,4 +1,11 @@
-import { Component, HostListener, Input, inject } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  HostListener,
+  Input,
+  Output,
+  inject,
+} from '@angular/core';
 import { NgClass, KeyValuePipe } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 
@@ -79,6 +86,9 @@ export class OpenviduInstanceComponent {
   @Input()
   index: number;
 
+  @Output()
+  remove = new EventEmitter<void>();
+
   room?: Room;
   roomEvents: Map<RoomEvent, Boolean> = new Map<RoomEvent, boolean>();
   participantEvents: Map<ParticipantEvent, boolean> = new Map<ParticipantEvent, boolean>();
diff --git a/openvidu-testapp/src/app/components/test-sessions/test-sessions.component.html b/openvidu-testapp/src/app/components/test-sessions/test-sessions.component.html
index 4ed162af1..cdaeccef4 100644
--- a/openvidu-testapp/src/app/components/test-sessions/test-sessions.component.html
+++ b/openvidu-testapp/src/app/components/test-sessions/test-sessions.component.html
@@ -22,8 +22,8 @@
   </div>
 
   <div class="instance-div">
-    @for (user of users; track user; let i = $index) {
-      <app-openvidu-instance @fadeAnimation [attr.id]="'openvidu-instance-' + i" [roomConf]="user" [index]="i">
+    @for (user of users; track user.uid) {
+      <app-openvidu-instance @fadeAnimation [attr.id]="'openvidu-instance-' + user.uid" [roomConf]="user" [index]="user.uid" (remove)="removeUserByUid(user.uid)">
       </app-openvidu-instance>
     }
   </div>
diff --git a/openvidu-testapp/src/app/components/test-sessions/test-sessions.component.ts b/openvidu-testapp/src/app/components/test-sessions/test-sessions.component.ts
index 51433e068..1e6e504af 100644
--- a/openvidu-testapp/src/app/components/test-sessions/test-sessions.component.ts
+++ b/openvidu-testapp/src/app/components/test-sessions/test-sessions.component.ts
@@ -11,6 +11,8 @@ import { OpenviduInstanceComponent } from '../openvidu-instance/openvidu-instanc
 import stringify from 'json-stringify-safe';
 
 export interface RoomConf {
+  // Stable unique id for this instance
+  uid: number;
   subscriber: boolean;
   publisher: boolean;
   startSession: boolean;
@@ -36,6 +38,11 @@ export class TestSessionsComponent {
   // OpenViduInstance collection
   users: RoomConf[] = [];
 
+  // Monotonic counter assigning a stable uid to each instance. Reset only on a
+  // full clear (removeAllUsers / loadScenario), never on individual removals, so
+  // uids are never reused while instances come and go.
+  private nextUid = 0;
+
   numberParticipants = 2;
   autoJoin = false;
 
@@ -54,8 +61,12 @@ export class TestSessionsComponent {
     this.eventsInfoSubscription.unsubscribe();
   }
 
+  private pushUser(conf: Omit<RoomConf, 'uid'>): void {
+    this.users.push({ uid: this.nextUid++, ...conf });
+  }
+
   addUser(): void {
-    this.users.push({
+    this.pushUser({
       subscriber: true,
       publisher: true,
       startSession: false,
@@ -66,13 +77,19 @@ export class TestSessionsComponent {
     this.users.pop();
   }
 
+  // Remove a single instance by its stable uid (emitted by its remove button).
+  removeUserByUid(uid: number): void {
+    this.users = this.users.filter((user) => user.uid !== uid);
+  }
+
   removeAllUsers(): void {
     this.users = [];
+    this.nextUid = 0;
   }
 
   private loadSubsPubs(n: number): void {
     for (let i = 0; i < n; i++) {
-      this.users.push({
+      this.pushUser({
         subscriber: true,
         publisher: true,
         startSession: this.autoJoin,
@@ -82,7 +99,7 @@ export class TestSessionsComponent {
 
   private loadSubs(n: number): void {
     for (let i = 0; i < n; i++) {
-      this.users.push({
+      this.pushUser({
         subscriber: true,
         publisher: false,
         startSession: this.autoJoin,
@@ -92,7 +109,7 @@ export class TestSessionsComponent {
 
   private loadPubs(n: number): void {
     for (let i = 0; i < n; i++) {
-      this.users.push({
+      this.pushUser({
         subscriber: false,
         publisher: true,
         startSession: this.autoJoin,
@@ -102,6 +119,7 @@ export class TestSessionsComponent {
 
   loadScenario(subsPubs: number, pubs: number, subs: number): void {
     this.users = [];
+    this.nextUid = 0;
     this.loadSubsPubs(subsPubs);
     this.loadPubs(pubs);
     this.loadSubs(subs);