diff --git a/src/app/+admin/admin-registries/admin-registries.module.ts b/src/app/+admin/admin-registries/admin-registries.module.ts index 18fc44f620..c7890e6697 100644 --- a/src/app/+admin/admin-registries/admin-registries.module.ts +++ b/src/app/+admin/admin-registries/admin-registries.module.ts @@ -8,7 +8,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { BitstreamFormatsComponent } from './bitstream-formats/bitstream-formats.component'; import { SharedModule } from '../../shared/shared.module'; import { MetadataSchemaFormComponent } from './metadata-registry/metadata-schema-form/metadata-schema-form.component'; -import {MetadataFieldFormComponent} from "./metadata-schema/metadata-field-form/metadata-field-form.component"; +import {MetadataFieldFormComponent} from './metadata-schema/metadata-field-form/metadata-field-form.component'; @NgModule({ imports: [ diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.actions.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.actions.ts index 23493c3d21..55fcd61644 100644 --- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.actions.ts +++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.actions.ts @@ -1,7 +1,7 @@ -import {Action} from '@ngrx/store'; -import {type} from "../../../shared/ngrx/type"; -import {MetadataSchema} from "../../../core/metadata/metadataschema.model"; -import {MetadataField} from "../../../core/metadata/metadatafield.model"; +import { Action } from '@ngrx/store'; +import { type } from '../../../shared/ngrx/type'; +import { MetadataSchema } from '../../../core/metadata/metadataschema.model'; +import { MetadataField } from '../../../core/metadata/metadatafield.model'; /** * For each action type in an action group, make a simple @@ -12,16 +12,16 @@ import {MetadataField} from "../../../core/metadata/metadatafield.model"; * action types in the application are unique. */ export const MetadataRegistryActionTypes = { - + EDIT_SCHEMA: type('dspace/metadata-registry/EDIT_SCHEMA'), CANCEL_EDIT_SCHEMA: type('dspace/metadata-registry/CANCEL_SCHEMA'), SELECT_SCHEMA: type('dspace/metadata-registry/SELECT_SCHEMA'), DESELECT_SCHEMA: type('dspace/metadata-registry/DESELECT_SCHEMA'), - EDIT_FIELD : type('dspace/metadata-registry/EDIT_FIELD'), - CANCEL_EDIT_FIELD : type('dspace/metadata-registry/CANCEL_FIELD'), - SELECT_FIELD : type('dspace/metadata-registry/SELECT_FIELD'), - DESELECT_FIELD : type('dspace/metadata-registry/DESELEC_FIELDT') + EDIT_FIELD: type('dspace/metadata-registry/EDIT_FIELD'), + CANCEL_EDIT_FIELD: type('dspace/metadata-registry/CANCEL_FIELD'), + SELECT_FIELD: type('dspace/metadata-registry/SELECT_FIELD'), + DESELECT_FIELD: type('dspace/metadata-registry/DESELEC_FIELDT') }; /* tslint:disable:max-classes-per-file */ diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts index c525fe625a..a1158c4cd7 100644 --- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts +++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts @@ -1,13 +1,11 @@ -import {Component} from '@angular/core'; -import {RegistryService} from '../../../core/registry/registry.service'; -import {Observable} from 'rxjs'; -import {RemoteData} from '../../../core/data/remote-data'; -import {PaginatedList} from '../../../core/data/paginated-list'; -import {MetadataSchema} from '../../../core/metadata/metadataschema.model'; -import {PaginationComponentOptions} from '../../../shared/pagination/pagination-component-options.model'; -import {Store} from "@ngrx/store"; -import {AppState} from "../../../app.reducer"; -import {map} from "rxjs/operators"; +import { Component } from '@angular/core'; +import { RegistryService } from '../../../core/registry/registry.service'; +import { Observable } from 'rxjs'; +import { RemoteData } from '../../../core/data/remote-data'; +import { PaginatedList } from '../../../core/data/paginated-list'; +import { MetadataSchema } from '../../../core/metadata/metadataschema.model'; +import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model'; +import { map } from 'rxjs/operators'; @Component({ selector: 'ds-metadata-registry', @@ -41,7 +39,7 @@ export class MetadataRegistryComponent { isActive(schema: MetadataSchema): Observable { return this.getActiveSchema().pipe( - map(activeSchema => schema === activeSchema) + map((activeSchema) => schema === activeSchema) ); } @@ -57,15 +55,15 @@ export class MetadataRegistryComponent { isSelected(schema: MetadataSchema): Observable { return this.registryService.getSelectedMetadataSchemas().pipe( - map(schemas => schemas.find(selectedSchema => selectedSchema == schema) != null) + map((schemas) => schemas.find((selectedSchema) => selectedSchema === schema) != null) ); } deleteSchemas() { this.registryService.getSelectedMetadataSchemas().subscribe( - schemas => { - console.log("metadata schemas to delete: "); - for (let schema of schemas) { + (schemas) => { + console.log('metadata schemas to delete: '); + for (const schema of schemas) { console.log(schema); } } diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.effects.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.effects.ts index c02d9bcda1..32aa2d27d7 100644 --- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.effects.ts +++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.effects.ts @@ -1,12 +1,12 @@ /** * Makes sure that if the user navigates to another route, the sidebar is collapsed */ -import {Injectable} from "@angular/core"; -import {Actions, Effect, ofType} from "@ngrx/effects"; -import {filter, map, tap} from "rxjs/operators"; -import {SearchSidebarCollapseAction} from "../../../+search-page/search-sidebar/search-sidebar.actions"; +import { Injectable } from '@angular/core'; +import { Actions, Effect, ofType } from '@ngrx/effects'; +import { filter, map, tap } from 'rxjs/operators'; +import { SearchSidebarCollapseAction } from '../../../+search-page/search-sidebar/search-sidebar.actions'; import * as fromRouter from '@ngrx/router-store'; -import {URLBaser} from "../../../core/url-baser/url-baser"; +import { URLBaser } from '../../../core/url-baser/url-baser'; @Injectable() export class SearchSidebarEffects { diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.reducers.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.reducers.ts index 0e728e8499..28f8ba025b 100644 --- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.reducers.ts +++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.reducers.ts @@ -1,4 +1,4 @@ -import {MetadataSchema} from "../../../core/metadata/metadataschema.model"; +import { MetadataSchema } from '../../../core/metadata/metadataschema.model'; import { MetadataRegistryAction, MetadataRegistryActionTypes, @@ -8,8 +8,8 @@ import { MetadataRegistryEditSchemaAction, MetadataRegistrySelectFieldAction, MetadataRegistrySelectSchemaAction -} from "./metadata-registry.actions"; -import {MetadataField} from "../../../core/metadata/metadatafield.model"; +} from './metadata-registry.actions'; +import { MetadataField } from '../../../core/metadata/metadatafield.model'; /** * The auth state. @@ -57,7 +57,7 @@ export function metadataRegistryReducer(state = initialState, action: MetadataRe case MetadataRegistryActionTypes.DESELECT_SCHEMA: { return Object.assign({}, state, { selectedSchemas: state.selectedSchemas.filter( - selectedSchema => selectedSchema != (action as MetadataRegistryDeselectSchemaAction).schema + (selectedSchema) => selectedSchema !== (action as MetadataRegistryDeselectSchemaAction).schema ) }); } @@ -83,7 +83,7 @@ export function metadataRegistryReducer(state = initialState, action: MetadataRe case MetadataRegistryActionTypes.DESELECT_FIELD: { return Object.assign({}, state, { selectedFields: state.selectedFields.filter( - selectedField => selectedField != (action as MetadataRegistryDeselectFieldAction).field + (selectedField) => selectedField !== (action as MetadataRegistryDeselectFieldAction).field ) }); } @@ -91,4 +91,4 @@ export function metadataRegistryReducer(state = initialState, action: MetadataRe default: return state; } -} \ No newline at end of file +} diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts index 54d82170fb..551e249d41 100644 --- a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts +++ b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts @@ -4,23 +4,22 @@ import { DynamicFormGroupModel, DynamicFormLayout, DynamicInputModel -} from "@ng-dynamic-forms/core"; -import {MetadataSchema} from "../../../../core/metadata/metadataschema.model"; -import {RegistryService} from "../../../../core/registry/registry.service"; -import {FormService} from "../../../../shared/form/form.service"; -import {FormBuilderService} from "../../../../shared/form/builder/form-builder.service"; -import {FormGroup} from "@angular/forms"; -import {Store} from "@ngrx/store"; -import {AppState} from "../../../../app.reducer"; +} from '@ng-dynamic-forms/core'; +import { FormGroup } from '@angular/forms'; +import { RegistryService } from '../../../../core/registry/registry.service'; +import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service'; +import { FormService } from '../../../../shared/form/form.service'; +import { Store } from '@ngrx/store'; +import { AppState } from '../../../../app.reducer'; @Component({ selector: 'ds-metadata-schema-form', templateUrl: './metadata-schema-form.component.html', - styleUrls: ['./metadata-schema-form.component.css'] + // styleUrls: ['./metadata-schema-form.component.css'] }) export class MetadataSchemaFormComponent implements OnInit { - formId: string = 'metadata-schema-form'; + formId = 'metadata-schema-form'; private name: DynamicInputModel = new DynamicInputModel({ id: 'name', @@ -28,7 +27,7 @@ export class MetadataSchemaFormComponent implements OnInit { name: 'name', validators: { required: null, - pattern: "^[^ ,_]{1,32}$" + pattern: '^[^ ,_]{1,32}$' }, required: true, }); @@ -44,8 +43,8 @@ export class MetadataSchemaFormComponent implements OnInit { formModel: DynamicFormControlModel[] = [ new DynamicFormGroupModel({ - id: "schema", - legend: "schema", + id: 'schema', + legend: 'schema', group: [ this.namespace, this.name @@ -54,13 +53,13 @@ export class MetadataSchemaFormComponent implements OnInit { ]; formLayout: DynamicFormLayout = { - "name": { + name: { grid: { control: 'col col-sm-5', label: 'col col-sm-5' } }, - "namespace": { + namespace: { grid: { control: 'col col-sm-5', label: 'col col-sm-5' @@ -78,11 +77,11 @@ export class MetadataSchemaFormComponent implements OnInit { ngOnInit() { this.formGroup = this.formBuilderService.createFormGroup(this.formModel); - this.registryService.getActiveMetadataSchema().subscribe(schema => { + this.registryService.getActiveMetadataSchema().subscribe((schema) => { this.formGroup.patchValue({ schema: { - name: schema != null ? schema.prefix : "", - namespace: schema != null ? schema.namespace : "" + name: schema != null ? schema.prefix : '', + namespace: schema != null ? schema.namespace : '' } } ); @@ -95,16 +94,16 @@ export class MetadataSchemaFormComponent implements OnInit { onSubmit() { this.registryService.getActiveMetadataSchema().subscribe( - schema => { + (schema) => { if (schema == null) { - console.log("metadata field to create:"); - console.log("prefix: " + this.name.value); - console.log("namespace: " + this.namespace.value); + console.log('metadata field to create:'); + console.log('prefix: ' + this.name.value); + console.log('namespace: ' + this.namespace.value); } else { - console.log("metadata field to update:"); - console.log("prefix: " + this.name.value); - console.log("namespace: " + this.namespace.value); + console.log('metadata field to update:'); + console.log('prefix: ' + this.name.value); + console.log('namespace: ' + this.namespace.value); } } ); diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts index 5677f48474..8c8c889739 100644 --- a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts +++ b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts @@ -1,20 +1,20 @@ -import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; -import {DynamicFormControlModel, DynamicFormGroupModel, DynamicInputModel} from "@ng-dynamic-forms/core"; -import {RegistryService} from "../../../../core/registry/registry.service"; -import {MetadataSchema} from "../../../../core/metadata/metadataschema.model"; -import {FormGroup} from "@angular/forms"; -import {FormBuilderService} from "../../../../shared/form/builder/form-builder.service"; -import {Observable} from "rxjs"; -import {MetadataField} from "../../../../core/metadata/metadatafield.model"; +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { MetadataSchema } from '../../../../core/metadata/metadataschema.model'; +import { DynamicFormControlModel, DynamicFormGroupModel, DynamicInputModel } from '@ng-dynamic-forms/core'; +import { FormGroup } from '@angular/forms'; +import { RegistryService } from '../../../../core/registry/registry.service'; +import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service'; +import { Observable } from 'rxjs/internal/Observable'; +import { MetadataField } from '../../../../core/metadata/metadatafield.model'; @Component({ selector: 'ds-metadata-field-form', templateUrl: './metadata-field-form.component.html', - styleUrls: ['./metadata-field-form.component.css'] + // styleUrls: ['./metadata-field-form.component.css'] }) export class MetadataFieldFormComponent implements OnInit { - formId: string = 'metadata-field-form'; + formId = 'metadata-field-form'; @Input() metadataSchema: MetadataSchema; @@ -42,8 +42,8 @@ export class MetadataFieldFormComponent implements OnInit { formModel: DynamicFormControlModel[] = [ new DynamicFormGroupModel({ - id: "field", - legend: "field", + id: 'field', + legend: 'field', group: [ this.element, this.qualifier, @@ -62,12 +62,12 @@ export class MetadataFieldFormComponent implements OnInit { ngOnInit() { this.formGroup = this.formBuilderService.createFormGroup(this.formModel); - this.registryService.getActiveMetadataField().subscribe(field => { + this.registryService.getActiveMetadataField().subscribe((field) => { this.formGroup.patchValue({ field: { - element: field != null ? field.element : "", - qualifier: field != null ? field.qualifier : "", - scopeNote: field != null ? field.scopeNote : "" + element: field != null ? field.element : '', + qualifier: field != null ? field.qualifier : '', + scopeNote: field != null ? field.scopeNote : '' } } ); @@ -84,22 +84,26 @@ export class MetadataFieldFormComponent implements OnInit { onSubmit() { this.registryService.getActiveMetadataField().subscribe( - field => { + (field) => { if (field == null) { - console.log("metadata field to create:"); - console.log("element: " + this.element.value); - if (this.qualifier.value) - console.log("qualifier: " + this.qualifier.value); - if (this.scopeNote.value) - console.log("scopeNote: " + this.scopeNote.value); + console.log('metadata field to create:'); + console.log('element: ' + this.element.value); + if (this.qualifier.value) { + console.log('qualifier: ' + this.qualifier.value); + } + if (this.scopeNote.value) { + console.log('scopeNote: ' + this.scopeNote.value); + } } else { - console.log("metadata field to update:"); - console.log("element: " + this.element.value); - if (this.qualifier.value) - console.log("qualifier: " + this.qualifier.value); - if (this.scopeNote.value) - console.log("scopeNote: " + this.scopeNote.value); + console.log('metadata field to update:'); + console.log('element: ' + this.element.value); + if (this.qualifier.value) { + console.log('qualifier: ' + this.qualifier.value); + } + if (this.scopeNote.value) { + console.log('scopeNote: ' + this.scopeNote.value); + } } } ); diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts index 4d73d58e32..3a31436fe2 100644 --- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts +++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts @@ -1,13 +1,13 @@ -import {Component, OnInit} from '@angular/core'; -import {RegistryService} from '../../../core/registry/registry.service'; -import {ActivatedRoute} from '@angular/router'; -import {Observable} from 'rxjs'; -import {RemoteData} from '../../../core/data/remote-data'; -import {PaginatedList} from '../../../core/data/paginated-list'; -import {MetadataField} from '../../../core/metadata/metadatafield.model'; -import {MetadataSchema} from '../../../core/metadata/metadataschema.model'; -import {PaginationComponentOptions} from '../../../shared/pagination/pagination-component-options.model'; -import {map} from "rxjs/operators"; +import { Component, OnInit } from '@angular/core'; +import { RegistryService } from '../../../core/registry/registry.service'; +import { ActivatedRoute } from '@angular/router'; +import { Observable } from 'rxjs'; +import { RemoteData } from '../../../core/data/remote-data'; +import { PaginatedList } from '../../../core/data/paginated-list'; +import { MetadataField } from '../../../core/metadata/metadatafield.model'; +import { MetadataSchema } from '../../../core/metadata/metadataschema.model'; +import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model'; +import { map } from 'rxjs/operators'; @Component({ selector: 'ds-metadata-schema', @@ -23,7 +23,7 @@ export class MetadataSchemaComponent implements OnInit { id: 'registry-metadatafields-pagination', pageSize: 25, pageSizeOptions: [25, 50, 100, 200] -}); + }); constructor(private registryService: RegistryService, private route: ActivatedRoute) { @@ -49,7 +49,7 @@ export class MetadataSchemaComponent implements OnInit { this.metadataSchema.subscribe((schemaData) => { const schema = schemaData.payload; this.metadataFields = this.registryService.getMetadataFieldsBySchema(schema, this.config); - this.namespace = { namespace: schemaData.payload.namespace }; + this.namespace = {namespace: schemaData.payload.namespace}; }); } @@ -59,7 +59,7 @@ export class MetadataSchemaComponent implements OnInit { isActive(field: MetadataField): Observable { return this.getActiveField().pipe( - map(activeField => field === activeField) + map((activeField) => field === activeField) ); } @@ -75,15 +75,15 @@ export class MetadataSchemaComponent implements OnInit { isSelected(field: MetadataField): Observable { return this.registryService.getSelectedMetadataFields().pipe( - map(fields => fields.find(selectedField => selectedField == field) != null) + map((fields) => fields.find((selectedField) => selectedField === field) != null) ); } deleteFields() { this.registryService.getSelectedMetadataFields().subscribe( - fields => { - console.log("metadata fields to delete: "); - for (let field of fields) { + (fields) => { + console.log('metadata fields to delete: '); + for (const field of fields) { console.log(field); } } diff --git a/src/app/+admin/admin-routing.module.ts b/src/app/+admin/admin-routing.module.ts index aa368e7122..061ed3f8a8 100644 --- a/src/app/+admin/admin-routing.module.ts +++ b/src/app/+admin/admin-routing.module.ts @@ -1,11 +1,15 @@ import { RouterModule } from '@angular/router'; import { NgModule } from '@angular/core'; -import {AuthenticatedGuard} from "../core/auth/authenticated.guard"; +import { AuthenticatedGuard } from '../core/auth/authenticated.guard'; @NgModule({ imports: [ RouterModule.forChild([ - { path: 'registries', loadChildren: './admin-registries/admin-registries.module#AdminRegistriesModule', canActivate: [AuthenticatedGuard] } + { + path: 'registries', + loadChildren: './admin-registries/admin-registries.module#AdminRegistriesModule', + canActivate: [AuthenticatedGuard] + } ]) ] }) diff --git a/src/app/+community-page/community-page.component.ts b/src/app/+community-page/community-page.component.ts index ce260aefc0..9a143f9a02 100644 --- a/src/app/+community-page/community-page.component.ts +++ b/src/app/+community-page/community-page.component.ts @@ -25,7 +25,6 @@ export class CommunityPageComponent implements OnInit, OnDestroy { communityRD$: Observable>; logoRD$: Observable>; - private subs: Subscription[] = []; constructor( @@ -42,14 +41,9 @@ export class CommunityPageComponent implements OnInit, OnDestroy { map((rd: RemoteData) => rd.payload), filter((community: Community) => hasValue(community)), mergeMap((community: Community) => community.logo)); - - } ngOnDestroy(): void { this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe()); } - - - } diff --git a/src/app/app.reducer.ts b/src/app/app.reducer.ts index f8931c2af0..82c5a0973b 100644 --- a/src/app/app.reducer.ts +++ b/src/app/app.reducer.ts @@ -17,7 +17,7 @@ import { truncatableReducer, TruncatablesState } from './shared/truncatable/trun import { metadataRegistryReducer, MetadataRegistryState -} from "./+admin/admin-registries/metadata-registry/metadata-registry.reducers"; +} from './+admin/admin-registries/metadata-registry/metadata-registry.reducers'; export interface AppState { router: fromRouter.RouterReducerState; diff --git a/src/app/core/cache/models/normalized-object-factory.ts b/src/app/core/cache/models/normalized-object-factory.ts index 468a2b050d..afa10920cb 100644 --- a/src/app/core/cache/models/normalized-object-factory.ts +++ b/src/app/core/cache/models/normalized-object-factory.ts @@ -10,7 +10,7 @@ import { NormalizedBitstreamFormat } from './normalized-bitstream-format.model'; import { NormalizedResourcePolicy } from './normalized-resource-policy.model'; import { NormalizedEPerson } from '../../eperson/models/normalized-eperson.model'; import { NormalizedGroup } from '../../eperson/models/normalized-group.model'; -import {NormalizedMetadataSchema} from "../../metadata/normalized-metadata-schema.model"; +import { NormalizedMetadataSchema } from '../../metadata/normalized-metadata-schema.model'; export class NormalizedObjectFactory { public static getConstructor(type: ResourceType): GenericConstructor { diff --git a/src/app/core/cache/response.models.ts b/src/app/core/cache/response.models.ts index 168bbe6f4d..8b31e3d449 100644 --- a/src/app/core/cache/response.models.ts +++ b/src/app/core/cache/response.models.ts @@ -1,15 +1,15 @@ -import {SearchQueryResponse} from '../../+search-page/search-service/search-query-response.model'; -import {RequestError} from '../data/request.models'; -import {PageInfo} from '../shared/page-info.model'; -import {ConfigObject} from '../shared/config/config.model'; -import {FacetValue} from '../../+search-page/search-service/facet-value.model'; -import {SearchFilterConfig} from '../../+search-page/search-service/search-filter-config.model'; -import {IntegrationModel} from '../integration/models/integration.model'; -import {RegistryMetadataschemasResponse} from '../registry/registry-metadataschemas-response.model'; -import {RegistryMetadatafieldsResponse} from '../registry/registry-metadatafields-response.model'; -import {RegistryBitstreamformatsResponse} from '../registry/registry-bitstreamformats-response.model'; -import {AuthStatus} from '../auth/models/auth-status.model'; -import {MetadataSchema} from "../metadata/metadataschema.model"; +import { SearchQueryResponse } from '../../+search-page/search-service/search-query-response.model'; +import { RequestError } from '../data/request.models'; +import { PageInfo } from '../shared/page-info.model'; +import { ConfigObject } from '../shared/config/config.model'; +import { FacetValue } from '../../+search-page/search-service/facet-value.model'; +import { SearchFilterConfig } from '../../+search-page/search-service/search-filter-config.model'; +import { IntegrationModel } from '../integration/models/integration.model'; +import { RegistryMetadataschemasResponse } from '../registry/registry-metadataschemas-response.model'; +import { RegistryMetadatafieldsResponse } from '../registry/registry-metadatafields-response.model'; +import { RegistryBitstreamformatsResponse } from '../registry/registry-bitstreamformats-response.model'; +import { AuthStatus } from '../auth/models/auth-status.model'; +import { MetadataSchema } from '../metadata/metadataschema.model'; /* tslint:disable:max-classes-per-file */ export class RestResponse { diff --git a/src/app/core/config/config.service.spec.ts b/src/app/core/config/config.service.spec.ts index 8e9f7db27a..44cfdee358 100644 --- a/src/app/core/config/config.service.spec.ts +++ b/src/app/core/config/config.service.spec.ts @@ -36,7 +36,6 @@ describe('ConfigService', () => { const scopedEndpoint = `${serviceEndpoint}/${scopeName}`; const searchEndpoint = `${serviceEndpoint}/${BROWSE}?uuid=${scopeID}`; - function initTestService(): TestService { return new TestService( requestService, diff --git a/src/app/core/data/metadata-schema-data.service.ts b/src/app/core/data/metadata-schema-data.service.ts index c25e4cc789..d568bd01f7 100644 --- a/src/app/core/data/metadata-schema-data.service.ts +++ b/src/app/core/data/metadata-schema-data.service.ts @@ -1,23 +1,17 @@ -import {distinctUntilChanged, filter, map, tap} from 'rxjs/operators'; -import {Injectable} from '@angular/core'; -import {Store} from '@ngrx/store'; -import {Observable} from 'rxjs'; -import {isNotEmpty} from '../../shared/empty.util'; -import {BrowseService} from '../browse/browse.service'; -import {RemoteDataBuildService} from '../cache/builders/remote-data-build.service'; -import {CoreState} from '../core.reducers'; -import {URLCombiner} from '../url-combiner/url-combiner'; +import { Injectable } from '@angular/core'; +import { Store } from '@ngrx/store'; +import { Observable } from 'rxjs'; +import { BrowseService } from '../browse/browse.service'; +import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; +import { CoreState } from '../core.reducers'; -import {DataService} from './data.service'; -import {RequestService} from './request.service'; -import {HALEndpointService} from '../shared/hal-endpoint.service'; -import {FindAllOptions, GetRequest, RestRequest} from './request.models'; -import {ObjectCacheService} from '../cache/object-cache.service'; -import {MetadataSchema} from "../metadata/metadataschema.model"; -import {NormalizedMetadataSchema} from "../metadata/normalized-metadata-schema.model"; -import {GenericConstructor} from "../shared/generic-constructor"; -import {ResponseParsingService} from "./parsing.service"; -import {RegistryMetadatafieldsResponseParsingService} from "./registry-metadatafields-response-parsing.service"; +import { DataService } from './data.service'; +import { RequestService } from './request.service'; +import { HALEndpointService } from '../shared/hal-endpoint.service'; +import { FindAllOptions, GetRequest, RestRequest } from './request.models'; +import { ObjectCacheService } from '../cache/object-cache.service'; +import { MetadataSchema } from '../metadata/metadataschema.model'; +import { NormalizedMetadataSchema } from '../metadata/normalized-metadata-schema.model'; @Injectable() export class MetadataSchemaDataService extends DataService { diff --git a/src/app/core/integration/integration.service.spec.ts b/src/app/core/integration/integration.service.spec.ts index 158f4b0680..152d7ab165 100644 --- a/src/app/core/integration/integration.service.spec.ts +++ b/src/app/core/integration/integration.service.spec.ts @@ -40,7 +40,7 @@ describe('IntegrationService', () => { findOptions = new IntegrationSearchOptions(uuid, name, metadata); - function initTestService(): TestService { + function initTestService(): TestService { return new TestService( requestService, halService diff --git a/src/app/core/metadata/normalized-metadata-schema.model.ts b/src/app/core/metadata/normalized-metadata-schema.model.ts index 73a64bc1ab..432a8bfd5e 100644 --- a/src/app/core/metadata/normalized-metadata-schema.model.ts +++ b/src/app/core/metadata/normalized-metadata-schema.model.ts @@ -1,12 +1,12 @@ -import {autoserialize} from 'cerialize'; -import {NormalizedObject} from "../cache/models/normalized-object.model"; -import {mapsTo} from "../cache/builders/build-decorators"; -import {CacheableObject} from "../cache/object-cache.reducer"; -import {ListableObject} from "../../shared/object-collection/shared/listable-object.model"; -import {MetadataSchema} from "./metadataschema.model"; +import { autoserialize } from 'cerialize'; +import { NormalizedObject } from '../cache/models/normalized-object.model'; +import { mapsTo } from '../cache/builders/build-decorators'; +import { CacheableObject } from '../cache/object-cache.reducer'; +import { ListableObject } from '../../shared/object-collection/shared/listable-object.model'; +import { MetadataSchema } from './metadataschema.model'; @mapsTo(MetadataSchema) -export class NormalizedMetadataSchema extends NormalizedObject implements CacheableObject, ListableObject { +export class NormalizedMetadataSchema extends NormalizedObject implements CacheableObject, ListableObject { @autoserialize id: number; diff --git a/src/app/core/registry/registry.service.ts b/src/app/core/registry/registry.service.ts index d6c646a5f5..6dd76c1066 100644 --- a/src/app/core/registry/registry.service.ts +++ b/src/app/core/registry/registry.service.ts @@ -1,35 +1,35 @@ -import {combineLatest as observableCombineLatest, Observable} from 'rxjs'; -import {Injectable} from '@angular/core'; -import {RemoteData} from '../data/remote-data'; -import {PaginatedList} from '../data/paginated-list'; -import {PageInfo} from '../shared/page-info.model'; -import {MetadataSchema} from '../metadata/metadataschema.model'; -import {MetadataField} from '../metadata/metadatafield.model'; -import {BitstreamFormat} from './mock-bitstream-format.model'; -import {GetRequest, RestRequest} from '../data/request.models'; -import {GenericConstructor} from '../shared/generic-constructor'; -import {ResponseParsingService} from '../data/parsing.service'; -import {RegistryMetadataschemasResponseParsingService} from '../data/registry-metadataschemas-response-parsing.service'; -import {RemoteDataBuildService} from '../cache/builders/remote-data-build.service'; -import {RequestService} from '../data/request.service'; -import {RegistryMetadataschemasResponse} from './registry-metadataschemas-response.model'; +import { combineLatest as observableCombineLatest, Observable } from 'rxjs'; +import { Injectable } from '@angular/core'; +import { RemoteData } from '../data/remote-data'; +import { PaginatedList } from '../data/paginated-list'; +import { PageInfo } from '../shared/page-info.model'; +import { MetadataSchema } from '../metadata/metadataschema.model'; +import { MetadataField } from '../metadata/metadatafield.model'; +import { BitstreamFormat } from './mock-bitstream-format.model'; +import { GetRequest, RestRequest } from '../data/request.models'; +import { GenericConstructor } from '../shared/generic-constructor'; +import { ResponseParsingService } from '../data/parsing.service'; +import { RegistryMetadataschemasResponseParsingService } from '../data/registry-metadataschemas-response-parsing.service'; +import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; +import { RequestService } from '../data/request.service'; +import { RegistryMetadataschemasResponse } from './registry-metadataschemas-response.model'; import { RegistryBitstreamformatsSuccessResponse, RegistryMetadatafieldsSuccessResponse, RegistryMetadataschemasSuccessResponse } from '../cache/response.models'; -import {HALEndpointService} from '../shared/hal-endpoint.service'; -import {RegistryMetadatafieldsResponseParsingService} from '../data/registry-metadatafields-response-parsing.service'; -import {RegistryMetadatafieldsResponse} from './registry-metadatafields-response.model'; -import {isNotEmpty} from '../../shared/empty.util'; -import {URLCombiner} from '../url-combiner/url-combiner'; -import {PaginationComponentOptions} from '../../shared/pagination/pagination-component-options.model'; -import {RegistryBitstreamformatsResponseParsingService} from '../data/registry-bitstreamformats-response-parsing.service'; -import {RegistryBitstreamformatsResponse} from './registry-bitstreamformats-response.model'; -import {getResponseFromEntry} from '../shared/operators'; -import {createSelector, select, Store} from "@ngrx/store"; -import {AppState} from "../../app.reducer"; -import {MetadataRegistryState} from "../../+admin/admin-registries/metadata-registry/metadata-registry.reducers"; +import { HALEndpointService } from '../shared/hal-endpoint.service'; +import { RegistryMetadatafieldsResponseParsingService } from '../data/registry-metadatafields-response-parsing.service'; +import { RegistryMetadatafieldsResponse } from './registry-metadatafields-response.model'; +import { isNotEmpty } from '../../shared/empty.util'; +import { URLCombiner } from '../url-combiner/url-combiner'; +import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model'; +import { RegistryBitstreamformatsResponseParsingService } from '../data/registry-bitstreamformats-response-parsing.service'; +import { RegistryBitstreamformatsResponse } from './registry-bitstreamformats-response.model'; +import { getResponseFromEntry } from '../shared/operators'; +import { createSelector, select, Store } from '@ngrx/store'; +import { AppState } from '../../app.reducer'; +import { MetadataRegistryState } from '../../+admin/admin-registries/metadata-registry/metadata-registry.reducers'; import { MetadataRegistryCancelFieldAction, MetadataRegistryCancelSchemaAction, @@ -39,8 +39,8 @@ import { MetadataRegistryEditSchemaAction, MetadataRegistrySelectFieldAction, MetadataRegistrySelectSchemaAction -} from "../../+admin/admin-registries/metadata-registry/metadata-registry.actions"; -import {flatMap, map, tap} from "rxjs/operators"; +} from '../../+admin/admin-registries/metadata-registry/metadata-registry.actions'; +import { flatMap, map, tap } from 'rxjs/operators'; const metadataRegistryStateSelector = (state: AppState) => state.metadataRegistry; const editMetadataSchemaSelector = createSelector(metadataRegistryStateSelector, (metadataState: MetadataRegistryState) => metadataState.editSchema); @@ -199,8 +199,8 @@ export class RegistryService { } private getMetadataFieldsBySchemaRequestObs(pagination: PaginationComponentOptions, schema: MetadataSchema): Observable { - return this.halService.getEndpoint(this.metadataFieldsPath + "/search/bySchema").pipe( - // return this.halService.getEndpoint(this.metadataFieldsPath).pipe( + return this.halService.getEndpoint(this.metadataFieldsPath + '/search/bySchema').pipe( + // return this.halService.getEndpoint(this.metadataFieldsPath).pipe( map((url: string) => { const args: string[] = []; args.push(`schema=${schema.prefix}`); diff --git a/src/app/shared/testing/utils.ts b/src/app/shared/testing/utils.ts index 8714358100..cd17a1b1f5 100644 --- a/src/app/shared/testing/utils.ts +++ b/src/app/shared/testing/utils.ts @@ -41,4 +41,4 @@ export function spyOnOperator(obj: any, prop: string): any { }); return spyOn(obj, prop); -} \ No newline at end of file +}