@chat21/chat21-ionic 3.0.97-rc.1 → 3.0.97-rc.3

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # chat21-ionic ver 3.0
 
+### 3.0.97-rc.3
+- added: channel property to message/conversation and changed attributes.channel to attributes.offline_channel for offline message email
+- added: channel info in conversation-header-detail component
+- updated: tiledesk logo
+- bug-fixed: sort last-messages for mqtt before publish to component
+
+### 3.0.97-rc.2
+- added: do not send automatic offline email if conversation is of type 'email' or 'form'
+- added: new tooltip directive
+- added: availability project user status on ProfileInfo page modal
+- added: isOniOSMobileDevice and isOnMobileDevice in utils
+- added: manage css for mobile/desktop modals
+- added: custom tooltip directive
+- changed: lib dependencies
+- bug-fixed: new_message event sounds every time conv.is_new is true or false
+- updated: ios icons
+- removed: ticketing for mobile
+- removed angular2-moment and ng2-tooltip-directive
+
 ### 3.0.97-rc.1
 - added: if user is offline and message is sent, forward the entire conversation by email 
 

package/Dockerfile

@@ -1,7 +1,7 @@
 ### STAGE 1: Build ###
 
 # We label our stage as ‘builder’
-FROM node:10-alpine as builder
+FROM node:14.21.2-alpine as builder
 
 RUN npm install -g ionic cordova@8.0.0
 

package/GoogleService-Info.plist

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CLIENT_ID</key>
+	<string>522823349790-q8m9iherm28n7vl8uo9klqhkt85ohj8g.apps.googleusercontent.com</string>
+	<key>REVERSED_CLIENT_ID</key>
+	<string>com.googleusercontent.apps.522823349790-q8m9iherm28n7vl8uo9klqhkt85ohj8g</string>
+	<key>API_KEY</key>
+	<string>AIzaSyAdGeIFqMHnfTSFsThRoEbaAYKjRaYZbnI</string>
+	<key>GCM_SENDER_ID</key>
+	<string>522823349790</string>
+	<key>PLIST_VERSION</key>
+	<string>1</string>
+	<key>BUNDLE_ID</key>
+	<string>it.chat.ionic</string>
+	<key>PROJECT_ID</key>
+	<string>tiledesk-v3-prod-cf4ff</string>
+	<key>STORAGE_BUCKET</key>
+	<string>tiledesk-v3-prod-cf4ff.appspot.com</string>
+	<key>IS_ADS_ENABLED</key>
+	<false></false>
+	<key>IS_ANALYTICS_ENABLED</key>
+	<false></false>
+	<key>IS_APPINVITE_ENABLED</key>
+	<true></true>
+	<key>IS_GCM_ENABLED</key>
+	<true></true>
+	<key>IS_SIGNIN_ENABLED</key>
+	<true></true>
+	<key>GOOGLE_APP_ID</key>
+	<string>1:522823349790:ios:7ea6d121437c2a441fa00f</string>
+	<key>DATABASE_URL</key>
+	<string>https://tiledesk-v3-prod-cf4ff-default-rtdb.europe-west1.firebasedatabase.app</string>
+</dict>
+</plist>

package/config.xml

@@ -14,6 +14,7 @@
     <allow-intent href="geo:*" />
     <preference name="ScrollEnabled" value="false" />
     <preference name="android-minSdkVersion" value="22" />
+    <preference name="android-targetSdkVersion" value="31" />
     <preference name="BackupWebStorage" value="none" />
     <preference name="SplashMaintainAspectRatio" value="true" />
     <preference name="FadeSplashScreenDuration" value="300" />
@@ -24,6 +25,9 @@
         <edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application" xmlns:android="http://schemas.android.com/apk/res/android">
             <application android:networkSecurityConfig="@xml/network_security_config" />
         </edit-config>
+        <edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application/activity" xmlns:android="http://schemas.android.com/apk/res/android">
+            <activity android:exported="true" />
+        </edit-config>
         <resource-file src="resources/android/xml/network_security_config.xml" target="app/src/main/res/xml/network_security_config.xml" />
         <allow-intent href="market:*" />
         <icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />
@@ -48,11 +52,10 @@
     <platform name="ios">
         <allow-intent href="itms:*" />
         <allow-intent href="itms-apps:*" />
