@chat21/chat21-ionic 3.0.61-rc19 → 3.0.61-rc23

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # chat21-ionic ver 3.0
 
+
+### 3.0.61-rc23
+- Handles the "SupptMode" environment variable if returned as a string (fixes the Docker image bugs: part of the conversation details go under the sidebar in mobile mode, the "add message as canned response" button is not displayed)
+- Fixes the position of the emoji selection window pop up when the canned responses button is not visible
+
+### 3.0.61-rc22
+- Minor improvements 
+
+### 3.0.61-rc21
+- Removes cordova-plugin-device
+
+### 3.0.61-rc20
+- Updates dependencies
+
 ### 3.0.61-rc19
 - Merge branch 'features/new-sidebar'
 

package/config.xml

@@ -106,7 +106,6 @@
         <variable name="ANDROID_SUPPORT_VERSION" value="27.+" />
     </plugin>
     <plugin name="cordova-plugin-chooser" spec="^1.3.2" />
-    <plugin name="cordova-plugin-device" spec="^2.0.3" />
     <plugin name="cordova-plugin-ionic-keyboard" spec="^2.2.0" />
     <plugin name="cordova-plugin-ionic-webview" spec="^4.2.1">
         <variable name="ANDROID_SUPPORT_ANNOTATIONS_VERSION" value="27.+" />

package/deploy_pre.sh

@@ -27,18 +27,57 @@ sed -i -e "s/$URL_VER/g" src/utils/constants.ts
 
 ionic cordova platform add browser --save
 #ionic cordova build browser --prod --release
-ionic cordova build --env=pre browser #--prod  --verbose
-
+# ionic cordova build --env=pre browser --prod  #--verbose
+ionic cordova build -c=pre  browser --prod
 cp -p src/firebase-messaging-sw.js platforms/browser/www/
 cp -p src/manifest.json platforms/browser/www/
 cp -p src/chat-config.json platforms/browser/www/
+cp -p config.xml platforms/browser/www/
+ 
+######### chat-ionic5 - the good one - publish in pre
+# cd platforms/browser/www
+# aws s3 sync . s3://tiledesk-dashboard-pre/chat-ionic5/$version/
+# aws s3 sync . s3://tiledesk-dashboard-pre/chat-ionic5/
+# cd ../../../
 
-cd platforms/browser/www
-aws s3 sync . s3://tiledesk-dashboard-pre/chat-ionic5/$version/
-aws s3 sync . s3://tiledesk-dashboard-pre/chat-ionic5/
-cd ../../../
+# aws cloudfront create-invalidation --distribution-id E2DTAKWHWQ7C3J --paths "/*"
+
+# echo new version deployed on s3://tiledesk-dashboard-pre/chat-ionic5/$version/
+# echo available on https://s3.eu-west-1.amazonaws.com/tiledesk-dashboard-pre/chat-ionic5/$version/index.html
+# echo available on https://support-pre.tiledesk.com/chat-ionic5/$version/index.html
+# echo available on https://support-pre.tiledesk.com/chat-ionic5/index.html
+
+######### chat-ionic5-panel - publish in pre with the projects right panel 
+# cd platforms/browser/www
+# aws s3 sync . s3://tiledesk-dashboard-pre/chat-ionic5-panel/$version/
+# aws s3 sync . s3://tiledesk-dashboard-pre/chat-ionic5-panel/
+# cd ../../../
+
+# aws cloudfront create-invalidation --distribution-id E2DTAKWHWQ7C3J --paths "/*"
 
-#aws cloudfront create-invalidation --distribution-id E2DTAKWHWQ7C3J --paths "/*"
+# echo new version deployed on s3://tiledesk-dashboard-pre/chat-ionic5-panel/$version/
+# echo available on https://s3.eu-west-1.amazonaws.com/tiledesk-dashboard-pre/chat-ionic5-panel/$version/index.html
+# echo available on https://support-pre.tiledesk.com/chat-ionic5-panel/$version/index.html
+# echo available on https://support-pre.tiledesk.com/chat-ionic5-panel/index.html
 
