@masterteam/work-center 0.0.83 → 0.0.84

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@masterteam/work-center",
-  "version": "0.0.83",
+  "version": "0.0.84",
   "publishConfig": {
     "directory": "../../../dist/masterteam/work-center",
     "linkDirectory": false,
@@ -20,12 +20,12 @@
     "rxjs": "^7.8.2",
     "tailwindcss": "^4.2.2",
     "tailwindcss-primeui": "^0.6.1",
-    "@masterteam/client-components": "^0.0.87",
-    "@masterteam/components": "^0.0.274",
     "@masterteam/forms": "^0.0.141",
+    "@masterteam/discussion": "^0.0.26",
     "@masterteam/icons": "^0.0.17",
-    "@masterteam/structure-builder": "^0.0.62",
-    "@masterteam/discussion": "^0.0.26"
+    "@masterteam/client-components": "^0.0.84",
+    "@masterteam/components": "^0.0.273",
+    "@masterteam/structure-builder": "^0.0.62"
   },
   "sideEffects": false,
   "exports": {

package/types/masterteam-work-center.d.ts

@@ -589,8 +589,11 @@ declare const WORK_CENTER_TYPE_COMPONENTS: InjectionToken<Record<string, Type<un
  */
 /**
  * `'removed'` means a row that is in the published snapshot but no longer in the
- * plan. `'unchanged'` never reaches the comparison payload - the drawer shows
- * what is being published, not the whole plan.
+ * plan. `'unchanged'` appears only on a CONVERGENT-CONFLICT row (round 3: both
+ * sides were touched and ended with equal values) - it carries no publishable
+ * change and is excluded from every publish count, but the approver must still
+ * see it in the conflicts section, or the request reports conflicts the view
+ * cannot show. A non-conflict `unchanged` row is still dropped.
  */
 type SchedulePublishState = 'added' | 'changed' | 'removed' | 'unchanged';
 interface SchedulePublishFieldChange {
@@ -624,6 +627,19 @@ interface SchedulePublishDiffRow {
      * list: the whole row is the change.
      */
     changes?: SchedulePublishFieldChange[] | null;
+    /**
+     * `'stale'` | `'conflict'` - the server's per-row baseline verdict (round 3,
+     * additive). `'conflict'` means the PUBLISHED side also moved on a row this
+     * draft edits; such rows lead the comparison in their own section. Absent on
+     * an older backend, which renders exactly as before.
+     */
+    draftBaselineState?: string | null;
+    /**
+     * Comma-joined field keys the published side changed on a conflict row -
+     * parse with {@link parseSchedulePublishChangedFields}. Additive; absent on
+     * older backends.
+     */
+    publishedChangedFields?: string | null;
 }
 interface SchedulePublishDiff {
     levelDataId?: number | null;
@@ -676,8 +692,10 @@ interface SchedulePublishFormLoadResponse {
  * group is where the eye stops.
  */
 declare const SCHEDULE_PUBLISH_GROUP_ORDER: readonly SchedulePublishState[];
+/** Group keys: the publish states plus the leading conflicts section (round 3). */
+type SchedulePublishGroupKey = SchedulePublishState | 'conflict';
 interface SchedulePublishGroup {
-    state: SchedulePublishState;
+    state: SchedulePublishGroupKey;
     rows: SchedulePublishDiffRow[];
     /** Rows in this group BEFORE the search filter - the badge count stays honest. */
     totalCount: number;
@@ -688,18 +706,42 @@ interface SchedulePublishSummary {
     changedCount: number;
     removedCount: number;
     totalCount: number;
+    /** Rows the published plan moved under the draft's own edits. */
+    conflictCount: number;
     /** True when there is genuinely nothing to publish (as opposed to never published). */
     isEmpty: boolean;
+    /**
+     * The comparison has something to show: publishable changes OR conflicts.
+     * A diff of only zero-diff conflict rows is publish-empty but must still
+     * render its conflicts section - "nothing to publish" would contradict the
+     * request the approver is looking at.
+     */
+    needsAttention: boolean;
 }
+/** The server's per-row baseline verdict says the published side also moved. */
+declare function isSchedulePublishConflictRow(row: SchedulePublishDiffRow): boolean;
 declare function summarizeSchedulePublish(diff: SchedulePublishDiff | null | undefined): SchedulePublishSummary;
 /**
  * Group the comparison for display, optionally narrowed by a free-text search.
  *
+ * CONFLICTS LEAD, as their own section holding every conflicted row (whatever
+ * its publish state - including the zero-diff `unchanged` convergences the
+ * backend ships solely for this section). The approver has no resolution
+ * control - the section is informational: the frozen plan they are approving
+ * was captured while the live plan had moved under it. The remaining rows
+ * group added → changed → removed exactly as before, with non-conflict
+ * `unchanged` rows still dropped.
+ *
  * Search matches a row's NAME and its changed FIELD KEYS, so "start" finds every
  * row whose planned start moved even though that text appears nowhere in a name.
  * Empty groups are dropped rather than rendered as empty headers.
  */
 declare function groupSchedulePublishRows(diff: SchedulePublishDiff | null | undefined, searchText?: string): SchedulePublishGroup[];
+/**
+ * The changed-field keys a conflict row ships as one comma-joined string -
+ * the same wire shape the schedule read envelope uses.
+ */
+declare function parseSchedulePublishChangedFields(changedFields: string | null | undefined): string[];
 /**
  * Plan order, falling back to the row id.
  *
@@ -797,6 +839,12 @@ declare class WorkCenterSchedulePublishType implements OnDestroy {
      * nothing.
      */
     protected isExpandable(row: SchedulePublishDiffRow): boolean;
+    /**
+     * The published-side field keys of a conflict row, as human labels. Rendered
+     * as an informational hint — the approver has no per-row resolution control;
+     * the frozen plan they decide on was captured as-is.
+     */
+    protected publishedMovedFields(row: SchedulePublishDiffRow): string[];
     protected groupBadgeClass(state: string): string;
     protected groupLabel(state: string): string;
     /**
@@ -1015,5 +1063,5 @@ declare class WorkCenterState {
 
 declare const APP_STATES: (typeof WorkCenterState)[];
 
-export { APP_STATES, ApplyColumnFilters, ApplyHeaderFilters, ClearAllFilters, EnterArea, HydrateFromContext, LoadRuntime, SCHEDULE_PUBLISH_GROUP_ORDER, SCHEDULE_PUBLISH_OPERATION_KEY, SelectCard, SetGroupBy, SetLookups, SetParams, WORK_CENTER_EMPTY_LABEL, WORK_CENTER_GROUP_NONE, WORK_CENTER_LEVEL_GROUP_FIELD, WORK_CENTER_LEVEL_NAME_KEY, WORK_CENTER_MAX_FILTERS, WORK_CENTER_MAX_PAGE_SIZE, WORK_CENTER_MAX_SORT, WORK_CENTER_QUERY_VERSION, WORK_CENTER_TYPE_COMPONENTS, WorkCenterActionKey, WorkCenterClientFormModal, WorkCenterFacade, WorkCenterItemModal, WorkCenterItemModalRoute, WorkCenterPage, WorkCenterSchedulePublishType, WorkCenterState, decodeWorkCenterRouteContextKey, encodeWorkCenterRouteContextKey, groupSchedulePublishRows, matchesSchedulePublishSearch, readSchedulePublishChanges, schedulePublishRowKey, sortSchedulePublishRows, summarizeSchedulePublish, windowSchedulePublishRows };
-export type { ApiEnvelope, SchedulePublishDiff, SchedulePublishDiffRow, SchedulePublishFieldChange, SchedulePublishFormLoadResponse, SchedulePublishGroup, SchedulePublishState, SchedulePublishSummary, TranslatableDto, WorkCenterArea, WorkCenterAreaState, WorkCenterBootstrapInputs, WorkCenterClientFormModalData, WorkCenterClientFormModalOptions, WorkCenterColumnsConfig, WorkCenterContext, WorkCenterFilterOperator, WorkCenterFilterRule, WorkCenterHydratePatch, WorkCenterItemActionAfterSuccess, WorkCenterItemActionExecutionResult, WorkCenterItemActionsData, WorkCenterItemBasicInfoData, WorkCenterItemContextKey, WorkCenterItemModalComponentInput, WorkCenterItemModalOptions, WorkCenterLoadReason, WorkCenterLookups, WorkCenterPreviewLevelTarget, WorkCenterRuntimeCard, WorkCenterRuntimeFilterSchema, WorkCenterRuntimeItemAction, WorkCenterRuntimeOperatorOption, WorkCenterRuntimePagination, WorkCenterRuntimeProperty, WorkCenterRuntimeRequest, WorkCenterRuntimeResponseData, WorkCenterRuntimeSelectedCard, WorkCenterRuntimeStatsItem, WorkCenterRuntimeWarningDto, WorkCenterSortRule, WorkCenterStateModel, WorkCenterTypeComponentInputs };
+export { APP_STATES, ApplyColumnFilters, ApplyHeaderFilters, ClearAllFilters, EnterArea, HydrateFromContext, LoadRuntime, SCHEDULE_PUBLISH_GROUP_ORDER, SCHEDULE_PUBLISH_OPERATION_KEY, SelectCard, SetGroupBy, SetLookups, SetParams, WORK_CENTER_EMPTY_LABEL, WORK_CENTER_GROUP_NONE, WORK_CENTER_LEVEL_GROUP_FIELD, WORK_CENTER_LEVEL_NAME_KEY, WORK_CENTER_MAX_FILTERS, WORK_CENTER_MAX_PAGE_SIZE, WORK_CENTER_MAX_SORT, WORK_CENTER_QUERY_VERSION, WORK_CENTER_TYPE_COMPONENTS, WorkCenterActionKey, WorkCenterClientFormModal, WorkCenterFacade, WorkCenterItemModal, WorkCenterItemModalRoute, WorkCenterPage, WorkCenterSchedulePublishType, WorkCenterState, decodeWorkCenterRouteContextKey, encodeWorkCenterRouteContextKey, groupSchedulePublishRows, isSchedulePublishConflictRow, matchesSchedulePublishSearch, parseSchedulePublishChangedFields, readSchedulePublishChanges, schedulePublishRowKey, sortSchedulePublishRows, summarizeSchedulePublish, windowSchedulePublishRows };
+export type { ApiEnvelope, SchedulePublishDiff, SchedulePublishDiffRow, SchedulePublishFieldChange, SchedulePublishFormLoadResponse, SchedulePublishGroup, SchedulePublishGroupKey, SchedulePublishState, SchedulePublishSummary, TranslatableDto, WorkCenterArea, WorkCenterAreaState, WorkCenterBootstrapInputs, WorkCenterClientFormModalData, WorkCenterClientFormModalOptions, WorkCenterColumnsConfig, WorkCenterContext, WorkCenterFilterOperator, WorkCenterFilterRule, WorkCenterHydratePatch, WorkCenterItemActionAfterSuccess, WorkCenterItemActionExecutionResult, WorkCenterItemActionsData, WorkCenterItemBasicInfoData, WorkCenterItemContextKey, WorkCenterItemModalComponentInput, WorkCenterItemModalOptions, WorkCenterLoadReason, WorkCenterLookups, WorkCenterPreviewLevelTarget, WorkCenterRuntimeCard, WorkCenterRuntimeFilterSchema, WorkCenterRuntimeItemAction, WorkCenterRuntimeOperatorOption, WorkCenterRuntimePagination, WorkCenterRuntimeProperty, WorkCenterRuntimeRequest, WorkCenterRuntimeResponseData, WorkCenterRuntimeSelectedCard, WorkCenterRuntimeStatsItem, WorkCenterRuntimeWarningDto, WorkCenterSortRule, WorkCenterStateModel, WorkCenterTypeComponentInputs };