fix(editor): fix-misc-issues-with-dashboard-views

geonetwork · Sep 20, 2024 · a98e713 · a98e713
1 parent 66a3379
commit a98e713
Show file tree

Hide file tree

Showing 43 changed files with 615 additions and 781 deletions.
diff --git a/apps/metadata-editor-e2e/src/e2e/dashboard.cy.ts b/apps/metadata-editor-e2e/src/e2e/dashboard.cy.ts
@@ -187,7 +187,7 @@ describe('dashboard', () => {
       cy.get('@draft')
         .children('div')
         .eq(5)
-        .should('contain', ' Not published ')
+        .should('include.text', 'Not published')
       cy.get('@draft').children('div').eq(6).should('contain', ' - ')
       cy.clearRecordDrafts()
     })
@@ -204,7 +204,11 @@ describe('dashboard', () => {
         .find('span')
         .invoke('text')
         .should('eq', 'admin admin')
-      cy.get('@record').children('div').eq(5).should('contain', ' Published ')
+      cy.get('@record')
+        .children('div')
+        .eq(5)
+        .find('span')
+        .should('include.text', 'Published')
       cy.get('@record').children('div').eq(6).should('not.contain', ' - ')
       cy.clearRecordDrafts()
     })

diff --git a/apps/metadata-editor-e2e/src/e2e/edit.cy.ts b/apps/metadata-editor-e2e/src/e2e/edit.cy.ts
@@ -1,9 +1,10 @@
 /* eslint-disable cypress/no-unnecessary-waiting */
 
 describe('editor form', () => {
-  let recordUuid
+  let recordUuid: any
   before(() => {
     cy.login('admin', 'admin', false)
+    cy.viewport(1920, 2400)
 
     cy.clearRecordDrafts()
 
@@ -53,6 +54,7 @@ describe('editor form', () => {
   })
   beforeEach(() => {
     cy.login('admin', 'admin', false)
+    cy.visit('/catalog/search')
     cy.wrap(recordUuid).as('recordUuid')
 
     cy.get('@recordUuid').then((recordUuid) => {

diff --git a/apps/metadata-editor-e2e/src/e2e/my-org.cy.ts b/apps/metadata-editor-e2e/src/e2e/my-org.cy.ts
diff --git a/apps/metadata-editor-e2e/src/e2e/record-actions.cy.ts b/apps/metadata-editor-e2e/src/e2e/record-actions.cy.ts
@@ -4,6 +4,7 @@ describe('record-actions', () => {
     cy.visit('/catalog/search')
   })
   describe('delete', () => {
+    const recordId = `TEST_RECORD_${Date.now()}`
     describe('record with draft', () => {
       it('should delete the record, delete its associated draft and refresh the interface', () => {
         // First create a record and its draft
@@ -13,13 +14,15 @@ describe('record-actions', () => {
           .as('abstractField')
           .focus()
         cy.get('@abstractField').type('record abstract')
+        cy.get('[data-test="recordTitleInput"]').click()
+        cy.get('[data-test="recordTitleInput"]').type('{selectAll}{backspace}')
+        cy.get('[data-test="recordTitleInput"]').type(recordId)
         cy.intercept({
           method: 'PUT',
           pathname: '**/records',
         }).as('insertRecord')
         cy.get('md-editor-publish-button').click()
         cy.wait('@insertRecord')
-        cy.get('@abstractField').focus()
         cy.get('@abstractField').type('draft abstract')
         // Assert that the draft exists in the local storage
         cy.editor_readFormUniqueIdentifier().then((uniqueIdentifier) =>
@@ -31,18 +34,17 @@ describe('record-actions', () => {
         )
         cy.visit('/my-space/my-records')
         cy.get('[data-cy="table-row"]')
-          .contains('My new record')
+          .contains(recordId)
           .should('have.length', 1)
         cy.get('[data-cy="dashboard-drafts-count"]').should('contain', '1')
         // Delete the record
         cy.get('[data-test="record-menu-button"]').last().click()
         cy.get('[data-test="record-menu-delete-button"]').click()
         cy.get('[data-cy="confirm-button"]').click()
         cy.get('[data-cy="table-row"]')
-          .contains('My new record')
+          .contains(recordId)
           .should('have.length', 0)
         cy.get('gn-ui-notification').should('contain', 'Delete success')
-        cy.get('[data-cy="dashboard-drafts-count"]').should('contain', '0')
       })
     })
 
@@ -51,6 +53,9 @@ describe('record-actions', () => {
         // First create a draft
         cy.get('[data-cy="create-record"]').click()
         cy.url().should('include', '/create')
+        cy.get('[data-test="recordTitleInput"]').click()
+        cy.get('[data-test="recordTitleInput"]').type('{selectAll}{backspace}')
+        cy.get('[data-test="recordTitleInput"]').type(recordId)
         cy.get('gn-ui-form-field[ng-reflect-model=abstract] textarea')
           .as('abstractField')
           .focus()
@@ -63,17 +68,14 @@ describe('record-actions', () => {
         })
         cy.visit('/my-space/my-draft')
         cy.get('[data-cy="table-row"]')
-          .contains('My new record')
+          .contains(recordId)
           .should('have.length', 1)
         cy.get('[data-cy="dashboard-drafts-count"]').should('contain', '1')
         // Delete the draft
         cy.get('[data-test="record-menu-button"]').click()
         cy.get('[data-test="record-menu-delete-button"]').click()
         cy.get('[data-cy="confirm-button"]').click()
-        cy.get('[data-cy="table-row"]')
-          .contains('New record')
-          .should('have.length', 0)
-        cy.get('[data-cy="dashboard-drafts-count"]').should('contain', '0')
+        cy.get('[data-cy="table-row"]').should('not.exist')
       })
     })
   })

diff --git a/apps/metadata-editor/src/app/app.routes.ts b/apps/metadata-editor/src/app/app.routes.ts
@@ -5,12 +5,11 @@ import { EditPageComponent } from './edit/edit-page.component'
 import { EditRecordResolver } from './edit-record.resolver'
 import { MyRecordsComponent } from './records/my-records/my-records.component'
 import { MyDraftComponent } from './records/my-draft/my-draft.component'
-import { MyLibraryComponent } from './records/my-library/my-library.component'
-import { SearchRecordsComponent } from './records/search-records/search-records-list.component'
+import { TemplatesComponent } from './records/templates/templates.component'
 import { MyOrgUsersComponent } from './my-org-users/my-org-users.component'
-import { MyOrgRecordsComponent } from './records/my-org-records/my-org-records.component'
 import { NewRecordResolver } from './new-record.resolver'
 import { DuplicateRecordResolver } from './duplicate-record.resolver'
+import { AllRecordsComponent } from './records/all-records/all-records.component'
 
 export const appRoutes: Route[] = [
   { path: '', redirectTo: 'catalog/search', pathMatch: 'prefix' },
@@ -26,35 +25,30 @@ export const appRoutes: Route[] = [
       },
       {
         path: 'discussion',
-        component: SearchRecordsComponent,
+        component: AllRecordsComponent,
         pathMatch: 'prefix',
       },
       {
         path: 'calendar',
-        component: SearchRecordsComponent,
+        component: AllRecordsComponent,
         pathMatch: 'prefix',
       },
       {
         path: 'contacts',
-        component: SearchRecordsComponent,
+        component: AllRecordsComponent,
         pathMatch: 'prefix',
       },
       {
         path: 'thesaurus',
-        component: SearchRecordsComponent,
+        component: AllRecordsComponent,
         pathMatch: 'prefix',
       },
       {
         path: 'search',
         title: 'Search Records',
-        component: SearchRecordsComponent,
+        component: AllRecordsComponent,
         pathMatch: 'prefix',
       },
-      {
-        path: 'my-org',
-        title: 'My Organisation',
-        component: MyOrgRecordsComponent,
-      },
     ],
   },
   {
@@ -78,7 +72,7 @@ export const appRoutes: Route[] = [
       {
         path: 'templates',
         title: 'Templates',
-        component: MyLibraryComponent,
+        component: TemplatesComponent,
         pathMatch: 'prefix',
       },
     ],

diff --git a/apps/metadata-editor/src/app/dashboard/dashboard-menu/dashboard-menu.component.html b/apps/metadata-editor/src/app/dashboard/dashboard-menu/dashboard-menu.component.html
@@ -71,11 +71,11 @@
     >
       <mat-icon class="material-symbols-outlined">edit_note</mat-icon>
       <span translate="">dashboard.records.myDraft</span>
-      <gn-ui-badge
-        [style.--gn-ui-badge-rounded]="'100px'"
-        data-cy="dashboard-drafts-count"
-        >{{ draftsCount$ | async }}</gn-ui-badge
-      >
+      <ng-container *ngIf="draftsCount$ | async as draftsCount">
+        <gn-ui-badge *ngIf="draftsCount > 0" data-cy="dashboard-drafts-count">{{
+          draftsCount
+        }}</gn-ui-badge>
+      </ng-container>
     </a>
     <a
       class="menu-item btn-inactive"

diff --git a/apps/metadata-editor/src/app/dashboard/dashboard-page.component.html b/apps/metadata-editor/src/app/dashboard/dashboard-page.component.html
@@ -4,7 +4,7 @@
       <md-editor-sidebar></md-editor-sidebar>
     </aside>
     <div class="grow flex flex-col">
-      <header class="shrink-0 border-b border-blue-300">
+      <header class="shrink-0 border-b border-gray-300">
         <md-editor-search-header></md-editor-search-header>
       </header>
       <div class="relative">

diff --git a/apps/metadata-editor/src/app/dashboard/search-header/search-header.component.css b/apps/metadata-editor/src/app/dashboard/search-header/search-header.component.css
@@ -1,8 +1,8 @@
 :host ::ng-deep gn-ui-autocomplete input {
-  @apply bg-blue-50 rounded-3xl shadow-none !py-2 !px-8 !pl-14 hover:shadow-none focus:outline-4 focus:outline-offset-1 focus:outline-blue-100 focus:outline-dotted;
+  @apply rounded-3xl shadow-none !py-2 !px-8 !pl-14 hover:shadow-none;
 }
 :host ::ng-deep gn-ui-autocomplete button {
-  @apply bg-blue-50 hover:bg-blue-50 border-none shadow-none hover:shadow-none text-gray-500 hover:text-gray-600 left-0 right-auto rounded-3xl;
+  @apply border-none shadow-none hover:shadow-none text-gray-500 hover:text-gray-600 left-0 right-auto rounded-3xl;
 }
 
 ::ng-deep .mdc-menu-surface.mat-mdc-autocomplete-panel {

diff --git a/apps/metadata-editor/src/app/dashboard/search-header/search-header.component.html b/apps/metadata-editor/src/app/dashboard/search-header/search-header.component.html
@@ -1,6 +1,8 @@
 <div class="py-3 px-12 flex justify-between w-full">
   <div class="w-2/3">
-    <gn-ui-fuzzy-search></gn-ui-fuzzy-search>
+    <gn-ui-fuzzy-search
+      style="--gn-ui-text-input-border-size: 0px"
+    ></gn-ui-fuzzy-search>
   </div>
   <div class="flex gap-5 items-center">
     <button [title]="'editor.temporary.disabled' | translate" disabled>

diff --git a/...cords/my-library/my-library.component.css → ...rds/all-records/all-records.component.css b/...cords/my-library/my-library.component.css → ...rds/all-records/all-records.component.css
diff --git a/...ecords/search-records-list.component.html → ...ds/all-records/all-records.component.html b/...ecords/search-records-list.component.html → ...ds/all-records/all-records.component.html
@@ -65,23 +65,5 @@ <h1 class="text-[16px] text-main font-title font-bold" translate>
     </gn-ui-button>
   </div>
 
-  <div
-    class="shadow-md shadow-gray-300 border-[1px] border-gray-200 overflow-hidden rounded bg-white grow mx-[32px] my-[16px]"
-  >
-    <gn-ui-results-table-container
-      class="text-[14px]"
-      (recordClick)="editRecord($event)"
-      (duplicateRecord)="duplicateRecord($event)"
-    ></gn-ui-results-table-container>
-
-    <div class="px-5 py-5 flex justify-center gap-8 items-baseline">
-      <div class="grow">
-        <gn-ui-pagination-buttons
-          [currentPage]="searchFacade.currentPage$ | async"
-          [totalPages]="searchFacade.totalPages$ | async"
-          (newCurrentPageEvent)="searchService.setPage($event)"
-        ></gn-ui-pagination-buttons>
-      </div>
-    </div>
-  </div>
+  <md-editor-records-list></md-editor-records-list>
 </main>