remove expired room

src/app/ui/chat/component/messages/contacts/contacts-routing.module.ts

@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-
-import { ContactsPage } from './contacts.page';
-
-const routes: Routes = [
-  {
-    path: '',
-    component: ContactsPage
-  }
-];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
-})
-export class ContactsPageRoutingModule {}

src/app/ui/chat/component/messages/contacts/contacts.module.ts

@@ -1,25 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-
-import { IonicModule } from '@ionic/angular';
-
-import { ContactsPageRoutingModule } from './contacts-routing.module';
-
-import { ContactsPage } from './contacts.page';
-import { SharedModule } from 'src/app/shared/shared.module';
-import { FilterPipe } from 'src/app/pipes/filter.pipe';
-import { PipesModule } from 'src/app/pipes/pipes.module';
-
-@NgModule({
-  imports: [
-    CommonModule,
-    FormsModule,
-    IonicModule,
-    ContactsPageRoutingModule,
-    PipesModule,
-  ],
-  exports: [ContactsPage],
-  declarations: [ContactsPage]
-})
-export class ContactsPageModule {}

src/app/ui/chat/component/messages/contacts/contacts.page.html

@@ -1,49 +0,0 @@
-<ion-header  class="ion-no-border">
-  <ion-toolbar class="header-toolbar">
-    <div class="main-header">
-      <div class="title-content">
-        <div class="back-icon cursor-pointer" (click)="close()">
-          <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
-          <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/doneIt/icons-calendar-arrow-left.svg"></ion-icon>
-          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "  slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
-        </div>
-        <div class="div-title">
-          <!-- Desktop -->
-          <ion-label class="title">Nova Conversa</ion-label>
-        </div>
-      </div>
-    </div>
-  </ion-toolbar>
-  <ion-toolbar class="toolbar-search">
-    <div class="search">
-      <ion-searchbar search-icon="undefined" debounce="500" (ionChange)="onChange($event)" placeholder="Pesquisar por contacto" ></ion-searchbar>
-    </div>
-  </ion-toolbar>
-</ion-header>
-
-<ion-content>
-  <ion-refresher  name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
-    <!-- <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar> -->
-    <ion-refresher-content>
-    </ion-refresher-content>
-  </ion-refresher>
-
-  <div class="main-content">
-    <ion-progress-bar class="position-absolute" type="indeterminate" *ngIf="loading"></ion-progress-bar>
-    <ion-virtual-scroll [items]="userList" approxItemHeight="70px" [headerFn]="separateLetter">
-
-      <div class="item-divider" *virtualHeader="let header">
-        <ion-label>{{ header }}</ion-label>
-      </div>
-
-      <div (click)="openMessagesPage(user.wxFullName, user.wxUserId)" *virtualItem="let user" class="item-user cursor-pointer">
-        <p>{{ user.wxFullName }}</p>
-        <span class="icon">
-          <ion-icon [class]="user.status" slot="end" name="ellipse"></ion-icon>
-        </span>
-      </div>
-
-    </ion-virtual-scroll>
-  </div>
-
-</ion-content>

src/app/ui/chat/component/messages/contacts/contacts.page.scss

