CXIEP-7764: cr changes pt2

Author: EmilJedrychowski-SAP

integration-libs/s4om/components/order-detail-attachments/attachments-dialog/s4om-attachments-dialog.component.html

@@ -36,14 +36,13 @@
     <!-- Modal Body -->
     <div class="cx-dialog-body modal-body">
       @for (errorId of erroredAttachments; track errorId) {
-        <div class="cx-dialog-message attachment-error" aria-live="assertive" aria-atomic="true">
-          <cx-message
-            [text]="'s4omOrder.attachments.dialog.downloadError' | cxTranslate"
-            [type]="globalMessageType.MSG_TYPE_ERROR"
-            (closeMessage)="closeErrorMessage(errorId)"
-          >
-          </cx-message>
-        </div>
+        <cx-message
+          [text]="'s4omOrder.attachments.dialog.downloadError' | cxTranslate"
+          [type]="globalMessageType.MSG_TYPE_ERROR"
+          (closeMessage)="closeErrorMessage(errorId)"
+          class="cx-dialog-message attachment-error"
+        >
+        </cx-message>
       }
       @if (attachments$ | async; as attachments) {
         @if (!(error$ | async)) {
@@ -85,25 +84,23 @@
                 </tr>
               }
             } @empty {
-              <div class="cx-dialog-message info-message" aria-live="assertive" aria-atomic="true">
-                <cx-message
-                  [text]="'s4omOrder.attachments.dialog.empty' | cxTranslate"
-                  [type]="globalMessageType.MSG_TYPE_INFO"
-                  [isVisibleCloseButton]="false"
-                >
-                </cx-message>
-              </div>
+              <cx-message
+                [text]="'s4omOrder.attachments.dialog.empty' | cxTranslate"
+                [type]="globalMessageType.MSG_TYPE_INFO"
+                [isVisibleCloseButton]="false"
+                class="cx-dialog-message info-message"
+              >
+              </cx-message>
             }
           </table>
         } @else {
-          <div class="cx-dialog-message error-message" aria-live="assertive" aria-atomic="true">
-            <cx-message
-              [text]="'s4omOrder.attachments.dialog.error' | cxTranslate"
-              [type]="globalMessageType.MSG_TYPE_ERROR"
-              [isVisibleCloseButton]="false"
-            >
-            </cx-message>
-          </div>
+          <cx-message
+            [text]="'s4omOrder.attachments.dialog.error' | cxTranslate"
+            [type]="globalMessageType.MSG_TYPE_ERROR"
+            [isVisibleCloseButton]="false"
+            class="cx-dialog-message error-message"
+          >
+          </cx-message>
         }
       } @else {
         <div class="cx-spinner">

integration-libs/s4om/components/order-detail-attachments/attachments-dialog/s4om-attachments-dialog.component.ts

@@ -103,7 +103,7 @@ export class S4omAttachmentsDialogComponent {
     link.href = blobUrl;
     link.target = '_blank';
     link.rel = 'noopener noreferrer';
-    link.download = fileName as string;
+    link.download = fileName;
     document.body.appendChild(link);
     link.click();
     document.body.removeChild(link);
@@ -127,7 +127,8 @@ export class S4omAttachmentsDialogComponent {
   }
 
   addErrorMessage(attachmentId: string): void {
-    this.erroredAttachments.push(`${attachmentId}_${this.errorCounter++}`);
+    this.erroredAttachments.push(`${attachmentId}_${this.errorCounter}`);
+    this.errorCounter++;
     this.cd.detectChanges();
   }
 

integration-libs/s4om/root/model/augmented-core.model.ts

@@ -6,7 +6,6 @@
 
 import '@spartacus/cart/base/root';
 import { ScheduleLine } from './schedule-line.model';
-
 import { LAUNCH_CALLER } from '@spartacus/storefront';
 
 declare module '@spartacus/storefront' {

integration-libs/s4om/styles/_attachments-dialog.scss

@@ -71,10 +71,6 @@ cx-s4om-order-attachments-dialog {
           box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
         }
       }
-
-      //.cx-dialog-message {
-      //  padding-right: 30px;
-      //}
     }
 
     .cx-dialog-footer {

projects/schematics/src/dependencies.json

@@ -457,6 +457,7 @@
     "@angular/core": "^19.1.8",
     "@spartacus/cart": "2211.38.0-1",
     "@spartacus/core": "2211.38.0-1",
+    "@spartacus/order": "2211.38.0-1",
     "@spartacus/pdf-invoices": "2211.38.0-1",
     "@spartacus/requested-delivery-date": "2211.38.0-1",
     "@spartacus/schematics": "2211.38.0-1",