From bc305e2aa6aec5b822007484431cce9313ca2f1d Mon Sep 17 00:00:00 2001 From: lotte Date: Wed, 20 Feb 2019 16:21:03 +0100 Subject: [PATCH 01/15] 60113: context sensitive popup started from submission branch --- .../admin-sidebar/admin-sidebar.component.ts | 17 ++- src/app/+admin/admin.module.ts | 4 +- .../builders/remote-data-build.service.ts | 21 ++- ...tion-selector-modal-wrapper.component.html | 6 + ...ection-selector-modal-wrapper.component.ts | 10 ++ .../collection-selector.component.html | 26 ++++ .../collection-selector.component.ts | 125 ++++++++++++++++++ src/app/shared/menu/initial-menus-state.ts | 2 +- .../menu/menu-item/models/onclick.model.ts | 11 ++ .../onclick-menu-item.component.html | 1 + .../menu-item/onclick-menu-item.component.ts | 20 +++ src/app/shared/menu/menu.module.ts | 7 +- src/app/shared/shared.module.ts | 8 +- 13 files changed, 246 insertions(+), 12 deletions(-) create mode 100644 src/app/shared/dso-selector/collection-selector-modal-wrapper/collection-selector-modal-wrapper.component.html create mode 100644 src/app/shared/dso-selector/collection-selector-modal-wrapper/collection-selector-modal-wrapper.component.ts create mode 100644 src/app/shared/dso-selector/collection-selector/collection-selector.component.html create mode 100644 src/app/shared/dso-selector/collection-selector/collection-selector.component.ts create mode 100644 src/app/shared/menu/menu-item/models/onclick.model.ts create mode 100644 src/app/shared/menu/menu-item/onclick-menu-item.component.html create mode 100644 src/app/shared/menu/menu-item/onclick-menu-item.component.ts diff --git a/src/app/+admin/admin-sidebar/admin-sidebar.component.ts b/src/app/+admin/admin-sidebar/admin-sidebar.component.ts index eb48f64d4d..f3d417b93d 100644 --- a/src/app/+admin/admin-sidebar/admin-sidebar.component.ts +++ b/src/app/+admin/admin-sidebar/admin-sidebar.component.ts @@ -1,6 +1,6 @@ import { Component, Injector, OnInit } from '@angular/core'; import { Observable } from 'rxjs/internal/Observable'; -import { slide, slideHorizontal, slideSidebar } from '../../shared/animations/slide'; +import { slideHorizontal, slideSidebar } from '../../shared/animations/slide'; import { CSSVariableService } from '../../shared/sass-helper/sass-helper.service'; import { MenuService } from '../../shared/menu/menu.service'; import { MenuID, MenuItemType } from '../../shared/menu/initial-menus-state'; @@ -10,6 +10,9 @@ import { LinkMenuItemModel } from '../../shared/menu/menu-item/models/link.model import { AuthService } from '../../core/auth/auth.service'; import { first, map } from 'rxjs/operators'; import { combineLatest as combineLatestObservable } from 'rxjs'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { OnClickMenuItemModel } from '../../shared/menu/menu-item/models/onclick.model'; +import { CollectionSelectorModalWrapperComponent } from '../../shared/dso-selector/collection-selector-modal-wrapper/collection-selector-modal-wrapper.component'; /** * Component representing the admin sidebar @@ -52,7 +55,8 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit { constructor(protected menuService: MenuService, protected injector: Injector, private variableService: CSSVariableService, - private authService: AuthService + private authService: AuthService, + private modalService: NgbModal ) { super(menuService, injector); } @@ -104,10 +108,13 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit { active: false, visible: true, model: { - type: MenuItemType.LINK, + type: MenuItemType.ONCLICK, text: 'menu.section.new_community', - link: '/communities/submission' - } as LinkMenuItemModel, + function: () => { + const modal = this.modalService.open(CollectionSelectorModalWrapperComponent); + modal.componentInstance.currentCollectionID = 'c069b0c2-dc6a-40de-92c3-6803cd66023e'; + } + } as OnClickMenuItemModel, }, { id: 'new_collection', diff --git a/src/app/+admin/admin.module.ts b/src/app/+admin/admin.module.ts index 41d00223ab..1495d0fd8c 100644 --- a/src/app/+admin/admin.module.ts +++ b/src/app/+admin/admin.module.ts @@ -1,12 +1,14 @@ import { NgModule } from '@angular/core'; import { AdminRegistriesModule } from './admin-registries/admin-registries.module'; import { AdminRoutingModule } from './admin-routing.module'; +import { SharedModule } from '../shared/shared.module'; @NgModule({ imports: [ AdminRegistriesModule, AdminRoutingModule, - ] + SharedModule, + ], }) export class AdminModule { diff --git a/src/app/core/cache/builders/remote-data-build.service.ts b/src/app/core/cache/builders/remote-data-build.service.ts index 7cfbcdd252..697d98fc68 100644 --- a/src/app/core/cache/builders/remote-data-build.service.ts +++ b/src/app/core/cache/builders/remote-data-build.service.ts @@ -5,8 +5,14 @@ import { race as observableRace } from 'rxjs'; import { Injectable } from '@angular/core'; -import { distinctUntilChanged, flatMap, map, startWith, switchMap } from 'rxjs/operators'; -import { hasValue, hasValueOperator, isEmpty, isNotEmpty } from '../../../shared/empty.util'; +import { distinctUntilChanged, flatMap, map, startWith, switchMap, tap } from 'rxjs/operators'; +import { + hasValue, + hasValueOperator, + isEmpty, + isNotEmpty, + isNotUndefined +} from '../../../shared/empty.util'; import { PaginatedList } from '../../data/paginated-list'; import { RemoteData } from '../../data/remote-data'; import { RemoteDataError } from '../../data/remote-data-error'; @@ -113,8 +119,19 @@ export class RemoteDataBuildService { } const requestEntry$ = href$.pipe(getRequestFromRequestHref(this.requestService)); + requestEntry$.subscribe((t) => { + console.log('requestEntry$', t) + }); const tDomainList$ = requestEntry$.pipe( getResourceLinksFromResponse(), + tap((resourceUUIDs: string[]) => { + const g = (href$ as Observable) + + g.subscribe((t) => { + console.log('href', t) + }); + console.log(resourceUUIDs); + }), flatMap((resourceUUIDs: string[]) => { return this.objectCache.getList(resourceUUIDs).pipe( map((normList: Array>) => { diff --git a/src/app/shared/dso-selector/collection-selector-modal-wrapper/collection-selector-modal-wrapper.component.html b/src/app/shared/dso-selector/collection-selector-modal-wrapper/collection-selector-modal-wrapper.component.html new file mode 100644 index 0000000000..7fadd477f4 --- /dev/null +++ b/src/app/shared/dso-selector/collection-selector-modal-wrapper/collection-selector-modal-wrapper.component.html @@ -0,0 +1,6 @@ +
+
New item
+
+ +
+
\ No newline at end of file diff --git a/src/app/shared/dso-selector/collection-selector-modal-wrapper/collection-selector-modal-wrapper.component.ts b/src/app/shared/dso-selector/collection-selector-modal-wrapper/collection-selector-modal-wrapper.component.ts new file mode 100644 index 0000000000..c60d6f2938 --- /dev/null +++ b/src/app/shared/dso-selector/collection-selector-modal-wrapper/collection-selector-modal-wrapper.component.ts @@ -0,0 +1,10 @@ +import { Component, Input } from '@angular/core'; + +@Component({ + selector: 'ds-collection-selector-modal-wrapper', + // styleUrls: ['./collection-selector.component.scss'], + templateUrl: './collection-selector-modal-wrapper.component.html', +}) +export class CollectionSelectorModalWrapperComponent { + @Input() currentCollectionID: string; +} diff --git a/src/app/shared/dso-selector/collection-selector/collection-selector.component.html b/src/app/shared/dso-selector/collection-selector/collection-selector.component.html new file mode 100644 index 0000000000..e137f5e119 --- /dev/null +++ b/src/app/shared/dso-selector/collection-selector/collection-selector.component.html @@ -0,0 +1,26 @@ +
+ +
+
+
+ + +
\ No newline at end of file diff --git a/src/app/shared/dso-selector/collection-selector/collection-selector.component.ts b/src/app/shared/dso-selector/collection-selector/collection-selector.component.ts new file mode 100644 index 0000000000..6b9625c8a6 --- /dev/null +++ b/src/app/shared/dso-selector/collection-selector/collection-selector.component.ts @@ -0,0 +1,125 @@ +import { Component, Input, OnChanges, SimpleChanges } from '@angular/core'; +import { FormControl } from '@angular/forms'; + +import { BehaviorSubject, combineLatest, Observable, Subscription } from 'rxjs'; +import { + debounceTime, + distinctUntilChanged, + filter, + find, + flatMap, + map, + mergeMap, + reduce, + startWith +} from 'rxjs/operators'; + +import { Collection } from '../../../core/shared/collection.model'; +import { CommunityDataService } from '../../../core/data/community-data.service'; +import { Community } from '../../../core/shared/community.model'; +import { hasValue, isEmpty, isNotEmpty } from '../../../shared/empty.util'; +import { RemoteData } from '../../../core/data/remote-data'; +import { PaginatedList } from '../../../core/data/paginated-list'; +import { getSucceededRemoteData } from '../../../core/shared/operators'; + +interface CollectionListEntryItem { + id: string; + name: string; +} + +interface CollectionListEntry { + communities: CollectionListEntryItem[], + collection: CollectionListEntryItem +} + +@Component({ + selector: 'ds-collection-selector', + // styleUrls: ['./collection-selector.component.scss'], + templateUrl: './collection-selector.component.html' +}) +export class CollectionSelectorComponent implements OnChanges { + @Input() currentCollectionId: string; + + public disabled$ = new BehaviorSubject(true); + public model: any; + public searchField: FormControl = new FormControl(); + public searchListCollection$: Observable; + public selectedCollectionId: string; + public selectedCollectionName$: Observable; + + private subs: Subscription[] = []; + + constructor(private communityDataService: CommunityDataService) { + } + + ngOnChanges(changes: SimpleChanges) { + if (hasValue(changes.currentCollectionId) + && hasValue(changes.currentCollectionId.currentValue)) { + this.selectedCollectionId = this.currentCollectionId; + + // @TODO replace with search/top browse endpoint + // @TODO implement community/subcommunity hierarchy + const communities$ = this.communityDataService.findAll().pipe( + find((communities: RemoteData>) => isNotEmpty(communities.payload)), + mergeMap((communities: RemoteData>) => communities.payload.page)); + communities$.subscribe((t) => {console.log('communities', t)}); + // const listCollection$ = communities$.pipe( + // flatMap((communityData: Community) => { + // return communityData.collections.pipe( + // getSucceededRemoteData(), + // mergeMap((collections: RemoteData>) => collections.payload.page), + // filter((collectionData: Collection) => isNotEmpty(collectionData)), + // map((collectionData: Collection) => ({ + // communities: [{ id: communityData.id, name: communityData.name }], + // collection: { id: collectionData.id, name: collectionData.name } + // })) + // ); + // }), + // reduce((acc: any, value: any) => [...acc, ...value], []), + // startWith([]) + // ); + // + // this.selectedCollectionName$ = communities$.pipe( + // flatMap((communityData: Community) => { + // return communityData.collections.pipe( + // getSucceededRemoteData(), + // mergeMap((collections: RemoteData>) => collections.payload.page), + // filter((collectionData: Collection) => isNotEmpty(collectionData)), + // filter((collectionData: Collection) => collectionData.id === this.selectedCollectionId), + // map((collectionData: Collection) => collectionData.name) + // ); + // }), + // startWith('') + // ); + // + // const searchTerm$ = this.searchField.valueChanges.pipe( + // debounceTime(200), + // distinctUntilChanged(), + // startWith('') + // ); + // + // this.searchListCollection$ = combineLatest(searchTerm$, listCollection$).pipe( + // map(([searchTerm, listCollection]) => { + // this.disabled$.next(isEmpty(listCollection)); + // if (isEmpty(searchTerm)) { + // return listCollection; + // } else { + // return listCollection.filter((v) => v.collection.name.toLowerCase().indexOf(searchTerm.toLowerCase()) > -1).slice(0, 5) + // } + // })); + } + } + + ngOnDestroy(): void { + this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe()); + } + + onSelect(event) { + this.searchField.reset(); + this.disabled$.next(true); + } + + onClose() { + this.searchField.reset(); + } +} diff --git a/src/app/shared/menu/initial-menus-state.ts b/src/app/shared/menu/initial-menus-state.ts index 7f3482f41f..7b900540b6 100644 --- a/src/app/shared/menu/initial-menus-state.ts +++ b/src/app/shared/menu/initial-menus-state.ts @@ -12,7 +12,7 @@ export enum MenuID { * List of possible MenuItemTypes */ export enum MenuItemType { - TEXT, LINK, ALTMETRIC, SEARCH + TEXT, LINK, ALTMETRIC, SEARCH, ONCLICK } /** diff --git a/src/app/shared/menu/menu-item/models/onclick.model.ts b/src/app/shared/menu/menu-item/models/onclick.model.ts new file mode 100644 index 0000000000..4cef3084f9 --- /dev/null +++ b/src/app/shared/menu/menu-item/models/onclick.model.ts @@ -0,0 +1,11 @@ +import { MenuItemModel } from './menu-item.model'; +import { MenuItemType } from '../../initial-menus-state'; + +/** + * Model representing an OnClick Menu Section + */ +export class OnClickMenuItemModel implements MenuItemModel { + type = MenuItemType.ONCLICK; + text: string; + function: () => {}; +} diff --git a/src/app/shared/menu/menu-item/onclick-menu-item.component.html b/src/app/shared/menu/menu-item/onclick-menu-item.component.html new file mode 100644 index 0000000000..0790ef7479 --- /dev/null +++ b/src/app/shared/menu/menu-item/onclick-menu-item.component.html @@ -0,0 +1 @@ +{{item.text | translate}} \ No newline at end of file diff --git a/src/app/shared/menu/menu-item/onclick-menu-item.component.ts b/src/app/shared/menu/menu-item/onclick-menu-item.component.ts new file mode 100644 index 0000000000..14fd5d8ffd --- /dev/null +++ b/src/app/shared/menu/menu-item/onclick-menu-item.component.ts @@ -0,0 +1,20 @@ +import { Component, Inject } from '@angular/core'; +import { MenuItemType } from '../initial-menus-state'; +import { rendersMenuItemForType } from '../menu-item.decorator'; +import { GLOBAL_CONFIG, GlobalConfig } from '../../../../config'; +import { OnClickMenuItemModel } from './models/onclick.model'; + +/** + * Component that renders a menu section of type LINK + */ +@Component({ + selector: 'ds-onclick-menu-item', + templateUrl: './onclick-menu-item.component.html' +}) +@rendersMenuItemForType(MenuItemType.ONCLICK) +export class OnClickMenuItemComponent { + item: OnClickMenuItemModel; + constructor(@Inject('itemModelProvider') item: OnClickMenuItemModel, @Inject(GLOBAL_CONFIG) private EnvConfig: GlobalConfig) { + this.item = item; + } +} diff --git a/src/app/shared/menu/menu.module.ts b/src/app/shared/menu/menu.module.ts index 736da5c267..7e900d18e6 100644 --- a/src/app/shared/menu/menu.module.ts +++ b/src/app/shared/menu/menu.module.ts @@ -5,17 +5,20 @@ import { TranslateModule } from '@ngx-translate/core'; import { RouterModule } from '@angular/router'; import { LinkMenuItemComponent } from './menu-item/link-menu-item.component'; import { TextMenuItemComponent } from './menu-item/text-menu-item.component'; +import { OnClickMenuItemComponent } from './menu-item/onclick-menu-item.component'; const COMPONENTS = [ MenuSectionComponent, MenuComponent, LinkMenuItemComponent, - TextMenuItemComponent + TextMenuItemComponent, + OnClickMenuItemComponent ]; const ENTRY_COMPONENTS = [ LinkMenuItemComponent, - TextMenuItemComponent + TextMenuItemComponent, + OnClickMenuItemComponent ]; const MODULES = [ diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 5ae3e517e3..da45faee9f 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -91,6 +91,8 @@ import { CreateComColPageComponent } from './comcol-forms/create-comcol-page/cre import { EditComColPageComponent } from './comcol-forms/edit-comcol-page/edit-comcol-page.component'; import { DeleteComColPageComponent } from './comcol-forms/delete-comcol-page/delete-comcol-page.component'; import { LangSwitchComponent } from './lang-switch/lang-switch.component'; +import { CollectionSelectorComponent } from './dso-selector/collection-selector/collection-selector.component'; +import { CollectionSelectorModalWrapperComponent } from './dso-selector/collection-selector-modal-wrapper/collection-selector-modal-wrapper.component'; import { ObjectValuesPipe } from './utils/object-values-pipe'; import { InListValidator } from './utils/in-list-validator.directive'; import { AutoFocusDirective } from './utils/auto-focus.directive'; @@ -177,6 +179,8 @@ const COMPONENTS = [ TruncatablePartComponent, BrowseByComponent, InputSuggestionsComponent, + CollectionSelectorComponent, + CollectionSelectorModalWrapperComponent ]; const ENTRY_COMPONENTS = [ @@ -189,7 +193,9 @@ const ENTRY_COMPONENTS = [ CollectionGridElementComponent, CommunityGridElementComponent, SearchResultGridElementComponent, - BrowseEntryListElementComponent + BrowseEntryListElementComponent, + CollectionSelectorComponent, + CollectionSelectorModalWrapperComponent ]; const PROVIDERS = [ From 61a5620efe761ec79027f7ee625a820c301553f0 Mon Sep 17 00:00:00 2001 From: lotte Date: Fri, 1 Mar 2019 16:41:38 +0100 Subject: [PATCH 02/15] refactored lookup --- config/environment.default.js | 5 +- .../admin-sidebar/admin-sidebar.component.ts | 21 +-- .../collection-page.module.ts | 1 - src/app/+search-page/search-page.module.ts | 1 - .../builders/remote-data-build.service.ts | 11 -- src/app/core/core.module.ts | 2 + src/app/core/data/request.models.ts | 9 +- ...tion-selector-modal-wrapper.component.html | 4 +- ...ection-selector-modal-wrapper.component.ts | 16 ++- .../collection-selector.component.html | 26 ---- .../collection-selector.component.ts | 125 ------------------ ...nity-selector-modal-wrapper.component.html | 7 + ...munity-selector-modal-wrapper.component.ts | 20 +++ .../dso-selector/dso-selector.component.html | 27 ++++ .../dso-selector/dso-selector.component.ts | 94 +++++++++++++ ...item-selector-modal-wrapper.component.html | 6 + .../item-selector-modal-wrapper.component.ts | 21 +++ src/app/shared/shared.module.ts | 16 ++- 18 files changed, 223 insertions(+), 189 deletions(-) delete mode 100644 src/app/shared/dso-selector/collection-selector/collection-selector.component.html delete mode 100644 src/app/shared/dso-selector/collection-selector/collection-selector.component.ts create mode 100644 src/app/shared/dso-selector/community-selector-modal-wrapper/community-selector-modal-wrapper.component.html create mode 100644 src/app/shared/dso-selector/community-selector-modal-wrapper/community-selector-modal-wrapper.component.ts create mode 100644 src/app/shared/dso-selector/dso-selector/dso-selector.component.html create mode 100644 src/app/shared/dso-selector/dso-selector/dso-selector.component.ts create mode 100644 src/app/shared/dso-selector/item-selector-modal-wrapper/item-selector-modal-wrapper.component.html create mode 100644 src/app/shared/dso-selector/item-selector-modal-wrapper/item-selector-modal-wrapper.component.ts diff --git a/config/environment.default.js b/config/environment.default.js index b8eae1ccff..b493d0473a 100644 --- a/config/environment.default.js +++ b/config/environment.default.js @@ -10,10 +10,9 @@ module.exports = { // The REST API server settings. rest: { ssl: true, - host: 'dspace7.4science.it', + host: 'dspace7-internal.atmire.com', port: 443, - // NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript - nameSpace: '/dspace-spring-rest/api' + nameSpace: '/rest/api' }, // Caching settings cache: { diff --git a/src/app/+admin/admin-sidebar/admin-sidebar.component.ts b/src/app/+admin/admin-sidebar/admin-sidebar.component.ts index f3d417b93d..22cb1f5825 100644 --- a/src/app/+admin/admin-sidebar/admin-sidebar.component.ts +++ b/src/app/+admin/admin-sidebar/admin-sidebar.component.ts @@ -13,6 +13,8 @@ import { combineLatest as combineLatestObservable } from 'rxjs'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { OnClickMenuItemModel } from '../../shared/menu/menu-item/models/onclick.model'; import { CollectionSelectorModalWrapperComponent } from '../../shared/dso-selector/collection-selector-modal-wrapper/collection-selector-modal-wrapper.component'; +import { ItemSelectorModalWrapperComponent } from '../../shared/dso-selector/item-selector-modal-wrapper/item-selector-modal-wrapper.component'; +import { CommunitySelectorModalWrapperComponent } from '../../shared/dso-selector/community-selector-modal-wrapper/community-selector-modal-wrapper.component'; /** * Component representing the admin sidebar @@ -111,8 +113,7 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit { type: MenuItemType.ONCLICK, text: 'menu.section.new_community', function: () => { - const modal = this.modalService.open(CollectionSelectorModalWrapperComponent); - modal.componentInstance.currentCollectionID = 'c069b0c2-dc6a-40de-92c3-6803cd66023e'; + this.modalService.open(CommunitySelectorModalWrapperComponent); } } as OnClickMenuItemModel, }, @@ -122,10 +123,12 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit { active: false, visible: true, model: { - type: MenuItemType.LINK, + type: MenuItemType.ONCLICK, text: 'menu.section.new_collection', - link: '/collections/submission' - } as LinkMenuItemModel, + function: () => { + this.modalService.open(CollectionSelectorModalWrapperComponent); + } + } as OnClickMenuItemModel, }, { id: 'new_item', @@ -133,10 +136,12 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit { active: false, visible: true, model: { - type: MenuItemType.LINK, + type: MenuItemType.ONCLICK, text: 'menu.section.new_item', - link: '/items/submission' - } as LinkMenuItemModel, + function: () => { + this.modalService.open(ItemSelectorModalWrapperComponent); + } + } as OnClickMenuItemModel, }, { id: 'new_item_version', diff --git a/src/app/+collection-page/collection-page.module.ts b/src/app/+collection-page/collection-page.module.ts index 8424cc02a4..f0e4138d2d 100644 --- a/src/app/+collection-page/collection-page.module.ts +++ b/src/app/+collection-page/collection-page.module.ts @@ -15,7 +15,6 @@ import { DeleteCollectionPageComponent } from './delete-collection-page/delete-c imports: [ CommonModule, SharedModule, - SearchPageModule, CollectionPageRoutingModule ], declarations: [ diff --git a/src/app/+search-page/search-page.module.ts b/src/app/+search-page/search-page.module.ts index 0c8a4ee306..5fa1fadfae 100644 --- a/src/app/+search-page/search-page.module.ts +++ b/src/app/+search-page/search-page.module.ts @@ -65,7 +65,6 @@ const effects = [ SearchBooleanFilterComponent, ], providers: [ - SearchService, SearchSidebarService, SearchFilterService, SearchConfigurationService diff --git a/src/app/core/cache/builders/remote-data-build.service.ts b/src/app/core/cache/builders/remote-data-build.service.ts index 697d98fc68..a59039c226 100644 --- a/src/app/core/cache/builders/remote-data-build.service.ts +++ b/src/app/core/cache/builders/remote-data-build.service.ts @@ -119,19 +119,8 @@ export class RemoteDataBuildService { } const requestEntry$ = href$.pipe(getRequestFromRequestHref(this.requestService)); - requestEntry$.subscribe((t) => { - console.log('requestEntry$', t) - }); const tDomainList$ = requestEntry$.pipe( getResourceLinksFromResponse(), - tap((resourceUUIDs: string[]) => { - const g = (href$ as Observable) - - g.subscribe((t) => { - console.log('href', t) - }); - console.log(resourceUUIDs); - }), flatMap((resourceUUIDs: string[]) => { return this.objectCache.getList(resourceUUIDs).pipe( map((normList: Array>) => { diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index 357f552074..82a25d6d4f 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -69,6 +69,7 @@ import { NormalizedObjectBuildService } from './cache/builders/normalized-object import { DSOChangeAnalyzer } from './data/dso-change-analyzer.service'; import { ObjectUpdatesService } from './data/object-updates/object-updates.service'; import { DefaultChangeAnalyzer } from './data/default-change-analyzer.service'; +import { SearchService } from '../+search-page/search-service/search.service'; const IMPORTS = [ CommonModule, @@ -138,6 +139,7 @@ const PROVIDERS = [ CSSVariableService, MenuService, ObjectUpdatesService, + SearchService, // register AuthInterceptor as HttpInterceptor { provide: HTTP_INTERCEPTORS, diff --git a/src/app/core/data/request.models.ts b/src/app/core/data/request.models.ts index 18820dbd43..951dbacff6 100644 --- a/src/app/core/data/request.models.ts +++ b/src/app/core/data/request.models.ts @@ -14,6 +14,7 @@ import { BrowseItemsResponseParsingService } from './browse-items-response-parsi import { RegistryMetadataschemasResponseParsingService } from './registry-metadataschemas-response-parsing.service'; import { MetadataschemaParsingService } from './metadataschema-parsing.service'; import { MetadatafieldParsingService } from './metadatafield-parsing.service'; +import { URLCombiner } from '../url-combiner/url-combiner'; /* tslint:disable:max-classes-per-file */ @@ -146,11 +147,11 @@ export class FindAllRequest extends GetRequest { export class EndpointMapRequest extends GetRequest { constructor( - public uuid: string, - public href: string, - public body?: any + uuid: string, + href: string, + body?: any ) { - super(uuid, href, body); + super(uuid, new URLCombiner(href, '?endpointMap').toString(), body); } getResponseParser(): GenericConstructor { diff --git a/src/app/shared/dso-selector/collection-selector-modal-wrapper/collection-selector-modal-wrapper.component.html b/src/app/shared/dso-selector/collection-selector-modal-wrapper/collection-selector-modal-wrapper.component.html index 7fadd477f4..f3bf405651 100644 --- a/src/app/shared/dso-selector/collection-selector-modal-wrapper/collection-selector-modal-wrapper.component.html +++ b/src/app/shared/dso-selector/collection-selector-modal-wrapper/collection-selector-modal-wrapper.component.html @@ -1,6 +1,6 @@
-
New item
+
New Collection
- +
\ No newline at end of file diff --git a/src/app/shared/dso-selector/collection-selector-modal-wrapper/collection-selector-modal-wrapper.component.ts b/src/app/shared/dso-selector/collection-selector-modal-wrapper/collection-selector-modal-wrapper.component.ts index c60d6f2938..cda2284835 100644 --- a/src/app/shared/dso-selector/collection-selector-modal-wrapper/collection-selector-modal-wrapper.component.ts +++ b/src/app/shared/dso-selector/collection-selector-modal-wrapper/collection-selector-modal-wrapper.component.ts @@ -1,10 +1,20 @@ -import { Component, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { Community } from '../../../core/shared/community.model'; +import { RemoteData } from '../../../core/data/remote-data'; @Component({ selector: 'ds-collection-selector-modal-wrapper', // styleUrls: ['./collection-selector.component.scss'], templateUrl: './collection-selector-modal-wrapper.component.html', }) -export class CollectionSelectorModalWrapperComponent { - @Input() currentCollectionID: string; +export class CollectionSelectorModalWrapperComponent implements OnInit { + @Input() communityRD: RemoteData; + + constructor(private route: ActivatedRoute) { + } + + ngOnInit(): void { + this.communityRD = this.route.root.firstChild.firstChild.snapshot.data.community; + } } diff --git a/src/app/shared/dso-selector/collection-selector/collection-selector.component.html b/src/app/shared/dso-selector/collection-selector/collection-selector.component.html deleted file mode 100644 index e137f5e119..0000000000 --- a/src/app/shared/dso-selector/collection-selector/collection-selector.component.html +++ /dev/null @@ -1,26 +0,0 @@ -
- -
-
-
- - -
\ No newline at end of file diff --git a/src/app/shared/dso-selector/collection-selector/collection-selector.component.ts b/src/app/shared/dso-selector/collection-selector/collection-selector.component.ts deleted file mode 100644 index 6b9625c8a6..0000000000 --- a/src/app/shared/dso-selector/collection-selector/collection-selector.component.ts +++ /dev/null @@ -1,125 +0,0 @@ -import { Component, Input, OnChanges, SimpleChanges } from '@angular/core'; -import { FormControl } from '@angular/forms'; - -import { BehaviorSubject, combineLatest, Observable, Subscription } from 'rxjs'; -import { - debounceTime, - distinctUntilChanged, - filter, - find, - flatMap, - map, - mergeMap, - reduce, - startWith -} from 'rxjs/operators'; - -import { Collection } from '../../../core/shared/collection.model'; -import { CommunityDataService } from '../../../core/data/community-data.service'; -import { Community } from '../../../core/shared/community.model'; -import { hasValue, isEmpty, isNotEmpty } from '../../../shared/empty.util'; -import { RemoteData } from '../../../core/data/remote-data'; -import { PaginatedList } from '../../../core/data/paginated-list'; -import { getSucceededRemoteData } from '../../../core/shared/operators'; - -interface CollectionListEntryItem { - id: string; - name: string; -} - -interface CollectionListEntry { - communities: CollectionListEntryItem[], - collection: CollectionListEntryItem -} - -@Component({ - selector: 'ds-collection-selector', - // styleUrls: ['./collection-selector.component.scss'], - templateUrl: './collection-selector.component.html' -}) -export class CollectionSelectorComponent implements OnChanges { - @Input() currentCollectionId: string; - - public disabled$ = new BehaviorSubject(true); - public model: any; - public searchField: FormControl = new FormControl(); - public searchListCollection$: Observable; - public selectedCollectionId: string; - public selectedCollectionName$: Observable; - - private subs: Subscription[] = []; - - constructor(private communityDataService: CommunityDataService) { - } - - ngOnChanges(changes: SimpleChanges) { - if (hasValue(changes.currentCollectionId) - && hasValue(changes.currentCollectionId.currentValue)) { - this.selectedCollectionId = this.currentCollectionId; - - // @TODO replace with search/top browse endpoint - // @TODO implement community/subcommunity hierarchy - const communities$ = this.communityDataService.findAll().pipe( - find((communities: RemoteData>) => isNotEmpty(communities.payload)), - mergeMap((communities: RemoteData>) => communities.payload.page)); - communities$.subscribe((t) => {console.log('communities', t)}); - // const listCollection$ = communities$.pipe( - // flatMap((communityData: Community) => { - // return communityData.collections.pipe( - // getSucceededRemoteData(), - // mergeMap((collections: RemoteData>) => collections.payload.page), - // filter((collectionData: Collection) => isNotEmpty(collectionData)), - // map((collectionData: Collection) => ({ - // communities: [{ id: communityData.id, name: communityData.name }], - // collection: { id: collectionData.id, name: collectionData.name } - // })) - // ); - // }), - // reduce((acc: any, value: any) => [...acc, ...value], []), - // startWith([]) - // ); - // - // this.selectedCollectionName$ = communities$.pipe( - // flatMap((communityData: Community) => { - // return communityData.collections.pipe( - // getSucceededRemoteData(), - // mergeMap((collections: RemoteData>) => collections.payload.page), - // filter((collectionData: Collection) => isNotEmpty(collectionData)), - // filter((collectionData: Collection) => collectionData.id === this.selectedCollectionId), - // map((collectionData: Collection) => collectionData.name) - // ); - // }), - // startWith('') - // ); - // - // const searchTerm$ = this.searchField.valueChanges.pipe( - // debounceTime(200), - // distinctUntilChanged(), - // startWith('') - // ); - // - // this.searchListCollection$ = combineLatest(searchTerm$, listCollection$).pipe( - // map(([searchTerm, listCollection]) => { - // this.disabled$.next(isEmpty(listCollection)); - // if (isEmpty(searchTerm)) { - // return listCollection; - // } else { - // return listCollection.filter((v) => v.collection.name.toLowerCase().indexOf(searchTerm.toLowerCase()) > -1).slice(0, 5) - // } - // })); - } - } - - ngOnDestroy(): void { - this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe()); - } - - onSelect(event) { - this.searchField.reset(); - this.disabled$.next(true); - } - - onClose() { - this.searchField.reset(); - } -} diff --git a/src/app/shared/dso-selector/community-selector-modal-wrapper/community-selector-modal-wrapper.component.html b/src/app/shared/dso-selector/community-selector-modal-wrapper/community-selector-modal-wrapper.component.html new file mode 100644 index 0000000000..91b97a25a3 --- /dev/null +++ b/src/app/shared/dso-selector/community-selector-modal-wrapper/community-selector-modal-wrapper.component.html @@ -0,0 +1,7 @@ +
+
New Community
+
+ + +
+
\ No newline at end of file diff --git a/src/app/shared/dso-selector/community-selector-modal-wrapper/community-selector-modal-wrapper.component.ts b/src/app/shared/dso-selector/community-selector-modal-wrapper/community-selector-modal-wrapper.component.ts new file mode 100644 index 0000000000..8ebee7ea7f --- /dev/null +++ b/src/app/shared/dso-selector/community-selector-modal-wrapper/community-selector-modal-wrapper.component.ts @@ -0,0 +1,20 @@ +import { Component, Input, OnInit } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { Community } from '../../../core/shared/community.model'; +import { RemoteData } from '../../../core/data/remote-data'; + +@Component({ + selector: 'ds-community-selector-modal-wrapper', + // styleUrls: ['./community-selector.component.scss'], + templateUrl: './community-selector-modal-wrapper.component.html', +}) +export class CommunitySelectorModalWrapperComponent implements OnInit { + @Input() communityRD: RemoteData; + + constructor(private route: ActivatedRoute) { + } + + ngOnInit(): void { + this.communityRD = this.route.root.firstChild.firstChild.snapshot.data.community; + } +} diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html new file mode 100644 index 0000000000..b15eaf9338 --- /dev/null +++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html @@ -0,0 +1,27 @@ +
+ +
+ +{{input.value}} +
+
+ + +
\ No newline at end of file diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts new file mode 100644 index 0000000000..04a5792c87 --- /dev/null +++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts @@ -0,0 +1,94 @@ +import { AfterViewInit, Component, Input, OnInit } from '@angular/core'; +import { FormControl } from '@angular/forms'; + +import { Observable } from 'rxjs'; +import { map, switchMap } from 'rxjs/operators'; +import { SearchService } from '../../../+search-page/search-service/search.service'; +import { PaginatedSearchOptions } from '../../../+search-page/paginated-search-options.model'; +import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model'; +import { RemoteData } from '../../../core/data/remote-data'; +import { PaginatedList } from '../../../core/data/paginated-list'; +import { SearchResult } from '../../../+search-page/search-result.model'; +import { DSpaceObject } from '../../../core/shared/dspace-object.model'; + +interface DSOSelectListEntry { + parents: DSpaceObject[], + dso: DSpaceObject +} + +@Component({ + selector: 'ds-dso-selector', + // styleUrls: ['./dso-selector.component.scss'], + templateUrl: './dso-selector.component.html' +}) +export class DSOSelectorComponent implements OnInit, AfterViewInit { + @Input() currentDSOId: string; + @Input() type: DSpaceObjectType; + + public input: FormControl = new FormControl(); + // private subs: Subscription[] = []; + private defaultPagination = { id: 'dso-selector', currentPage: 1, pageSize: 5 } as any; + listEntries$: Observable; + + constructor(private searchService: SearchService) { + + } + + ngOnInit(): void { + this.listEntries$ = this.input.valueChanges + .pipe( + switchMap((query) => { + return this.searchService.search( + new PaginatedSearchOptions({ + query: query, + dsoType: this.type, + pagination: this.defaultPagination + }) + ) + } + ), + map((searchResultsRD: RemoteData>>) => { + return searchResultsRD.payload.page.map( + (searchResult: SearchResult) => { + let dso = searchResult.dspaceObject; + return { + parents: this.retrieveParentList(dso), + dso + } as DSOSelectListEntry + } + ) + }) + ); + + } + + + retrieveParentList(dso: DSpaceObject, parents: DSpaceObject[] = []) { + return [{name: 'Test Community'} as any]; + // if (hasValue(dso.owner)) { + // dso.owner.pipe( + // first(), + // ).subscribe((parentRD) => { + // const newDSO: DSpaceObject = parentRD.payload; + // parents = [...this.retrieveParentList(newDSO, parents), newDSO]; + // }); + // } + // return parents; + } + + // ngOnDestroy(): void { + // this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe()); + // } + + onSelect(event) { + + } + + onClose() { + + } + + ngAfterViewInit(): void { + this.input.setValue(this.currentDSOId); + } +} diff --git a/src/app/shared/dso-selector/item-selector-modal-wrapper/item-selector-modal-wrapper.component.html b/src/app/shared/dso-selector/item-selector-modal-wrapper/item-selector-modal-wrapper.component.html new file mode 100644 index 0000000000..7d100cbece --- /dev/null +++ b/src/app/shared/dso-selector/item-selector-modal-wrapper/item-selector-modal-wrapper.component.html @@ -0,0 +1,6 @@ +
+
New Item
+
+ +
+
\ No newline at end of file diff --git a/src/app/shared/dso-selector/item-selector-modal-wrapper/item-selector-modal-wrapper.component.ts b/src/app/shared/dso-selector/item-selector-modal-wrapper/item-selector-modal-wrapper.component.ts new file mode 100644 index 0000000000..f8d0a14359 --- /dev/null +++ b/src/app/shared/dso-selector/item-selector-modal-wrapper/item-selector-modal-wrapper.component.ts @@ -0,0 +1,21 @@ +import { Component, Input, OnInit } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { Community } from '../../../core/shared/community.model'; +import { RemoteData } from '../../../core/data/remote-data'; +import { Collection } from '../../../core/shared/collection.model'; + +@Component({ + selector: 'ds-item-selector-modal-wrapper', + // styleUrls: ['./item-selector.component.scss'], + templateUrl: './item-selector-modal-wrapper.component.html', +}) +export class ItemSelectorModalWrapperComponent implements OnInit { + @Input() collectionRD: RemoteData; + + constructor(private route: ActivatedRoute) { + } + + ngOnInit(): void { + this.collectionRD = this.route.root.firstChild.firstChild.snapshot.data.collection; + } +} diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index da45faee9f..2d69c70591 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -91,12 +91,14 @@ import { CreateComColPageComponent } from './comcol-forms/create-comcol-page/cre import { EditComColPageComponent } from './comcol-forms/edit-comcol-page/edit-comcol-page.component'; import { DeleteComColPageComponent } from './comcol-forms/delete-comcol-page/delete-comcol-page.component'; import { LangSwitchComponent } from './lang-switch/lang-switch.component'; -import { CollectionSelectorComponent } from './dso-selector/collection-selector/collection-selector.component'; import { CollectionSelectorModalWrapperComponent } from './dso-selector/collection-selector-modal-wrapper/collection-selector-modal-wrapper.component'; import { ObjectValuesPipe } from './utils/object-values-pipe'; import { InListValidator } from './utils/in-list-validator.directive'; import { AutoFocusDirective } from './utils/auto-focus.directive'; import { ComcolPageBrowseByComponent } from './comcol-page-browse-by/comcol-page-browse-by.component'; +import { DSOSelectorComponent } from './dso-selector/dso-selector/dso-selector.component'; +import { ItemSelectorModalWrapperComponent } from './dso-selector/item-selector-modal-wrapper/item-selector-modal-wrapper.component'; +import { CommunitySelectorModalWrapperComponent } from './dso-selector/community-selector-modal-wrapper/community-selector-modal-wrapper.component'; const MODULES = [ // Do NOT include UniversalModule, HttpModule, or JsonpModule here @@ -179,8 +181,10 @@ const COMPONENTS = [ TruncatablePartComponent, BrowseByComponent, InputSuggestionsComponent, - CollectionSelectorComponent, - CollectionSelectorModalWrapperComponent + DSOSelectorComponent, + CommunitySelectorModalWrapperComponent, + CollectionSelectorModalWrapperComponent, + ItemSelectorModalWrapperComponent ]; const ENTRY_COMPONENTS = [ @@ -194,8 +198,10 @@ const ENTRY_COMPONENTS = [ CommunityGridElementComponent, SearchResultGridElementComponent, BrowseEntryListElementComponent, - CollectionSelectorComponent, - CollectionSelectorModalWrapperComponent + DSOSelectorComponent, + CommunitySelectorModalWrapperComponent, + CollectionSelectorModalWrapperComponent, + ItemSelectorModalWrapperComponent ]; const PROVIDERS = [ From 9f02f65a0a8c0840520fe6f61a8e9a4304881001 Mon Sep 17 00:00:00 2001 From: lotte Date: Mon, 4 Mar 2019 16:35:04 +0100 Subject: [PATCH 03/15] implemented edit popups and added actions --- .../admin-sidebar/admin-sidebar.component.ts | 40 ++++++++++------- .../collection-page-routing.module.ts | 23 +++++++++- .../community-page-routing.module.ts | 23 +++++++++- src/app/app-routing.module.ts | 12 +++++- ...tion-selector-modal-wrapper.component.html | 6 --- ...ection-selector-modal-wrapper.component.ts | 20 --------- ...nity-selector-modal-wrapper.component.html | 7 --- ...munity-selector-modal-wrapper.component.ts | 20 --------- .../dso-selector/dso-selector.component.html | 4 +- .../dso-selector/dso-selector.component.ts | 34 +++++++++------ ...item-selector-modal-wrapper.component.html | 6 --- .../item-selector-modal-wrapper.component.ts | 21 --------- ...-collection-parent-selector.component.html | 6 +++ ...te-collection-parent-selector.component.ts | 39 +++++++++++++++++ ...e-community-parent-selector.component.html | 7 +++ ...ate-community-parent-selector.component.ts | 43 +++++++++++++++++++ ...create-item-parent-selector.component.html | 6 +++ .../create-item-parent-selector.component.ts | 36 ++++++++++++++++ ...-collection-parent-selector.component.html | 6 +++ ...it-collection-parent-selector.component.ts | 33 ++++++++++++++ ...t-community-parent-selector.component.html | 6 +++ ...dit-community-parent-selector.component.ts | 32 ++++++++++++++ .../edit-item-parent-selector.component.html | 6 +++ .../edit-item-parent-selector.component.ts | 34 +++++++++++++++ .../onclick-menu-item.component.html | 2 +- src/app/shared/shared.module.ts | 27 ++++++++---- 26 files changed, 371 insertions(+), 128 deletions(-) delete mode 100644 src/app/shared/dso-selector/collection-selector-modal-wrapper/collection-selector-modal-wrapper.component.html delete mode 100644 src/app/shared/dso-selector/collection-selector-modal-wrapper/collection-selector-modal-wrapper.component.ts delete mode 100644 src/app/shared/dso-selector/community-selector-modal-wrapper/community-selector-modal-wrapper.component.html delete mode 100644 src/app/shared/dso-selector/community-selector-modal-wrapper/community-selector-modal-wrapper.component.ts delete mode 100644 src/app/shared/dso-selector/item-selector-modal-wrapper/item-selector-modal-wrapper.component.html delete mode 100644 src/app/shared/dso-selector/item-selector-modal-wrapper/item-selector-modal-wrapper.component.ts create mode 100644 src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.html create mode 100644 src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts create mode 100644 src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html create mode 100644 src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts create mode 100644 src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html create mode 100644 src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts create mode 100644 src/app/shared/dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-parent-selector.component.html create mode 100644 src/app/shared/dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-parent-selector.component.ts create mode 100644 src/app/shared/dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-parent-selector.component.html create mode 100644 src/app/shared/dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-parent-selector.component.ts create mode 100644 src/app/shared/dso-selector/modal-wrappers/edit-item-parent-selector/edit-item-parent-selector.component.html create mode 100644 src/app/shared/dso-selector/modal-wrappers/edit-item-parent-selector/edit-item-parent-selector.component.ts diff --git a/src/app/+admin/admin-sidebar/admin-sidebar.component.ts b/src/app/+admin/admin-sidebar/admin-sidebar.component.ts index 22cb1f5825..8b71bca423 100644 --- a/src/app/+admin/admin-sidebar/admin-sidebar.component.ts +++ b/src/app/+admin/admin-sidebar/admin-sidebar.component.ts @@ -12,9 +12,12 @@ import { first, map } from 'rxjs/operators'; import { combineLatest as combineLatestObservable } from 'rxjs'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { OnClickMenuItemModel } from '../../shared/menu/menu-item/models/onclick.model'; -import { CollectionSelectorModalWrapperComponent } from '../../shared/dso-selector/collection-selector-modal-wrapper/collection-selector-modal-wrapper.component'; -import { ItemSelectorModalWrapperComponent } from '../../shared/dso-selector/item-selector-modal-wrapper/item-selector-modal-wrapper.component'; -import { CommunitySelectorModalWrapperComponent } from '../../shared/dso-selector/community-selector-modal-wrapper/community-selector-modal-wrapper.component'; +import { CreateCommunityParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component'; +import { CreateItemParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component'; +import { CreateCollectionParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component'; +import { EditCollectionParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-parent-selector.component'; +import { EditItemParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/edit-item-parent-selector/edit-item-parent-selector.component'; +import { EditCommunityParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-parent-selector.component'; /** * Component representing the admin sidebar @@ -113,7 +116,7 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit { type: MenuItemType.ONCLICK, text: 'menu.section.new_community', function: () => { - this.modalService.open(CommunitySelectorModalWrapperComponent); + this.modalService.open(CreateCommunityParentSelectorComponent); } } as OnClickMenuItemModel, }, @@ -126,7 +129,7 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit { type: MenuItemType.ONCLICK, text: 'menu.section.new_collection', function: () => { - this.modalService.open(CollectionSelectorModalWrapperComponent); + this.modalService.open(CreateCollectionParentSelectorComponent); } } as OnClickMenuItemModel, }, @@ -139,7 +142,7 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit { type: MenuItemType.ONCLICK, text: 'menu.section.new_item', function: () => { - this.modalService.open(ItemSelectorModalWrapperComponent); + this.modalService.open(CreateItemParentSelectorComponent); } } as OnClickMenuItemModel, }, @@ -173,10 +176,12 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit { active: false, visible: true, model: { - type: MenuItemType.LINK, + type: MenuItemType.ONCLICK, text: 'menu.section.edit_community', - link: '#' - } as LinkMenuItemModel, + function: () => { + this.modalService.open(EditCommunityParentSelectorComponent); + } + } as OnClickMenuItemModel, }, { id: 'edit_collection', @@ -184,10 +189,12 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit { active: false, visible: true, model: { - type: MenuItemType.LINK, + type: MenuItemType.ONCLICK, text: 'menu.section.edit_collection', - link: '#' - } as LinkMenuItemModel, + function: () => { + this.modalService.open(EditCollectionParentSelectorComponent); + } + } as OnClickMenuItemModel, }, { id: 'edit_item', @@ -195,10 +202,12 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit { active: false, visible: true, model: { - type: MenuItemType.LINK, + type: MenuItemType.ONCLICK, text: 'menu.section.edit_item', - link: '#' - } as LinkMenuItemModel, + function: () => { + this.modalService.open(EditItemParentSelectorComponent); + } + } as OnClickMenuItemModel, }, /* Import */ @@ -235,7 +244,6 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit { link: '#' } as LinkMenuItemModel, }, - /* Export */ { id: 'export', diff --git a/src/app/+collection-page/collection-page-routing.module.ts b/src/app/+collection-page/collection-page-routing.module.ts index ddcf36a0cc..cdbd7650b2 100644 --- a/src/app/+collection-page/collection-page-routing.module.ts +++ b/src/app/+collection-page/collection-page-routing.module.ts @@ -8,17 +8,36 @@ import { AuthenticatedGuard } from '../core/auth/authenticated.guard'; import { EditCollectionPageComponent } from './edit-collection-page/edit-collection-page.component'; import { CreateCollectionPageGuard } from './create-collection-page/create-collection-page.guard'; import { DeleteCollectionPageComponent } from './delete-collection-page/delete-collection-page.component'; +import { URLCombiner } from '../core/url-combiner/url-combiner'; +import { getCollectionModulePath } from '../app-routing.module'; + +export const COLLECTION_PARENT_PARAMETER = 'parent'; + +export function getCollectionPageRoute(collectionId: string) { + return new URLCombiner(getCollectionModulePath(), collectionId).toString(); +} + +export function getCollectionEditPath(id: string) { + return new URLCombiner(getCollectionModulePath(), COLLECTION_EDIT_PATH.replace(/:id/, id)).toString() +} + +export function getCollectionCreatePath() { + return new URLCombiner(getCollectionModulePath(), COLLECTION_CREATE_PATH).toString() +} + +const COLLECTION_CREATE_PATH = 'create'; +const COLLECTION_EDIT_PATH = ':id/edit'; @NgModule({ imports: [ RouterModule.forChild([ { - path: 'create', + path: COLLECTION_CREATE_PATH, component: CreateCollectionPageComponent, canActivate: [AuthenticatedGuard, CreateCollectionPageGuard] }, { - path: ':id/edit', + path: COLLECTION_EDIT_PATH, pathMatch: 'full', component: EditCollectionPageComponent, canActivate: [AuthenticatedGuard], diff --git a/src/app/+community-page/community-page-routing.module.ts b/src/app/+community-page/community-page-routing.module.ts index 02f28f6375..cecd17ec10 100644 --- a/src/app/+community-page/community-page-routing.module.ts +++ b/src/app/+community-page/community-page-routing.module.ts @@ -8,17 +8,36 @@ import { AuthenticatedGuard } from '../core/auth/authenticated.guard'; import { EditCommunityPageComponent } from './edit-community-page/edit-community-page.component'; import { CreateCommunityPageGuard } from './create-community-page/create-community-page.guard'; import { DeleteCommunityPageComponent } from './delete-community-page/delete-community-page.component'; +import { URLCombiner } from '../core/url-combiner/url-combiner'; +import { getCommunityModulePath } from '../app-routing.module'; + +export const COMMUNITY_PARENT_PARAMETER = 'parent'; + +export function getCommunityPageRoute(communityId: string) { + return new URLCombiner(getCommunityModulePath(), communityId).toString(); +} + +export function getCommunityEditPath(id: string) { + return new URLCombiner(getCommunityModulePath(), COMMUNITY_EDIT_PATH.replace(/:id/, id)).toString() +} + +export function getCommunityCreatePath() { + return new URLCombiner(getCommunityModulePath(), COMMUNITY_CREATE_PATH).toString() +} + +const COMMUNITY_CREATE_PATH = 'create'; +const COMMUNITY_EDIT_PATH = ':id/edit'; @NgModule({ imports: [ RouterModule.forChild([ { - path: 'create', + path: COMMUNITY_CREATE_PATH, component: CreateCommunityPageComponent, canActivate: [AuthenticatedGuard, CreateCommunityPageGuard] }, { - path: ':id/edit', + path: COMMUNITY_EDIT_PATH, pathMatch: 'full', component: EditCommunityPageComponent, canActivate: [AuthenticatedGuard], diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 1476aa5dad..1448601067 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -8,13 +8,21 @@ const ITEM_MODULE_PATH = 'items'; export function getItemModulePath() { return `/${ITEM_MODULE_PATH}`; } +const COLLECTION_MODULE_PATH = 'collections'; +export function getCollectionModulePath() { + return `/${COLLECTION_MODULE_PATH}`; +} +const COMMUNITY_MODULE_PATH = 'communities'; +export function getCommunityModulePath() { + return `/${COMMUNITY_MODULE_PATH}`; +} @NgModule({ imports: [ RouterModule.forRoot([ { path: '', redirectTo: '/home', pathMatch: 'full' }, { path: 'home', loadChildren: './+home-page/home-page.module#HomePageModule' }, - { path: 'communities', loadChildren: './+community-page/community-page.module#CommunityPageModule' }, - { path: 'collections', loadChildren: './+collection-page/collection-page.module#CollectionPageModule' }, + { path: COMMUNITY_MODULE_PATH, loadChildren: './+community-page/community-page.module#CommunityPageModule' }, + { path: COLLECTION_MODULE_PATH, loadChildren: './+collection-page/collection-page.module#CollectionPageModule' }, { path: ITEM_MODULE_PATH, loadChildren: './+item-page/item-page.module#ItemPageModule' }, { path: 'search', loadChildren: './+search-page/search-page.module#SearchPageModule' }, { path: 'browse', loadChildren: './+browse-by/browse-by.module#BrowseByModule' }, diff --git a/src/app/shared/dso-selector/collection-selector-modal-wrapper/collection-selector-modal-wrapper.component.html b/src/app/shared/dso-selector/collection-selector-modal-wrapper/collection-selector-modal-wrapper.component.html deleted file mode 100644 index f3bf405651..0000000000 --- a/src/app/shared/dso-selector/collection-selector-modal-wrapper/collection-selector-modal-wrapper.component.html +++ /dev/null @@ -1,6 +0,0 @@ -
-
New Collection
-
- -
-
\ No newline at end of file diff --git a/src/app/shared/dso-selector/collection-selector-modal-wrapper/collection-selector-modal-wrapper.component.ts b/src/app/shared/dso-selector/collection-selector-modal-wrapper/collection-selector-modal-wrapper.component.ts deleted file mode 100644 index cda2284835..0000000000 --- a/src/app/shared/dso-selector/collection-selector-modal-wrapper/collection-selector-modal-wrapper.component.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { Component, Input, OnInit } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; -import { Community } from '../../../core/shared/community.model'; -import { RemoteData } from '../../../core/data/remote-data'; - -@Component({ - selector: 'ds-collection-selector-modal-wrapper', - // styleUrls: ['./collection-selector.component.scss'], - templateUrl: './collection-selector-modal-wrapper.component.html', -}) -export class CollectionSelectorModalWrapperComponent implements OnInit { - @Input() communityRD: RemoteData; - - constructor(private route: ActivatedRoute) { - } - - ngOnInit(): void { - this.communityRD = this.route.root.firstChild.firstChild.snapshot.data.community; - } -} diff --git a/src/app/shared/dso-selector/community-selector-modal-wrapper/community-selector-modal-wrapper.component.html b/src/app/shared/dso-selector/community-selector-modal-wrapper/community-selector-modal-wrapper.component.html deleted file mode 100644 index 91b97a25a3..0000000000 --- a/src/app/shared/dso-selector/community-selector-modal-wrapper/community-selector-modal-wrapper.component.html +++ /dev/null @@ -1,7 +0,0 @@ -
-
New Community
-
- - -
-
\ No newline at end of file diff --git a/src/app/shared/dso-selector/community-selector-modal-wrapper/community-selector-modal-wrapper.component.ts b/src/app/shared/dso-selector/community-selector-modal-wrapper/community-selector-modal-wrapper.component.ts deleted file mode 100644 index 8ebee7ea7f..0000000000 --- a/src/app/shared/dso-selector/community-selector-modal-wrapper/community-selector-modal-wrapper.component.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { Component, Input, OnInit } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; -import { Community } from '../../../core/shared/community.model'; -import { RemoteData } from '../../../core/data/remote-data'; - -@Component({ - selector: 'ds-community-selector-modal-wrapper', - // styleUrls: ['./community-selector.component.scss'], - templateUrl: './community-selector-modal-wrapper.component.html', -}) -export class CommunitySelectorModalWrapperComponent implements OnInit { - @Input() communityRD: RemoteData; - - constructor(private route: ActivatedRoute) { - } - - ngOnInit(): void { - this.communityRD = this.route.root.firstChild.firstChild.snapshot.data.community; - } -} diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html index b15eaf9338..762f736b5d 100644 --- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html +++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html @@ -5,8 +5,6 @@ placeholder="{{ 'submission.sections.general.search-collection' | translate }}" [formControl]="input"> - -{{input.value}}
+ +
+ \ No newline at end of file diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts new file mode 100644 index 0000000000..8e1eb4e23f --- /dev/null +++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts @@ -0,0 +1,43 @@ +import { Component, Input, OnInit } from '@angular/core'; +import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; +import { Community } from '../../../../core/shared/community.model'; +import { RemoteData } from '../../../../core/data/remote-data'; +import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model'; +import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; +import { hasValue } from '../../../empty.util'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { map } from 'rxjs/operators'; +import { Observable } from 'rxjs'; +import { COMMUNITY_PARENT_PARAMETER } from '../../../../+community-page/community-page-routing.module'; + +@Component({ + selector: 'ds-create-community-parent-selector', + // styleUrls: ['./create-community-parent-selector.component.scss'], + templateUrl: './create-community-parent-selector.component.html', +}) +export class CreateCommunityParentSelectorComponent implements OnInit { + @Input() communityRD$: Observable>; + type = DSpaceObjectType.COMMUNITY; + + private createPath = '/communities/create'; + + constructor(private activeModal: NgbActiveModal, private route: ActivatedRoute, private router: Router) { + } + + ngOnInit(): void { + this.communityRD$ = this.route.root.firstChild.firstChild.data.pipe(map(data => data.community)); + } + + createCommunity(dso?: DSpaceObject) { + this.activeModal.close(); + let navigationExtras: NavigationExtras = {}; + if (hasValue(dso)) { + navigationExtras = { + queryParams: { + [COMMUNITY_PARENT_PARAMETER]: dso.uuid, + } + }; + } + this.router.navigate([this.createPath], navigationExtras); + } +} diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html new file mode 100644 index 0000000000..1851fb876b --- /dev/null +++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html @@ -0,0 +1,6 @@ +
+
New Item
+
+ +
+
\ No newline at end of file diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts new file mode 100644 index 0000000000..dba3db6959 --- /dev/null +++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts @@ -0,0 +1,36 @@ +import { Component, Input, OnInit } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { Community } from '../../../../core/shared/community.model'; +import { RemoteData } from '../../../../core/data/remote-data'; +import { Collection } from '../../../../core/shared/collection.model'; +import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model'; +import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; +import { hasValue } from '../../../empty.util'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { map } from 'rxjs/operators'; +import { Observable } from 'rxjs'; + +@Component({ + selector: 'ds-create-item-parent-selector', + // styleUrls: ['./create-item-parent-selector.component.scss'], + templateUrl: './create-item-parent-selector.component.html', +}) +export class CreateItemParentSelectorComponent implements OnInit { + @Input() collectionRD$: Observable>; + type = DSpaceObjectType.COLLECTION; + + constructor(private activeModal: NgbActiveModal, private route: ActivatedRoute) { + } + + ngOnInit(): void { + this.collectionRD$ = this.route.root.firstChild.firstChild.data.pipe(map(data => data.collection)); + } + + createItem(dso: DSpaceObject) { + this.activeModal.close(); + + let path; + // path = this.createPath; + // this.router.navigate([path]); + } +} diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-parent-selector.component.html new file mode 100644 index 0000000000..f14110db97 --- /dev/null +++ b/src/app/shared/dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-parent-selector.component.html @@ -0,0 +1,6 @@ +
+
Edit Collection
+
+ +
+
\ No newline at end of file diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-parent-selector.component.ts new file mode 100644 index 0000000000..422bd8aee0 --- /dev/null +++ b/src/app/shared/dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-parent-selector.component.ts @@ -0,0 +1,33 @@ +import { Component, Input, OnInit } from '@angular/core'; +import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; +import { Community } from '../../../../core/shared/community.model'; +import { RemoteData } from '../../../../core/data/remote-data'; +import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model'; +import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { Collection } from '../../../../core/shared/collection.model'; +import { Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; +import { getCollectionEditPath } from '../../../../+collection-page/collection-page-routing.module'; + +@Component({ + selector: 'ds-edit-collection-parent-selector', + // styleUrls: ['./edit-collection-parent-selector.component.scss'], + templateUrl: './edit-collection-parent-selector.component.html', +}) +export class EditCollectionParentSelectorComponent implements OnInit { + @Input() collectionRD$: Observable>; + type = DSpaceObjectType.COLLECTION; + + constructor(private activeModal: NgbActiveModal, private route: ActivatedRoute, private router: Router) { + } + + ngOnInit(): void { + this.collectionRD$ = this.route.root.firstChild.firstChild.data.pipe(map(data => data.collection)); + } + + editCollection(dso: DSpaceObject) { + this.activeModal.close(); + this.router.navigate([getCollectionEditPath(dso.uuid)]); + } +} diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-parent-selector.component.html new file mode 100644 index 0000000000..2cc8c8ae19 --- /dev/null +++ b/src/app/shared/dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-parent-selector.component.html @@ -0,0 +1,6 @@ +
+
Edit Community
+
+ +
+
\ No newline at end of file diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-parent-selector.component.ts new file mode 100644 index 0000000000..e14845bfa4 --- /dev/null +++ b/src/app/shared/dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-parent-selector.component.ts @@ -0,0 +1,32 @@ +import { Component, Input, OnInit } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { Community } from '../../../../core/shared/community.model'; +import { RemoteData } from '../../../../core/data/remote-data'; +import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model'; +import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; +import { getCommunityEditPath } from '../../../../+community-page/community-page-routing.module'; + +@Component({ + selector: 'ds-edit-community-parent-selector', + // styleUrls: ['./edit-community-parent-selector.component.scss'], + templateUrl: './edit-community-parent-selector.component.html', +}) +export class EditCommunityParentSelectorComponent implements OnInit { + @Input() communityRD$: Observable>; + type = DSpaceObjectType.COMMUNITY; + + constructor(private activeModal: NgbActiveModal, private route: ActivatedRoute, private router: Router) { + } + + ngOnInit(): void { + this.communityRD$ = this.route.root.firstChild.firstChild.data.pipe(map(data => data.collection)); + } + + editCommunity(dso: DSpaceObject) { + this.activeModal.close(); + this.router.navigate([getCommunityEditPath(dso.uuid)]); + } +} diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-item-parent-selector/edit-item-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/edit-item-parent-selector/edit-item-parent-selector.component.html new file mode 100644 index 0000000000..6bc59b96bd --- /dev/null +++ b/src/app/shared/dso-selector/modal-wrappers/edit-item-parent-selector/edit-item-parent-selector.component.html @@ -0,0 +1,6 @@ +
+
Edit Item
+
+ +
+
\ No newline at end of file diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-item-parent-selector/edit-item-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-item-parent-selector/edit-item-parent-selector.component.ts new file mode 100644 index 0000000000..0a3963d6ae --- /dev/null +++ b/src/app/shared/dso-selector/modal-wrappers/edit-item-parent-selector/edit-item-parent-selector.component.ts @@ -0,0 +1,34 @@ +import { Component, Input, OnInit } from '@angular/core'; +import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; +import { Community } from '../../../../core/shared/community.model'; +import { RemoteData } from '../../../../core/data/remote-data'; +import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model'; +import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { Collection } from '../../../../core/shared/collection.model'; +import { Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; +import { Item } from '../../../../core/shared/item.model'; +import { getItemEditPath } from '../../../../+item-page/item-page-routing.module'; + +@Component({ + selector: 'ds-edit-item-parent-selector', + // styleUrls: ['./edit-item-parent-selector.component.scss'], + templateUrl: './edit-item-parent-selector.component.html', +}) +export class EditItemParentSelectorComponent implements OnInit { + @Input() itemRD$: Observable>; + type = DSpaceObjectType.ITEM; + + constructor(private activeModal: NgbActiveModal, private route: ActivatedRoute, private router: Router) { + } + + ngOnInit(): void { + this.itemRD$ = this.route.root.firstChild.firstChild.data.pipe(map(data => data.item)); + } + + editItem(dso: DSpaceObject) { + this.activeModal.close(); + this.router.navigate([getItemEditPath(dso.uuid)]); + } +} diff --git a/src/app/shared/menu/menu-item/onclick-menu-item.component.html b/src/app/shared/menu/menu-item/onclick-menu-item.component.html index 0790ef7479..96c9049ab3 100644 --- a/src/app/shared/menu/menu-item/onclick-menu-item.component.html +++ b/src/app/shared/menu/menu-item/onclick-menu-item.component.html @@ -1 +1 @@ -{{item.text | translate}} \ No newline at end of file +{{item.text | translate}} \ No newline at end of file diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 2d69c70591..3ee20d435d 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -91,14 +91,17 @@ import { CreateComColPageComponent } from './comcol-forms/create-comcol-page/cre import { EditComColPageComponent } from './comcol-forms/edit-comcol-page/edit-comcol-page.component'; import { DeleteComColPageComponent } from './comcol-forms/delete-comcol-page/delete-comcol-page.component'; import { LangSwitchComponent } from './lang-switch/lang-switch.component'; -import { CollectionSelectorModalWrapperComponent } from './dso-selector/collection-selector-modal-wrapper/collection-selector-modal-wrapper.component'; import { ObjectValuesPipe } from './utils/object-values-pipe'; import { InListValidator } from './utils/in-list-validator.directive'; import { AutoFocusDirective } from './utils/auto-focus.directive'; import { ComcolPageBrowseByComponent } from './comcol-page-browse-by/comcol-page-browse-by.component'; import { DSOSelectorComponent } from './dso-selector/dso-selector/dso-selector.component'; -import { ItemSelectorModalWrapperComponent } from './dso-selector/item-selector-modal-wrapper/item-selector-modal-wrapper.component'; -import { CommunitySelectorModalWrapperComponent } from './dso-selector/community-selector-modal-wrapper/community-selector-modal-wrapper.component'; +import { CreateCommunityParentSelectorComponent } from './dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component'; +import { CreateItemParentSelectorComponent } from './dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component'; +import { CreateCollectionParentSelectorComponent } from './dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component'; +import { EditCollectionParentSelectorComponent } from './dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-parent-selector.component'; +import { EditItemParentSelectorComponent } from './dso-selector/modal-wrappers/edit-item-parent-selector/edit-item-parent-selector.component'; +import { EditCommunityParentSelectorComponent } from './dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-parent-selector.component'; const MODULES = [ // Do NOT include UniversalModule, HttpModule, or JsonpModule here @@ -182,9 +185,12 @@ const COMPONENTS = [ BrowseByComponent, InputSuggestionsComponent, DSOSelectorComponent, - CommunitySelectorModalWrapperComponent, - CollectionSelectorModalWrapperComponent, - ItemSelectorModalWrapperComponent + CreateCommunityParentSelectorComponent, + CreateCollectionParentSelectorComponent, + CreateItemParentSelectorComponent, + EditCommunityParentSelectorComponent, + EditCollectionParentSelectorComponent, + EditItemParentSelectorComponent, ]; const ENTRY_COMPONENTS = [ @@ -199,9 +205,12 @@ const ENTRY_COMPONENTS = [ SearchResultGridElementComponent, BrowseEntryListElementComponent, DSOSelectorComponent, - CommunitySelectorModalWrapperComponent, - CollectionSelectorModalWrapperComponent, - ItemSelectorModalWrapperComponent + CreateCommunityParentSelectorComponent, + CreateCollectionParentSelectorComponent, + CreateItemParentSelectorComponent, + EditCommunityParentSelectorComponent, + EditCollectionParentSelectorComponent, + EditItemParentSelectorComponent, ]; const PROVIDERS = [ From b4d404e1d38745d53ca39ffe252f75771e26d58d Mon Sep 17 00:00:00 2001 From: lotte Date: Tue, 5 Mar 2019 16:22:52 +0100 Subject: [PATCH 04/15] fixed focus and css --- .../dso-selector/dso-selector.component.html | 6 +-- .../dso-selector/dso-selector.component.ts | 48 +++++++++---------- ...-collection-parent-selector.component.html | 9 +++- ...te-collection-parent-selector.component.ts | 6 ++- ...e-community-parent-selector.component.html | 18 +++++-- ...e-community-parent-selector.component.scss | 3 ++ ...ate-community-parent-selector.component.ts | 8 +++- ...create-item-parent-selector.component.html | 6 ++- .../create-item-parent-selector.component.ts | 6 ++- ...-collection-parent-selector.component.html | 6 ++- ...it-collection-parent-selector.component.ts | 6 ++- ...t-community-parent-selector.component.html | 6 ++- ...dit-community-parent-selector.component.ts | 7 ++- .../edit-item-parent-selector.component.html | 6 ++- .../edit-item-parent-selector.component.ts | 6 ++- 15 files changed, 103 insertions(+), 44 deletions(-) create mode 100644 src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.scss diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html index 762f736b5d..ceaefc2ac9 100644 --- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html +++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html @@ -6,14 +6,14 @@ [formControl]="input">
-
+
+
- +
\ No newline at end of file diff --git a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts index 57e77ce77d..c4bff22c7b 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts @@ -28,7 +28,7 @@ export class CreateCollectionParentSelectorComponent implements OnInit { } createCollection(dso: DSpaceObject) { - this.activeModal.close(); + this.close(); let navigationExtras: NavigationExtras = { queryParams: { [COLLECTION_PARENT_PARAMETER]: dso.uuid, @@ -36,4 +36,8 @@ export class CreateCollectionParentSelectorComponent implements OnInit { }; this.router.navigate([this.createPath], navigationExtras); } + + close() { + this.activeModal.close(); + } } diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html index e32d278a44..a50f1a57c6 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html +++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html @@ -1,7 +1,19 @@
-
New Community
+
New Community + +
- - + +

+
+
+ or +
+

+
Create a new community in
+
\ No newline at end of file diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.scss b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.scss new file mode 100644 index 0000000000..0daf4cfa5f --- /dev/null +++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.scss @@ -0,0 +1,3 @@ +#create-community-or-separator { + top: 0; +} \ No newline at end of file diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts index 8e1eb4e23f..017f933d1f 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts @@ -12,7 +12,7 @@ import { COMMUNITY_PARENT_PARAMETER } from '../../../../+community-page/communit @Component({ selector: 'ds-create-community-parent-selector', - // styleUrls: ['./create-community-parent-selector.component.scss'], + styleUrls: ['./create-community-parent-selector.component.scss'], templateUrl: './create-community-parent-selector.component.html', }) export class CreateCommunityParentSelectorComponent implements OnInit { @@ -29,7 +29,7 @@ export class CreateCommunityParentSelectorComponent implements OnInit { } createCommunity(dso?: DSpaceObject) { - this.activeModal.close(); + this.close(); let navigationExtras: NavigationExtras = {}; if (hasValue(dso)) { navigationExtras = { @@ -40,4 +40,8 @@ export class CreateCommunityParentSelectorComponent implements OnInit { } this.router.navigate([this.createPath], navigationExtras); } + + close() { + this.activeModal.close(); + } } diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html index 1851fb876b..1009867056 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html +++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html @@ -1,5 +1,9 @@
-
New Item
+
New Item + +
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts index dba3db6959..44a8d67d04 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts @@ -27,10 +27,14 @@ export class CreateItemParentSelectorComponent implements OnInit { } createItem(dso: DSpaceObject) { - this.activeModal.close(); + this.close(); let path; // path = this.createPath; // this.router.navigate([path]); } + + close() { + this.activeModal.close(); + } } diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-parent-selector.component.html index f14110db97..9d050ef2fc 100644 --- a/src/app/shared/dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-parent-selector.component.html +++ b/src/app/shared/dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-parent-selector.component.html @@ -1,5 +1,9 @@
-
Edit Collection
+
Edit Collection + +
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-parent-selector.component.ts index 422bd8aee0..11e1c47f55 100644 --- a/src/app/shared/dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-parent-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-parent-selector.component.ts @@ -27,7 +27,11 @@ export class EditCollectionParentSelectorComponent implements OnInit { } editCollection(dso: DSpaceObject) { - this.activeModal.close(); + this.close(); this.router.navigate([getCollectionEditPath(dso.uuid)]); } + + close() { + this.activeModal.close(); + } } diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-parent-selector.component.html index 2cc8c8ae19..b75a760f8e 100644 --- a/src/app/shared/dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-parent-selector.component.html +++ b/src/app/shared/dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-parent-selector.component.html @@ -1,5 +1,9 @@
-
Edit Community
+
Edit Community + +
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-parent-selector.component.ts index e14845bfa4..8932be26ca 100644 --- a/src/app/shared/dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-parent-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-parent-selector.component.ts @@ -26,7 +26,12 @@ export class EditCommunityParentSelectorComponent implements OnInit { } editCommunity(dso: DSpaceObject) { - this.activeModal.close(); + this.close(); this.router.navigate([getCommunityEditPath(dso.uuid)]); } + + + close() { + this.activeModal.close(); + } } diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-item-parent-selector/edit-item-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/edit-item-parent-selector/edit-item-parent-selector.component.html index 6bc59b96bd..a9c508e381 100644 --- a/src/app/shared/dso-selector/modal-wrappers/edit-item-parent-selector/edit-item-parent-selector.component.html +++ b/src/app/shared/dso-selector/modal-wrappers/edit-item-parent-selector/edit-item-parent-selector.component.html @@ -1,5 +1,9 @@
-
Edit Item
+
Edit Item + +
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-item-parent-selector/edit-item-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-item-parent-selector/edit-item-parent-selector.component.ts index 0a3963d6ae..f71e61a1fa 100644 --- a/src/app/shared/dso-selector/modal-wrappers/edit-item-parent-selector/edit-item-parent-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/edit-item-parent-selector/edit-item-parent-selector.component.ts @@ -28,7 +28,11 @@ export class EditItemParentSelectorComponent implements OnInit { } editItem(dso: DSpaceObject) { - this.activeModal.close(); + this.close(); this.router.navigate([getItemEditPath(dso.uuid)]); } + + close() { + this.activeModal.close(); + } } From 9abbfa955e3cb6923646f04291089423703a554e Mon Sep 17 00:00:00 2001 From: lotte Date: Wed, 6 Mar 2019 17:03:43 +0100 Subject: [PATCH 05/15] refactored, started tests --- config/environment.default.js | 5 +- resources/i18n/en.json | 26 +++++++ .../admin-sidebar/admin-sidebar.component.ts | 12 +-- src/app/+search-page/search-page.module.ts | 14 ++-- .../dso-selector/dso-selector.component.html | 20 ++--- .../dso-selector.component.spec.ts | 65 +++++++++++++++++ .../dso-selector/dso-selector.component.ts | 73 ++++++++++--------- ...-collection-parent-selector.component.html | 11 --- ...te-collection-parent-selector.component.ts | 39 +++++----- ...e-community-parent-selector.component.html | 10 +-- ...ate-community-parent-selector.component.ts | 34 ++++----- ...create-item-parent-selector.component.html | 10 --- .../create-item-parent-selector.component.ts | 28 +++---- .../dso-selector-modal-wrapper.component.html | 10 +++ .../dso-selector-modal-wrapper.component.ts | 43 +++++++++++ ...-collection-parent-selector.component.html | 10 --- ...it-collection-parent-selector.component.ts | 37 ---------- .../edit-collection-selector.component.ts | 28 +++++++ ...t-community-parent-selector.component.html | 10 --- ...dit-community-parent-selector.component.ts | 37 ---------- .../edit-community-selector.component.ts | 29 ++++++++ .../edit-item-parent-selector.component.html | 10 --- ...ent.ts => edit-item-selector.component.ts} | 30 ++++---- src/app/shared/shared.module.ts | 27 ++++--- src/app/shared/testing/search-service-stub.ts | 4 + 25 files changed, 348 insertions(+), 274 deletions(-) create mode 100644 src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts delete mode 100644 src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.html delete mode 100644 src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html create mode 100644 src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html create mode 100644 src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts delete mode 100644 src/app/shared/dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-parent-selector.component.html delete mode 100644 src/app/shared/dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-parent-selector.component.ts create mode 100644 src/app/shared/dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-selector.component.ts delete mode 100644 src/app/shared/dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-parent-selector.component.html delete mode 100644 src/app/shared/dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-parent-selector.component.ts create mode 100644 src/app/shared/dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-selector.component.ts delete mode 100644 src/app/shared/dso-selector/modal-wrappers/edit-item-parent-selector/edit-item-parent-selector.component.html rename src/app/shared/dso-selector/modal-wrappers/edit-item-parent-selector/{edit-item-parent-selector.component.ts => edit-item-selector.component.ts} (57%) diff --git a/config/environment.default.js b/config/environment.default.js index b493d0473a..b8eae1ccff 100644 --- a/config/environment.default.js +++ b/config/environment.default.js @@ -10,9 +10,10 @@ module.exports = { // The REST API server settings. rest: { ssl: true, - host: 'dspace7-internal.atmire.com', + host: 'dspace7.4science.it', port: 443, - nameSpace: '/rest/api' + // NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript + nameSpace: '/dspace-spring-rest/api' }, // Caching settings cache: { diff --git a/resources/i18n/en.json b/resources/i18n/en.json index 208e5415a8..38d90e67ea 100644 --- a/resources/i18n/en.json +++ b/resources/i18n/en.json @@ -642,5 +642,31 @@ }, "chips": { "remove": "Remove chip" + }, + "dso-selector": { + "create": { + "community": { + "head": "New community", + "sub-level": "Create a new community in", + "top-level": "Create a new top-level community" + }, + "collection": { + "head": "New collection" + }, + "item": { + "head": "New item" + } + }, + "edit": { + "community": { + "head": "Edit community" + }, + "collection": { + "head": "Edit collection" + }, + "item": { + "head": "Edit item" + } + } } } diff --git a/src/app/+admin/admin-sidebar/admin-sidebar.component.ts b/src/app/+admin/admin-sidebar/admin-sidebar.component.ts index 8b71bca423..e429b57bae 100644 --- a/src/app/+admin/admin-sidebar/admin-sidebar.component.ts +++ b/src/app/+admin/admin-sidebar/admin-sidebar.component.ts @@ -15,9 +15,9 @@ import { OnClickMenuItemModel } from '../../shared/menu/menu-item/models/onclick import { CreateCommunityParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component'; import { CreateItemParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component'; import { CreateCollectionParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component'; -import { EditCollectionParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-parent-selector.component'; -import { EditItemParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/edit-item-parent-selector/edit-item-parent-selector.component'; -import { EditCommunityParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-parent-selector.component'; +import { EditItemSelectorComponent } from '../../shared/dso-selector/modal-wrappers/edit-item-parent-selector/edit-item-selector.component'; +import { EditCommunitySelectorComponent } from '../../shared/dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-selector.component'; +import { EditCollectionSelectorComponent } from '../../shared/dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-selector.component'; /** * Component representing the admin sidebar @@ -179,7 +179,7 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit { type: MenuItemType.ONCLICK, text: 'menu.section.edit_community', function: () => { - this.modalService.open(EditCommunityParentSelectorComponent); + this.modalService.open(EditCommunitySelectorComponent); } } as OnClickMenuItemModel, }, @@ -192,7 +192,7 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit { type: MenuItemType.ONCLICK, text: 'menu.section.edit_collection', function: () => { - this.modalService.open(EditCollectionParentSelectorComponent); + this.modalService.open(EditCollectionSelectorComponent); } } as OnClickMenuItemModel, }, @@ -205,7 +205,7 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit { type: MenuItemType.ONCLICK, text: 'menu.section.edit_item', function: () => { - this.modalService.open(EditItemParentSelectorComponent); + this.modalService.open(EditItemSelectorComponent); } } as OnClickMenuItemModel, }, diff --git a/src/app/+search-page/search-page.module.ts b/src/app/+search-page/search-page.module.ts index 5fa1fadfae..4cd0c9428b 100644 --- a/src/app/+search-page/search-page.module.ts +++ b/src/app/+search-page/search-page.module.ts @@ -11,7 +11,6 @@ import { CommunitySearchResultListElementComponent } from '../shared/object-list 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'; import { SearchSidebarEffects } from './search-sidebar/search-sidebar.effects'; @@ -46,13 +45,12 @@ const effects = [ SearchResultsComponent, SearchSidebarComponent, SearchSettingsComponent, - ItemSearchResultListElementComponent, - CollectionSearchResultListElementComponent, - CommunitySearchResultListElementComponent, + // ItemSearchResultListElementComponent, + // CollectionSearchResultListElementComponent, + // CommunitySearchResultListElementComponent, ItemSearchResultGridElementComponent, CollectionSearchResultGridElementComponent, CommunitySearchResultGridElementComponent, - CommunitySearchResultListElementComponent, SearchFiltersComponent, SearchFilterComponent, SearchFacetFilterComponent, @@ -70,9 +68,9 @@ const effects = [ SearchConfigurationService ], entryComponents: [ - ItemSearchResultListElementComponent, - CollectionSearchResultListElementComponent, - CommunitySearchResultListElementComponent, + // ItemSearchResultListElementComponent, + // CollectionSearchResultListElementComponent, + // CommunitySearchResultListElementComponent, ItemSearchResultGridElementComponent, CollectionSearchResultGridElementComponent, CommunitySearchResultGridElementComponent, diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html index ceaefc2ac9..bc520bfe3b 100644 --- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html +++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html @@ -6,20 +6,14 @@ [formControl]="input">
-
- -
\ No newline at end of file diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts new file mode 100644 index 0000000000..38067f3dc0 --- /dev/null +++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts @@ -0,0 +1,65 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { TranslateModule } from '@ngx-translate/core'; +import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core'; +import { DSOSelectorComponent } from './dso-selector.component'; +import { SearchService } from '../../../+search-page/search-service/search.service'; +import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model'; +import { PaginatedSearchOptions } from '../../../+search-page/paginated-search-options.model'; +import { RemoteData } from '../../../core/data/remote-data'; +import { ItemSearchResult } from '../../object-collection/shared/item-search-result.model'; +import { Item } from '../../../core/shared/item.model'; +import { of as observableOf } from 'rxjs'; +import { PaginatedList } from '../../../core/data/paginated-list'; + +fdescribe('DSOSelectorComponent', () => { + let component: DSOSelectorComponent; + let fixture: ComponentFixture; + let debugElement: DebugElement; + + const currentDSOId = 'test-uuid-ford-sose'; + const type = DSpaceObjectType.ITEM; + const searchResult = new ItemSearchResult(); + const item = new Item(); + item.metadata = { 'dc.title': [{ value: 'Item title', language: undefined }] }; + searchResult.dspaceObject = item; + searchResult.hitHighlights = {}; + const searchService = jasmine.createSpyObj('searchService', { + search: observableOf(new RemoteData(false, false, true, undefined, new PaginatedList(undefined, [searchResult]))) + }); + + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [TranslateModule.forRoot()], + declarations: [DSOSelectorComponent], + providers: [ + { provide: SearchService, useValue: searchService }, + ], + schemas: [NO_ERRORS_SCHEMA] + }) + .compileComponents(); + + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DSOSelectorComponent); + component = fixture.componentInstance; + debugElement = fixture.debugElement; + component.currentDSOId = currentDSOId; + component.type = type; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should initially call the search method on the SearchService with the given DSO uuid', () => { + const searchOptions = new PaginatedSearchOptions({ + query: currentDSOId, + dsoType: type, + pagination: (component as any).defaultPagination + }); + expect(searchService.search).toHaveBeenCalledWith(searchOptions); + }); + +}); diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts index 6eb5716489..f3164a37e2 100644 --- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts +++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts @@ -21,32 +21,60 @@ import { PaginatedList } from '../../../core/data/paginated-list'; import { SearchResult } from '../../../+search-page/search-result.model'; import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -interface DSOSelectListEntry { - parents: DSpaceObject[], - dso: DSpaceObject -} - @Component({ selector: 'ds-dso-selector', // styleUrls: ['./dso-selector.component.scss'], templateUrl: './dso-selector.component.html' }) + +/** + * Component to render a list of DSO's of which one can be selected + * The user can search the list by using the input field + */ export class DSOSelectorComponent implements OnInit, AfterViewInit { + + /** + * The initially selected DSO's uuid + */ @Input() currentDSOId: string; + + /** + * The type of DSpace objects this components shows a list of + */ @Input() type: DSpaceObjectType; + /** + * Emits the selected Object when a user selects it in the list + */ @Output() onSelect: EventEmitter = new EventEmitter(); + /** + * Input form control to query the list + */ public input: FormControl = new FormControl(); - // private subs: Subscription[] = []; + + /** + * Default pagination for this feature + */ private defaultPagination = { id: 'dso-selector', currentPage: 1, pageSize: 5 } as any; - listEntries$: Observable; + + /** + * List with search results of DSpace objects for the current query + */ + listEntries$: Observable>>>; + + /** + * List of element references to all elements + */ @ViewChildren('listEntryElement') listElements: QueryList; constructor(private searchService: SearchService) { - } + /** + * Fills the listEntries$ variable with search results based on the input field's current value + * The search will always start with the initial currentDSOId value + */ ngOnInit(): void { this.listEntries$ = this.input.valueChanges .pipe( @@ -60,21 +88,13 @@ export class DSOSelectorComponent implements OnInit, AfterViewInit { }) ) } - ), - map((searchResultsRD: RemoteData>>) => { - return searchResultsRD.payload.page.map( - (searchResult: SearchResult) => { - let dso = searchResult.dspaceObject; - return { - parents: this.retrieveParentList(dso), - dso - } as DSOSelectListEntry - } - ) - }) + ) ) } + /** + * Make sure to set focus on the first list element when the initial search (with currentDSOId) emits a single value + */ ngAfterViewInit(): void { this.listElements.changes.pipe( take(1) @@ -84,17 +104,4 @@ export class DSOSelectorComponent implements OnInit, AfterViewInit { } }); } - - retrieveParentList(dso: DSpaceObject, parents: DSpaceObject[] = []) { - return [{ name: 'Test Community' } as any]; - // if (hasValue(dso.owner)) { - // dso.owner.pipe( - // first(), - // ).subscribe((parentRD) => { - // const newDSO: DSpaceObject = parentRD.payload; - // parents = [...this.retrieveParentList(newDSO, parents), newDSO]; - // }); - // } - // return parents; - } } diff --git a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.html deleted file mode 100644 index 16fd37928f..0000000000 --- a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.html +++ /dev/null @@ -1,11 +0,0 @@ -
-
New Collection - -
-
- -
-
\ No newline at end of file diff --git a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts index c4bff22c7b..631480c04d 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts @@ -5,39 +5,34 @@ import { RemoteData } from '../../../../core/data/remote-data'; import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model'; import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { map } from 'rxjs/operators'; -import { Observable } from 'rxjs'; -import { COLLECTION_PARENT_PARAMETER } from '../../../../+collection-page/collection-page-routing.module'; +import { + COLLECTION_PARENT_PARAMETER, + getCollectionCreatePath +} from '../../../../+collection-page/collection-page-routing.module'; +import { + DSOSelectorModalWrapperComponent, + SelectorActionType +} from '../dso-selector-modal-wrapper.component'; @Component({ selector: 'ds-create-collection-parent-selector', - // styleUrls: ['./create-collection-parent-selector.component.scss'], - templateUrl: './create-collection-parent-selector.component.html', + templateUrl: '../dso-selector-modal-wrapper.component.html', }) -export class CreateCollectionParentSelectorComponent implements OnInit { - @Input() communityRD$: Observable>; - type = DSpaceObjectType.COMMUNITY; +export class CreateCollectionParentSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit { + objectType = DSpaceObjectType.COLLECTION; + selectorType = DSpaceObjectType.COMMUNITY; + action = SelectorActionType.CREATE; - private createPath = '/collections/create'; - - constructor(private activeModal: NgbActiveModal, private route: ActivatedRoute, private router: Router) { + constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router) { + super(activeModal, route); } - ngOnInit(): void { - this.communityRD$ = this.route.root.firstChild.firstChild.data.pipe(map(data => data.community)); - } - - createCollection(dso: DSpaceObject) { - this.close(); + navigate(dso: DSpaceObject) { let navigationExtras: NavigationExtras = { queryParams: { [COLLECTION_PARENT_PARAMETER]: dso.uuid, } }; - this.router.navigate([this.createPath], navigationExtras); - } - - close() { - this.activeModal.close(); + this.router.navigate([getCollectionCreatePath()], navigationExtras); } } diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html index a50f1a57c6..e6a0db3b62 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html +++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html @@ -1,19 +1,19 @@
-
New Community +
{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
- +

or

-
Create a new community in
- + +
{{'dso-selector.create.community.sub-level' | translate}}
+
\ No newline at end of file diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts index 017f933d1f..c3d112a455 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts @@ -8,28 +8,30 @@ import { hasValue } from '../../../empty.util'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { map } from 'rxjs/operators'; import { Observable } from 'rxjs'; -import { COMMUNITY_PARENT_PARAMETER } from '../../../../+community-page/community-page-routing.module'; +import { + COMMUNITY_PARENT_PARAMETER, + getCommunityCreatePath +} from '../../../../+community-page/community-page-routing.module'; +import { + DSOSelectorModalWrapperComponent, + SelectorActionType +} from '../dso-selector-modal-wrapper.component'; @Component({ selector: 'ds-create-community-parent-selector', styleUrls: ['./create-community-parent-selector.component.scss'], templateUrl: './create-community-parent-selector.component.html', }) -export class CreateCommunityParentSelectorComponent implements OnInit { - @Input() communityRD$: Observable>; - type = DSpaceObjectType.COMMUNITY; +export class CreateCommunityParentSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit { + objectType = DSpaceObjectType.COMMUNITY; + selectorType = DSpaceObjectType.COMMUNITY; + action = SelectorActionType.CREATE; - private createPath = '/communities/create'; - - constructor(private activeModal: NgbActiveModal, private route: ActivatedRoute, private router: Router) { + constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router) { + super(activeModal, route); } - ngOnInit(): void { - this.communityRD$ = this.route.root.firstChild.firstChild.data.pipe(map(data => data.community)); - } - - createCommunity(dso?: DSpaceObject) { - this.close(); + navigate(dso: DSpaceObject) { let navigationExtras: NavigationExtras = {}; if (hasValue(dso)) { navigationExtras = { @@ -38,10 +40,6 @@ export class CreateCommunityParentSelectorComponent implements OnInit { } }; } - this.router.navigate([this.createPath], navigationExtras); - } - - close() { - this.activeModal.close(); + this.router.navigate([getCommunityCreatePath()], navigationExtras); } } diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html deleted file mode 100644 index 1009867056..0000000000 --- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html +++ /dev/null @@ -1,10 +0,0 @@ -
-
New Item - -
-
- -
-
\ No newline at end of file diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts index 44a8d67d04..dac79dddcb 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts @@ -9,32 +9,28 @@ import { hasValue } from '../../../empty.util'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { map } from 'rxjs/operators'; import { Observable } from 'rxjs'; +import { + DSOSelectorModalWrapperComponent, + SelectorActionType +} from '../dso-selector-modal-wrapper.component'; @Component({ selector: 'ds-create-item-parent-selector', // styleUrls: ['./create-item-parent-selector.component.scss'], - templateUrl: './create-item-parent-selector.component.html', + templateUrl: '../dso-selector-modal-wrapper.component.html', }) -export class CreateItemParentSelectorComponent implements OnInit { - @Input() collectionRD$: Observable>; - type = DSpaceObjectType.COLLECTION; +export class CreateItemParentSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit { + objectType = DSpaceObjectType.ITEM; + selectorType = DSpaceObjectType.COLLECTION; + action = SelectorActionType.CREATE; - constructor(private activeModal: NgbActiveModal, private route: ActivatedRoute) { + constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router) { + super(activeModal, route); } - ngOnInit(): void { - this.collectionRD$ = this.route.root.firstChild.firstChild.data.pipe(map(data => data.collection)); - } - - createItem(dso: DSpaceObject) { - this.close(); - + navigate(dso: DSpaceObject) { let path; // path = this.createPath; // this.router.navigate([path]); } - - close() { - this.activeModal.close(); - } } diff --git a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html new file mode 100644 index 0000000000..88f4a6f917 --- /dev/null +++ b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html @@ -0,0 +1,10 @@ +
+
{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}} + +
+
+ +
+
\ No newline at end of file diff --git a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts new file mode 100644 index 0000000000..3d053e9dcb --- /dev/null +++ b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts @@ -0,0 +1,43 @@ +import { Component, Input, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { Observable } from 'rxjs'; +import { DSpaceObject } from '../../../core/shared/dspace-object.model'; +import { RemoteData } from '../../../core/data/remote-data'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { map } from 'rxjs/operators'; +import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model'; + +export enum SelectorActionType { + CREATE = 'create', + EDIT = 'edit' +}; + +@Component({ + selector: 'ds-dso-selector-modal-wrapper', + templateUrl: './dso-selector-modal-wrapper.component.html', +}) +export abstract class DSOSelectorModalWrapperComponent implements OnInit { + @Input() dsoRD$: Observable>; + objectType: DSpaceObjectType; + selectorType: DSpaceObjectType; + action: SelectorActionType; + + constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute) { + } + + ngOnInit(): void { + const typeString = this.selectorType.toString().toLowerCase(); + this.dsoRD$ = this.route.root.firstChild.firstChild.data.pipe(map(data => data[typeString])); + } + + selectObject(dso: DSpaceObject) { + this.close(); + this.navigate(dso); + } + + abstract navigate(dso: DSpaceObject); + + close() { + this.activeModal.close(); + } +} diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-parent-selector.component.html deleted file mode 100644 index 9d050ef2fc..0000000000 --- a/src/app/shared/dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-parent-selector.component.html +++ /dev/null @@ -1,10 +0,0 @@ -
-
Edit Collection - -
-
- -
-
\ No newline at end of file diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-parent-selector.component.ts deleted file mode 100644 index 11e1c47f55..0000000000 --- a/src/app/shared/dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-parent-selector.component.ts +++ /dev/null @@ -1,37 +0,0 @@ -import { Component, Input, OnInit } from '@angular/core'; -import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; -import { Community } from '../../../../core/shared/community.model'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model'; -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { Collection } from '../../../../core/shared/collection.model'; -import { Observable } from 'rxjs'; -import { map } from 'rxjs/operators'; -import { getCollectionEditPath } from '../../../../+collection-page/collection-page-routing.module'; - -@Component({ - selector: 'ds-edit-collection-parent-selector', - // styleUrls: ['./edit-collection-parent-selector.component.scss'], - templateUrl: './edit-collection-parent-selector.component.html', -}) -export class EditCollectionParentSelectorComponent implements OnInit { - @Input() collectionRD$: Observable>; - type = DSpaceObjectType.COLLECTION; - - constructor(private activeModal: NgbActiveModal, private route: ActivatedRoute, private router: Router) { - } - - ngOnInit(): void { - this.collectionRD$ = this.route.root.firstChild.firstChild.data.pipe(map(data => data.collection)); - } - - editCollection(dso: DSpaceObject) { - this.close(); - this.router.navigate([getCollectionEditPath(dso.uuid)]); - } - - close() { - this.activeModal.close(); - } -} diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-selector.component.ts new file mode 100644 index 0000000000..edf3f37f6e --- /dev/null +++ b/src/app/shared/dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-selector.component.ts @@ -0,0 +1,28 @@ +import { Component, OnInit } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model'; +import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { getCollectionEditPath } from '../../../../+collection-page/collection-page-routing.module'; +import { + DSOSelectorModalWrapperComponent, + SelectorActionType +} from '../dso-selector-modal-wrapper.component'; + +@Component({ + selector: 'ds-edit-collection-selector', + templateUrl: '../dso-selector-modal-wrapper.component.html', +}) +export class EditCollectionSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit { + objectType = DSpaceObjectType.COLLECTION; + selectorType = DSpaceObjectType.COLLECTION; + action = SelectorActionType.EDIT; + + constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router) { + super(activeModal, route); + } + + navigate(dso: DSpaceObject) { + this.router.navigate([getCollectionEditPath(dso.uuid)]); + } +} diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-parent-selector.component.html deleted file mode 100644 index b75a760f8e..0000000000 --- a/src/app/shared/dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-parent-selector.component.html +++ /dev/null @@ -1,10 +0,0 @@ -
-
Edit Community - -
-
- -
-
\ No newline at end of file diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-parent-selector.component.ts deleted file mode 100644 index 8932be26ca..0000000000 --- a/src/app/shared/dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-parent-selector.component.ts +++ /dev/null @@ -1,37 +0,0 @@ -import { Component, Input, OnInit } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; -import { Community } from '../../../../core/shared/community.model'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model'; -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { Observable } from 'rxjs'; -import { map } from 'rxjs/operators'; -import { getCommunityEditPath } from '../../../../+community-page/community-page-routing.module'; - -@Component({ - selector: 'ds-edit-community-parent-selector', - // styleUrls: ['./edit-community-parent-selector.component.scss'], - templateUrl: './edit-community-parent-selector.component.html', -}) -export class EditCommunityParentSelectorComponent implements OnInit { - @Input() communityRD$: Observable>; - type = DSpaceObjectType.COMMUNITY; - - constructor(private activeModal: NgbActiveModal, private route: ActivatedRoute, private router: Router) { - } - - ngOnInit(): void { - this.communityRD$ = this.route.root.firstChild.firstChild.data.pipe(map(data => data.collection)); - } - - editCommunity(dso: DSpaceObject) { - this.close(); - this.router.navigate([getCommunityEditPath(dso.uuid)]); - } - - - close() { - this.activeModal.close(); - } -} diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-selector.component.ts new file mode 100644 index 0000000000..9af974782a --- /dev/null +++ b/src/app/shared/dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-selector.component.ts @@ -0,0 +1,29 @@ +import { Component, OnInit } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model'; +import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { getCommunityEditPath } from '../../../../+community-page/community-page-routing.module'; +import { + DSOSelectorModalWrapperComponent, + SelectorActionType +} from '../dso-selector-modal-wrapper.component'; + +@Component({ + selector: 'ds-edit-community-selector', + templateUrl: '../dso-selector-modal-wrapper.component.html', +}) + +export class EditCommunitySelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit { + objectType = DSpaceObjectType.COMMUNITY; + selectorType = DSpaceObjectType.COMMUNITY; + action = SelectorActionType.EDIT; + + constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router) { + super(activeModal, route); + } + + navigate(dso: DSpaceObject) { + this.router.navigate([getCommunityEditPath(dso.uuid)]); + } +} diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-item-parent-selector/edit-item-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/edit-item-parent-selector/edit-item-parent-selector.component.html deleted file mode 100644 index a9c508e381..0000000000 --- a/src/app/shared/dso-selector/modal-wrappers/edit-item-parent-selector/edit-item-parent-selector.component.html +++ /dev/null @@ -1,10 +0,0 @@ -
-
Edit Item - -
-
- -
-
\ No newline at end of file diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-item-parent-selector/edit-item-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-item-parent-selector/edit-item-selector.component.ts similarity index 57% rename from src/app/shared/dso-selector/modal-wrappers/edit-item-parent-selector/edit-item-parent-selector.component.ts rename to src/app/shared/dso-selector/modal-wrappers/edit-item-parent-selector/edit-item-selector.component.ts index f71e61a1fa..ff6ab35bf3 100644 --- a/src/app/shared/dso-selector/modal-wrappers/edit-item-parent-selector/edit-item-parent-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/edit-item-parent-selector/edit-item-selector.component.ts @@ -10,29 +10,25 @@ import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { Item } from '../../../../core/shared/item.model'; import { getItemEditPath } from '../../../../+item-page/item-page-routing.module'; +import { + DSOSelectorModalWrapperComponent, + SelectorActionType +} from '../dso-selector-modal-wrapper.component'; @Component({ - selector: 'ds-edit-item-parent-selector', - // styleUrls: ['./edit-item-parent-selector.component.scss'], - templateUrl: './edit-item-parent-selector.component.html', + selector: 'ds-edit-item-selector', + templateUrl: '../dso-selector-modal-wrapper.component.html', }) -export class EditItemParentSelectorComponent implements OnInit { - @Input() itemRD$: Observable>; - type = DSpaceObjectType.ITEM; +export class EditItemSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit { + objectType = DSpaceObjectType.ITEM; + selectorType = DSpaceObjectType.ITEM; + action = SelectorActionType.EDIT; - constructor(private activeModal: NgbActiveModal, private route: ActivatedRoute, private router: Router) { + constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router) { + super(activeModal, route); } - ngOnInit(): void { - this.itemRD$ = this.route.root.firstChild.firstChild.data.pipe(map(data => data.item)); - } - - editItem(dso: DSpaceObject) { - this.close(); + navigate(dso: DSpaceObject) { this.router.navigate([getItemEditPath(dso.uuid)]); } - - close() { - this.activeModal.close(); - } } diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 3ee20d435d..5d87148a73 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -99,9 +99,12 @@ import { DSOSelectorComponent } from './dso-selector/dso-selector/dso-selector.c import { CreateCommunityParentSelectorComponent } from './dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component'; import { CreateItemParentSelectorComponent } from './dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component'; import { CreateCollectionParentSelectorComponent } from './dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component'; -import { EditCollectionParentSelectorComponent } from './dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-parent-selector.component'; -import { EditItemParentSelectorComponent } from './dso-selector/modal-wrappers/edit-item-parent-selector/edit-item-parent-selector.component'; -import { EditCommunityParentSelectorComponent } from './dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-parent-selector.component'; +import { CommunitySearchResultListElementComponent } from './object-list/search-result-list-element/community-search-result/community-search-result-list-element.component'; +import { CollectionSearchResultListElementComponent } from './object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component'; +import { ItemSearchResultListElementComponent } from './object-list/search-result-list-element/item-search-result/item-search-result-list-element.component'; +import { EditItemSelectorComponent } from './dso-selector/modal-wrappers/edit-item-parent-selector/edit-item-selector.component'; +import { EditCommunitySelectorComponent } from './dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-selector.component'; +import { EditCollectionSelectorComponent } from './dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-selector.component'; const MODULES = [ // Do NOT include UniversalModule, HttpModule, or JsonpModule here @@ -188,9 +191,12 @@ const COMPONENTS = [ CreateCommunityParentSelectorComponent, CreateCollectionParentSelectorComponent, CreateItemParentSelectorComponent, - EditCommunityParentSelectorComponent, - EditCollectionParentSelectorComponent, - EditItemParentSelectorComponent, + EditCommunitySelectorComponent, + EditCollectionSelectorComponent, + EditItemSelectorComponent, + CommunitySearchResultListElementComponent, + CollectionSearchResultListElementComponent, + ItemSearchResultListElementComponent, ]; const ENTRY_COMPONENTS = [ @@ -199,6 +205,9 @@ const ENTRY_COMPONENTS = [ CollectionListElementComponent, CommunityListElementComponent, SearchResultListElementComponent, + CommunitySearchResultListElementComponent, + CollectionSearchResultListElementComponent, + ItemSearchResultListElementComponent, ItemGridElementComponent, CollectionGridElementComponent, CommunityGridElementComponent, @@ -208,9 +217,9 @@ const ENTRY_COMPONENTS = [ CreateCommunityParentSelectorComponent, CreateCollectionParentSelectorComponent, CreateItemParentSelectorComponent, - EditCommunityParentSelectorComponent, - EditCollectionParentSelectorComponent, - EditItemParentSelectorComponent, + EditCommunitySelectorComponent, + EditCollectionSelectorComponent, + EditItemSelectorComponent, ]; const PROVIDERS = [ diff --git a/src/app/shared/testing/search-service-stub.ts b/src/app/shared/testing/search-service-stub.ts index cbc0611a47..2a46e42ef5 100644 --- a/src/app/shared/testing/search-service-stub.ts +++ b/src/app/shared/testing/search-service-stub.ts @@ -40,4 +40,8 @@ export class SearchServiceStub { getFilterLabels() { return observableOf([]); } + + search() { + return observableOf({}); + } } From 31d24284fb7551e8f9aa2eb15d1c0024c491ea8d Mon Sep 17 00:00:00 2001 From: lotte Date: Thu, 7 Mar 2019 14:17:49 +0100 Subject: [PATCH 06/15] added tests for popups --- .../admin-sidebar.component.spec.ts | 29 +++- .../admin-sidebar/admin-sidebar.component.ts | 6 +- .../dso-selector.component.spec.ts | 5 +- ...llection-parent-selector.component.spec.ts | 65 +++++++++ ...ommunity-parent-selector.component.spec.ts | 65 +++++++++ ...ate-community-parent-selector.component.ts | 6 +- ...ate-item-parent-selector.component.spec.ts | 65 +++++++++ .../create-item-parent-selector.component.ts | 4 +- ...o-selector-modal-wrapper.component.spec.ts | 129 ++++++++++++++++++ .../dso-selector-modal-wrapper.component.ts | 38 +++++- ...edit-collection-selector.component.spec.ts | 65 +++++++++ .../edit-collection-selector.component.ts | 0 .../edit-community-selector.component.spec.ts | 65 +++++++++ .../edit-community-selector.component.ts | 0 .../edit-item-selector.component.spec.ts | 65 +++++++++ .../edit-item-selector.component.ts | 0 .../onclick-menu-item.component.spec.ts | 51 +++++++ .../menu-item/onclick-menu-item.component.ts | 5 +- src/app/shared/shared.module.ts | 7 +- 19 files changed, 639 insertions(+), 31 deletions(-) create mode 100644 src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.spec.ts create mode 100644 src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts create mode 100644 src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.spec.ts create mode 100644 src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts create mode 100644 src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.spec.ts rename src/app/shared/dso-selector/modal-wrappers/{edit-collection-parent-selector => edit-collection-selector}/edit-collection-selector.component.ts (100%) create mode 100644 src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.spec.ts rename src/app/shared/dso-selector/modal-wrappers/{edit-community-parent-selector => edit-community-selector}/edit-community-selector.component.ts (100%) create mode 100644 src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.spec.ts rename src/app/shared/dso-selector/modal-wrappers/{edit-item-parent-selector => edit-item-selector}/edit-item-selector.component.ts (100%) create mode 100644 src/app/shared/menu/menu-item/onclick-menu-item.component.spec.ts diff --git a/src/app/+admin/admin-sidebar/admin-sidebar.component.spec.ts b/src/app/+admin/admin-sidebar/admin-sidebar.component.spec.ts index c99e8adc58..e95949dd94 100644 --- a/src/app/+admin/admin-sidebar/admin-sidebar.component.spec.ts +++ b/src/app/+admin/admin-sidebar/admin-sidebar.component.spec.ts @@ -12,6 +12,7 @@ import { AuthService } from '../../core/auth/auth.service'; import { of as observableOf } from 'rxjs'; import { By } from '@angular/platform-browser'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; describe('AdminSidebarComponent', () => { let comp: AdminSidebarComponent; @@ -26,7 +27,13 @@ describe('AdminSidebarComponent', () => { { provide: Injector, useValue: {} }, { provide: MenuService, useValue: menuService }, { provide: CSSVariableService, useClass: CSSVariableServiceStub }, - { provide: AuthService, useClass: AuthServiceStub } + { provide: AuthService, useClass: AuthServiceStub }, + { + provide: NgbModal, useValue: { + open: () => { + } + } + } ], schemas: [NO_ERRORS_SCHEMA] }).overrideComponent(AdminSidebarComponent, { @@ -96,7 +103,10 @@ describe('AdminSidebarComponent', () => { beforeEach(() => { spyOn(menuService, 'toggleMenu'); const sidebarToggler = fixture.debugElement.query(By.css('#sidebar-collapse-toggle')).query(By.css('a.shortcut-icon')); - sidebarToggler.triggerEventHandler('click', {preventDefault: () => {/**/}}); + sidebarToggler.triggerEventHandler('click', { + preventDefault: () => {/**/ + } + }); }); it('should call toggleMenu on the menuService', () => { @@ -108,7 +118,10 @@ describe('AdminSidebarComponent', () => { beforeEach(() => { spyOn(menuService, 'toggleMenu'); const sidebarToggler = fixture.debugElement.query(By.css('#sidebar-collapse-toggle')).query(By.css('.sidebar-collapsible')).query(By.css('a')); - sidebarToggler.triggerEventHandler('click', {preventDefault: () => {/**/}}); + sidebarToggler.triggerEventHandler('click', { + preventDefault: () => {/**/ + } + }); }); it('should call toggleMenu on the menuService', () => { @@ -120,7 +133,10 @@ describe('AdminSidebarComponent', () => { it('should call expandPreview on the menuService after 100ms', fakeAsync(() => { spyOn(menuService, 'expandMenuPreview'); const sidebarToggler = fixture.debugElement.query(By.css('nav.navbar')); - sidebarToggler.triggerEventHandler('mouseenter', {preventDefault: () => {/**/}}); + sidebarToggler.triggerEventHandler('mouseenter', { + preventDefault: () => {/**/ + } + }); tick(99); expect(menuService.expandMenuPreview).not.toHaveBeenCalled(); tick(1); @@ -132,7 +148,10 @@ describe('AdminSidebarComponent', () => { it('should call collapseMenuPreview on the menuService after 400ms', fakeAsync(() => { spyOn(menuService, 'collapseMenuPreview'); const sidebarToggler = fixture.debugElement.query(By.css('nav.navbar')); - sidebarToggler.triggerEventHandler('mouseleave', {preventDefault: () => {/**/}}); + sidebarToggler.triggerEventHandler('mouseleave', { + preventDefault: () => {/**/ + } + }); tick(399); expect(menuService.collapseMenuPreview).not.toHaveBeenCalled(); tick(1); diff --git a/src/app/+admin/admin-sidebar/admin-sidebar.component.ts b/src/app/+admin/admin-sidebar/admin-sidebar.component.ts index e429b57bae..f148627297 100644 --- a/src/app/+admin/admin-sidebar/admin-sidebar.component.ts +++ b/src/app/+admin/admin-sidebar/admin-sidebar.component.ts @@ -15,9 +15,9 @@ import { OnClickMenuItemModel } from '../../shared/menu/menu-item/models/onclick import { CreateCommunityParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component'; import { CreateItemParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component'; import { CreateCollectionParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component'; -import { EditItemSelectorComponent } from '../../shared/dso-selector/modal-wrappers/edit-item-parent-selector/edit-item-selector.component'; -import { EditCommunitySelectorComponent } from '../../shared/dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-selector.component'; -import { EditCollectionSelectorComponent } from '../../shared/dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-selector.component'; +import { EditItemSelectorComponent } from '../../shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component'; +import { EditCommunitySelectorComponent } from '../../shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component'; +import { EditCollectionSelectorComponent } from '../../shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component'; /** * Component representing the admin sidebar diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts index 38067f3dc0..b7fa0c420e 100644 --- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts +++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts @@ -11,7 +11,7 @@ import { Item } from '../../../core/shared/item.model'; import { of as observableOf } from 'rxjs'; import { PaginatedList } from '../../../core/data/paginated-list'; -fdescribe('DSOSelectorComponent', () => { +describe('DSOSelectorComponent', () => { let component: DSOSelectorComponent; let fixture: ComponentFixture; let debugElement: DebugElement; @@ -35,8 +35,7 @@ fdescribe('DSOSelectorComponent', () => { { provide: SearchService, useValue: searchService }, ], schemas: [NO_ERRORS_SCHEMA] - }) - .compileComponents(); + }).compileComponents(); })); diff --git a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.spec.ts new file mode 100644 index 0000000000..5ffbae79be --- /dev/null +++ b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.spec.ts @@ -0,0 +1,65 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { TranslateModule } from '@ngx-translate/core'; +import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core'; +import { of as observableOf } from 'rxjs'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { ActivatedRoute, Router } from '@angular/router'; +import { RemoteData } from '../../../../core/data/remote-data'; +import { RouterStub } from '../../../testing/router-stub'; +import * as collectionRouter from '../../../../+collection-page/collection-page-routing.module'; +import { Community } from '../../../../core/shared/community.model'; +import { CreateCollectionParentSelectorComponent } from './create-collection-parent-selector.component'; + +describe('CreateCollectionParentSelectorComponent', () => { + let component: CreateCollectionParentSelectorComponent; + let fixture: ComponentFixture; + let debugElement: DebugElement; + + const community = new Community(); + community.uuid = '1234-1234-1234-1234'; + community.metadata = { 'dc.title': [{ value: 'Community title', language: undefined }] }; + const router = new RouterStub(); + const communityRD = new RemoteData(false, false, true, undefined, community); + const modalStub = jasmine.createSpyObj('modalStub', ['close']); + const createPath = 'testCreatePath'; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [TranslateModule.forRoot()], + declarations: [CreateCollectionParentSelectorComponent], + providers: [ + { provide: NgbActiveModal, useValue: modalStub }, + { + provide: ActivatedRoute, + useValue: { root: { firstChild: { firstChild: { data: observableOf({ community: communityRD }) } } } } + }, + { + provide: Router, useValue: router + } + ], + schemas: [NO_ERRORS_SCHEMA] + }).compileComponents(); + + })); + + beforeEach(() => { + spyOnProperty(collectionRouter, 'getCollectionCreatePath').and.callFake(() => { + return () => createPath; + }); + + fixture = TestBed.createComponent(CreateCollectionParentSelectorComponent); + component = fixture.componentInstance; + debugElement = fixture.debugElement; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should call navigate on the router with the correct edit path when navigate is called', () => { + component.navigate(community); + expect(router.navigate).toHaveBeenCalledWith([createPath], { queryParams: { parent: community.uuid } } ); + }); + +}); diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts new file mode 100644 index 0000000000..156e8924c8 --- /dev/null +++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts @@ -0,0 +1,65 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { TranslateModule } from '@ngx-translate/core'; +import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core'; +import { of as observableOf } from 'rxjs'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { ActivatedRoute, Router } from '@angular/router'; +import { RemoteData } from '../../../../core/data/remote-data'; +import { RouterStub } from '../../../testing/router-stub'; +import * as communityRouter from '../../../../+community-page/community-page-routing.module'; +import { Community } from '../../../../core/shared/community.model'; +import { CreateCommunityParentSelectorComponent } from './create-community-parent-selector.component'; + +describe('CreateCommunityParentSelectorComponent', () => { + let component: CreateCommunityParentSelectorComponent; + let fixture: ComponentFixture; + let debugElement: DebugElement; + + const community = new Community(); + community.uuid = '1234-1234-1234-1234'; + community.metadata = { 'dc.title': [{ value: 'Community title', language: undefined }] }; + const router = new RouterStub(); + const communityRD = new RemoteData(false, false, true, undefined, community); + const modalStub = jasmine.createSpyObj('modalStub', ['close']); + const createPath = 'testCreatePath'; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [TranslateModule.forRoot()], + declarations: [CreateCommunityParentSelectorComponent], + providers: [ + { provide: NgbActiveModal, useValue: modalStub }, + { + provide: ActivatedRoute, + useValue: { root: { firstChild: { firstChild: { data: observableOf({ community: communityRD }) } } } } + }, + { + provide: Router, useValue: router + } + ], + schemas: [NO_ERRORS_SCHEMA] + }).compileComponents(); + + })); + + beforeEach(() => { + spyOnProperty(communityRouter, 'getCommunityCreatePath').and.callFake(() => { + return () => createPath; + }); + + fixture = TestBed.createComponent(CreateCommunityParentSelectorComponent); + component = fixture.componentInstance; + debugElement = fixture.debugElement; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should call navigate on the router with the correct edit path when navigate is called', () => { + component.navigate(community); + expect(router.navigate).toHaveBeenCalledWith([createPath], { queryParams: { parent: community.uuid } }); + }); + +}); diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts index c3d112a455..c8c98503d0 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts @@ -1,13 +1,9 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; -import { Community } from '../../../../core/shared/community.model'; -import { RemoteData } from '../../../../core/data/remote-data'; import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model'; import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; import { hasValue } from '../../../empty.util'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { map } from 'rxjs/operators'; -import { Observable } from 'rxjs'; import { COMMUNITY_PARENT_PARAMETER, getCommunityCreatePath diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.spec.ts new file mode 100644 index 0000000000..89204ff2b3 --- /dev/null +++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.spec.ts @@ -0,0 +1,65 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { TranslateModule } from '@ngx-translate/core'; +import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core'; +import { of as observableOf } from 'rxjs'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { ActivatedRoute, Router } from '@angular/router'; +import { RemoteData } from '../../../../core/data/remote-data'; +import { RouterStub } from '../../../testing/router-stub'; +import { Collection } from '../../../../core/shared/collection.model'; +import { CreateItemParentSelectorComponent } from './create-item-parent-selector.component'; + +describe('CreateItemParentSelectorComponent', () => { + let component: CreateItemParentSelectorComponent; + let fixture: ComponentFixture; + let debugElement: DebugElement; + + const collection = new Collection(); + collection.uuid = '1234-1234-1234-1234'; + collection.metadata = { 'dc.title': [{ value: 'Collection title', language: undefined }] }; + const router = new RouterStub(); + const collectionRD = new RemoteData(false, false, true, undefined, collection); + const modalStub = jasmine.createSpyObj('modalStub', ['close']); + const createPath = 'testCreatePath'; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [TranslateModule.forRoot()], + declarations: [CreateItemParentSelectorComponent], + providers: [ + { provide: NgbActiveModal, useValue: modalStub }, + { + provide: ActivatedRoute, + useValue: { root: { firstChild: { firstChild: { data: observableOf({ collection: collectionRD }) } } } } + }, + { + provide: Router, useValue: router + } + ], + schemas: [NO_ERRORS_SCHEMA] + }).compileComponents(); + + })); + + beforeEach(() => { + // spyOnProperty(itemRouter, 'getItemCreatePath').and.callFake(() => { + // return () => createPath; + // }); + + fixture = TestBed.createComponent(CreateItemParentSelectorComponent); + component = fixture.componentInstance; + debugElement = fixture.debugElement; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should call navigate on the router with the correct create path when navigate is called', () => { + /* TODO when there is a specific submission path */ + // component.navigate(item); + // expect(router.navigate).toHaveBeenCalledWith([createPath]); + }); + +}); diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts index dac79dddcb..27610304e5 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts @@ -29,8 +29,6 @@ export class CreateItemParentSelectorComponent extends DSOSelectorModalWrapperCo } navigate(dso: DSpaceObject) { - let path; - // path = this.createPath; - // this.router.navigate([path]); + //There's no submit path per collection yet... } } diff --git a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts new file mode 100644 index 0000000000..edc6a512a5 --- /dev/null +++ b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts @@ -0,0 +1,129 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { TranslateModule } from '@ngx-translate/core'; +import { Component, DebugElement, NO_ERRORS_SCHEMA, OnInit } from '@angular/core'; +import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model'; +import { RemoteData } from '../../../core/data/remote-data'; +import { Item } from '../../../core/shared/item.model'; +import { of as observableOf } from 'rxjs'; +import { + DSOSelectorModalWrapperComponent, + SelectorActionType +} from './dso-selector-modal-wrapper.component'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { ActivatedRoute } from '@angular/router'; +import { DSpaceObject } from '../../../core/shared/dspace-object.model'; +import { first } from 'rxjs/operators'; +import { By } from '@angular/platform-browser'; +import { DSOSelectorComponent } from '../dso-selector/dso-selector.component'; +import { MockComponent } from 'ng-mocks'; + +describe('DSOSelectorModalWrapperComponent', () => { + let component: DSOSelectorModalWrapperComponent; + let fixture: ComponentFixture; + let debugElement: DebugElement; + + const item = new Item(); + item.uuid = '1234-1234-1234-1234'; + item.metadata = { 'dc.title': [{ value: 'Item title', language: undefined }] }; + + const itemRD = new RemoteData(false, false, true, undefined, item); + const modalStub = jasmine.createSpyObj('modalStub', ['close']); + + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [TranslateModule.forRoot()], + declarations: [TestComponent, MockComponent(DSOSelectorComponent)], + providers: [ + { provide: NgbActiveModal, useValue: modalStub }, + { + provide: ActivatedRoute, + useValue: { root: { firstChild: { firstChild: { data: observableOf({ item: itemRD }) } } } } + } + ], + schemas: [NO_ERRORS_SCHEMA] + }).compileComponents(); + + })); + + beforeEach(() => { + fixture = TestBed.createComponent(TestComponent); + component = fixture.componentInstance; + debugElement = fixture.debugElement; + fixture.detectChanges(); + component.ngOnInit(); + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should initially set the DSO to the activated route\'s item/collection/community', () => { + component.dsoRD$ + .pipe(first()) + .subscribe((a) => { + expect(a).toEqual(itemRD); + }) + }); + + describe('selectObject', () => { + beforeEach(() => { + spyOn(component, 'navigate'); + spyOn(component, 'close'); + component.selectObject(item) + }); + it('should call the close and navigate method on the component with the given DSO', () => { + expect(component.close).toHaveBeenCalled(); + expect(component.navigate).toHaveBeenCalledWith(item); + }); + }); + + describe('close', () => { + beforeEach(() => { + component.close(); + }); + it('should call the close method on the æctive modal', () => { + expect(modalStub.close).toHaveBeenCalled(); + }); + }); + + + describe('when the onSelect method emits on the child component', () => { + beforeEach(() => { + spyOn(component, 'selectObject'); + debugElement.query(By.css('ds-dso-selector')).componentInstance.onSelect.emit(item); + fixture.detectChanges(); + }); + it('should call the selectObject method on the component with the correct object', () => { + expect(component.selectObject).toHaveBeenCalledWith(item); + }); + }); + + describe('when the click method emits on close button', () => { + beforeEach(() => { + spyOn(component, 'close'); + debugElement.query(By.css('button.close')).triggerEventHandler('click', {}); + fixture.detectChanges(); + }); + it('should call the close method on the component', () => { + expect(component.close).toHaveBeenCalled(); + }); + }); +}); + +@Component({ + selector: 'ds-test-cmp', + templateUrl: './dso-selector-modal-wrapper.component.html' +}) +class TestComponent extends DSOSelectorModalWrapperComponent implements OnInit { + objectType = DSpaceObjectType.ITEM; + selectorType = DSpaceObjectType.ITEM; + action = SelectorActionType.EDIT; + + constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute) { + super(activeModal, route); + } + + navigate(dso: DSpaceObject) { + } +} diff --git a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts index 3d053e9dcb..7e6ee889c0 100644 --- a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Injectable, Input, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Observable } from 'rxjs'; import { DSpaceObject } from '../../../core/shared/dspace-object.model'; @@ -10,33 +10,59 @@ import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model' export enum SelectorActionType { CREATE = 'create', EDIT = 'edit' -}; +} -@Component({ - selector: 'ds-dso-selector-modal-wrapper', - templateUrl: './dso-selector-modal-wrapper.component.html', -}) +@Injectable() export abstract class DSOSelectorModalWrapperComponent implements OnInit { + /** + * The current page's DSO + */ @Input() dsoRD$: Observable>; + + /** + * The type of the DSO that's being edited or created + */ objectType: DSpaceObjectType; + + /** + * The type of DSO that can be selected from this list + */ selectorType: DSpaceObjectType; + + /** + * The type of action to perform + */ action: SelectorActionType; constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute) { } + /** + * Get de current page's DSO based on the selectorType + */ ngOnInit(): void { const typeString = this.selectorType.toString().toLowerCase(); this.dsoRD$ = this.route.root.firstChild.firstChild.data.pipe(map(data => data[typeString])); } + /** + * Method called when an object has been selected + * @param dso The selected DSpaceObject + */ selectObject(dso: DSpaceObject) { this.close(); this.navigate(dso); } + /** + * Navigate to a page based on the DSpaceObject provided + * @param dso The DSpaceObject which can be used to calculate the page to navigate to + */ abstract navigate(dso: DSpaceObject); + /** + * Close the modal + */ close() { this.activeModal.close(); } diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.spec.ts new file mode 100644 index 0000000000..6e4cd7b3b6 --- /dev/null +++ b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.spec.ts @@ -0,0 +1,65 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { TranslateModule } from '@ngx-translate/core'; +import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core'; +import { of as observableOf } from 'rxjs'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { ActivatedRoute, Router } from '@angular/router'; +import { RemoteData } from '../../../../core/data/remote-data'; +import { RouterStub } from '../../../testing/router-stub'; +import * as collectionRouter from '../../../../+collection-page/collection-page-routing.module'; +import { EditCollectionSelectorComponent } from './edit-collection-selector.component'; +import { Collection } from '../../../../core/shared/collection.model'; + +describe('EditCollectionSelectorComponent', () => { + let component: EditCollectionSelectorComponent; + let fixture: ComponentFixture; + let debugElement: DebugElement; + + const collection = new Collection(); + collection.uuid = '1234-1234-1234-1234'; + collection.metadata = { 'dc.title': [{ value: 'Collection title', language: undefined }] }; + const router = new RouterStub(); + const collectionRD = new RemoteData(false, false, true, undefined, collection); + const modalStub = jasmine.createSpyObj('modalStub', ['close']); + const editPath = 'testEditPath'; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [TranslateModule.forRoot()], + declarations: [EditCollectionSelectorComponent], + providers: [ + { provide: NgbActiveModal, useValue: modalStub }, + { + provide: ActivatedRoute, + useValue: { root: { firstChild: { firstChild: { data: observableOf({ collection: collectionRD }) } } } } + }, + { + provide: Router, useValue: router + } + ], + schemas: [NO_ERRORS_SCHEMA] + }).compileComponents(); + + })); + + beforeEach(() => { + spyOnProperty(collectionRouter, 'getCollectionEditPath').and.callFake(() => { + return () => editPath; + }); + + fixture = TestBed.createComponent(EditCollectionSelectorComponent); + component = fixture.componentInstance; + debugElement = fixture.debugElement; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should call navigate on the router with the correct edit path when navigate is called', () => { + component.navigate(collection); + expect(router.navigate).toHaveBeenCalledWith([editPath]); + }); + +}); diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts similarity index 100% rename from src/app/shared/dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-selector.component.ts rename to src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.spec.ts new file mode 100644 index 0000000000..e66554d1c3 --- /dev/null +++ b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.spec.ts @@ -0,0 +1,65 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { TranslateModule } from '@ngx-translate/core'; +import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core'; +import { of as observableOf } from 'rxjs'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { ActivatedRoute, Router } from '@angular/router'; +import { RemoteData } from '../../../../core/data/remote-data'; +import { RouterStub } from '../../../testing/router-stub'; +import * as communityRouter from '../../../../+community-page/community-page-routing.module'; +import { EditCommunitySelectorComponent } from './edit-community-selector.component'; +import { Community } from '../../../../core/shared/community.model'; + +describe('EditCommunitySelectorComponent', () => { + let component: EditCommunitySelectorComponent; + let fixture: ComponentFixture; + let debugElement: DebugElement; + + const community = new Community(); + community.uuid = '1234-1234-1234-1234'; + community.metadata = { 'dc.title': [{ value: 'Community title', language: undefined }] }; + const router = new RouterStub(); + const communityRD = new RemoteData(false, false, true, undefined, community); + const modalStub = jasmine.createSpyObj('modalStub', ['close']); + const editPath = 'testEditPath'; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [TranslateModule.forRoot()], + declarations: [EditCommunitySelectorComponent], + providers: [ + { provide: NgbActiveModal, useValue: modalStub }, + { + provide: ActivatedRoute, + useValue: { root: { firstChild: { firstChild: { data: observableOf({ community: communityRD }) } } } } + }, + { + provide: Router, useValue: router + } + ], + schemas: [NO_ERRORS_SCHEMA] + }).compileComponents(); + + })); + + beforeEach(() => { + spyOnProperty(communityRouter, 'getCommunityEditPath').and.callFake(() => { + return () => editPath; + }); + + fixture = TestBed.createComponent(EditCommunitySelectorComponent); + component = fixture.componentInstance; + debugElement = fixture.debugElement; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should call navigate on the router with the correct edit path when navigate is called', () => { + component.navigate(community); + expect(router.navigate).toHaveBeenCalledWith([editPath]); + }); + +}); diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts similarity index 100% rename from src/app/shared/dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-selector.component.ts rename to src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.spec.ts new file mode 100644 index 0000000000..01de6b2de6 --- /dev/null +++ b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.spec.ts @@ -0,0 +1,65 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { TranslateModule } from '@ngx-translate/core'; +import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core'; +import { of as observableOf } from 'rxjs'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { ActivatedRoute, Router } from '@angular/router'; +import { EditItemSelectorComponent } from './edit-item-selector.component'; +import { Item } from '../../../../core/shared/item.model'; +import { RemoteData } from '../../../../core/data/remote-data'; +import { RouterStub } from '../../../testing/router-stub'; +import * as itemRouter from '../../../../+item-page/item-page-routing.module'; + +describe('EditItemSelectorComponent', () => { + let component: EditItemSelectorComponent; + let fixture: ComponentFixture; + let debugElement: DebugElement; + + const item = new Item(); + item.uuid = '1234-1234-1234-1234'; + item.metadata = { 'dc.title': [{ value: 'Item title', language: undefined }] }; + const router = new RouterStub(); + const itemRD = new RemoteData(false, false, true, undefined, item); + const modalStub = jasmine.createSpyObj('modalStub', ['close']); + const editPath = 'testEditPath'; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [TranslateModule.forRoot()], + declarations: [EditItemSelectorComponent], + providers: [ + { provide: NgbActiveModal, useValue: modalStub }, + { + provide: ActivatedRoute, + useValue: { root: { firstChild: { firstChild: { data: observableOf({ item: itemRD }) } } } } + }, + { + provide: Router, useValue: router + } + ], + schemas: [NO_ERRORS_SCHEMA] + }).compileComponents(); + + })); + + beforeEach(() => { + spyOnProperty(itemRouter, 'getItemEditPath').and.callFake(() => { + return () => editPath; + }); + + fixture = TestBed.createComponent(EditItemSelectorComponent); + component = fixture.componentInstance; + debugElement = fixture.debugElement; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should call navigate on the router with the correct edit path when navigate is called', () => { + component.navigate(item); + expect(router.navigate).toHaveBeenCalledWith([editPath]); + }); + +}); diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-item-parent-selector/edit-item-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts similarity index 100% rename from src/app/shared/dso-selector/modal-wrappers/edit-item-parent-selector/edit-item-selector.component.ts rename to src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts diff --git a/src/app/shared/menu/menu-item/onclick-menu-item.component.spec.ts b/src/app/shared/menu/menu-item/onclick-menu-item.component.spec.ts new file mode 100644 index 0000000000..5b085b28e4 --- /dev/null +++ b/src/app/shared/menu/menu-item/onclick-menu-item.component.spec.ts @@ -0,0 +1,51 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { TextMenuItemComponent } from './text-menu-item.component'; +import { TranslateModule } from '@ngx-translate/core'; +import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core'; +import { By } from '@angular/platform-browser'; +import { OnClickMenuItemComponent } from './onclick-menu-item.component'; +import { OnClickMenuItemModel } from './models/onclick.model'; + +describe('OnClickMenuItemComponent', () => { + let component: OnClickMenuItemComponent; + let fixture: ComponentFixture; + let debugElement: DebugElement; + const text = 'HELLO'; + const func = () => { + }; + const item = Object.assign(new OnClickMenuItemModel(), { text, function: func }); + + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [TranslateModule.forRoot()], + declarations: [OnClickMenuItemComponent], + providers: [ + { provide: 'itemModelProvider', useValue: item }, + ], + schemas: [NO_ERRORS_SCHEMA] + }) + .compileComponents(); + })); + + beforeEach(() => { + spyOn(item, 'function'); + fixture = TestBed.createComponent(OnClickMenuItemComponent); + component = fixture.componentInstance; + debugElement = fixture.debugElement; + fixture.detectChanges(); + }); + + it('should contain the correct text', () => { + expect(component).toBeTruthy(); + }); + + it('should contain the text element', () => { + const textContent = debugElement.query(By.css('a')).nativeElement.textContent; + expect(textContent).toEqual(text); + }); + + it('should contain call the function on the item when clicked', () => { + debugElement.query(By.css('a.nav-link')).triggerEventHandler('click', {}); + expect(item.function).toHaveBeenCalled(); + }); +}); diff --git a/src/app/shared/menu/menu-item/onclick-menu-item.component.ts b/src/app/shared/menu/menu-item/onclick-menu-item.component.ts index 14fd5d8ffd..b981f08764 100644 --- a/src/app/shared/menu/menu-item/onclick-menu-item.component.ts +++ b/src/app/shared/menu/menu-item/onclick-menu-item.component.ts @@ -1,11 +1,10 @@ import { Component, Inject } from '@angular/core'; import { MenuItemType } from '../initial-menus-state'; import { rendersMenuItemForType } from '../menu-item.decorator'; -import { GLOBAL_CONFIG, GlobalConfig } from '../../../../config'; import { OnClickMenuItemModel } from './models/onclick.model'; /** - * Component that renders a menu section of type LINK + * Component that renders a menu section of type ONCLICK */ @Component({ selector: 'ds-onclick-menu-item', @@ -14,7 +13,7 @@ import { OnClickMenuItemModel } from './models/onclick.model'; @rendersMenuItemForType(MenuItemType.ONCLICK) export class OnClickMenuItemComponent { item: OnClickMenuItemModel; - constructor(@Inject('itemModelProvider') item: OnClickMenuItemModel, @Inject(GLOBAL_CONFIG) private EnvConfig: GlobalConfig) { + constructor(@Inject('itemModelProvider') item: OnClickMenuItemModel) { this.item = item; } } diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 5d87148a73..e98da96e53 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -102,9 +102,10 @@ import { CreateCollectionParentSelectorComponent } from './dso-selector/modal-wr import { CommunitySearchResultListElementComponent } from './object-list/search-result-list-element/community-search-result/community-search-result-list-element.component'; import { CollectionSearchResultListElementComponent } from './object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component'; import { ItemSearchResultListElementComponent } from './object-list/search-result-list-element/item-search-result/item-search-result-list-element.component'; -import { EditItemSelectorComponent } from './dso-selector/modal-wrappers/edit-item-parent-selector/edit-item-selector.component'; -import { EditCommunitySelectorComponent } from './dso-selector/modal-wrappers/edit-community-parent-selector/edit-community-selector.component'; -import { EditCollectionSelectorComponent } from './dso-selector/modal-wrappers/edit-collection-parent-selector/edit-collection-selector.component'; +import { EditItemSelectorComponent } from './dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component'; +import { EditCommunitySelectorComponent } from './dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component'; +import { EditCollectionSelectorComponent } from './dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component'; +import { DSOSelectorModalWrapperComponent } from './dso-selector/modal-wrappers/dso-selector-modal-wrapper.component'; const MODULES = [ // Do NOT include UniversalModule, HttpModule, or JsonpModule here From c60175ac80140114944d14e729a37c5eb8ec0376 Mon Sep 17 00:00:00 2001 From: lotte Date: Thu, 7 Mar 2019 15:00:30 +0100 Subject: [PATCH 07/15] fixed metadata value issues --- resources/i18n/en.json | 4 +++- .../dso-selector/dso-selector.component.html | 7 ++++--- .../dso-selector/dso-selector.component.spec.ts | 3 ++- ...ate-collection-parent-selector.component.spec.ts | 13 ++++++++++--- ...eate-community-parent-selector.component.spec.ts | 3 ++- .../create-item-parent-selector.component.spec.ts | 3 ++- .../dso-selector-modal-wrapper.component.spec.ts | 8 +++++++- .../edit-collection-selector.component.spec.ts | 3 ++- .../edit-community-selector.component.spec.ts | 3 ++- .../edit-item-selector.component.spec.ts | 3 ++- 10 files changed, 36 insertions(+), 14 deletions(-) diff --git a/resources/i18n/en.json b/resources/i18n/en.json index 38d90e67ea..f563411231 100644 --- a/resources/i18n/en.json +++ b/resources/i18n/en.json @@ -667,6 +667,8 @@ "item": { "head": "Edit item" } - } + }, + "placeholder": "Search for a {{ type }}", + "no-results": "No {{ type }} found" } } diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html index bc520bfe3b..e9555a6191 100644 --- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html +++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html @@ -2,13 +2,14 @@
-
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts index f3164a37e2..7bb9bfac28 100644 --- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts +++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts @@ -31,7 +31,7 @@ import { DSpaceObject } from '../../../core/shared/dspace-object.model'; * Component to render a list of DSO's of which one can be selected * The user can search the list by using the input field */ -export class DSOSelectorComponent implements OnInit, AfterViewInit { +export class DSOSelectorComponent implements OnInit { /** * The initially selected DSO's uuid @@ -76,6 +76,7 @@ export class DSOSelectorComponent implements OnInit, AfterViewInit { * The search will always start with the initial currentDSOId value */ ngOnInit(): void { + this.input.setValue(this.currentDSOId); this.listEntries$ = this.input.valueChanges .pipe( startWith(this.currentDSOId), @@ -93,15 +94,11 @@ export class DSOSelectorComponent implements OnInit, AfterViewInit { } /** - * Make sure to set focus on the first list element when the initial search (with currentDSOId) emits a single value + * Set focus on the first list element when there is only one result */ - ngAfterViewInit(): void { - this.listElements.changes.pipe( - take(1) - ).subscribe((changes) => { - if (changes.length === 1) { - this.listElements.first.nativeElement.focus(); - } - }); + selectSingleResult(): void { + if (this.listElements.length > 0) { + this.listElements.first.nativeElement.click(); + } } } diff --git a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts index 631480c04d..ea2da41849 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts @@ -27,6 +27,9 @@ export class CreateCollectionParentSelectorComponent extends DSOSelectorModalWra super(activeModal, route); } + /** + * Navigate to the collection create page + */ navigate(dso: DSpaceObject) { let navigationExtras: NavigationExtras = { queryParams: { diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts index c8c98503d0..b8cc28b9fc 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts @@ -27,6 +27,9 @@ export class CreateCommunityParentSelectorComponent extends DSOSelectorModalWrap super(activeModal, route); } + /** + * Navigate to the community create page + */ navigate(dso: DSpaceObject) { let navigationExtras: NavigationExtras = {}; if (hasValue(dso)) { diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts index 27610304e5..dad0a2eb41 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts @@ -28,6 +28,9 @@ export class CreateItemParentSelectorComponent extends DSOSelectorModalWrapperCo super(activeModal, route); } + /** + * Navigate to the item create page + */ navigate(dso: DSpaceObject) { //There's no submit path per collection yet... } diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts index edf3f37f6e..dab5b8eea3 100644 --- a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts @@ -22,6 +22,9 @@ export class EditCollectionSelectorComponent extends DSOSelectorModalWrapperComp super(activeModal, route); } + /** + * Navigate to the collection edit page + */ navigate(dso: DSpaceObject) { this.router.navigate([getCollectionEditPath(dso.uuid)]); } diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts index 9af974782a..ce688d17ae 100644 --- a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts @@ -23,6 +23,9 @@ export class EditCommunitySelectorComponent extends DSOSelectorModalWrapperCompo super(activeModal, route); } + /** + * Navigate to the community edit page + */ navigate(dso: DSpaceObject) { this.router.navigate([getCommunityEditPath(dso.uuid)]); } diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts index ff6ab35bf3..e14be10435 100644 --- a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts @@ -28,6 +28,9 @@ export class EditItemSelectorComponent extends DSOSelectorModalWrapperComponent super(activeModal, route); } + /** + * Navigate to the item edit page + */ navigate(dso: DSpaceObject) { this.router.navigate([getItemEditPath(dso.uuid)]); } diff --git a/src/app/shared/menu/menu-item/onclick-menu-item.component.scss b/src/app/shared/menu/menu-item/onclick-menu-item.component.scss new file mode 100644 index 0000000000..adb670aa6f --- /dev/null +++ b/src/app/shared/menu/menu-item/onclick-menu-item.component.scss @@ -0,0 +1,3 @@ +a { + cursor: pointer; +} \ No newline at end of file diff --git a/src/app/shared/menu/menu-item/onclick-menu-item.component.ts b/src/app/shared/menu/menu-item/onclick-menu-item.component.ts index b981f08764..95b896ed64 100644 --- a/src/app/shared/menu/menu-item/onclick-menu-item.component.ts +++ b/src/app/shared/menu/menu-item/onclick-menu-item.component.ts @@ -8,6 +8,7 @@ import { OnClickMenuItemModel } from './models/onclick.model'; */ @Component({ selector: 'ds-onclick-menu-item', + styleUrls: ['./onclick-menu-item.component.scss'], templateUrl: './onclick-menu-item.component.html' }) @rendersMenuItemForType(MenuItemType.ONCLICK) From ede9f05e92c17d10e0265d696669f655f53ef0ea Mon Sep 17 00:00:00 2001 From: lotte Date: Fri, 8 Mar 2019 08:51:33 +0100 Subject: [PATCH 09/15] fixed documentation --- src/app/+admin/admin-sidebar/admin-sidebar.component.spec.ts | 3 +-- .../create-collection-parent-selector.component.ts | 2 +- .../create-item-parent-selector.component.ts | 2 +- .../dso-selector-modal-wrapper.component.spec.ts | 2 +- .../modal-wrappers/dso-selector-modal-wrapper.component.ts | 2 +- .../shared/menu/menu-item/onclick-menu-item.component.spec.ts | 1 + 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/+admin/admin-sidebar/admin-sidebar.component.spec.ts b/src/app/+admin/admin-sidebar/admin-sidebar.component.spec.ts index e95949dd94..590caaaccf 100644 --- a/src/app/+admin/admin-sidebar/admin-sidebar.component.spec.ts +++ b/src/app/+admin/admin-sidebar/admin-sidebar.component.spec.ts @@ -30,8 +30,7 @@ describe('AdminSidebarComponent', () => { { provide: AuthService, useClass: AuthServiceStub }, { provide: NgbModal, useValue: { - open: () => { - } + open: () => {/*comment*/} } } ], diff --git a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts index ea2da41849..20968456b3 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts @@ -31,7 +31,7 @@ export class CreateCollectionParentSelectorComponent extends DSOSelectorModalWra * Navigate to the collection create page */ navigate(dso: DSpaceObject) { - let navigationExtras: NavigationExtras = { + const navigationExtras: NavigationExtras = { queryParams: { [COLLECTION_PARENT_PARAMETER]: dso.uuid, } diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts index dad0a2eb41..5dc6e4fe78 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts @@ -32,6 +32,6 @@ export class CreateItemParentSelectorComponent extends DSOSelectorModalWrapperCo * Navigate to the item create page */ navigate(dso: DSpaceObject) { - //There's no submit path per collection yet... + // There's no submit path per collection yet... } } diff --git a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts index 2c7ddeb265..ea857f7d62 100644 --- a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts +++ b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts @@ -93,7 +93,6 @@ describe('DSOSelectorModalWrapperComponent', () => { }); }); - describe('when the onSelect method emits on the child component', () => { beforeEach(() => { spyOn(component, 'selectObject'); @@ -131,5 +130,6 @@ class TestComponent extends DSOSelectorModalWrapperComponent implements OnInit { } navigate(dso: DSpaceObject) { + /* comment */ } } diff --git a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts index 7e6ee889c0..8414f00830 100644 --- a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts @@ -42,7 +42,7 @@ export abstract class DSOSelectorModalWrapperComponent implements OnInit { */ ngOnInit(): void { const typeString = this.selectorType.toString().toLowerCase(); - this.dsoRD$ = this.route.root.firstChild.firstChild.data.pipe(map(data => data[typeString])); + this.dsoRD$ = this.route.root.firstChild.firstChild.data.pipe(map((data) => data[typeString])); } /** diff --git a/src/app/shared/menu/menu-item/onclick-menu-item.component.spec.ts b/src/app/shared/menu/menu-item/onclick-menu-item.component.spec.ts index 5b085b28e4..dd031a96e0 100644 --- a/src/app/shared/menu/menu-item/onclick-menu-item.component.spec.ts +++ b/src/app/shared/menu/menu-item/onclick-menu-item.component.spec.ts @@ -12,6 +12,7 @@ describe('OnClickMenuItemComponent', () => { let debugElement: DebugElement; const text = 'HELLO'; const func = () => { + /* comment */ }; const item = Object.assign(new OnClickMenuItemModel(), { text, function: func }); From f1686f3de1b7c8f853a5509573fbd5ab61540ea8 Mon Sep 17 00:00:00 2001 From: lotte Date: Mon, 11 Mar 2019 12:40:29 +0100 Subject: [PATCH 10/15] applied feedback --- src/app/+search-page/search-page.module.ts | 9 +++------ .../create-collection-parent-selector.component.ts | 5 +++++ .../create-community-parent-selector.component.ts | 7 +++++++ .../create-item-parent-selector.component.ts | 5 +++++ .../dso-selector-modal-wrapper.component.ts | 4 ++++ .../edit-collection-selector.component.ts | 5 +++++ .../edit-community-selector.component.ts | 5 +++++ .../edit-item-selector/edit-item-selector.component.ts | 5 +++++ 8 files changed, 39 insertions(+), 6 deletions(-) diff --git a/src/app/+search-page/search-page.module.ts b/src/app/+search-page/search-page.module.ts index 4cd0c9428b..505065e44c 100644 --- a/src/app/+search-page/search-page.module.ts +++ b/src/app/+search-page/search-page.module.ts @@ -45,9 +45,6 @@ const effects = [ SearchResultsComponent, SearchSidebarComponent, SearchSettingsComponent, - // ItemSearchResultListElementComponent, - // CollectionSearchResultListElementComponent, - // CommunitySearchResultListElementComponent, ItemSearchResultGridElementComponent, CollectionSearchResultGridElementComponent, CommunitySearchResultGridElementComponent, @@ -68,9 +65,9 @@ const effects = [ SearchConfigurationService ], entryComponents: [ - // ItemSearchResultListElementComponent, - // CollectionSearchResultListElementComponent, - // CommunitySearchResultListElementComponent, + ItemSearchResultListElementComponent, + CollectionSearchResultListElementComponent, + CommunitySearchResultListElementComponent, ItemSearchResultGridElementComponent, CollectionSearchResultGridElementComponent, CommunitySearchResultGridElementComponent, diff --git a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts index 20968456b3..1e129c0dbe 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts @@ -14,6 +14,11 @@ import { SelectorActionType } from '../dso-selector-modal-wrapper.component'; +/** + * Component to wrap a list of existing communities inside a modal + * Used to choose a community from to create a new collection in + */ + @Component({ selector: 'ds-create-collection-parent-selector', templateUrl: '../dso-selector-modal-wrapper.component.html', diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts index b8cc28b9fc..914dc7582f 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts @@ -13,6 +13,13 @@ import { SelectorActionType } from '../dso-selector-modal-wrapper.component'; +/** + * Component to wrap a button - for top communities - + * and a list of parent communities - for sub communities + * inside a modal + * Used to create a new community + */ + @Component({ selector: 'ds-create-community-parent-selector', styleUrls: ['./create-community-parent-selector.component.scss'], diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts index 5dc6e4fe78..dac5888bf7 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts @@ -14,6 +14,11 @@ import { SelectorActionType } from '../dso-selector-modal-wrapper.component'; +/** + * Component to wrap a list of existing collections inside a modal + * Used to choose a collection from to create a new item in + */ + @Component({ selector: 'ds-create-item-parent-selector', // styleUrls: ['./create-item-parent-selector.component.scss'], diff --git a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts index 8414f00830..351a92302c 100644 --- a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts @@ -12,6 +12,10 @@ export enum SelectorActionType { EDIT = 'edit' } +/** + * Abstract base class that represents a wrapper for modal content used to select a DSpace Object + */ + @Injectable() export abstract class DSOSelectorModalWrapperComponent implements OnInit { /** diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts index dab5b8eea3..79660b9589 100644 --- a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts @@ -9,6 +9,11 @@ import { SelectorActionType } from '../dso-selector-modal-wrapper.component'; +/** + * Component to wrap a list of existing collections inside a modal + * Used to choose a collection from to edit + */ + @Component({ selector: 'ds-edit-collection-selector', templateUrl: '../dso-selector-modal-wrapper.component.html', diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts index ce688d17ae..6b9efc1ff4 100644 --- a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts @@ -9,6 +9,11 @@ import { SelectorActionType } from '../dso-selector-modal-wrapper.component'; +/** + * Component to wrap a list of existing communities inside a modal + * Used to choose a community from to edit + */ + @Component({ selector: 'ds-edit-community-selector', templateUrl: '../dso-selector-modal-wrapper.component.html', diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts index e14be10435..9182df8045 100644 --- a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts @@ -15,6 +15,11 @@ import { SelectorActionType } from '../dso-selector-modal-wrapper.component'; +/** + * Component to wrap a list of existing items inside a modal + * Used to choose an item from to edit + */ + @Component({ selector: 'ds-edit-item-selector', templateUrl: '../dso-selector-modal-wrapper.component.html', From 88ae626736d00226413e679a5caf04eaaa16942b Mon Sep 17 00:00:00 2001 From: lotte Date: Wed, 13 Mar 2019 15:51:04 +0100 Subject: [PATCH 11/15] fixed caching --- .../builders/remote-data-build.service.ts | 4 +- .../core/cache/object-cache.service.spec.ts | 6 +- src/app/core/cache/object-cache.service.ts | 14 +-- .../core/cache/server-sync-buffer.effects.ts | 2 +- src/app/core/data/comcol-data.service.spec.ts | 4 +- src/app/core/data/comcol-data.service.ts | 2 +- src/app/core/data/data.service.ts | 2 +- src/app/core/data/request.service.spec.ts | 106 +++++------------ src/app/core/data/request.service.ts | 111 +++++++----------- 9 files changed, 91 insertions(+), 160 deletions(-) diff --git a/src/app/core/cache/builders/remote-data-build.service.ts b/src/app/core/cache/builders/remote-data-build.service.ts index a59039c226..8d40741dc0 100644 --- a/src/app/core/cache/builders/remote-data-build.service.ts +++ b/src/app/core/cache/builders/remote-data-build.service.ts @@ -56,13 +56,13 @@ export class RemoteDataBuildService { const payload$ = observableCombineLatest( href$.pipe( - switchMap((href: string) => this.objectCache.getBySelfLink(href)), + switchMap((href: string) => this.objectCache.getObjectBySelfLink(href)), startWith(undefined)), requestEntry$.pipe( getResourceLinksFromResponse(), switchMap((resourceSelfLinks: string[]) => { if (isNotEmpty(resourceSelfLinks)) { - return this.objectCache.getBySelfLink(resourceSelfLinks[0]); + return this.objectCache.getObjectBySelfLink(resourceSelfLinks[0]); } else { return observableOf(undefined); } diff --git a/src/app/core/cache/object-cache.service.spec.ts b/src/app/core/cache/object-cache.service.spec.ts index af353a38c1..eae7c06be7 100644 --- a/src/app/core/cache/object-cache.service.spec.ts +++ b/src/app/core/cache/object-cache.service.spec.ts @@ -80,7 +80,7 @@ describe('ObjectCacheService', () => { }); // due to the implementation of spyOn above, this subscribe will be synchronous - service.getBySelfLink(selfLink).pipe(first()).subscribe((o) => { + service.getObjectBySelfLink(selfLink).pipe(first()).subscribe((o) => { expect(o.self).toBe(selfLink); // this only works if testObj is an instance of TestClass expect(o instanceof NormalizedItem).toBeTruthy(); @@ -96,7 +96,7 @@ describe('ObjectCacheService', () => { }); let getObsHasFired = false; - const subscription = service.getBySelfLink(selfLink).subscribe((o) => getObsHasFired = true); + const subscription = service.getObjectBySelfLink(selfLink).subscribe((o) => getObsHasFired = true); expect(getObsHasFired).toBe(false); subscription.unsubscribe(); }); @@ -106,7 +106,7 @@ describe('ObjectCacheService', () => { it('should return an observable of the array of cached objects with the specified self link and type', () => { const item = new NormalizedItem(); item.self = selfLink; - spyOn(service, 'getBySelfLink').and.returnValue(observableOf(item)); + spyOn(service, 'getObjectBySelfLink').and.returnValue(observableOf(item)); service.getList([selfLink, selfLink]).pipe(first()).subscribe((arr) => { expect(arr[0].self).toBe(selfLink); diff --git a/src/app/core/cache/object-cache.service.ts b/src/app/core/cache/object-cache.service.ts index d4d52b404f..384df23c22 100644 --- a/src/app/core/cache/object-cache.service.ts +++ b/src/app/core/cache/object-cache.service.ts @@ -78,16 +78,16 @@ export class ObjectCacheService { * @return Observable * An observable of the requested object */ - getByUUID(uuid: string): Observable> { + getObjectByUUID(uuid: string): Observable> { return this.store.pipe( select(selfLinkFromUuidSelector(uuid)), - mergeMap((selfLink: string) => this.getBySelfLink(selfLink) + mergeMap((selfLink: string) => this.getObjectBySelfLink(selfLink) ) ) } - getBySelfLink(selfLink: string): Observable> { - return this.getEntry(selfLink).pipe( + getObjectBySelfLink(selfLink: string): Observable> { + return this.getBySelfLink(selfLink).pipe( map((entry: ObjectCacheEntry) => { if (isNotEmpty(entry.patches)) { const flatPatch: Operation[] = [].concat(...entry.patches.map((patch) => patch.operations)); @@ -105,7 +105,7 @@ export class ObjectCacheService { ); } - private getEntry(selfLink: string): Observable { + getBySelfLink(selfLink: string): Observable { return this.store.pipe( select(entryFromSelfLinkSelector(selfLink)), filter((entry) => this.isValid(entry)), @@ -114,7 +114,7 @@ export class ObjectCacheService { } getRequestUUIDBySelfLink(selfLink: string): Observable { - return this.getEntry(selfLink).pipe( + return this.getBySelfLink(selfLink).pipe( map((entry: ObjectCacheEntry) => entry.requestUUID), distinctUntilChanged()); } @@ -147,7 +147,7 @@ export class ObjectCacheService { */ getList(selfLinks: string[]): Observable>> { return observableCombineLatest( - selfLinks.map((selfLink: string) => this.getBySelfLink(selfLink)) + selfLinks.map((selfLink: string) => this.getObjectBySelfLink(selfLink)) ); } diff --git a/src/app/core/cache/server-sync-buffer.effects.ts b/src/app/core/cache/server-sync-buffer.effects.ts index 0d7392e555..2e11f15540 100644 --- a/src/app/core/cache/server-sync-buffer.effects.ts +++ b/src/app/core/cache/server-sync-buffer.effects.ts @@ -95,7 +95,7 @@ export class ServerSyncBufferEffects { * @returns {Observable} ApplyPatchObjectCacheAction to be dispatched */ private applyPatch(href: string): Observable { - const patchObject = this.objectCache.getBySelfLink(href).pipe(take(1)); + const patchObject = this.objectCache.getObjectBySelfLink(href).pipe(take(1)); return patchObject.pipe( map((object) => { diff --git a/src/app/core/data/comcol-data.service.spec.ts b/src/app/core/data/comcol-data.service.spec.ts index 784075c855..d93600a06a 100644 --- a/src/app/core/data/comcol-data.service.spec.ts +++ b/src/app/core/data/comcol-data.service.spec.ts @@ -94,7 +94,7 @@ describe('ComColDataService', () => { function initMockObjectCacheService(): ObjectCacheService { return jasmine.createSpyObj('objectCache', { - getByUUID: cold('d-', { + getObjectByUUID: cold('d-', { d: { _links: { [LINK_NAME]: scopedEndpoint @@ -159,7 +159,7 @@ describe('ComColDataService', () => { it('should fetch the scope Community from the cache', () => { scheduler.schedule(() => service.getBrowseEndpoint(options).subscribe()); scheduler.flush(); - expect(objectCache.getByUUID).toHaveBeenCalledWith(scopeID); + expect(objectCache.getObjectByUUID).toHaveBeenCalledWith(scopeID); }); it('should return the endpoint to fetch resources within the given scope', () => { diff --git a/src/app/core/data/comcol-data.service.ts b/src/app/core/data/comcol-data.service.ts index 693b8af58b..9d82cc5047 100644 --- a/src/app/core/data/comcol-data.service.ts +++ b/src/app/core/data/comcol-data.service.ts @@ -49,7 +49,7 @@ export abstract class ComColDataService extends DataS ); const successResponses = responses.pipe( filter((response) => response.isSuccessful), - mergeMap(() => this.objectCache.getByUUID(options.scopeID)), + mergeMap(() => this.objectCache.getObjectByUUID(options.scopeID)), map((nc: NormalizedCommunity) => nc._links[linkPath]), filter((href) => isNotEmpty(href)) ); diff --git a/src/app/core/data/data.service.ts b/src/app/core/data/data.service.ts index 42115b6b6c..72af52c4c8 100644 --- a/src/app/core/data/data.service.ts +++ b/src/app/core/data/data.service.ts @@ -139,7 +139,7 @@ export abstract class DataService { * @param {DSpaceObject} object The given object */ update(object: T): Observable> { - const oldVersion$ = this.objectCache.getBySelfLink(object.self); + const oldVersion$ = this.objectCache.getObjectBySelfLink(object.self); return oldVersion$.pipe(take(1), mergeMap((oldVersion: T) => { const operations = this.comparator.diff(oldVersion, object); if (isNotEmpty(operations)) { diff --git a/src/app/core/data/request.service.spec.ts b/src/app/core/data/request.service.spec.ts index b28436f3a8..69d64cf470 100644 --- a/src/app/core/data/request.service.spec.ts +++ b/src/app/core/data/request.service.spec.ts @@ -24,7 +24,7 @@ import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject'; import { MockStore } from '../../shared/testing/mock-store'; import { IndexState } from '../index/index.reducer'; -describe('RequestService', () => { +fdescribe('RequestService', () => { let scheduler: TestScheduler; let service: RequestService; let serviceAsAny: any; @@ -323,6 +323,7 @@ describe('RequestService', () => { describe('in the ObjectCache', () => { beforeEach(() => { (objectCache.hasBySelfLink as any).and.returnValue(true); + spyOn(serviceAsAny, 'hasByHref').and.returnValue(false); }); it('should return true', () => { @@ -332,63 +333,16 @@ describe('RequestService', () => { expect(result).toEqual(expected); }); }); - describe('in the responseCache', () => { + describe('in the request cache', () => { beforeEach(() => { - spyOn(serviceAsAny, 'isReusable').and.returnValue(observableOf(true)); - spyOn(serviceAsAny, 'getByHref').and.returnValue(observableOf(undefined)); + (objectCache.hasBySelfLink as any).and.returnValue(false); + spyOn(serviceAsAny, 'hasByHref').and.returnValue(true); }); + it('should return true', () => { + const result = serviceAsAny.isCachedOrPending(testGetRequest); + const expected = true; - describe('and it\'s a DSOSuccessResponse', () => { - beforeEach(() => { - (serviceAsAny.getByHref as any).and.returnValue(observableOf({ - response: { - isSuccessful: true, - resourceSelfLinks: [ - 'https://rest.api/endpoint/selfLink1', - 'https://rest.api/endpoint/selfLink2' - ] - } - } - )); - }); - - it('should return true if all top level links in the response are cached in the object cache', () => { - (objectCache.hasBySelfLink as any).and.returnValues(false, true, true); - - const result = serviceAsAny.isCachedOrPending(testGetRequest); - const expected = true; - - expect(result).toEqual(expected); - }); - it('should return false if not all top level links in the response are cached in the object cache', () => { - (objectCache.hasBySelfLink as any).and.returnValues(false, true, false); - spyOn(service, 'isPending').and.returnValue(false); - - const result = serviceAsAny.isCachedOrPending(testGetRequest); - const expected = false; - - expect(result).toEqual(expected); - }); - }); - - describe('and it isn\'t a DSOSuccessResponse', () => { - beforeEach(() => { - (objectCache.hasBySelfLink as any).and.returnValue(false); - (service as any).isReusable.and.returnValue(observableOf(true)); - (serviceAsAny.getByHref as any).and.returnValue(observableOf({ - response: { - isSuccessful: true - } - } - )); - }); - - it('should return true', () => { - const result = serviceAsAny.isCachedOrPending(testGetRequest); - const expected = true; - - expect(result).toEqual(expected); - }); + expect(result).toEqual(expected); }); }); }); @@ -462,56 +416,56 @@ describe('RequestService', () => { }); }); - describe('isReusable', () => { - describe('when the given UUID is has no value', () => { - let reusable; + describe('isValid', () => { + describe('when the given UUID has no value', () => { + let valid; beforeEach(() => { const uuid = undefined; - reusable = serviceAsAny.isReusable(uuid); + valid = serviceAsAny.isValid(uuid); }); it('return an observable emitting false', () => { - reusable.subscribe((isReusable) => expect(isReusable).toBe(false)); + valid.subscribe((isValid) => expect(isValid).toBe(false)); }) }); describe('when the given UUID has a value, but no cached entry is found', () => { - let reusable; + let valid; beforeEach(() => { spyOn(service, 'getByUUID').and.returnValue(observableOf(undefined)); const uuid = 'a45bb291-1adb-40d9-b2fc-7ad9080607be'; - reusable = serviceAsAny.isReusable(uuid); + valid = serviceAsAny.isValid(uuid); }); it('return an observable emitting false', () => { - reusable.subscribe((isReusable) => expect(isReusable).toBe(false)); + valid.subscribe((isValid) => expect(isValid).toBe(false)); }) }); describe('when the given UUID has a value, a cached entry is found, but it has no response', () => { - let reusable; + let valid; beforeEach(() => { spyOn(service, 'getByUUID').and.returnValue(observableOf({ response: undefined })); const uuid = '53c9b814-ad8b-4567-9bc1-d9bb6cfba6c8'; - reusable = serviceAsAny.isReusable(uuid); + valid = serviceAsAny.isValid(uuid); }); it('return an observable emitting false', () => { - reusable.subscribe((isReusable) => expect(isReusable).toBe(false)); + valid.subscribe((isValid) => expect(isValid).toBe(false)); }) }); describe('when the given UUID has a value, a cached entry is found, but its response was not successful', () => { - let reusable; + let valid; beforeEach(() => { spyOn(service, 'getByUUID').and.returnValue(observableOf({ response: { isSuccessful: false } })); const uuid = '694c9b32-7b2e-4788-835b-ef3fc2252e6c'; - reusable = serviceAsAny.isReusable(uuid); + valid = serviceAsAny.isValid(uuid); }); it('return an observable emitting false', () => { - reusable.subscribe((isReusable) => expect(isReusable).toBe(false)); + valid.subscribe((isValid) => expect(isValid).toBe(false)); }) }); - describe('when the given UUID has a value, a cached entry is found, its response was successful, but the response is outdated', () => { - let reusable; + fdescribe('when the given UUID has a value, a cached entry is found, its response was successful, but the response is outdated', () => { + let valid; const now = 100000; const timeAdded = 99899; const msToLive = 100; @@ -528,16 +482,16 @@ describe('RequestService', () => { } })); const uuid = 'f9b85788-881c-4994-86b6-bae8dad024d2'; - reusable = serviceAsAny.isReusable(uuid); + valid = serviceAsAny.isValid(uuid); }); it('return an observable emitting false', () => { - reusable.subscribe((isReusable) => expect(isReusable).toBe(false)); + valid.subscribe((isValid) => expect(isValid).toBe(false)); }) }); describe('when the given UUID has a value, a cached entry is found, its response was successful, and the response is not outdated', () => { - let reusable; + let valid; const now = 100000; const timeAdded = 99999; const msToLive = 100; @@ -554,11 +508,11 @@ describe('RequestService', () => { } })); const uuid = 'f9b85788-881c-4994-86b6-bae8dad024d2'; - reusable = serviceAsAny.isReusable(uuid); + valid = serviceAsAny.isValid(uuid); }); it('return an observable emitting true', () => { - reusable.subscribe((isReusable) => expect(isReusable).toBe(true)); + valid.subscribe((isValid) => expect(isValid).toBe(true)); }) }) }) diff --git a/src/app/core/data/request.service.ts b/src/app/core/data/request.service.ts index 93a7a10506..4fd7b84196 100644 --- a/src/app/core/data/request.service.ts +++ b/src/app/core/data/request.service.ts @@ -1,36 +1,25 @@ -import { merge as observableMerge, Observable, of as observableOf } from 'rxjs'; -import { - distinctUntilChanged, - filter, - find, - first, - map, - mergeMap, - reduce, - startWith, - switchMap, - take, - tap -} from 'rxjs/operators'; -import { race as observableRace } from 'rxjs'; +import { Observable, race as observableRace } from 'rxjs'; +import { filter, mergeMap, take } from 'rxjs/operators'; import { Injectable } from '@angular/core'; import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store'; -import { hasNoValue, hasValue, isNotEmpty, isNotUndefined } from '../../shared/empty.util'; +import { hasValue, isNotEmpty } from '../../shared/empty.util'; import { CacheableObject } from '../cache/object-cache.reducer'; import { ObjectCacheService } from '../cache/object-cache.service'; -import { DSOSuccessResponse, RestResponse } from '../cache/response.models'; import { coreSelector, CoreState } from '../core.reducers'; import { IndexName, IndexState } from '../index/index.reducer'; import { pathSelector } from '../shared/selectors'; import { UUIDService } from '../shared/uuid.service'; -import { RequestConfigureAction, RequestExecuteAction, RequestRemoveAction } from './request.actions'; -import { GetRequest, RestRequest } from './request.models'; +import { + RequestConfigureAction, + RequestExecuteAction, + RequestRemoveAction +} from './request.actions'; +import { EndpointMapRequest, GetRequest, RestRequest } from './request.models'; import { RequestEntry } from './request.reducer'; import { CommitSSBAction } from '../cache/server-sync-buffer.actions'; import { RestRequestMethod } from './rest-request-method'; -import { getResponseFromEntry } from '../shared/operators'; import { AddToIndexAction, RemoveFromIndexBySubstringAction } from '../index/index.actions'; @Injectable() @@ -104,7 +93,6 @@ export class RequestService { .subscribe((re: RequestEntry) => { isPending = (hasValue(re) && !re.completed) }); - return isPending; } @@ -183,31 +171,11 @@ export class RequestService { * @param {GetRequest} request The request to check * @returns {boolean} True if the request is cached or still pending */ - private isCachedOrPending(request: GetRequest) { - let isCached = this.objectCache.hasBySelfLink(request.href); - if (isCached) { - const responses: Observable = this.isReusable(request.uuid).pipe( - filter((reusable: boolean) => reusable), - switchMap(() => { - return this.getByHref(request.href).pipe( - getResponseFromEntry(), - take(1) - ); - } - )); + private isCachedOrPending(request: GetRequest): boolean { + const inReqCache = this.hasByHref(request.href); + const inObjCache = this.objectCache.hasBySelfLink(request.href); + const isCached = inReqCache || inObjCache; - const errorResponses = responses.pipe(filter((response) => !response.isSuccessful), map(() => true)); // TODO add a configurable number of retries in case of an error. - const dsoSuccessResponses = responses.pipe( - filter((response) => response.isSuccessful && hasValue((response as DSOSuccessResponse).resourceSelfLinks)), - map((response: DSOSuccessResponse) => response.resourceSelfLinks), - map((resourceSelfLinks: string[]) => resourceSelfLinks - .every((selfLink) => this.objectCache.hasBySelfLink(selfLink)) - )); - - const otherSuccessResponses = responses.pipe(filter((response) => response.isSuccessful && !hasValue((response as DSOSuccessResponse).resourceSelfLinks)), map(() => true)); - - observableMerge(errorResponses, otherSuccessResponses, dsoSuccessResponses).subscribe((c) => isCached = c); - } const isPending = this.isPending(request); return isCached || isPending; } @@ -230,7 +198,7 @@ export class RequestService { */ private trackRequestsOnTheirWayToTheStore(request: GetRequest) { this.requestsOnTheirWayToTheStore = [...this.requestsOnTheirWayToTheStore, request.href]; - this.store.pipe(select(this.entryFromUUIDSelector(request.href)), + this.getByHref(request.href).pipe( filter((re: RequestEntry) => hasValue(re)), take(1) ).subscribe((re: RequestEntry) => { @@ -247,31 +215,40 @@ export class RequestService { } /** - * Check whether a Response should still be cached + * Check whether a cached response should still be valid * - * @param uuid - * the uuid of the entry to check + * @param entry + * the entry to check * @return boolean - * false if the uuid has no value, no entry could be found, the response was nog successful or its time to - * live has exceeded, true otherwise + * false if the uuid has no value, the response was not successful or its time to + * live was exceeded, true otherwise */ - private isReusable(uuid: string): Observable { - if (hasNoValue(uuid)) { - return observableOf(false); + private isValid(entry: RequestEntry): boolean { + if (hasValue(entry) && entry.completed && entry.response.isSuccessful) { + const timeOutdated = entry.response.timeAdded + entry.request.responseMsToLive; + const isOutDated = new Date().getTime() > timeOutdated; + return !isOutDated; } else { - const requestEntry$ = this.getByUUID(uuid); - return requestEntry$.pipe( - filter((entry: RequestEntry) => hasValue(entry) && hasValue(entry.response)), - map((entry: RequestEntry) => { - if (hasValue(entry) && entry.response.isSuccessful) { - const timeOutdated = entry.response.timeAdded + entry.request.responseMsToLive; - const isOutDated = new Date().getTime() > timeOutdated; - return !isOutDated; - } else { - return false; - } - }) - ); + return false; } } + + /** + * Check whether the request with the specified href is cached + * + * @param href + * The link of the request to check + * @return boolean + * true if the request with the specified href is cached, + * false otherwise + */ + hasByHref(href: string): boolean { + let result = false; + this.getByHref(href).pipe( + take(1) + ).subscribe((requestEntry: RequestEntry) => result = this.isValid(requestEntry)); + + return result; + } + } From 4c150988e26ce985378c32b55f785a8812da5f25 Mon Sep 17 00:00:00 2001 From: lotte Date: Wed, 13 Mar 2019 16:28:46 +0100 Subject: [PATCH 12/15] fixed tests after changes to request caching --- .../cache/server-sync-buffer.effects.spec.ts | 2 +- src/app/core/data/data.service.spec.ts | 4 +- src/app/core/data/request.service.spec.ts | 95 +++++++++---------- 3 files changed, 46 insertions(+), 55 deletions(-) diff --git a/src/app/core/cache/server-sync-buffer.effects.spec.ts b/src/app/core/cache/server-sync-buffer.effects.spec.ts index 0a8d50107e..87d8804e9c 100644 --- a/src/app/core/cache/server-sync-buffer.effects.spec.ts +++ b/src/app/core/cache/server-sync-buffer.effects.spec.ts @@ -47,7 +47,7 @@ describe('ServerSyncBufferEffects', () => { { provide: RequestService, useValue: getMockRequestService() }, { provide: ObjectCacheService, useValue: { - getBySelfLink: (link) => { + getObjectBySelfLink: (link) => { const object = new DSpaceObject(); object.self = link; return observableOf(object); diff --git a/src/app/core/data/data.service.spec.ts b/src/app/core/data/data.service.spec.ts index 178a16d4c1..51474f6740 100644 --- a/src/app/core/data/data.service.spec.ts +++ b/src/app/core/data/data.service.spec.ts @@ -67,7 +67,7 @@ describe('DataService', () => { addPatch: () => { /* empty */ }, - getBySelfLink: () => { + getObjectBySelfLink: () => { /* empty */ } } as any; @@ -189,7 +189,7 @@ describe('DataService', () => { dso2.metadata = [{ key: 'dc.title', value: name2 }]; spyOn(service, 'findById').and.returnValues(observableOf(dso)); - spyOn(objectCache, 'getBySelfLink').and.returnValues(observableOf(dso)); + spyOn(objectCache, 'getObjectBySelfLink').and.returnValues(observableOf(dso)); spyOn(objectCache, 'addPatch'); }); diff --git a/src/app/core/data/request.service.spec.ts b/src/app/core/data/request.service.spec.ts index 69d64cf470..1ff55f9871 100644 --- a/src/app/core/data/request.service.spec.ts +++ b/src/app/core/data/request.service.spec.ts @@ -24,7 +24,7 @@ import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject'; import { MockStore } from '../../shared/testing/mock-store'; import { IndexState } from '../index/index.reducer'; -fdescribe('RequestService', () => { +describe('RequestService', () => { let scheduler: TestScheduler; let service: RequestService; let serviceAsAny: any; @@ -42,6 +42,7 @@ fdescribe('RequestService', () => { const testHeadRequest = new HeadRequest(testUUID, testHref); const testPatchRequest = new PatchRequest(testUUID, testHref); let selectSpy; + beforeEach(() => { scheduler = getTestScheduler(); @@ -417,76 +418,65 @@ fdescribe('RequestService', () => { }); describe('isValid', () => { - describe('when the given UUID has no value', () => { + describe('when the given entry has no value', () => { let valid; beforeEach(() => { - const uuid = undefined; - valid = serviceAsAny.isValid(uuid); + const entry = undefined; + valid = serviceAsAny.isValid(entry); }); it('return an observable emitting false', () => { - valid.subscribe((isValid) => expect(isValid).toBe(false)); + expect(valid).toBe(false); }) }); - describe('when the given UUID has a value, but no cached entry is found', () => { + describe('when the given entry has a value, but the request is not completed', () => { let valid; + const requestEntry = { completed: false } ; beforeEach(() => { - spyOn(service, 'getByUUID').and.returnValue(observableOf(undefined)); - const uuid = 'a45bb291-1adb-40d9-b2fc-7ad9080607be'; - valid = serviceAsAny.isValid(uuid); + spyOn(service, 'getByUUID').and.returnValue(observableOf(requestEntry)); + valid = serviceAsAny.isValid(requestEntry); }); it('return an observable emitting false', () => { - valid.subscribe((isValid) => expect(isValid).toBe(false)); + expect(valid).toBe(false); }) }); - describe('when the given UUID has a value, a cached entry is found, but it has no response', () => { + describe('when the given entry has a value, but the response is not successful', () => { let valid; + const requestEntry = { completed: true, response: { isSuccessful: false } }; beforeEach(() => { - spyOn(service, 'getByUUID').and.returnValue(observableOf({ response: undefined })); - const uuid = '53c9b814-ad8b-4567-9bc1-d9bb6cfba6c8'; - valid = serviceAsAny.isValid(uuid); + spyOn(service, 'getByUUID').and.returnValue(observableOf(requestEntry)); + valid = serviceAsAny.isValid(requestEntry); }); it('return an observable emitting false', () => { - valid.subscribe((isValid) => expect(isValid).toBe(false)); + expect(valid).toBe(false); }) }); - describe('when the given UUID has a value, a cached entry is found, but its response was not successful', () => { - let valid; - beforeEach(() => { - spyOn(service, 'getByUUID').and.returnValue(observableOf({ response: { isSuccessful: false } })); - const uuid = '694c9b32-7b2e-4788-835b-ef3fc2252e6c'; - valid = serviceAsAny.isValid(uuid); - }); - it('return an observable emitting false', () => { - valid.subscribe((isValid) => expect(isValid).toBe(false)); - }) - }); - - fdescribe('when the given UUID has a value, a cached entry is found, its response was successful, but the response is outdated', () => { + describe('when the given UUID has a value, its response was successful, but the response is outdated', () => { let valid; const now = 100000; const timeAdded = 99899; const msToLive = 100; + const requestEntry = { + completed: true, + response: { + isSuccessful: true, + timeAdded: timeAdded + }, + request: { + responseMsToLive: msToLive, + } + }; beforeEach(() => { spyOn(Date.prototype, 'getTime').and.returnValue(now); - spyOn(service, 'getByUUID').and.returnValue(observableOf({ - response: { - isSuccessful: true, - timeAdded: timeAdded - }, - request: { - responseMsToLive: msToLive - } - })); - const uuid = 'f9b85788-881c-4994-86b6-bae8dad024d2'; - valid = serviceAsAny.isValid(uuid); + spyOn(service, 'getByUUID').and.returnValue(observableOf(requestEntry)); + valid = serviceAsAny.isValid(requestEntry); }); it('return an observable emitting false', () => { - valid.subscribe((isValid) => expect(isValid).toBe(false)); + expect(valid).toBe(false); }) }); @@ -496,23 +486,24 @@ fdescribe('RequestService', () => { const timeAdded = 99999; const msToLive = 100; + const requestEntry = { + completed: true, + response: { + isSuccessful: true, + timeAdded: timeAdded + }, + request: { + responseMsToLive: msToLive + } + }; beforeEach(() => { spyOn(Date.prototype, 'getTime').and.returnValue(now); - spyOn(service, 'getByUUID').and.returnValue(observableOf({ - response: { - isSuccessful: true, - timeAdded: timeAdded - }, - request: { - responseMsToLive: msToLive - } - })); - const uuid = 'f9b85788-881c-4994-86b6-bae8dad024d2'; - valid = serviceAsAny.isValid(uuid); + spyOn(service, 'getByUUID').and.returnValue(observableOf(requestEntry)); + valid = serviceAsAny.isValid(requestEntry); }); it('return an observable emitting true', () => { - valid.subscribe((isValid) => expect(isValid).toBe(true)); + expect(valid).toBe(true); }) }) }) From 917c00f8fbca40b97840e35fbc42e0c5609ef16a Mon Sep 17 00:00:00 2001 From: lotte Date: Thu, 14 Mar 2019 11:14:59 +0100 Subject: [PATCH 13/15] added missing tests and docs --- src/app/core/cache/object-cache.service.ts | 44 ++++++++++++++++----- src/app/core/data/request.models.ts | 2 +- src/app/core/data/request.service.spec.ts | 46 ++++++++++++++++++---- src/app/core/data/request.service.ts | 10 ++++- 4 files changed, 83 insertions(+), 19 deletions(-) diff --git a/src/app/core/cache/object-cache.service.ts b/src/app/core/cache/object-cache.service.ts index 384df23c22..b4c37df736 100644 --- a/src/app/core/cache/object-cache.service.ts +++ b/src/app/core/cache/object-cache.service.ts @@ -65,18 +65,10 @@ export class ObjectCacheService { /** * Get an observable of the object with the specified UUID * - * The type needs to be specified as well, in order to turn - * the cached plain javascript object in to an instance of - * a class. - * - * e.g. getByUUID('c96588c6-72d3-425d-9d47-fa896255a695', Item) - * * @param uuid * The UUID of the object to get - * @param type - * The type of the object to get - * @return Observable - * An observable of the requested object + * @return Observable> + * An observable of the requested object in normalized form */ getObjectByUUID(uuid: string): Observable> { return this.store.pipe( @@ -86,6 +78,14 @@ export class ObjectCacheService { ) } + /** + * Get an observable of the object with the specified selfLink + * + * @param selfLink + * The selfLink of the object to get + * @return Observable> + * An observable of the requested object in normalized form + */ getObjectBySelfLink(selfLink: string): Observable> { return this.getBySelfLink(selfLink).pipe( map((entry: ObjectCacheEntry) => { @@ -105,6 +105,14 @@ export class ObjectCacheService { ); } + /** + * Get an observable of the object cache entry with the specified selfLink + * + * @param selfLink + * The selfLink of the object to get + * @return Observable + * An observable of the requested object cache entry + */ getBySelfLink(selfLink: string): Observable { return this.store.pipe( select(entryFromSelfLinkSelector(selfLink)), @@ -113,12 +121,28 @@ export class ObjectCacheService { ); } + /** + * Get an observable of the request's uuid with the specified selfLink + * + * @param selfLink + * The selfLink of the object to get + * @return Observable + * An observable of the request's uuid + */ getRequestUUIDBySelfLink(selfLink: string): Observable { return this.getBySelfLink(selfLink).pipe( map((entry: ObjectCacheEntry) => entry.requestUUID), distinctUntilChanged()); } + /** + * Get an observable of the request's uuid with the specified uuid + * + * @param uuid + * The uuid of the object to get + * @return Observable + * An observable of the request's uuid + */ getRequestUUIDByObjectUUID(uuid: string): Observable { return this.store.pipe( select(selfLinkFromUuidSelector(uuid)), diff --git a/src/app/core/data/request.models.ts b/src/app/core/data/request.models.ts index 951dbacff6..11ead7b53c 100644 --- a/src/app/core/data/request.models.ts +++ b/src/app/core/data/request.models.ts @@ -39,7 +39,7 @@ export abstract class RestRequest { } export class GetRequest extends RestRequest { - public responseMsToLive = 60 * 15 * 1000; + public responseMsToLive = 10000; constructor( public uuid: string, diff --git a/src/app/core/data/request.service.spec.ts b/src/app/core/data/request.service.spec.ts index 1ff55f9871..b3d9436d30 100644 --- a/src/app/core/data/request.service.spec.ts +++ b/src/app/core/data/request.service.spec.ts @@ -1,5 +1,5 @@ import { cold, getTestScheduler, hot } from 'jasmine-marbles'; -import { of as observableOf } from 'rxjs'; +import { of as observableOf, EMPTY } from 'rxjs'; import { getMockObjectCacheService } from '../../shared/mocks/mock-object-cache.service'; import { defaultUUID, getMockUUIDService } from '../../shared/mocks/mock-uuid.service'; import { ObjectCacheService } from '../cache/object-cache.service'; @@ -7,6 +7,7 @@ import { CoreState } from '../core.reducers'; import { UUIDService } from '../shared/uuid.service'; import { RequestConfigureAction, RequestExecuteAction } from './request.actions'; import * as ngrx from '@ngrx/store'; +import { ActionsSubject, Store } from '@ngrx/store'; import { DeleteRequest, GetRequest, @@ -18,11 +19,8 @@ import { RestRequest } from './request.models'; import { RequestService } from './request.service'; -import { ActionsSubject, Store } from '@ngrx/store'; import { TestScheduler } from 'rxjs/testing'; import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject'; -import { MockStore } from '../../shared/testing/mock-store'; -import { IndexState } from '../index/index.reducer'; describe('RequestService', () => { let scheduler: TestScheduler; @@ -431,7 +429,7 @@ describe('RequestService', () => { describe('when the given entry has a value, but the request is not completed', () => { let valid; - const requestEntry = { completed: false } ; + const requestEntry = { completed: false }; beforeEach(() => { spyOn(service, 'getByUUID').and.returnValue(observableOf(requestEntry)); valid = serviceAsAny.isValid(requestEntry); @@ -503,8 +501,42 @@ describe('RequestService', () => { }); it('return an observable emitting true', () => { - expect(valid).toBe(true); + expect(valid).toBe(true); }) }) - }) + }); + + describe('hasByHref', () => { + describe('when nothing is returned by getByHref', () => { + beforeEach(() => { + spyOn(service, 'getByHref').and.returnValue(EMPTY); + }); + it('hasByHref should return false', () => { + const result = service.hasByHref(''); + expect(result).toBe(false); + }); + }); + + describe('when isValid returns false', () => { + beforeEach(() => { + spyOn(service, 'getByHref').and.returnValue(observableOf(undefined)); + spyOn(service as any, 'isValid').and.returnValue(false); + }); + it('hasByHref should return false', () => { + const result = service.hasByHref(''); + expect(result).toBe(false); + }); + }); + + describe('when isValid returns true', () => { + beforeEach(() => { + spyOn(service, 'getByHref').and.returnValue(observableOf(undefined)); + spyOn(service as any, 'isValid').and.returnValue(true); + }); + it('hasByHref should return true', () => { + const result = service.hasByHref(''); + expect(result).toBe(true); + }); + }); + }); }); diff --git a/src/app/core/data/request.service.ts b/src/app/core/data/request.service.ts index 4fd7b84196..f129f8becd 100644 --- a/src/app/core/data/request.service.ts +++ b/src/app/core/data/request.service.ts @@ -80,6 +80,9 @@ export class RequestService { return `client/${this.uuidService.generate()}`; } + /** + * Check if a request is currently pending + */ isPending(request: GetRequest): boolean { // first check requests that haven't made it to the store yet if (this.requestsOnTheirWayToTheStore.includes(request.href)) { @@ -96,6 +99,9 @@ export class RequestService { return isPending; } + /** + * Retrieve a RequestEntry based on their uuid + */ getByUUID(uuid: string): Observable { return observableRace( this.store.pipe(select(this.entryFromUUIDSelector(uuid))), @@ -108,6 +114,9 @@ export class RequestService { ); } + /** + * Retrieve a RequestEntry based on their href + */ getByHref(href: string): Observable { return this.store.pipe( select(this.uuidFromHrefSelector(href)), @@ -247,7 +256,6 @@ export class RequestService { this.getByHref(href).pipe( take(1) ).subscribe((requestEntry: RequestEntry) => result = this.isValid(requestEntry)); - return result; } From f160196cf3ae8c7b8095310d17bafa793e15abf1 Mon Sep 17 00:00:00 2001 From: lotte Date: Thu, 14 Mar 2019 11:35:00 +0100 Subject: [PATCH 14/15] reinstated responseMsToLive for get requests --- src/app/core/data/request.models.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/core/data/request.models.ts b/src/app/core/data/request.models.ts index 11ead7b53c..951dbacff6 100644 --- a/src/app/core/data/request.models.ts +++ b/src/app/core/data/request.models.ts @@ -39,7 +39,7 @@ export abstract class RestRequest { } export class GetRequest extends RestRequest { - public responseMsToLive = 10000; + public responseMsToLive = 60 * 15 * 1000; constructor( public uuid: string, From 6d64326238745cd43677d445934daf3d8424ba8d Mon Sep 17 00:00:00 2001 From: lotte Date: Tue, 19 Mar 2019 16:22:16 +0100 Subject: [PATCH 15/15] Added debounce, fixed error handling for search results, fixed bug in paginated lists --- .../+search-page/search-service/search.service.ts | 4 ++-- src/app/core/data/paginated-list.ts | 5 ++++- .../dso-selector/dso-selector.component.spec.ts | 14 +++++++++++--- .../dso-selector/dso-selector.component.ts | 9 +++++++-- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/app/+search-page/search-service/search.service.ts b/src/app/+search-page/search-service/search.service.ts index 275b0b3340..2c0f1f4e55 100644 --- a/src/app/+search-page/search-service/search.service.ts +++ b/src/app/+search-page/search-service/search.service.ts @@ -23,7 +23,7 @@ import { DSpaceObject } from '../../core/shared/dspace-object.model'; import { GenericConstructor } from '../../core/shared/generic-constructor'; import { HALEndpointService } from '../../core/shared/hal-endpoint.service'; import { - configureRequest, + configureRequest, filterSuccessfulResponses, getResponseFromEntry, getSucceededRemoteData } from '../../core/shared/operators'; @@ -104,7 +104,7 @@ export class SearchService implements OnDestroy { // get search results from response cache const sqrObs: Observable = requestEntryObs.pipe( - getResponseFromEntry(), + filterSuccessfulResponses(), map((response: SearchSuccessResponse) => response.results) ); diff --git a/src/app/core/data/paginated-list.ts b/src/app/core/data/paginated-list.ts index 8efdccd75d..faecd231bc 100644 --- a/src/app/core/data/paginated-list.ts +++ b/src/app/core/data/paginated-list.ts @@ -1,5 +1,5 @@ import { PageInfo } from '../shared/page-info.model'; -import { hasValue } from '../../shared/empty.util'; +import { hasNoValue, hasValue } from '../../shared/empty.util'; export class PaginatedList { @@ -22,6 +22,9 @@ export class PaginatedList { if (hasValue(this.pageInfo) && hasValue(this.pageInfo.totalElements)) { return this.pageInfo.totalElements; } + if (hasNoValue(this.page)) { + return 0; + } return this.page.length; } diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts index 0386276be7..04111a4ea6 100644 --- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts +++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts @@ -1,4 +1,4 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; import { TranslateModule } from '@ngx-translate/core'; import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core'; import { DSOSelectorComponent } from './dso-selector.component'; @@ -21,7 +21,12 @@ describe('DSOSelectorComponent', () => { const type = DSpaceObjectType.ITEM; const searchResult = new ItemSearchResult(); const item = new Item(); - item.metadata = { 'dc.title': [Object.assign(new MetadataValue(), { value: 'Item title', language: undefined })] }; + item.metadata = { + 'dc.title': [Object.assign(new MetadataValue(), { + value: 'Item title', + language: undefined + })] + }; searchResult.dspaceObject = item; searchResult.hitHighlights = {}; const searchService = jasmine.createSpyObj('searchService', { @@ -46,6 +51,7 @@ describe('DSOSelectorComponent', () => { debugElement = fixture.debugElement; component.currentDSOId = currentDSOId; component.type = type; + fixture.detectChanges(); }); @@ -59,7 +65,9 @@ describe('DSOSelectorComponent', () => { dsoType: type, pagination: (component as any).defaultPagination }); + expect(searchService.search).toHaveBeenCalledWith(searchOptions); }); -}); +}) +; diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts index 7bb9bfac28..04501e4923 100644 --- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts +++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts @@ -1,5 +1,4 @@ import { - AfterViewInit, Component, ElementRef, EventEmitter, @@ -12,7 +11,7 @@ import { import { FormControl } from '@angular/forms'; import { Observable } from 'rxjs'; -import { map, startWith, switchMap, take } from 'rxjs/operators'; +import { debounceTime, startWith, switchMap } from 'rxjs/operators'; import { SearchService } from '../../../+search-page/search-service/search.service'; import { PaginatedSearchOptions } from '../../../+search-page/paginated-search-options.model'; import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model'; @@ -68,6 +67,11 @@ export class DSOSelectorComponent implements OnInit { */ @ViewChildren('listEntryElement') listElements: QueryList; + /** + * Time to wait before sending a search request to the server when a user types something + */ + debounceTime = 500; + constructor(private searchService: SearchService) { } @@ -79,6 +83,7 @@ export class DSOSelectorComponent implements OnInit { this.input.setValue(this.currentDSOId); this.listEntries$ = this.input.valueChanges .pipe( + debounceTime(this.debounceTime), startWith(this.currentDSOId), switchMap((query) => { return this.searchService.search(