From c43f7b458a218f5359e1762eea147b269f4424b7 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 27 Sep 2022 14:52:01 +0100
Subject: [PATCH] improve

---
 .dockerignore                                 |  1 -
 dockerfile                                    | 22 +++++++++----------
 src/app/pages/chat/chat.page.html             |  4 ++--
 src/app/pages/login/login.page.ts             |  4 +++-
 src/app/services/chat/room.service.ts         |  8 +++----
 .../services/chat/ws-chat-methods.service.ts  | 11 +++++-----
 .../chat-debugging/chat-debugging.page.html   |  2 +-
 7 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index c4b1a684d..cbf42b71f 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -18,7 +18,6 @@
 **/Dockerfile*
 **/node_modules
 **/npm-debug.log
-**/www
 **/secrets.dev.yaml
 **/values.dev.yaml
 LICENSE
diff --git a/dockerfile b/dockerfile
index 719543f90..750b12e42 100644
--- a/dockerfile
+++ b/dockerfile
@@ -1,15 +1,15 @@
-FROM node:14 as build
-WORKDIR /app
-COPY ./package*.json /app/
-RUN npm config set unsafe-perm true
-RUN npm install -g ionic
-RUN npm config set legacy-peer-deps true
-RUN npm i -D typescript@4.3.5
-RUN npm install --save --legacy-peer-deps
-COPY ./ /app/
-RUN ionic build --prod
+# FROM node:14 as build
+# WORKDIR /app
+# COPY ./package*.json /app/
+# RUN npm config set unsafe-perm true
+# RUN npm install -g ionic
+# RUN npm config set legacy-peer-deps true
+# RUN npm i -D typescript@4.3.5
+# RUN npm install --save --legacy-peer-deps
+# COPY ./ /app/
+# RUN ionic build --prod
 
 FROM nginx:alpine
 COPY ./nginx/default.conf /etc/nginx/conf.d/default.conf
 RUN rm -rf /usr/share/nginx/html/*
-COPY --from=build /app/www/ /usr/share/nginx/html/
\ No newline at end of file
+COPY /www/ /usr/share/nginx/html/
\ No newline at end of file
diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index e7f073030..4c473fd14 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -18,9 +18,9 @@
             </div>
             <div class="div-icon">
 
-              <!-- <button (click)="openChatDebuggingPageModal()" title="Nova Conversa Individual" class="btn-no-color font-12">
+              <button (click)="openChatDebuggingPageModal()" title="Nova Conversa Individual" class="btn-no-color font-12">
                 Dev
-              </button> -->
+              </button>
               <button title="Nova Conversa Individual" class="btn-no-color" (click)="openContactsPage()">
                 <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src="assets/images/icons-chat-new-conversation.svg"></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src="assets/images/theme/gov/icons-chat-new-conversation.svg"></ion-icon>
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 6a576a779..ec6d1397b 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -159,7 +159,9 @@ export class LoginPage implements OnInit {
             if(attempt.ChatData) {
               await this.authService.loginChat(attempt.ChatData.data); 
               await this.authService.loginToChatWs();
-              this.ChatService.setheader()
+              this.ChatService.setheader();
+              this.ChatService.refreshtoken();
+              this.WsChatMethodsService.ReLoadChat();
             }
 
             this.getToken();
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 0f5e0febe..91f55dd47 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -669,8 +669,7 @@ export class RoomService {
 
       const messages = await MessageModel.filter({rid:this.id}).execute()
 
-      await messages.forEach( async (ChatMessage, index) => {
-
+      for (let  ChatMessage of messages) { 
         const wewMessage = await this.simplePrepareMessage(ChatMessage)
 
         if(wewMessage.offline == false) {
@@ -694,9 +693,8 @@ export class RoomService {
         if(wewMessage.delate && !wewMessage.offline && !wewMessage.delateRequest) {
           this.sendDeleteRequest(wewMessage._id)
         }
-
-      });
-
+      }
+      
       setTimeout(()=> {
         this.scrollDown()
       }, 50)
diff --git a/src/app/services/chat/ws-chat-methods.service.ts b/src/app/services/chat/ws-chat-methods.service.ts
index 0f68d0c19..87cb4b3b9 100644
--- a/src/app/services/chat/ws-chat-methods.service.ts
+++ b/src/app/services/chat/ws-chat-methods.service.ts
@@ -153,11 +153,10 @@ export class WsChatMethodsService {
       const rooms = await this.storage.get('Rooms');
 
       
-
       if(rooms) {
-        await rooms.result.update.forEach( async (roomData: room) => {
+        for (let  roomData of rooms.result.update) { 
           await this.prepareRoom(roomData);
-        });
+        }
 
       }
 
@@ -172,7 +171,7 @@ export class WsChatMethodsService {
   async getAllRooms () {
     this.loadingWholeList = true
     const rooms = await this.WsChatService.getRooms();
-    try {
+      try {
       await this.storage.remove('Rooms');
     } catch(e) {}
 
@@ -219,6 +218,7 @@ export class WsChatMethodsService {
 
 
     await this.storage.set('Rooms', rooms);
+    console.log("Done")
 
 
     setTimeout(() => {
@@ -247,7 +247,7 @@ export class WsChatMethodsService {
    */
   subscribeToRoom() {
 
-
+    console.log('subcribe/////////////////////////////////')
     for (const id in this.dm) {
       this.defaultSubtribe(id)
     }
@@ -283,7 +283,6 @@ export class WsChatMethodsService {
    */
   private defaultSubtribe(id: any) {
   
-
     this.WsChatService.streamRoomMessages(id).then((subscription) => {
       const room = this.getRoomById(id);
       room.status.receive.message = true;
diff --git a/src/app/shared/popover/chat-debugging/chat-debugging.page.html b/src/app/shared/popover/chat-debugging/chat-debugging.page.html
index 99ec48fd1..bcb4b7dc5 100644
--- a/src/app/shared/popover/chat-debugging/chat-debugging.page.html
+++ b/src/app/shared/popover/chat-debugging/chat-debugging.page.html
@@ -1,7 +1,7 @@
 <ion-content>
   <ul>
     <li>Chat login</li>
-    <li>Chat user list</li>
+    <li>Chat user list {{ wsChatMethodsService.users | json }}</li>
   </ul>
   <ul>
     <li *ngFor="let room of wsChatMethodsService._dm">chat Name: {{room.name}}; subcribe: {{room.status.receive.message}}; </li>