@@ -1,136 +0,0 @@
-@import '~src/function.scss';
-
-.header-toolbar{
-    --background:transparent;
-    --opacity: 1;
- 
-   .main-header{
-     width: 100%;
-     height: 100%;
-     font-family: Roboto;
-     border-top-left-radius: 25px;
-     border-top-right-radius: 25px;
-     background-color: #fff;
-     overflow:hidden;
-     padding: 30px 20px 0px 20px;
-     color:#000;
-     transform: translate3d(0, 1px, 0);
- 
-     .div-icon{
-       width: rem(40);
-       float: right;
-       font-size: rem(35);
-       overflow: auto;
-       padding: 1px;
-     }
-     .div-icon ion-icon{
-       float: right;
-       padding-left: 20px;
-     }
-       .title-content{
-         margin: 0px auto;
-         overflow: auto;
-         padding: 0 !important;
-       }
-     
-     .back-icon{
-       width: 37px;
-       float: left;
-       font-size: rem(35);
-       overflow: auto;
-         
-       }
-     .div-title{
-         width: 221px;
-         padding: 0!important;
-         float: left;
-         margin: 2.5px 0 0 5px;
-     }
-     .title{
-         font-size: rem(25);
-     }
-   }
- }
- .toolbar-search{
-   --padding-top:0 !important;
-   --padding-bottom:0 !important;
-   --padding-start:0 !important;
-   --padding-end:0 !important;
-   
-   .search{
-     border: 1px solid #ebebeb;
-     margin: 5px 20px 5px 20px;
-     border-radius: 5px;
-     height: auto;
-     padding: 0 !important;
-   }
-   .search ion-searchbar{
-     /* border: 1px solid green; */
-     width: 100%;
-     margin: 0 !important;
-     padding: 0 !important;
-     --border-radius: 5px;
-     --box-shadow: none;
-     overflow: hidden;
-     --icon-color:var( --font-awesome);
-   }
- 
- }
- ion-content{
-   --background:transparent;
- }
- .main-content{
-  width: 100%;
-  height: 100%;
-  font-family: Roboto;
-  margin: 0 auto;
-  background-color: #fff;
-  padding: 0 0 0 0;
-  overflow:auto;
- 
-     .item-divider{
-       background: #ebebeb;
-       font-size: rem(15);
-       margin: 10px 0 10px 0;
-       padding:5px 0 5px 20px;
-  
-     }
- 
-     .item-user{
-       display: flex;
-       margin: 10px 20px 10px 20px !important;
-       overflow: auto;
-       align-items: center;
-     }
- 
-     .item-user p{
-        display: block;
-        margin: 0 !important;
-        width: 90%;
-        font-size: rem(15);
-        color: var(--title-text-color);
-        float: left;
-     }
-     .item-user .icon{
-        width: 10%;
-        font-size: rem(10);
-        display: block;
-        text-align: right;
-        overflow: auto;
-      }
-      .online{
-        color:#99e47b;
-      }
-     .offline{
-       color:#cbced1;
-      }
-     .away{
-      color:#ffd21f;
-      }
-      .invisible{
-        color:#cbced1;
-      }
-      .busy{
-        color:#f5455c;
-      }
-   }

src/app/ui/chat/component/messages/contacts/contacts.page.spec.ts

@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { IonicModule } from '@ionic/angular';
-
-import { ContactsPage } from './contacts.page';
-
-describe('ContactsPage', () => {
-  let component: ContactsPage;
-  let fixture: ComponentFixture<ContactsPage>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ ContactsPage ],
-      imports: [IonicModule.forRoot()]
-    }).compileComponents();
-
-    fixture = TestBed.createComponent(ContactsPage);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  }));
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

src/app/ui/chat/component/messages/contacts/contacts.page.ts

