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

fix an issue where a relationship in the submission would keep loading until you click the page

Browse Source
This commit is contained in:
Art Lowel
2020-04-22 18:17:08 +02:00
parent 056bac885d
commit adc7649820
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.html
View File

@@ -1,10 +1,10 @@
<div class="d-flex">
<span class="mr-auto text-contents">
<ng-container *ngIf="!relatedItem">
<ng-container *ngIf="!(relatedItem$ | async)">
<ds-loading [showMessage]="false"></ds-loading>
</ng-container>
<ng-container *ngIf="relatedItem">
<ds-listable-object-component-loader [showLabel]="false" [viewMode]="viewType" [object]="relatedItem"></ds-listable-object-component-loader>
<ng-container *ngIf="(relatedItem$ | async)">
<ds-listable-object-component-loader [showLabel]="false" [viewMode]="viewType" [object]="(relatedItem$ | async)"></ds-listable-object-component-loader>
</ng-container>
</span>
<button type="button" class="btn btn-secondary"

10
src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.ts
View File

@@ -10,7 +10,7 @@ import {
import { FormControl } from '@angular/forms';
import { DynamicFormArrayGroupModel } from '@ng-dynamic-forms/core';
import { Store } from '@ngrx/store';
import { Observable, of as observableOf, Subscription } from 'rxjs';
import { Observable, of as observableOf, Subscription, BehaviorSubject } from 'rxjs';
import { filter } from 'rxjs/operators';
import { AppState } from '../../../../../app.reducer';
import { Item } from '../../../../../core/shared/item.model';
@@ -77,7 +77,7 @@ export class ExistingRelationListElementComponent implements OnInit, OnChanges,
@Input() metadataFields: string[];
@Input() relationshipOptions: RelationshipOptions;
@Input() submissionId: string;
relatedItem: Item;
relatedItem$: BehaviorSubject<Item> = new BehaviorSubject<Item>(undefined);
viewType = ViewMode.ListElement;
@Output() remove: EventEmitter<any> = new EventEmitter();
@@ -108,7 +108,7 @@ export class ExistingRelationListElementComponent implements OnInit, OnChanges,
getRemoteDataPayload(),
filter((item: Item) => hasValue(item) && isNotEmpty(item.uuid))
).subscribe((item: Item) => {
this.relatedItem = item;
this.relatedItem$.next(item);
}));
}
@@ -118,8 +118,8 @@ export class ExistingRelationListElementComponent implements OnInit, OnChanges,
* Removes the selected relationship from the list
*/
removeSelection() {
this.selectableListService.deselectSingle(this.listId, Object.assign(new ItemSearchResult(), { indexableObject: this.relatedItem }));
this.store.dispatch(new RemoveRelationshipAction(this.submissionItem, this.relatedItem, this.relationshipOptions.relationshipType, this.submissionId));
this.selectableListService.deselectSingle(this.listId, Object.assign(new ItemSearchResult(), { indexableObject: this.relatedItem$ }));
this.store.dispatch(new RemoveRelationshipAction(this.submissionItem, this.relatedItem$.getValue(), this.relationshipOptions.relationshipType, this.submissionId));
}
/**