@chat21/chat21-ionic 3.3.0 → 3.4.0-rc.1

package/CHANGELOG.md

@@ -1,5 +1,8 @@
 # chat21-ionic ver 3.0
 
+### 3.4.0-rc.1
+- added: downloadURL in metadata obj while sending message from tiledesk
+
 ### 3.3.0 in PROD
 
 ### 3.3.0-rc.1

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@chat21/chat21-ionic",
     "author": "Tiledesk SRL",
-    "version": "3.3.0",
+    "version": "3.4.0-rc.1",
     "license": "MIT License",
     "homepage": "https://tiledesk.com/",
     "repository": {

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

@@ -362,10 +362,11 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
           this.logger.log('[CONVS-DETAIL][MSG-TEXT-AREA] FIREBASE-UPLOAD presentModal onDidDismiss currentUpload', currentUpload);
           this.logger.log('[CONVS-DETAIL][MSG-TEXT-AREA] FIREBASE-UPLOAD presentModal onDidDismiss detail.data', detail.data);
 
-          that.uploadService.upload(that.loggedUser.uid, currentUpload).then(downloadURL => {
-            metadata.src = downloadURL;
+          that.uploadService.upload(that.loggedUser.uid, currentUpload).then((data) => {
+            metadata.src = data.src;
+            metadata.downloadURL = data.downloadURL;
             this.logger.log('[CONVS-DETAIL][MSG-TEXT-AREA] FIREBASE-UPLOAD presentModal invio msg metadata::: ', metadata);
-            this.logger.log('[CONVS-DETAIL][MSG-TEXT-AREA] FIREBASE-UPLOAD presentModal invio msg metadata downloadURL::: ', downloadURL);
+            this.logger.log('[CONVS-DETAIL][MSG-TEXT-AREA] FIREBASE-UPLOAD presentModal invio msg metadata downloadURL::: ', data);
             this.logger.log('[CONVS-DETAIL][MSG-TEXT-AREA] FIREBASE-UPLOAD presentModal invio msg type::: ', type);
             this.logger.log('[CONVS-DETAIL][MSG-TEXT-AREA] FIREBASE-UPLOAD presentModal invio msg message::: ', messageString);
             // send message

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

@@ -217,6 +217,7 @@ export class ProjectItemComponent implements OnInit {
     if (project) {
       const user_role = this.project.role
       this.logger.log('[PROJECT-ITEM] - user_role ', user_role)
+      //TODO: recuperare id da root project (DA VERIFICARE)
       this.projectIdEvent.emit(project.id_project._id)
 
       if (user_role === 'agent') {
@@ -228,6 +229,7 @@ export class ProjectItemComponent implements OnInit {
 
 
       this.logger.log('[PROJECT-ITEM] - LAST PROJECT PARSED > user_role ', user_role)
+      //TODO: recuperare project_user_ID da API --> aggiugere metodo
       this.wsService.subscriptionToWsCurrentProjectUserAvailability(project.id_project._id, this.project._id);
       this.listenTocurrentProjectUserUserAvailability$(project)
 

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

@@ -283,6 +283,7 @@ export class SidebarUserDetailsComponent implements OnInit, OnChanges {
       if (projectObjct && projectObjct !== 'undefined') {
         // console.log('[SIDEBAR-USER-DETAILS] - GET STORED PROJECT ', projectObjct)
 
+        //TODO: recuperare info da root e non da id_project
         this.project = {
           _id: projectObjct['id_project']['_id'],
           name: projectObjct['id_project']['name'],

package/src/app/modals/create-canned-response/create-canned-response.page.ts

@@ -65,13 +65,6 @@ export class CreateCannedResponsePage implements OnInit {
     this.logger.log('[CREATE-CANNED-RES] tiledeskToken ', this.tiledeskToken)
     this.getCurrentProjectId(this.conversationWith, this.tiledeskToken);
 
-    // const stored_project = localStorage.getItem('last_project')
-    // const storedPrjctObjct = JSON.parse(stored_project)
-    // this.logger.log('[CREATE-CANNED-RES] storedPrjctObjct ', storedPrjctObjct)
-    // if (storedPrjctObjct) {
-    //   this.prjctID = storedPrjctObjct.id_project.id
-    //   this.logger.log('[CREATE-CANNED-RES] this.prjctID ', this.prjctID)
-    // }
 
     let keys= [
       'Title',

package/src/app/modals/create-ticket/create-ticket.page.ts

@@ -81,6 +81,7 @@ export class CreateTicketPage implements OnInit {
     const storedPrjctObjct = JSON.parse(stored_project)
     this.logger.log('[CREATE-TICKET] storedPrjctObjct ', storedPrjctObjct)
     if (storedPrjctObjct) {
+      //TODO: recuperare info da root e non da id_project
       this.prjctID = storedPrjctObjct.id_project.id
       this.logger.log('[CREATE-TICKET] this.prjctID ', this.prjctID)
     }

package/src/app/modals/send-whatsapp-template/send-whatsapp-template.page.ts

@@ -327,9 +327,9 @@ export class SendWhatsappTemplateModal implements OnInit {
       let file = e.target.files.item(0);
       const currentUpload = new UploadModel(file);
       this.logger.log('[SEND-TEMPLATE-MODAL] currentUpload -->', currentUpload);
-      this.uploadService.upload(this.loggedUser.uid, currentUpload).then((downloadURL) => {
-        this.logger.log('[SEND-TEMPLATE-MODAL] downloadURL -->', downloadURL);
-        resolve(downloadURL);
+      this.uploadService.upload(this.loggedUser.uid, currentUpload).then((data) => {
+        this.logger.log('[SEND-TEMPLATE-MODAL] downloadURL -->', data);
+        resolve(data.downloadURL);
       }).catch((err) => {
         this.logger.log('[SEND-TEMPLATE-MODAL] uploading error ', err);
         reject(err);

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

@@ -474,6 +474,7 @@ export class ConversationListPage implements OnInit {
       if (projectObjct && projectObjct !== 'undefined') {
         // console.log('[CONVS-LIST-PAGE] - GET STORED PROJECT ', projectObjct)
 
+        //TODO: recuperare info da root e non da id_project
         this.project = {
           _id: projectObjct['id_project']['_id'],
           name: projectObjct['id_project']['name'],

package/src/app/pages/create-requester/create-requester.page.ts

@@ -38,6 +38,7 @@ export class CreateRequesterPage implements OnInit {
     const storedPrjctObjct = JSON.parse(stored_project)
     this.logger.log('[CREATE-REQUESTER] storedPrjctObjct ', storedPrjctObjct)
     if (storedPrjctObjct) {
+      //TODO: recuperare info da root e non da id_project
       this.prjctID = storedPrjctObjct.id_project.id
       this.logger.log('[CREATE-REQUESTER] this.prjctID ', this.prjctID)
     }

package/src/chat21-core/providers/abstract/upload.service.ts

@@ -35,7 +35,7 @@ export abstract class UploadService {
 
   // functions
   abstract initialize(): void;
-  abstract upload(userId: string, upload: UploadModel): Promise<any>;
+  abstract upload(userId: string, upload: UploadModel): Promise<{downloadURL: string, src: string}>;
   abstract uploadProfile(userId: string, upload: UploadModel): Promise<any>;
   abstract delete(userId: string, path: string): Promise<any>;
   abstract deleteProfile(userId: string, path: string): Promise<any>

package/src/chat21-core/providers/firebase/firebase-upload.service.ts

@@ -46,7 +46,7 @@ export class FirebaseUploadService extends UploadService {
     this.logger.log('[FIREBASEUploadSERVICE] initialize');
   }
   
-  public upload(userId: string, upload: UploadModel): Promise<any> {
+  public upload(userId: string, upload: UploadModel): Promise<{downloadURL: string, src: any}> {
     const that = this;
     const uid = this.createGuid();
     const urlImagesNodeFirebase = '/public/images/' + userId + '/' + uid + '/' + upload.file.name;
@@ -91,11 +91,12 @@ export class FirebaseUploadService extends UploadService {
       }, function error(error) {
         // Handle unsuccessful uploads
         reject(error)
-      }, function complete() {
+      }, async function complete() {
         // Handle successful uploads on complete
         that.logger.debug('[FIREBASEUploadSERVICE] Upload is complete', upload);
-       
-        resolve(uploadTask.snapshot.ref.getDownloadURL())
+        
+        const downloadURL = await uploadTask.snapshot.ref.getDownloadURL();
+        resolve({downloadURL: downloadURL, src: downloadURL})
         // that.BSStateUpload.next({upload: upload});
 
       });
@@ -151,7 +152,9 @@ export class FirebaseUploadService extends UploadService {
         // Handle successful uploads on complete
         that.logger.debug('[FIREBASEUploadSERVICE] Upload is complete', upload);
        
-        resolve(uploadTask.snapshot.ref.getDownloadURL())
+        const downloadURL = uploadTask.snapshot.ref.getDownloadURL();
+        resolve({downloadURL : downloadURL, url: downloadURL})
+
         // that.BSStateUpload.next({upload: upload});
 
       });

package/src/chat21-core/providers/native/native-upload-service.ts

@@ -33,7 +33,7 @@ export class NativeUploadService extends UploadService {
     }
 
 
-    upload(userId: string, upload: UploadModel): Promise<any>  {
+    upload(userId: string, upload: UploadModel): Promise<{ downloadURL: string, src: string}>  {
         this.logger.log('[NATIVE UPLOAD] - upload new image/file ... upload', upload)
         const headers = new HttpHeaders({
             Authorization: this.tiledeskToken,
@@ -51,7 +51,7 @@ export class NativeUploadService extends UploadService {
             return new Promise((resolve, reject) => {
                 that.http.post(url, formData, requestOptions).subscribe(data => {
                     const downloadURL = this.URL_TILEDESK_IMAGES + '?path=' + data['filename'];
-                    resolve(downloadURL)
+                    resolve({downloadURL : downloadURL, src: downloadURL})
                     // that.BSStateUpload.next({upload: upload});
                 }, (error) => {
                     reject(error)
@@ -63,11 +63,9 @@ export class NativeUploadService extends UploadService {
             const url = this.URL_TILEDESK_FILE + '/users'
             return new Promise((resolve, reject) => {
                 that.http.post(url, formData, requestOptions).subscribe(data => {
-                    let downloadURL = this.URL_TILEDESK_FILE + '/download' + '?path=' + encodeURI(data['filename']);
-                    if(upload.file.type.includes('pdf')){
-                        downloadURL = this.URL_TILEDESK_FILE + '?path=' + encodeURI(data['filename']);
-                    }
-                    resolve(downloadURL)
+                    const src = this.URL_TILEDESK_FILE + '?path=' + encodeURI(data['filename']);
+                    const downloadURL = this.URL_TILEDESK_FILE + '/download' + '?path=' + encodeURI(data['filename']);
+                    resolve({downloadURL : downloadURL, src: src})
                     // that.BSStateUpload.next({upload: upload});
                 }, (error) => {
                     this.logger.error('[NATIVE UPLOAD] - ERROR upload new file ', error)