fix: various fixes on subscriptions

geonetwork · Dec 19, 2024 · e21ae72 · e21ae72
1 parent c8ce8fe
commit e21ae72
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 15 deletions.
diff --git a/apps/metadata-editor/src/app/edit/components/top-toolbar/top-toolbar.component.html b/apps/metadata-editor/src/app/edit/components/top-toolbar/top-toolbar.component.html
@@ -69,7 +69,5 @@
   >
     <ng-icon name="iconoirBadgeCheck"></ng-icon>
   </gn-ui-button> -->
-  <md-editor-publish-button
-    [publishWarning]="publishWarning"
-  ></md-editor-publish-button>
+  <md-editor-publish-button></md-editor-publish-button>
 </div>
diff --git a/apps/metadata-editor/src/app/edit/components/top-toolbar/top-toolbar.component.ts b/apps/metadata-editor/src/app/edit/components/top-toolbar/top-toolbar.component.ts
@@ -61,7 +61,6 @@ import {
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class TopToolbarComponent {
-  @Input() publishWarning = []
   protected SaveStatus = [
     'draft_only', // => when creating a record
     'record_up_to_date', // => when the record was just published (ie saved on the server)

diff --git a/apps/metadata-editor/src/app/edit/edit-page.component.html b/apps/metadata-editor/src/app/edit/edit-page.component.html
@@ -4,28 +4,21 @@
   </aside>
   <div class="flex flex-col h-full w-full">
     <div class="w-full h-auto shrink-0 relative">
-<<<<<<< HEAD
       <md-editor-top-toolbar></md-editor-top-toolbar>
-      <div class="absolute top-full left-0 w-2/3 z-50 pointer-events-none">
-=======
-      <md-editor-top-toolbar
-        [publishWarning]="hasRecordChanged$ | async"
-      ></md-editor-top-toolbar>
       <div class="absolute top-full left-0 w-2/3 z-10 pointer-events-none">
->>>>>>> 4aeaddd7f (feat: warning in toolbar)
         <gn-ui-notifications-container></gn-ui-notifications-container>
       </div>
     </div>
     <div class="grow overflow-auto p-[32px]" #scrollContainer>
       <div class="container-lg mx-auto flex flex-col gap-[32px]">
         <div *ngIf="hasRecordChanged$ | async as hasChanged">
           <div
-            *ngIf="hasChanged.length > 0"
+            *ngIf="hasChanged.user && hasChanged.date"
             class="p-4 border border-primary bg-primary-lightest rounded-lg text-center"
             translate
             [translateParams]="{
-              date: hasChanged[0],
-              user: hasChanged[1]
+              date: formatDate(hasChanged.date),
+              user: hasChanged.user
             }"
             data-test="draft-alert"
           >

diff --git a/apps/metadata-editor/src/app/edit/edit-page.component.ts b/apps/metadata-editor/src/app/edit/edit-page.component.ts
@@ -137,6 +137,12 @@ export class EditPageComponent implements OnInit, OnDestroy {
       })
     )
 
+    this.subscription.add(
+      this.facade.record$.subscribe((record) => {
+        this.facade.checkHasRecordChanged(record)
+      })
+    )
+
     // if we're on the /create route, go to /edit/{uuid} on first change
     if (this.route.snapshot.routeConfig?.path.includes('create')) {
       this.subscription.add(
@@ -165,7 +171,7 @@ export class EditPageComponent implements OnInit, OnDestroy {
 
     this.subscription.add(
       this.facade.record$.subscribe((record) => {
-        this.facade.hasRecordChangedSinceDraft(record)
+        this.facade.checkHasRecordChanged(record)
       })
     )
   }
@@ -199,4 +205,14 @@ export class EditPageComponent implements OnInit, OnDestroy {
       top: 0,
     })
   }
+
+  formatDate(date: Date): string {
+    return date.toLocaleDateString(this.translateService.currentLang, {
+      year: 'numeric',
+      month: 'long',
+      day: 'numeric',
+      hour: 'numeric',
+      minute: 'numeric',
+    })
+  }
 }