Code review fixes

geonetwork · Apr 29, 2024 · dd46dc9 · dd46dc9
1 parent 651d488
commit dd46dc9
Show file tree

Hide file tree

Showing 14 changed files with 53 additions and 19 deletions.
diff --git a/apps/datahub-e2e/src/e2e/datasetDetailPage.cy.ts b/apps/datahub-e2e/src/e2e/datasetDetailPage.cy.ts
@@ -703,7 +703,7 @@ describe('userFeedback', () => {
       cy.get('@commentText')
         .first()
         .then((div) => {
-          const premierCommentaireAvantTri = div.text().trim()
+          const firstCommentBeforeSort = div.text().trim()
           cy.get('@userFeedback')
             .find('gn-ui-dropdown-selector')
             .openDropdown()
@@ -718,10 +718,8 @@ describe('userFeedback', () => {
             .find('[data-cy="commentText"]')
             .first()
             .then((div) => {
-              const premierCommentaireApresTri = div.text().trim()
-              expect(premierCommentaireAvantTri).to.not.eq(
-                premierCommentaireApresTri
-              )
+              const firstCommentAfterSort = div.text().trim()
+              expect(firstCommentBeforeSort).to.not.eq(firstCommentAfterSort)
             })
         })
     })
@@ -736,11 +734,6 @@ describe('userFeedback', () => {
     beforeEach(() => {
       cy.login()
       cy.visit('/dataset/accroche_velos')
-      cy.get('datahub-record-user-feedbacks').as('userFeedback')
-
-      cy.get('gn-ui-user-feedback-item')
-        .find('[data-cy="commentText"]')
-        .as('commentText')
     })
     it('should publish a comment', () => {
       cy.get('datahub-record-user-feedbacks')

diff --git a/apps/datahub/src/app/record/record-user-feedbacks/record-user-feedbacks.component.html b/apps/datahub/src/app/record/record-user-feedbacks/record-user-feedbacks.component.html
@@ -21,7 +21,7 @@
 </ng-container>
 
 <ng-template #userFeedbacksSection>
-  <ng-container *ngIf="activeUser; else annonymousUser">
+  <ng-container *ngIf="activeUser; else anonymousUser">
     <div class="flex flex-col h-auto w-full">
       <div class="flex flex-row items-center w-full h-auto gap-3 px-6">
         <mat-icon class="material-symbols-outlined grow-0">edit</mat-icon>
@@ -64,12 +64,12 @@
       </div>
     </div>
   </ng-container>
-  <ng-template #annonymousUser>
+  <ng-template #anonymousUser>
     <div class="flex flex-row items-center gap-3 w-full h-auto px-6">
       <mat-icon class="material-symbols-outlined grow-0">edit</mat-icon>
       <span translate>record.metadata.userFeedbacks.anonymousUser</span>
       <a
-        [href]="this.loginUrl"
+        [href]="loginUrl"
         class="gn-ui-btn-primary uppercase flex flex-row items-center gap-2 ml-auto"
         translate
       >

diff --git a/apps/datahub/src/app/record/record-user-feedbacks/record-user-feedbacks.component.spec.ts b/apps/datahub/src/app/record/record-user-feedbacks/record-user-feedbacks.component.spec.ts
@@ -19,18 +19,24 @@ import {
   SOME_USER_FEEDBACKS,
   USER_FIXTURE,
 } from '@geonetwork-ui/common/fixtures'
-import { UserFeedbackViewModel } from '@geonetwork-ui/common/domain/model/record'
+import {
+  UserFeedback,
+  UserFeedbackViewModel,
+} from '@geonetwork-ui/common/domain/model/record'
 import { Gn4PlatformMapper } from '@geonetwork-ui/api/repository'
 
 describe('RelatedRecordsComponent', () => {
   const allUserFeedbacks = SOME_USER_FEEDBACKS
   let mockDestroy$: Subject<void>
 
+  const activeUser = USER_FIXTURE()
+
   const mdViewFacadeMock: Partial<MdViewFacade> = {
     isAllUserFeedbackLoading$: new BehaviorSubject(false),
     isAddUserFeedbackLoading$: new BehaviorSubject(false),
     loadUserFeedbacks: jest.fn(),
     userFeedbacks$: of(allUserFeedbacks),
+    addUserFeedback: jest.fn(),
   }
 
   const gn4PlatformMapperMock: Partial<Gn4PlatformMapper> = {
@@ -48,7 +54,7 @@ describe('RelatedRecordsComponent', () => {
 
   const platformServiceInterfaceMock: Partial<PlatformServiceInterface> = {
     getUserFeedbacks: jest.fn(),
-    getMe: jest.fn(() => new BehaviorSubject(USER_FIXTURE())),
+    getMe: jest.fn(() => new BehaviorSubject(activeUser)),
   }
 
   let component: RecordUserFeedbacksComponent
@@ -127,4 +133,28 @@ describe('RelatedRecordsComponent', () => {
       ).toBe(2)
     })
   })
+
+  describe('publishNewComment()', () => {
+    it('should publish the new userFeedback', () => {
+      const expectedNewUserFeedback: UserFeedback = {
+        uuid: undefined,
+        comment: 'TEST',
+        metadataUUID: 'accroche_velos',
+        parentUuid: null,
+        published: true,
+        date: expect.any(Date),
+        authorUserId: activeUser.id,
+        authorEmail: activeUser.email,
+        authorName: `${activeUser.name} ${activeUser.surname}`,
+      }
+
+      component.newComment = 'TEST'
+      component.metadataUuid = 'accroche_velos'
+      fixture.detectChanges()
+      component.publishNewComment()
+      expect(mdViewFacadeMock.addUserFeedback).toHaveBeenCalledWith(
+        expectedNewUserFeedback
+      )
+    })
+  })
 })
diff --git a/apps/datahub/src/app/record/record-user-feedbacks/record-user-feedbacks.component.ts b/apps/datahub/src/app/record/record-user-feedbacks/record-user-feedbacks.component.ts
@@ -18,6 +18,7 @@ import { DropdownChoice } from '@geonetwork-ui/ui/inputs'
 import { MdViewFacade } from '@geonetwork-ui/feature/record'
 import { TranslateService } from '@ngx-translate/core'
 import { AuthService, Gn4PlatformMapper } from '@geonetwork-ui/api/repository'
+import { UserApiModel } from '@geonetwork-ui/data-access/gn4'
 
 type UserFeedbackSortingFunction = (
   userFeedbackA: UserFeedback,
@@ -175,8 +176,8 @@ export class RecordUserFeedbacksComponent implements OnInit, OnDestroy {
   }
 
   onNewUserFeedbackAnswer(newUserFeedback: UserFeedbackViewModel) {
-    delete newUserFeedback.avatarUrl
-    this.newUserFeedback(newUserFeedback)
+    const userFeedBack = this.mapper.userFeedbacksFromApi(newUserFeedback)
+    this.newUserFeedback(userFeedBack)
   }
 
   publishNewComment() {

diff --git a/libs/api/repository/src/lib/gn4/platform/gn4-platform.mapper.ts b/libs/api/repository/src/lib/gn4/platform/gn4-platform.mapper.ts
@@ -73,7 +73,7 @@ export class Gn4PlatformMapper {
     })
   }
 
-  userFeedbacksFromApi(userFeedback: UserFeedbackDTOApiModel): UserFeedback {
+  userFeedbacksFromApi(userFeedback: any): UserFeedback {
     return {
       uuid: userFeedback.uuid,
       metadataUUID: userFeedback.metadataUUID,

diff --git a/libs/ui/elements/src/lib/user-feedback-item/user-feedback-item.component.html b/libs/ui/elements/src/lib/user-feedback-item/user-feedback-item.component.html
@@ -52,7 +52,9 @@
           [disabled]="isAddUserFeedbackLoading"
           [type]="'outline'"
           (buttonClick)="publishNewAnswer()"
-          title="Publish"
+          [title]="
+            'record.metadata.userFeedbacks.newAnswer.buttonTitle' | translate
+          "
           extraClass="!p-[0.5em] text-primary-darker border-primary-darker h-9"
         >
           <mat-icon

diff --git a/translations/de.json b/translations/de.json
@@ -286,6 +286,7 @@
   "record.metadata.userFeedbacks.sortSelector.choices.oldestFirst": "",
   "record.metadata.userFeedbacks.newComment.placeholder": "",
   "record.metadata.userFeedbacks.newAnswer.placeholder": "",
+  "record.metadata.userFeedbacks.newAnswer.buttonTitle": "",
   "record.metadata.sheet": "Weitere Informationen verfügbar unter:",
   "record.metadata.status": "Status",
   "record.metadata.technical": "Technische Informationen",

diff --git a/translations/en.json b/translations/en.json
@@ -286,6 +286,7 @@
   "record.metadata.userFeedbacks.sortSelector.choices.oldestFirst": "Oldest comments first",
   "record.metadata.userFeedbacks.newComment.placeholder": "Write your comment here...",
   "record.metadata.userFeedbacks.newAnswer.placeholder": "Answer...",
+  "record.metadata.userFeedbacks.newAnswer.buttonTitle": "Publish",
   "record.metadata.sheet": "Original metadata",
   "record.metadata.status": "Status",
   "record.metadata.technical": "Technical information",

diff --git a/translations/es.json b/translations/es.json
@@ -286,6 +286,7 @@
   "record.metadata.userFeedbacks.sortSelector.choices.oldestFirst": "",
   "record.metadata.userFeedbacks.newComment.placeholder": "",
   "record.metadata.userFeedbacks.newAnswer.placeholder": "",
+  "record.metadata.userFeedbacks.newAnswer.buttonTitle": "",
   "record.metadata.sheet": "",
   "record.metadata.status": "",
   "record.metadata.technical": "",

diff --git a/translations/fr.json b/translations/fr.json
@@ -286,6 +286,7 @@
   "record.metadata.userFeedbacks.sortSelector.choices.oldestFirst": "Les plus anciens en premier",
   "record.metadata.userFeedbacks.newComment.placeholder": "Rédiger votre commentaire ici...",
   "record.metadata.userFeedbacks.newAnswer.placeholder": "Répondre...",
+  "record.metadata.userFeedbacks.newAnswer.buttonTitle": "Publier",
   "record.metadata.sheet": "Fiche de métadonnées d'origine",
   "record.metadata.status": "Statut",
   "record.metadata.technical": "Informations techniques",

diff --git a/translations/it.json b/translations/it.json
@@ -286,6 +286,7 @@
   "record.metadata.userFeedbacks.sortSelector.choices.oldestFirst": "",
   "record.metadata.userFeedbacks.newComment.placeholder": "",
   "record.metadata.userFeedbacks.newAnswer.placeholder": "",
+  "record.metadata.userFeedbacks.newAnswer.buttonTitle": "",
   "record.metadata.sheet": "Origine del metadata",
   "record.metadata.status": "Stato",
   "record.metadata.technical": "Informazioni tecniche",

diff --git a/translations/nl.json b/translations/nl.json
@@ -286,6 +286,7 @@
   "record.metadata.userFeedbacks.sortSelector.choices.oldestFirst": "",
   "record.metadata.userFeedbacks.newComment.placeholder": "",
   "record.metadata.userFeedbacks.newAnswer.placeholder": "",
+  "record.metadata.userFeedbacks.newAnswer.buttonTitle": "",
   "record.metadata.sheet": "",
   "record.metadata.status": "",
   "record.metadata.technical": "",

diff --git a/translations/pt.json b/translations/pt.json
@@ -286,6 +286,7 @@
   "record.metadata.userFeedbacks.sortSelector.choices.oldestFirst": "",
   "record.metadata.userFeedbacks.newComment.placeholder": "",
   "record.metadata.userFeedbacks.newAnswer.placeholder": "",
+  "record.metadata.userFeedbacks.newAnswer.buttonTitle": "",
   "record.metadata.sheet": "",
   "record.metadata.status": "",
   "record.metadata.technical": "",

diff --git a/translations/sk.json b/translations/sk.json
@@ -286,6 +286,7 @@
   "record.metadata.userFeedbacks.sortSelector.choices.oldestFirst": "",
   "record.metadata.userFeedbacks.newComment.placeholder": "",
   "record.metadata.userFeedbacks.newAnswer.placeholder": "",
+  "record.metadata.userFeedbacks.newAnswer.buttonTitle": "",
   "record.metadata.sheet": "Ďalšie metadáta sú k dispozícii na:",
   "record.metadata.status": "Stav",
   "record.metadata.technical": "",