Skip to content

Commit 0483612

Browse files
alexandrevryghemalexandrevryghem
committed
108588: Moved CommunityPageSubCommunityListComponent & CommunityPageSubCollectionListComponent to a custom sections folder
1 parent 2fb393d commit 0483612

20 files changed

Lines changed: 99 additions & 104 deletions

‎src/app/community-page/community-page.module.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import { CommonModule } from '@angular/common';
44
import { SharedModule } from '../shared/shared.module';
55

66
import { CommunityPageComponent } from './community-page.component';
7-
import { CommunityPageSubCollectionListComponent } from './sub-collection-list/community-page-sub-collection-list.component';
7+
import { CommunityPageSubCollectionListComponent } from './sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component';
88
import { CommunityPageRoutingModule } from './community-page-routing.module';
9-
import { CommunityPageSubCommunityListComponent } from './sub-community-list/community-page-sub-community-list.component';
9+
import { CommunityPageSubCommunityListComponent } from './sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component';
1010
import { CreateCommunityPageComponent } from './create-community-page/create-community-page.component';
1111
import { DeleteCommunityPageComponent } from './delete-community-page/delete-community-page.component';
1212
import { StatisticsModule } from '../statistics/statistics.module';
@@ -15,10 +15,10 @@ import { ThemedCommunityPageComponent } from './themed-community-page.component'
1515
import { ComcolModule } from '../shared/comcol/comcol.module';
1616
import {
1717
ThemedCommunityPageSubCommunityListComponent
18-
} from './sub-community-list/themed-community-page-sub-community-list.component';
18+
} from './sections/sub-com-col-section/sub-community-list/themed-community-page-sub-community-list.component';
1919
import {
2020
ThemedCollectionPageSubCollectionListComponent
21-
} from './sub-collection-list/themed-community-page-sub-collection-list.component';
21+
} from './sections/sub-com-col-section/sub-collection-list/themed-community-page-sub-collection-list.component';
2222
import { DsoPageModule } from '../shared/dso-page/dso-page.module';
2323

