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

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # chat21-ionic ver 3.0
 
+### 3.0.61-rc19
+- Merge branch 'features/new-sidebar'
+
+### 3.0.61-rc18
+- Fix bugs: in the teammate settings drawer the logout button area is too large
+- Fixed the bug: in the detail of the conversation the button messages are not aligned with the other messages
+
+### 3.0.61-rc16
+- Does not allow teammates with agent role to access the "settings sidebar"
+
 ### 3.0.61-rc15
 - Increase the size of the emoji and remove the background color when it is sent or received without text
 - Adds the ability to open sidebar menu items in a new tab by combining left mouse button + CMD keyboard key

package/deploy_pre.sh

@@ -27,57 +27,18 @@ 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 -c=pre  browser --prod
+ionic cordova build --env=pre browser #--prod  --verbose
+
 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/
 
- 
-######### 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 ../../../
 
-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/$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 "/*"
-
-# 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
-
-
-####### 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
+echo available on https://s3.eu-west-1.amazonaws.com/tiledesk-dashboard-pre/chat-ionic5/$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,51 +12,22 @@ 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/v2/chat/
-aws s3 sync . s3://tiledesk-console/v2/chat/$version/
+#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/$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
+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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@chat21/chat21-ionic",
-    "version": "3.0.61-rc15",
+    "version": "3.0.61-rc19",
     "author": "Tiledesk SRL",
     "homepage": "https://tiledesk.com/",
     "scripts": {

package/src/app/chatlib/conversation-detail/message/message-attachment/message-attachment.component.scss

@@ -4,7 +4,7 @@
     margin-top: -6px;
     margin-bottom: 5px;
     height: auto;
-
+    padding-left: 8px;
 
     .div-button {
         display: inline-block;

package/src/app/components/sidebar/sidebar.component.html

@@ -213,7 +213,7 @@
       <!-- ----------------------------------------------------------------------------------- -->
       <!-- SETTINGS // old: goToSettings_CannedResponses()  *ngIf="USER_ROLE !== 'agent'" (click)="goToWidgetSetUpOrToCannedResponses()" -->
       <!-- ----------------------------------------------------------------------------------- -->
-      <li  matTooltipClass="custom-mat-tooltip"
+      <li *ngIf="USER_ROLE !== 'agent'"  matTooltipClass="custom-mat-tooltip"
         matTooltip="{{ settings_lbl }}" #tooltip="matTooltip" matTooltipPosition='right' matTooltipHideDelay="100" style="text-align: center;">
         <a target="_self" href="{{ dashboard_settings_url }}" class="customAncor">
           <i class="material-icons sidebar-icons">settings</i>

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

@@ -21,11 +21,11 @@
 
     <!-- (click)="goToUserProfile()" -->
     <div role="button" class="user-details-avatar">
-        <img  *ngIf="USER_PHOTO_PROFILE_EXIST" class="user-img-in-sidebar-user-details" [src]="photo_profile_URL"
+        <img *ngIf="USER_PHOTO_PROFILE_EXIST" class="user-img-in-sidebar-user-details" [src]="photo_profile_URL"
             onerror="this.src='assets/images/no_image_user.png'" />
 
-        <div *ngIf="!USER_PHOTO_PROFILE_EXIST"  class="user-img-in-sidebar-user-details"
-        [ngStyle]="{'background':  'linear-gradient(rgb(255,255,255) -125%,' + user?.fillColour + ')'}">
+        <div *ngIf="!USER_PHOTO_PROFILE_EXIST" class="user-img-in-sidebar-user-details"
+            [ngStyle]="{'background':  'linear-gradient(rgb(255,255,255) -125%,' + user?.fillColour + ')'}">
             <span id="sidebaravatar-altenative-user-avatar" class="sidebar-user-details-altenative-user-avatar">
                 {{ user?.fullname_initial }}
             </span>
@@ -76,7 +76,7 @@
     <section *ngIf="isVisiblePAY" class="user-details-plan-info">
         <span>
             <div> {{prjct_name}} </div>
-            <div  style="display: inline-block;"> {{ profile_name_translated }} </div>
+            <div style="display: inline-block;"> {{ profile_name_translated }} </div>
 
             <div *ngIf="plan_type === 'payment' && plan_subscription_is_active === false"
                 style="color:#f44336; position:relative; top: -1px;;display: inline-block;">
@@ -99,18 +99,22 @@
         border-top: 1px solid rgba(255, 255,255, 0.2);"> -->
 
 
-    <section class="user-details-footer-section" (click)=onLogout()
+    <section class="user-details-footer-section"
         [ngClass]="{'footer-margin-top-pricing-no-visible': isVisiblePAY === false }">
-        <i class="material-icons user-details-logout-icon">
-            logout
-        </i>
-        <div> Logout</div>
+        <div role="button" class="logout-btn-wpr" (click)=onLogout()>
+            <i class="material-icons user-details-logout-icon" >
+                logout
+            </i>
+            <div class="user-details-logout-text"> 
+                 {{LOGOUT_msg}} 
+            </div>
+        </div>
     </section>
 
     <section class="user-details-footer-chat-version">
-        <div class="chat-version"> 
-        <!-- &copy; {{test | date: 'yyyy'}} {{company_name}} ver {{version}} -->
-        ver {{version}}
+        <div class="chat-version">
+            <!-- &copy; {{test | date: 'yyyy'}} {{company_name}} ver {{version}} -->
+            ver {{version}}
         </div>
     </section>
 

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

@@ -253,7 +253,7 @@ button.user-details-btn-close {
     margin: auto;
     position: absolute;
     text-align: center;
-    cursor: pointer;
+
     padding-bottom: 15px;
     padding-top: 200px;
     font-size: 16px;
@@ -262,13 +262,17 @@ button.user-details-btn-close {
     // top:355px
 }
 
+.logout-btn-wpr {
+    cursor: pointer;
+}
+
 .footer-margin-top-pricing-no-visible {
     padding-top: 240px;
 }
 .user-details-logout-icon {
     color: #a9afbb;
     font-size: 30px;
-    margin-top: 30px;
+    // margin-top: 30px;
 }
 
 .user-details-logout-icon:hover {

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

@@ -41,6 +41,7 @@ export class SidebarUserDetailsComponent implements OnInit, OnChanges {
   PAYD_PLAN_NAME_ENTERPRISE_msg: string;
   PRO_PLAN_TRIAL_msg: string;
   FREE_PLAN_msg: string;
+  LOGOUT_msg: string;
   profile_name_translated: string;
   SubscriptionPaymentProblem: string;
   user: any
@@ -222,6 +223,7 @@ export class SidebarUserDetailsComponent implements OnInit, OnChanges {
     this.getIsBusyTranslation();
     this.getSubscriptionPaymentProblemTranslation();
     this.getThePlanHasExpiredTranslation();
+    this.getLogoutTranslation();
   }
 
 
@@ -280,6 +282,15 @@ export class SidebarUserDetailsComponent implements OnInit, OnChanges {
       });
   }
 
+  getLogoutTranslation() {
+    this.translate.get('LABEL_LOGOUT')
+      .subscribe((text: string) => {
+        // this.deleteContact_msg = text;
+        // console.log('[SIDEBAR-USER-DETAILS] - GET Logout label ', text)
+        this.LOGOUT_msg = text
+      });
+  }
+
   getSubscriptionPaymentProblemTranslation() {
     this.translate.get('SubscriptionPaymentProblem')
       .subscribe((text: string) => {
@@ -392,6 +403,7 @@ export class SidebarUserDetailsComponent implements OnInit, OnChanges {
       });
   }
 
+ 
 
 
   listenTocurrentProjectUserUserAvailability$() {

package/src/assets/i18n/es.json

@@ -78,7 +78,7 @@
   "LABEL_ERROR_EMAIL": "Introduzca una dirección de correo electrónico válida.",
   "LABEL_ERROR_PASSWORD": "La contraseña debe tener al menos 6 caracteres.",
   "LABEL_LOGIN": "Ingresar",
-  "LABEL_LOGOUT": "Cerrar sesión",
+  "LABEL_LOGOUT": "Finalizar la sesión",
   "LABEL_WELCOME_TO": "Bienvenido a",
   "LABEL_SIGNUP": "Regístrate",
   "LABEL_ALREDY_HAVE_AN_ACCOUNT": "¿Ya tienes una cuenta?",

package/src/assets/i18n/fr.json

@@ -78,7 +78,7 @@
   "LABEL_ERROR_EMAIL": "Entrez une adresse mail valide.",
   "LABEL_ERROR_PASSWORD": "Le mot de passe doit comporter au moins 6 caractères.",
   "LABEL_LOGIN": "Connexion",
-  "LABEL_LOGOUT": "Se déconnecter",
+  "LABEL_LOGOUT": "Déconnexion",
   "LABEL_WELCOME_TO": "Bienvenue à",
   "LABEL_SIGNUP": "S'inscrire",
   "LABEL_ALREDY_HAVE_AN_ACCOUNT": "Vous avez déjà un compte?",

package/src/assets/i18n/it.json

@@ -78,7 +78,7 @@
     "LABEL_ERROR_EMAIL": "Inserisci un indirizzo email valido.",
     "LABEL_ERROR_PASSWORD": "La password deve essere di almeno 6 caratteri.",
     "LABEL_LOGIN": "Login",
-    "LABEL_LOGOUT": "Logout",
+    "LABEL_LOGOUT": "Disconnettersi",
     "LABEL_WELCOME_TO": "Benvenuto in",
     "LABEL_SIGNUP": "Registrati",
     "LABEL_ALREDY_HAVE_AN_ACCOUNT": "Hai già un account?",

package/src/assets/i18n/pt.json

@@ -78,7 +78,7 @@
   "LABEL_ERROR_EMAIL": "Digite um endereço de e-mail válido.",
   "LABEL_ERROR_PASSWORD": "A senha deve ter pelo menos 6 caracteres.",
   "LABEL_LOGIN": "Conecte-se",
-  "LABEL_LOGOUT": "Sair",
+  "LABEL_LOGOUT": "Deslogar",
   "LABEL_WELCOME_TO": "Bem-vindo ao",
   "LABEL_SIGNUP": "Inscrever-se",
   "LABEL_ALREDY_HAVE_AN_ACCOUNT": "Já tem uma conta?",

package/src/assets/i18n/ru.json

@@ -78,7 +78,7 @@
   "LABEL_ERROR_EMAIL": "Введите действительный адрес электронной почты.",
   "LABEL_ERROR_PASSWORD": "Пароль должен быть не менее 6 символов.",
   "LABEL_LOGIN": "Авторизоваться",
-  "LABEL_LOGOUT": "Выйти",
+  "LABEL_LOGOUT": "Выйти из системы",
   "LABEL_WELCOME_TO": "Добро пожаловать в",
   "LABEL_SIGNUP": "Зарегистрироваться",
   "LABEL_ALREDY_HAVE_AN_ACCOUNT": "У вас уже есть аккаунт?",

package/src/assets/i18n/sr.json

@@ -78,7 +78,7 @@
         "LABEL_ERROR_EMAIL": "Унесите исправну е-маил адресу.",
         "LABEL_ERROR_PASSWORD": "Лозинка мора имати најмање 6 знакова.",
         "LABEL_LOGIN": "Пријавите се",
-        "LABEL_LOGOUT": "Одјавити се",
+        "LABEL_LOGOUT": "Одјава",
         "LABEL_WELCOME_TO": "Добродошли у",
         "LABEL_SIGNUP": "Пријави се",
         "LABEL_ALREDY_HAVE_AN_ACCOUNT": "Већ имате налог?",