Hooray! Updates to updates!

crudkit/core/service.py

@@ -649,15 +649,16 @@ class CRUDService(Generic[T]):
 
         return rows
 
-    def create(self, data: dict, actor=None) -> T:
+    def create(self, data: dict, actor=None, *, commit: bool = True) -> T:
         session = self.session
         obj = self.model(**data)
         session.add(obj)
+        if commit:
             session.commit()
-        self._log_version("create", obj, actor)
+        self._log_version("create", obj, actor, commit=commit)
         return obj
 
-    def update(self, id: int, data: dict, actor=None) -> T:
+    def update(self, id: int, data: dict, actor=None, *, commit: bool = True) -> T:
         session = self.session
         obj = session.get(self.model, id)
         if not obj:
@@ -695,6 +696,7 @@ class CRUDService(Generic[T]):
             return obj
 
         # Commit atomically
+        if commit:
             session.commit()
 
         # AFTER snapshot for audit
@@ -712,10 +714,10 @@ class CRUDService(Generic[T]):
             return obj
 
         # Log both what we *intended* and what *actually* happened
-        self._log_version("update", obj, actor, metadata={"diff": actual, "patch": patch})
+        self._log_version("update", obj, actor, metadata={"diff": actual, "patch": patch}, commit=commit)
         return obj
 
-    def delete(self, id: int, hard: bool = False, actor = None):
+    def delete(self, id: int, hard: bool = False, actor = None, *, commit: bool = True):
         session = self.session
         obj = session.get(self.model, id)
         if not obj:
@@ -725,11 +727,12 @@ class CRUDService(Generic[T]):
         else:
             soft = cast(_SoftDeletable, obj)
             soft.is_deleted = True
+        if commit:
             session.commit()
-        self._log_version("delete", obj, actor)
+        self._log_version("delete", obj, actor, commit=commit)
         return obj
 
-    def _log_version(self, change_type: str, obj: T, actor=None, metadata: dict | None = None):
+    def _log_version(self, change_type: str, obj: T, actor=None, metadata: dict | None = None, *, commit: bool = True):
         session = self.session
         try:
             snapshot = {}
@@ -747,7 +750,8 @@ class CRUDService(Generic[T]):
                 meta=to_jsonable(metadata) if metadata else None,
             )
             session.add(version)
+            if commit:
                 session.commit()
         except Exception as e:
-            log.warning(f"Version logging failed for {self.model.__name__} id={getattr(obj, "id", "?")}: {str(e)}")
+            log.warning(f"Version logging failed for {self.model.__name__} id={getattr(obj, 'id', '?')}: {str(e)}")
             session.rollback()

inventory/routes/entry.py

@@ -9,6 +9,28 @@ from crudkit.core import normalize_payload
 
 bp_entry = Blueprint("entry", __name__)
 
+def _apply_worklog_updates(worklog, updates, delete_ids):
+    note_cls = type(worklog).updates.property.mapper.class_
+    note_svc = crudkit.crud.get_service(note_cls)
+    sess = note_svc.session
+
+    existing = {u.id: u for u in worklog.updates if not getattr(u, "is_deleted", False)}
+
+    for item in updates:
+        uid = item.get("id")
+        content = (item.get("content") or "").strip()
+        if not content and not uid:
+            continue
+        if uid:
+            # per-note version log preserved, but commit deferred.
+            note_svc.update(uid, {"content": content}, actor="bulk_child_update", commit=False)
+        else:
+            note_svc.create({"work_log_id": worklog.id, "content": content}, actor="bulk_child_create", commit=False)
+
+    for uid in delete_ids:
+        if uid in existing:
+            note_svc.delete(uid, actor="bulk_child_delete", commit=False)
+
 def init_entry_routes(app):
 
     @bp_entry.get("/entry/<model>/<int:id>")
@@ -168,6 +190,9 @@ def init_entry_routes(app):
             cls = crudkit.crud.get_model(model)
             payload = normalize_payload(request.get_json(), cls)
 
+            updates = payload.pop("updates", None) or []
+            delete_ids = payload.pop("delete_update_ids", None) or []
+
             params = {}
             if model == "inventory":
                 pass
@@ -191,16 +216,25 @@ def init_entry_routes(app):
                         "start_time",
                         "end_time",
                         "complete",
+                        "updates",
                     ]
                 }
             else:
                 raise TypeError("Invalid model.")
 
             service = crudkit.crud.get_service(cls)
-            service.update(id, data=payload, actor="update_entry")
+            sess = service.session
+
+            obj = service.update(id, data=payload, actor="update_entry", commit=False)
+
+            if model == "worklog" and (updates or delete_ids):
+                _apply_worklog_updates(obj, updates, delete_ids)
+
+            sess.commit()
 
             return {"status": "success", "payload": payload}
         except Exception as e:
+            print(e)
             return {"status": "failure", "error": str(e)}
 
     app.register_blueprint(bp_entry)

inventory/templates/submit_button.html

@@ -1,9 +1,13 @@
 <button type="submit" class="btn btn-primary" id="submit">Save</button>
 <script>
