Skip to content

Commit d9759d1

Browse files
alexandrevryghemalexandrevryghem
committed
108588: Renamed components, because now these aren't page components anymore
1 parent fb2c7ce commit d9759d1

35 files changed

Lines changed: 138 additions & 137 deletions

‎cypress/e2e/browse-by-author.cy.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ describe('Browse By Author', () => {
55
cy.visit('/browse/author');
66

77
// Wait for <ds-browse-by-metadata-page> to be visible
8-
cy.get('ds-browse-by-metadata-page').should('be.visible');
8+
cy.get('ds-browse-by-metadata').should('be.visible');
99

1010
// Analyze <ds-browse-by-metadata-page> for accessibility
11-
testA11y('ds-browse-by-metadata-page');
11+
testA11y('ds-browse-by-metadata');
1212
});
1313
});

‎cypress/e2e/browse-by-dateissued.cy.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ describe('Browse By Date Issued', () => {
55
cy.visit('/browse/dateissued');
66

77
// Wait for <ds-browse-by-date-page> to be visible
8-
cy.get('ds-browse-by-date-page').should('be.visible');
8+
cy.get('ds-browse-by-date').should('be.visible');
99

1010
// Analyze <ds-browse-by-date-page> for accessibility
11-
testA11y('ds-browse-by-date-page');
11+
testA11y('ds-browse-by-date');
1212
});
1313
});

‎cypress/e2e/browse-by-subject.cy.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ describe('Browse By Subject', () => {
55
cy.visit('/browse/subject');
66

77
// Wait for <ds-browse-by-metadata-page> to be visible
8-
cy.get('ds-browse-by-metadata-page').should('be.visible');
8+
cy.get('ds-browse-by-metadata').should('be.visible');
99

1010
// Analyze <ds-browse-by-metadata-page> for accessibility
11-
testA11y('ds-browse-by-metadata-page');
11+
testA11y('ds-browse-by-metadata');
1212
});
1313
});

‎cypress/e2e/browse-by-title.cy.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ describe('Browse By Title', () => {
55
cy.visit('/browse/title');
66

77
// Wait for <ds-browse-by-title-page> to be visible
8-
cy.get('ds-browse-by-title-page').should('be.visible');
8+
cy.get('ds-browse-by-title').should('be.visible');
99

1010
// Analyze <ds-browse-by-title-page> for accessibility
11-
testA11y('ds-browse-by-title-page');
11+
testA11y('ds-browse-by-title');
1212
});
1313
});

src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts renamed to src/app/browse-by/browse-by-date/browse-by-date.component.spec.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { BrowseByDatePageComponent } from './browse-by-date-page.component';
1+
import { BrowseByDateComponent } from './browse-by-date.component';
22
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
33
import { CommonModule } from '@angular/common';
44
import { RouterTestingModule } from '@angular/router/testing';
@@ -15,7 +15,7 @@ import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
1515
import { Community } from '../../core/shared/community.model';
1616
import { Item } from '../../core/shared/item.model';
1717
import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model';
18-
import { toRemoteData } from '../browse-by-metadata-page/browse-by-metadata-page.component.spec';
18+
import { toRemoteData } from '../browse-by-metadata/browse-by-metadata.component.spec';
1919
import { VarDirective } from '../../shared/utils/var.directive';
2020
import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
2121
import { PaginationService } from '../../core/pagination/pagination.service';
@@ -24,9 +24,9 @@ import { APP_CONFIG } from '../../../config/app-config.interface';
2424
import { environment } from '../../../environments/environment';
2525
import { SortDirection } from '../../core/cache/models/sort-options.model';
2626

