@chat21/chat21-ionic 3.4.6 → 3.4.7-rc.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # chat21-ionic ver 3.0
 
+### 3.4.7-rc.2
+- minior fix
+
+### 3.4.7-rc.1
+- added: uploaded control after file is loaded
+
 ### 3.4.6 in PROD
 
 ### 3.4.5 in PROD

package/package.json

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

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

@@ -21,6 +21,7 @@ import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
 import { EventsService } from 'src/app/services/events-service';
 import { isOnMobileDevice } from 'src/chat21-core/utils/utils';
+import { checkAcceptedFile } from 'src/chat21-core/utils/utils';
 
 
 @Component({
@@ -282,7 +283,7 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
   private async presentModal(e: any): Promise<any> {
     this.onPresentModalScrollToBottom.emit(true);
     const that = this;
-    let dataFiles = " "
+    let dataFiles: any = " "
     if (e.type === 'change') {
 
       this.logger.log('[CONVS-DETAIL][MSG-TEXT-AREA] presentModal change e', e);
@@ -309,6 +310,13 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
     // this.logger.log('presentModal e.target.files.length', e.target.files.length);
 
     const attributes = { files: dataFiles, enableBackdropDismiss: false, msg: this.msg };
+
+    const canUploadFile = checkAcceptedFile(dataFiles[0].type, this.fileUploadAccept)
+    if(!canUploadFile){
+      this.presentToastOnlyImageFilesAreAllowed()
+      return;
+    }
+
     this.logger.log('[CONVS-DETAIL][MSG-TEXT-AREA] attributes', attributes);
     const modal: HTMLIonModalElement =
       await this.modalController.create({
@@ -391,7 +399,6 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
         that.fileInput.nativeElement.value = '';
       }
     });
-
     return await modal.present();
   }
 

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

@@ -46,7 +46,7 @@ import { ArchivedConversationsHandlerService } from 'src/chat21-core/providers/a
 import { ConversationHandlerService } from 'src/chat21-core/providers/abstract/conversation-handler.service'
 import { ContactsService } from 'src/app/services/contacts/contacts.service'
 import { CannedResponsesService } from '../../services/canned-responses/canned-responses.service'
-import {getDateDifference} from 'src/chat21-core/utils/utils'
+import {checkAcceptedFile, getDateDifference} from 'src/chat21-core/utils/utils'
 import { ImageRepoService } from 'src/chat21-core/providers/abstract/image-repo.service'
 import { PresenceService } from 'src/chat21-core/providers/abstract/presence.service'
 import { CreateCannedResponsePage } from 'src/app/modals/create-canned-response/create-canned-response.page'
@@ -654,7 +654,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
       'LABEL_ENTER_MSG_SHORT',
       'LABEL_ENTER_MSG_SHORTER',
       'ONLY_IMAGE_FILES_ARE_ALLOWED_TO_PASTE',
-      'FAILED_TO_UPLOAD_THE_FORMAT_IS NOT_SUPPORTED',
+      'FAILED_TO_UPLOAD_THE_FORMAT_IS_NOT_SUPPORTED',
       'NO_INFORMATION_AVAILABLE',
       'CONTACT_ID',
 
@@ -2132,19 +2132,15 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
 
       var mimeType = fileList[0].type
       this.logger.log('[CONVS-DETAIL] ----> FILE - DROP mimeType files ', mimeType)
-
-      // if (mimeType.startsWith("image") || mimeType.startsWith("application")) {
-      // this.logger.log('[CONVS-DETAIL] ----> FILE - DROP mimeType files: ', this.appConfigProvider.getConfig().fileUploadAccept);
-      // this.checkAcceptedFile(mimeType);
-      const isAccepted = this.checkAcceptedFile(mimeType)
-      this.logger.log('[CONVS-DETAIL] > checkAcceptedFile - fileUploadAccept isAcceptFile FILE - DROP', isAccepted)
-      if (isAccepted === true) {
-        this.handleDropEvent(ev)
-      } else {
-        this.logger.log('[CONVS-DETAIL] ----> FILE - DROP mimeType files ', mimeType, 'NOT SUPPORTED FILE TYPE')
+      
+      // const isAccepted = this.checkAcceptedFile(mimeType)
+      const canUploadFile = checkAcceptedFile(mimeType, this.appConfigProvider.getConfig().fileUploadAccept)
+      if(!canUploadFile){
         this.presentToast(this.translationsMap.get('FAILED_TO_UPLOAD_THE_FORMAT_IS_NOT_SUPPORTED'), 'danger', 'toast-custom-class', 5000)
-        // this.presentToastOnlyImageFilesAreAllowedToDrag()
+        return;
       }
+      this.handleDropEvent(ev)
+
     }
   }
 

package/src/chat21-core/utils/utils.ts

@@ -864,3 +864,59 @@ export function isGroup(conv: ConversationModel) {
   };
   return false
 }
+
+export function checkAcceptedFile(fileType, fileUploadAccept ): boolean{
+  
+  if (fileUploadAccept === '*/*') {
+    return true
+  }
+  // Dividi la stringa fileUploadAccept in un array di tipi accettati
+  const acceptedTypes = fileUploadAccept.split(',');
+
+  // Verifica se il tipo di file è accettato
+  return acceptedTypes.some((accept) => {
+    accept = accept.trim();
+    // Controlla per i tipi MIME con wildcard, come image/*
+    if (accept.endsWith('/*')) {
+      const baseMimeType = fileType.split('/')[0]; // Ottieni la parte principale del MIME type
+      return accept.replace('/*', '') === baseMimeType;
+    }
+
+    // Controlla se l'accettazione è un MIME type esatto (come image/jpeg)
+    if (accept === fileType) {
+      return true;
+    }
+    // Controlla per le estensioni di file specifiche come .pdf o .txt
+    return fileType === getMimeTypeFromExtension(accept);
+  });
+
+}
+
+function getMimeTypeFromExtension(extension: string): string {
+  // Rimuovi il punto dall'estensione e ottieni il MIME type
+  const mimeTypes: { [key: string]: string } = {
+    '.jpg': 'image/jpeg',
+    '.jpeg': 'image/jpeg',
+    '.png': 'image/png',
+    '.gif': 'image/gif',
+    '.pdf': 'application/pdf',
+    '.txt': 'text/plain',
+    '.doc': 'application/msword',
+    '.docx': 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+    // Aggiungi altri tipi MIME se necessario
+  };
+  return mimeTypes[extension] || '';
+}
+
+export function getProjectIdSelectedConversation(conversationWith: string): string{
+  const conversationWith_segments = conversationWith.split('-')
+  // Removes the last element of the array if is = to the separator
+  if (conversationWith_segments[conversationWith_segments.length - 1] === '') {
+    conversationWith_segments.pop()
+  }
+  let projectId = ''
+  if (conversationWith_segments.length >= 4) {
+    projectId = conversationWith_segments[2]
+  }
+  return projectId
+}