thatcher 1.0.80 → 1.0.82

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thatcher",
-  "version": "1.0.80",
+  "version": "1.0.82",
   "description": "A config-driven application framework for building data-intensive web apps without code.",
   "main": "src/index.js",
   "type": "module",

package/src/lib/config-generator-engine.js

@@ -342,6 +342,7 @@ export function customEntityDefToEntityDef(row) {
       required: !!f.required,
       options: f.options || undefined,
       ref: f.ref || undefined,
+      cross_entity_rule: f.cross_entity_rule || undefined,
     };
   }
   return {

package/src/lib/validation/entity-validators.js

@@ -218,6 +218,79 @@ function checkContractDateOrder(entityName, data, existingRecord) {
   return null;
 }
 
+const CROSS_ENTITY_OPERATORS = {
+  equals: (a, b) => a === b,
+  not_equals: (a, b) => a !== b,
+  gt: (a, b) => Number(a) > Number(b),
+  gte: (a, b) => Number(a) >= Number(b),
+  lt: (a, b) => Number(a) < Number(b),
+  lte: (a, b) => Number(a) <= Number(b),
+};
+
+// Generic cross-entity rule evaluator: reads a field's cross_entity_rule
+// definition off the SAME spec.fields[key] shape every other field metadata
+// (visible_to/editable_by/encrypted) already lives on, so it works for any
+// entity -- built-in or custom_entity_def-registered -- carrying one, not
+// hardcoded to a single entity name the way checkStockBalance/
+// checkContractDateOrder/checkResourceCapacity are. Two shapes:
+// - simple: {ref_field, related_field, operator, value} compares the
+//   related record's field against a literal value.
+// - aggregate: {ref_field, aggregate:'sum', aggregate_field, operator,
+//   limit_field} sums a field across every OTHER record referencing the
+//   same related entity via ref_field, and compares against a limit read
+//   from the related record's limit_field.
+// Uses the same unscoped internal get()/list() lookup pattern
+// checkContractDateOrder/checkStockBalance/checkResourceCapacity already
+// use -- these run from validateEntity/validateUpdate, which today has no
+// user context threaded through, so this does not introduce a new
+// access-control gap relative to those three existing checks; it matches
+// their established behavior exactly rather than inventing a new one.
+async function checkCrossEntityRules(entityName, data, existingRecord) {
+  const spec = getSpec(entityName);
+  for (const [fieldKey, fieldDef] of Object.entries(spec.fields || {})) {
+    const rule = fieldDef.cross_entity_rule;
+    if (!rule || !rule.ref_field) continue;
+
+    const refId = data[rule.ref_field] !== undefined ? data[rule.ref_field] : existingRecord?.[rule.ref_field];
+    if (refId == null) continue;
+
+    const refFieldDef = spec.fields[rule.ref_field];
+    const relatedEntity = refFieldDef?.ref;
+    if (!relatedEntity) continue;
+
+    const { get, list } = await import('@/lib/busybase/store');
+    const related = await get(relatedEntity, refId);
+    if (!related) continue;
+
+    const operatorFn = CROSS_ENTITY_OPERATORS[rule.operator];
+    if (!operatorFn) continue;
+
+    if (rule.aggregate === 'sum') {
+      const relatedEntitySelfEntity = entityName;
+      const siblingRecords = await list(relatedEntitySelfEntity, { [rule.ref_field]: refId });
+      const selfId = existingRecord?.id;
+      const thisValue = Number(data[rule.aggregate_field] !== undefined ? data[rule.aggregate_field] : existingRecord?.[rule.aggregate_field]) || 0;
+      const othersTotal = siblingRecords
+        .filter(r => r.id !== selfId)
+        .reduce((sum, r) => sum + (Number(r[rule.aggregate_field]) || 0), 0);
+      const resultingTotal = othersTotal + thisValue;
+      const limit = Number(related[rule.limit_field]);
+      if (!Number.isFinite(limit)) continue;
+      if (!operatorFn(resultingTotal, limit)) {
+        return `${fieldKey}: sum of ${rule.aggregate_field} across ${relatedEntitySelfEntity} for this ${rule.ref_field} would be ${resultingTotal}, violating ${rule.operator} ${limit}`;
+      }
+      continue;
+    }
+
+    if (!rule.related_field) continue;
+    const relatedValue = related[rule.related_field];
+    if (!operatorFn(relatedValue, rule.value)) {
+      return `${fieldKey}: related ${relatedEntity}.${rule.related_field} (${relatedValue}) fails rule "${rule.operator} ${rule.value}"`;
+    }
+  }
+  return null;
+}
+
 const WEEKLY_CAPACITY_HOURS = 40;
 
 // Two date ranges overlap unless one entirely precedes the other -- the
@@ -288,6 +361,9 @@ export async function validateEntity(entityName, data, existingRecord = null, op
   const capacityErr = await checkResourceCapacity(entityName, data, existingRecord);
   if (capacityErr) errors.allocated_hours_per_week = capacityErr;
 
+  const crossEntityErr = await checkCrossEntityRules(entityName, data, existingRecord);
+  if (crossEntityErr) errors._cross_entity = crossEntityErr;
+
   return errors;
 }
 
@@ -369,6 +445,9 @@ export async function validateUpdate(entityName, changes, existingRecord) {
   const capacityErr = await checkResourceCapacity(entityName, changes, existingRecord);
   if (capacityErr) errors.allocated_hours_per_week = capacityErr;
 
+  const crossEntityErr = await checkCrossEntityRules(entityName, changes, existingRecord);
+  if (crossEntityErr) errors._cross_entity = crossEntityErr;
+
   return errors;
 }
 

package/src/ui/custom-entity-renderer.js

@@ -44,12 +44,26 @@ export function renderCustomEntityList(user, defs) {
       var idx=fieldRowCount++;
       var row=document.createElement('div');
       row.className='field-row';
-      row.style.cssText='display:flex;gap:6px;margin:4px 0';
-      row.innerHTML='<input type="text" class="form-input field-key" placeholder="key" style="flex:1">'+
+      row.style.cssText='display:flex;flex-direction:column;gap:4px;margin:4px 0;padding:6px;border:1px solid var(--color-border,#eee);border-radius:4px';
+      row.innerHTML='<div style="display:flex;gap:6px">'+
+        '<input type="text" class="form-input field-key" placeholder="key" style="flex:1">'+
         '<select class="form-input field-type" style="flex:1">${typeOpts}</select>'+
         '<input type="text" class="form-input field-label" placeholder="label" style="flex:1">'+
         '<label style="display:flex;align-items:center;gap:4px;font-size:12px"><input type="checkbox" class="field-required">required</label>'+
-        '<button type="button" class="btn-ghost-clean" data-action="removeFieldRow">x</button>';
+        '<button type="button" class="btn-ghost-clean" data-action="removeFieldRow">x</button>'+
+        '</div>'+
+        '<details><summary style="font-size:12px;cursor:pointer">Cross-entity rule (optional)</summary>'+
+        '<div style="display:flex;gap:6px;margin-top:4px;flex-wrap:wrap">'+
+        '<input type="text" class="form-input rule-ref-field" placeholder="ref field, e.g. project_id" style="flex:1;min-width:120px">'+
+        '<input type="text" class="form-input rule-related-field" placeholder="related field, e.g. status" style="flex:1;min-width:120px">'+
+        '<select class="form-input rule-operator" style="flex:1;min-width:100px">'+
+        '<option value="">No rule</option><option value="equals">equals</option><option value="not_equals">not_equals</option>'+
+        '<option value="gt">gt</option><option value="gte">gte</option><option value="lt">lt</option><option value="lte">lte</option>'+
+        '</select>'+
+        '<input type="text" class="form-input rule-value" placeholder="value (simple rule)" style="flex:1;min-width:100px">'+
+        '<input type="text" class="form-input rule-aggregate-field" placeholder="aggregate field (sum, optional)" style="flex:1;min-width:140px">'+
+        '<input type="text" class="form-input rule-limit-field" placeholder="limit field on related entity (optional)" style="flex:1;min-width:160px">'+
+        '</div></details>';
       container.appendChild(row);
     }
     window.addFieldRow=addFieldRow;
@@ -69,7 +83,23 @@ export function renderCustomEntityList(user, defs) {
         var type=row.querySelector('.field-type').value;
         var flabel=row.querySelector('.field-label').value.trim();
         var required=row.querySelector('.field-required').checked;
-        if(key)fields.push({key:key,type:type,label:flabel||key,required:required});
+        if(!key)return;
+        var field={key:key,type:type,label:flabel||key,required:required};
+        var ruleOperator=row.querySelector('.rule-operator').value;
+        if(ruleOperator){
+          var refField=row.querySelector('.rule-ref-field').value.trim();
+          var relatedField=row.querySelector('.rule-related-field').value.trim();
+          var aggregateField=row.querySelector('.rule-aggregate-field').value.trim();
+          var limitField=row.querySelector('.rule-limit-field').value.trim();
+          if(refField){
+            if(aggregateField&&limitField){
+              field.cross_entity_rule={ref_field:refField,aggregate:'sum',aggregate_field:aggregateField,operator:ruleOperator,limit_field:limitField};
+            } else if(relatedField){
+              field.cross_entity_rule={ref_field:refField,related_field:relatedField,operator:ruleOperator,value:row.querySelector('.rule-value').value};
+            }
+          }
+        }
+        fields.push(field);
       });
       if(!fields.length){status.textContent='At least one field required';return}
       status.textContent='Creating...';

