Skip to content

Commit a2378e6

Browse files
committed
use unique instead of discriminator
1 parent 0a8ac3b commit a2378e6

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

src/Umbraco.Web.UI.Client/src/packages/core/content/workspace/content-detail-workspace-base.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@ export abstract class UmbContentDetailWorkspaceContextBase<
720720
const updatedEvent = new UmbEntityUpdatedEvent({
721721
unique,
722722
entityType,
723-
discriminator: this._workspaceEventDiscriminator,
723+
eventUnique: this._workspaceEventUnique,
724724
});
725725

726726
eventContext.dispatchEvent(updatedEvent);

src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action.event.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
33

44
// eslint-disable-next-line @typescript-eslint/no-empty-object-type
55
export interface UmbEntityActionEventArgs extends UmbEntityModel {
6-
discriminator?: string;
6+
eventUnique?: string;
77
}
88

99
export class UmbEntityActionEvent<
@@ -24,7 +24,7 @@ export class UmbEntityActionEvent<
2424
return this._args.unique;
2525
}
2626

27-
getDiscriminator(): string | undefined {
28-
return this._args.discriminator;
27+
getEventUnique(): string | undefined {
28+
return this._args.eventUnique;
2929
}
3030
}

src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
335335
const updatedEvent = new UmbEntityUpdatedEvent({
336336
unique,
337337
entityType,
338-
discriminator: this._workspaceEventDiscriminator,
338+
eventUnique: this._workspaceEventUnique,
339339
});
340340

341341
eventContext.dispatchEvent(updatedEvent);
@@ -422,19 +422,19 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
422422
}
423423

424424
// Discriminator to identify events from this workspace context
425-
protected readonly _workspaceEventDiscriminator = UmbId.new();
425+
protected readonly _workspaceEventUnique = UmbId.new();
426426

427427
#onEntityUpdatedEvent = (event: UmbEntityUpdatedEvent) => {
428428
const eventEntityUnique = event.getUnique();
429429
const eventEntityType = event.getEntityType();
430-
const eventDiscriminator = event.getDiscriminator();
430+
const eventDiscriminator = event.getEventUnique();
431431

432432
// Ignore events for other entities
433433
if (eventEntityType !== this.getEntityType()) return;
434434
if (eventEntityUnique !== this.getUnique()) return;
435435

436436
// Ignore events from this workspace so we don't reload the data twice. Ex saving this workspace
437-
if (eventDiscriminator === this._workspaceEventDiscriminator) return;
437+
if (eventDiscriminator === this._workspaceEventUnique) return;
438438

439439
this.reload();
440440
};

0 commit comments

Comments
 (0)