@mintplayer/ng-spark 22.24.0 → 22.26.0

package/fesm2022/mintplayer-ng-spark-po-edit.mjs

@@ -1,26 +1,774 @@
 import * as i0 from "@angular/core";
-import { ChangeDetectionStrategy, Component, computed, inject, output, signal } from "@angular/core";
+import { ChangeDetectionStrategy, Component, LOCALE_ID, computed, effect, inject, input, output, signal, untracked, viewChild } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
-import { CommonModule } from "@angular/common";
+import { CommonModule, NgTemplateOutlet, formatDate } from "@angular/common";
 import { ActivatedRoute, Router } from "@angular/router";
 import { Color } from "@mintplayer/ng-bootstrap";
 import { BsAlertComponent } from "@mintplayer/ng-bootstrap/alert";
 import { BsContainerComponent } from "@mintplayer/ng-bootstrap/container";
 import { BsSpinnerComponent } from "@mintplayer/ng-bootstrap/spinner";
+import { SPARK_CONFIG } from "@mintplayer/ng-spark";
 import { SparkLanguageService, SparkService } from "@mintplayer/ng-spark/services";
 import { SparkPoFormComponent } from "@mintplayer/ng-spark/po-form";
-import { ResolveTranslationPipe, TranslateKeyPipe } from "@mintplayer/ng-spark/pipes";
-import { ShowedOn, applyOverlay, dictToNestedPo, fromDateInputValue, hasShowedOnFlag, isDateDataType, nestedPoToDict, toDateInputValue, wireDatesEqual } from "@mintplayer/ng-spark/models";
+import { QueryCellValuePipe, QueryReferenceChipsPipe, ResolveTranslationPipe, TranslateKeyPipe } from "@mintplayer/ng-spark/pipes";
+import { AS_DETAIL_ROW_KEY, ShowedOn, applyOverlay, dictToNestedPo, formValuesEqual, fromDateInputValue, hasShowedOnFlag, isDateDataType, isReservedAsDetailKey, nestedPoToDict, rowMetadata, selfBreadcrumb, toDateInputValue, valueFor, wireDatesEqual } from "@mintplayer/ng-spark/models";
+import { BsModalBodyDirective, BsModalDirective, BsModalFooterDirective, BsModalHeaderDirective, BsModalHostComponent } from "@mintplayer/ng-bootstrap/modal";
+import { BsButtonTypeDirective } from "@mintplayer/ng-bootstrap/button-type";
+import { SparkGridCellComponent, SparkGridRenderers } from "@mintplayer/ng-spark/grid";
+import { cellValue } from "@mintplayer/ng-spark/renderers";
+const CONTRIBUTION_ROW_METADATA = "contribution";
+function contributionRowIsOwn(row) {
+	const facts = rowMetadata(row, CONTRIBUTION_ROW_METADATA);
+	return facts && typeof facts.own === "boolean" ? facts.own : void 0;
+}
+function mergeThreeWay(base, mine, theirs, schema, choices = {}) {
+	const ctx = {
+		resolve: schema.resolve,
+		choices,
+		conflicts: [],
+		theirChanges: [],
+		contributionNotices: []
+	};
+	return {
+		merged: mergeObject(schema.attributes, base ?? {}, mine ?? {}, theirs ?? {}, "", void 0, void 0, ctx),
+		conflicts: ctx.conflicts,
+		theirChanges: ctx.theirChanges,
+		contributionNotices: ctx.contributionNotices
+	};
+}
+function mergeObject(attributes, base, mine, theirs, prefix, root, rowLabel, ctx) {
+	const merged = { ...theirs };
+	for (const attribute of attributes) {
+		const at = {
+			path: prefix ? `${prefix}.${attribute.name}` : attribute.name,
+			attribute,
+			rootAttribute: root ?? attribute,
+			group: prefix,
+			rowLabel
+		};
+		merged[attribute.name] = mergeAttribute(at, base[attribute.name], mine[attribute.name], theirs[attribute.name], ctx);
+	}
+	return merged;
+}
+function mergeAttribute(at, base, mine, theirs, ctx) {
+	if (at.attribute.isReadOnly) return theirs;
+	if (at.attribute.dataType === "AsDetail" && at.attribute.asDetailType) {
+		const rowType = ctx.resolve(at.attribute.asDetailType);
+		if (rowType) {
+			const typed = {
+				...at,
+				rowType: {
+					attributes: rowType.attributes ?? [],
+					name: rowType.name
+				}
+			};
+			if (at.attribute.isArray) return mergeRows(typed, rowType.attributes ?? [], rowType.name, asRows(base), asRows(mine), asRows(theirs), ctx);
+			if (isPlainObject(base) && isPlainObject(mine) && isPlainObject(theirs) && !formValuesEqual(mine, base) && !formValuesEqual(theirs, base)) return mergeObject(rowType.attributes ?? [], base, mine, theirs, at.path, at.rootAttribute, at.rowLabel, ctx);
+			return mergeValue(typed, "value", base, mine, theirs, ctx);
+		}
+	}
+	return mergeValue(at, "value", base, mine, theirs, ctx);
+}
+function mergeValue(at, kind, base, mine, theirs, ctx) {
+	const mineChanged = !formValuesEqual(mine, base);
+	const theirsChanged = !formValuesEqual(theirs, base);
+	if (!mineChanged) {
+		if (theirsChanged) ctx.theirChanges.push({
+			path: at.path,
+			attribute: at.attribute,
+			rootAttribute: at.rootAttribute
+		});
+		return theirs;
+	}
+	if (!theirsChanged || formValuesEqual(mine, theirs)) return theirsChanged ? theirs : mine;
+	return conflict(at, kind, base, mine, theirs, ctx);
+}
+function conflict(at, kind, base, mine, theirs, ctx) {
+	ctx.conflicts.push({
+		path: at.path,
+		kind,
+		attribute: at.attribute,
+		rootAttribute: at.rootAttribute,
+		group: at.group,
+		rowLabel: at.rowLabel,
+		...at.rowType ? {
+			rowAttributes: at.rowType.attributes,
+			rowTypeName: at.rowType.name
+		} : {},
+		base,
+		mine,
+		theirs
+	});
+	return ctx.choices[at.path] === "mine" ? mine : theirs;
+}
+function mergeRows(at, rowAttributes, rowTypeName, base, mine, theirs, ctx) {
+	const baseByKey = byKey(base);
+	const mineByKey = byKey(mine);
+	const merged = [];
+	const seen = /* @__PURE__ */ new Set();
+	const mergeOne = (key, b, m, t) => {
+		const rowPath = `${at.path}[${key}]`;
+		const label = selfBreadcrumb(t ?? m ?? b, rowTypeName) ?? key;
+		const row = mergeRow({
+			...at,
+			path: rowPath,
+			rowLabel: label
+		}, rowAttributes, b, m, t, ctx);
+		if (row !== void 0) merged.push(row);
+	};
+	for (const t of theirs) {
+		const key = rowKey(t);
+		if (key === void 0) {
+			merged.push(t);
+			continue;
+		}
+		if (seen.has(key)) continue;
+		seen.add(key);
+		mergeOne(key, baseByKey.get(key), mineByKey.get(key), t);
+	}
+	for (const m of mine) {
+		const key = rowKey(m);
+		if (key === void 0) {
+			merged.push(m);
+			continue;
+		}
+		if (seen.has(key)) continue;
+		seen.add(key);
+		mergeOne(key, baseByKey.get(key), m, void 0);
+	}
+	return merged;
+}
+function mergeRow(at, rowAttributes, base, mine, theirs, ctx) {
+	if (contributionRowIsOwn(theirs ?? base) === false && !formValuesEqual(mine, base) && !formValuesEqual(theirs, base)) {
+		ctx.theirChanges.push({
+			path: at.path,
+			attribute: at.attribute,
+			rootAttribute: at.rootAttribute
+		});
+		ctx.contributionNotices.push({
+			path: at.path,
+			attribute: at.attribute,
+			rowLabel: at.rowLabel ?? at.path
+		});
+		return theirs;
+	}
+	if (base === void 0) {
+		if (mine !== void 0 && theirs !== void 0) return formValuesEqual(mine, theirs) ? theirs : conflict(at, "row", void 0, mine, theirs, ctx);
+		if (theirs !== void 0) {
+			ctx.theirChanges.push({
+				path: at.path,
+				attribute: at.attribute,
+				rootAttribute: at.rootAttribute
+			});
+			return theirs;
+		}
+		return mine;
+	}
+	if (mine === void 0 && theirs === void 0) return void 0;
+	if (mine === void 0) {
+		if (formValuesEqual(theirs, base)) return void 0;
+		return conflict(at, "row", base, void 0, theirs, ctx);
+	}
+	if (theirs === void 0) {
+		if (formValuesEqual(mine, base)) {
+			ctx.theirChanges.push({
+				path: at.path,
+				attribute: at.attribute,
+				rootAttribute: at.rootAttribute
+			});
+			return;
+		}
+		return conflict(at, "row", base, mine, void 0, ctx);
+	}
+	return mergeObject(rowAttributes, base, mine, theirs, at.path, at.rootAttribute, at.rowLabel, ctx);
+}
+function rowKey(row) {
+	const key = row?.[AS_DETAIL_ROW_KEY];
+	return typeof key === "string" && key !== "" ? key : void 0;
+}
+function byKey(rows) {
+	const map = /* @__PURE__ */ new Map();
+	for (const row of rows) {
+		const key = rowKey(row);
+		if (key !== void 0 && !map.has(key)) map.set(key, row);
+	}
+	return map;
+}
+function asRows(value) {
+	return Array.isArray(value) ? value.filter(isPlainObject) : [];
+}
+function isPlainObject(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+const cellValuePipe = new QueryCellValuePipe();
+const chipsPipe = new QueryReferenceChipsPipe();
+var SparkPoConflictDialogComponent = class SparkPoConflictDialogComponent {
+	language = inject(SparkLanguageService);
+	gridRenderers = inject(SparkGridRenderers);
+	conflicts = input([], ...ngDevMode ? [{ debugName: "conflicts" }] : /* istanbul ignore next */ []);
+	referenceLabels = input({}, ...ngDevMode ? [{ debugName: "referenceLabels" }] : /* istanbul ignore next */ []);
+	audit = input(null, ...ngDevMode ? [{ debugName: "audit" }] : /* istanbul ignore next */ []);
+	theyChanged = input(null, ...ngDevMode ? [{ debugName: "theyChanged" }] : /* istanbul ignore next */ []);
+	resolved = output();
+	cancelled = output();
+	colors = Color;
+	choices = signal({}, ...ngDevMode ? [{ debugName: "choices" }] : /* istanbul ignore next */ []);
+	lookupOptions = signal({}, ...ngDevMode ? [{ debugName: "lookupOptions" }] : /* istanbul ignore next */ []);
+	complete = computed(() => {
+		const choices = this.choices();
+		return this.conflicts().every((c) => choices[c.path] !== void 0);
+	}, ...ngDevMode ? [{ debugName: "complete" }] : /* istanbul ignore next */ []);
+	groups = computed(() => {
+		const lookups = this.lookupOptions();
+		const labels = this.referenceLabels();
+		const groups = /* @__PURE__ */ new Map();
+		for (const conflict of this.conflicts()) {
+			const key = conflict.kind === "row" ? conflict.path : conflict.group;
+			let group = groups.get(key);
+			if (!group) {
+				group = key === "" ? {
+					key,
+					entries: []
+				} : {
+					key,
+					attribute: conflict.rootAttribute,
+					rowLabel: conflict.kind === "row" ? void 0 : conflict.rowLabel,
+					entries: []
+				};
+				groups.set(key, group);
+			}
+			group.entries.push({
+				conflict,
+				mine: this.sideCell(conflict, conflict.mine, conflict.theirs, labels, lookups),
+				theirs: this.sideCell(conflict, conflict.theirs, conflict.mine, labels, lookups)
+			});
+		}
+		return [...groups.values()];
+	}, ...ngDevMode ? [{ debugName: "groups" }] : /* istanbul ignore next */ []);
+	constructor() {
+		effect(() => {
+			const conflicts = this.conflicts();
+			untracked(() => {
+				this.choices.set({});
+				const attributes = conflicts.flatMap((c) => [...c.kind === "value" ? [c.attribute] : [], ...c.rowAttributes ?? []]);
+				this.gridRenderers.loadLookupOptions(attributes).then((o) => this.lookupOptions.set(o), () => this.lookupOptions.set({}));
+			});
+		});
+	}
+	choose(path, side) {
+		this.choices.update((c) => ({
+			...c,
+			[path]: side
+		}));
+	}
+	chooseAll(side) {
+		const all = {};
+		for (const c of this.conflicts()) all[c.path] = side;
+		this.choices.set(all);
+	}
+	apply() {
+		if (!this.complete()) return;
+		this.resolved.emit(this.choices());
+	}
+	sideCell(conflict, value, other, labels, lookups) {
+		if (!(conflict.kind === "row" || conflict.attribute.dataType === "AsDetail")) return this.cell(conflict.attribute, value, labels, lookups);
+		const cell = this.cell(conflict.attribute, void 0, labels, lookups);
+		if (value === void 0 || value === null) {
+			cell.text = value === void 0 && conflict.kind === "row" ? this.language.t("common.conflictRowRemoved") : "-";
+			return cell;
+		}
+		if (!conflict.rowAttributes || typeof value !== "object" || Array.isArray(value)) {
+			cell.text = summarize(value) || "-";
+			return cell;
+		}
+		const row = value;
+		const otherRow = typeof other === "object" && other !== null && !Array.isArray(other) ? other : void 0;
+		cell.fields = conflict.rowAttributes.filter((a) => a.isVisible !== false).sort((a, b) => (a.order ?? 0) - (b.order ?? 0)).map((attribute) => ({
+			attribute,
+			cell: this.cell(attribute, row[attribute.name], labels, lookups),
+			differs: otherRow !== void 0 && !formValuesEqual(row[attribute.name], otherRow[attribute.name])
+		}));
+		return cell;
+	}
+	cell(attribute, value, labels, lookups) {
+		const column = attribute;
+		const wire = isDateDataType(attribute.dataType) ? fromDateInputValue(attribute.dataType, value) : value;
+		const isReference = attribute.dataType === "Reference";
+		const breadcrumb = isReference && typeof wire === "string" ? labels[wire] : void 0;
+		const breadcrumbs = isReference && Array.isArray(wire) ? Object.fromEntries(wire.filter((id) => typeof id === "string" && id in labels).map((id) => [id, labels[id]])) : void 0;
+		const item = {
+			id: "",
+			name: "",
+			objectTypeId: "",
+			attributes: [{
+				id: attribute.id,
+				name: attribute.name,
+				dataType: attribute.dataType,
+				isArray: attribute.isArray,
+				isRequired: false,
+				isVisible: true,
+				isReadOnly: true,
+				order: 0,
+				rules: [],
+				value: wire,
+				breadcrumb,
+				breadcrumbs
+			}]
+		};
+		const cell = {
+			column,
+			display: "",
+			rendererValue: null,
+			chips: [],
+			item
+		};
+		if (value === void 0 && attribute.dataType === "AsDetail") return cell;
+		if (attribute.dataType === "AsDetail" || typeof value === "object" && value !== null && !Array.isArray(value)) {
+			cell.text = summarize(value) || "-";
+			return cell;
+		}
+		const row = item;
+		const display = cellValuePipe.transform(column, row, lookups);
+		cell.display = attribute.dataType !== "boolean" && (display == null || display === "") ? "-" : display;
+		cell.rendererValue = cellValue(valueFor(row, attribute.name));
+		cell.chips = chipsPipe.transform(column, row);
+		return cell;
+	}
+	static ɵfac = i0.ɵɵngDeclareFactory({
+		minVersion: "12.0.0",
+		version: "22.2.0",
+		ngImport: i0,
+		type: SparkPoConflictDialogComponent,
+		deps: [],
+		target: i0.ɵɵFactoryTarget.Component
+	});
+	static ɵcmp = i0.ɵɵngDeclareComponent({
+		minVersion: "17.0.0",
+		version: "22.2.0",
+		type: SparkPoConflictDialogComponent,
+		isStandalone: true,
+		selector: "spark-po-conflict-dialog",
+		inputs: {
+			conflicts: {
+				classPropertyName: "conflicts",
+				publicName: "conflicts",
+				isSignal: true,
+				isRequired: false,
+				transformFunction: null
+			},
+			referenceLabels: {
+				classPropertyName: "referenceLabels",
+				publicName: "referenceLabels",
+				isSignal: true,
+				isRequired: false,
+				transformFunction: null
+			},
+			audit: {
+				classPropertyName: "audit",
+				publicName: "audit",
+				isSignal: true,
+				isRequired: false,
+				transformFunction: null
+			},
+			theyChanged: {
+				classPropertyName: "theyChanged",
+				publicName: "theyChanged",
+				isSignal: true,
+				isRequired: false,
+				transformFunction: null
+			}
+		},
+		outputs: {
+			resolved: "resolved",
+			cancelled: "cancelled"
+		},
+		ngImport: i0,
+		template: `
+    <bs-modal [isOpen]="conflicts().length > 0" (isOpenChange)="!$event && cancelled.emit()">
+      <div *bsModal>
+        <div bsModalHeader>
+          <h5 class="modal-title">{{ 'common.conflictTitle' | t }}</h5>
+        </div>
+        <div bsModalBody class="spark-conflict-dialog">
+          <p>{{ 'common.conflictIntro' | t }}</p>
+          @if (audit()) {
+            <p class="text-muted spark-conflict-audit">{{ audit() }}</p>
+          }
+          @if (theyChanged()) {
+            <p class="text-muted spark-conflict-they-changed">{{ theyChanged() }}</p>
+          }
+          @for (group of groups(); track group.key) {
+            <div class="mb-3 spark-conflict-group">
+              @if (group.attribute) {
+                <h6>
+                  <span>{{ group.attribute.label | resolveTranslation:group.attribute.name }}</span>
+                  @if (group.rowLabel) {
+                    <span> — {{ group.rowLabel }}</span>
+                  }
+                </h6>
+              }
+              <table class="table table-sm align-middle mb-0">
+                <thead>
+                  <tr>
+                    <th>{{ 'common.conflictField' | t }}</th>
+                    <th>{{ 'common.conflictMine' | t }}</th>
+                    <th>{{ 'common.conflictTheirs' | t }}</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  @for (entry of group.entries; track entry.conflict.path) {
+                    <tr class="spark-conflict" [attr.data-path]="entry.conflict.path">
+                      <th scope="row">
+                        @if (entry.conflict.kind === 'row') {
+                          {{ entry.conflict.rowLabel }}
+                        } @else {
+                          {{ entry.conflict.attribute.label | resolveTranslation:entry.conflict.attribute.name }}
+                        }
+                      </th>
+                      <td class="spark-conflict-mine-value">
+                        <label class="d-flex gap-2 align-items-start">
+                          <input type="radio" class="form-check-input spark-conflict-mine" [name]="entry.conflict.path"
+                                 [checked]="choices()[entry.conflict.path] === 'mine'" (change)="choose(entry.conflict.path, 'mine')" />
+                          <ng-container [ngTemplateOutlet]="side" [ngTemplateOutletContext]="{ $implicit: entry.mine }" />
+                        </label>
+                      </td>
+                      <td class="spark-conflict-theirs-value">
+                        <label class="d-flex gap-2 align-items-start">
+                          <input type="radio" class="form-check-input spark-conflict-theirs" [name]="entry.conflict.path"
+                                 [checked]="choices()[entry.conflict.path] === 'theirs'" (change)="choose(entry.conflict.path, 'theirs')" />
+                          <ng-container [ngTemplateOutlet]="side" [ngTemplateOutletContext]="{ $implicit: entry.theirs }" />
+                        </label>
+                      </td>
+                    </tr>
+                  }
+                </tbody>
+              </table>
+            </div>
+          }
+        </div>
+        <div bsModalFooter>
+          <button type="button" class="spark-conflict-all-mine" [color]="colors.secondary" (click)="chooseAll('mine')">{{ 'common.conflictKeepAllMine' | t }}</button>
+          <button type="button" class="spark-conflict-all-theirs" [color]="colors.secondary" (click)="chooseAll('theirs')">{{ 'common.conflictTakeAllTheirs' | t }}</button>
+          <button type="button" class="spark-conflict-cancel" [color]="colors.secondary" (click)="cancelled.emit()">{{ 'common.cancel' | t }}</button>
+          <button type="button" class="spark-conflict-apply" [color]="colors.primary" [disabled]="!complete()" (click)="apply()">{{ 'common.conflictApply' | t }}</button>
+        </div>
+      </div>
+    </bs-modal>
+
+    <!-- One side's value. A row is its attributes cell by cell, the ones the other side differs in marked. -->
+    <ng-template #side let-cell>
+      @if (cell.fields) {
+        <table class="table table-sm table-borderless mb-0 spark-conflict-row-cells">
+          <tbody>
+            @for (field of cell.fields; track field.attribute.name) {
+              <tr [class.spark-conflict-differs]="field.differs" [attr.data-attribute]="field.attribute.name">
+                <th scope="row" class="fw-normal text-muted pe-2">{{ field.attribute.label | resolveTranslation:field.attribute.name }}</th>
+                <td [class.fw-bold]="field.differs">
+                  <ng-container [ngTemplateOutlet]="value" [ngTemplateOutletContext]="{ $implicit: field.cell }" />
+                </td>
+              </tr>
+            }
+          </tbody>
+        </table>
+      } @else {
+        <span><ng-container [ngTemplateOutlet]="value" [ngTemplateOutletContext]="{ $implicit: cell }" /></span>
+      }
+    </ng-template>
+    <ng-template #value let-cell>
+      @if (cell.text !== undefined) { {{ cell.text }} } @else {
+        <spark-grid-cell [column]="cell.column" [display]="cell.display" [rendererValue]="cell.rendererValue"
+                         [item]="cell.item" [chips]="cell.chips" />
+      }
+    </ng-template>
+  `,
+		isInline: true,
+		dependencies: [
+			{
+				kind: "directive",
+				type: NgTemplateOutlet,
+				selector: "[ngTemplateOutlet]",
+				inputs: [
+					"ngTemplateOutletContext",
+					"ngTemplateOutlet",
+					"ngTemplateOutletInjector"
+				]
+			},
+			{
+				kind: "component",
+				type: BsModalHostComponent,
+				selector: "bs-modal",
+				inputs: [
+					"isOpen",
+					"closeOnEscape",
+					"scrollable"
+				],
+				outputs: ["isOpenChange"]
+			},
+			{
+				kind: "directive",
+				type: BsModalDirective,
+				selector: "[bsModal]"
+			},
+			{
+				kind: "directive",
+				type: BsModalHeaderDirective,
+				selector: "[bsModalHeader]"
+			},
+			{
+				kind: "directive",
+				type: BsModalBodyDirective,
+				selector: "[bsModalBody]"
+			},
+			{
+				kind: "directive",
+				type: BsModalFooterDirective,
+				selector: "[bsModalFooter]"
+			},
+			{
+				kind: "directive",
+				type: BsButtonTypeDirective,
+				selector: "button[color],input[type=\"button\"][color],input[type=\"submit\"][color],a[color]",
+				inputs: ["color"]
+			},
+			{
+				kind: "component",
+				type: SparkGridCellComponent,
+				selector: "spark-grid-cell",
+				inputs: [
+					"column",
+					"display",
+					"rendererValue",
+					"item",
+					"chips",
+					"link"
+				]
+			},
+			{
+				kind: "pipe",
+				type: ResolveTranslationPipe,
+				name: "resolveTranslation"
+			},
+			{
+				kind: "pipe",
+				type: TranslateKeyPipe,
+				name: "t"
+			}
+		],
+		changeDetection: i0.ChangeDetectionStrategy.OnPush
+	});
+};
+i0.ɵɵngDeclareClassMetadata({
+	minVersion: "12.0.0",
+	version: "22.2.0",
+	ngImport: i0,
+	type: SparkPoConflictDialogComponent,
+	decorators: [{
+		type: Component,
+		args: [{
+			selector: "spark-po-conflict-dialog",
+			imports: [
+				NgTemplateOutlet,
+				BsModalHostComponent,
+				BsModalDirective,
+				BsModalHeaderDirective,
+				BsModalBodyDirective,
+				BsModalFooterDirective,
+				BsButtonTypeDirective,
+				SparkGridCellComponent,
+				ResolveTranslationPipe,
+				TranslateKeyPipe
+			],
+			template: `
+    <bs-modal [isOpen]="conflicts().length > 0" (isOpenChange)="!$event && cancelled.emit()">
+      <div *bsModal>
+        <div bsModalHeader>
+          <h5 class="modal-title">{{ 'common.conflictTitle' | t }}</h5>
+        </div>
+        <div bsModalBody class="spark-conflict-dialog">
+          <p>{{ 'common.conflictIntro' | t }}</p>
+          @if (audit()) {
+            <p class="text-muted spark-conflict-audit">{{ audit() }}</p>
+          }
+          @if (theyChanged()) {
+            <p class="text-muted spark-conflict-they-changed">{{ theyChanged() }}</p>
+          }
+          @for (group of groups(); track group.key) {
+            <div class="mb-3 spark-conflict-group">
+              @if (group.attribute) {
+                <h6>
+                  <span>{{ group.attribute.label | resolveTranslation:group.attribute.name }}</span>
+                  @if (group.rowLabel) {
+                    <span> — {{ group.rowLabel }}</span>
+                  }
+                </h6>
+              }
+              <table class="table table-sm align-middle mb-0">
+                <thead>
+                  <tr>
+                    <th>{{ 'common.conflictField' | t }}</th>
+                    <th>{{ 'common.conflictMine' | t }}</th>
+                    <th>{{ 'common.conflictTheirs' | t }}</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  @for (entry of group.entries; track entry.conflict.path) {
+                    <tr class="spark-conflict" [attr.data-path]="entry.conflict.path">
+                      <th scope="row">
+                        @if (entry.conflict.kind === 'row') {
+                          {{ entry.conflict.rowLabel }}
+                        } @else {
+                          {{ entry.conflict.attribute.label | resolveTranslation:entry.conflict.attribute.name }}
+                        }
+                      </th>
+                      <td class="spark-conflict-mine-value">
+                        <label class="d-flex gap-2 align-items-start">
+                          <input type="radio" class="form-check-input spark-conflict-mine" [name]="entry.conflict.path"
+                                 [checked]="choices()[entry.conflict.path] === 'mine'" (change)="choose(entry.conflict.path, 'mine')" />
+                          <ng-container [ngTemplateOutlet]="side" [ngTemplateOutletContext]="{ $implicit: entry.mine }" />
+                        </label>
+                      </td>
+                      <td class="spark-conflict-theirs-value">
+                        <label class="d-flex gap-2 align-items-start">
+                          <input type="radio" class="form-check-input spark-conflict-theirs" [name]="entry.conflict.path"
+                                 [checked]="choices()[entry.conflict.path] === 'theirs'" (change)="choose(entry.conflict.path, 'theirs')" />
+                          <ng-container [ngTemplateOutlet]="side" [ngTemplateOutletContext]="{ $implicit: entry.theirs }" />
+                        </label>
+                      </td>
+                    </tr>
+                  }
+                </tbody>
+              </table>
+            </div>
+          }
+        </div>
+        <div bsModalFooter>
+          <button type="button" class="spark-conflict-all-mine" [color]="colors.secondary" (click)="chooseAll('mine')">{{ 'common.conflictKeepAllMine' | t }}</button>
+          <button type="button" class="spark-conflict-all-theirs" [color]="colors.secondary" (click)="chooseAll('theirs')">{{ 'common.conflictTakeAllTheirs' | t }}</button>
+          <button type="button" class="spark-conflict-cancel" [color]="colors.secondary" (click)="cancelled.emit()">{{ 'common.cancel' | t }}</button>
+          <button type="button" class="spark-conflict-apply" [color]="colors.primary" [disabled]="!complete()" (click)="apply()">{{ 'common.conflictApply' | t }}</button>
+        </div>
+      </div>
+    </bs-modal>
+
+    <!-- One side's value. A row is its attributes cell by cell, the ones the other side differs in marked. -->
+    <ng-template #side let-cell>
+      @if (cell.fields) {
+        <table class="table table-sm table-borderless mb-0 spark-conflict-row-cells">
+          <tbody>
+            @for (field of cell.fields; track field.attribute.name) {
+              <tr [class.spark-conflict-differs]="field.differs" [attr.data-attribute]="field.attribute.name">
+                <th scope="row" class="fw-normal text-muted pe-2">{{ field.attribute.label | resolveTranslation:field.attribute.name }}</th>
+                <td [class.fw-bold]="field.differs">
+                  <ng-container [ngTemplateOutlet]="value" [ngTemplateOutletContext]="{ $implicit: field.cell }" />
+                </td>
+              </tr>
+            }
+          </tbody>
+        </table>
+      } @else {
+        <span><ng-container [ngTemplateOutlet]="value" [ngTemplateOutletContext]="{ $implicit: cell }" /></span>
+      }
+    </ng-template>
+    <ng-template #value let-cell>
+      @if (cell.text !== undefined) { {{ cell.text }} } @else {
+        <spark-grid-cell [column]="cell.column" [display]="cell.display" [rendererValue]="cell.rendererValue"
+                         [item]="cell.item" [chips]="cell.chips" />
+      }
+    </ng-template>
+  `,
+			changeDetection: ChangeDetectionStrategy.OnPush
+		}]
+	}],
+	ctorParameters: () => [],
+	propDecorators: {
+		conflicts: [{
+			type: i0.Input,
+			args: [{
+				isSignal: true,
+				alias: "conflicts",
+				required: false
+			}]
+		}],
+		referenceLabels: [{
+			type: i0.Input,
+			args: [{
+				isSignal: true,
+				alias: "referenceLabels",
+				required: false
+			}]
+		}],
+		audit: [{
+			type: i0.Input,
+			args: [{
+				isSignal: true,
+				alias: "audit",
+				required: false
+			}]
+		}],
+		theyChanged: [{
+			type: i0.Input,
+			args: [{
+				isSignal: true,
+				alias: "theyChanged",
+				required: false
+			}]
+		}],
+		resolved: [{
+			type: i0.Output,
+			args: ["resolved"]
+		}],
+		cancelled: [{
+			type: i0.Output,
+			args: ["cancelled"]
+		}]
+	}
+});
+function summarize(value) {
+	if (value === null || value === void 0) return "";
+	if (Array.isArray(value)) return value.map(summarize).filter((s) => s !== "").join("; ");
+	if (typeof value === "object") return Object.entries(value).filter(([key]) => !isReservedAsDetailKey(key)).map(([, v]) => summarize(v)).filter((s) => s !== "").join(", ");
+	return String(value);
+}
+function addReferenceLabelsOf(po, into) {
+	for (const attr of po?.attributes ?? []) {
+		if (attr.object) addReferenceLabelsOf(attr.object, into);
+		for (const row of attr.objects ?? []) addReferenceLabelsOf(row, into);
+		for (const [id, label] of Object.entries(attr.breadcrumbs ?? {})) add(into, id, label);
+		if (typeof attr.value === "string") add(into, attr.value, attr.breadcrumb);
+	}
+	return into;
+}
+function addReferenceLabelsOfOptions(options, into) {
+	for (const list of options) for (const item of list ?? []) if (item.id) add(into, item.id, item.breadcrumb);
+	return into;
+}
+function add(into, id, label) {
+	if (id === "" || id in into || typeof label !== "string" || label.trim() === "") return;
+	into[id] = label;
+}
 var SparkPoEditComponent = class SparkPoEditComponent {
 	route = inject(ActivatedRoute);
 	router = inject(Router);
 	sparkService = inject(SparkService);
 	language = inject(SparkLanguageService);
+	showChangedBy = inject(SPARK_CONFIG, { optional: true })?.conflictDialog?.showChangedBy === true;
 	saved = output();
 	cancelled = output();
 	colors = Color;
 	entityType = signal(null, ...ngDevMode ? [{ debugName: "entityType" }] : /* istanbul ignore next */ []);
 	item = signal(null, ...ngDevMode ? [{ debugName: "item" }] : /* istanbul ignore next */ []);
+	formEntityType = computed(() => {
+		const type = this.entityType();
+		const readOnlyHere = new Set((this.item()?.attributes ?? []).filter((a) => a.isReadOnly).map((a) => a.name));
+		if (!type || readOnlyHere.size === 0) return type;
+		return {
+			...type,
+			attributes: type.attributes.map((a) => readOnlyHere.has(a.name) && !a.isReadOnly ? {
+				...a,
+				isReadOnly: true
+			} : a)
+		};
+	}, ...ngDevMode ? [{ debugName: "formEntityType" }] : /* istanbul ignore next */ []);
 	type = "";
 	id = "";
 	formData = signal({}, ...ngDevMode ? [{ debugName: "formData" }] : /* istanbul ignore next */ []);
@@ -29,6 +777,19 @@ var SparkPoEditComponent = class SparkPoEditComponent {
 	isSaving = signal(false, ...ngDevMode ? [{ debugName: "isSaving" }] : /* istanbul ignore next */ []);
 	allEntityTypes = signal([], ...ngDevMode ? [{ debugName: "allEntityTypes" }] : /* istanbul ignore next */ []);
 	generalErrors = computed(() => this.validationErrors().filter((e) => !e.attributeName), ...ngDevMode ? [{ debugName: "generalErrors" }] : /* istanbul ignore next */ []);
+	conflictNoticeText = signal(null, ...ngDevMode ? [{ debugName: "conflictNoticeText" }] : /* istanbul ignore next */ []);
+	conflictNotice = computed(() => {
+		const text = this.conflictNoticeText();
+		if (!text) return null;
+		const item = this.item();
+		const audit = item ? this.auditLine(item) : null;
+		return audit ? `${text} ${audit}` : text;
+	}, ...ngDevMode ? [{ debugName: "conflictNotice" }] : /* istanbul ignore next */ []);
+	pendingConflict = signal(null, ...ngDevMode ? [{ debugName: "pendingConflict" }] : /* istanbul ignore next */ []);
+	pendingConflicts = computed(() => this.pendingConflict()?.result.conflicts ?? [], ...ngDevMode ? [{ debugName: "pendingConflicts" }] : /* istanbul ignore next */ []);
+	changedByName = signal(null, ...ngDevMode ? [{ debugName: "changedByName" }] : /* istanbul ignore next */ []);
+	form = viewChild(SparkPoFormComponent, ...ngDevMode ? [{ debugName: "form" }] : /* istanbul ignore next */ []);
+	locale = inject(LOCALE_ID);
 	constructor() {
 		this.route.paramMap.pipe(takeUntilDestroyed()).subscribe((params) => this.onParamsChange(params));
 	}
@@ -52,8 +813,10 @@ var SparkPoEditComponent = class SparkPoEditComponent {
 		}
 	}
 	initFormData() {
+		this.formData.set(this.formDataFrom(this.item()));
+	}
+	formDataFrom(currentItem) {
 		const data = {};
-		const currentItem = this.item();
 		this.getEditableAttributes().forEach((attr) => {
 			const itemAttr = currentItem?.attributes.find((a) => a.name === attr.name);
 			if (attr.dataType === "Reference") data[attr.name] = itemAttr?.value ?? null;
@@ -64,7 +827,7 @@ var SparkPoEditComponent = class SparkPoEditComponent {
 			else if (isDateDataType(attr.dataType)) data[attr.name] = toDateInputValue(attr.dataType, itemAttr?.value);
 			else data[attr.name] = itemAttr?.value ?? "";
 		});
-		this.formData.set(data);
+		return data;
 	}
 	resolveEntityType() {
 		const cache = this.allEntityTypes();
@@ -73,12 +836,13 @@ var SparkPoEditComponent = class SparkPoEditComponent {
 	}
 	getEditableAttributes() {
 		const overlay = this.refreshOverlay();
-		return this.entityType()?.attributes.map((a) => applyOverlay(a, overlay[a.name])).filter((a) => a.isVisible && !a.isReadOnly && hasShowedOnFlag(a.showedOn, ShowedOn.PersistentObject)).sort((a, b) => a.order - b.order) || [];
+		return this.formEntityType()?.attributes.map((a) => applyOverlay(a, overlay[a.name])).filter((a) => a.isVisible && !a.isReadOnly && hasShowedOnFlag(a.showedOn, ShowedOn.PersistentObject)).sort((a, b) => a.order - b.order) || [];
 	}
 	async onSave() {
 		const currentItem = this.item();
 		if (!this.entityType() || !currentItem) return;
 		this.validationErrors.set([]);
+		this.conflictNoticeText.set(null);
 		this.isSaving.set(true);
 		const resolver = this.resolveEntityType();
 		const attributes = currentItem.attributes.map((attr) => {
@@ -147,12 +911,14 @@ var SparkPoEditComponent = class SparkPoEditComponent {
 			const error = e;
 			const errors = error.error?.result?.errors ?? error.error?.errors;
 			if (error.status === 400 && errors) this.validationErrors.set(errors);
-			else if (error.status === 409) this.validationErrors.set([{
-				attributeName: "",
-				errorMessage: { en: this.language.t("common.concurrencyConflict") },
-				ruleType: "error"
-			}]);
-			else this.validationErrors.set([{
+			else if (error.status === 409) {
+				this.validationErrors.set([{
+					attributeName: "",
+					errorMessage: { en: this.language.t("common.concurrencyConflict") },
+					ruleType: "error"
+				}]);
+				await this.resolveConcurrencyConflict();
+			} else this.validationErrors.set([{
 				attributeName: "",
 				errorMessage: { en: error.error?.result?.error || error.error?.error || error.message || "An unexpected error occurred" },
 				ruleType: "error"
@@ -167,6 +933,120 @@ var SparkPoEditComponent = class SparkPoEditComponent {
 			this.id
 		]);
 	}
+	async resolveConcurrencyConflict() {
+		const base = this.item();
+		if (!base) return;
+		let theirs;
+		try {
+			theirs = await this.sparkService.get(this.type, this.id);
+		} catch {
+			return;
+		}
+		this.changedByName.set(null);
+		if (this.showChangedBy) this.lookUpChangedBy(theirs);
+		const attributes = this.getEditableAttributes();
+		const baseForm = this.formDataFrom(base);
+		const theirsForm = this.formDataFrom(theirs);
+		const mine = structuredClone(this.formData());
+		const schema = {
+			attributes,
+			resolve: this.resolveEntityType()
+		};
+		const result = mergeThreeWay(baseForm, mine, theirsForm, schema);
+		if (result.conflicts.length === 0) {
+			this.rebase(theirs, result.merged, result.theirChanges, "common.conflictMerged", result.contributionNotices);
+			return;
+		}
+		this.pendingConflict.set({
+			loaded: base,
+			theirs,
+			base: baseForm,
+			mine,
+			theirsForm,
+			schema,
+			result
+		});
+	}
+	conflictReferenceLabels = computed(() => {
+		const pending = this.pendingConflict();
+		if (!pending) return {};
+		const labels = {};
+		addReferenceLabelsOf(pending.theirs, labels);
+		addReferenceLabelsOf(pending.loaded, labels);
+		const form = this.form();
+		if (form) {
+			addReferenceLabelsOfOptions(Object.values(form.referenceOptions()), labels);
+			for (const columns of Object.values(form.asDetailReferenceOptions())) addReferenceLabelsOfOptions(Object.values(columns), labels);
+		}
+		return labels;
+	}, ...ngDevMode ? [{ debugName: "conflictReferenceLabels" }] : /* istanbul ignore next */ []);
+	async lookUpChangedBy(theirs) {
+		this.changedByName.set(null);
+		const typeId = this.entityType()?.id;
+		if (!typeId) return;
+		try {
+			if ((await this.sparkService.getPermissions(typeId))?.canViewHistory !== true) return;
+			const revisions = await this.sparkService.postEnvelope("/po/revisions", {
+				objectTypeId: typeId,
+				id: this.id,
+				take: 1
+			});
+			const latest = Array.isArray(revisions) ? revisions[0] : void 0;
+			if (!latest || typeof latest.userName !== "string" || latest.userName === "") return;
+			if (latest.isCurrent !== true || theirs.etag && latest.changeVector !== theirs.etag) return;
+			const by = modifiedBy(theirs);
+			if (by && latest.userId && latest.userId !== by) return;
+			this.changedByName.set({
+				etag: theirs.etag,
+				name: latest.userName
+			});
+		} catch {}
+	}
+	onConflictResolved(choices) {
+		const pending = this.pendingConflict();
+		if (!pending) return;
+		const result = mergeThreeWay(pending.base, pending.mine, pending.theirsForm, pending.schema, choices);
+		this.pendingConflict.set(null);
+		this.rebase(pending.theirs, result.merged, result.theirChanges, "common.conflictResolved", result.contributionNotices);
+	}
+	onConflictCancelled() {
+		this.pendingConflict.set(null);
+	}
+	rebase(theirs, merged, theirChanges, noticeKey, contributionNotices = []) {
+		this.item.set(theirs);
+		this.formData.set(structuredClone(merged));
+		this.validationErrors.set([]);
+		const fields = [...new Map(theirChanges.map((c) => [c.rootAttribute.name, c.rootAttribute])).values()].map((a) => this.language.resolve(a.label) || a.name);
+		const text = fields.length > 0 ? this.language.t(noticeKey).replace("{fields}", fields.join(", ")) : this.language.t(`${noticeKey}NoFields`);
+		const rows = [...new Set(contributionNotices.map((n) => n.rowLabel))];
+		const contributions = rows.length > 0 ? " " + this.language.t("contributions.theirsKept").replace("{rows}", rows.join(", ")) : "";
+		this.conflictNoticeText.set(text + contributions);
+	}
+	theyChanged = computed(() => {
+		const pending = this.pendingConflict();
+		if (!pending || pending.result.theirChanges.length === 0) return null;
+		const fields = [...new Map(pending.result.theirChanges.map((c) => [c.rootAttribute.name, c.rootAttribute])).values()].map((a) => this.language.resolve(a.label) || a.name);
+		return this.language.t("common.conflictTheyChanged").replace("{fields}", fields.join(", "));
+	}, ...ngDevMode ? [{ debugName: "theyChanged" }] : /* istanbul ignore next */ []);
+	conflictAudit = computed(() => {
+		const pending = this.pendingConflict();
+		return pending ? this.auditLine(pending.theirs) : null;
+	}, ...ngDevMode ? [{ debugName: "conflictAudit" }] : /* istanbul ignore next */ []);
+	auditLine(po) {
+		const resolved = this.changedByName();
+		const at = po.attributes.find((a) => a.name === "ModifiedAt")?.value;
+		const user = this.showChangedBy && resolved && resolved.etag === po.etag ? resolved.name : null;
+		let time = null;
+		if (at) try {
+			time = formatDate(at, "medium", this.locale);
+		} catch {
+			time = String(at);
+		}
+		if (user && time) return this.language.t("common.conflictChangedByAt").replace("{user}", user).replace("{time}", time);
+		if (user) return this.language.t("common.conflictChangedBy").replace("{user}", user);
+		if (time) return this.language.t("common.conflictChangedAt").replace("{time}", time);
+		return null;
+	}
 	static ɵfac = i0.ɵɵngDeclareFactory({
 		minVersion: "12.0.0",
 		version: "22.2.0",
@@ -185,8 +1065,15 @@ var SparkPoEditComponent = class SparkPoEditComponent {
 			saved: "saved",
 			cancelled: "cancelled"
 		},
+		viewQueries: [{
+			propertyName: "form",
+			first: true,
+			predicate: SparkPoFormComponent,
+			descendants: true,
+			isSignal: true
+		}],
 		ngImport: i0,
-		template: "<bs-container>\n<div class=\"container\">\n  @for (error of generalErrors(); track error.errorMessage) {\n    <bs-alert [type]=\"colors.danger\" class=\"mb-3\">\n      {{ error.errorMessage | resolveTranslation }}\n    </bs-alert>\n  }\n\n  @if (entityType(); as et) {\n    @if (item()) {\n    <h2 class=\"mb-4\">{{ 'common.edit' | t }} {{ (et.description | resolveTranslation) || et.name }}</h2>\n\n    <spark-po-form\n      [entityType]=\"et\"\n      [(formData)]=\"formData\"\n      [(refreshOverlay)]=\"refreshOverlay\"\n      [objectTypeId]=\"type\"\n      [objectId]=\"id\"\n      [validationErrors]=\"validationErrors()\"\n      [showButtons]=\"true\"\n      [isSaving]=\"isSaving()\"\n      [parentId]=\"id\"\n      [parentType]=\"type\"\n      (save)=\"onSave()\"\n      (cancel)=\"onCancel()\">\n    </spark-po-form>\n    }\n  } @else {\n    <div class=\"text-center p-5\">\n      <bs-spinner />\n    </div>\n  }\n</div>\n</bs-container>\n",
+		template: "<bs-container>\n<div class=\"container\">\n  @for (error of generalErrors(); track error.errorMessage) {\n    <bs-alert [type]=\"colors.danger\" class=\"mb-3\">\n      {{ error.errorMessage | resolveTranslation }}\n    </bs-alert>\n  }\n\n  @if (conflictNotice(); as notice) {\n    <bs-alert [type]=\"colors.info\" class=\"mb-3 spark-conflict-notice\">\n      {{ notice }}\n    </bs-alert>\n  }\n\n  <spark-po-conflict-dialog\n    [conflicts]=\"pendingConflicts()\"\n    [referenceLabels]=\"conflictReferenceLabels()\"\n    [audit]=\"conflictAudit()\"\n    [theyChanged]=\"theyChanged()\"\n    (resolved)=\"onConflictResolved($event)\"\n    (cancelled)=\"onConflictCancelled()\" />\n\n  @if (entityType(); as et) {\n    @if (item()) {\n    <h2 class=\"mb-4\">{{ 'common.edit' | t }} {{ (et.description | resolveTranslation) || et.name }}</h2>\n\n    <spark-po-form\n      [entityType]=\"formEntityType() ?? et\"\n      [(formData)]=\"formData\"\n      [(refreshOverlay)]=\"refreshOverlay\"\n      [objectTypeId]=\"type\"\n      [objectId]=\"id\"\n      [validationErrors]=\"validationErrors()\"\n      [showButtons]=\"true\"\n      [isSaving]=\"isSaving()\"\n      [parentId]=\"id\"\n      [parentType]=\"type\"\n      (save)=\"onSave()\"\n      (cancel)=\"onCancel()\">\n    </spark-po-form>\n    }\n  } @else {\n    <div class=\"text-center p-5\">\n      <bs-spinner />\n    </div>\n  }\n</div>\n</bs-container>\n",
 		dependencies: [
 			{
 				kind: "ngmodule",
@@ -226,6 +1113,8 @@ var SparkPoEditComponent = class SparkPoEditComponent {
 					"isSaving",
 					"parentId",
 					"parentType",
+					"referenceParentId",
+					"referenceParentType",
 					"objectTypeId",
 					"objectId",
 					"triggerPathPrefix",
@@ -240,6 +1129,18 @@ var SparkPoEditComponent = class SparkPoEditComponent {
 					"refreshOverlayChange"
 				]
 			},
+			{
+				kind: "component",
+				type: SparkPoConflictDialogComponent,
+				selector: "spark-po-conflict-dialog",
+				inputs: [
+					"conflicts",
+					"referenceLabels",
+					"audit",
+					"theyChanged"
+				],
+				outputs: ["resolved", "cancelled"]
+			},
 			{
 				kind: "pipe",
 				type: ResolveTranslationPipe,
@@ -269,11 +1170,12 @@ i0.ɵɵngDeclareClassMetadata({
 				BsContainerComponent,
 				BsSpinnerComponent,
 				SparkPoFormComponent,
+				SparkPoConflictDialogComponent,
 				ResolveTranslationPipe,
 				TranslateKeyPipe
 			],
 			changeDetection: ChangeDetectionStrategy.OnPush,
-			template: "<bs-container>\n<div class=\"container\">\n  @for (error of generalErrors(); track error.errorMessage) {\n    <bs-alert [type]=\"colors.danger\" class=\"mb-3\">\n      {{ error.errorMessage | resolveTranslation }}\n    </bs-alert>\n  }\n\n  @if (entityType(); as et) {\n    @if (item()) {\n    <h2 class=\"mb-4\">{{ 'common.edit' | t }} {{ (et.description | resolveTranslation) || et.name }}</h2>\n\n    <spark-po-form\n      [entityType]=\"et\"\n      [(formData)]=\"formData\"\n      [(refreshOverlay)]=\"refreshOverlay\"\n      [objectTypeId]=\"type\"\n      [objectId]=\"id\"\n      [validationErrors]=\"validationErrors()\"\n      [showButtons]=\"true\"\n      [isSaving]=\"isSaving()\"\n      [parentId]=\"id\"\n      [parentType]=\"type\"\n      (save)=\"onSave()\"\n      (cancel)=\"onCancel()\">\n    </spark-po-form>\n    }\n  } @else {\n    <div class=\"text-center p-5\">\n      <bs-spinner />\n    </div>\n  }\n</div>\n</bs-container>\n"
+			template: "<bs-container>\n<div class=\"container\">\n  @for (error of generalErrors(); track error.errorMessage) {\n    <bs-alert [type]=\"colors.danger\" class=\"mb-3\">\n      {{ error.errorMessage | resolveTranslation }}\n    </bs-alert>\n  }\n\n  @if (conflictNotice(); as notice) {\n    <bs-alert [type]=\"colors.info\" class=\"mb-3 spark-conflict-notice\">\n      {{ notice }}\n    </bs-alert>\n  }\n\n  <spark-po-conflict-dialog\n    [conflicts]=\"pendingConflicts()\"\n    [referenceLabels]=\"conflictReferenceLabels()\"\n    [audit]=\"conflictAudit()\"\n    [theyChanged]=\"theyChanged()\"\n    (resolved)=\"onConflictResolved($event)\"\n    (cancelled)=\"onConflictCancelled()\" />\n\n  @if (entityType(); as et) {\n    @if (item()) {\n    <h2 class=\"mb-4\">{{ 'common.edit' | t }} {{ (et.description | resolveTranslation) || et.name }}</h2>\n\n    <spark-po-form\n      [entityType]=\"formEntityType() ?? et\"\n      [(formData)]=\"formData\"\n      [(refreshOverlay)]=\"refreshOverlay\"\n      [objectTypeId]=\"type\"\n      [objectId]=\"id\"\n      [validationErrors]=\"validationErrors()\"\n      [showButtons]=\"true\"\n      [isSaving]=\"isSaving()\"\n      [parentId]=\"id\"\n      [parentType]=\"type\"\n      (save)=\"onSave()\"\n      (cancel)=\"onCancel()\">\n    </spark-po-form>\n    }\n  } @else {\n    <div class=\"text-center p-5\">\n      <bs-spinner />\n    </div>\n  }\n</div>\n</bs-container>\n"
 		}]
 	}],
 	ctorParameters: () => [],
@@ -285,9 +1187,17 @@ i0.ɵɵngDeclareClassMetadata({
 		cancelled: [{
 			type: i0.Output,
 			args: ["cancelled"]
+		}],
+		form: [{
+			type: i0.ViewChild,
+			args: [i0.forwardRef(() => SparkPoFormComponent), { isSignal: true }]
 		}]
 	}
 });
-export { SparkPoEditComponent };
+function modifiedBy(po) {
+	const by = po.attributes.find((a) => a.name === "ModifiedBy")?.value;
+	return typeof by === "string" && by !== "" ? by : null;
+}
+export { CONTRIBUTION_ROW_METADATA, SparkPoConflictDialogComponent, SparkPoEditComponent, addReferenceLabelsOf, addReferenceLabelsOfOptions, contributionRowIsOwn, mergeThreeWay };
 
 //# sourceMappingURL=mintplayer-ng-spark-po-edit.mjs.map