+    window.newDrafts = window.newDrafts || [];
+    window.deletedIds = window.deletedIds || [];
+
     function formToJson(form) {
         const fd = new FormData(form);
         const out = {};
 
+        // base values
         fd.forEach((value, key) => {
             if (key in out) {
                 if (!Array.isArray(out[key])) out[key] = [out[key]];
@@ -13,21 +17,21 @@
             }
         });
 
+        // normalize radios and checkboxes
         form.querySelectorAll('input[type="checkbox"], input[type="radio"]').forEach(el => {
             if (!el.name) return;
 
             if (el.type === 'radio') {
-                if (out[el.name] !== undefined) return;
+                if (out[el.name] !== undefined) return; // already set for this group
                 const checked = form.querySelector(`input[type="radio"][name="${CSS.escape(el.name)}"]:checked`);
                 if (checked) out[el.name] = checked.value ?? true;
+                return;
             }
 
             if (el.type === 'checkbox') {
                 const group = form.querySelectorAll(`input[type="checkbox"][name="${CSS.escape(el.name)}"]`);
                 if (group.length > 1) {
-                    const checkedVals = Array.from(group)
-                        .filter(i => i.checked)
-                        .map(i => i.value ?? true);
+                    const checkedVals = Array.from(group).filter(i => i.checked).map(i => i.value ?? true);
                     out[el.name] = checkedVals;
                 } else {
                     out[el.name] = el.checked;
@@ -38,24 +42,61 @@
         return out;
     }
 
+    function collectExistingUpdateIds() {
+        return Array.from(document.querySelectorAll('script[type="application/json"][id^="md-"]'))
+            .map(el => Number(el.id.slice(3)))
+            .filter(Number.isFinite);
+    }
+
+    function collectEditedUpdates() {
+        const updates = [];
+        for (const id of collectExistingUpdateIds()) {
+            updates.push({ id, content: getMarkdown(id) });  // ensure getMarkdown exists
+        }
+        for (const md of (window.newDrafts || [])) {
+            if ((md ?? '').trim()) updates.push({ content: md });
+        }
+        return updates;
+    }
+
+    function collectDeletedIds() {
+        return (window.deletedIds || []).filter(Number.isFinite);
+    }
+
     document.getElementById("{{ field['attrs']['data-model'] }}_form").addEventListener("submit", async e => {
         e.preventDefault();
+
         const json = formToJson(e.target);
-        json['id'] = {{ field['template_ctx']['values']['id'] }};
+        json.id = {{ field['template_ctx']['values']['id'] }};
 
-        response = await fetch("{{ url_for('entry.update_entry', id=field['template_ctx']['values']['id'], model=field['attrs']['data-model']) }}", {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify(json)
-        });
+        // map friendly names to real FK columns if needed
+        if (json.contact && !json.contact_id) json.contact_id = Number(json.contact) || null;
+        if (json.work_item && !json.work_item_id) json.work_item_id = Number(json.work_item) || null;
 
-        reply = await response.json();
-        if (reply['status'] === 'success') {
-            toastMessage("This entry has been successfully saved!", "success");
+        // child mutations
+        json.updates = collectEditedUpdates();
+        json.delete_update_ids = collectDeletedIds();
+
+        try {
+            const response = await fetch(
+                "{{ url_for('entry.update_entry', id=field['template_ctx']['values']['id'], model=field['attrs']['data-model']) }}",
+                {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify(json),
+                }
+            );
+
+            const reply = await response.json();
+            if (reply.status === 'success') {
+                toastMessage('This entry has been successfully saved!', 'success');
+                window.newDrafts = [];
+                window.deletedIds = [];
             } else {
-            toastMessage(`Unable to save entry: ${reply['error']}`, "danger");
+                toastMessage(`Unable to save entry: ${reply.error}`, 'danger');
+            }
+        } catch (err) {
+            toastMessage(`Network error: ${String(err)}`, 'danger');
         }
   });
 </script>

inventory/templates/update_list.html

@@ -5,6 +5,7 @@
   <li class="list-group-item">
     <div class="d-flex justify-content-between align-items-start">
       <div class="me-3 w-100" id="editContainer{{ n.id }}"></div>
+      <script type="application/json" id="md-{{ n.id }}">{{ n.content | tojson }}</script>
 
       <div class="d-flex flex-column align-items-end">
         <div id="editView{{ n.id }}">
@@ -13,8 +14,8 @@
           </small>
         </div>
         <div class="form-check form-switch">
-                        <input type="checkbox" class="form-check-input" id="editSwitch{{ n.id }}" switch onchange="changeMode({{ n.id }})">
-                        <label for="editSwitch" class="form-check-label">Edit</label>
+          <input class="form-check-input" type="checkbox" id="editSwitch{{ n.id }}" onchange="changeMode({{ n.id }})" role="switch" aria-label="Edit mode for update {{ n.id }}">
+          <label for="editSwitch{{ n.id }}" class="form-check-label">Edit</label>
         </div>
       </div>
     </div>
@@ -24,83 +25,101 @@
   {% endfor %}
 </ul>
 
+<style>
+    textarea.auto-md {
+        box-sizing: border-box;
+        width: 100%;
+        max-height: 60vh;
+        overflow: hidden;
+        resize: vertical;
+    }
+
+    @supports (field-sizing: content) {
+        text-area.auto-md {
+            field-sizing: content;
+        }
+    }
+</style>
+
 <script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/dompurify/dist/purify.min.js"></script>
 <script>
-    const contents = {};
-    {% for n in items %}
-        contents[{{ n.id }}] = {{ n.content | tojson }};
-    {% endfor %}
-
+  // Initial render
   document.addEventListener('DOMContentLoaded', () => {
-        for (const [id, md] of Object.entries(contents)) {
-            renderView(+id, md);
-        }
+    const ids = [ {% for n in items %} {{ n.id }}{% if not loop.last %}, {% endif %}{% endfor %} ];
+    for (const id of ids) renderView(id, getMarkdown(id));
   });
 
+  function getMarkdown(id) {
+    const el = document.getElementById(`md-${id}`);
+    return el ? JSON.parse(el.textContent) : "";
+  }
+  function setMarkdown(id, md) {
+    const el = document.getElementById(`md-${id}`);
+    if (el) el.textContent = JSON.stringify(md ?? "");
+  }
+
   function renderView(id, md) {
     const container = document.getElementById(`editContainer${id}`);
-        const html = marked.parse(md ?? "");
-
-        container.innerHTML = DOMPurify.sanitize(html, {
-            ADD_ATTR: ['target', 'rel'],
-        });
+    if (!container) return;
+    const html = marked.parse(md || "");
+    container.innerHTML = DOMPurify.sanitize(html, { ADD_ATTR: ['target','rel'] });
     for (const a of container.querySelectorAll('a[href]')) {
-            a.setAttribute('target', '_blank');
-            a.setAttribute('rel', 'noopener noreferrer nofollow')
+      a.setAttribute('target','_blank');
+      a.setAttribute('rel','noopener noreferrer nofollow');
     }
   }
 
   function changeMode(id) {
     const container = document.getElementById(`editContainer${id}`);
     const toggle = document.getElementById(`editSwitch${id}`);
+    if (!toggle.checked) return renderView(id, getMarkdown(id));
 
-        if (toggle.checked) {
-            // Switch to editor mode
-            const current = contents[id] ?? "";
-            container.dataset.prev = container.innerHTML;
-
+    const current = getMarkdown(id);
     container.innerHTML = `
-                <textarea class="form-control w-100" id="editor${id}" rows="6">${escapeForTextarea(current)}</textarea>
+      <textarea class="form-control w-100 auto-md" id="editor${id}">${escapeForTextarea(current)}</textarea>
       <div class="mt-2 d-flex gap-2">
         <button class="btn btn-primary btn-sm" onclick="saveEdit(${id})">Save</button>
         <button class="btn btn-secondary btn-sm" onclick="cancelEdit(${id})">Cancel</button>
         <button class="btn btn-outline-secondary btn-sm" onclick="togglePreview(${id})">Preview</button>
       </div>
-                <div class="mt-2 border rounded p-2 d-none" id="preview${id}"></div>
+      <div class="mt-2 border rounded p-2 d-none" id="preview${id}" aria-live="polite"></div>
     `;
-        } else {
-            // Switch to viewer mode
-            renderView(id, contents[id]);
-        }
+    const ta = document.getElementById(`editor${id}`);
+    autoGrow(ta);
+    ta.addEventListener('input', () => autoGrow(ta));
   }
 
   function saveEdit(id) {
-        const textarea = document.getElementById(`editor${id}`);
-        const value = textarea.value;
-        contents[id] = value;
-        renderView(id, value);
-
+    const ta = document.getElementById(`editor${id}`);
+    const value = ta ? ta.value : "";
+    setMarkdown(id, value);     // persist into the JSON tag
+    renderView(id, value);      // show it
     document.getElementById(`editSwitch${id}`).checked = false;
   }
 
   function cancelEdit(id) {
     document.getElementById(`editSwitch${id}`).checked = false;
-        renderView(id, contents[id]);
+    renderView(id, getMarkdown(id));
   }
 
   function togglePreview(id) {
-        const textarea = document.getElementById(`editor${id}`);
+    const ta = document.getElementById(`editor${id}`);
     const preview = document.getElementById(`preview${id}`);
     preview.classList.toggle('d-none');
     if (!preview.classList.contains('d-none')) {
-            const html = marked.parse(textarea.value ?? "");
+      const html = marked.parse(ta ? ta.value : "");
       preview.innerHTML = DOMPurify.sanitize(html);
     }
   }
 
+  function autoGrow(ta) {
+    if (!ta) return;
+    ta.style.height = 'auto';
+    ta.style.height = ta.scrollHeight + 'px';
+  }
+
   function escapeForTextarea(s) {
-        // Keep control of what goes inside the textarea
     return (s ?? "").replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
   }
 </script>