-echo new version deployed on s3://tiledesk-dashboard-pre/chat-ionic5/$version/
-echo available on https://s3.eu-west-1.amazonaws.com/tiledesk-dashboard-pre/chat-ionic5/$version/index.html
+
+####### chat ionic MQTT in pre da aggiungere in deploy_pre.sh
+# cd platforms/browser/www
+# aws s3 sync . s3://tiledesk-dashboard-pre/native-mqtt/chat-ionic5/
+# aws s3 sync . s3://tiledesk-dashboard-pre/native-mqtt/chat-ionic5/$version
+# cd ../../../
+# echo new version deployed on s3://tiledesk-dashboard-pre/native-mqtt/chat-ionic5/
+# echo new version deployed on s3://tiledesk-dashboard-pre/native-mqtt/chat-ionic5/$version
+# echo http://tiledesk-dashboard-pre.s3-eu-west-1.amazonaws.com/native-mqtt/chat-ionic5/index.html
+# echo http://tiledesk-dashboard-pre.s3-eu-west-1.amazonaws.com/native-mqtt/chat-ionic5/$version/index.html
+
+
+####### chat ionic FIREBASE in pre da aggiungere in deploy_pre.sh
+cd platforms/browser/www
+aws s3 sync . s3://tiledesk-dashboard-pre/chat5/
+aws s3 sync . s3://tiledesk-dashboard-pre/chat5/$version
+cd ../../../
+echo new version deployed on s3://tiledesk-dashboard-pre/chat5/$version
+echo new version deployed on s3://tiledesk-dashboard-pre/chat5/
+echo available on http://support-pre.tiledesk.com/chat5/index.html
+echo available on http://support-pre.tiledesk.com/chat5/$version/index.html

package/deploy_prod.sh

@@ -1,4 +1,4 @@
-npm version patch
+# npm version patch
 version=`node -e 'console.log(require("./package.json").version)'`
 echo "version $version"
 
@@ -12,22 +12,51 @@ echo 'URL_VER: ---->'$URL_VER
 #     npm publish
 # fi
 
-# sed -i -e "s/$start$ver.$build/$start$NEW_VER.$NEW_BUILD/g" src/utils/constants.ts
 sed -i -e "s/$URL_VER/g" src/utils/constants.ts
+
 ionic cordova platform add browser --save
 #ionic cordova build --env=prod browser  -- --base-href /www/ --prod
 ionic cordova build --env=prod browser --prod 
 cp -p src/firebase-messaging-sw.js platforms/browser/www/
 cp -p src/manifest.json platforms/browser/www/
 cp -p src/chat-config.json platforms/browser/www/
+cp -p config.xml platforms/browser/www/
+
 
+###### CHAT in prod
 cd platforms/browser/www
-#aws s3 sync . s3://tiledesk-dashboard/chat/
-aws s3 sync . s3://tiledesk-console/v2/chat-ionic5/
-aws s3 sync . s3://tiledesk-console/v2/chat-ionic5/$version/
+aws s3 sync . s3://tiledesk-dashboard/v2/chat/
+aws s3 sync . s3://tiledesk-console/v2/chat/$version/
 cd ../../../
 # aws cloudfront create-invalidation --distribution-id E2DTAKWHWQ7C3J --paths "/*"
 
 # echo new version deployed on s3://tiledesk-dashboard/chat/$NEW_BUILD/