package/src/ui/styles2.css

@@ -354,6 +354,31 @@ html, body { overflow-x: hidden; max-width: 100%; }
   .form-hint { font-size: 0.75rem; }
 }
 
+/* Board/Kanban view: unstyled by default (relied on browser block/flow layout
+   accidentally being usable on wide desktop screens) -- explicit rules needed
+   so it doesn't collapse into an unreadable single column of stacked cards on
+   any width. */
+.board-view { display: flex; gap: 12px; align-items: flex-start; overflow-x: auto; -webkit-overflow-scrolling: touch; padding-bottom: 8px; }
+.board-column { flex: 0 0 280px; min-width: 280px; background: var(--color-bg, #f8fafc); border-radius: var(--radius, 8px); display: flex; flex-direction: column; max-height: 80vh; }
+.board-column-header { display: flex; justify-content: space-between; align-items: center; padding: 12px; font-weight: 600; font-size: 13px; text-transform: uppercase; letter-spacing: 0.5px; color: var(--color-text-muted); }
+.board-column-count { background: var(--color-border, #e2e8f0); border-radius: 9999px; padding: 2px 8px; font-size: 12px; }
+.board-column-body { flex: 1; overflow-y: auto; padding: 0 8px 8px; display: flex; flex-direction: column; gap: 8px; }
+.board-column-empty { padding: 16px; text-align: center; color: var(--color-text-muted); font-size: 13px; }
+.board-card { background: var(--color-surface, #fff); border: 1px solid var(--color-border, #e2e8f0); border-radius: 6px; padding: 10px 12px; cursor: pointer; }
+.board-card-title { font-size: 14px; font-weight: 500; }
+.board-card-meta { margin-top: 4px; font-size: 12px; color: var(--color-text-muted); }
+.board-empty-state { padding: 24px; text-align: center; color: var(--color-text-muted); }
+
+/* Kanban stays horizontally-scrolling (not stacked) on narrow viewports --
+   stacking would hide every column but the first, losing the at-a-glance
+   status overview that is the entire point of a board view. Columns shrink
+   slightly and snap-scroll for a touch-friendly swipe between stages. */
+@media (max-width: 768px) {
+  .board-view { scroll-snap-type: x mandatory; margin-left: calc(-1 * var(--page-gutter)); margin-right: calc(-1 * var(--page-gutter)); padding-left: var(--page-gutter); padding-right: var(--page-gutter); }
+  .board-column { flex-basis: 85vw; min-width: 240px; scroll-snap-align: start; }
+  .board-card { min-height: 44px; }
+}
+
 /* Tablet */
 @media (min-width: 769px) and (max-width: 1023px) {
   :root { --page-gutter: 1.25rem; }