27-
describe('BrowseByDatePageComponent', () => {
28-
let comp: BrowseByDatePageComponent;
29-
let fixture: ComponentFixture<BrowseByDatePageComponent>;
27+
describe('BrowseByDateComponent', () => {
28+
let comp: BrowseByDateComponent;
29+
let fixture: ComponentFixture<BrowseByDateComponent>;
3030
let route: ActivatedRoute;
3131
let paginationService;
3232

@@ -86,7 +86,7 @@ describe('BrowseByDatePageComponent', () => {
8686
beforeEach(waitForAsync(() => {
8787
TestBed.configureTestingModule({
8888
imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
89-
declarations: [BrowseByDatePageComponent, EnumKeysPipe, VarDirective],
89+
declarations: [BrowseByDateComponent, EnumKeysPipe, VarDirective],
9090
providers: [
9191
{ provide: ActivatedRoute, useValue: activatedRouteStub },
9292
{ provide: BrowseService, useValue: mockBrowseService },
@@ -101,7 +101,7 @@ describe('BrowseByDatePageComponent', () => {
101101
}));
102102

103103
beforeEach(() => {
104-
fixture = TestBed.createComponent(BrowseByDatePageComponent);
104+
fixture = TestBed.createComponent(BrowseByDateComponent);
105105
const browseService = fixture.debugElement.injector.get(BrowseService);
106106
spyOn(browseService, 'getFirstItemFor')
107107
// ok to expect the default browse as first param since we just need the mock items obtained via sort direction.

src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts renamed to src/app/browse-by/browse-by-date/browse-by-date.component.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { ChangeDetectorRef, Component, Inject, OnInit } from '@angular/core';
22
import {
3-
BrowseByMetadataPageComponent,
3+
BrowseByMetadataComponent,
44
browseParamsToOptions,
55
getBrowseSearchOptions
6-
} from '../browse-by-metadata-page/browse-by-metadata-page.component';
6+
} from '../browse-by-metadata/browse-by-metadata.component';
77
import { combineLatest as observableCombineLatest } from 'rxjs';
88
import { hasValue, isNotEmpty } from '../../shared/empty.util';
99
import { ActivatedRoute, Params, Router } from '@angular/router';
@@ -23,17 +23,17 @@ import { rendersBrowseBy } from '../browse-by-switcher/browse-by-decorator';
2323
import { BrowseByDataType } from '../browse-by-switcher/browse-by-data-type';
2424

2525
@Component({
26-
selector: 'ds-browse-by-date-page',
27-
styleUrls: ['../browse-by-metadata-page/browse-by-metadata-page.component.scss'],
28-
templateUrl: '../browse-by-metadata-page/browse-by-metadata-page.component.html'
26+
selector: 'ds-browse-by-date',
27+
styleUrls: ['../browse-by-metadata/browse-by-metadata.component.scss'],
28+
templateUrl: '../browse-by-metadata/browse-by-metadata.component.html',
2929
})
3030
/**
3131
* Component for browsing items by metadata definition of type 'date'
3232
* A metadata definition (a.k.a. browse id) is a short term used to describe one or multiple metadata fields.
3333
* An example would be 'dateissued' for 'dc.date.issued'
3434
*/
3535
@rendersBrowseBy(BrowseByDataType.Date)
36-
export class BrowseByDatePageComponent extends BrowseByMetadataPageComponent implements OnInit {
36+
export class BrowseByDateComponent extends BrowseByMetadataComponent implements OnInit {
3737

3838
/**
3939
* The default metadata keys to use for determining the lower limit of the StartsWith dropdown options

src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html renamed to src/app/browse-by/browse-by-metadata/browse-by-metadata.component.html

File renamed without changes.

src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.scss renamed to src/app/browse-by/browse-by-metadata/browse-by-metadata.component.scss

File renamed without changes.

src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts renamed to src/app/browse-by/browse-by-metadata/browse-by-metadata.component.spec.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import {
2-
BrowseByMetadataPageComponent,
2+
BrowseByMetadataComponent,
33
browseParamsToOptions,
44
getBrowseSearchOptions
5-
} from './browse-by-metadata-page.component';
5+
} from './browse-by-metadata.component';
66
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
77
import { BrowseService } from '../../core/browse/browse.service';
88
import { CommonModule } from '@angular/common';
@@ -31,9 +31,9 @@ import { PaginationComponentOptions } from '../../shared/pagination/pagination-c
3131
import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
3232
import { APP_CONFIG } from '../../../config/app-config.interface';
3333

34-
describe('BrowseByMetadataPageComponent', () => {
35-
let comp: BrowseByMetadataPageComponent;
36-
let fixture: ComponentFixture<BrowseByMetadataPageComponent>;
34+
describe('BrowseByMetadataComponent', () => {
35+
let comp: BrowseByMetadataComponent;
36+
let fixture: ComponentFixture<BrowseByMetadataComponent>;
3737
let browseService: BrowseService;
3838
let route: ActivatedRoute;
3939
let paginationService;
@@ -103,7 +103,7 @@ describe('BrowseByMetadataPageComponent', () => {
103103
beforeEach(waitForAsync(() => {
104104
TestBed.configureTestingModule({
105105
imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
106-
declarations: [BrowseByMetadataPageComponent, EnumKeysPipe, VarDirective],
106+
declarations: [BrowseByMetadataComponent, EnumKeysPipe, VarDirective],
107107
providers: [
108108
{ provide: ActivatedRoute, useValue: activatedRouteStub },
109109
{ provide: BrowseService, useValue: mockBrowseService },
@@ -117,7 +117,7 @@ describe('BrowseByMetadataPageComponent', () => {
117117
}));
118118

119119
beforeEach(() => {
120-
fixture = TestBed.createComponent(BrowseByMetadataPageComponent);
120+
fixture = TestBed.createComponent(BrowseByMetadataComponent);
121121
comp = fixture.componentInstance;
122122
fixture.detectChanges();
123123
browseService = (comp as any).browseService;

src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts renamed to src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import { Context } from '../../core/shared/context.model';
2424
export const BBM_PAGINATION_ID = 'bbm';
2525

2626
@Component({
27-
selector: 'ds-browse-by-metadata-page',
28-
styleUrls: ['./browse-by-metadata-page.component.scss'],
29-
templateUrl: './browse-by-metadata-page.component.html'
27+
selector: 'ds-browse-by-metadata',
28+
styleUrls: ['./browse-by-metadata.component.scss'],
29+
templateUrl: './browse-by-metadata.component.html',
3030
})
3131
/**
3232
* Component for browsing (items) by metadata definition.
@@ -35,7 +35,7 @@ export const BBM_PAGINATION_ID = 'bbm';
3535
* 'dc.contributor.*'
3636
*/
3737
@rendersBrowseBy(BrowseByDataType.Metadata)
38-
export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
38+
export class BrowseByMetadataComponent implements OnInit, OnDestroy {
3939

4040
/**
4141
* The optional context

0 commit comments

Comments
 (0)