Merge branch 'master' into w2p-68346_Bundles-in-edit-item-Updates

Conflicts: package.json src/app/+item-page/item-page-routing.module.ts src/app/core/cache/builders/remote-data-build.service.ts src/app/core/cache/server-sync-buffer.effects.ts src/app/core/core.module.ts src/app/core/data/bitstream-data.service.ts src/app/core/data/bundle-data.service.ts src/app/core/data/data.service.ts src/app/core/data/dso-change-analyzer.service.ts src/app/core/data/item-data.service.ts src/app/core/data/object-updates/object-updates.actions.ts src/app/core/shared/bitstream.model.ts src/app/core/shared/dspace-object.model.ts src/app/shared/mocks/mock-request.service.ts src/app/shared/shared.module.ts yarn.lock
2025-10-18 23:43:01 +00:00 · 2020-03-05 17:21:38 +01:00
parent c8be50614a 01231ef105
commit a054938d80
526 changed files with 11384 additions and 9370 deletions
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.scss
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.scss
@@ -9,7 +9,7 @@
  justify-content: center;
 }

-:host /deep/ .custom-select {
+:host ::ng-deep .custom-select {
  -webkit-appearance: none;
  -moz-appearance: none;
  appearance: none;
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
@@ -160,7 +160,7 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
      imports: [
        FormsModule,
        ReactiveFormsModule,
-        NgbModule.forRoot(),
+        NgbModule,
        DynamicFormsCoreModule.forRoot(),
        SharedModule,
        TranslateModule.forRoot(),
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
@@ -29,13 +29,13 @@ import {
  DYNAMIC_FORM_CONTROL_TYPE_SELECT,
  DYNAMIC_FORM_CONTROL_TYPE_TEXTAREA,
  DYNAMIC_FORM_CONTROL_TYPE_TIMEPICKER,
-  DynamicDatePickerModel,
+  DynamicDatePickerModel, DynamicFormComponentService,
  DynamicFormControl,
  DynamicFormControlContainerComponent,
  DynamicFormControlEvent,
-  DynamicFormControlModel, DynamicFormInstancesService,
+  DynamicFormControlModel,
  DynamicFormLayout,
-  DynamicFormLayoutService,
+  DynamicFormLayoutService, DynamicFormRelationService,
  DynamicFormValidationService,
  DynamicTemplateDirective,
 } from '@ng-dynamic-forms/core';
@@ -50,6 +50,7 @@ import {
  DynamicNGBootstrapTimePickerComponent
 } from '@ng-dynamic-forms/ui-ng-bootstrap';
 import { TranslateService } from '@ngx-translate/core';
+import { followLink } from '../../../utils/follow-link-config.model';
 import {
  Reorderable,
  ReorderableRelationship
@@ -206,32 +207,32 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
  @Output('dfFocus') focus: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
  @Output('ngbEvent') customEvent: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
  /* tslint:enable:no-output-rename */
-  @ViewChild('componentViewContainer', { read: ViewContainerRef }) componentViewContainerRef: ViewContainerRef;
+  @ViewChild('componentViewContainer', { read: ViewContainerRef, static: true}) componentViewContainerRef: ViewContainerRef;

  private showErrorMessagesPreviousStage: boolean;

  get componentType(): Type<DynamicFormControl> | null {
-    return this.layoutService.getCustomComponentType(this.model) || dsDynamicFormControlMapFn(this.model);
+    return dsDynamicFormControlMapFn(this.model);
  }

  constructor(
    protected componentFactoryResolver: ComponentFactoryResolver,
-    protected dynamicFormInstanceService: DynamicFormInstancesService,
+    protected dynamicFormComponentService: DynamicFormComponentService,
    protected layoutService: DynamicFormLayoutService,
    protected validationService: DynamicFormValidationService,
    protected translateService: TranslateService,
+    protected relationService: DynamicFormRelationService,
    private modalService: NgbModal,
-    private relationService: RelationshipService,
+    private relationshipService: RelationshipService,
    private selectableListService: SelectableListService,
    private itemService: ItemDataService,
-    private relationshipService: RelationshipService,
    private zone: NgZone,
    private store: Store<AppState>,
    private submissionObjectService: SubmissionObjectDataService,
    private ref: ChangeDetectorRef
  ) {

-    super(componentFactoryResolver, layoutService, validationService, dynamicFormInstanceService);
+    super(componentFactoryResolver, layoutService, validationService, dynamicFormComponentService, relationService);
  }

  /**
@@ -245,7 +246,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
      this.listId = 'list-' + this.model.relationship.relationshipType;

      const submissionObject$ = this.submissionObjectService
-        .findById(this.model.submissionId).pipe(
+        .findById(this.model.submissionId, followLink('item'), followLink('collection')).pipe(
          getAllSucceededRemoteData(),
          getRemoteDataPayload()
        );
@@ -256,7 +257,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
      this.subs.push(item$.subscribe((item) => this.item = item));
      this.subs.push(collection$.subscribe((collection) => this.collection = collection));
      this.reorderables$ = item$.pipe(
-        switchMap((item) => this.relationService.getItemRelationshipsByLabel(item, this.model.relationship.relationshipType)
+        switchMap((item) => this.relationshipService.getItemRelationshipsByLabel(item, this.model.relationship.relationshipType, undefined, followLink('leftItem'), followLink('rightItem'), followLink('relationshipType'))
          .pipe(
            getAllSucceededRemoteData(),
            getRemoteDataPayload(),
@@ -288,9 +289,12 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
        this.ref.detectChanges();
      }));

-      this.relationService.getRelatedItemsByLabel(this.item, this.model.relationship.relationshipType).pipe(
+      item$.pipe(
+        switchMap((item) => this.relationshipService.getRelatedItemsByLabel(item, this.model.relationship.relationshipType)),
        map((items: RemoteData<PaginatedList<Item>>) => items.payload.page.map((item) => Object.assign(new ItemSearchResult(), { indexableObject: item }))),
-      ).subscribe((relatedItems: Array<SearchResult<Item>>) => this.selectableListService.select(this.listId, relatedItems));
+      ).subscribe((relatedItems: Array<SearchResult<Item>>) => {
+        this.selectableListService.select(this.listId, relatedItems)
+      });
    }
  }

--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.spec.ts
@@ -26,7 +26,7 @@ describe('DsDatePickerInlineComponent test suite', () => {
                ReactiveFormsModule,
                NoopAnimationsModule,
                TextMaskModule,
-                NgbDatepickerModule.forRoot(),
+                NgbDatepickerModule,
                DynamicFormsCoreModule.forRoot()
            ],
            declarations: [DsDatePickerInlineComponent]
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts
@@ -24,7 +24,7 @@ export class DsDatePickerInlineComponent extends DynamicFormControlComponent {
  @Output() change: EventEmitter<any> = new EventEmitter();
  @Output() focus: EventEmitter<any> = new EventEmitter();

-  @ViewChild(NgbDatepicker) ngbDatePicker: NgbDatepicker;
+  @ViewChild(NgbDatepicker, {static: false}) ngbDatePicker: NgbDatepicker;

  constructor(protected layoutService: DynamicFormLayoutService,
              protected validationService: DynamicFormValidationService,
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts
@@ -43,7 +43,7 @@ describe('DsDatePickerComponent test suite', () => {

    TestBed.configureTestingModule({
      imports: [
-        NgbModule.forRoot()
+        NgbModule
      ],
      declarations: [
        DsDatePickerComponent,
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.spec.ts
@@ -88,7 +88,7 @@ describe('DsDynamicListComponent test suite', () => {
        DynamicFormsNGBootstrapUIModule,
        FormsModule,
        ReactiveFormsModule,
-        NgbModule.forRoot()
+        NgbModule
      ],
      declarations: [
        DsDynamicListComponent,
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.scss
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.scss
@@ -2,7 +2,7 @@
  display:none
 }

-:host /deep/ .dropdown-menu {
+:host ::ng-deep .dropdown-menu {
  left: 0 !important;
  width: 100% !important;
  max-height: $dropdown-menu-max-height;
@@ -10,10 +10,10 @@
  overflow-x: hidden;
 }

-:host /deep/ .dropdown-item.active,
-:host /deep/ .dropdown-item:active,
-:host /deep/ .dropdown-item:focus,
-:host /deep/ .dropdown-item:hover {
+:host ::ng-deep .dropdown-item.active,
+:host ::ng-deep .dropdown-item:active,
+:host ::ng-deep .dropdown-item:focus,
+:host ::ng-deep .dropdown-item:hover {
  color: $dropdown-link-hover-color !important;
  background-color: $dropdown-link-hover-bg !important;
 }
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
@@ -160,7 +160,7 @@ describe('Dynamic Lookup component', () => {
        FormsModule,
        InfiniteScrollModule,
        ReactiveFormsModule,
-        NgbModule.forRoot(),
+        NgbModule,
        TranslateModule.forRoot()
      ],
      declarations: [
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts
@@ -113,7 +113,7 @@ describe('DsDynamicRelationGroupComponent test suite', () => {
        BrowserAnimationsModule,
        FormsModule,
        ReactiveFormsModule,
-        NgbModule.forRoot(),
+        NgbModule,
        StoreModule.forRoot({}),
        TranslateModule.forRoot()
      ],
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts
@@ -65,7 +65,7 @@ export class DsDynamicRelationGroupComponent extends DynamicFormControlComponent
  private selectedChipItem: ChipsItem;
  private subs: Subscription[] = [];

-  @ViewChild('formRef') private formRef: FormComponent;
+  @ViewChild('formRef', {static: false}) private formRef: FormComponent;

  constructor(@Inject(GLOBAL_CONFIG) protected EnvConfig: GlobalConfig,
              private authorityService: AuthorityService,
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts
@@ -64,7 +64,7 @@ describe('Dynamic Dynamic Scrollable Dropdown component', () => {
        FormsModule,
        InfiniteScrollModule,
        ReactiveFormsModule,
-        NgbModule.forRoot(),
+        NgbModule,
        TranslateModule.forRoot()
      ],
      declarations: [
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.scss
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.scss
@@ -8,7 +8,7 @@
  padding-right: 100%;
 }

-:host /deep/ .dropdown-menu {
+:host ::ng-deep .dropdown-menu {
  width: 100% !important;
  max-height: $dropdown-menu-max-height;
  overflow-y: scroll;
@@ -17,10 +17,10 @@
  margin-top: $spacer !important;
 }

-:host /deep/ .dropdown-item.active,
-:host /deep/ .dropdown-item:active,
-:host /deep/ .dropdown-item:focus,
-:host /deep/ .dropdown-item:hover {
+:host ::ng-deep .dropdown-item.active,
+:host ::ng-deep .dropdown-item:active,
+:host ::ng-deep .dropdown-item:focus,
+:host ::ng-deep .dropdown-item:hover {
  color: $dropdown-link-hover-color !important;
  background-color: $dropdown-link-hover-bg !important;
 }
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.spec.ts
@@ -85,7 +85,7 @@ describe('DsDynamicTagComponent test suite', () => {
        DynamicFormsCoreModule,
        DynamicFormsNGBootstrapUIModule,
        FormsModule,
-        NgbModule.forRoot(),
+        NgbModule,
        ReactiveFormsModule,
      ],
      declarations: [
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts
@@ -33,7 +33,7 @@ export class DsDynamicTagComponent extends DynamicFormControlComponent implement
  @Output() change: EventEmitter<any> = new EventEmitter<any>();
  @Output() focus: EventEmitter<any> = new EventEmitter<any>();

-  @ViewChild('instance') instance: NgbTypeahead;
+  @ViewChild('instance', {static: false}) instance: NgbTypeahead;

  chips: Chips;
  hasAuthority: boolean;
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component.scss
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component.scss
@@ -1,18 +1,18 @@
-:host /deep/ .dropdown-menu {
+:host ::ng-deep .dropdown-menu {
  width: 100% !important;
  max-height: $dropdown-menu-max-height;
  overflow-y: auto !important;
  overflow-x: hidden;
 }

-:host /deep/ .dropdown-item {
+:host ::ng-deep .dropdown-item {
  border-bottom: $dropdown-border-width solid $dropdown-border-color;
 }

-:host /deep/ .dropdown-item.active,
-:host /deep/ .dropdown-item:active,
-:host /deep/ .dropdown-item:focus,
-:host /deep/ .dropdown-item:hover {
+:host ::ng-deep .dropdown-item.active,
+:host ::ng-deep .dropdown-item:active,
+:host ::ng-deep .dropdown-item:focus,
+:host ::ng-deep .dropdown-item:hover {
  color: $dropdown-link-hover-color !important;
  background-color: $dropdown-link-hover-bg !important;
 }
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component.spec.ts
@@ -70,7 +70,7 @@ describe('DsDynamicTypeaheadComponent test suite', () => {
        DynamicFormsCoreModule,
        DynamicFormsNGBootstrapUIModule,
        FormsModule,
-        NgbModule.forRoot(),
+        NgbModule,
        ReactiveFormsModule,
        TranslateModule.forRoot()
      ],
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component.ts
@@ -31,7 +31,7 @@ export class DsDynamicTypeaheadComponent extends DynamicFormControlComponent imp
  @Output() change: EventEmitter<any> = new EventEmitter<any>();
  @Output() focus: EventEmitter<any> = new EventEmitter<any>();

-  @ViewChild('instance') instance: NgbTypeahead;
+  @ViewChild('instance', {static: false}) instance: NgbTypeahead;

  searching = false;
  searchOptions: IntegrationSearchOptions;
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
@@ -79,7 +79,7 @@ describe('DsDynamicLookupRelationModalComponent', () => {
    init();
    TestBed.configureTestingModule({
      declarations: [DsDynamicLookupRelationModalComponent],
-      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NgbModule.forRoot()],
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NgbModule],
      providers: [
        {
          provide: SearchConfigurationService, useValue: {
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts
@@ -95,7 +95,7 @@ describe('DsDynamicLookupRelationExternalSourceTabComponent', () => {
    init();
    TestBed.configureTestingModule({
      declarations: [DsDynamicLookupRelationExternalSourceTabComponent, VarDirective],
-      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NgbModule.forRoot(), BrowserAnimationsModule],
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NgbModule, BrowserAnimationsModule],
      providers: [
        {
          provide: SearchConfigurationService, useValue: {
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.spec.ts
@@ -67,7 +67,7 @@ describe('DsDynamicLookupRelationExternalSourceTabComponent', () => {
    init();
    TestBed.configureTestingModule({
      declarations: [ExternalSourceEntryImportModalComponent],
-      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NgbModule.forRoot()],
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NgbModule],
      providers: [
        { provide: LookupRelationService, useValue: lookupRelationService },
        { provide: SelectableListService, useValue: selectService },