millas 0.2.3 → 0.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "millas",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "A modern batteries-included backend framework for Node.js — built on Express, inspired by Laravel, Django, and FastAPI",
   "main": "src/index.js",
   "exports": {

package/src/admin/ActivityLog.js

@@ -0,0 +1,95 @@
+'use strict';
+
+/**
+ * AdminActivityLog
+ *
+ * Lightweight in-process activity log for the admin panel.
+ * Stores the last N actions in a ring buffer — no database required.
+ *
+ * Each entry:
+ *   { id, action, resource, recordId, label, user, at, meta }
+ *
+ * Usage (automatic — Admin.js calls this internally):
+ *   ActivityLog.record('create', 'users', 5, 'Alice Smith');
+ *   ActivityLog.record('update', 'posts', 12, 'Hello World');
+ *   ActivityLog.record('delete', 'comments', 7, '#7');
+ *
+ * Read:
+ *   ActivityLog.recent(20)   // last 20 entries, newest first
+ *   ActivityLog.forResource('users', 10)
+ */
+class AdminActivityLog {
+  constructor(maxSize = 200) {
+    this._log     = [];
+    this._maxSize = maxSize;
+    this._seq     = 0;
+  }
+
+  /**
+   * Record an admin action.
+   * @param {'create'|'update'|'delete'} action
+   * @param {string} resource   — resource slug
+   * @param {*}      recordId
+   * @param {string} label      — human-readable name of the record
+   * @param {string} [user]     — who performed the action (optional)
+   */
+  record(action, resource, recordId, label, user = null) {
+    this._seq++;
+    const entry = {
+      id:         this._seq,
+      action,
+      resource,
+      recordId,
+      label:      label || `#${recordId}`,
+      user:       user || 'Admin',
+      at:         new Date().toISOString(),
+      _ts:        Date.now(),
+    };
+
+    this._log.unshift(entry);
+
+    // Trim to max size
+    if (this._log.length > this._maxSize) {
+      this._log.length = this._maxSize;
+    }
+  }
+
+  /**
+   * Return the most recent N entries, newest first.
+   */
+  recent(n = 20) {
+    return this._log.slice(0, n);
+  }
+
+  /**
+   * Return recent entries for a specific resource slug.
+   */
+  forResource(slug, n = 10) {
+    return this._log.filter(e => e.resource === slug).slice(0, n);
+  }
+
+  /**
+   * Return totals by action type.
+   * { create: N, update: N, delete: N }
+   */
+  totals() {
+    const t = { create: 0, update: 0, delete: 0 };
+    for (const e of this._log) {
+      if (t[e.action] !== undefined) t[e.action]++;
+    }
+    return t;
+  }
+
+  /**
+   * Clear all log entries.
+   */
+  clear() {
+    this._log = [];
+    this._seq = 0;
+  }
+}
+
+// Singleton
+const activityLog = new AdminActivityLog();
+module.exports = activityLog;
+module.exports.AdminActivityLog = AdminActivityLog;

package/src/admin/Admin.js

@@ -1,7 +1,8 @@
 'use strict';
 
-const path = require('path');
-const nunjucks = require('nunjucks');
+const path        = require('path');
+const nunjucks    = require('nunjucks');
+const ActivityLog = require('./ActivityLog');
 const { AdminResource, AdminField, AdminFilter } = require('./resources/AdminResource');
 
 /**
@@ -75,13 +76,19 @@ class Admin {
     expressApp.get(`${prefix}`,     (q, s) => this._dashboard(q, s));
     expressApp.get(`${prefix}/`,    (q, s) => this._dashboard(q, s));
 
+    // Global search
+    expressApp.get(`${prefix}/search`, (q, s) => this._search(q, s));
+
     // Resource routes
-    expressApp.get   (`${prefix}/:resource`,             (q, s) => this._list(q, s));
-    expressApp.get   (`${prefix}/:resource/create`,      (q, s) => this._create(q, s));
-    expressApp.post  (`${prefix}/:resource`,             (q, s) => this._store(q, s));
-    expressApp.get   (`${prefix}/:resource/:id/edit`,    (q, s) => this._edit(q, s));
-    expressApp.post  (`${prefix}/:resource/:id`,         (q, s) => this._update(q, s));
-    expressApp.post  (`${prefix}/:resource/:id/delete`,  (q, s) => this._destroy(q, s));
+    expressApp.get   (`${prefix}/:resource`,                   (q, s) => this._list(q, s));
+    expressApp.get   (`${prefix}/:resource/export.:format`,    (q, s) => this._export(q, s));
+    expressApp.get   (`${prefix}/:resource/create`,            (q, s) => this._create(q, s));
+    expressApp.post  (`${prefix}/:resource`,                   (q, s) => this._store(q, s));
+    expressApp.get   (`${prefix}/:resource/:id/edit`,          (q, s) => this._edit(q, s));
+    expressApp.get   (`${prefix}/:resource/:id`,               (q, s) => this._detail(q, s));
+    expressApp.post  (`${prefix}/:resource/:id`,               (q, s) => this._update(q, s));
+    expressApp.post  (`${prefix}/:resource/:id/delete`,        (q, s) => this._destroy(q, s));
+    expressApp.post  (`${prefix}/:resource/bulk-delete`,       (q, s) => this._bulkDestroy(q, s));
 
     return this;
   }
@@ -139,11 +146,67 @@ class Admin {
       }
     });
 
-    env.addFilter('min', (arr) => Math.min(...arr));
+    env.addFilter('adminDetail', (value, field) => {
+      if (value === null || value === undefined || value === '') {
+        return '<span class="cell-muted">—</span>';
+      }
+      switch (field.type) {
+        case 'boolean':
+          return value
+            ? '<span class="badge badge-green">Yes</span>'
+            : '<span class="badge badge-gray">No</span>';
+        case 'badge': {
+          const colorMap = { admin:'purple', user:'blue', active:'green', inactive:'gray', pending:'yellow', published:'green', draft:'gray', banned:'red' };
+          const c = (field.colors && field.colors[String(value)]) || colorMap[String(value)] || 'gray';
+          return `<span class="badge badge-${c}">${value}</span>`;
+        }
+        case 'datetime':
+          try {
+            const d = new Date(value);
+            return `<span title="${d.toISOString()}">${d.toLocaleString()}</span>`;
+          } catch { return String(value); }
+        case 'date':
+          try { return new Date(value).toLocaleDateString(); } catch { return String(value); }
+        case 'password':
+          return '<span class="cell-muted" style="letter-spacing:2px">••••••</span>';
+        case 'image':
+          return `<img src="${value}" style="width:64px;height:64px;border-radius:8px;object-fit:cover;border:1px solid var(--border)" alt="">`;
+        case 'url':
+          return `<a href="${value}" target="_blank" rel="noopener" style="color:var(--primary);word-break:break-all">${value} <svg width="11" height="11" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" style="vertical-align:middle"><path d="M18 13v6a2 2 0 01-2 2H5a2 2 0 01-2-2V8a2 2 0 012-2h6"/><polyline points="15 3 21 3 21 9"/><line x1="10" y1="14" x2="21" y2="3"/></svg></a>`;
+        case 'email':
+          return `<a href="mailto:${value}" style="color:var(--primary)">${value}</a>`;
+        case 'color':
+          return `<span style="display:inline-flex;align-items:center;gap:8px"><span style="width:20px;height:20px;border-radius:4px;background:${value};border:1px solid var(--border);flex-shrink:0"></span><span class="cell-mono">${value}</span></span>`;
+        case 'json':
+          try {
+            const pretty = JSON.stringify(typeof value === 'string' ? JSON.parse(value) : value, null, 2);
+            return `<pre style="background:var(--surface2);border:1px solid var(--border);border-radius:var(--radius-sm);padding:12px;font-family:'DM Mono',monospace;font-size:12px;overflow-x:auto;white-space:pre-wrap;margin:0;color:var(--text-soft)">${pretty}</pre>`;
+          } catch { return String(value); }
+        case 'richtext':
+          return `<div style="line-height:1.6;color:var(--text-soft)">${value}</div>`;
+        default: {
+          const str = String(value);
+          return str;
+        }
+      }
+    });
     env.addFilter('dump', (val) => {
       try { return JSON.stringify(val, null, 2); } catch { return String(val); }
     });
 
+    env.addFilter('min', (arr) => Math.min(...arr));
+
+    env.addFilter('relativeTime', (iso) => {
+      try {
+        const diff = Date.now() - new Date(iso).getTime();
+        const s = Math.floor(diff / 1000);
+        if (s < 60)    return 'just now';
+        if (s < 3600)  return `${Math.floor(s / 60)}m ago`;
+        if (s < 86400) return `${Math.floor(s / 3600)}h ago`;
+        return `${Math.floor(s / 86400)}d ago`;
+      } catch { return String(iso); }
+    });
+
     return env;
   }
 
@@ -153,11 +216,13 @@ class Admin {
     return {
       adminPrefix:    this._config.prefix,
       adminTitle:     this._config.title,
-      resources:      this.resources().map(r => ({
+      resources:      this.resources().map((r, idx) => ({
         slug:     r.slug,
         label:    r._getLabel(),
         singular: r._getLabelSingular(),
         icon:     r.icon,
+        canView:  r.canView,
+        index:    idx + 1,
       })),
       flash:          this._pullFlash(req),
       activePage:     extra.activePage || null,
@@ -174,26 +239,42 @@ class Admin {
         this.resources().map(async (R) => {
           let count = 0;
           let recent = [];
+          let recentCount = 0;
           try {
             count  = await R.model.count();
             const result = await R.fetchList({ page: 1, perPage: 5 });
             recent = result.data.map(r => r.toJSON ? r.toJSON() : r);
+            // Count records created in last 7 days for trend indicator
+            try {
+              const since = new Date(Date.now() - 7 * 24 * 60 * 60 * 1000).toISOString();
+              recentCount = await R.model.where('created_at__gte', since).count();
+            } catch { /* model may not have created_at */ }
           } catch {}
           return {
-            slug:       R.slug,
-            label:      R._getLabel(),
-            icon:       R.icon,
+            slug:        R.slug,
+            label:       R._getLabel(),
+            singular:    R._getLabelSingular(),
+            icon:        R.icon,
             count,
+            recentCount,
             recent,
-            listFields: R.fields().filter(f => !f._hidden && !f._detailOnly).slice(0, 4).map(f => f.toJSON()),
+            listFields:  R.fields()
+              .filter(f => f._type !== 'tab' && !f._hidden && !f._detailOnly)
+              .slice(0, 4)
+              .map(f => f.toJSON()),
           };
         })
       );
 
