added excplicit sorting of attachments by id, increased preview file size to 10MB

Author: EvgenySafronov

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aquality-tracking-ui",
-  "version": "1.4.3",
+  "version": "1.4.4",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",

src/app/elements/lookup/attachment-modal/attachment-modal.component.html

@@ -21,7 +21,7 @@ <h6 class="modal-sub-title col-sm-8">{{subTitle}}</h6>
                     </div>
                     <div class="col-sm-4 line-margin">
                         <div class="col-sm-12 btnGroup">
-                            <button *ngFor="let attach of testResultAttachments" (click)="showAttachment(attach)"
+                            <button *ngFor="let attach of sortedTestResultAttachmentsById" (click)="showAttachment(attach)"
                                 [class.selected]="attach === selectedTestResultAttachment"
                                 class="btn btn-group-item bg-light">{{attach['name']}}</button>
                         </div>

src/app/elements/lookup/attachment-modal/attachment-modal.component.ts

@@ -24,6 +24,8 @@ export class AttachmentModalComponent implements OnChanges {
   selectedTestResultAttachment: TestResultAttachment;
   supportedPreviewTypes = ['text', 'image', 'message'];
   icon = faFile;
+  private readonly maxFileSizeBytes = 10 * 1024 * 1024;
+  private readonly base64SizeMultiplier = 4 / 3;
 
   constructor(private sanitizer: DomSanitizer, private testResultService: TestResultService) {
   }
@@ -35,6 +37,10 @@ export class AttachmentModalComponent implements OnChanges {
     }
   }
 
+  get sortedTestResultAttachmentsById(): TestResultAttachment[] {
+    return this.testResultAttachments?.sort((a, b) => a.id - b.id) || [];
+  }
+
   isSupportedPreviewFileType(): boolean {
     let isSupported = false;
     this.supportedPreviewTypes.forEach(type => {
@@ -48,7 +54,16 @@ export class AttachmentModalComponent implements OnChanges {
   }
 
   isSupportedPreviewFileSize(): boolean {
-    return this.testResultAttachment.attachment.toString().length / 1024 / 1024 < 5;
+    let attachmentSize = 0;
+  
+    if (typeof this.testResultAttachment?.attachment === 'string') {
+      const base64Length = this.testResultAttachment.attachment.length;
+      attachmentSize = base64Length / this.base64SizeMultiplier;
+    } else if (this.testResultAttachment?.attachment instanceof ArrayBuffer) {
+      attachmentSize = this.testResultAttachment.attachment.byteLength;
+    }
+  
+    return attachmentSize <= this.maxFileSizeBytes;
   }
 
   getNotSupportedMessage(): string {
@@ -57,7 +72,7 @@ export class AttachmentModalComponent implements OnChanges {
       message = 'Preview is not available for this file type.';
     }
     if (!this.isSupportedPreviewFileSize()) {
-      message = 'Preview is not available, the file size should be less than 5Mb.';
+      message = 'Preview is not available, the file size should be less than 10MB.';
     } else { message = 'Preview is not available for the file.'; }
     return `${message} You can download the file.`;
   }