fix(module:notification): don't create new messageId for update (#8000)

* fix(module:notification): don't create new messageId for update

* refactor(module:notification): remove useless code

* chore: update gitignore

Author: Nicoss54

.gitignore

@@ -54,3 +54,5 @@ report.*.json
 # System Files
 .DS_Store
 Thumbs.db
+
+monospace.json

components/message/base.ts

@@ -101,16 +101,15 @@ export abstract class NzMNContainerComponent implements OnInit, OnDestroy {
   }
 
   remove(id: string, userAction: boolean = false): void {
-    this.instances.some((instance, index) => {
-      if (instance.messageId === id) {
+    this.instances
+      .map((instance, index) => ({ index, instance }))
+      .filter(({ instance }) => instance.messageId === id)
+      .forEach(({ index, instance }) => {
         this.instances.splice(index, 1);
         this.instances = [...this.instances];
         this.onRemove(instance, userAction);
         this.readyInstances();
-        return true;
-      }
-      return false;
-    });
+      });
   }
 
   removeAll(): void {

components/notification/notification.service.ts

@@ -70,7 +70,7 @@ export class NzNotificationService extends NzMNService {
       ...message,
       ...{
         createdAt: new Date(),
-        messageId: this.generateMessageId(),
+        messageId: options?.nzKey || this.generateMessageId(),
         options
       }
     });

components/notification/notification.spec.ts

@@ -5,7 +5,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 
 import { HomeOutline } from '@ant-design/icons-angular/icons';
 
-import { NzConfigService, NZ_CONFIG } from 'ng-zorro-antd/core/config';
+import { NZ_CONFIG, NzConfigService } from 'ng-zorro-antd/core/config';
 import { dispatchMouseEvent } from 'ng-zorro-antd/core/testing';
 import { ComponentBed, createComponentBed } from 'ng-zorro-antd/core/testing/component-bed';
 import { NZ_ICONS } from 'ng-zorro-antd/icon';
@@ -218,9 +218,12 @@ describe('NzNotification', () => {
   });
 
   it('should update an existing notification when keys are matched', () => {
-    notificationService.create('', '', 'EXISTS', { nzKey: 'exists' });
+    let messageId: string | null = null;
+    messageId = notificationService.create('', '', 'EXISTS', { nzKey: 'exists' }).messageId;
     expect(overlayContainerElement.textContent).toContain('EXISTS');
-    notificationService.create('success', 'Title', 'SHOULD NOT CHANGE', { nzKey: 'exists' });
+    expect(messageId).toEqual('exists');
+    messageId = notificationService.create('success', 'Title', 'SHOULD NOT CHANGE', { nzKey: 'exists' }).messageId;
+    expect(messageId).toEqual('exists');
     expect(overlayContainerElement.textContent).not.toContain('EXISTS');
     expect(overlayContainerElement.textContent).toContain('Title');
     expect(overlayContainerElement.textContent).toContain('SHOULD NOT CHANGE');