110889: Moved & renamed ComcolRecentlyAddedComponent

alexandrevryghem · Jan 8, 2024 · 130fefd · 130fefd
1 parent 6950444
commit 130fefd
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 36 deletions.
diff --git a/src/app/collection-page/collection-page-routing.module.ts b/src/app/collection-page/collection-page-routing.module.ts
@@ -25,7 +25,7 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
 import { ComcolBrowseByComponent } from '../shared/comcol/sections/comcol-browse-by/comcol-browse-by.component';
 import { BrowseByGuard } from '../browse-by/browse-by-guard';
 import { BrowseByI18nBreadcrumbResolver } from '../browse-by/browse-by-i18n-breadcrumb.resolver';
-import { CollectionRecentlyAddedComponent } from './sections/recently-added/collection-recently-added.component';
+import { ComcolRecentlyAddedComponent } from '../shared/comcol/sections/comcol-recently-added/comcol-recently-added.component';
 
 @NgModule({
   imports: [
@@ -73,7 +73,7 @@ import { CollectionRecentlyAddedComponent } from './sections/recently-added/coll
               {
                 path: '',
                 pathMatch: 'full',
-                component: CollectionRecentlyAddedComponent,
+                component: ComcolRecentlyAddedComponent,
               },
               {
                 path: 'browse/:id',

diff --git a/src/app/collection-page/collection-page.module.ts b/src/app/collection-page/collection-page.module.ts
@@ -19,7 +19,6 @@ import { ComcolModule } from '../shared/comcol/comcol.module';
 import { DsoSharedModule } from '../dso-shared/dso-shared.module';
 import { DsoPageModule } from '../shared/dso-page/dso-page.module';
 import { BrowseByPageModule } from '../browse-by/browse-by-page.module';
-import { CollectionRecentlyAddedComponent } from './sections/recently-added/collection-recently-added.component';
 
 const DECLARATIONS = [
   CollectionPageComponent,
@@ -29,7 +28,6 @@ const DECLARATIONS = [
   EditItemTemplatePageComponent,
   ThemedEditItemTemplatePageComponent,
   CollectionItemMapperComponent,
-  CollectionRecentlyAddedComponent,
 ];
 
 @NgModule({

diff --git a/src/app/shared/comcol/comcol.module.ts b/src/app/shared/comcol/comcol.module.ts
@@ -18,6 +18,7 @@ import { FormModule } from '../form/form.module';
 import { UploadModule } from '../upload/upload.module';
 import { ComcolBrowseByComponent } from './sections/comcol-browse-by/comcol-browse-by.component';
 import { BrowseByModule } from '../../browse-by/browse-by.module';
+import { ComcolRecentlyAddedComponent } from './sections/comcol-recently-added/comcol-recently-added.component';
 
 const COMPONENTS = [
   ComcolPageContentComponent,
@@ -33,6 +34,7 @@ const COMPONENTS = [
   ComcolRoleComponent,
   ThemedComcolPageHandleComponent,
   ComcolBrowseByComponent,
+  ComcolRecentlyAddedComponent,
 ];
 
 @NgModule({

diff --git a/.../collection-recently-added.component.html → ...dded/comcol-recently-added.component.html b/.../collection-recently-added.component.html → ...dded/comcol-recently-added.component.html
diff --git a/.../collection-recently-added.component.scss → ...dded/comcol-recently-added.component.scss b/.../collection-recently-added.component.scss → ...dded/comcol-recently-added.component.scss
diff --git a/...llection-recently-added.component.spec.ts → ...d/comcol-recently-added.component.spec.ts b/...llection-recently-added.component.spec.ts → ...d/comcol-recently-added.component.spec.ts
@@ -1,20 +1,20 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { CollectionRecentlyAddedComponent } from './collection-recently-added.component';
-import { APP_CONFIG } from '../../../../config/app-config.interface';
-import { environment } from '../../../../environments/environment.test';
+import { ComcolRecentlyAddedComponent } from './comcol-recently-added.component';
+import { APP_CONFIG } from '../../../../../config/app-config.interface';
+import { environment } from '../../../../../environments/environment.test';
 import { ActivatedRoute } from '@angular/router';
-import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
-import { PaginationService } from '../../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
-import { SearchServiceStub } from '../../../shared/testing/search-service.stub';
-import { SearchService } from '../../../core/shared/search/search.service';
-import { VarDirective } from '../../../shared/utils/var.directive';
+import { ActivatedRouteStub } from '../../../testing/active-router.stub';
+import { PaginationService } from '../../../../core/pagination/pagination.service';
+import { PaginationServiceStub } from '../../../testing/pagination-service.stub';
+import { SearchServiceStub } from '../../../testing/search-service.stub';
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { VarDirective } from '../../../utils/var.directive';
 import { TranslateModule } from '@ngx-translate/core';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 
-describe('CollectionRecentlyAddedComponent', () => {
-  let component: CollectionRecentlyAddedComponent;
-  let fixture: ComponentFixture<CollectionRecentlyAddedComponent>;
+describe('ComcolRecentlyAddedComponent', () => {
+  let component: ComcolRecentlyAddedComponent;
+  let fixture: ComponentFixture<ComcolRecentlyAddedComponent>;
 
   let activatedRoute: ActivatedRouteStub;
   let paginationService: PaginationServiceStub;
@@ -27,7 +27,7 @@ describe('CollectionRecentlyAddedComponent', () => {
 
     await TestBed.configureTestingModule({
       declarations: [
-        CollectionRecentlyAddedComponent,
+        ComcolRecentlyAddedComponent,
         VarDirective,
       ],
       imports: [
@@ -42,7 +42,7 @@ describe('CollectionRecentlyAddedComponent', () => {
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
 
-    fixture = TestBed.createComponent(CollectionRecentlyAddedComponent);
+    fixture = TestBed.createComponent(ComcolRecentlyAddedComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });

diff --git a/...ed/collection-recently-added.component.ts → ...-added/comcol-recently-added.component.ts b/...ed/collection-recently-added.component.ts → ...-added/comcol-recently-added.component.ts
@@ -1,29 +1,29 @@
 import { Component, OnInit, Inject, OnDestroy } from '@angular/core';
 import { Observable, combineLatest as observableCombineLatest } from 'rxjs';
-import { RemoteData } from '../../../core/data/remote-data';
-import { PaginatedList } from '../../../core/data/paginated-list.model';
-import { Item } from '../../../core/shared/item.model';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
+import { Item } from '../../../../core/shared/item.model';
 import { switchMap, map, startWith, take } from 'rxjs/operators';
-import { getFirstSucceededRemoteData, toDSpaceObjectListRD } from '../../../core/shared/operators';
-import { PaginatedSearchOptions } from '../../../shared/search/models/paginated-search-options.model';
-import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
-import { BROWSE_LINKS_TO_FOLLOW } from '../../../core/browse/browse.service';
-import { PaginationService } from '../../../core/pagination/pagination.service';
-import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { SortOptions, SortDirection } from '../../../core/cache/models/sort-options.model';
-import { APP_CONFIG, AppConfig } from '../../../../config/app-config.interface';
-import { SearchService } from '../../../core/shared/search/search.service';
-import { Collection } from '../../../core/shared/collection.model';
+import { getFirstSucceededRemoteData, toDSpaceObjectListRD } from '../../../../core/shared/operators';
+import { PaginatedSearchOptions } from '../../../search/models/paginated-search-options.model';
+import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
+import { BROWSE_LINKS_TO_FOLLOW } from '../../../../core/browse/browse.service';
+import { PaginationService } from '../../../../core/pagination/pagination.service';
+import { PaginationComponentOptions } from '../../../pagination/pagination-component-options.model';
+import { SortOptions, SortDirection } from '../../../../core/cache/models/sort-options.model';
+import { APP_CONFIG, AppConfig } from '../../../../../config/app-config.interface';
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { Collection } from '../../../../core/shared/collection.model';
 import { ActivatedRoute, Data } from '@angular/router';
-import { fadeIn } from '../../../shared/animations/fade';
+import { fadeIn } from '../../../animations/fade';
 
 @Component({
-  selector: 'ds-collection-recently-added',
-  templateUrl: './collection-recently-added.component.html',
-  styleUrls: ['./collection-recently-added.component.scss'],
+  selector: 'ds-comcol-recently-added',
+  templateUrl: './comcol-recently-added.component.html',
+  styleUrls: ['./comcol-recently-added.component.scss'],
   animations: [fadeIn],
 })
-export class CollectionRecentlyAddedComponent implements OnInit, OnDestroy {
+export class ComcolRecentlyAddedComponent implements OnInit, OnDestroy {
 
   paginationConfig: PaginationComponentOptions;