#150 Moved list,grid and object-collection to shared package

This commit is contained in:
Jonas Van Goolen
2017-11-03 15:02:01 +01:00
parent cc4aaa4c79
commit 520b7f3e12
108 changed files with 153 additions and 147 deletions

View File

@@ -4,12 +4,12 @@ import { SharedModule } from '../shared/shared.module';
import { SearchPageRoutingModule } from './search-page-routing.module';
import { SearchPageComponent } from './search-page.component';
import { SearchResultsComponent } from './search-results/search-results.component';
import { ItemSearchResultListElementComponent } from '../object-list/search-result-list-element/item-search-result/item-search-result-list-element.component';
import { CollectionSearchResultListElementComponent } from '../object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component';
import { CommunitySearchResultListElementComponent } from '../object-list/search-result-list-element/community-search-result/community-search-result-list-element.component';
import { ItemSearchResultGridElementComponent } from '../object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component';
import { CommunitySearchResultGridElementComponent } from '../object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component'
import { CollectionSearchResultGridElementComponent } from '../object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component';
import { ItemSearchResultListElementComponent } from '../shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component';
import { CollectionSearchResultListElementComponent } from '../shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component';
import { CommunitySearchResultListElementComponent } from '../shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component';
import { ItemSearchResultGridElementComponent } from '../shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component';
import { CommunitySearchResultGridElementComponent } from '../shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component'
import { CollectionSearchResultGridElementComponent } from '../shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component';
import { SearchService } from './search-service/search.service';
import { SearchSidebarComponent } from './search-sidebar/search-sidebar.component';
import { SearchSidebarService } from './search-sidebar/search-sidebar.service';

View File

