hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-10 03:23:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

58789: TSLint error fixing

Browse Source
This commit is contained in:
Kristof De Langhe
2019-01-21 12:32:55 +01:00
parent 962bafcce2
commit 52a440c9f2
19 changed files with 181 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/+admin/admin-registries/admin-registries.module.ts
View File

@@ -8,7 +8,7 @@ import { TranslateModule } from '@ngx-translate/core';
import { BitstreamFormatsComponent } from './bitstream-formats/bitstream-formats.component'; import { BitstreamFormatsComponent } from './bitstream-formats/bitstream-formats.component';
import { SharedModule } from '../../shared/shared.module'; import { SharedModule } from '../../shared/shared.module';
import { MetadataSchemaFormComponent } from './metadata-registry/metadata-schema-form/metadata-schema-form.component'; 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({ @NgModule({
imports: [ imports: [

18
src/app/+admin/admin-registries/metadata-registry/metadata-registry.actions.ts
View File

@@ -1,7 +1,7 @@
import {Action} from '@ngrx/store'; import { Action } from '@ngrx/store';
import {type} from "../../../shared/ngrx/type"; import { type } from '../../../shared/ngrx/type';
import {MetadataSchema} from "../../../core/metadata/metadataschema.model"; import { MetadataSchema } from '../../../core/metadata/metadataschema.model';
import {MetadataField} from "../../../core/metadata/metadatafield.model"; import { MetadataField } from '../../../core/metadata/metadatafield.model';
/** /**
* For each action type in an action group, make a simple * 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. * action types in the application are unique.
*/ */
export const MetadataRegistryActionTypes = { export const MetadataRegistryActionTypes = {
EDIT_SCHEMA: type('dspace/metadata-registry/EDIT_SCHEMA'), EDIT_SCHEMA: type('dspace/metadata-registry/EDIT_SCHEMA'),
CANCEL_EDIT_SCHEMA: type('dspace/metadata-registry/CANCEL_SCHEMA'), CANCEL_EDIT_SCHEMA: type('dspace/metadata-registry/CANCEL_SCHEMA'),
SELECT_SCHEMA: type('dspace/metadata-registry/SELECT_SCHEMA'), SELECT_SCHEMA: type('dspace/metadata-registry/SELECT_SCHEMA'),
DESELECT_SCHEMA: type('dspace/metadata-registry/DESELECT_SCHEMA'), DESELECT_SCHEMA: type('dspace/metadata-registry/DESELECT_SCHEMA'),
EDIT_FIELD : type('dspace/metadata-registry/EDIT_FIELD'), EDIT_FIELD: type('dspace/metadata-registry/EDIT_FIELD'),
CANCEL_EDIT_FIELD : type('dspace/metadata-registry/CANCEL_FIELD'), CANCEL_EDIT_FIELD: type('dspace/metadata-registry/CANCEL_FIELD'),
SELECT_FIELD : type('dspace/metadata-registry/SELECT_FIELD'), SELECT_FIELD: type('dspace/metadata-registry/SELECT_FIELD'),
DESELECT_FIELD : type('dspace/metadata-registry/DESELEC_FIELDT') DESELECT_FIELD: type('dspace/metadata-registry/DESELEC_FIELDT')
}; };
/* tslint:disable:max-classes-per-file */ /* tslint:disable:max-classes-per-file */

28
src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
View File

@@ -1,13 +1,11 @@
import {Component} from '@angular/core'; import { Component } from '@angular/core';
import {RegistryService} from '../../../core/registry/registry.service'; import { RegistryService } from '../../../core/registry/registry.service';
import {Observable} from 'rxjs'; import { Observable } from 'rxjs';
import {RemoteData} from '../../../core/data/remote-data'; import { RemoteData } from '../../../core/data/remote-data';
import {PaginatedList} from '../../../core/data/paginated-list'; import { PaginatedList } from '../../../core/data/paginated-list';
import {MetadataSchema} from '../../../core/metadata/metadataschema.model'; import { MetadataSchema } from '../../../core/metadata/metadataschema.model';
import {PaginationComponentOptions} from '../../../shared/pagination/pagination-component-options.model'; import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
import {Store} from "@ngrx/store"; import { map } from 'rxjs/operators';
import {AppState} from "../../../app.reducer";
import {map} from "rxjs/operators";
@Component({ @Component({
selector: 'ds-metadata-registry', selector: 'ds-metadata-registry',
@@ -41,7 +39,7 @@ export class MetadataRegistryComponent {
isActive(schema: MetadataSchema): Observable<boolean> { isActive(schema: MetadataSchema): Observable<boolean> {
return this.getActiveSchema().pipe( return this.getActiveSchema().pipe(
map(activeSchema => schema === activeSchema) map((activeSchema) => schema === activeSchema)
); );
} }
@@ -57,15 +55,15 @@ export class MetadataRegistryComponent {
isSelected(schema: MetadataSchema): Observable<boolean> { isSelected(schema: MetadataSchema): Observable<boolean> {
return this.registryService.getSelectedMetadataSchemas().pipe( return this.registryService.getSelectedMetadataSchemas().pipe(
map(schemas => schemas.find(selectedSchema => selectedSchema == schema) != null) map((schemas) => schemas.find((selectedSchema) => selectedSchema === schema) != null)
); );
} }
deleteSchemas() { deleteSchemas() {
this.registryService.getSelectedMetadataSchemas().subscribe( this.registryService.getSelectedMetadataSchemas().subscribe(
schemas => { (schemas) => {
console.log("metadata schemas to delete: "); console.log('metadata schemas to delete: ');
for (let schema of schemas) { for (const schema of schemas) {
console.log(schema); console.log(schema);
} }
} }

10
src/app/+admin/admin-registries/metadata-registry/metadata-registry.effects.ts
View File

@@ -1,12 +1,12 @@
/** /**
* Makes sure that if the user navigates to another route, the sidebar is collapsed * Makes sure that if the user navigates to another route, the sidebar is collapsed
*/ */
import {Injectable} from "@angular/core"; import { Injectable } from '@angular/core';
import {Actions, Effect, ofType} from "@ngrx/effects"; import { Actions, Effect, ofType } from '@ngrx/effects';
import {filter, map, tap} from "rxjs/operators"; import { filter, map, tap } from 'rxjs/operators';
import {SearchSidebarCollapseAction} from "../../../+search-page/search-sidebar/search-sidebar.actions"; import { SearchSidebarCollapseAction } from '../../../+search-page/search-sidebar/search-sidebar.actions';
import * as fromRouter from '@ngrx/router-store'; import * as fromRouter from '@ngrx/router-store';
import {URLBaser} from "../../../core/url-baser/url-baser"; import { URLBaser } from '../../../core/url-baser/url-baser';
@Injectable() @Injectable()
export class SearchSidebarEffects { export class SearchSidebarEffects {

12
src/app/+admin/admin-registries/metadata-registry/metadata-registry.reducers.ts
View File

@@ -1,4 +1,4 @@
import {MetadataSchema} from "../../../core/metadata/metadataschema.model"; import { MetadataSchema } from '../../../core/metadata/metadataschema.model';
import { import {
MetadataRegistryAction, MetadataRegistryAction,
MetadataRegistryActionTypes, MetadataRegistryActionTypes,
@@ -8,8 +8,8 @@ import {
MetadataRegistryEditSchemaAction, MetadataRegistryEditSchemaAction,
MetadataRegistrySelectFieldAction, MetadataRegistrySelectFieldAction,
MetadataRegistrySelectSchemaAction MetadataRegistrySelectSchemaAction
} from "./metadata-registry.actions"; } from './metadata-registry.actions';
import {MetadataField} from "../../../core/metadata/metadatafield.model"; import { MetadataField } from '../../../core/metadata/metadatafield.model';
/** /**
* The auth state. * The auth state.
@@ -57,7 +57,7 @@ export function metadataRegistryReducer(state = initialState, action: MetadataRe
case MetadataRegistryActionTypes.DESELECT_SCHEMA: { case MetadataRegistryActionTypes.DESELECT_SCHEMA: {
return Object.assign({}, state, { return Object.assign({}, state, {
selectedSchemas: state.selectedSchemas.filter( 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: { case MetadataRegistryActionTypes.DESELECT_FIELD: {
return Object.assign({}, state, { return Object.assign({}, state, {
selectedFields: state.selectedFields.filter( 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: default:
return state; return state;
} }
} }

49
src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
View File

@@ -4,23 +4,22 @@ import {
DynamicFormGroupModel, DynamicFormGroupModel,
DynamicFormLayout, DynamicFormLayout,
DynamicInputModel DynamicInputModel
} from "@ng-dynamic-forms/core"; } from '@ng-dynamic-forms/core';
import {MetadataSchema} from "../../../../core/metadata/metadataschema.model"; import { FormGroup } from '@angular/forms';
import {RegistryService} from "../../../../core/registry/registry.service"; import { RegistryService } from '../../../../core/registry/registry.service';
import {FormService} from "../../../../shared/form/form.service"; import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
import {FormBuilderService} from "../../../../shared/form/builder/form-builder.service"; import { FormService } from '../../../../shared/form/form.service';
import {FormGroup} from "@angular/forms"; import { Store } from '@ngrx/store';
import {Store} from "@ngrx/store"; import { AppState } from '../../../../app.reducer';
import {AppState} from "../../../../app.reducer";
@Component({ @Component({
selector: 'ds-metadata-schema-form', selector: 'ds-metadata-schema-form',
templateUrl: './metadata-schema-form.component.html', templateUrl: './metadata-schema-form.component.html',
styleUrls: ['./metadata-schema-form.component.css'] // styleUrls: ['./metadata-schema-form.component.css']
}) })
export class MetadataSchemaFormComponent implements OnInit { export class MetadataSchemaFormComponent implements OnInit {
formId: string = 'metadata-schema-form'; formId = 'metadata-schema-form';
private name: DynamicInputModel = new DynamicInputModel({ private name: DynamicInputModel = new DynamicInputModel({
id: 'name', id: 'name',
@@ -28,7 +27,7 @@ export class MetadataSchemaFormComponent implements OnInit {
name: 'name', name: 'name',
validators: { validators: {
required: null, required: null,
pattern: "^[^ ,_]{1,32}$" pattern: '^[^ ,_]{1,32}$'
}, },
required: true, required: true,
}); });
@@ -44,8 +43,8 @@ export class MetadataSchemaFormComponent implements OnInit {
formModel: DynamicFormControlModel[] = [ formModel: DynamicFormControlModel[] = [
new DynamicFormGroupModel({ new DynamicFormGroupModel({
id: "schema", id: 'schema',
legend: "schema", legend: 'schema',
group: [ group: [
this.namespace, this.namespace,
this.name this.name
@@ -54,13 +53,13 @@ export class MetadataSchemaFormComponent implements OnInit {
]; ];
formLayout: DynamicFormLayout = { formLayout: DynamicFormLayout = {
"name": { name: {
grid: { grid: {
control: 'col col-sm-5', control: 'col col-sm-5',
label: 'col col-sm-5' label: 'col col-sm-5'
} }
}, },
"namespace": { namespace: {
grid: { grid: {
control: 'col col-sm-5', control: 'col col-sm-5',
label: 'col col-sm-5' label: 'col col-sm-5'
@@ -78,11 +77,11 @@ export class MetadataSchemaFormComponent implements OnInit {
ngOnInit() { ngOnInit() {
this.formGroup = this.formBuilderService.createFormGroup(this.formModel); this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
this.registryService.getActiveMetadataSchema().subscribe(schema => { this.registryService.getActiveMetadataSchema().subscribe((schema) => {
this.formGroup.patchValue({ this.formGroup.patchValue({
schema: { schema: {
name: schema != null ? schema.prefix : "", name: schema != null ? schema.prefix : '',
namespace: schema != null ? schema.namespace : "" namespace: schema != null ? schema.namespace : ''
} }
} }
); );
@@ -95,16 +94,16 @@ export class MetadataSchemaFormComponent implements OnInit {
onSubmit() { onSubmit() {
this.registryService.getActiveMetadataSchema().subscribe( this.registryService.getActiveMetadataSchema().subscribe(
schema => { (schema) => {
if (schema == null) { if (schema == null) {
console.log("metadata field to create:"); console.log('metadata field to create:');
console.log("prefix: " + this.name.value); console.log('prefix: ' + this.name.value);
console.log("namespace: " + this.namespace.value); console.log('namespace: ' + this.namespace.value);
} else { } else {
console.log("metadata field to update:"); console.log('metadata field to update:');
console.log("prefix: " + this.name.value); console.log('prefix: ' + this.name.value);
console.log("namespace: " + this.namespace.value); console.log('namespace: ' + this.namespace.value);
} }
} }
); );

62
src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
View File

@@ -1,20 +1,20 @@
import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import {DynamicFormControlModel, DynamicFormGroupModel, DynamicInputModel} from "@ng-dynamic-forms/core"; import { MetadataSchema } from '../../../../core/metadata/metadataschema.model';
import {RegistryService} from "../../../../core/registry/registry.service"; import { DynamicFormControlModel, DynamicFormGroupModel, DynamicInputModel } from '@ng-dynamic-forms/core';
import {MetadataSchema} from "../../../../core/metadata/metadataschema.model"; import { FormGroup } from '@angular/forms';
import {FormGroup} from "@angular/forms"; import { RegistryService } from '../../../../core/registry/registry.service';
import {FormBuilderService} from "../../../../shared/form/builder/form-builder.service"; import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
import {Observable} from "rxjs"; import { Observable } from 'rxjs/internal/Observable';
import {MetadataField} from "../../../../core/metadata/metadatafield.model"; import { MetadataField } from '../../../../core/metadata/metadatafield.model';
@Component({ @Component({
selector: 'ds-metadata-field-form', selector: 'ds-metadata-field-form',
templateUrl: './metadata-field-form.component.html', templateUrl: './metadata-field-form.component.html',
styleUrls: ['./metadata-field-form.component.css'] // styleUrls: ['./metadata-field-form.component.css']
}) })
export class MetadataFieldFormComponent implements OnInit { export class MetadataFieldFormComponent implements OnInit {
formId: string = 'metadata-field-form'; formId = 'metadata-field-form';
@Input() metadataSchema: MetadataSchema; @Input() metadataSchema: MetadataSchema;
@@ -42,8 +42,8 @@ export class MetadataFieldFormComponent implements OnInit {
formModel: DynamicFormControlModel[] = [ formModel: DynamicFormControlModel[] = [
new DynamicFormGroupModel({ new DynamicFormGroupModel({
id: "field", id: 'field',
legend: "field", legend: 'field',
group: [ group: [
this.element, this.element,
this.qualifier, this.qualifier,
@@ -62,12 +62,12 @@ export class MetadataFieldFormComponent implements OnInit {
ngOnInit() { ngOnInit() {
this.formGroup = this.formBuilderService.createFormGroup(this.formModel); this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
this.registryService.getActiveMetadataField().subscribe(field => { this.registryService.getActiveMetadataField().subscribe((field) => {
this.formGroup.patchValue({ this.formGroup.patchValue({
field: { field: {
element: field != null ? field.element : "", element: field != null ? field.element : '',
qualifier: field != null ? field.qualifier : "", qualifier: field != null ? field.qualifier : '',
scopeNote: field != null ? field.scopeNote : "" scopeNote: field != null ? field.scopeNote : ''
} }
} }
); );
@@ -84,22 +84,26 @@ export class MetadataFieldFormComponent implements OnInit {
onSubmit() { onSubmit() {
this.registryService.getActiveMetadataField().subscribe( this.registryService.getActiveMetadataField().subscribe(
field => { (field) => {
if (field == null) { if (field == null) {
console.log("metadata field to create:"); console.log('metadata field to create:');
console.log("element: " + this.element.value); console.log('element: ' + this.element.value);
if (this.qualifier.value) if (this.qualifier.value) {
console.log("qualifier: " + this.qualifier.value); console.log('qualifier: ' + this.qualifier.value);
if (this.scopeNote.value) }
console.log("scopeNote: " + this.scopeNote.value); if (this.scopeNote.value) {
console.log('scopeNote: ' + this.scopeNote.value);
}
} else { } else {
console.log("metadata field to update:"); console.log('metadata field to update:');
console.log("element: " + this.element.value); console.log('element: ' + this.element.value);
if (this.qualifier.value) if (this.qualifier.value) {
console.log("qualifier: " + this.qualifier.value); console.log('qualifier: ' + this.qualifier.value);
if (this.scopeNote.value) }
console.log("scopeNote: " + this.scopeNote.value); if (this.scopeNote.value) {
console.log('scopeNote: ' + this.scopeNote.value);
}
} }
} }
); );

34
src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
View File

@@ -1,13 +1,13 @@
import {Component, OnInit} from '@angular/core'; import { Component, OnInit } from '@angular/core';
import {RegistryService} from '../../../core/registry/registry.service'; import { RegistryService } from '../../../core/registry/registry.service';
import {ActivatedRoute} from '@angular/router'; import { ActivatedRoute } from '@angular/router';
import {Observable} from 'rxjs'; import { Observable } from 'rxjs';
import {RemoteData} from '../../../core/data/remote-data'; import { RemoteData } from '../../../core/data/remote-data';
import {PaginatedList} from '../../../core/data/paginated-list'; import { PaginatedList } from '../../../core/data/paginated-list';
import {MetadataField} from '../../../core/metadata/metadatafield.model'; import { MetadataField } from '../../../core/metadata/metadatafield.model';
import {MetadataSchema} from '../../../core/metadata/metadataschema.model'; import { MetadataSchema } from '../../../core/metadata/metadataschema.model';
import {PaginationComponentOptions} from '../../../shared/pagination/pagination-component-options.model'; import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
import {map} from "rxjs/operators"; import { map } from 'rxjs/operators';
@Component({ @Component({
selector: 'ds-metadata-schema', selector: 'ds-metadata-schema',
@@ -23,7 +23,7 @@ export class MetadataSchemaComponent implements OnInit {
id: 'registry-metadatafields-pagination', id: 'registry-metadatafields-pagination',
pageSize: 25, pageSize: 25,
pageSizeOptions: [25, 50, 100, 200] pageSizeOptions: [25, 50, 100, 200]
}); });
constructor(private registryService: RegistryService, private route: ActivatedRoute) { constructor(private registryService: RegistryService, private route: ActivatedRoute) {
@@ -49,7 +49,7 @@ export class MetadataSchemaComponent implements OnInit {
this.metadataSchema.subscribe((schemaData) => { this.metadataSchema.subscribe((schemaData) => {
const schema = schemaData.payload; const schema = schemaData.payload;
this.metadataFields = this.registryService.getMetadataFieldsBySchema(schema, this.config); 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<boolean> { isActive(field: MetadataField): Observable<boolean> {
return this.getActiveField().pipe( 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<boolean> { isSelected(field: MetadataField): Observable<boolean> {
return this.registryService.getSelectedMetadataFields().pipe( return this.registryService.getSelectedMetadataFields().pipe(
map(fields => fields.find(selectedField => selectedField == field) != null) map((fields) => fields.find((selectedField) => selectedField === field) != null)
); );
} }
deleteFields() { deleteFields() {
this.registryService.getSelectedMetadataFields().subscribe( this.registryService.getSelectedMetadataFields().subscribe(
fields => { (fields) => {
console.log("metadata fields to delete: "); console.log('metadata fields to delete: ');
for (let field of fields) { for (const field of fields) {
console.log(field); console.log(field);
} }
} }

8
src/app/+admin/admin-routing.module.ts
View File

@@ -1,11 +1,15 @@
import { RouterModule } from '@angular/router'; import { RouterModule } from '@angular/router';
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import {AuthenticatedGuard} from "../core/auth/authenticated.guard"; import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
@NgModule({ @NgModule({
imports: [ imports: [
RouterModule.forChild([ RouterModule.forChild([
{ path: 'registries', loadChildren: './admin-registries/admin-registries.module#AdminRegistriesModule', canActivate: [AuthenticatedGuard] } {
path: 'registries',
loadChildren: './admin-registries/admin-registries.module#AdminRegistriesModule',
canActivate: [AuthenticatedGuard]
}
]) ])
] ]
}) })

6
src/app/+community-page/community-page.component.ts
View File

@@ -25,7 +25,6 @@ export class CommunityPageComponent implements OnInit, OnDestroy {
communityRD$: Observable<RemoteData<Community>>; communityRD$: Observable<RemoteData<Community>>;
logoRD$: Observable<RemoteData<Bitstream>>; logoRD$: Observable<RemoteData<Bitstream>>;
private subs: Subscription[] = []; private subs: Subscription[] = [];
constructor( constructor(
@@ -42,14 +41,9 @@ export class CommunityPageComponent implements OnInit, OnDestroy {
map((rd: RemoteData<Community>) => rd.payload), map((rd: RemoteData<Community>) => rd.payload),
filter((community: Community) => hasValue(community)), filter((community: Community) => hasValue(community)),
mergeMap((community: Community) => community.logo)); mergeMap((community: Community) => community.logo));
} }
ngOnDestroy(): void { ngOnDestroy(): void {
this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe()); this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
} }
} }

2
src/app/app.reducer.ts
View File

@@ -17,7 +17,7 @@ import { truncatableReducer, TruncatablesState } from './shared/truncatable/trun
import { import {
metadataRegistryReducer, metadataRegistryReducer,
MetadataRegistryState MetadataRegistryState
} from "./+admin/admin-registries/metadata-registry/metadata-registry.reducers"; } from './+admin/admin-registries/metadata-registry/metadata-registry.reducers';
export interface AppState { export interface AppState {
router: fromRouter.RouterReducerState; router: fromRouter.RouterReducerState;

2
src/app/core/cache/models/normalized-object-factory.ts vendored
View File

@@ -10,7 +10,7 @@ import { NormalizedBitstreamFormat } from './normalized-bitstream-format.model';
import { NormalizedResourcePolicy } from './normalized-resource-policy.model'; import { NormalizedResourcePolicy } from './normalized-resource-policy.model';
import { NormalizedEPerson } from '../../eperson/models/normalized-eperson.model'; import { NormalizedEPerson } from '../../eperson/models/normalized-eperson.model';
import { NormalizedGroup } from '../../eperson/models/normalized-group.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 { export class NormalizedObjectFactory {
public static getConstructor(type: ResourceType): GenericConstructor<NormalizedObject> { public static getConstructor(type: ResourceType): GenericConstructor<NormalizedObject> {

24
src/app/core/cache/response.models.ts vendored
View File

@@ -1,15 +1,15 @@
import {SearchQueryResponse} from '../../+search-page/search-service/search-query-response.model'; import { SearchQueryResponse } from '../../+search-page/search-service/search-query-response.model';
import {RequestError} from '../data/request.models'; import { RequestError } from '../data/request.models';
import {PageInfo} from '../shared/page-info.model'; import { PageInfo } from '../shared/page-info.model';
import {ConfigObject} from '../shared/config/config.model'; import { ConfigObject } from '../shared/config/config.model';
import {FacetValue} from '../../+search-page/search-service/facet-value.model'; import { FacetValue } from '../../+search-page/search-service/facet-value.model';
import {SearchFilterConfig} from '../../+search-page/search-service/search-filter-config.model'; import { SearchFilterConfig } from '../../+search-page/search-service/search-filter-config.model';
import {IntegrationModel} from '../integration/models/integration.model'; import { IntegrationModel } from '../integration/models/integration.model';
import {RegistryMetadataschemasResponse} from '../registry/registry-metadataschemas-response.model'; import { RegistryMetadataschemasResponse } from '../registry/registry-metadataschemas-response.model';
import {RegistryMetadatafieldsResponse} from '../registry/registry-metadatafields-response.model'; import { RegistryMetadatafieldsResponse } from '../registry/registry-metadatafields-response.model';
import {RegistryBitstreamformatsResponse} from '../registry/registry-bitstreamformats-response.model'; import { RegistryBitstreamformatsResponse } from '../registry/registry-bitstreamformats-response.model';
import {AuthStatus} from '../auth/models/auth-status.model'; import { AuthStatus } from '../auth/models/auth-status.model';
import {MetadataSchema} from "../metadata/metadataschema.model"; import { MetadataSchema } from '../metadata/metadataschema.model';
/* tslint:disable:max-classes-per-file */ /* tslint:disable:max-classes-per-file */
export class RestResponse { export class RestResponse {

1
src/app/core/config/config.service.spec.ts
View File

@@ -36,7 +36,6 @@ describe('ConfigService', () => {
const scopedEndpoint = `${serviceEndpoint}/${scopeName}`; const scopedEndpoint = `${serviceEndpoint}/${scopeName}`;
const searchEndpoint = `${serviceEndpoint}/${BROWSE}?uuid=${scopeID}`; const searchEndpoint = `${serviceEndpoint}/${BROWSE}?uuid=${scopeID}`;
function initTestService(): TestService { function initTestService(): TestService {
return new TestService( return new TestService(
requestService, requestService,

32
src/app/core/data/metadata-schema-data.service.ts
View File

@@ -1,23 +1,17 @@
import {distinctUntilChanged, filter, map, tap} from 'rxjs/operators'; import { Injectable } from '@angular/core';
import {Injectable} from '@angular/core'; import { Store } from '@ngrx/store';
import {Store} from '@ngrx/store'; import { Observable } from 'rxjs';
import {Observable} from 'rxjs'; import { BrowseService } from '../browse/browse.service';
import {isNotEmpty} from '../../shared/empty.util'; import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
import {BrowseService} from '../browse/browse.service'; import { CoreState } from '../core.reducers';
import {RemoteDataBuildService} from '../cache/builders/remote-data-build.service';
import {CoreState} from '../core.reducers';
import {URLCombiner} from '../url-combiner/url-combiner';
import {DataService} from './data.service'; import { DataService } from './data.service';
import {RequestService} from './request.service'; import { RequestService } from './request.service';
import {HALEndpointService} from '../shared/hal-endpoint.service'; import { HALEndpointService } from '../shared/hal-endpoint.service';
import {FindAllOptions, GetRequest, RestRequest} from './request.models'; import { FindAllOptions, GetRequest, RestRequest } from './request.models';
import {ObjectCacheService} from '../cache/object-cache.service'; import { ObjectCacheService } from '../cache/object-cache.service';
import {MetadataSchema} from "../metadata/metadataschema.model"; import { MetadataSchema } from '../metadata/metadataschema.model';
import {NormalizedMetadataSchema} from "../metadata/normalized-metadata-schema.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";
@Injectable() @Injectable()
export class MetadataSchemaDataService extends DataService<NormalizedMetadataSchema, MetadataSchema> { export class MetadataSchemaDataService extends DataService<NormalizedMetadataSchema, MetadataSchema> {

2
src/app/core/integration/integration.service.spec.ts
View File

@@ -40,7 +40,7 @@ describe('IntegrationService', () => {
findOptions = new IntegrationSearchOptions(uuid, name, metadata); findOptions = new IntegrationSearchOptions(uuid, name, metadata);
function initTestService(): TestService { function initTestService(): TestService {
return new TestService( return new TestService(
requestService, requestService,
halService halService

14
src/app/core/metadata/normalized-metadata-schema.model.ts
View File

@@ -1,12 +1,12 @@
import {autoserialize} from 'cerialize'; import { autoserialize } from 'cerialize';
import {NormalizedObject} from "../cache/models/normalized-object.model"; import { NormalizedObject } from '../cache/models/normalized-object.model';
import {mapsTo} from "../cache/builders/build-decorators"; import { mapsTo } from '../cache/builders/build-decorators';
import {CacheableObject} from "../cache/object-cache.reducer"; import { CacheableObject } from '../cache/object-cache.reducer';
import {ListableObject} from "../../shared/object-collection/shared/listable-object.model"; import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
import {MetadataSchema} from "./metadataschema.model"; import { MetadataSchema } from './metadataschema.model';
@mapsTo(MetadataSchema) @mapsTo(MetadataSchema)
export class NormalizedMetadataSchema extends NormalizedObject implements CacheableObject, ListableObject { export class NormalizedMetadataSchema extends NormalizedObject implements CacheableObject, ListableObject {
@autoserialize @autoserialize
id: number; id: number;

62
src/app/core/registry/registry.service.ts
View File

@@ -1,35 +1,35 @@
import {combineLatest as observableCombineLatest, Observable} from 'rxjs'; import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
import {Injectable} from '@angular/core'; import { Injectable } from '@angular/core';
import {RemoteData} from '../data/remote-data'; import { RemoteData } from '../data/remote-data';
import {PaginatedList} from '../data/paginated-list'; import { PaginatedList } from '../data/paginated-list';
import {PageInfo} from '../shared/page-info.model'; import { PageInfo } from '../shared/page-info.model';
import {MetadataSchema} from '../metadata/metadataschema.model'; import { MetadataSchema } from '../metadata/metadataschema.model';
import {MetadataField} from '../metadata/metadatafield.model'; import { MetadataField } from '../metadata/metadatafield.model';
import {BitstreamFormat} from './mock-bitstream-format.model'; import { BitstreamFormat } from './mock-bitstream-format.model';
import {GetRequest, RestRequest} from '../data/request.models'; import { GetRequest, RestRequest } from '../data/request.models';
import {GenericConstructor} from '../shared/generic-constructor'; import { GenericConstructor } from '../shared/generic-constructor';
import {ResponseParsingService} from '../data/parsing.service'; import { ResponseParsingService } from '../data/parsing.service';
import {RegistryMetadataschemasResponseParsingService} from '../data/registry-metadataschemas-response-parsing.service'; import { RegistryMetadataschemasResponseParsingService } from '../data/registry-metadataschemas-response-parsing.service';
import {RemoteDataBuildService} from '../cache/builders/remote-data-build.service'; import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
import {RequestService} from '../data/request.service'; import { RequestService } from '../data/request.service';
import {RegistryMetadataschemasResponse} from './registry-metadataschemas-response.model'; import { RegistryMetadataschemasResponse } from './registry-metadataschemas-response.model';
import { import {
RegistryBitstreamformatsSuccessResponse, RegistryBitstreamformatsSuccessResponse,
RegistryMetadatafieldsSuccessResponse, RegistryMetadatafieldsSuccessResponse,
RegistryMetadataschemasSuccessResponse RegistryMetadataschemasSuccessResponse
} from '../cache/response.models'; } from '../cache/response.models';
import {HALEndpointService} from '../shared/hal-endpoint.service'; import { HALEndpointService } from '../shared/hal-endpoint.service';
import {RegistryMetadatafieldsResponseParsingService} from '../data/registry-metadatafields-response-parsing.service'; import { RegistryMetadatafieldsResponseParsingService } from '../data/registry-metadatafields-response-parsing.service';
import {RegistryMetadatafieldsResponse} from './registry-metadatafields-response.model'; import { RegistryMetadatafieldsResponse } from './registry-metadatafields-response.model';
import {isNotEmpty} from '../../shared/empty.util'; import { isNotEmpty } from '../../shared/empty.util';
import {URLCombiner} from '../url-combiner/url-combiner'; import { URLCombiner } from '../url-combiner/url-combiner';
import {PaginationComponentOptions} from '../../shared/pagination/pagination-component-options.model'; import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
import {RegistryBitstreamformatsResponseParsingService} from '../data/registry-bitstreamformats-response-parsing.service'; import { RegistryBitstreamformatsResponseParsingService } from '../data/registry-bitstreamformats-response-parsing.service';
import {RegistryBitstreamformatsResponse} from './registry-bitstreamformats-response.model'; import { RegistryBitstreamformatsResponse } from './registry-bitstreamformats-response.model';
import {getResponseFromEntry} from '../shared/operators'; import { getResponseFromEntry } from '../shared/operators';
import {createSelector, select, Store} from "@ngrx/store"; import { createSelector, select, Store } from '@ngrx/store';
import {AppState} from "../../app.reducer"; import { AppState } from '../../app.reducer';
import {MetadataRegistryState} from "../../+admin/admin-registries/metadata-registry/metadata-registry.reducers"; import { MetadataRegistryState } from '../../+admin/admin-registries/metadata-registry/metadata-registry.reducers';
import { import {
MetadataRegistryCancelFieldAction, MetadataRegistryCancelFieldAction,
MetadataRegistryCancelSchemaAction, MetadataRegistryCancelSchemaAction,
@@ -39,8 +39,8 @@ import {
MetadataRegistryEditSchemaAction, MetadataRegistryEditSchemaAction,
MetadataRegistrySelectFieldAction, MetadataRegistrySelectFieldAction,
MetadataRegistrySelectSchemaAction MetadataRegistrySelectSchemaAction
} from "../../+admin/admin-registries/metadata-registry/metadata-registry.actions"; } from '../../+admin/admin-registries/metadata-registry/metadata-registry.actions';
import {flatMap, map, tap} from "rxjs/operators"; import { flatMap, map, tap } from 'rxjs/operators';
const metadataRegistryStateSelector = (state: AppState) => state.metadataRegistry; const metadataRegistryStateSelector = (state: AppState) => state.metadataRegistry;
const editMetadataSchemaSelector = createSelector(metadataRegistryStateSelector, (metadataState: MetadataRegistryState) => metadataState.editSchema); const editMetadataSchemaSelector = createSelector(metadataRegistryStateSelector, (metadataState: MetadataRegistryState) => metadataState.editSchema);
@@ -199,8 +199,8 @@ export class RegistryService {
} }
private getMetadataFieldsBySchemaRequestObs(pagination: PaginationComponentOptions, schema: MetadataSchema): Observable<RestRequest> { private getMetadataFieldsBySchemaRequestObs(pagination: PaginationComponentOptions, schema: MetadataSchema): Observable<RestRequest> {
return this.halService.getEndpoint(this.metadataFieldsPath + "/search/bySchema").pipe( return this.halService.getEndpoint(this.metadataFieldsPath + '/search/bySchema').pipe(
// return this.halService.getEndpoint(this.metadataFieldsPath).pipe( // return this.halService.getEndpoint(this.metadataFieldsPath).pipe(
map((url: string) => { map((url: string) => {
const args: string[] = []; const args: string[] = [];
args.push(`schema=${schema.prefix}`); args.push(`schema=${schema.prefix}`);

2
src/app/shared/testing/utils.ts
View File

@@ -41,4 +41,4 @@ export function spyOnOperator(obj: any, prop: string): any {
}); });
return spyOn(obj, prop); return spyOn(obj, prop);
} }