From d817386ba1234cd0a55c891c2e1beb93e9c83d6a Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Mon, 1 Mar 2021 10:24:43 -0700 Subject: [PATCH] Fixed issue with contention --- backend/src/main/resources/i18n/messages.properties | 1 + .../component/contention-dialog.component.html | 12 ++++++++---- ui/src/app/contention/effect/contention.effect.ts | 6 ------ .../metadata/provider/effect/collection.effect.ts | 4 ++-- .../app/metadata/provider/effect/editor.effect.ts | 13 ++++++++----- .../app/metadata/resolver/effect/entity.effect.ts | 11 +++++++++-- 6 files changed, 28 insertions(+), 19 deletions(-) diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties index 0d5356269..0032a25ed 100644 --- a/backend/src/main/resources/i18n/messages.properties +++ b/backend/src/main/resources/i18n/messages.properties @@ -453,6 +453,7 @@ message.protocol-support-required=Protocol Support Enumeration is required if an message.conflict=Conflict message.data-version-contention=Data Version Contention message.contention-new-version=A newer version of this metadata source has been saved. Below are a list of changes. You can use your changes or their changes. +message.contention-error=There was a problem saving due to a mismatched version. message.organization-feedback=These three fields must all be entered if any single field has a value. message.valid-email=Must be a valid Email Address message.valid-url=Must be a valid URL diff --git a/ui/src/app/contention/component/contention-dialog.component.html b/ui/src/app/contention/component/contention-dialog.component.html index 0922f982f..1ff63bb4b 100644 --- a/ui/src/app/contention/component/contention-dialog.component.html +++ b/ui/src/app/contention/component/contention-dialog.component.html @@ -3,12 +3,16 @@

Data Version Contention

-
+
-

- A newer version of this metadata source has been saved. Below are a list of changes. You can use your changes or their changes.

+

+ A newer version of this metadata source has been saved. Below are a list of changes. You can use your changes or their changes. +

+

+ There was a problem saving due to a mismatched version. +

-
+
diff --git a/ui/src/app/contention/effect/contention.effect.ts b/ui/src/app/contention/effect/contention.effect.ts index f6845df3f..55c815c71 100644 --- a/ui/src/app/contention/effect/contention.effect.ts +++ b/ui/src/app/contention/effect/contention.effect.ts @@ -23,12 +23,6 @@ export class ContentionEffects { switchMap(contention => { const resolutionAction = of(new ResolveContentionAction({ value: contention.resolutionObject, handlers: contention.handlers })); const rejectionAction = of(new CancelContentionAction({ value: contention.rejectionObject, handlers: contention.handlers })); - /*if (contention.ourChanges.length < 1) { - return rejectionAction; - } - if (contention.theirChanges.length < 1) { - return resolutionAction; - }*/ return this.modal .open(ContentionDialogComponent, DEFAULT_MODAL_OPTIONS, { contention }) .pipe( diff --git a/ui/src/app/metadata/provider/effect/collection.effect.ts b/ui/src/app/metadata/provider/effect/collection.effect.ts index 1eb9e5093..04d296c7e 100644 --- a/ui/src/app/metadata/provider/effect/collection.effect.ts +++ b/ui/src/app/metadata/provider/effect/collection.effect.ts @@ -33,13 +33,13 @@ import { MetadataProviderService } from '../../domain/service/provider.service'; import * as fromProvider from '../reducer'; import * as fromRoot from '../../../app.reducer'; import { array_move } from '../../../shared/util'; -import { ClearProvider, ResetChanges } from '../action/entity.action'; +import { ClearProvider } from '../action/entity.action'; import { ShowContentionAction } from '../../../contention/action/contention.action'; import { ContentionService } from '../../../contention/service/contention.service'; import { MetadataProvider } from '../../domain/model'; import { AddNotification } from '../../../notification/action/notification.action'; import { Notification, NotificationType } from '../../../notification/model/notification'; -import { WizardActionTypes, SetDisabled } from '../../../wizard/action/wizard.action'; +import { SetDisabled } from '../../../wizard/action/wizard.action'; import { I18nService } from '../../../i18n/service/i18n.service'; import * as fromI18n from '../../../i18n/reducer'; import { ClearEditor } from '../action/editor.action'; diff --git a/ui/src/app/metadata/provider/effect/editor.effect.ts b/ui/src/app/metadata/provider/effect/editor.effect.ts index 60ec2d719..28a134724 100644 --- a/ui/src/app/metadata/provider/effect/editor.effect.ts +++ b/ui/src/app/metadata/provider/effect/editor.effect.ts @@ -2,10 +2,7 @@ import { Injectable } from '@angular/core'; import { Effect, Actions, ofType } from '@ngrx/effects'; import { SchemaService } from '../../../schema-form/service/schema.service'; -import { - EditorActionTypes -} from '../action/editor.action'; -import { map, switchMap, catchError, withLatestFrom, debounceTime } from 'rxjs/operators'; +import { map, switchMap, catchError, debounceTime } from 'rxjs/operators'; import { of } from 'rxjs'; import { LoadSchemaRequest, @@ -18,6 +15,7 @@ import { ResetChanges } from '../action/entity.action'; import * as fromWizard from '../../../wizard/reducer'; import { Store } from '@ngrx/store'; +import { CancelContentionAction, ContentionActionTypes } from '../../../contention/action/contention.action'; @Injectable() export class EditorEffects { @@ -43,9 +41,14 @@ export class EditorEffects { map(() => new ResetChanges()) ); + @Effect() + $resetChangesOnContentionFail = this.actions$.pipe( + ofType(ContentionActionTypes.CANCEL_CONTENTION), + map(() => new ResetChanges()) + ); + constructor( private schemaService: SchemaService, - private store: Store, private actions$: Actions ) { } } /* istanbul ignore next */ diff --git a/ui/src/app/metadata/resolver/effect/entity.effect.ts b/ui/src/app/metadata/resolver/effect/entity.effect.ts index badd1925c..f869a55dc 100644 --- a/ui/src/app/metadata/resolver/effect/entity.effect.ts +++ b/ui/src/app/metadata/resolver/effect/entity.effect.ts @@ -12,11 +12,12 @@ import { Clear, Cancel, UpdateChangesRequest, - UpdateChangesSuccess + UpdateChangesSuccess, + UpdateSaving } from '../action/entity.action'; import * as provider from '../action/collection.action'; -import { ShowContentionAction } from '../../../contention/action/contention.action'; +import { CancelContentionAction, ContentionActionTypes, ShowContentionAction } from '../../../contention/action/contention.action'; import { ResolverCollectionActionTypes } from '../action/collection.action'; import { ResolverService } from '../../domain/service/resolver.service'; @@ -69,6 +70,12 @@ export class EntityEffects { }) ); + @Effect() + $resetChangesOnContentionFail = this.actions$.pipe( + ofType(ContentionActionTypes.CANCEL_CONTENTION), + map(() => new UpdateSaving(false)) + ); + constructor( private store: Store, private service: ResolverService,