@chat21/chat21-ionic 3.0.5-9.2 → 3.0.6-2.3

package/src/app/pages/profile-info/profile-info.page.ts

@@ -86,16 +86,18 @@ export class ProfileInfoPage implements OnInit {
   private setUser() {
     // width and height NON sono obbligatori
     this.loggedUser = this.chatManager.getCurrentUser();
-    this.itemAvatar = {
-      imageurl: this.imageRepo.getImagePhotoUrl(this.loggedUser.uid),
-      avatar: this.loggedUser.avatar,
-      color: this.loggedUser.color,
-      online: this.loggedUser.online,
-      lastConnection: this.loggedUser.lastConnection,
-      status: '',
-      width: '100px',
-      height: '100px'
-    };
+    if (this.loggedUser) {
+      this.itemAvatar = {
+        imageurl: this.imageRepo.getImagePhotoUrl(this.loggedUser.uid),
+        avatar: this.loggedUser.avatar,
+        color: this.loggedUser.color,
+        online: this.loggedUser.online,
+        lastConnection: this.loggedUser.lastConnection,
+        status: '',
+        width: '100px',
+        height: '100px'
+      };
+    }
   }
 
 
@@ -121,10 +123,10 @@ export class ProfileInfoPage implements OnInit {
   private setSubscriptions() {
     this.presenceService.userIsOnline(this.loggedUser.uid);
     this.presenceService.lastOnlineForUser(this.loggedUser.uid);
-   
-  
+
+
     const subscribeBSIsOnline = this.presenceService.BSIsOnline.subscribe((data: any) => {
-     this.logger.log('[PROFILE-INFO-PAGE] setSubscriptions $ubscribe to BSIsOnline - data' , data);
+      this.logger.log('[PROFILE-INFO-PAGE] setSubscriptions $ubscribe to BSIsOnline - data', data);
       if (data) {
         const userId = data.uid;
         const isOnline = data.isOnline;
@@ -135,7 +137,7 @@ export class ProfileInfoPage implements OnInit {
     });
 
     const subscribeBSLastOnline = this.presenceService.BSLastOnline.subscribe((data: any) => {
-     this.logger.log('[PROFILE-INFO-PAGE] setSubscriptions $ubscribe to BSLastOnline - data' , data);
+      this.logger.log('[PROFILE-INFO-PAGE] setSubscriptions $ubscribe to BSLastOnline - data', data);
       if (data) {
         const userId = data.uid;
         const timestamp = data.lastOnline;
@@ -150,7 +152,7 @@ export class ProfileInfoPage implements OnInit {
 
 
   userIsOnLine = (userId: string, isOnline: boolean) => {
-   this.logger.log('[PROFILE-INFO-PAGE] userIsOnLine - userId ', userId, ' - isOnline ', isOnline);
+    this.logger.log('[PROFILE-INFO-PAGE] userIsOnLine - userId ', userId, ' - isOnline ', isOnline);
     this.itemAvatar.online = isOnline;
     if (isOnline) {
       this.itemAvatar.status = this.translationMap.get('LABEL_AVAILABLE');
@@ -180,9 +182,9 @@ export class ProfileInfoPage implements OnInit {
 
   /** */
   private unsubescribeAll() {
-   this.logger.log('unsubescribeAll: ', this.subscriptions);
+    this.logger.log('unsubescribeAll: ', this.subscriptions);
     this.subscriptions.forEach((subscription: any) => {
-     this.logger.log('unsubescribe: ', subscription);
+      this.logger.log('unsubescribe: ', subscription);
       // this.events.unsubscribe(subscription, null);
     });
     this.subscriptions = [];
@@ -207,15 +209,15 @@ export class ProfileInfoPage implements OnInit {
   }
 
   copyLoggedUserUID() {
-    var copyText = document.createElement("input");                  
+    var copyText = document.createElement("input");
     copyText.setAttribute("type", "text");
     copyText.setAttribute("value", this.loggedUser.uid);
-     
-    document.body.appendChild(copyText); 
+
+    document.body.appendChild(copyText);
     copyText.select();
     copyText.setSelectionRange(0, 99999); /*For mobile devices*/
     document.execCommand("copy");
-   this.logger.log("Copied the text: " + copyText.value);
+    this.logger.log("Copied the text: " + copyText.value);
     const tootipElem = <HTMLElement>document.querySelector('.chat-tooltip');
     this.renderer.appendChild(tootipElem, this.renderer.createText('Copied!'))
 

package/src/app/pages/unassigned-conversations/unassigned-conversations.page.html

@@ -1,6 +1,11 @@
 <ion-header>
   <ion-toolbar>
-    <ion-title>{{translationMap?.get('NewConversations') }}</ion-title>
+    <ion-title *ngIf="callerBtn !== 'pinbtn'" style="font-size: 16px;">
+      {{translationMap?.get('UnassignedConversations') }}
+    </ion-title>
+    <ion-title *ngIf="callerBtn === 'pinbtn'" style="font-size: 16px;">
+      {{translationMap?.get('PIN_A_PROJECT') }}
+    </ion-title>
     <ion-buttons slot="end">
       <ion-button ion-button fill="clear" (click)="onClose()">
         <ion-icon slot="icon-only" name="close"></ion-icon>
@@ -9,14 +14,14 @@
   </ion-toolbar>
 </ion-header>
 
-<ion-content overflow-scroll="true" id="iframe-ion-content" 
-[ngClass]="{'ion-content-black-background' : isProjectsForPanel === true}">
+<ion-content overflow-scroll="true" id="iframe-ion-content"
+  [ngClass]="{'ion-content-black-background' : isProjectsForPanel === true}">
   <!-- <iframe  id="i_frame"  style="width:100%; height:99%" frameBorder="0" allowfullscreen [src]="unassigned_convs_url_sanitized"></iframe> -->
-  <!-- <div class="stretchspinner-unassigned-convs">
-    <div class="rect1"></div>
-    <div class="rect2"></div>
-    <div class="rect3"></div>
-    <div class="rect4"></div>
-    <div class="rect5"></div>
-  </div> -->
-</ion-content>
+  <div class="loader-spinner-wpr">
+    <div id="loader" class="loader">
+      <svg class="circular" viewBox="25 25 50 50">
+        <circle class="path" cx="50" cy="50" r="20" fill="none" stroke-width="2" stroke-miterlimit="10" />
+      </svg>
+    </div>
+  </div>
+</ion-content>

package/src/app/pages/unassigned-conversations/unassigned-conversations.page.scss

@@ -1,79 +1,173 @@
 .ion-content-black-background {
---background: #2d323e	
+  --background: #2d323e;
 }
 
 // -------------------------------------------------
 // stretch spinner https://tobiasahlin.com/spinkit/
 // -------------------------------------------------
 .stretchspinner-unassigned-convs {
-    margin: 100px auto;
-    width: 50px;
-    height: 40px;
-    text-align: center;
-    font-size: 10px;
-    position: absolute;
-    margin: auto;
-    top: 0;
-    left: 0;
-    bottom: 0;
-    right: 0;
+  // margin: 100px auto;
+  width: 50px;
+  height: 40px;
+  text-align: center;
+  font-size: 10px;
+  position: absolute;
+  margin: auto;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  right: 0;
+}
+
+.stretchspinner-unassigned-convs > div {
+  background-color: #3ea9f5;
+  height: 100%;
+  width: 6px;
+  display: inline-block;
+
+  -webkit-animation: sk-stretchdelay 1.2s infinite ease-in-out;
+  animation: sk-stretchdelay 1.2s infinite ease-in-out;
+}
+
+.stretchspinner-unassigned-convs .rect2 {
+  -webkit-animation-delay: -1.1s;
+  animation-delay: -1.1s;
+}
+
+.stretchspinner-unassigned-convs .rect3 {
+  -webkit-animation-delay: -1s;
+  animation-delay: -1s;
+}
+
+.stretchspinner-unassigned-convs .rect4 {
+  -webkit-animation-delay: -0.9s;
+  animation-delay: -0.9s;
+}
+
+.stretchspinner-unassigned-convs .rect5 {
+  -webkit-animation-delay: -0.8s;
+  animation-delay: -0.8s;
+}
+
+@-webkit-keyframes sk-stretchdelay {
+  0%,
+  40%,
+  100% {
+    -webkit-transform: scaleY(0.4);
+  }
+  20% {
+    -webkit-transform: scaleY(1);
+  }
+}
+
+@keyframes sk-stretchdelay {
+  0%,
+  40%,
+  100% {
+    transform: scaleY(0.4);
+    -webkit-transform: scaleY(0.4);
+  }
+  20% {
+    transform: scaleY(1);
+    -webkit-transform: scaleY(1);
+  }
+}
+
+// -------------------------------------------------
+// Loader as in dashboard
+// -------------------------------------------------
+.loader {
+  margin: 0 auto;
+  width: 60px;
+  position: absolute;
+  display: block;
+  left: 0;
+  right: 0;
+  z-index: 1;
+  // @include transform-translate-y(-50%);
+  -webkit-transform: translateY(-50%);
+  -moz-transform: translateY(-50%);
+  -ms-transform: translateY(-50%);
+  transform: translateY(-50%);
+  text-align: center;
+  top: 50%;
+
+  &:before {
+    content: "";
+    display: block;
+    padding-top: 100%;
   }
-  
-  .stretchspinner-unassigned-convs  > div {
-    background-color: #3ea9f5;
-    height: 100%;
-    width: 6px;
-    display: inline-block;
-  
-    -webkit-animation: sk-stretchdelay 1.2s infinite ease-in-out;
-    animation: sk-stretchdelay 1.2s infinite ease-in-out;
+}
+
+.circular {
+  animation: rotate 2s linear infinite;
+  height: 100%;
+  transform-origin: center center;
+  width: 100%;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  margin: auto;
+}
+
+.path {
+  stroke-dasharray: 1, 200;
+  stroke-dashoffset: 0;
+  animation: dash 1.5s ease-in-out infinite, color 2s ease-in-out infinite;
+  stroke-linecap: round;
+}
+
+@keyframes rotate {
+  100% {
+    transform: rotate(360deg);
   }
-  
-  .stretchspinner-unassigned-convs .rect2 {
-    -webkit-animation-delay: -1.1s;
-    animation-delay: -1.1s;
+}
+
+@keyframes dash {
+  0% {
+    stroke-dasharray: 1, 200;
+    stroke-dashoffset: 0;
   }
-  
-  .stretchspinner-unassigned-convs .rect3 {
-    -webkit-animation-delay: -1s;
-    animation-delay: -1s;
+  50% {
+    stroke-dasharray: 89, 200;
+    stroke-dashoffset: -35px;
   }
-  
-  .stretchspinner-unassigned-convs .rect4 {
-    -webkit-animation-delay: -0.9s;
-    animation-delay: -0.9s;
+  100% {
+    stroke-dasharray: 89, 200;
+    stroke-dashoffset: -124px;
   }
-  
-  .stretchspinner-unassigned-convs .rect5 {
-    -webkit-animation-delay: -0.8s;
-    animation-delay: -0.8s;
+}
+
+@keyframes color {
+  100%,
+  0% {
+    stroke: #3ea9f5;
   }
-  
-  @-webkit-keyframes sk-stretchdelay {
-    0%,
-    40%,
-    100% {
-      -webkit-transform: scaleY(0.4);
-    }
-    20% {
-      -webkit-transform: scaleY(1);
-    }
+  50% {
+    stroke: #ff5722;
   }
-  
-  @keyframes sk-stretchdelay {
-    0%,
-    40%,
-    100% {
-      transform: scaleY(0.4);
-      -webkit-transform: scaleY(0.4);
-    }
-    20% {
-      transform: scaleY(1);
-      -webkit-transform: scaleY(1);
-    }
+  100% {
+    stroke: #3ea9f5;
   }
-  
+}
+
+// -------------------------------------
+// Loader spinner wpr
+// -------------------------------------
+.loader-spinner-wpr {
+  text-align: center;
+  // font-size: 10px;
+  position: absolute;
+  margin: auto;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  background: #fff;
+}
 
-  .hide-stretchspinner {
-         display: none;
-  }
+.hide-stretchspinner {
+  display: none;
+}

package/src/app/pages/unassigned-conversations/unassigned-conversations.page.ts

@@ -14,8 +14,12 @@ import { CustomTranslateService } from 'src/chat21-core/providers/custom-transla
 })
 export class UnassignedConversationsPage implements OnInit {
 
-  @Input() unassigned_convs_url: any;
-  unassigned_convs_url_sanitized: any;
+  @Input() iframe_URL: any;
+  @Input() callerBtn: string;
+  // @Input() prjctsxpanel_url: any;
+  // @Input() unassigned_convs_url: any;
+
+  iframe_url_sanitized: any;
   private logger: LoggerService = LoggerInstance.getInstance();
   // has_loaded: boolean;
   ion_content: any;
@@ -32,7 +36,11 @@ export class UnassignedConversationsPage implements OnInit {
   ) { }
 
   ngOnInit() {
-    const keys = ['UnassignedConversations', 'NewConversations'];
+    const keys = [
+      'UnassignedConversations',
+      'NewConversations',
+      'PIN_A_PROJECT'
+    ];
     this.translationMap = this.translateService.translateLanguage(keys);
     this.buildIFRAME();
     this.listenToPostMsg();
@@ -47,14 +55,16 @@ export class UnassignedConversationsPage implements OnInit {
   }
 
   buildIFRAME() {
-    this.logger.log('[UNASSIGNED-CONVS-PAGE] - UNASSIGNED CONVS URL (ngOnInit)', this.unassigned_convs_url);
-    this.unassigned_convs_url_sanitized = this.sanitizer.sanitize(SecurityContext.URL, this.unassigned_convs_url)
-    this.logger.log('[UNASSIGNED-CONVS-PAGE] - UNASSIGNED CONVS URL SANITIZED (ngOnInit)', this.unassigned_convs_url_sanitized);
+    this.logger.log('[UNASSIGNED-CONVS-PAGE] - iframe_URL (ngOnInit)', this.iframe_URL);
+    this.logger.log('[UNASSIGNED-CONVS-PAGE] - callerBtn (ngOnInit)', this.callerBtn);
+
+    this.iframe_url_sanitized = this.sanitizer.sanitize(SecurityContext.URL, this.iframe_URL)
+    this.logger.log('[UNASSIGNED-CONVS-PAGE] - UNASSIGNED CONVS URL SANITIZED (ngOnInit)', this.iframe_url_sanitized);
     // this.has_loaded = false
 
     this.ion_content = document.getElementById("iframe-ion-content");
     this.iframe = document.createElement("iframe");
-    this.iframe.src = this.unassigned_convs_url_sanitized;
+    this.iframe.src = this.iframe_url_sanitized;
     this.iframe.width = "100%";
     this.iframe.height = "99%";
     this.iframe.id = "unassigned-convs-iframe"
@@ -63,23 +73,35 @@ export class UnassignedConversationsPage implements OnInit {
     this.iframe.style.background = "white";
     this.ion_content.appendChild(this.iframe);
 
-    //  this.getIframeHaLoaded()
+    this.getIframeHaLoaded()
+
   }
 
   getIframeHaLoaded() {
     var self = this;
-    var iframe = document.getElementById('unassigned-convs-iframe') as HTMLIFrameElement;;
-    this.logger.log('[APP-STORE-INSTALL] GET iframe ', iframe)
-    if (iframe) {
-      iframe.addEventListener("load", function () {
-        self.logger.log("[APP-STORE-INSTALL] GET - Finish");
-        let spinnerElem = <HTMLElement>document.querySelector('.stretchspinner-unassigned-convs')
+    var iframeWin = document.getElementById('unassigned-convs-iframe') as HTMLIFrameElement;;
+    this.logger.log('[UNASSIGNED-CONVS-PAGE] GET iframe ', iframeWin)
+    if (iframeWin) {
+      iframeWin.addEventListener("load", function () {
+        self.logger.log("[UNASSIGNED-CONVS-PAGE] GET - Finish");
+
+        const isIFrame = (input: HTMLElement | null): input is HTMLIFrameElement =>
+          input !== null && input.tagName === 'IFRAME';
+
+        if (isIFrame(iframeWin) && iframeWin.contentWindow) {
+          const msg = { action: "hidewidget", calledBy: 'unassigned-convs' }
+          iframeWin.contentWindow.postMessage(msg, '*');
+        }
+
+
+        let spinnerElem = <HTMLElement>document.querySelector('.loader-spinner-wpr')
 
         self.logger.log('[APP-STORE-INSTALL] GET iframeDoc readyState spinnerElem', spinnerElem)
         spinnerElem.classList.add("hide-stretchspinner")
 
       });
     }
+
   }
 
   listenToPostMsg() {
@@ -94,18 +116,31 @@ export class UnassignedConversationsPage implements OnInit {
           this.isProjectsForPanel = false;
         }
       }
+
+      if (event.data === 'hasChangedProject') {
+        this.closemodal()
+      }
     });
   }
 
+  public async closemodal() {
+    // const modal = await this.modalController.getTop();
+    // modal.dismiss({
+    //   confirmed: true
+    // });
+    // await this.modalController.dismiss({ confirmed: true });
+    this.onClose()
+
+  }
+
 
   async onClose() {
     this.logger.log('[UNASSIGNED-CONVS-PAGE] - onClose MODAL')
     this.logger.log('[UNASSIGNED-CONVS-PAGE] - onClose MODAL isModalOpened ', await this.modalController.getTop())
     const isModalOpened = await this.modalController.getTop();
-
+    this.logger.log('[UNASSIGNED-CONVS-PAGE] - onClose MODAL isModalOpened ', isModalOpened)
     if (isModalOpened) {
       this.modalController.dismiss({
-
         confirmed: true
       });
     } else {

package/src/app/services/app-config.ts

@@ -29,9 +29,9 @@ export class AppConfigProvider {
 
 
     return this.http.get(this.appConfig.remoteConfigUrl)
-      .toPromise().then((data: any ) => {
+      .toPromise().then((data: any) => {
         // console.log('AppConfigService loadAppConfig data: ', data);
- 
+
         const allconfig = data
         // console.log('[APP-CONFIG-SERVICE] - loadAppConfig allconfig: ', allconfig);
 
@@ -59,22 +59,22 @@ export class AppConfigProvider {
 
             //   // console.log('AppConfigService loadAppConfig allconfig !!!! exist - SERVER_BASE_URL protocol is HTTPS - wsUrl', ws_url);
             // } else {
-            
-            
-              // console.log('AppConfigService loadAppConfig allconfig !!!! exist - SERVER_BASE_URL !!! IS RELATIVE - window.location ', window.location);
 
-              // console.log(window.location)
 
-              if (window.location.protocol === 'http:') {
-                allconfig.wsUrl = 'ws://' + window.location.hostname + allconfig.wsUrlRel
+            // console.log('AppConfigService loadAppConfig allconfig !!!! exist - SERVER_BASE_URL !!! IS RELATIVE - window.location ', window.location);
+
+            // console.log(window.location)
 
-              } else if (window.location.protocol === 'https:') {
+            if (window.location.protocol === 'http:') {
+              allconfig.wsUrl = 'ws://' + window.location.hostname + ':' + window.location.port + allconfig.wsUrlRel
 
-                allconfig.wsUrl = 'wss://' + window.location.hostname + allconfig.wsUrlRel
-              } else {
+            } else if (window.location.protocol === 'https:') {
 
-                allconfig.wsUrl = 'ws://' + window.location.hostname + allconfig.wsUrlRel
-              }
+              allconfig.wsUrl = 'wss://' + window.location.hostname + ':' + window.location.port + allconfig.wsUrlRel
+            } else {
+
+              allconfig.wsUrl = 'ws://' + window.location.hostname + ':' + window.location.port + allconfig.wsUrlRel
+            }
             // }
 
           } else {
@@ -87,7 +87,7 @@ export class AppConfigProvider {
         }
 
         this.appConfig = allconfig;
-      
+
 
       }).catch(err => {
         console.error('error loadAppConfig' + err);