@@ -1,203 +0,0 @@
-import { HttpHeaders } from '@angular/common/http';
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { ModalController } from '@ionic/angular';
-import { MessagesPage } from '../messages.page';
-import { ThemeService } from 'src/app/services/theme.service'
-// import { ChatSystemService } from 'src/app/services/chat/chat-system.service'
-import { SessionStore } from 'src/app/store/session.service';
-import { ContactRepositoryService } from 'src/app/services/Repositorys/contacts/repository/contacts-repository.service';
-import { UserContacts } from 'src/app/services/Repositorys/contacts/data-source/contacts-data-source.service';
-
-import { HttpErrorResponse } from '@angular/common/http';
-import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
-import { ToastService } from 'src/app/services/toast.service';
-import { ChatServiceService } from 'src/app/module/chat/domain/chat-service.service'
-
-
-class UserToSelect {
-
-}
-
-@Component({
-  selector: 'app-contacts',
-  templateUrl: './contacts.page.html',
-  styleUrls: ['./contacts.page.scss'],
-})
-export class ContactsPage implements OnInit {
-  loggedUser: any;
-
-  headers: HttpHeaders;
-  options: any;
-  textSearch: string;
-  room: any;
-  dm: any;
-  sessionStore = SessionStore
-  loading = false
-  @Input() roomId: string;
-
-  @Output() openMessage: EventEmitter<any> = new EventEmitter<any>();
-  @Output() emptyTextDescriptionOpen: EventEmitter<any> = new EventEmitter<any>();
-  @Output() backToChat: EventEmitter<any> = new EventEmitter<any>();
-  @Output() closeAllDesktopComponents: EventEmitter<any> = new EventEmitter<any>();
-
-  userList: UserContacts[];
-  originalUserList: any[] = [];
-
-  CoolList = []
-
-  constructor(
-    private modalController: ModalController,
-    public ThemeService: ThemeService,
-    // public ChatSystemService: ChatSystemService,
-    private contactsRepositoryService: ContactRepositoryService,
-    private httpErrorHandle: HttpErrorHandle,
-    private toastService: ToastService,
-    private ChatServiceService: ChatServiceService
-  ) {
-    this.loggedUser = SessionStore.user.ChatData['data'];
-    this.textSearch = "";
-    this.dm = null;
-    this.room = null;
-  }
-
-  async ngOnInit() {
-
-    this.loadUsers();
-  }
-
-  onChange(event) {
-    this.textSearch = event.detail.value.toLowerCase();
-    this.userList = this.originalUserList.filter((e) => {
-      const username = e.wxFullName.toLowerCase();
-      return username.includes(this.textSearch);
-    });
-
-    this.userList.sort((a, b) => a.wxFullName.toLowerCase().localeCompare(b.wxFullName.toLowerCase()));
-  }
-
-  openMessagesPage(username: string, wxUserId: number) {
-    this.createRoom(username, wxUserId);
-   /* if (window.innerWidth < 701) {
-      this.createRoom(username);
-    }
-    else {
-       let body = {
-        username: username,
-      }
-
-      this.loading = true
-      this.chatService.createRoom(body).subscribe(res => {
-        this.room = res['room'];
-
-        this.ChatSystemService.getAllRooms(() => {
-          this.openMessage.emit(this.room._id);
-
-          this.loading = false
-        }, this.room._id);
-
-      }, () => {
-        this.loading = false
-      });
-    }*/
-  }
-
-  async loadUsers() {
-    try {
-      let users = await this.contactsRepositoryService.getUsers();
-      if (users.isOk()) {
-        const userData = users.value.data.result;
-        console.log(userData)
-        this.originalUserList = userData;
-        this.userList = [...this.originalUserList];
-        this.userList.sort((a, b) => a.wxFullName.toLowerCase().localeCompare(b.wxFullName.toLowerCase()));
-        console.log('User data loaded successfully:', this.originalUserList);
-      } else {
-        console.error('Failed to fetch users:', users.error);
-      }
-      this.loading = false;
-    } catch (error) {
-      console.error('Error loading users', error);
-      this.loading = false;
-    }
-  }
-
-  separateLetter(record, recordIndex, records) {
-    const normalize = (str) => str.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
-
-    if (recordIndex == 0) {
-      return normalize(record.wxFullName[0]).toUpperCase();
-    }
-
-    let firstPrev = normalize(records[recordIndex - 1].wxFullName[0]).toUpperCase();
-    let firstCurrent = normalize(record.wxFullName[0]).toUpperCase();
-
-    if (firstPrev !== firstCurrent) {
-      return firstCurrent;
-    }
-    return null;
-  }
-
-  doRefresh(event) {
-  }
-
-  close() {
-    if (this.roomId) {
-      this.backToChat.emit({ roomId: this.roomId });
-    } else {
-      this.closeAllDesktopComponents.emit();
-    }
-
-  }
-
-  clicked() {
-
-  }
-
-  async createRoom(username: string, wxUserId: number) {
-    const result = await this.ChatServiceService.createRoom({
-      roomName: username,
-      createdBy: SessionStore.user.UserId,
-      roomType: 0,
-      expirationDate: null,
-      members: [wxUserId]
-    })
-
-
-    console.log(result)
-
-    if(result.isOk()) {
-      await this.ChatServiceService.getRoomById(result.value.id);
-      this.openMessage.emit(result.value.id);
-
-    } else if(result.error instanceof HttpErrorResponse) {
-      this.httpErrorHandle.httpStatusHandle(result.error)
-    } else {
-      this.toastService._badRequest("Pedimos desculpa mas não foi possível executar a acção. Por favor, contacte o apoio técnico.")
-      console.log(result.error)
-    }
-    /*  this.chatService.createRoom(body).subscribe(res => {
-
-       this.room = res['room'];
-       this.openMessagesModal(this.room._id);
-       this.ChatSystemService.getAllRooms()
-     }); */
-  }
-
-  async openMessagesModal(roomId: any) {
-
-
-
-    const modal = await this.modalController.create({
-      component: MessagesPage,
-      cssClass: 'modal modal-desktop isMessagesChatOpened',
-      componentProps: {
-        roomId: roomId,
-      },
-    });
-
-    modal.onDidDismiss();
-    await modal.present();
-  }
-
-
-}