@@ -1,6 +1,6 @@
import { DSpaceObject } from '../core/shared/dspace-object.model';
import { Metadatum } from '../core/shared/metadatum.model';
import { ListableObject } from '../object-collection/shared/listable-object.model';
import { ListableObject } from '../shared/object-collection/shared/listable-object.model';
export class SearchResult<T extends DSpaceObject> implements ListableObject {

View File

@@ -15,6 +15,7 @@ import { FacetValue } from './facet-value.model';
import { ItemSearchResult } from '../../object-collection/shared/item-search-result.model';
import { ViewMode } from '../../+search-page/search-options.model';
import { Router, NavigationExtras, ActivatedRoute } from '@angular/router';
import { ItemSearchResult } from '../../shared/object-collection/shared/item-search-result.model';
import { RouteService } from '../../shared/route.service';
import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
import { SortOptions } from '../../core/cache/models/sort-options.model';

View File

@@ -3,7 +3,7 @@ import { isEmpty, isNotEmpty } from '../../shared/empty.util';
import { CacheableObject } from '../cache/object-cache.reducer';
import { RemoteData } from '../data/remote-data';
import { ResourceType } from './resource-type';
import { ListableObject } from '../../object-collection/shared/listable-object.model';
import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
import { Observable } from 'rxjs/Observable';
/**

View File

@@ -1 +0,0 @@
@import '../../styles/variables.scss';

View File

@@ -1,5 +0,0 @@
import { SearchResult } from '../../+search-page/search-result.model';
import { Item } from '../../core/shared/item.model';
export class ItemSearchResult extends SearchResult<Item> {
}

View File

@@ -1,2 +0,0 @@
@import '../../../styles/variables.scss';
@import '../grid-card-styling.scss';

View File

@@ -1,2 +0,0 @@
@import '../../../styles/variables.scss';
@import '../grid-card-styling.scss';

View File

@@ -1 +0,0 @@
@import '../../../styles/variables.scss';

View File

@@ -1,2 +0,0 @@
@import '../../../styles/variables.scss';
@import '../grid-card-styling.scss';

View File

@@ -1,6 +0,0 @@
@import '../../../styles/variables.scss';
@import '../grid-card-styling.scss';
:host {
display: block;
margin-bottom: $spacer;
}

View File

@@ -1 +0,0 @@
@import '../../styles/variables.scss';

View File

@@ -1,2 +0,0 @@
@import '../../../../styles/variables.scss';
@import '../../grid-card-styling.scss';

View File

@@ -1,5 +0,0 @@
import { SearchResult } from '../../../+search-page/search-result.model';
import { Collection } from '../../../core/shared/collection.model';
export class CollectionSearchResult extends SearchResult<Collection> {
}

View File

@@ -1,2 +0,0 @@
@import '../../../../styles/variables.scss';
@import '../../grid-card-styling.scss';

View File

@@ -1,5 +0,0 @@
import { SearchResult } from '../../../+search-page/search-result.model';
import { Community } from '../../../core/shared/community.model';
export class CommunitySearchResult extends SearchResult<Community> {
}

View File

@@ -1,2 +0,0 @@
@import '../../../../styles/variables.scss';
@import '../../grid-card-styling.scss';

View File

@@ -1,2 +0,0 @@
@import '../../../styles/variables.scss';
@import '../grid-card-styling.scss';

View File

@@ -1 +0,0 @@
@import '../../../styles/variables.scss';

View File

@@ -1 +0,0 @@
@import '../../../styles/variables.scss';

View File

@@ -1 +0,0 @@
@import '../../../styles/variables.scss';

View File

@@ -1 +0,0 @@
@import '../../styles/variables.scss';

View File

@@ -1,5 +0,0 @@
import { SearchResult } from '../../../+search-page/search-result.model';
import { Collection } from '../../../core/shared/collection.model';
export class CollectionSearchResult extends SearchResult<Collection> {
}

View File

@@ -1,5 +0,0 @@
import { SearchResult } from '../../../+search-page/search-result.model';
import { Community } from '../../../core/shared/community.model';
export class CommunitySearchResult extends SearchResult<Community> {
}

View File

@@ -1,2 +0,0 @@
@import '../../../styles/variables.scss';

View File

@@ -0,0 +1 @@
@import '../../../styles/variables';

View File

@@ -1,13 +1,13 @@
import { ObjectCollectionComponent } from './object-collection.component';
import { ViewMode } from '../+search-page/search-options.model';
import { ViewMode } from '../../+search-page/search-options.model';
import { element } from 'protractor';
import { By } from '@angular/platform-browser';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { Config } from '../../config/config.interface';
import { Config } from '../../../config/config.interface';
import { NO_ERRORS_SCHEMA } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { Observable } from 'rxjs/Observable';
import { RouterStub } from '../shared/testing/router-stub';
import { RouterStub } from '../testing/router-stub';
describe('ObjectCollectionComponent', () => {
let fixture: ComponentFixture<ObjectCollectionComponent>;

View File

@@ -6,16 +6,16 @@ import { ActivatedRoute, Router } from '@angular/router';
import { Observable } from 'rxjs/Observable';
import { RemoteData } from '../core/data/remote-data';
import { PageInfo } from '../core/shared/page-info.model';
import { RemoteData } from '../../core/data/remote-data';
import { PageInfo } from '../../core/shared/page-info.model';
import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model';
import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
import { ListableObject } from './shared/listable-object.model';
import { ViewMode } from '../+search-page/search-options.model';
import { hasValue, isNotEmpty } from '../shared/empty.util';
import { ViewMode } from '../../+search-page/search-options.model';
import { hasValue, isNotEmpty } from '../empty.util';
@Component({
selector: 'ds-viewable-collection',

View File

@@ -1,6 +1,6 @@
import { ViewMode } from '../../+search-page/search-options.model';
import { ViewMode } from '../../../+search-page/search-options.model';
import { renderElementsFor } from './dso-element-decorator';
import { Item } from '../../core/shared/item.model';
import { Item } from '../../../core/shared/item.model';
describe('ElementDecorator', () => {
let gridDecorator = renderElementsFor(Item, ViewMode.Grid);

View File

@@ -1,6 +1,6 @@
import { GenericConstructor } from '../../core/shared/generic-constructor';
import { GenericConstructor } from '../../../core/shared/generic-constructor';
import { ListableObject } from './listable-object.model';
import { ViewMode } from '../../+search-page/search-options.model';
import { ViewMode } from '../../../+search-page/search-options.model';
const dsoElementMap = new Map();
export function renderElementsFor(listable: GenericConstructor<ListableObject>, viewMode : ViewMode) {

View File

@@ -0,0 +1,5 @@
import { SearchResult } from '../../../+search-page/search-result.model';
import { Item } from '../../../core/shared/item.model';
export class ItemSearchResult extends SearchResult<Item> {
}

View File

@@ -0,0 +1,2 @@
@import '../../../../styles/variables';
@import '../grid-card-styling';

View File

@@ -1,9 +1,9 @@
import { Component, Inject } from '@angular/core';
import { Collection } from '../../core/shared/collection.model';
import { Collection } from '../../../core/shared/collection.model';
import { ObjectGridElementComponent } from '../object-grid-element/object-grid-element.component';
import { renderElementsFor} from '../../object-collection/shared/dso-element-decorator';
import { ViewMode } from '../../+search-page/search-options.model';
import { ViewMode } from '../../../+search-page/search-options.model';
@Component({

View File

@@ -0,0 +1,2 @@
@import '../../../../styles/variables';
@import '../grid-card-styling';

View File

@@ -1,9 +1,9 @@
import { Component, Input, Inject } from '@angular/core';
import { Community } from '../../core/shared/community.model';
import { Community } from '../../../core/shared/community.model';
import { ObjectGridElementComponent } from '../object-grid-element/object-grid-element.component';
import { renderElementsFor} from '../../object-collection/shared/dso-element-decorator';
import { ViewMode } from '../../+search-page/search-options.model';
import { ViewMode } from '../../../+search-page/search-options.model';
@Component({
selector: 'ds-community-grid-element',

View File

@@ -1,4 +1,4 @@
@import '../../styles/custom_variables';
@import '../../../styles/custom_variables';
.card-title{
line-height: $line-height-base;

View File

@@ -0,0 +1 @@
@import '../../../../styles/variables';

View File

@@ -3,8 +3,8 @@ import { By } from '@angular/platform-browser';
import { DebugElement } from '@angular/core';
import { GridThumbnailComponent } from './grid-thumbnail.component';
import { Bitstream } from '../../core/shared/bitstream.model';
import { SafeUrlPipe } from '../../shared/utils/safe-url-pipe';
import { Bitstream } from '../../../core/shared/bitstream.model';
import { SafeUrlPipe } from '../../utils/safe-url-pipe';
describe('ThumbnailComponent', () => {
let comp: GridThumbnailComponent;

View File

@@ -1,5 +1,5 @@
import { Component, Input } from '@angular/core';
import { Bitstream } from '../../core/shared/bitstream.model';
import { Bitstream } from '../../../core/shared/bitstream.model';
/**
* This component renders a given Bitstream as a thumbnail.

View File

@@ -0,0 +1,2 @@
@import '../../../../styles/variables';
@import '../grid-card-styling';

View File

@@ -1,9 +1,9 @@
import { Component, Input, Inject } from '@angular/core';
import { Item } from '../../core/shared/item.model';
import { Item } from '../../../core/shared/item.model';
import { renderElementsFor} from '../../object-collection/shared/dso-element-decorator';
import { ObjectGridElementComponent } from '../object-grid-element/object-grid-element.component';
import { ViewMode } from '../../+search-page/search-options.model';
import { ViewMode } from '../../../+search-page/search-options.model';
@Component({
selector: 'ds-item-grid-element',

View File

@@ -0,0 +1,6 @@
@import '../../../../styles/variables';
@import '../grid-card-styling';
:host {
display: block;
margin-bottom: $spacer;
}

View File

@@ -0,0 +1 @@
@import '../../../styles/variables';

View File

@@ -8,13 +8,13 @@ import {
} from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { RemoteData } from '../core/data/remote-data';
import { PageInfo } from '../core/shared/page-info.model';
import { RemoteData } from '../../core/data/remote-data';
import { PageInfo } from '../../core/shared/page-info.model';
import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
import { SortOptions, SortDirection } from '../core/cache/models/sort-options.model';
import { fadeIn } from '../shared/animations/fade';
import { SortOptions, SortDirection } from '../../core/cache/models/sort-options.model';
import { fadeIn } from '../animations/fade';
import { ListableObject } from '../object-collection/shared/listable-object.model';
@Component({

View File

@@ -0,0 +1,2 @@
@import '../../../../../styles/variables';
@import '../../grid-card-styling';

View File

@@ -4,8 +4,8 @@ import { renderElementsFor} from '../../../object-collection/shared/dso-element-
import { CollectionSearchResult } from './collection-search-result.model';
import { SearchResultGridElementComponent } from '../search-result-grid-element.component';
import { Collection } from '../../../core/shared/collection.model';
import { ViewMode } from '../../../+search-page/search-options.model';
import { Collection } from '../../../../core/shared/collection.model';
import { ViewMode } from '../../../../+search-page/search-options.model';
@Component({
selector: 'ds-collection-search-result-grid-element',

View File

@@ -0,0 +1,5 @@
import { SearchResult } from '../../../../+search-page/search-result.model';
import { Collection } from '../../../../core/shared/collection.model';
export class CollectionSearchResult extends SearchResult<Collection> {
}

View File

@@ -0,0 +1,2 @@
@import '../../../../../styles/variables';
@import '../../grid-card-styling';

View File

@@ -1,10 +1,10 @@
import { Component } from '@angular/core';
import { CommunitySearchResult } from './community-search-result.model';
import { Community } from '../../../core/shared/community.model';
import { Community } from '../../../../core/shared/community.model';
import { renderElementsFor } from '../../../object-collection/shared/dso-element-decorator';
import { SearchResultGridElementComponent } from '../search-result-grid-element.component';
import { ViewMode } from '../../../+search-page/search-options.model';
import { ViewMode } from '../../../../+search-page/search-options.model';
@Component({
selector: 'ds-community-search-result-grid-element',

View File

@@ -0,0 +1,5 @@
import { SearchResult } from '../../../../+search-page/search-result.model';
import { Community } from '../../../../core/shared/community.model';
export class CommunitySearchResult extends SearchResult<Community> {
}

View File

@@ -0,0 +1,2 @@
@import '../../../../../styles/variables';
@import '../../grid-card-styling';

View File

@@ -2,9 +2,9 @@ import { Component } from '@angular/core';
import { renderElementsFor } from '../../../object-collection/shared/dso-element-decorator';
import { SearchResultGridElementComponent } from '../search-result-grid-element.component';
import { Item } from '../../../core/shared/item.model';
import { Item } from '../../../../core/shared/item.model';
import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
import { ViewMode } from '../../../+search-page/search-options.model';
import { ViewMode } from '../../../../+search-page/search-options.model';
@Component({
selector: 'ds-item-search-result-grid-element',

View File

@@ -1,5 +1,5 @@
@import '../../../styles/variables.scss';
@import '../grid-card-styling.scss';
@import '../../../../styles/variables';
@import '../grid-card-styling';
:host {
/deep/ em {
font-weight: bold;

View File

@@ -1,9 +1,9 @@
import { Component, Inject } from '@angular/core';
import { SearchResult } from '../../+search-page/search-result.model';
import { DSpaceObject } from '../../core/shared/dspace-object.model';
import { Metadatum } from '../../core/shared/metadatum.model';
import { isEmpty, hasNoValue } from '../../shared/empty.util';
import { SearchResult } from '../../../+search-page/search-result.model';
import { DSpaceObject } from '../../../core/shared/dspace-object.model';
import { Metadatum } from '../../../core/shared/metadatum.model';
import { isEmpty, hasNoValue } from '../../empty.util';
import { ObjectGridElementComponent } from '../object-grid-element/object-grid-element.component';
import { ListableObject } from '../../object-collection/shared/listable-object.model';

View File

@@ -0,0 +1,2 @@
@import '../../../../styles/variables';
@import '../grid-card-styling';

View File

@@ -1,8 +1,8 @@
import { Component, Input, Injector, ReflectiveInjector, OnInit } from '@angular/core';
import { GenericConstructor } from '../../core/shared/generic-constructor';
import { GenericConstructor } from '../../../core/shared/generic-constructor';
import { rendersDSOType } from '../../object-collection/shared/dso-element-decorator';
import { ListableObject } from '../../object-collection/shared/listable-object.model';
import { ViewMode } from '../../+search-page/search-options.model';
import { ViewMode } from '../../../+search-page/search-options.model';
@Component({
selector: 'ds-wrapper-grid-element',

View File

@@ -0,0 +1 @@
@import '../../../../styles/variables';

View File

@@ -1,9 +1,9 @@
import { Component, Inject } from '@angular/core';
import { Collection } from '../../core/shared/collection.model';
import { Collection } from '../../../core/shared/collection.model';
import { ObjectListElementComponent } from '../object-list-element/object-list-element.component';
import { renderElementsFor } from '../../object-collection/shared/dso-element-decorator';
import { ViewMode } from '../../+search-page/search-options.model';
import { ViewMode } from '../../../+search-page/search-options.model';
@Component({
selector: 'ds-collection-list-element',

View File

@@ -0,0 +1 @@
@import '../../../../styles/variables';

View File

@@ -1,9 +1,9 @@
import { Component, Input, Inject } from '@angular/core';
import { Community } from '../../core/shared/community.model';
import { Community } from '../../../core/shared/community.model';
import { ObjectListElementComponent } from '../object-list-element/object-list-element.component';
import { renderElementsFor } from '../../object-collection/shared/dso-element-decorator';
import { ViewMode } from '../../+search-page/search-options.model';
import { ViewMode } from '../../../+search-page/search-options.model';
@Component({
selector: 'ds-community-list-element',

View File

@@ -0,0 +1 @@
@import '../../../../styles/variables';

View File

@@ -1,9 +1,9 @@
import { Component, Input, Inject } from '@angular/core';
import { Item } from '../../core/shared/item.model';
import { Item } from '../../../core/shared/item.model';
import { ObjectListElementComponent } from '../object-list-element/object-list-element.component';
import { renderElementsFor } from '../../object-collection/shared/dso-element-decorator';
import { ViewMode } from '../../+search-page/search-options.model';
import { ViewMode } from '../../../+search-page/search-options.model';
@Component({
selector: 'ds-item-list-element',

View File

@@ -1,4 +1,4 @@
@import '../../../styles/variables.scss';
@import '../../../../styles/variables';
:host {
display: block;

View File

@@ -0,0 +1 @@
@import '../../../styles/variables';

View File

@@ -9,9 +9,14 @@ import {
import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model';
import { RemoteData } from '../core/data/remote-data';
import { PageInfo } from '../core/shared/page-info.model';
import { fadeIn } from '../shared/animations/fade';
import { RemoteData } from '../../core/data/remote-data';
import { PageInfo } from '../../core/shared/page-info.model';
import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
import { SortOptions, SortDirection } from '../../core/cache/models/sort-options.model';
import { fadeIn } from '../animations/fade';
import { ListableObject } from '../object-collection/shared/listable-object.model';
import { hasValue } from '../shared/empty.util';

View File

@@ -3,8 +3,8 @@ import { Component } from '@angular/core';
import { renderElementsFor } from '../../../object-collection/shared/dso-element-decorator';
import { CollectionSearchResult } from './collection-search-result.model';
import { SearchResultListElementComponent } from '../search-result-list-element.component';
import { Collection } from '../../../core/shared/collection.model';
import { ViewMode } from '../../../+search-page/search-options.model';
import { Collection } from '../../../../core/shared/collection.model';
import { ViewMode } from '../../../../+search-page/search-options.model';
@Component({
selector: 'ds-collection-search-result-list-element',

View File

@@ -0,0 +1,5 @@
import { SearchResult } from '../../../../+search-page/search-result.model';
import { Collection } from '../../../../core/shared/collection.model';
export class CollectionSearchResult extends SearchResult<Collection> {
}

View File

@@ -3,8 +3,8 @@ import { Component } from '@angular/core';
import { renderElementsFor } from '../../../object-collection/shared/dso-element-decorator';
import { CommunitySearchResult } from './community-search-result.model';
import { SearchResultListElementComponent } from '../search-result-list-element.component';
import { Community } from '../../../core/shared/community.model';
import { ViewMode } from '../../../+search-page/search-options.model';
import { Community } from '../../../../core/shared/community.model';
import { ViewMode } from '../../../../+search-page/search-options.model';
@Component({
selector: 'ds-community-search-result-list-element',

View File

@@ -0,0 +1,5 @@
import { SearchResult } from '../../../../+search-page/search-result.model';
import { Community } from '../../../../core/shared/community.model';
export class CommunitySearchResult extends SearchResult<Community> {
}

Some files were not shown because too many files have changed in this diff Show More