@chat21/chat21-ionic 3.0.61-rc24 → 3.0.61-rc25

package/CHANGELOG.md

@@ -1,5 +1,8 @@
 # chat21-ionic ver 3.0
 
+### 3.0.61-rc25
+- Handles the case that in the storage the value of the "last_project" key is undefined
+
 ### 3.0.61-rc24
 - Handles the "writeToButton" and the 'archivedButton' environment variables if are returned as a string
 - Adds the "authPersistence" key in the chat-config-template.json, chat-config.json and env.sample files

package/deploy_pre.sh

@@ -32,20 +32,20 @@ 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/
+# 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 "/*"
+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
+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
@@ -73,11 +73,11 @@ cp -p config.xml platforms/browser/www/
 
 
 ####### 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
+# 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/package.json

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

package/src/app/components/project-item/project-item.component.ts

@@ -179,8 +179,8 @@ export class ProjectItemComponent implements OnInit {
     }
 
 
-    if (!stored_project) {
-      this.logger.log('PROJECT-ITEM - THERE IS NOT STORED LAST PROJECT ', stored_project)
+    if (!stored_project || stored_project === 'undefined') {
+      this.logger.log('PROJECT-ITEM - THERE IS NOT STORED LAST PROJECT OR IS UNDEFINED ', stored_project)
       const tiledeskToken = this.appStorageService.getItem('tiledeskToken');
       this.logger.log('[PROJECT-ITEM] - GET PROJECTS - tiledeskToken', tiledeskToken);
       this.tiledeskService.getProjects(tiledeskToken).subscribe(projects => {
@@ -204,7 +204,7 @@ export class ProjectItemComponent implements OnInit {
     }
 
 
-    if (stored_project) {
+    if (stored_project && stored_project !== 'undefined') {
       this.logger.log('PROJECT-ITEM - THERE IS STORED LAST PROJECT ', stored_project)
       if (stored_project) {
         this.project = JSON.parse(stored_project)

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

@@ -100,8 +100,8 @@ export class SidebarComponent implements OnInit {
 
   getStoredProjectAndUserRole() {
     const stored_project = localStorage.getItem('last_project')
-    // console.log('[SIDEBAR] stored_project ', stored_project)
-    if (stored_project) {
+    this.logger.log('[SIDEBAR] stored_project ', stored_project)
+    if (stored_project && stored_project !== 'undefined') {
       const project = JSON.parse(stored_project)
       this.logger.log('[SIDEBAR] project ', project)
 
@@ -111,6 +111,8 @@ export class SidebarComponent implements OnInit {
       this.USER_ROLE = project.role;
       this.logger.log('[SIDEBAR] USER_ROLE ', this.USER_ROLE)
       this.buildURLs(this.USER_ROLE)
+    } else {
+      this.logger.log('[SIDEBAR] stored_project ', stored_project)
     }
   }
 

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

@@ -313,7 +313,7 @@ export class SidebarUserDetailsComponent implements OnInit, OnChanges {
   getCurrentStoredProject() {
     try {
       const project = localStorage.getItem('last_project')
-      if (project) {
+      if (project && project !== 'undefined') {
         const projectObjct = JSON.parse(localStorage.getItem('last_project'))
         // console.log('[SIDEBAR-USER-DETAILS] - GET STORED PROJECT ', projectObjct)
 

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

@@ -257,7 +257,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   getStoredProjectAndUserRole() {
     const stored_project = localStorage.getItem('last_project')
     // console.log('[SIDEBAR] stored_project ', stored_project)
-    if (stored_project) {
+    if (stored_project && stored_project !== undefined) {
       const project = JSON.parse(stored_project)
       // this.logger.log('[CONVS-DETAIL]  project ', project)
 

package/src/chat-config-mqtt.json

@@ -1,27 +1,36 @@
 {
+    "t2y12PruGU9wUtEGzBJfolMIgK": "",
     "chatEngine": "mqtt",
     "uploadEngine": "native",
-    "pushEngine": "none",
+    "pushEngine":"none",
     "fileUploadAccept":"*/*",
-    "logLevel": "Debug",
+    "logLevel":"info",
+    "authPersistence": "LOCAL",
+    "supportMode": "true",
+    "writeToButton": "true",
+    "archivedButton": "true",
     "firebaseConfig": {
-        "tenant": "tilechat",
-        "apiKey": "AIzaSyCoWXHNvP1-qOllCpTshhC6VjPXeRTK0T4",
-        "authDomain": "chat21-pre-01.firebaseapp.com",
-        "databaseURL": "https://chat21-pre-01.firebaseio.com",
-        "projectId": "chat21-pre-01",
-        "storageBucket": "chat21-pre-01.appspot.com",
-        "messagingSenderId": "269505353043",
-        "appId": "1:269505353043:web:b82af070572669e3707da6",
-        "chat21ApiUrl": "https://us-central1-chat21-pre-01.cloudfunctions.net"
+        "tenant":"tilechat",
+        "apiKey": "",
+        "authDomain": "",
+        "databaseURL": "",
+        "projectId": "",
+        "storageBucket": "",
+        "messagingSenderId": "",
+        "appId": "",
+        "chat21ApiUrl": "",
+        "vapidKey": ""
     },
     "chat21Config": {
         "appId": "tilechat",
-        "MQTTendpoint": "ws://99.80.197.164:15675/ws",
-        "APIendpoint": "http://99.80.197.164:8004/api"
+        "MQTTendpoint": "ws://localhost:8081/mqws/ws",
+        "APIendpoint": "/chatapi/api"
     },
-    "apiUrl": "http://99.80.197.164:3000/",
-    "baseImageUrl": "http://99.80.197.164:3000/",
-    "dashboardUrl": "http://tiledesk-dashboard-pre.s3-eu-west-1.amazonaws.com/native-mqtt/dashboard/2.1.70-beta.1.6/index.html"
+    "apiUrl": "/api/",
+    "baseImageUrl": "/api/",
+    "dashboardUrl": "/dashboard/",
+    "wsUrl": "",
+    "wsUrlRel": ""
 }
 
+