mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-15 05:53:03 +00:00
Merge branch 'resolvers-branch-angular6' into patch-support
This commit is contained in:
@@ -17,14 +17,11 @@ import { ResponseCacheService } from '../cache/response-cache.service';
|
||||
import { RegistryMetadataschemasResponse } from './registry-metadataschemas-response.model';
|
||||
import { ResponseCacheEntry } from '../cache/response-cache.reducer';
|
||||
import {
|
||||
MetadataschemaSuccessResponse,
|
||||
RegistryBitstreamformatsSuccessResponse,
|
||||
RegistryMetadatafieldsSuccessResponse,
|
||||
RegistryMetadataschemasSuccessResponse
|
||||
} from '../cache/response-cache.models';
|
||||
import { HALEndpointService } from '../shared/hal-endpoint.service';
|
||||
import { MetadataschemaParsingService } from '../data/metadataschema-parsing.service';
|
||||
import { Res } from 'awesome-typescript-loader/dist/checker/protocol';
|
||||
import { RegistryMetadatafieldsResponseParsingService } from '../data/registry-metadatafields-response-parsing.service';
|
||||
import { RegistryMetadatafieldsResponse } from './registry-metadatafields-response.model';
|
||||
import { isNotEmpty } from '../../shared/empty.util';
|
||||
|
@@ -1,12 +1,16 @@
|
||||
import {
|
||||
Component, ComponentFactoryResolver,
|
||||
Component,
|
||||
ComponentFactoryResolver,
|
||||
ContentChildren,
|
||||
EventEmitter,
|
||||
Input,
|
||||
OnChanges,
|
||||
Output,
|
||||
QueryList,
|
||||
SimpleChanges, Type, ViewChild, ViewContainerRef
|
||||
SimpleChanges,
|
||||
Type,
|
||||
ViewChild,
|
||||
ViewContainerRef
|
||||
} from '@angular/core';
|
||||
import { FormGroup } from '@angular/forms';
|
||||
import {
|
||||
@@ -20,11 +24,11 @@ import {
|
||||
DYNAMIC_FORM_CONTROL_TYPE_SELECT,
|
||||
DYNAMIC_FORM_CONTROL_TYPE_TEXTAREA,
|
||||
DYNAMIC_FORM_CONTROL_TYPE_TIMEPICKER,
|
||||
DynamicDatePickerModel, DynamicFormControl, DynamicFormControlComponent,
|
||||
DynamicDatePickerModel,
|
||||
DynamicFormControl,
|
||||
DynamicFormControlContainerComponent,
|
||||
DynamicFormControlEvent,
|
||||
DynamicFormControlModel,
|
||||
DynamicFormLayout,
|
||||
DynamicFormControlModel, DynamicFormLayout,
|
||||
DynamicFormLayoutService,
|
||||
DynamicFormValidationService,
|
||||
DynamicTemplateDirective,
|
||||
@@ -77,7 +81,7 @@ export class DsDynamicFormControlComponent extends DynamicFormControlContainerCo
|
||||
@Input() context: any | null = null;
|
||||
@Input() group: FormGroup;
|
||||
@Input() hasErrorMessaging = false;
|
||||
@Input() layout: DynamicFormLayout;
|
||||
@Input() layout = null as DynamicFormLayout;
|
||||
@Input() model: any;
|
||||
|
||||
/* tslint:disable:no-output-rename */
|
||||
|
@@ -29,7 +29,7 @@ export class DsDynamicFormComponent extends DynamicFormComponent {
|
||||
@Input() formId: string;
|
||||
@Input() formGroup: FormGroup;
|
||||
@Input() formModel: DynamicFormControlModel[];
|
||||
@Input() formLayout: DynamicFormLayout = null;
|
||||
@Input() formLayout = null as DynamicFormLayout;
|
||||
|
||||
/* tslint:disable:no-output-rename */
|
||||
@Output('dfBlur') blur: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
|
||||
|
@@ -59,7 +59,7 @@ export class FormComponent implements OnDestroy, OnInit {
|
||||
@Input() formModel: DynamicFormControlModel[];
|
||||
@Input() parentFormModel: DynamicFormGroupModel | DynamicFormGroupModel[];
|
||||
@Input() formGroup: FormGroup;
|
||||
@Input() formLayout: DynamicFormLayout = null;
|
||||
@Input() formLayout = null as DynamicFormLayout;
|
||||
|
||||
/* tslint:disable:no-output-rename */
|
||||
@Output('dfBlur') blur: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
|
||||
|
@@ -1,4 +1,4 @@
|
||||
import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
|
||||
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
import { BrowserModule, By } from '@angular/platform-browser';
|
||||
import { ChangeDetectorRef, DebugElement } from '@angular/core';
|
||||
|
||||
@@ -9,11 +9,6 @@ import { notificationsReducer } from '../notifications.reducers';
|
||||
import { Store, StoreModule } from '@ngrx/store';
|
||||
import { NotificationOptions } from '../models/notification-options.model';
|
||||
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
|
||||
import { Router } from '@angular/router';
|
||||
import { NotificationsServiceStub } from '../../testing/notifications-service-stub';
|
||||
import { AppState } from '../../../app.reducer';
|
||||
import { Observable } from 'rxjs';
|
||||
import { SearchPageComponent } from '../../../+search-page/search-page.component';
|
||||
import { INotificationBoardOptions } from '../../../../config/notifications-config.interfaces';
|
||||
import { GlobalConfig } from '../../../../config/global-config.interface';
|
||||
import { Notification } from '../models/notification.model';
|
||||
|
@@ -1,4 +1,3 @@
|
||||
|
||||
import {of as observableOf, Observable } from 'rxjs';
|
||||
import {
|
||||
ChangeDetectionStrategy,
|
||||
@@ -14,7 +13,6 @@ import {
|
||||
import { trigger } from '@angular/animations';
|
||||
import { DomSanitizer } from '@angular/platform-browser';
|
||||
import { NotificationsService } from '../notifications.service';
|
||||
import { INotification } from '../models/notification.model';
|
||||
import { scaleEnter, scaleInState, scaleLeave, scaleOutState } from '../../animations/scale';
|
||||
import { rotateEnter, rotateInState, rotateLeave, rotateOutState } from '../../animations/rotate';
|
||||
import { fromBottomEnter, fromBottomInState, fromBottomLeave, fromBottomOutState } from '../../animations/fromBottom';
|
||||
@@ -24,6 +22,7 @@ import { fromTopEnter, fromTopInState, fromTopLeave, fromTopOutState } from '../
|
||||
import { fadeInEnter, fadeInState, fadeOutLeave, fadeOutState } from '../../animations/fade';
|
||||
import { NotificationAnimationsStatus } from '../models/notification-animations-type';
|
||||
import { isNotEmpty } from '../../empty.util';
|
||||
import { INotification } from '../models/notification.model';
|
||||
|
||||
@Component({
|
||||
selector: 'ds-notification',
|
||||
@@ -46,7 +45,7 @@ import { isNotEmpty } from '../../empty.util';
|
||||
|
||||
export class NotificationComponent implements OnInit, OnDestroy {
|
||||
|
||||
@Input() public notification: INotification;
|
||||
@Input() public notification = null as INotification;
|
||||
|
||||
// Progress bar variables
|
||||
public title: Observable<string>;
|
||||
|
@@ -1,12 +1,15 @@
|
||||
|
||||
import {of as observableOf, Observable } from 'rxjs';
|
||||
import { of as observableOf, Observable } from 'rxjs';
|
||||
import { Inject, Injectable } from '@angular/core';
|
||||
import { INotification, Notification } from './models/notification.model';
|
||||
import { NotificationType } from './models/notification-type';
|
||||
import { NotificationOptions } from './models/notification-options.model';
|
||||
import { uniqueId } from 'lodash';
|
||||
import { Store } from '@ngrx/store';
|
||||
import { NewNotificationAction, RemoveAllNotificationsAction, RemoveNotificationAction } from './notifications.actions';
|
||||
import {
|
||||
NewNotificationAction,
|
||||
RemoveAllNotificationsAction,
|
||||
RemoveNotificationAction
|
||||
} from './notifications.actions';
|
||||
import { GLOBAL_CONFIG, GlobalConfig } from '../../../config';
|
||||
|
||||
@Injectable()
|
||||
|
Reference in New Issue
Block a user