@outbuild-company/schedule-core 1.17.0 → 1.17.2

package/dist/index.cjs

@@ -1290,6 +1290,24 @@ function getFieldDescriptor(field) {
   return FIELD_REGISTRY[field] ?? null;
 }
 
+// src/internal/view-attributes/types.ts
+var VISUAL_ROW_KIND = {
+  GROUP: "group",
+  ACTIVITY: "activity"
+};
+var UNASSIGNED_VALUE_ID = "unassigned";
+var GROUP_ID_PREFIX = "g";
+var GROUP_ID_SEPARATOR = ":";
+var UNASSIGNED_GROUP_LABEL = "Unassigned";
+var MINIMUM_GROUP_DEPTH = 1;
+var MINIMUM_GROUP_LEVEL = 1;
+function buildGroupRowId(attributeKey, valueId) {
+  return `${GROUP_ID_PREFIX}${GROUP_ID_SEPARATOR}${attributeKey}${GROUP_ID_SEPARATOR}${valueId}`;
+}
+function appendGroupRowId(parentRowId, attributeKey, valueId) {
+  return `${parentRowId}${GROUP_ID_SEPARATOR}${attributeKey}${GROUP_ID_SEPARATOR}${valueId}`;
+}
+
 // src/internal/view-attributes/index-catalog.ts
 var ROOT_PARENT_SENTINEL = null;
 function childListKey(parentId) {
@@ -1363,10 +1381,13 @@ function expandSelectedValueIds(catalog, selectedIds) {
   }
   return expanded;
 }