+        <preference name="UseSwiftLanguageVersion" value="5" />
+        <preference name="scheme" value="app" />
         <icon height="57" src="resources/ios/icon/icon.png" width="57" />
         <icon height="114" src="resources/ios/icon/icon@2x.png" width="114" />
-        <icon height="29" src="resources/ios/icon/icon-small.png" width="29" />
-        <icon height="58" src="resources/ios/icon/icon-small@2x.png" width="58" />
-        <icon height="87" src="resources/ios/icon/icon-small@3x.png" width="87" />
         <icon height="20" src="resources/ios/icon/icon-20.png" width="20" />
         <icon height="40" src="resources/ios/icon/icon-20@2x.png" width="40" />
         <icon height="60" src="resources/ios/icon/icon-20@3x.png" width="60" />

package/google-services.json

@@ -0,0 +1,40 @@
+{
+  "project_info": {
+    "project_number": "522823349790",
+    "firebase_url": "https://tiledesk-v3-prod-cf4ff-default-rtdb.europe-west1.firebasedatabase.app",
+    "project_id": "tiledesk-v3-prod-cf4ff",
+    "storage_bucket": "tiledesk-v3-prod-cf4ff.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:522823349790:android:54cf45313fbe20101fa00f",
+        "android_client_info": {
+          "package_name": "chat.ionic"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "522823349790-gsagrbpf0ktecjbm3ec53d4jnunpi4k3.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBI2rc6vHd5VLzptv6ftBya54F-7VNfw6E"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "522823349790-gsagrbpf0ktecjbm3ec53d4jnunpi4k3.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@chat21/chat21-ionic",
     "author": "Tiledesk SRL",
-    "version": "3.0.97-rc.1",
+    "version": "3.0.97-rc.3",
     "license": "MIT License",
     "homepage": "https://tiledesk.com/",
     "repository": {
@@ -23,7 +23,6 @@
         "@angular/common": "~8.2.14",
         "@angular/core": "~8.2.14",
         "@angular/forms": "~8.2.14",
-        "@angular/http": "^7.2.16",
         "@angular/material": "^8.2.3",
         "@angular/platform-browser": "~8.2.14",
         "@angular/platform-browser-dynamic": "~8.2.14",
@@ -43,7 +42,6 @@
         "@ngx-translate/core": "^12.1.2",
         "@ngx-translate/http-loader": "^4.0.0",
         "@types/marked": "^1.1.0",
-        "angular2-moment": "^1.9.0",
         "autolinker": "^3.14.2",
         "cordova-android": "9.1.0",
         "cordova-android-support-gradle-release": "^3.0.1",
@@ -62,16 +60,13 @@
         "firebase": "^8.6.7",
         "marked": "^2.1.3",
         "material-icons": "^1.11.2",
-        "moment": "^2.24.0",
+        "moment": "^2.29.4",
         "moment-timezone": "^0.5.28",
-        "ng-connection-service": "^1.0.4",
-        "ng2-tooltip-directive": "^2.9.22",
-        "ngx-linkifyjs": "^1.3.0",
         "ngx-logger": "^4.2.1",
-        "ngx-perfect-scrollbar": "^9.0.0",
-        "perfect-scrollbar": "^1.5.0",
+        "ngx-moment": "^5.0.0",
         "roboto-fontface": "^0.10.0",
         "rxjs": "~6.5.1",
+        "sharp": "^0.32.0",
         "tslib": "^1.9.0",
         "zone.js": "~0.9.1"
     },
@@ -86,13 +81,13 @@
         "@types/jasminewd2": "~2.0.3",
         "codelyzer": "^5.0.0",
         "cordova-plugin-add-swift-support": "^2.0.2",
-        "jasmine-core": "~3.4.0",
+        "jasmine-core": "~4.4.0",
         "jasmine-spec-reporter": "~4.2.1",
-        "karma": "~4.1.0",
+        "karma": "~6.4.1",
         "karma-chrome-launcher": "~2.2.0",
         "karma-coverage-istanbul-reporter": "~2.0.1",
-        "karma-jasmine": "~2.0.1",
-        "karma-jasmine-html-reporter": "^1.4.0",
+        "karma-jasmine": "~5.1.0",
+        "karma-jasmine-html-reporter": "^2.0.0",
         "protractor": "~5.4.0",
         "ts-node": "~7.0.0",
         "tslint": "~5.15.0",

package/src/app/app-routing.module.ts

@@ -64,11 +64,12 @@ const routes: Routes = [
   {
     path: 'send-email',
     loadChildren: () => import('./modals/send-email/send-email.module').then( m => m.SendEmailModalModule)
-  },
  {
-    path: 'json-message',
-    loadChildren: () => import('./modals/json-message/json-message.module').then( m => m.JsonMessagePageModule)
-  }
-
+  },
+  {
+    path: 'json-message',
+    loadChildren: () => import('./modals/json-message/json-message.module').then( m => m.JsonMessagePageModule)
+  }
+
 
 
 

package/src/app/app.component.html

@@ -25,7 +25,6 @@
       <!--  our side menu  -->
       <!-- <ion-router-outlet id="sidebar" name='sidebar' animated="false" #masterNav> -->
       <!-- <app-conversations-list></app-conversations-list> -->
-      <!-- <app-details></app-details> -->
       <!-- </ion-router-outlet> -->
       <!-- the main content -->
       <!--  -->

package/src/app/app.component.ts

@@ -39,7 +39,7 @@ import { LoginPage } from './pages/authentication/login/login.page';
 import { ConversationListPage } from './pages/conversations-list/conversations-list.page';
 
 // utils
-import { checkPlatformIsMobile, isGroup, getParameterByName, searchIndexInArrayForUid, compareValues, stripTags } from 'src/chat21-core/utils/utils';
+import { checkPlatformIsMobile, isGroup, getParameterByName, searchIndexInArrayForUid, compareValues, stripTags, isOnMobileDevice } from 'src/chat21-core/utils/utils';
 import { STORAGE_PREFIX, PLATFORM_MOBILE, PLATFORM_DESKTOP, CHAT_ENGINE_FIREBASE, AUTH_STATE_OFFLINE, AUTH_STATE_ONLINE } from 'src/chat21-core/utils/constants';
 import { environment } from '../environments/environment';
 import { UserModel } from '../chat21-core/models/user';
@@ -61,6 +61,7 @@ import { filter } from 'rxjs/operators'
 import { WebSocketJs } from './services/websocket/websocket-js';
 import { Location } from '@angular/common'
 import { ScriptService } from './services/scripts/script.service';
+// import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx';
 
 // import { filter } from 'rxjs/operators';
 
@@ -112,7 +113,7 @@ export class AppComponent implements OnInit {
   private version: string;
   public lang: string; 
   IS_ONLINE: boolean;
-  IS_ON_MOBILE_DEVICE: boolean;
+  IS_ON_MOBILE_DEVICE: boolean = true
   SUPPORT_MODE: boolean;
   // private isOnline: boolean = false;
 
@@ -155,25 +156,18 @@ export class AppComponent implements OnInit {
     private networkService: NetworkService,
     public webSocketJs: WebSocketJs,
     public scriptService: ScriptService,
-    public location: Location
+    public location: Location,
+    // private fcm: FCM
   ) {
 
 
     this.saveInStorageNumberOfOpenedChatTab();
     this.listenChatAlreadyOpenWithoutParamsInMobileMode()
-    this.isOnMobileDevice()
+    this.IS_ON_MOBILE_DEVICE = isOnMobileDevice()
     // this.listenToUrlChanges();
     // this.getPageState();
   }
 
-  isOnMobileDevice() {
-    this.IS_ON_MOBILE_DEVICE = false;
-    if (/Android|iPhone/i.test(window.navigator.userAgent)) {
-      this.IS_ON_MOBILE_DEVICE = true;
-    }
-    this.logger.log('[APP-COMP] IS_ON_MOBILE_DEVICE', this.IS_ON_MOBILE_DEVICE)
-    return this.IS_ON_MOBILE_DEVICE;
-  }
 
 
 
@@ -512,6 +506,20 @@ export class AppComponent implements OnInit {
       // Watch to network status
       // ---------------------------------------
       this.watchToConnectionStatus();
+
+
+      // this.fcm.onNotification().subscribe(data => {
+      //   if (data.wasTapped) {
+      //     console.log("Received in background");
+      //   } else {
+      //     console.log("Received in foreground");
+      //   };
+      // });
+
+      // this.fcm.onTokenRefresh().subscribe(token => {
+      //   // Register your new token in your back-end if you want
+      //   // backend.registerToken(token);
+      // });
     });
   }
 
@@ -755,14 +763,23 @@ export class AppComponent implements OnInit {
     } else {
       this.logger.warn('[APP-COMP] >>> I AM NOT LOGGED IN <<<')
       this.IS_ONLINE = false;
-      // clearTimeout(this.timeModalLogin);
-      // this.timeModalLogin = setTimeout(() => {
-      // if (!this.hadBeenCalledOpenModal) {
-      //   this.authModal = this.presentModal('initAuthentication');
-      //   this.hadBeenCalledOpenModal = true;
-      // }
-      this.goToDashboardLogin()
-      // }, 1000);
+
+      if (!this.hadBeenCalledOpenModal) {
+        this.authModal = this.presentModal('initAuthentication');
+        this.hadBeenCalledOpenModal = true;
+      }
+
+      if(this.IS_ON_MOBILE_DEVICE){
+        clearTimeout(this.timeModalLogin);
+        this.timeModalLogin = setTimeout(() => {
+          if (!this.hadBeenCalledOpenModal) {
+            this.authModal = this.presentModal('initAuthentication');
+            this.hadBeenCalledOpenModal = true;
+          }
+        }, 1000)
+      }else{
+        this.goToDashboardLogin()
+      }
     }
   }
 
@@ -785,11 +802,14 @@ export class AppComponent implements OnInit {
       this.logger.log('[APP-COMP] checkPlatformIsMobile', checkPlatformIsMobile());
       this.platformIs = PLATFORM_MOBILE;
       this.logger.log('[APP-COMP] this.platformIs', this.platformIs);
-      const IDConv = this.route.snapshot.firstChild.paramMap.get('IDConv');
+      let IDConv= null
+      if(this.route &&  this.route.snapshot && this.route.snapshot.firstChild){
+        IDConv = this.route.snapshot.firstChild.paramMap.get('IDConv');
+      }
 
-      // console.log('[APP-COMP]  platformIs', this.platformIs);
       // console.log('[APP-COMP] PLATFORM', PLATFORM_MOBILE, 'route.snapshot', this.route.snapshot);
       if (!IDConv) {
+        this.logger.log('[APP-COMP]  navigateByUrl -- conversations-list');
         this.router.navigateByUrl('conversations-list')
       }
       // this.router.navigateByUrl(pageUrl);
@@ -896,7 +916,7 @@ export class AppComponent implements OnInit {
     if(sound_status && sound_status !== 'undefined'){
       this.isSoundEnabled = sound_status === 'enabled'? true: false
     }
-    this.logger.debug('[APP-COMP] manageTabNotification can saund?', this.isInitialized, this.isSoundEnabled)
+    this.logger.debug('[APP-COMP] manageTabNotification can saund?', this.isInitialized, this.isSoundEnabled, sound_type)
     if(this.isInitialized && this.isSoundEnabled) {
       switch(sound_type){
         case 'conv_added': {
@@ -1040,9 +1060,11 @@ export class AppComponent implements OnInit {
       // console.log('[APP-COMP] ***** subscribeConversationChangedDetailed conversation: ', changes);
       const currentUser = this.tiledeskAuthService.getCurrentUser()
       if (currentUser && currentUser !== null) {
-        this.logger.log('[APP-COMP] ***** subscribeConversationChangedDetailed currentUser: ', currentUser);
+        this.logger.log('[APP-COMP] ***** subscribeConversationChangedDetailed currentUser: ', currentUser, changes);
         if (changes.value && changes.value.sender !== currentUser.uid) {
-          if(changes.value.is_new === changes.previousValue.is_new){
+          let checkIfStatusChanged = changes.value.is_new === changes.previousValue.is_new? true: false
+          let checkIfUidChanged = changes.value.uid === changes.previousValue.uid? true: false
+          if(changes.value.is_new && checkIfStatusChanged && checkIfUidChanged){
             this.manageTabNotification('new_message');
           }
         }
@@ -1128,7 +1150,17 @@ export class AppComponent implements OnInit {
     this.chatManager.goOffLine();
 
     this.router.navigateByUrl('conversation-detail/'); //redirect to basePage
-    this.goToDashboardLogin()
+    if(this.IS_ON_MOBILE_DEVICE){
+        clearTimeout(this.timeModalLogin);
+        this.timeModalLogin = setTimeout(() => {
+          if (!this.hadBeenCalledOpenModal) {
+            this.authModal = this.presentModal('initAuthentication');
+            this.hadBeenCalledOpenModal = true;
+          }
+        }, 1000)
+      }else{
+        this.goToDashboardLogin()
+      }
     
 
     // if (!this.hadBeenCalledOpenModal) {

package/src/app/app.module.ts

@@ -14,7 +14,6 @@ import { TranslateLoader, TranslateModule, TranslatePipe } from '@ngx-translate/
 import { TranslateHttpLoader } from '@ngx-translate/http-loader';
 import { HttpClient, HttpClientModule } from '@angular/common/http';
 import { Keyboard } from '@ionic-native/keyboard/ngx';
-import { NgxLinkifyjsModule } from 'ngx-linkifyjs';
 import { Chooser } from '@ionic-native/chooser/ngx';
 import { LoggerModule, NGXLogger, NgxLoggerLevel } from "ngx-logger";
 
@@ -103,19 +102,17 @@ import { ConversationInfoModule } from 'src/app/components/conversation-info/con
 
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
 import { Network } from '@ionic-native/network/ngx';
-import { ConnectionService } from 'ng-connection-service';
 import { WebSocketJs } from './services/websocket/websocket-js';
 import { UnassignedConversationsPageModule } from './pages/unassigned-conversations/unassigned-conversations.module';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 
-
 // FACTORIES
 export function createTranslateLoader(http: HttpClient) {
   return new TranslateHttpLoader(http, './assets/i18n/', '.json');
 
 }
 
-export function authenticationFactory(http: HttpClient, appConfig: AppConfigProvider, chat21Service: Chat21Service, appSorage: AppStorageService, network: Network, connectionService: ConnectionService) {
+export function authenticationFactory(http: HttpClient, appConfig: AppConfigProvider, chat21Service: Chat21Service, appSorage: AppStorageService) {
   const config = appConfig.getConfig()
   if (config.chatEngine === CHAT_ENGINE_MQTT) {
 
@@ -136,7 +133,7 @@ export function authenticationFactory(http: HttpClient, appConfig: AppConfigProv
 
     FirebaseInitService.initFirebase(config.firebaseConfig)
     // console.log('[APP-MOD] FirebaseInitService config ', config)
-    const auth = new FirebaseAuthService(http, network, connectionService);
+    const auth = new FirebaseAuthService(http);
     auth.setBaseUrl(config.apiUrl)
 
     return auth
@@ -292,7 +289,6 @@ const appInitializerFn = (appConfig: AppConfigProvider, logger: NGXLogger) => {
     ScrollbarThemeModule,
     SharedModule,
     ConversationInfoModule,
-    NgxLinkifyjsModule.forRoot(),
     LoaderPreviewPageModule,
     SendEmailModalModule,
     CreateTicketPageModule,
@@ -313,7 +309,7 @@ const appInitializerFn = (appConfig: AppConfigProvider, logger: NGXLogger) => {
     {
       provide: MessagingAuthService,
       useFactory: authenticationFactory,
-      deps: [HttpClient, AppConfigProvider, Chat21Service, AppStorageService, Network, ConnectionService]
+      deps: [HttpClient, AppConfigProvider, Chat21Service, AppStorageService]
     },
     {
       provide: PresenceService,

package/src/app/chatlib/conversation-detail/conversation-content/conversation-content.component.spec.ts

@@ -1,8 +1,6 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { MomentModule } from 'angular2-moment';
-import { TooltipModule } from 'ng2-tooltip-directive';
 import { NGXLogger } from 'ngx-logger';
 import { HtmlEntitiesEncodePipe } from 'src/app/directives/html-entities-encode.pipe';
 import { MarkedPipe } from 'src/app/directives/marked.pipe';
@@ -40,8 +38,6 @@ describe('ConversationContentComponent', () => {
         HtmlEntitiesEncodePipe,
       ],
       imports: [
-        MomentModule,
-        TooltipModule
       ],
       providers: [ 
         UploadService,