+      const activityData   = ActivityLog.recent(25);
+      const activityTotals = ActivityLog.totals();
+
       res.render('pages/dashboard.njk', this._ctx(req, {
-        pageTitle:  'Dashboard',
-        activePage: 'dashboard',
-        resources:  resourceData,
+        pageTitle:       'Dashboard',
+        activePage:      'dashboard',
+        resources:       resourceData,
+        activity:        activityData,
+        activityTotals,
       }));
     } catch (err) {
       this._error(res, err);
@@ -236,6 +317,7 @@ class Admin {
           canCreate: R.canCreate,
           canEdit:   R.canEdit,
           canDelete: R.canDelete,
+          canView:   R.canView,
         },
         rows,
         listFields,
@@ -283,6 +365,7 @@ class Admin {
       if (!R.canCreate) return res.status(403).send('Not allowed');
 
       await R.create(req.body);
+      ActivityLog.record('create', R.slug, null, `New ${R._getLabelSingular()}`);
       this._flash(req, 'success', `${R._getLabelSingular()} created successfully`);
       this._redirectWithFlash(res, `${this._config.prefix}/${R.slug}`, req._flashType, req._flashMessage);
     } catch (err) {
@@ -337,6 +420,7 @@ class Admin {
       const method = req.body._method || 'POST';
       if (method === 'PUT' || method === 'POST') {
         await R.update(req.params.id, req.body);
+        ActivityLog.record('update', R.slug, req.params.id, `${R._getLabelSingular()} #${req.params.id}`);
         this._flash(req, 'success', `${R._getLabelSingular()} updated successfully`);
         this._redirectWithFlash(res, `${this._config.prefix}/${R.slug}`, req._flashType, req._flashMessage);
       }
@@ -365,6 +449,7 @@ class Admin {
       if (!R.canDelete) return res.status(403).send('Not allowed');
 
       await R.destroy(req.params.id);
+      ActivityLog.record('delete', R.slug, req.params.id, `${R._getLabelSingular()} #${req.params.id}`);
       this._flash(req, 'success', `${R._getLabelSingular()} deleted`);
       this._redirectWithFlash(res, `${this._config.prefix}/${R.slug}`, req._flashType, req._flashMessage);
     } catch (err) {
@@ -372,12 +457,243 @@ class Admin {
     }
   }
 
+  // ─── Detail view (readonly) ───────────────────────────────────────────────
+
+  async _detail(req, res) {
+    try {
+      const R = this._resolve(req.params.resource, res);
+      if (!R) return;
+      if (!R.canView) {
+        if (R.canEdit) return res.redirect(`${this._config.prefix}/${R.slug}/${req.params.id}/edit`);
+        return res.status(403).send('Not allowed');
+      }
+
+      const record = await R.fetchOne(req.params.id);
+      const data   = record.toJSON ? record.toJSON() : record;
+
+      // Build detail field groups (all non-hidden fields, grouped by tab)
+      const detailFields = R.fields()
+        .filter(f => f._type !== '__tab__' && !f._hidden && !f._listOnly)
+        .map(f => f.toJSON());
+
+      const tabs = this._buildTabs(R.fields());
+
+      res.render('pages/detail.njk', this._ctx(req, {
+        pageTitle:      `${R._getLabelSingular()} #${req.params.id}`,
+        activeResource: req.params.resource,
+        resource: {
+          slug:      R.slug,
+          label:     R._getLabel(),
+          singular:  R._getLabelSingular(),
+          icon:      R.icon,
+          canEdit:   R.canEdit,
+          canDelete: R.canDelete,
+          canCreate: R.canCreate,
+        },
+        record:       data,
+        detailFields,
+        tabs,
+        hasTabs:      tabs.length > 1,
+      }));
+    } catch (err) {
+      this._error(res, err);
+    }
+  }
+
+  // ─── Bulk delete ──────────────────────────────────────────────────────────
+
+  async _bulkDestroy(req, res) {
+    try {
+      const R = this._resolve(req.params.resource, res);
+      if (!R) return;
+      if (!R.canDelete) return res.status(403).send('Not allowed');
+
+      const ids = Array.isArray(req.body.ids) ? req.body.ids : [req.body.ids].filter(Boolean);
+      if (!ids.length) {
+        this._flash(req, 'error', 'No records selected.');
+        return this._redirectWithFlash(res, `${this._config.prefix}/${R.slug}`, req._flashType, req._flashMessage);
+      }
+
+      await R.model.destroy(...ids);
+      ActivityLog.record('delete', R.slug, null, `${ids.length} ${R._getLabel()} (bulk)`);
+      this._flash(req, 'success', `Deleted ${ids.length} record${ids.length > 1 ? 's' : ''}.`);
+      this._redirectWithFlash(res, `${this._config.prefix}/${R.slug}`, req._flashType, req._flashMessage);
+    } catch (err) {
+      this._error(res, err);
+    }
+  }
+
+  // ─── Global search ────────────────────────────────────────────────────────
+
+  async _search(req, res) {
+    try {
+      const q = (req.query.q || '').trim();
+
+      if (!q) {
+        return res.render('pages/search.njk', this._ctx(req, {
+          pageTitle: 'Search',
+          activePage: 'search',
+          query: '',
+          results: [],
+          total: 0,
+        }));
+      }
+
+      const results = await Promise.all(
+        this.resources().map(async (R) => {
+          if (!R.searchable || !R.searchable.length) return null;
+          try {
+            const result = await R.fetchList({ page: 1, perPage: 8, search: q });
+            if (!result.data.length) return null;
+            return {
+              slug:     R.slug,
+              label:    R._getLabel(),
+              singular: R._getLabelSingular(),
+              icon:     R.icon,
+              total:    result.total,
+              rows:     result.data.map(r => r.toJSON ? r.toJSON() : r),
+              listFields: R.fields()
+                .filter(f => f._type !== 'tab' && !f._hidden && !f._detailOnly)
+                .slice(0, 4)
+                .map(f => f.toJSON()),
+            };
+          } catch { return null; }
+        })
+      );
+
+      const filtered = results.filter(Boolean);
+      const total    = filtered.reduce((s, r) => s + r.total, 0);
+
+      res.render('pages/search.njk', this._ctx(req, {
+        pageTitle:  `Search: ${q}`,
+        activePage: 'search',
+        query:      q,
+        results:    filtered,
+        total,
+      }));
+    } catch (err) {
+      this._error(res, err);
+    }
+  }
+
+  // ─── Export ───────────────────────────────────────────────────────────────
+
+  async _export(req, res) {
+    try {
+      const R      = this._resolve(req.params.resource, res);
+      if (!R) return;
+
+      const format = req.params.format; // 'csv' or 'json'
+      const search = req.query.search || '';
+      const sort   = req.query.sort   || 'id';
+      const order  = req.query.order  || 'desc';
+
+      const activeFilters = {};
+      if (req.query.filter) {
+        for (const [k, v] of Object.entries(req.query.filter)) {
+          if (v !== '') activeFilters[k] = v;
+        }
+      }
+
+      // Fetch all records (no pagination)
+      const result = await R.fetchList({
+        page: 1, perPage: 100000, search, sort, order, filters: activeFilters,
+      });
+      const rows = result.data.map(r => r.toJSON ? r.toJSON() : r);
+
+      const fields = R.fields()
+        .filter(f => f._type !== 'tab' && !f._hidden)
+        .map(f => f.toJSON());
+
+      const filename = `${R.slug}-${new Date().toISOString().slice(0, 10)}`;
+
+      if (format === 'json') {
+        res.setHeader('Content-Type', 'application/json');
+        res.setHeader('Content-Disposition', `attachment; filename="${filename}.json"`);
+        return res.json(rows);
+      }
+
+      // CSV
+      const header = fields.map(f => `"${f.label}"`).join(',');
+      const csvRows = rows.map(row =>
+        fields.map(f => {
+          const v = row[f.name];
+          if (v === null || v === undefined) return '';
+          const s = String(typeof v === 'object' ? JSON.stringify(v) : v);
+          return `"${s.replace(/"/g, '""')}"`;
+        }).join(',')
+      );
+
+      res.setHeader('Content-Type', 'text/csv');
+      res.setHeader('Content-Disposition', `attachment; filename="${filename}.csv"`);
+      res.send([header, ...csvRows].join('\r\n'));
+    } catch (err) {
+      this._error(res, err);
+    }
+  }
+
   // ─── Helpers ──────────────────────────────────────────────────────────────
 
+  /**
+   * Build form fields with tab metadata injected.
+   * readonly fields (from readonlyFields[] or field.readonly()) are
+   * passed through with a _isReadonly flag so the template can render
+   * them as text instead of inputs.
+   */
   _formFields(R) {
-    return R.fields()
-      .filter(f => f._type !== 'id' && !f._listOnly && !f._readonly)
-      .map(f => ({ ...f.toJSON(), required: !f._nullable }));
+    const readonlySet = new Set(R.readonlyFields || []);
+    let currentTab = null;
+    const result = [];
+
+    for (const f of R.fields()) {
+      // Tab separator — update current tab context, don't add to form fields
+      if (f._type === 'tab') {
+        currentTab = f._label;
+        continue;
+      }
+
+      // Skip id, list-only, and fully hidden fields
+      if (f._type === 'id' || f._listOnly || f._hidden) continue;
+
+      const json = f.toJSON();
+      json.tab = currentTab;
+      json.required = !f._nullable;
+
+      // Mark as readonly if in readonlyFields array or flagged on field itself
+      if (readonlySet.has(f._name) || f._readonly) {
+        json.isReadonly = true;
+      }
+
+      result.push(json);
+    }
+
+    return result;
+  }
+
+  /**
+   * Build tab structure for tabbed form/detail rendering.
+   * Returns [{ label, fields }] — one entry per tab.
+   * If no tabs defined, returns a single unnamed tab with all fields.
+   */
+  _buildTabs(fields) {
+    const tabs = [];
+    let current = null;
+
+    for (const f of fields) {
+      if (f._type === 'tab') {
+        current = { label: f._label, fields: [] };
+        tabs.push(current);
+        continue;
+      }
+      if (f._hidden || f._listOnly) continue;
+      if (!current) {
+        current = { label: null, fields: [] };
+        tabs.push(current);
+      }
+      current.fields.push(f.toJSON());
+    }
+
+    return tabs;
   }
 
   _resolve(slug, res) {