-
-
-
- organization.lastPublishedDatasets
-
-
+
+
+
+
+
+ organization.lastPublishedDatasets
+
+
-
-
-
+
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
-
+
+
+
+
+
diff --git a/apps/datahub/src/app/organization/organization-details/organization-details.component.spec.ts b/apps/datahub/src/app/organization/organization-details/organization-details.component.spec.ts
index 6e4d6078ac..bec7bfd76b 100644
--- a/apps/datahub/src/app/organization/organization-details/organization-details.component.spec.ts
+++ b/apps/datahub/src/app/organization/organization-details/organization-details.component.spec.ts
@@ -52,10 +52,6 @@ class OrganisationsServiceMock {
}
const anOrganizationWithManyDatasets: Organization = ORGANISATIONS_FIXTURE[0]
-const anOrganizationWithOnlyOneDataset: Organization = {
- ...ORGANISATIONS_FIXTURE[0],
- recordCount: 1,
-}
const oneDataset = [DATASET_RECORDS[0]]
const manyDatasets = DATASET_RECORDS.concat(DATASET_RECORDS[0])
@@ -204,14 +200,9 @@ describe('OrganizationDetailsComponent', () => {
organizationIsLoading.next(true)
fixture.detectChanges()
- const organizationDetailsLastPublishedDatasetsPreviousNextButtons =
- getHTMLElement(
- 'organizationDetailsLastPublishedDatasetsPreviousNextButtons'
- )
+ const orgDetailsNavBtn = getHTMLElement('orgDetailsNavBtn')
- expect(
- organizationDetailsLastPublishedDatasetsPreviousNextButtons
- ).toBeFalsy()
+ expect(orgDetailsNavBtn).toBeFalsy()
})
it('should not be displayed organization is loaded but has no pagination', () => {
@@ -219,14 +210,9 @@ describe('OrganizationDetailsComponent', () => {
totalPages.next(1)
fixture.detectChanges()
- const organizationDetailsLastPublishedDatasetsPreviousNextButtons =
- getHTMLElement(
- 'organizationDetailsLastPublishedDatasetsPreviousNextButtons'
- )
+ const orgDetailsNavBtn = getHTMLElement('orgDetailsNavBtn')
- expect(
- organizationDetailsLastPublishedDatasetsPreviousNextButtons
- ).toBeFalsy()
+ expect(orgDetailsNavBtn).toBeFalsy()
})
it('should be displayed if organization is loadded and have pagination', () => {
@@ -234,39 +220,29 @@ describe('OrganizationDetailsComponent', () => {
totalPages.next(10)
fixture.detectChanges()
- const organizationDetailsLastPublishedDatasetsPreviousNextButtons =
- getHTMLElement(
- 'organizationDetailsLastPublishedDatasetsPreviousNextButtons'
- )
+ const orgDetailsNavBtn = getHTMLElement('orgDetailsNavBtn')
- expect(
- organizationDetailsLastPublishedDatasetsPreviousNextButtons
- ).toBeTruthy()
+ expect(orgDetailsNavBtn).toBeTruthy()
})
it('should call paginate from the facade if button is clicked', () => {
const initialPageNumber = currentPage.getValue()
const nextPageNumber = initialPageNumber + 1
- const organizationDetailsLastPublishedDatasetsPreviousNextButtons =
- getHTMLElement(
- 'organizationDetailsLastPublishedDatasetsPreviousNextButtons'
- )
+ const orgDetailsNavBtn = getHTMLElement('orgDetailsNavBtn')
- const nextButton =
- organizationDetailsLastPublishedDatasetsPreviousNextButtons?.querySelector(
- '[data-test="nextButton"]'
- ) as HTMLElement
+ const nextButton = orgDetailsNavBtn?.querySelector(
+ '[data-test="nextButton"]'
+ ) as HTMLElement
;(nextButton?.firstChild as HTMLElement).click()
fixture.detectChanges()
expect(searchFacade.paginate).toHaveBeenCalledWith(nextPageNumber)
- const previousButton =
- organizationDetailsLastPublishedDatasetsPreviousNextButtons?.querySelector(
- '[data-test="previousButton"]'
- ) as HTMLElement
+ const previousButton = orgDetailsNavBtn?.querySelector(
+ '[data-test="previousButton"]'
+ ) as HTMLElement
;(previousButton?.firstChild as HTMLElement).click()
fixture.detectChanges()
@@ -276,20 +252,13 @@ describe('OrganizationDetailsComponent', () => {
describe('Search all button', () => {
it('should send to the search page filtered on the correct organization', () => {
- const organizationDetailsLastPublishedDatasetsSearchAllButton =
- getHTMLElement(
- 'organizationDetailsLastPublishedDatasetsSearchAllButton'
- )
-
- expect(
- organizationDetailsLastPublishedDatasetsSearchAllButton
- ).toBeTruthy()
-
- expect(
- organizationDetailsLastPublishedDatasetsSearchAllButton?.getAttribute(
- 'href'
- )
- ).toEqual(
+ const orgDetailsSearchAllBtn = getHTMLElement(
+ 'orgDetailsSearchAllBtn'
+ )
+
+ expect(orgDetailsSearchAllBtn).toBeTruthy()
+
+ expect(orgDetailsSearchAllBtn?.getAttribute('href')).toEqual(
`/${ROUTER_ROUTE_SEARCH}?publisher=${encodeURIComponent(
anOrganizationWithManyDatasets.name
)}`
@@ -300,21 +269,26 @@ describe('OrganizationDetailsComponent', () => {
describe('Last published datasets', () => {
it('should display the datasets properly', () => {
- const organizationPageLastPublishedDatasets = getHTMLElement(
- 'organizationPageLastPublishedDatasets'
- )
+ const orgPageLasPubDat = getHTMLElement('orgPageLasPubDat')
- expect(organizationPageLastPublishedDatasets).toBeTruthy()
- expect(organizationPageLastPublishedDatasets?.children.length).toEqual(
- desiredPageSize
- )
+ expect(orgPageLasPubDat).toBeTruthy()
+ expect(orgPageLasPubDat?.children.length).toEqual(desiredPageSize)
results.next(oneDataset)
fixture.detectChanges()
- expect(organizationPageLastPublishedDatasets?.children.length).toEqual(
- 1
- )
+ expect(orgPageLasPubDat?.children.length).toEqual(1)
+ })
+
+ it('should display the orgHasNodataset error component if the org has no dataset', () => {
+ results.next([])
+ fixture.detectChanges()
+
+ const orgHasNoDataset = getHTMLElement('lastPubliDatasets')
+
+ console.log(orgHasNoDataset?.outerHTML)
+
+ expect(orgHasNoDataset).toBeTruthy()
})
})
})
diff --git a/apps/datahub/src/app/organization/organization-details/organization-details.component.ts b/apps/datahub/src/app/organization/organization-details/organization-details.component.ts
index 23ab3fd7a2..2656219bee 100644
--- a/apps/datahub/src/app/organization/organization-details/organization-details.component.ts
+++ b/apps/datahub/src/app/organization/organization-details/organization-details.component.ts
@@ -4,11 +4,13 @@ import {
ChangeDetectorRef,
Component,
Input,
+ OnChanges,
OnDestroy,
OnInit,
+ SimpleChanges,
ViewChild,
} from '@angular/core'
-import { AsyncPipe, NgForOf, NgIf } from '@angular/common'
+import { AsyncPipe, NgClass, NgForOf, NgIf } from '@angular/common'
import {
CatalogRecord,
Organization,
@@ -32,7 +34,15 @@ import {
} from '@geonetwork-ui/ui/elements'
import { UiSearchModule } from '@geonetwork-ui/ui/search'
import { SearchFacade } from '@geonetwork-ui/feature/search'
-import { Observable, of, Subscription, switchMap } from 'rxjs'
+import {
+ BehaviorSubject,
+ combineLatest,
+ distinctUntilChanged,
+ Observable,
+ of,
+ Subscription,
+ switchMap,
+} from 'rxjs'
import { UiDatavizModule } from '@geonetwork-ui/ui/dataviz'
import { RouterLink } from '@angular/router'
import { ROUTER_ROUTE_SEARCH } from '@geonetwork-ui/feature/router'
@@ -63,27 +73,36 @@ import { UiWidgetsModule } from '@geonetwork-ui/ui/widgets'
UiDatavizModule,
RouterLink,
UiWidgetsModule,
+ NgClass,
],
})
export class OrganizationDetailsComponent
- implements OnInit, AfterViewInit, OnDestroy
+ implements OnInit, AfterViewInit, OnDestroy, OnChanges
{
protected readonly Error = Error
protected readonly ErrorType = ErrorType
+ protected readonly ROUTER_ROUTE_SEARCH = ROUTER_ROUTE_SEARCH
- @Input() organization: Organization
+ protected get pages() {
+ return new Array(this.totalPages).fill(0).map((_, i) => i + 1)
+ }
lastPublishedDatasets$: Observable
= of([])
subscriptions$: Subscription = new Subscription()
- isOrganizationsLoading = true
+ isSearchFacadeLoading = true
totalPages = 0
currentPage = 1
isFirstPage = this.currentPage === 1
isLastPage = false
+ organizationHasChanged$ = new BehaviorSubject(undefined)
+
+ @Input() organization?: Organization
+ @Input() paginationContainerClass = 'w-full bottom-0 top-auto'
+
@ViewChild(BlockListComponent) list: BlockListComponent
constructor(
@@ -95,19 +114,30 @@ export class OrganizationDetailsComponent
ngOnInit(): void {
this.searchFacade.setPageSize(3)
- this.lastPublishedDatasets$ = this.organizationsService
- .getFiltersForOrgs([this.organization])
- .pipe(
- switchMap((filters) => {
- return this.searchFacade
- .setFilters(filters)
- .setSortBy(['desc', 'changeDate']).results$
- })
- )
+ this.lastPublishedDatasets$ = this.organizationHasChanged$.pipe(
+ distinctUntilChanged(),
+ switchMap(() => {
+ return this.organizationsService
+ .getFiltersForOrgs([this.organization])
+ .pipe(
+ switchMap((filters) => {
+ return this.searchFacade
+ .setFilters(filters)
+ .setSortBy(['desc', 'changeDate']).results$
+ })
+ )
+ })
+ )
this.manageSubscriptions()
}
+ ngOnChanges(changes: SimpleChanges): void {
+ if (changes['organization']) {
+ this.organizationHasChanged$.next()
+ }
+ }
+
ngAfterViewInit() {
// this is required to show the pagination correctly
this.changeDetector.detectChanges()
@@ -129,38 +159,35 @@ export class OrganizationDetailsComponent
}
}
- private manageSubscriptions() {
- this.subscriptions$.add(
- this.searchFacade.isLoading$.subscribe(
- (isOrganizationsLoading) =>
- (this.isOrganizationsLoading = isOrganizationsLoading)
- )
- )
-
- this.subscriptions$.add(
- this.searchFacade.totalPages$.subscribe(
- (totalPages) => (this.totalPages = totalPages)
- )
- )
-
- this.subscriptions$.add(
- this.searchFacade.isBeginningOfResults$.subscribe(
- (isBeginningOfResults) => (this.isFirstPage = isBeginningOfResults)
- )
- )
-
- this.subscriptions$.add(
- this.searchFacade.isEndOfResults$.subscribe(
- (isEndOfResults) => (this.isLastPage = isEndOfResults)
- )
- )
+ goToPage(page: number) {
+ this.searchFacade.paginate(page)
+ }
+ private manageSubscriptions() {
this.subscriptions$.add(
- this.searchFacade.currentPage$.subscribe(
- (currentPage) => (this.currentPage = currentPage)
+ combineLatest([
+ this.searchFacade.isLoading$.pipe(distinctUntilChanged()),
+ this.searchFacade.totalPages$.pipe(distinctUntilChanged()),
+ this.searchFacade.isBeginningOfResults$.pipe(distinctUntilChanged()),
+ this.searchFacade.isEndOfResults$.pipe(distinctUntilChanged()),
+ this.searchFacade.currentPage$.pipe(distinctUntilChanged()),
+ ]).subscribe(
+ ([
+ isSearchFacadeLoading,
+ totalPages,
+ isBeginningOfResults,
+ isEndOfResults,
+ currentPage,
+ ]) => {
+ this.isSearchFacadeLoading = isSearchFacadeLoading
+ this.totalPages = totalPages
+ this.isFirstPage = isBeginningOfResults
+ this.isLastPage = isEndOfResults
+ this.currentPage = currentPage
+ }
)
)
}
- protected readonly ROUTER_ROUTE_SEARCH = ROUTER_ROUTE_SEARCH
+ protected readonly errorTypes = ErrorType
}
diff --git a/apps/datahub/src/app/organization/header-organization/organization-header.component.css b/apps/datahub/src/app/organization/organization-header/organization-header.component.css
similarity index 100%
rename from apps/datahub/src/app/organization/header-organization/organization-header.component.css
rename to apps/datahub/src/app/organization/organization-header/organization-header.component.css
diff --git a/apps/datahub/src/app/organization/organization-header/organization-header.component.html b/apps/datahub/src/app/organization/organization-header/organization-header.component.html
new file mode 100644
index 0000000000..42e90a94bd
--- /dev/null
+++ b/apps/datahub/src/app/organization/organization-header/organization-header.component.html
@@ -0,0 +1,60 @@
+
+
+
+
+
+ {{ organization.name }}
+
+
+
+
face
question_mark
+ >question_mark
+
question_mark
+ >question_mark
+
search.error.couldNotReachApi