-echo new version deployed on s3://tiledesk-console/v2/chat-ionic5/$version/
-echo available on https://console.tiledesk.com/v2/chat-ionic5/$version/index.html
+echo new version deployed on s3://tiledesk-console/v2/chat/$version/
+echo new version deployed on s3://tiledesk-console/v2/chat/
+echo available on https://console.tiledesk.com/v2/chat/$version/index.html
+echo available on https://console.tiledesk.com/v2/chat/index.html
+
+
+###### CHAT-IONIC5
+# cd platforms/browser/www
+# #aws s3 sync . s3://tiledesk-dashboard/chat/
+# aws s3 sync . s3://tiledesk-console/v2/chat-ionic5/
+# aws s3 sync . s3://tiledesk-console/v2/chat-ionic5/$version/
+# cd ../../../
+# # aws cloudfront create-invalidation --distribution-id E2DTAKWHWQ7C3J --paths "/*"
+
+# # echo new version deployed on s3://tiledesk-dashboard/chat/$NEW_BUILD/
+# echo new version deployed on s3://tiledesk-console/v2/chat-ionic5/$version/
+# echo available on https://console.tiledesk.com/v2/chat-ionic5/$version/index.html
+
+
+
+####### chat ionic FIREBASE in PROD IN SUBFOLDER 
+# cd platforms/browser/www
+# aws s3 sync . s3://tiledesk-console/v2/chat5-dev/
+# aws s3 sync . s3://tiledesk-console/v2/chat5-dev/$version
+# cd ../../../
+# echo new version deployed on s3://console.tiledesk.com/v2/chat5-dev/$version
+# echo new version deployed on s3://console.tiledesk.com/v2/chat5-dev/
+# echo available on http://console.tiledesk.com/v2/chat5-dev/index.html
+# echo available on http://console.tiledesk.com/v2/chat5-dev/$version/index.html

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@chat21/chat21-ionic",
-    "version": "3.0.61-rc19",
+    "version": "3.0.61-rc23",
     "author": "Tiledesk SRL",
     "homepage": "https://tiledesk.com/",
     "scripts": {
@@ -44,7 +44,6 @@
         "cordova-browser": "^5.0.4",
         "cordova-ios": "6.1.1",
         "cordova-plugin-chooser": "^1.3.2",
-        "cordova-plugin-device": "^2.0.3",
         "cordova-plugin-ionic-keyboard": "^2.2.0",
         "cordova-plugin-ionic-webview": "^4.2.1",
         "cordova-plugin-network-information": "^2.0.2",
@@ -97,7 +96,6 @@
         "plugins": {
             "cordova-plugin-whitelist": {},
             "cordova-plugin-statusbar": {},
-            "cordova-plugin-device": {},
             "cordova-plugin-splashscreen": {},
             "cordova-plugin-ionic-webview": {
                 "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"

package/src/app/app.component.ts

@@ -158,7 +158,7 @@ export class AppComponent implements OnInit {
     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)
+    this.logger.log('[APP-COMP] IS_ON_MOBILE_DEVICE', this.IS_ON_MOBILE_DEVICE)
     return this.IS_ON_MOBILE_DEVICE;
   }
 
@@ -298,12 +298,13 @@ export class AppComponent implements OnInit {
    */
   ngOnInit() {
     const appconfig = this.appConfigProvider.getConfig();
-    // console.log('[APP-COMP] appconfig', appconfig)
-    if (appconfig && appconfig.supportMode) {
-      this.SUPPORT_MODE = appconfig.supportMode
-      // console.log('[APP-COMP] appconfig > SUPPORT_MODE', this.SUPPORT_MODE)
+    this.logger.log('[APP-COMP] ngOnInit  appconfig', appconfig)
+    if (appconfig && appconfig.supportMode &&  (appconfig.supportMode === true || appconfig.supportMode === 'true' )) {
+      this.SUPPORT_MODE = true;
+      this.logger.log('[APP-COMP] appconfig > SUPPORT_MODE', this.SUPPORT_MODE)
     } else {
       this.SUPPORT_MODE = false;
+      this.logger.log('[APP-COMP] appconfig > SUPPORT_MODE', this.SUPPORT_MODE)
     }
     this.persistence = appconfig.authPersistence;
     this.appStorageService.initialize(environment.storage_prefix, this.persistence, '')
@@ -435,7 +436,7 @@ export class AppComponent implements OnInit {
     // this.logger.log('[APP-COMP] - X - initializeApp !!! CALLED-BY: ', calledby);
     // console.log('[APP-COMP] appconfig platform is cordova: ', this.platform.is('cordova'))
 
-    if (!this.platform.is('cordova')) {
+    if (!this.platform.is('desktop')) {
       this.splashScreen.show();
     }
     this.tabTitle = document.title;
@@ -723,6 +724,7 @@ 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');
 
       // console.log('[APP-COMP]  platformIs', this.platformIs);
@@ -736,7 +738,7 @@ export class AppComponent implements OnInit {
       this.chatManager.startApp();
       this.logger.log('[APP-COMP] checkPlatformIsMobile', checkPlatformIsMobile());
       this.platformIs = PLATFORM_DESKTOP;
-      // console.log('[APP-COMP]  platformIs', this.platformIs);
+      this.logger.log('[APP-COMP]  platformIs', this.platformIs);
       // console.log('[APP-COMP] PLATFORM', PLATFORM_DESKTOP, 'route.snapshot',  this.route.snapshot);
       this.logger.log('[APP-COMP] PLATFORM_DESKTOP ', this.navService);
 
@@ -1005,6 +1007,7 @@ export class AppComponent implements OnInit {
     let platformIsNow = PLATFORM_DESKTOP;
     if (checkPlatformIsMobile()) {
       platformIsNow = PLATFORM_MOBILE;
+      this.logger.log('onResize platformIsNow ', platformIsNow) 
     }
     if (!this.platformIs || this.platformIs === '') {
       this.platformIs = platformIsNow;

package/src/app/chatlib/conversation-detail/ion-conversation-detail/ion-conversation-detail.component.ts

@@ -69,7 +69,14 @@ export class IonConversationDetailComponent extends ConversationContentComponent
   }
 
   getOSCODE() {
-    this.support_mode = this.appConfigProvider.getConfig().supportMode
+    this.support_mode = null
+    if( this.appConfigProvider.getConfig().supportMode === true ||  this.appConfigProvider.getConfig().supportMode === 'true') {
+      this.support_mode = true
+    } else if ( this.appConfigProvider.getConfig().supportMode === false  ||  this.appConfigProvider.getConfig().supportMode === 'false') {
+      this.support_mode = false
+    } else if ( !this.appConfigProvider.getConfig().supportMode ) {
+      this.support_mode = false
+    }
     this.public_Key = this.appConfigProvider.getConfig().t2y12PruGU9wUtEGzBJfolMIgK
     this.logger.log('[CONVS-DETAIL][ION-CONVS-DETAIL] AppConfigService getAppConfig public_Key', this.public_Key)
 

package/src/app/components/conversation-detail/message-text-area/message-text-area.component.ts

@@ -109,7 +109,12 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
 
   ngOnInit() {
     // this.setSubscriptions();
+
     this.logger.log("[CONVS-DETAIL] [MSG-TEXT-AREA] HELLO !!!!! ");
+    this.logger.log("[CONVS-DETAIL] [MSG-TEXT-AREA] areVisibleCAR ", this.areVisibleCAR);
+    if (this.areVisibleCAR === false) {
+      this.emojiPerLine = 7
+    }
     // this.events.subscribe((cannedmessage) => {
     //   this.logger.log("[CONVS-DETAIL] [MSG-TEXT-AREA] events.subscribe cannedmessage ", cannedmessage);
     // })
@@ -236,7 +241,7 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
   @HostListener('window:resize', ['$event'])
   onResize(event) {
     // this.getIfTexareaIsEmpty('onResize')
-  //  console.log("[CONVS-DETAIL][MSG-TEXT-AREA]  event.target.innerWidth; ", event.target.innerWidth);
+    //  console.log("[CONVS-DETAIL][MSG-TEXT-AREA]  event.target.innerWidth; ", event.target.innerWidth);
 
 
 
@@ -598,7 +603,7 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
       this.addWhiteSpaceBefore = false;
       // console.log('[CONVS-DETAIL][MSG-TEXT-AREA] ADD EMOJI addWhiteSpaceBefore ',  this.addWhiteSpaceBefore)
     } else {
-      this.addWhiteSpaceBefore = true 
+      this.addWhiteSpaceBefore = true
       // console.log('[CONVS-DETAIL][MSG-TEXT-AREA] ADD EMOJI addWhiteSpaceBefore ',  this.addWhiteSpaceBefore)
     }
     const elTextArea = this.message_text_area['el'];
@@ -607,13 +612,13 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
   }
 
   insertAtCursor(myField, myValue) {
-    this.logger.log('[CANNED-RES-EDIT-CREATE] - insertAtCursor - myValue ', myValue );
-     
+    this.logger.log('[CANNED-RES-EDIT-CREATE] - insertAtCursor - myValue ', myValue);
+
     if (this.addWhiteSpaceBefore === true) {
       myValue = ' ' + myValue;
-      this.logger.log('[CANNED-RES-EDIT-CREATE] - GET TEXT AREA - QUI ENTRO myValue ', myValue );
+      this.logger.log('[CANNED-RES-EDIT-CREATE] - GET TEXT AREA - QUI ENTRO myValue ', myValue);
     }
-   
+
     //IE support
     if (myField.selection) {
       myField.focus();
@@ -625,23 +630,23 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
     else if (myField.selectionStart || myField.selectionStart == '0') {
       var startPos = myField.selectionStart;
       this.logger.log('[CANNED-RES-EDIT-CREATE] - insertAtCursor - startPos ', startPos);
-      
+
       var endPos = myField.selectionEnd;
       this.logger.log('[CANNED-RES-EDIT-CREATE] - insertAtCursor - endPos ', endPos);
-      
+
       myField.value = myField.value.substring(0, startPos) + myValue + myField.value.substring(endPos, myField.value.length);
-  
+
       // place cursor at end of text in text input element
       myField.focus();
       var val = myField.value; //store the value of the element
       myField.value = ''; //clear the value of the element
       myField.value = val + ' '; //set that value back. 
-  
-  
+
+
       // myField.select();
     } else {
       myField.value += myValue;
-      
+
     }
   }
 

package/src/app/components/sidebar-user-details/sidebar-user-details.component.scss

@@ -259,6 +259,7 @@ button.user-details-btn-close {
     font-size: 16px;
     font-weight: 400;
     // bottom: 50px;
+    bottom: 55px;
     // top:355px
 }
 

package/src/app/pages/conversation-detail/conversation-detail.page.ts

@@ -307,7 +307,14 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   }
 
   getOSCODE() {
-    this.support_mode = this.appConfigProvider.getConfig().supportMode
+    this.support_mode = null
+    if( this.appConfigProvider.getConfig().supportMode === true ||  this.appConfigProvider.getConfig().supportMode === 'true') {
+      this.support_mode = true
+    } else if ( this.appConfigProvider.getConfig().supportMode === false  ||  this.appConfigProvider.getConfig().supportMode === 'false') {
+      this.support_mode = false
+    } else if ( !this.appConfigProvider.getConfig().supportMode ) {
+      this.support_mode = false
+    }
     this.logger.log('[CONVS-DETAIL] AppConfigService getAppConfig support_mode', this.support_mode)
     this.public_Key = this.appConfigProvider.getConfig().t2y12PruGU9wUtEGzBJfolMIgK
     this.logger.log('[CONVS-DETAIL] AppConfigService getAppConfig public_Key', this.public_Key)