-function truncatedPath(catalog, valueId, depth) {
+function levelWindowPath(catalog, valueId, startLevel, depth) {
+  const from = Math.max(startLevel, MINIMUM_GROUP_LEVEL);
   const path = catalog.pathByValueId.get(valueId);
-  if (path === void 0 || path.length === 0) return [valueId];
-  return path.slice(0, Math.max(depth, 1));
+  if (path === void 0 || path.length === 0) {
+    return from > MINIMUM_GROUP_LEVEL ? [] : [valueId];
+  }
+  return path.slice(from - 1, Math.max(depth, from));
 }
 
 // src/internal/view-attributes/match.ts
@@ -1988,21 +2009,32 @@ function normalizeParentKey(parent) {
 var NOT_SET_SORT_VALUE = Number.MAX_SAFE_INTEGER;
 function getChildrenInVisualOrder(parentId, adapter) {
   const children = collectChildrenSnapshots(parentId, adapter);
-  const userOrder = adapter.getOrderComparator?.() ?? null;
-  const mode = adapter.getOrderMode?.() ?? ORDER_MODE.STANDARD;
-  if (userOrder !== null && mode === ORDER_MODE.KEEP_WBS_IN_PLACE) {
-    return sortKeepWbsInPlace(children, userOrder, adapter);
+  const ordered = sortSiblingsInOrderMode(
+    children,
+    adapter.getOrderComparator?.() ?? null,
+    adapter.getOrderMode?.() ?? ORDER_MODE.STANDARD,
+    (activityId) => adapter.hasChildren(activityId)
+  );
+  return ordered.map((activity) => String(activity.id));
+}
+function sortSiblingsInOrderMode(siblings, userOrder, mode, hasChildren) {
+  if (userOrder === null) {
+    siblings.sort(compareActivitiesInVisualOrder);
+    return siblings;
+  }
+  if (mode === ORDER_MODE.KEEP_WBS_IN_PLACE) {
+    return sortKeepWbsInPlace(siblings, userOrder, hasChildren);
   }
-  children.sort(
-    userOrder === null ? compareActivitiesInVisualOrder : (a, b) => userOrder(a, b) || compareActivitiesInVisualOrder(a, b)
+  siblings.sort(
+    (a, b) => userOrder(a, b) || compareActivitiesInVisualOrder(a, b)
   );
-  return children.map((activity) => String(activity.id));
+  return siblings;
 }
-function sortKeepWbsInPlace(children, userOrder, adapter) {
+function sortKeepWbsInPlace(siblings, userOrder, hasChildren) {
   const leafActivities = [];
   const wbsItems = [];
-  for (const child of children) {
-    if (adapter.hasChildren(child.id)) {
+  for (const child of siblings) {
+    if (hasChildren(child.id)) {
       wbsItems.push(child);
     } else {
       leafActivities.push(child);
@@ -2012,10 +2044,9 @@ function sortKeepWbsInPlace(children, userOrder, adapter) {
     (a, b) => userOrder(a, b) || compareActivitiesInVisualOrder(a, b)
   );
   wbsItems.sort(compareActivitiesInVisualOrder);
-  return [
-    ...leafActivities.map((a) => String(a.id)),
-    ...wbsItems.map((a) => String(a.id))
-  ];
+  siblings.length = 0;
+  siblings.push(...leafActivities, ...wbsItems);
+  return siblings;
 }
 function iterateInVisualOrder(adapter) {
   const result = [];
@@ -2148,44 +2179,66 @@ function dispatchSortSet(action, deps) {
   return { ok: true, changes };
 }
 
-// src/internal/view-attributes/types.ts
-var VISUAL_ROW_KIND = {
-  GROUP: "group",
-  ACTIVITY: "activity"
-};
-var UNASSIGNED_VALUE_ID = "unassigned";
-var GROUP_ID_PREFIX = "g";
-var GROUP_ID_SEPARATOR = ":";
-var UNASSIGNED_GROUP_LABEL = "Unassigned";
-var MINIMUM_GROUP_DEPTH = 1;
-function buildGroupRowId(attributeKey, valueId) {
-  return `${GROUP_ID_PREFIX}${GROUP_ID_SEPARATOR}${attributeKey}${GROUP_ID_SEPARATOR}${valueId}`;
-}
-
 // src/dispatch/view-attributes.ts
 function isFiniteInteger(value) {
   return Number.isInteger(value) && Number.isFinite(value);
 }
-function toGroupState(input) {
-  if (typeof input.attributeKey !== "string" || input.attributeKey.length === 0) {
+function isValidDirection(value) {
+  return value === ORDER_DIRECTION.ASCENDING || value === ORDER_DIRECTION.DESCENDING;
+}
+function toLevelWindow(input) {
+  const startLevel = input.startLevel ?? MINIMUM_GROUP_LEVEL;
+  if (!isFiniteInteger(startLevel) || startLevel < MINIMUM_GROUP_LEVEL) {
     return null;
   }
   if (!isFiniteInteger(input.depth) || input.depth < MINIMUM_GROUP_DEPTH) {
     return null;
   }
-  if (input.direction !== ORDER_DIRECTION.ASCENDING && input.direction !== ORDER_DIRECTION.DESCENDING) {
+  if (input.depth < startLevel) return null;
+  return { startLevel, depth: input.depth };
+}
+var INVALID_CRITERION = /* @__PURE__ */ Symbol("invalid-group-criterion");
+function toSecondaryCriterion(input) {
+  const secondary = input.secondary;
+  if (secondary === void 0 || secondary === null) return null;
+  if (typeof secondary !== "object") return INVALID_CRITERION;
+  if (typeof secondary.attributeKey !== "string" || secondary.attributeKey.length === 0) {
+    return INVALID_CRITERION;
+  }
+  if (secondary.attributeKey === input.attributeKey) return INVALID_CRITERION;
+  const window2 = toLevelWindow(secondary);
+  if (window2 === null) return INVALID_CRITERION;
+  if (!isValidDirection(secondary.direction)) return INVALID_CRITERION;
+  return {
+    attributeKey: secondary.attributeKey,
+    startLevel: window2.startLevel,
+    depth: window2.depth,
+    direction: secondary.direction
+  };
+}
+function toGroupState(input) {
+  if (typeof input.attributeKey !== "string" || input.attributeKey.length === 0) {
+    return null;
+  }
+  const window2 = toLevelWindow(input);
+  if (window2 === null) return null;
+  if (!isValidDirection(input.direction)) {
     return null;
   }
   if (typeof input.includeWbs !== "boolean") return null;
   if (!Array.isArray(input.collapsedIds) || input.collapsedIds.some((id) => typeof id !== "string")) {
     return null;
   }
+  const secondary = toSecondaryCriterion(input);
+  if (secondary === INVALID_CRITERION) return null;
   return {
     attributeKey: input.attributeKey,
-    depth: input.depth,
+    startLevel: window2.startLevel,
+    depth: window2.depth,
     direction: input.direction,
     includeWbs: input.includeWbs,
-    collapsedIds: new Set(input.collapsedIds)
+    collapsedIds: new Set(input.collapsedIds),
+    secondary
   };
 }
 function emptyViewChanges(action) {
@@ -4973,6 +5026,7 @@ var POST_PROCESSOR = {
 
 // src/columns/shared/error-codes.ts
 var VALIDATION_REASON = {
+  UNCHANGED: "unchanged",
   NEGATIVE_DURATION: "negative_duration"};
 var EDIT_DENIAL_REASON = {
   COMPLETED: "completed",
@@ -5446,14 +5500,6 @@ var startDatePipeline = {
     if (isCompletedActivity(activity)) {
       return cannotEdit("completed", "cant_edit_completed_activity");
     }
-    if (!isValidDate(edit.newValue)) return canEdit();
-    if (isSameDay(activity.startDate, edit.newValue)) return canEdit();
-    if (edit.newValue.getTime() > activity.startDate.getTime()) {
-      return cannotEdit(
-        "sir_start_after_progress",
-        "sir_cant_move_start_after_progress"
-      );
-    }
     return canEdit();
   },
   parseInput(rawValue, _activity, _ctx) {
@@ -15939,6 +15985,7 @@ function mergeBeforeSnapshots(beforeSnap, ids, deps) {
 
 // src/dispatch/handlers/bulk-edit.ts
 var CUSTOM_ID_COLUMN = COLUMN.CUSTOM_ID;
+var SIR_APPLY_EVENT_SOURCE2 = "sir-apply";
 async function dispatchBulkEdit(action, options, deps) {
   const { adapter, scheduler, sector } = deps;
   const editsIncludeDuration = action.edits.some(
@@ -15962,6 +16009,13 @@ async function dispatchBulkEdit(action, options, deps) {
   for (const edit of action.edits) {
     const outcome = applyOneEdit2(edit, deps, action.eventSource);
     verdicts.push(outcome.verdict);
+    if (action.eventSource === SIR_APPLY_EVENT_SOURCE2 && !outcome.verdict.ok && outcome.verdict.reason !== VALIDATION_REASON.UNCHANGED) {
+      return {
+        ok: false,
+        reason: outcome.verdict.reason ?? REJECTION_REASON.INVALID,
+        ...outcome.verdict.alertKey ? { alertKey: outcome.verdict.alertKey } : {}
+      };
+    }
     if (!outcome.verdict.ok || !outcome.changes) continue;
     const constraintWarning = toConstraintWarning(
       edit.activityId,
@@ -20092,10 +20146,10 @@ var ViewStateStore = class {
 };
 
 // src/internal/view-attributes/project-rows.ts
-function createNode(attributeKey, valueId, label, color, level, sequence) {
+function createNode(rowId, valueId, label, color, level, sequence) {
   return {
     valueId,
-    id: buildGroupRowId(attributeKey, valueId),
+    id: rowId,
     label,
     color,
     level,
@@ -20104,6 +20158,35 @@ function createNode(attributeKey, valueId, label, color, level, sequence) {
     activities: []
   };
 }
+function buildGroupTree(activities, criterion, catalog, root, nestIds) {
+  const { attributeKey, startLevel, depth } = criterion;
+  for (const activity of activities) {
+    const assignedValueId = catalog.assignmentByActivityId.get(
+      String(activity.id)
+    );
+    const window2 = assignedValueId === void 0 ? [] : levelWindowPath(catalog, assignedValueId, startLevel, depth);
+    const path = window2.length === 0 ? [UNASSIGNED_VALUE_ID] : window2;
+    let cursor = root;
+    path.forEach((valueId, index) => {
+      let child = cursor.children.get(valueId);
+      if (child === void 0) {
+        const value = catalog.valueById.get(valueId);
+        child = createNode(
+          nestIds ? appendGroupRowId(cursor.id, attributeKey, valueId) : buildGroupRowId(attributeKey, valueId),
+          valueId,
+          value?.label ?? (valueId === UNASSIGNED_VALUE_ID ? UNASSIGNED_GROUP_LABEL : valueId),
+          value?.color ?? null,
+          root.level + 1 + index,
+          value?.sequence ?? Number.MAX_SAFE_INTEGER
+        );
+        cursor.children.set(valueId, child);
+      }
+      cursor = child;
+    });
+    cursor.activities.push(activity);
+  }
+  return root;
+}
 function countActivities(node) {
   let total = node.activities.length;
   for (const child of node.children.values()) total += countActivities(child);
@@ -20140,7 +20223,31 @@ function emitWbsOrderedActivities(memberActivities, activitiesInVisualOrder, par
     });
   }
 }
-function emitNode(node, group, activitiesInVisualOrder, parentOf, rows) {
+function emitActivities(node, context) {
+  const { rows } = context;
+  if (context.group.includeWbs) {
+    emitWbsOrderedActivities(
+      node.activities,
+      context.activitiesInVisualOrder,
+      context.parentOf,
+      rows
+    );
+    return;
+  }
+  for (const activity of sortSiblingsInOrderMode(
+    [...node.activities],
+    context.comparator,
+    context.orderMode,
+    context.hasChildren
+  )) {
+    rows.push({
+      kind: VISUAL_ROW_KIND.ACTIVITY,
+      activityId: String(activity.id)
+    });
+  }
+}
+function emitNode(node, childDirection, allowSecondary, context) {
+  const { group, rows } = context;
   rows.push({
     kind: VISUAL_ROW_KIND.GROUP,
     id: node.id,
@@ -20150,25 +20257,25 @@ function emitNode(node, group, activitiesInVisualOrder, parentOf, rows) {
     activityCount: countActivities(node)
   });
   if (group.collapsedIds.has(node.id)) return;
-  for (const child of sortedChildNodes(node, group.direction)) {
-    emitNode(child, group, activitiesInVisualOrder, parentOf, rows);
+  for (const child of sortedChildNodes(node, childDirection)) {
+    emitNode(child, childDirection, allowSecondary, context);
   }
   if (node.activities.length === 0) return;
-  if (group.includeWbs) {
-    emitWbsOrderedActivities(
+  const secondary = group.secondary;
+  if (allowSecondary && secondary != null && context.secondaryCatalog != null) {
+    const secondaryRoot = buildGroupTree(
       node.activities,
-      activitiesInVisualOrder,
-      parentOf,
-      rows
+      secondary,
+      context.secondaryCatalog,
+      createNode(node.id, "", "", null, node.level, 0),
+      true
     );
+    for (const child of sortedChildNodes(secondaryRoot, secondary.direction)) {
+      emitNode(child, secondary.direction, false, context);
+    }
     return;
   }
-  for (const activity of node.activities) {
-    rows.push({
-      kind: VISUAL_ROW_KIND.ACTIVITY,
-      activityId: String(activity.id)
-    });
-  }
+  emitActivities(node, context);
 }
 function projectVisualRows(input) {
   const visibleActivities = input.activitiesInVisualOrder.filter(
@@ -20181,34 +20288,26 @@ function projectVisualRows(input) {
     }));
   }
   const { group, catalog } = input;
-  const root = createNode(group.attributeKey, "", "", null, -1, 0);
-  for (const activity of visibleActivities) {
-    const assignedValueId = catalog.assignmentByActivityId.get(
-      String(activity.id)
-    );
-    const path = assignedValueId === void 0 ? [UNASSIGNED_VALUE_ID] : truncatedPath(catalog, assignedValueId, group.depth);
-    let cursor = root;
-    path.forEach((valueId, index) => {
-      let child = cursor.children.get(valueId);
-      if (child === void 0) {
-        const value = catalog.valueById.get(valueId);
-        child = createNode(
-          group.attributeKey,
-          valueId,
-          value?.label ?? (valueId === UNASSIGNED_VALUE_ID ? UNASSIGNED_GROUP_LABEL : valueId),
-          value?.color ?? null,
-          index,
-          value?.sequence ?? Number.MAX_SAFE_INTEGER
-        );
-        cursor.children.set(valueId, child);
-      }
-      cursor = child;
-    });
-    cursor.activities.push(activity);
-  }
+  const root = buildGroupTree(
+    visibleActivities,
+    group,
+    catalog,
+    createNode("", "", "", null, -1, 0),
+    false
+  );
   const rows = [];
+  const context = {
+    group,
+    activitiesInVisualOrder: input.activitiesInVisualOrder,
+    parentOf: input.parentOf,
+    hasChildren: input.hasChildren,
+    comparator: input.comparator,
+    orderMode: input.orderMode,
+    secondaryCatalog: input.secondaryCatalog,
+    rows
+  };
   for (const child of sortedChildNodes(root, group.direction)) {
-    emitNode(child, group, input.activitiesInVisualOrder, input.parentOf, rows);
+    emitNode(child, group.direction, true, context);
   }
   return rows;
 }
@@ -20484,6 +20583,7 @@ var ScheduleState = class _ScheduleState {
     if (this._cache.visualRows) return this._cache.visualRows;
     const group = this._viewAttributes.getGroup();
     const catalog = group === null ? null : this._viewAttributes.getCatalog(group.attributeKey);
+    const secondaryCatalog = group?.secondary == null ? null : this._viewAttributes.getCatalog(group.secondary.attributeKey);
     const activitiesInVisualOrder = [];
     for (const activityId of this.getVisualOrderIds()) {
       const activity = this.getActivity(activityId);
@@ -20493,8 +20593,12 @@ var ScheduleState = class _ScheduleState {
       activitiesInVisualOrder,
       isVisible: (activityId) => this.isVisible(activityId),
       parentOf: (activityId) => this.getParentId(activityId),
+      hasChildren: (activityId) => this.hasChildren(activityId),
       group,
-      catalog
+      catalog,
+      secondaryCatalog,
+      comparator: this.getOrderComparator(),
+      orderMode: this.getOrderMode()
     });
     return this._cache.visualRows;
   }
@@ -25325,6 +25429,7 @@ exports.LINK_RELATIONSHIP = LINK_RELATIONSHIP;
 exports.LINK_TYPE = LINK_TYPE;
 exports.LINK_TYPE_CODE = LINK_TYPE_CODE;
 exports.MINIMUM_GROUP_DEPTH = MINIMUM_GROUP_DEPTH;
+exports.MINIMUM_GROUP_LEVEL = MINIMUM_GROUP_LEVEL;
 exports.NEW_ACTIVITY_DEFAULTS = NEW_ACTIVITY_DEFAULTS;
 exports.NOT_STARTED_PROGRESS = NOT_STARTED_PROGRESS;
 exports.ORDER_DIRECTION = ORDER_DIRECTION;
@@ -25342,6 +25447,7 @@ exports.UNASSIGNED_VALUE_ID = UNASSIGNED_VALUE_ID;
 exports.VIEW_ATTRIBUTE_KIND = VIEW_ATTRIBUTE_KIND;
 exports.VISUAL_ROW_KIND = VISUAL_ROW_KIND;
 exports.WORK_TIME_DIRECTION = WORK_TIME_DIRECTION;
+exports.appendGroupRowId = appendGroupRowId;
 exports.buildGroupRowId = buildGroupRowId;
 exports.checkNoUpdatedLinks = checkNoUpdatedLinks;
 exports.computeExpectedProgress = computeExpectedProgress;