2424
const DECLARATIONS = [CommunityPageComponent,

src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.html renamed to src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.html

File renamed without changes.

src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.scss renamed to src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.scss

File renamed without changes.

src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.spec.ts renamed to src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.spec.ts

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,27 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
88
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
99

1010
import { CommunityPageSubCollectionListComponent } from './community-page-sub-collection-list.component';
11-
import { Community } from '../../core/shared/community.model';
12-
import { SharedModule } from '../../shared/shared.module';
13-
import { CollectionDataService } from '../../core/data/collection-data.service';
14-
import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
15-
import { buildPaginatedList } from '../../core/data/paginated-list.model';
16-
import { PageInfo } from '../../core/shared/page-info.model';
17-
import { HostWindowService } from '../../shared/host-window.service';
18-
import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
19-
import { SelectableListService } from '../../shared/object-list/selectable-list/selectable-list.service';
20-
import { PaginationService } from '../../core/pagination/pagination.service';
21-
import { getMockThemeService } from '../../shared/mocks/theme-service.mock';
22-
import { ThemeService } from '../../shared/theme-support/theme.service';
23-
import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
24-
import { FindListOptions } from '../../core/data/find-list-options.model';
25-
import { GroupDataService } from '../../core/eperson/group-data.service';
26-
import { LinkHeadService } from '../../core/services/link-head.service';
27-
import { ConfigurationDataService } from '../../core/data/configuration-data.service';
28-
import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
29-
import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
30-
import { createPaginatedList } from '../../shared/testing/utils.test';
31-
import { SearchConfigurationServiceStub } from '../../shared/testing/search-configuration-service.stub';
11+
import { Community } from '../../../../core/shared/community.model';
12+
import { SharedModule } from '../../../../shared/shared.module';
13+
import { CollectionDataService } from '../../../../core/data/collection-data.service';
14+
import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
15+
import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
16+
import { PageInfo } from '../../../../core/shared/page-info.model';
17+
import { HostWindowService } from '../../../../shared/host-window.service';
18+
import { HostWindowServiceStub } from '../../../../shared/testing/host-window-service.stub';
19+
import { SelectableListService } from '../../../../shared/object-list/selectable-list/selectable-list.service';
20+
import { PaginationService } from '../../../../core/pagination/pagination.service';
21+
import { getMockThemeService } from '../../../../shared/mocks/theme-service.mock';
22+
import { ThemeService } from '../../../../shared/theme-support/theme.service';
23+
import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub';
24+
import { FindListOptions } from '../../../../core/data/find-list-options.model';
25+
import { GroupDataService } from '../../../../core/eperson/group-data.service';
26+
import { LinkHeadService } from '../../../../core/services/link-head.service';
27+
import { ConfigurationDataService } from '../../../../core/data/configuration-data.service';
28+
import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
29+
import { ConfigurationProperty } from '../../../../core/shared/configuration-property.model';
30+
import { createPaginatedList } from '../../../../shared/testing/utils.test';
31+
import { SearchConfigurationServiceStub } from '../../../../shared/testing/search-configuration-service.stub';
3232

3333
describe('CommunityPageSubCollectionList Component', () => {
3434
let comp: CommunityPageSubCollectionListComponent;

src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts renamed to src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
import { Component, Input, OnDestroy, OnInit } from '@angular/core';
22
import { ActivatedRoute } from '@angular/router';
3-
43
import { BehaviorSubject, combineLatest as observableCombineLatest } from 'rxjs';
5-
6-
import { RemoteData } from '../../core/data/remote-data';
7-
import { Collection } from '../../core/shared/collection.model';
8-
import { Community } from '../../core/shared/community.model';
9-
import { fadeIn } from '../../shared/animations/fade';
10-
import { PaginatedList } from '../../core/data/paginated-list.model';
11-
import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
12-
import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
13-
import { CollectionDataService } from '../../core/data/collection-data.service';
14-
import { PaginationService } from '../../core/pagination/pagination.service';
4+
import { RemoteData } from '../../../../core/data/remote-data';
5+
import { Collection } from '../../../../core/shared/collection.model';
6+
import { Community } from '../../../../core/shared/community.model';
7+
import { fadeIn } from '../../../../shared/animations/fade';
8+
import { PaginatedList } from '../../../../core/data/paginated-list.model';
9+
import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
10+
import { SortDirection, SortOptions } from '../../../../core/cache/models/sort-options.model';
11+
import { CollectionDataService } from '../../../../core/data/collection-data.service';
12+
import { PaginationService } from '../../../../core/pagination/pagination.service';
1513
import { switchMap } from 'rxjs/operators';
16-
import { hasValue } from '../../shared/empty.util';
14+
import { hasValue } from '../../../../shared/empty.util';
1715

1816
@Component({
1917
selector: 'ds-community-page-sub-collection-list',

src/app/community-page/sub-collection-list/themed-community-page-sub-collection-list.component.ts renamed to src/app/community-page/sections/sub-com-col-section/sub-collection-list/themed-community-page-sub-collection-list.component.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { ThemedComponent } from '../../shared/theme-support/themed.component';
1+
import { ThemedComponent } from '../../../../shared/theme-support/themed.component';
22
import { CommunityPageSubCollectionListComponent } from './community-page-sub-collection-list.component';
33
import { Component, Input } from '@angular/core';
4-
import { Community } from '../../core/shared/community.model';
4+
import { Community } from '../../../../core/shared/community.model';
55

66
@Component({
77
selector: 'ds-themed-community-page-sub-collection-list',
88
styleUrls: [],
9-
templateUrl: '../../shared/theme-support/themed.component.html',
9+
templateUrl: '../../../../shared/theme-support/themed.component.html',
1010
})
1111
export class ThemedCollectionPageSubCollectionListComponent extends ThemedComponent<CommunityPageSubCollectionListComponent> {
1212
@Input() community: Community;
@@ -18,7 +18,7 @@ export class ThemedCollectionPageSubCollectionListComponent extends ThemedCompon
1818
}
1919

2020
protected importThemedComponent(themeName: string): Promise<any> {
21-
return import(`../../../themes/${themeName}/app/community-page/sub-collection-list/community-page-sub-collection-list.component`);
21+
return import(`../../../../../themes/${themeName}/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component`);
2222
}
2323

2424
protected importUnthemedComponent(): Promise<any> {

src/app/community-page/sub-community-list/community-page-sub-community-list.component.html renamed to src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.html

File renamed without changes.

src/app/community-page/sub-community-list/community-page-sub-community-list.component.scss renamed to src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.scss

File renamed without changes.

src/app/community-page/sub-community-list/community-page-sub-community-list.component.spec.ts renamed to src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.spec.ts

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,27 @@ import { By } from '@angular/platform-browser';
88
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
99

1010
import { CommunityPageSubCommunityListComponent } from './community-page-sub-community-list.component';
11-
import { Community } from '../../core/shared/community.model';
12-
import { buildPaginatedList } from '../../core/data/paginated-list.model';
13-
import { PageInfo } from '../../core/shared/page-info.model';
14-
import { SharedModule } from '../../shared/shared.module';
15-
import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
16-
import { HostWindowService } from '../../shared/host-window.service';
17-
import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
18-
import { CommunityDataService } from '../../core/data/community-data.service';
19-
import { SelectableListService } from '../../shared/object-list/selectable-list/selectable-list.service';
20-
import { PaginationService } from '../../core/pagination/pagination.service';
21-
import { getMockThemeService } from '../../shared/mocks/theme-service.mock';
22-
import { ThemeService } from '../../shared/theme-support/theme.service';
23-
import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
24-
import { FindListOptions } from '../../core/data/find-list-options.model';
25-
import { GroupDataService } from '../../core/eperson/group-data.service';
26-
import { LinkHeadService } from '../../core/services/link-head.service';
27-
import { ConfigurationDataService } from '../../core/data/configuration-data.service';
28-
import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
29-
import { SearchConfigurationServiceStub } from '../../shared/testing/search-configuration-service.stub';
30-
import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
31-
import { createPaginatedList } from '../../shared/testing/utils.test';
11+
import { Community } from '../../../../core/shared/community.model';
12+
import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
13+
import { PageInfo } from '../../../../core/shared/page-info.model';
14+
import { SharedModule } from '../../../../shared/shared.module';
15+
import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
16+
import { HostWindowService } from '../../../../shared/host-window.service';
17+
import { HostWindowServiceStub } from '../../../../shared/testing/host-window-service.stub';
18+
import { CommunityDataService } from '../../../../core/data/community-data.service';
19+
import { SelectableListService } from '../../../../shared/object-list/selectable-list/selectable-list.service';
20+
import { PaginationService } from '../../../../core/pagination/pagination.service';
21+
import { getMockThemeService } from '../../../../shared/mocks/theme-service.mock';
22+
import { ThemeService } from '../../../../shared/theme-support/theme.service';
23+
import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub';
24+
import { FindListOptions } from '../../../../core/data/find-list-options.model';
25+
import { GroupDataService } from '../../../../core/eperson/group-data.service';
26+
import { LinkHeadService } from '../../../../core/services/link-head.service';
27+
import { ConfigurationDataService } from '../../../../core/data/configuration-data.service';
28+
import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
29+
import { SearchConfigurationServiceStub } from '../../../../shared/testing/search-configuration-service.stub';
30+
import { ConfigurationProperty } from '../../../../core/shared/configuration-property.model';
31+
import { createPaginatedList } from '../../../../shared/testing/utils.test';
3232

3333
describe('CommunityPageSubCommunityListComponent Component', () => {
3434
let comp: CommunityPageSubCommunityListComponent;

src/app/community-page/sub-community-list/community-page-sub-community-list.component.ts renamed to src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ import { ActivatedRoute } from '@angular/router';
33

44
import { BehaviorSubject, combineLatest as observableCombineLatest } from 'rxjs';
55

6-
import { RemoteData } from '../../core/data/remote-data';
7-
import { Community } from '../../core/shared/community.model';
8-
import { fadeIn } from '../../shared/animations/fade';
9-
import { PaginatedList } from '../../core/data/paginated-list.model';
10-
import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
11-
import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
12-
import { CommunityDataService } from '../../core/data/community-data.service';
6+
import { RemoteData } from '../../../../core/data/remote-data';
7+
import { Community } from '../../../../core/shared/community.model';
8+
import { fadeIn } from '../../../../shared/animations/fade';
9+
import { PaginatedList } from '../../../../core/data/paginated-list.model';
10+
import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
11+
import { SortDirection, SortOptions } from '../../../../core/cache/models/sort-options.model';
12+
import { CommunityDataService } from '../../../../core/data/community-data.service';
1313
import { switchMap } from 'rxjs/operators';
14-
import { PaginationService } from '../../core/pagination/pagination.service';
15-
import { hasValue } from '../../shared/empty.util';
14+
import { PaginationService } from '../../../../core/pagination/pagination.service';
15+
import { hasValue } from '../../../../shared/empty.util';
1616

1717
@Component({
1818
selector: 'ds-community-page-sub-community-list',

0 commit comments

Comments
 (0)