class="flex flex-row items-center mx-[32px] my-[16px] py-[8px] gap-[16px]"
>
- dashboard.results.listMetadata
+ dashboard.results.listMetadata
- dashboard.results.listResources
+ dashboard.results.listResources
-
+
-
-
-
-
dashboard.records.myDraft
@@ -6,7 +7,7 @@
+
diff --git a/apps/metadata-editor/src/app/records/my-records/my-records-state-wrapper.component.ts b/apps/metadata-editor/src/app/records/my-records/my-records-state-wrapper.component.ts
new file mode 100644
index 0000000000..4add9d4b58
--- /dev/null
+++ b/apps/metadata-editor/src/app/records/my-records/my-records-state-wrapper.component.ts
@@ -0,0 +1,14 @@
+import { ChangeDetectionStrategy, Component } from '@angular/core'
+import { MyRecordsComponent } from './my-records.component'
+import { FeatureSearchModule } from '@geonetwork-ui/feature/search'
+import { CommonModule } from '@angular/common'
+
+@Component({
+ selector: 'md-editor-my-records-state-wrapper',
+ templateUrl: './my-records-state-wrapper.component.html',
+ styles: [],
+ standalone: true,
+ imports: [CommonModule, FeatureSearchModule, MyRecordsComponent],
+ changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class MyRecordsStateWrapperComponent {}
diff --git a/apps/metadata-editor/src/app/records/my-records/my-records.component.css b/apps/metadata-editor/src/app/records/my-records/my-records.component.css
index e69de29bb2..157df3d655 100644
--- a/apps/metadata-editor/src/app/records/my-records/my-records.component.css
+++ b/apps/metadata-editor/src/app/records/my-records/my-records.component.css
@@ -0,0 +1,4 @@
+/* set max-height for overflow-y-auto */
+main {
+ max-height: calc(100vh - 60px);
+}
diff --git a/apps/metadata-editor/src/app/records/my-records/my-records.component.html b/apps/metadata-editor/src/app/records/my-records/my-records.component.html
index 049f7af0c3..95da1b8ed8 100644
--- a/apps/metadata-editor/src/app/records/my-records/my-records.component.html
+++ b/apps/metadata-editor/src/app/records/my-records/my-records.component.html
@@ -1,5 +1,82 @@
-
+
+
+
+
+
+ + dashboard.records.search +
+
+
+ + dashboard.records.myRecords +
+
+
+
+
+ dashboard.importRecord
+ keyboard_arrow_down
+ keyboard_arrow_up
+
+
+
+
+ edit_document
+ dashboard.createRecord
+
+
+
+
+ dashboard.myRecords.publishedMetadatas
+
+
+ dashboard.myRecords.currentlyEdited
+
+
+
-
let router: Router
let searchService: SearchService
+ let searchFacade: SearchFacade
beforeEach(() => {
TestBed.configureTestingModule({
@@ -97,6 +98,7 @@ describe('RecordsListComponent', () => {
})
router = TestBed.inject(Router)
searchService = TestBed.inject(SearchService)
+ searchFacade = TestBed.inject(SearchFacade)
fixture = TestBed.createComponent(RecordsListComponent)
component = fixture.componentInstance
fixture.detectChanges()
@@ -106,6 +108,17 @@ describe('RecordsListComponent', () => {
expect(component).toBeTruthy()
})
+ describe('on init', () => {
+ it('sets search fields', () => {
+ expect(searchFacade.setConfigRequestFields).toHaveBeenCalledWith(
+ allSearchFields
+ )
+ })
+ it('sets page size', () => {
+ expect(searchFacade.setPageSize).toHaveBeenCalledWith(15)
+ })
+ })
+
describe('when search results', () => {
let table, pagination
beforeEach(() => {
diff --git a/apps/metadata-editor/src/app/records/records-list.component.ts b/apps/metadata-editor/src/app/records/records-list.component.ts
index c930da2a02..a286b499fe 100644
--- a/apps/metadata-editor/src/app/records/records-list.component.ts
+++ b/apps/metadata-editor/src/app/records/records-list.component.ts
@@ -1,5 +1,5 @@
import { CommonModule } from '@angular/common'
-import { Component, Input } from '@angular/core'
+import { Component, OnInit } from '@angular/core'
import { MatIconModule } from '@angular/material/icon'
import { Router } from '@angular/router'
import { CatalogRecord } from '@geonetwork-ui/common/domain/model/record'
@@ -14,7 +14,7 @@ import { TranslateModule } from '@ngx-translate/core'
import { UiInputsModule } from '@geonetwork-ui/ui/inputs'
import { RecordsCountComponent } from './records-count/records-count.component'
-const includes = [
+export const allSearchFields = [
'uuid',
'resourceTitleObject',
'createDate',
@@ -25,7 +25,6 @@ const includes = [
'link',
'owner',
]
-
@Component({
selector: 'md-editor-records-list',
templateUrl: './records-list.component.html',
@@ -42,28 +41,22 @@ const includes = [
RecordsCountComponent,
],
})
-export class RecordsListComponent {
- @Input() title: string
- @Input() logo: string
- @Input() linkToDatahub?: string
- @Input() userCount = 0
-
+export class RecordsListComponent implements OnInit {
constructor(
private router: Router,
public searchFacade: SearchFacade,
- public searchService: SearchService
- ) {
- this.searchFacade.setPageSize(15).setConfigRequestFields(includes)
+ private searchService: SearchService
+ ) {}
+
+ ngOnInit(): void {
+ this.searchFacade.setConfigRequestFields(allSearchFields)
+ this.searchFacade.setPageSize(15)
}
paginate(page: number) {
this.searchService.setPage(page)
}
- createRecord() {
- this.router.navigate(['/create'])
- }
-
editRecord(record: CatalogRecord) {
this.router.navigate(['/edit', record.uniqueIdentifier])
}
@@ -71,8 +64,4 @@ export class RecordsListComponent {
duplicateRecord(record: CatalogRecord) {
this.router.navigate(['/duplicate', record.uniqueIdentifier])
}
-
- showUsers() {
- this.router.navigate(['/users/my-org'])
- }
}
diff --git a/apps/metadata-editor/src/app/records/search-records/search-records-list.component.css b/apps/metadata-editor/src/app/records/search-records/search-records-list.component.css
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/apps/metadata-editor/src/app/records/search-records/search-records-list.component.spec.ts b/apps/metadata-editor/src/app/records/search-records/search-records-list.component.spec.ts
deleted file mode 100644
index d39c0a6771..0000000000
--- a/apps/metadata-editor/src/app/records/search-records/search-records-list.component.spec.ts
+++ /dev/null
@@ -1,235 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing'
-import { SearchFacade, SearchService } from '@geonetwork-ui/feature/search'
-import { SearchRecordsComponent } from './search-records-list.component'
-import {
- Component,
- CUSTOM_ELEMENTS_SCHEMA,
- EventEmitter,
- importProvidersFrom,
- Input,
- Output,
-} from '@angular/core'
-import { TranslateModule } from '@ngx-translate/core'
-import { BehaviorSubject } from 'rxjs'
-import { CatalogRecord } from '@geonetwork-ui/common/domain/model/record'
-import { CommonModule } from '@angular/common'
-import { MatIconModule } from '@angular/material/icon'
-import { UiInputsModule } from '@geonetwork-ui/ui/inputs'
-import { By } from '@angular/platform-browser'
-import { datasetRecordsFixture } from '@geonetwork-ui/common/fixtures'
-import { Router } from '@angular/router'
-
-const results = [{ md: true }]
-const currentPage = 5
-const totalPages = 25
-
-@Component({
- // eslint-disable-next-line @angular-eslint/component-selector
- selector: 'gn-ui-results-table-container',
- template: '',
- standalone: true,
-})
-export class ResultsTableContainerComponent {
- @Output() recordClick = new EventEmitter()
- @Output() duplicateRecord = new EventEmitter()
-}
-
-@Component({
- // eslint-disable-next-line @angular-eslint/component-selector
- selector: 'gn-ui-pagination-buttons',
- template: '',
- standalone: true,
-})
-export class PaginationButtonsComponent {
- @Input() currentPage = 1
- @Input() totalPages = 1
- @Input() hideButton = false
- @Output() newCurrentPageEvent = new EventEmitter()
-}
-
-@Component({
- selector: 'md-editor-records-count',
- template: '',
- standalone: true,
-})
-export class RecordsCountComponent {}
-
-class SearchFacadeMock {
- searchFilters$ = new BehaviorSubject({
- any: 'hello world',
- })
- results$ = new BehaviorSubject(results)
- currentPage$ = new BehaviorSubject(currentPage)
- totalPages$ = new BehaviorSubject(totalPages)
- resultsHits$ = new BehaviorSubject(1000)
- setConfigRequestFields = jest.fn(() => this)
- setPageSize = jest.fn(() => this)
- setSortBy = jest.fn(() => this)
- resetSearch = jest.fn()
-}
-
-class SearchServiceMock {
- setPage = jest.fn()
- setSortBy = jest.fn()
-}
-
-class RouterMock {
- navigate = jest.fn(() => Promise.resolve(true))
-}
-
-describe('SearchRecordsComponent', () => {
- let component: SearchRecordsComponent
- let fixture: ComponentFixture
- let router: Router
- let searchService: SearchService
- let searchFacade: SearchFacade
-
- beforeEach(() => {
- TestBed.configureTestingModule({
- schemas: [CUSTOM_ELEMENTS_SCHEMA],
- providers: [
- importProvidersFrom(TranslateModule.forRoot()),
- {
- provide: SearchFacade,
- useClass: SearchFacadeMock,
- },
- {
- provide: Router,
- useClass: RouterMock,
- },
- {
- provide: SearchService,
- useClass: SearchServiceMock,
- },
- ],
- }).overrideComponent(SearchRecordsComponent, {
- set: {
- imports: [
- CommonModule,
- TranslateModule,
- MatIconModule,
- ResultsTableContainerComponent,
- PaginationButtonsComponent,
- UiInputsModule,
- RecordsCountComponent,
- ],
- },
- })
- fixture = TestBed.createComponent(SearchRecordsComponent)
- router = TestBed.inject(Router)
- searchService = TestBed.inject(SearchService)
- searchFacade = TestBed.inject(SearchFacade)
-
- component = fixture.componentInstance
- fixture.detectChanges()
- })
-
- it('should create', () => {
- expect(component).toBeTruthy()
- })
-
- it('should map search filters to searchText$', (done) => {
- component.searchText$.subscribe((text) => {
- expect(text).toBe('hello world')
- done()
- })
- })
-
- describe('when clicking createRecord', () => {
- beforeEach(() => {
- component.createRecord()
- })
-
- it('navigates to the create record page', () => {
- expect(router.navigate).toHaveBeenCalledWith(['/create'])
- })
- })
-
- describe('when importing a record', () => {
- beforeEach(() => {
- component.duplicateExternalRecord()
- })
-
- it('sets isImportMenuOpen to true', () => {
- expect(component.isImportMenuOpen).toBe(true)
- })
- })
-
- describe('when closing the import menu', () => {
- let overlaySpy: any
-
- beforeEach(() => {
- overlaySpy = {
- dispose: jest.fn(),
- }
- component['overlayRef'] = overlaySpy
-
- component.closeImportMenu()
- })
-
- it('sets isImportMenuOpen to false', () => {
- expect(component.isImportMenuOpen).toBe(false)
- })
-
- it('disposes the overlay', () => {
- expect(overlaySpy.dispose).toHaveBeenCalled()
- })
- })
-
- describe('when search results', () => {
- let table, pagination
- beforeEach(() => {
- table = fixture.debugElement.query(
- By.directive(ResultsTableContainerComponent)
- ).componentInstance
- pagination = fixture.debugElement.query(
- By.directive(PaginationButtonsComponent)
- ).componentInstance
- })
- it('displays record table', () => {
- expect(table).toBeTruthy()
- })
- it('displays pagination', () => {
- expect(pagination).toBeTruthy()
- expect(pagination.currentPage).toEqual(currentPage)
- expect(pagination.totalPages).toEqual(totalPages)
- })
-
- describe('when click on a record', () => {
- const uniqueIdentifier = 123
- const singleRecord = {
- ...datasetRecordsFixture()[0],
- uniqueIdentifier,
- }
- beforeEach(() => {
- table.recordClick.emit(singleRecord)
- })
- it('routes to record edition', () => {
- expect(router.navigate).toHaveBeenCalledWith(['/edit', 123])
- })
- })
-
- describe('when asking for record duplication', () => {
- const uniqueIdentifier = 123
- const singleRecord = {
- ...datasetRecordsFixture()[0],
- uniqueIdentifier,
- }
- beforeEach(() => {
- table.duplicateRecord.emit(singleRecord)
- })
- it('routes to record duplication', () => {
- expect(router.navigate).toHaveBeenCalledWith(['/duplicate', 123])
- })
- })
-
- describe('when click on pagination', () => {
- beforeEach(() => {
- pagination.newCurrentPageEvent.emit(3)
- })
- it('paginates', () => {
- expect(searchService.setPage).toHaveBeenCalledWith(3)
- })
- })
- })
-})
diff --git a/apps/metadata-editor/src/app/records/my-library/my-library.component.css b/apps/metadata-editor/src/app/records/templates/templates.component.css
similarity index 100%
rename from apps/metadata-editor/src/app/records/my-library/my-library.component.css
rename to apps/metadata-editor/src/app/records/templates/templates.component.css
diff --git a/apps/metadata-editor/src/app/records/my-org-records/my-org-records.component.css b/apps/metadata-editor/src/app/records/templates/templates.component.html
similarity index 100%
rename from apps/metadata-editor/src/app/records/my-org-records/my-org-records.component.css
rename to apps/metadata-editor/src/app/records/templates/templates.component.html
diff --git a/apps/metadata-editor/src/app/records/my-library/my-library.component.spec.ts b/apps/metadata-editor/src/app/records/templates/templates.component.spec.ts
similarity index 83%
rename from apps/metadata-editor/src/app/records/my-library/my-library.component.spec.ts
rename to apps/metadata-editor/src/app/records/templates/templates.component.spec.ts
index f44522a61a..bf2c40dc05 100644
--- a/apps/metadata-editor/src/app/records/my-library/my-library.component.spec.ts
+++ b/apps/metadata-editor/src/app/records/templates/templates.component.spec.ts
@@ -1,5 +1,5 @@
import { ComponentFixture, TestBed } from '@angular/core/testing'
-import { MyLibraryComponent } from './my-library.component'
+import { TemplatesComponent } from './templates.component'
import { SearchFacade } from '@geonetwork-ui/feature/search'
import { Component, importProvidersFrom } from '@angular/core'
import { TranslateModule } from '@ngx-translate/core'
@@ -17,8 +17,8 @@ class SearchFacadeMock {
}
describe('MyLibraryComponent', () => {
- let component: MyLibraryComponent
- let fixture: ComponentFixture
+ let component: TemplatesComponent
+ let fixture: ComponentFixture
let searchFacade: SearchFacade
beforeEach(() => {
@@ -30,7 +30,7 @@ describe('MyLibraryComponent', () => {
useClass: SearchFacadeMock,
},
],
- }).overrideComponent(MyLibraryComponent, {
+ }).overrideComponent(TemplatesComponent, {
remove: {
imports: [RecordsListComponent],
},
@@ -39,7 +39,7 @@ describe('MyLibraryComponent', () => {
},
})
searchFacade = TestBed.inject(SearchFacade)
- fixture = TestBed.createComponent(MyLibraryComponent)
+ fixture = TestBed.createComponent(TemplatesComponent)
component = fixture.componentInstance
fixture.detectChanges()
})
diff --git a/apps/metadata-editor/src/app/records/my-library/my-library.component.ts b/apps/metadata-editor/src/app/records/templates/templates.component.ts
similarity index 74%
rename from apps/metadata-editor/src/app/records/my-library/my-library.component.ts
rename to apps/metadata-editor/src/app/records/templates/templates.component.ts
index b3ad45edb6..56e02ba67b 100644
--- a/apps/metadata-editor/src/app/records/my-library/my-library.component.ts
+++ b/apps/metadata-editor/src/app/records/templates/templates.component.ts
@@ -5,13 +5,13 @@ import { RecordsListComponent } from '../records-list.component'
import { SearchFacade } from '@geonetwork-ui/feature/search'
@Component({
- selector: 'md-editor-my-library',
- templateUrl: './my-library.component.html',
- styleUrls: ['./my-library.component.css'],
+ selector: 'md-editor-templates',
+ templateUrl: './templates.component.html',
+ styleUrls: ['./templates.component.css'],
standalone: true,
imports: [CommonModule, TranslateModule, RecordsListComponent],
})
-export class MyLibraryComponent {
+export class TemplatesComponent {
constructor(public searchFacade: SearchFacade) {
this.searchFacade.resetSearch()
}
diff --git a/libs/feature/editor/src/lib/components/record-form/form-field/form-field.component.html b/libs/feature/editor/src/lib/components/record-form/form-field/form-field.component.html
index d48c8df844..d5ef07d21a 100644
--- a/libs/feature/editor/src/lib/components/record-form/form-field/form-field.component.html
+++ b/libs/feature/editor/src/lib/components/record-form/form-field/form-field.component.html
@@ -25,6 +25,7 @@
-
-
-
-
-
-
-
- - {{ title }} -
-
-
-
- {{ searchFacade.resultsHits$ | async }}
- dashboard.records.publishedRecords
-
- {{ userCount }}
-
- dashboard.records.users
-
-
-
+
+
diff --git a/apps/metadata-editor/src/app/records/records-list.component.spec.ts b/apps/metadata-editor/src/app/records/records-list.component.spec.ts
index a48a0d8572..a6e006662e 100644
--- a/apps/metadata-editor/src/app/records/records-list.component.spec.ts
+++ b/apps/metadata-editor/src/app/records/records-list.component.spec.ts
@@ -1,6 +1,6 @@
import { ComponentFixture, TestBed } from '@angular/core/testing'
import { SearchFacade, SearchService } from '@geonetwork-ui/feature/search'
-import { RecordsListComponent } from './records-list.component'
+import { allSearchFields, RecordsListComponent } from './records-list.component'
import { Component, EventEmitter, Input, Output } from '@angular/core'
import { CatalogRecord } from '@geonetwork-ui/common/domain/model/record'
import { By } from '@angular/platform-browser'
@@ -67,6 +67,7 @@ describe('RecordsListComponent', () => {
let fixture: ComponentFixture
+
-
-
-
+
-
-
-
-
boolean = () => true
+ @Input() canDelete: (record: CatalogRecord) => boolean = () => true
+
@Output() recordClick = new EventEmitter()
@Output() duplicateRecord = new EventEmitter()
subscription = new Subscription()
- records$ = this.searchFacade.results$
selectedRecords$ = this.selectionService.selectedRecordsIdentifiers$
sortBy$ = this.searchFacade.sortBy$
@@ -40,7 +42,7 @@ export class ResultsTableContainerComponent implements OnDestroy {
this.recordsRepository.isRecordNotYetSaved(record.uniqueIdentifier)
constructor(
- private searchFacade: SearchFacade,
+ protected searchFacade: SearchFacade,
private searchService: SearchService,
private selectionService: SelectionService,
private recordsRepository: RecordsRepositoryInterface,
diff --git a/libs/ui/inputs/src/lib/badge/badge.component.html b/libs/ui/inputs/src/lib/badge/badge.component.html
index cfa8d07b99..f567849682 100644
--- a/libs/ui/inputs/src/lib/badge/badge.component.html
+++ b/libs/ui/inputs/src/lib/badge/badge.component.html
@@ -11,8 +11,7 @@
type="light"
*ngIf="removable"
(buttonClick)="removeBadge()"
- class="ml-1 -my-[0.4em] -mr-[0.45em]"
- extraClass="border-0"
+ extraClass="text-xs border-0 px-0 py-0"
style="
--gn-ui-button-padding: 0;
--gn-ui-button-font-size: 0.8em;
diff --git a/libs/ui/layout/src/lib/interactive-table/interactive-table.component.css b/libs/ui/layout/src/lib/interactive-table/interactive-table.component.css
index df5d1f2711..c808088fc4 100644
--- a/libs/ui/layout/src/lib/interactive-table/interactive-table.component.css
+++ b/libs/ui/layout/src/lib/interactive-table/interactive-table.component.css
@@ -7,7 +7,7 @@
}
.table-header-cell {
- @apply text-gray-700 px-4 py-5 flex items-center truncate bg-white;
+ @apply text-gray-700 px-3 py-3 flex items-center truncate bg-white;
}
button.table-header-cell {
diff --git a/libs/ui/layout/src/lib/interactive-table/interactive-table.component.html b/libs/ui/layout/src/lib/interactive-table/interactive-table.component.html
index 143497cfbb..eb8d5b500f 100644
--- a/libs/ui/layout/src/lib/interactive-table/interactive-table.component.html
+++ b/libs/ui/layout/src/lib/interactive-table/interactive-table.component.html
@@ -1,5 +1,5 @@
-
+