src/app/ui/chat/component/messages/messages-routing.module.ts

@@ -1,21 +1,22 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-
-import { MessagesPage } from './messages.page';
-
-const routes: Routes = [
-  {
-    path: '',
-    component: MessagesPage
-  },
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { MessagesPage } from './messages.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: MessagesPage
+  },
+  {
     path: 'contacts',
-    path: 'contacts',
+    loadChildren: () => import('../contacts/contacts.module').then( m => m.ContactsPageModule)
   }
 
-
-];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
-})
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class MessagesPageRoutingModule {}

src/app/ui/chat/component/messages/messages.page.html

@@ -7,7 +7,7 @@
           <!-- <button (click)="ChatMessageDebuggingPage()">Dev</button> -->
           <span *ngIf="roomStatus$ | async as roomStatus"><ion-icon *ngIf="roomStatus" class="online" name="ellipse"></ion-icon></span>
         </div>
-        <div class="right">
+        <div class="right" *ngIf="roomType == RoomTypeEnum.Group">
           <button title="Menu" class="btn-no-color" (click)="_openMessagesOptions()" >
             <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/theme/blue/icons-menu.svg"></ion-icon>
             <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg">

src/app/ui/chat/component/messages/messages.page.ts

@@ -223,7 +223,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
 
         setTimeout(() => {
           this.subscribeToChanges()
-        }, 500)
+        }, 500);
 
       })
     }
@@ -243,6 +243,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   }
 
   subscribeToChanges() {
+
     this.listenToIncomingMessage();
     this.listenToDeleteMessage();
     this.listenToUpdateMessage();
@@ -281,7 +282,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
 
   removeBold() {
     if(!this.room?.local) {
-      this.chatServiceService.removeBoldFromRoom({roomId: this.room.$id})
+      this.chatServiceService.removeBoldFromRoom({roomId: this.room.id})
     }
   }
 
@@ -329,7 +330,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
       this.date = {}
       const allMessage = [];
 
-      console.time("mappingTime");
+      //console.time("mappingTime");
       const sortMessages = messages.value.sort((a, b) => new Date(a.sentAt).getTime() - new Date(b.sentAt).getTime())
 
       for(const message of sortMessages) {
@@ -342,12 +343,10 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
 
         allMessage.push(new MessageViewModal(message))
       }
-      console.timeEnd("mappingTime");
+      //console.timeEnd("mappingTime");
       this.messages1[this.room.$id]
       this.messages1[this.room.$id] = allMessage
 
-
-
       // if(messages.length >= 1) {
       //   this.messages1[this.room.$id].push(LastMessage)
       // }
@@ -451,7 +450,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
               roomId: this.room.id
             })
           } else {
-            console.log('no need', message )
+            // console.log('no need', message )
           }
         }
       }
@@ -491,7 +490,12 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
         }
       }
 
-      //this.sendReadMessage()
+      this.chatServiceService.sendReadAt({
+        memberId: SessionStore.user.UserId,
+        messageId: message.id,
+        requestId: '',
+        roomId: this.room.id
+      })
 
       setTimeout(() => {
         this.scrollToBottomClicked()
@@ -535,7 +539,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   listenToUpdateMessage() {
     this.messageUpdateSubject?.unsubscribe();
 
-    console.log('liste to update')
+    // console.log('liste to update')
     this.messageUpdateSubject = this.chatServiceService.listenToUpdateMessage(this.room.id).subscribe((updateMessage) => {
 
       const index = this.messages1[this.room.$id].findIndex(e => e?.id === updateMessage.id); // Use triple equals for comparison
@@ -829,14 +833,14 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     if(message.isOk() && this.room.local == IDBoolean.true) {
       this.room.local = IDBoolean.false;
 
-      // console.log('enter')
-      // await this.chatServiceService.roomSetLocalToFalseById({
-      //   $roomId: this.room.$id,
-      //   roomId: message.value.roomId
-      // })
+      console.log('enter')
+      await this.chatServiceService.roomSetLocalToFalseById({
+        $roomId: this.room.$id,
+        roomId: message.value.roomId
+      })
 
       this.room.id = message.value.roomId
-      // this.subscribeToChanges()
+      this.subscribeToChanges()
     }
   }