Skip to content

Commit

Permalink
115046: Fixed incorrect name variant being saved in the store when ma…
Browse files Browse the repository at this point in the history
…rking relationship ready for deletion
  • Loading branch information
alexandrevryghem committed May 28, 2024
1 parent 0557f70 commit e43bab3
Showing 1 changed file with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -336,16 +336,16 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
modalComp.submitEv = () => {
modalComp.isPending = true;
const isLeft = this.currentItemIsLeftItem$.getValue();
const addOperations = modalComp.toAdd.map((searchResult: any) => ({ type: 'add', searchResult }));
const removeOperations = modalComp.toRemove.map((searchResult: any) => ({ type: 'remove', searchResult }));
const addOperations = modalComp.toAdd.map((searchResult: ItemSearchResult) => ({ type: 'add', searchResult }));
const removeOperations = modalComp.toRemove.map((searchResult: ItemSearchResult) => ({ type: 'remove', searchResult }));
observableFrom([...addOperations, ...removeOperations]).pipe(

Check warning on line 341 in src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts

View check run for this annotation

Codecov / codecov/patch

src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts#L337-L341

Added lines #L337 - L341 were not covered by tests
concatMap(({ type, searchResult }: { type: string, searchResult: any }) => {
concatMap(({ type, searchResult }: { type: string, searchResult: ItemSearchResult }) => {
const relatedItem: Item = searchResult.indexableObject;

Check warning on line 343 in src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts

View check run for this annotation

Codecov / codecov/patch

src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts#L343

Added line #L343 was not covered by tests
if (type === 'add') {
return this.relationshipService.getNameVariant(this.listId, relatedItem.uuid).pipe(

Check warning on line 345 in src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts

View check run for this annotation

Codecov / codecov/patch

src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts#L345

Added line #L345 was not covered by tests
map((nameVariant) => {
const update = {
uuid: `${this.relationshipType.id}-${searchResult.indexableObject.uuid}`,
uuid: `${this.relationshipType.id}-${relatedItem.uuid}`,
nameVariant,
type: this.relationshipType,
originalIsLeft: isLeft,
Expand All @@ -358,7 +358,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
take(1),
);
} else if (type === 'remove') {
return this.relationshipService.getNameVariant(this.listId, searchResult.indexableObjectuuid).pipe(
return this.relationshipService.getNameVariant(this.listId, relatedItem.uuid).pipe(

Check warning on line 361 in src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts

View check run for this annotation

Codecov / codecov/patch

src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts#L361

Added line #L361 was not covered by tests
switchMap((nameVariant) => {
return this.getRelationFromId(searchResult.indexableObject).pipe(

Check warning on line 363 in src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts

View check run for this annotation

Codecov / codecov/patch

src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts#L363

Added line #L363 was not covered by tests
map( (relationship: Relationship) => {
Expand Down

0 comments on commit e43bab3

Please sign in to comment.