webspresso 0.0.49 → 0.0.50

package/README.md

@@ -530,6 +530,100 @@ Template helpers from analytics plugin:
 
 Individual helpers: `gtag()`, `gtm()`, `gtmNoscript()`, `yandexMetrika()`, `bingUET()`, `facebookPixel()`, `allAnalytics()`
 
+**Admin Panel Plugin:**
+- Modular admin panel with SPA (Mithril.js)
+- Model CRUD UI (auto-generated from ORM)
+- Extensible via custom pages, menu items, API routes, and dashboard widgets
+- Other plugins (e.g. site-analytics) can register their own admin pages
+
+```javascript
+const { adminPanelPlugin } = require('webspresso/plugins');
+
+const { app } = createApp({
+  pagesDir: './pages',
+  plugins: [
+    adminPanelPlugin({
+      db,
+      path: '/_admin',           // Admin URL (default: /_admin)
+      auth: authManager,         // Optional: for user management
+      userManagement: { enabled: true, model: 'User' },
+    })
+  ]
+});
+```
+
+Options:
+- `db` (required) - Database instance
+- `path` - Admin panel path (default: `/_admin`)
+- `auth` - Auth manager for user management
+- `userManagement` - User management config (`enabled`, `model`, `fields`)
+- `configure` - Callback `(registry) => void` for manual setup
+
+**Custom Admin Pages (registerModule):**
+
+Plugins can add custom admin pages using `registerModule` in `onRoutesReady`:
+
+```javascript
+// In your plugin's onRoutesReady(ctx)
+const adminApi = ctx.usePlugin('admin-panel');
+if (adminApi) {
+  adminApi.registerModule({
+    id: 'my-module',
+
+    pages: [{
+      id: 'reports',
+      title: 'Reports',
+      path: '/reports',
+      icon: 'chart',
+      description: 'View reports',
+      component: `window.__customPages["reports"] = { view: () => m("div", "My Report") };`,  // Mithril.js
+    }],
+
+    menu: [{ id: 'reports', label: 'Reports', path: '/reports', icon: 'chart', order: 5 }],
+
+    api: {
+      prefix: '/reports',
+      routes: [
+        { method: 'get', path: '/summary', handler: getSummaryHandler, auth: true },
+      ],
+    },
+
+    widgets: [{
+      id: 'reports-widget',
+      title: 'Quick Stats',
+      dataLoader: async () => ({ count: 42 }),
+    }],
+
+    menuGroups: [{ id: 'analytics', label: 'Analytics', order: 2 }],
+  });
+}
+```
+
+**registerModule config:**
+| Field | Description |
+|-------|-------------|
+| `id` | Unique module identifier (required) |
+| `pages` | Custom admin pages (each: `id`, `title`, `path`, `icon`, `description`, optional `component`) |
+| `menu` | Sidebar menu items (`id`, `label`, `path`, `icon`, `order`) |
+| `menuGroups` | Collapsible menu groups (`id`, `label`, `order`) |
+| `api` | API routes (`prefix`, `routes`: `method`, `path`, `handler`, `auth`) |
+| `widgets` | Dashboard widgets (`id`, `title`, `dataLoader`) |
+
+For pages with `component`: provide Mithril.js code that assigns to `window.__customPages[pageId]`. Without `component`, the page shows a static placeholder.
+
+**Manual registry API** (alternative to registerModule):
+
+```javascript
+adminPanelPlugin({
+  db,
+  configure(registry) {
+    registry.registerPage('custom', { title: 'Custom', path: '/custom', icon: 'tool' });
+    registry.registerClientComponent('custom', 'window.__customPages["custom"] = { view: () => m("p","Hi") };');
+    registry.registerMenuItem({ id: 'custom', label: 'Custom', path: '/custom', icon: 'tool' });
+  },
+})
+```
+
 **Site Analytics Plugin:**
 - Self-hosted page view analytics (no external services required)
 - Automatic page view tracking via Express middleware

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webspresso",
-  "version": "0.0.49",
+  "version": "0.0.50",
   "description": "Minimal, production-ready SSR framework for Node.js with file-based routing, Nunjucks templating, built-in i18n, and CLI tooling",
   "main": "index.js",
   "bin": {

package/plugins/admin-panel/api.js

@@ -227,6 +227,7 @@ function createApiHandlers(options) {
         columns,
         relations: Object.keys(model.relations),
         queries: Object.keys(model.admin.queries || {}),
+        softDelete: !!model.scopes?.softDelete,
       });
     } catch (error) {
       res.status(500).json({ error: error.message });
@@ -250,9 +251,19 @@ function createApiHandlers(options) {
       const perPage = parseInt(req.query.perPage) || 15;
       const offset = (page - 1) * perPage;
 
-      // Build query
+      // Build query (with soft delete scope if applicable)
       let query = repo.query();
       let countQuery = repo.query();
+      if (model.scopes?.softDelete) {
+        const trashed = req.query.trashed;
+        if (trashed === 'only') {
+          query = query.onlyTrashed();
+          countQuery = countQuery.onlyTrashed();
+        } else if (trashed === 'include') {
+          query = query.withTrashed();
+          countQuery = countQuery.withTrashed();
+        }
+      }
 
       // Parse filter parameters from query string
       // Express's qs library automatically parses filter[column][prop] into nested objects
@@ -492,7 +503,7 @@ function createApiHandlers(options) {
   }
 
   /**
-   * Delete record
+   * Delete record (soft delete if model has softDelete scope)
    */
   async function deleteRecordHandler(req, res) {
     try {
@@ -516,6 +527,35 @@ function createApiHandlers(options) {
     }
   }
 
+  /**
+   * Restore soft-deleted record
+   */
+  async function restoreRecordHandler(req, res) {
+    try {
+      const { model: modelName, id } = req.params;
+      const model = getModelFromDb(modelName);
+
+      if (!model || !model.admin || model.admin.enabled !== true) {
+        return res.status(404).json({ error: 'Model not found or not enabled' });
+      }
+
+      if (!model.scopes?.softDelete) {
+        return res.status(400).json({ error: 'Model does not support soft delete' });
+      }
+
+      const repo = db.getRepository(model.name);
+      const record = await repo.restore(id);
+
+      if (!record) {
+        return res.status(404).json({ error: 'Record not found in trash' });
+      }
+
+      res.json({ success: true, data: record });
+    } catch (error) {
+      res.status(500).json({ error: error.message });
+    }
+  }
+
   /**
    * Get relation data
    */
@@ -615,6 +655,7 @@ function createApiHandlers(options) {
     createRecordHandler,
     updateRecordHandler,
     deleteRecordHandler,
+    restoreRecordHandler,
     relationHandler,
     queryHandler,
     resetHandler,

package/plugins/admin-panel/components.js

@@ -1590,6 +1590,9 @@ function loadRecords(modelName, page = 1, filters = null) {
   // Update URL with filters
   const queryParams = new URLSearchParams();
   queryParams.set('page', page);
+  if (state.trashedView) {
+    queryParams.set('trashed', 'only');
+  }
   if (Object.keys(activeFilters).length > 0) {
     for (const [col, filter] of Object.entries(activeFilters)) {
       if (!filter || (filter.value === '' && !filter.from && !filter.to)) continue;
@@ -1613,7 +1616,8 @@ function loadRecords(modelName, page = 1, filters = null) {
   const newUrl = window.location.pathname + (queryParams.toString() ? '?' + queryParams.toString() : '');
   window.history.replaceState({}, '', newUrl);
   
-  api.get('/models/' + modelName + '/records?page=' + page + '&perPage=' + perPage + filterQuery)
+  const trashedParam = state.trashedView ? '&trashed=only' : '';
+  api.get('/models/' + modelName + '/records?page=' + page + '&perPage=' + perPage + trashedParam + filterQuery)
     .then(result => {
       state.records = result.data || [];
       state.pagination = {
@@ -1641,6 +1645,7 @@ function initializeModelView(modelName) {
   state.filterDrawerOpen = false;
   state.selectedRecords = new Set(); // Bulk selection
   state.selectAllMode = false; // Reset select all mode
+  state.trashedView = false; // Soft delete: show trashed records
   state.bulkActionInProgress = false;
   state.bulkFields = []; // Reset bulk fields
   state.bulkFieldDropdownOpen = false;
@@ -1725,8 +1730,26 @@ const RecordList = {
     return m(Layout, { breadcrumbs }, [
       // Header
       m('.flex.items-center.justify-between.mb-4', [
-        m('h2.text-2xl.font-bold', modelMeta?.label || modelName),
-        m('button.inline-flex.items-center.gap-2.px-4.py-2.text-sm.font-medium.text-white.bg-indigo-600.rounded-lg.hover:bg-indigo-700.focus:outline-none.focus:ring-2.focus:ring-indigo-500', {
+        m('.flex.items-center.gap-3', [
+          m('h2.text-2xl.font-bold', modelMeta?.label || modelName),
+          modelMeta?.softDelete ? m('.flex.rounded-lg.border.border-gray-200.p-0.5', [
+            m('button.px-3.py-1.5.text-sm.font-medium.rounded-md.transition-colors', {
+              class: !state.trashedView ? 'bg-indigo-600.text-white' : 'text-gray-600.hover:text-gray-900',
+              onclick: () => {
+                state.trashedView = false;
+                loadRecords(modelName, 1);
+              },
+            }, 'Active'),
+            m('button.px-3.py-1.5.text-sm.font-medium.rounded-md.transition-colors', {
+              class: state.trashedView ? 'bg-indigo-600.text-white' : 'text-gray-600.hover:text-gray-900',
+              onclick: () => {
+                state.trashedView = true;
+                loadRecords(modelName, 1);
+              },
+            }, 'Trash'),
+          ]) : null,
+        ]),
+        !state.trashedView ? m('button.inline-flex.items-center.gap-2.px-4.py-2.text-sm.font-medium.text-white.bg-indigo-600.rounded-lg.hover:bg-indigo-700.focus:outline-none.focus:ring-2.focus:ring-indigo-500', {
           onclick: () => {
             state.currentRecord = null;
             state.editing = true;
@@ -1737,7 +1760,7 @@ const RecordList = {
             m('path', { 'stroke-linecap': 'round', 'stroke-linejoin': 'round', 'stroke-width': '2', d: 'M12 4v16m8-8H4' }),
           ]),
           'New Record',
-        ]),
+        ]) : null,
       ]),
       
       // Quick Filters Bar
@@ -1825,35 +1848,63 @@ const RecordList = {
                 }, 'Select only this page (' + state.selectedRecords.size + ')'),
               ]),
               m('.flex.items-center.gap-2', [
-                m('button.inline-flex.items-center.gap-1.px-3.py-1.5.text-sm.font-medium.text-red-600.bg-white.border.border-red-200.rounded.hover:bg-red-50.transition-colors', {
-                  disabled: state.bulkActionInProgress,
-                  onclick: async () => {
-                    const count = state.selectAllMode ? state.pagination.total : state.selectedRecords.size;
-                    if (!confirm('Are you sure you want to delete ' + count + ' records? This action cannot be undone.')) return;
-                    state.bulkActionInProgress = true;
-                    m.redraw();
-                    try {
-                      const payload = state.selectAllMode 
-                        ? { selectAll: true, filters: state.filters }
-                        : { ids: Array.from(state.selectedRecords) };
-                      await api.post('/extensions/bulk-actions/bulk-delete/' + modelName, payload);
-                      state.selectedRecords = new Set();
-                      state.selectAllMode = false;
-                      loadRecords(modelName, 1);
-                    } catch (err) {
-                      alert('Error: ' + err.message);
-                    } finally {
-                      state.bulkActionInProgress = false;
-                      m.redraw();
-                    }
-                  },
-                }, [
-                  m('svg.w-4.h-4', { fill: 'none', viewBox: '0 0 24 24', stroke: 'currentColor' },
-                    m('path', { 'stroke-linecap': 'round', 'stroke-linejoin': 'round', 'stroke-width': '2', d: 'M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16' })
-                  ),
-                  'Delete',
-                ]),
-                m('button.inline-flex.items-center.gap-1.px-3.py-1.5.text-sm.font-medium.text-blue-600.bg-white.border.border-blue-200.rounded.hover:bg-blue-50.transition-colors', {
+                state.trashedView && modelMeta?.softDelete
+                  ? m('button.inline-flex.items-center.gap-1.px-3.py-1.5.text-sm.font-medium.text-green-600.bg-white.border.border-green-200.rounded.hover:bg-green-50.transition-colors', {
+                      disabled: state.bulkActionInProgress,
+                      onclick: async () => {
+                        if (!confirm('Restore the selected records?')) return;
+                        state.bulkActionInProgress = true;
+                        m.redraw();
+                        try {
+                          const payload = state.selectAllMode
+                            ? { selectAll: true, filters: state.filters, trashed: true }
+                            : { ids: Array.from(state.selectedRecords), trashed: true };
+                          await api.post('/extensions/bulk-actions/bulk-restore/' + modelName, payload);
+                          state.selectedRecords = new Set();
+                          state.selectAllMode = false;
+                          loadRecords(modelName, 1);
+                        } catch (err) {
+                          alert('Error: ' + err.message);
+                        } finally {
+                          state.bulkActionInProgress = false;
+                          m.redraw();
+                        }
+                      },
+                    }, [
+                      m('svg.w-4.h-4', { fill: 'none', viewBox: '0 0 24 24', stroke: 'currentColor' },
+                        m('path', { 'stroke-linecap': 'round', 'stroke-linejoin': 'round', 'stroke-width': '2', d: 'M5 13l4 4L19 7' })
+                      ),
+                      'Restore',
+                    ])
+                  : m('button.inline-flex.items-center.gap-1.px-3.py-1.5.text-sm.font-medium.text-red-600.bg-white.border.border-red-200.rounded.hover:bg-red-50.transition-colors', {
+                      disabled: state.bulkActionInProgress,
+                      onclick: async () => {
+                        const count = state.selectAllMode ? state.pagination.total : state.selectedRecords.size;
+                        if (!confirm('Are you sure you want to delete ' + count + ' records? This action cannot be undone.')) return;
+                        state.bulkActionInProgress = true;
+                        m.redraw();
+                        try {
+                          const payload = state.selectAllMode 
+                            ? { selectAll: true, filters: state.filters }
+                            : { ids: Array.from(state.selectedRecords) };
+                          await api.post('/extensions/bulk-actions/bulk-delete/' + modelName, payload);
+                          state.selectedRecords = new Set();
+                          state.selectAllMode = false;
+                          loadRecords(modelName, 1);
+                        } catch (err) {
+                          alert('Error: ' + err.message);
+                        } finally {
+                          state.bulkActionInProgress = false;
+                          m.redraw();
+                        }
+                      },
+                    }, [
+                      m('svg.w-4.h-4', { fill: 'none', viewBox: '0 0 24 24', stroke: 'currentColor' },
+                        m('path', { 'stroke-linecap': 'round', 'stroke-linejoin': 'round', 'stroke-width': '2', d: 'M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16' })
+                      ),
+                      'Delete',
+                    ]),
+                !state.trashedView ? m('button.inline-flex.items-center.gap-1.px-3.py-1.5.text-sm.font-medium.text-blue-600.bg-white.border.border-blue-200.rounded.hover:bg-blue-50.transition-colors', {
                   disabled: state.bulkActionInProgress,
                   onclick: async () => {
                     state.bulkActionInProgress = true;
@@ -1883,8 +1934,8 @@ const RecordList = {
                     m('path', { 'stroke-linecap': 'round', 'stroke-linejoin': 'round', 'stroke-width': '2', d: 'M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4' })
                   ),
                   'Export JSON',
-                ]),
-                m('button.inline-flex.items-center.gap-1.px-3.py-1.5.text-sm.font-medium.text-green-600.bg-white.border.border-green-200.rounded.hover:bg-green-50.transition-colors', {
+                ]) : null,
+                !state.trashedView ? m('button.inline-flex.items-center.gap-1.px-3.py-1.5.text-sm.font-medium.text-green-600.bg-white.border.border-green-200.rounded.hover:bg-green-50.transition-colors', {
                   disabled: state.bulkActionInProgress,
                   onclick: async () => {
                     state.bulkActionInProgress = true;
@@ -1914,9 +1965,8 @@ const RecordList = {
                     m('path', { 'stroke-linecap': 'round', 'stroke-linejoin': 'round', 'stroke-width': '2', d: 'M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4' })
                   ),
                   'Export CSV',
-                ]),
-                // Bulk Field Update Dropdown
-                m(BulkFieldUpdateDropdown, {
+                ]) : null,
+                !state.trashedView ? m(BulkFieldUpdateDropdown, {
                   modelName: modelName,
                   selectedIds: state.selectAllMode ? null : Array.from(state.selectedRecords),
                   selectAllMode: state.selectAllMode,
@@ -1926,7 +1976,7 @@ const RecordList = {
                     state.selectAllMode = false;
                     loadRecords(modelName, state.pagination.page);
                   },
-                }),
+                }) : null,
                 m('button.px-3.py-1.5.text-sm.text-gray-500.hover:text-gray-700', {
                   onclick: () => {
                     state.selectedRecords = new Set();
@@ -1938,14 +1988,14 @@ const RecordList = {
                 }, 'Clear'),
               ]),
             ]) : null,
-            // Table container with sticky header and actions
-            m('.overflow-x-auto.max-h-[calc(100vh-380px)]', { style: 'position: relative;' }, [
+            // Table container with sticky header, fixed columns, and overflow scroll
+            m('.overflow-auto.max-h-[calc(100vh-380px)]', { style: 'position: relative;' }, [
               m('table.w-full.border-collapse', { style: 'min-width: 100%;' }, [
                 // Sticky header
-                m('thead.bg-gray-50', { style: 'position: sticky; top: 0; z-index: 10;' }, [
+                m('thead.bg-gray-50', { style: 'position: sticky; top: 0; z-index: 20; background: #f9fafb;' }, [
                   m('tr', [
-                    // Checkbox column header
-                    m('th.px-4.py-3.text-left.bg-gray-50.border-b.border-gray-200', { style: 'width: 40px;' }, [
+                    // Checkbox column header (sticky left, box-shadow on right)
+                    m('th.px-4.py-3.text-left.bg-gray-50.border-b.border-gray-200', { style: 'width: 40px; position: sticky; left: 0; z-index: 15; box-shadow: 4px 0 8px -4px rgba(0,0,0,0.08);' }, [
                       m('input[type=checkbox].rounded.border-gray-300.text-indigo-600.focus:ring-indigo-500', {
                         checked: state.records.length > 0 && state.selectedRecords && state.selectedRecords.size === state.records.length,
                         indeterminate: state.selectedRecords && state.selectedRecords.size > 0 && state.selectedRecords.size < state.records.length,
@@ -1959,15 +2009,16 @@ const RecordList = {
                         },
                       }),
                     ]),
-                    // Dynamic column headers
-                    ...displayColumns.map(col => 
+                    // Dynamic column headers (first column sticky left with box-shadow)
+                    ...displayColumns.map((col, i) => 
                       m('th.px-4.py-3.text-left.text-xs.font-medium.text-gray-500.uppercase.tracking-wider.whitespace-nowrap.bg-gray-50.border-b.border-gray-200', 
+                        i === 0 ? { style: 'position: sticky; left: 40px; z-index: 15; box-shadow: 4px 0 8px -4px rgba(0,0,0,0.08);' } : {},
                         formatColumnLabel(col.name)
                       )
                     ),
-                    // Sticky actions header
+                    // Sticky actions header (sticky right, box-shadow on left)
                     m('th.px-4.py-3.text-right.text-xs.font-medium.text-gray-500.uppercase.tracking-wider.bg-gray-50.border-b.border-gray-200', {
-                      style: 'position: sticky; right: 0; min-width: 120px;',
+                      style: 'position: sticky; right: 0; min-width: 120px; z-index: 15; box-shadow: -4px 0 8px -4px rgba(0,0,0,0.08);',
                     }, 'Actions'),
                   ]),
                 ]),
@@ -1975,8 +2026,10 @@ const RecordList = {
                   m('tr.hover:bg-gray-50.transition-colors', {
                     class: state.selectedRecords && state.selectedRecords.has(record[primaryKey]) ? 'bg-indigo-50' : '',
                   }, [
-                    // Checkbox cell
-                    m('td.px-4.py-3', [
+                    // Checkbox cell (sticky left, box-shadow on right)
+                    m('td.px-4.py-3.bg-white', {
+                      style: 'position: sticky; left: 0; z-index: 5; box-shadow: 4px 0 8px -4px rgba(0,0,0,0.08);',
+                    }, [
                       m('input[type=checkbox].rounded.border-gray-300.text-indigo-600.focus:ring-indigo-500', {
                         checked: state.selectedRecords && state.selectedRecords.has(record[primaryKey]),
                         onchange: (e) => {
@@ -1990,35 +2043,49 @@ const RecordList = {
                         },
                       }),
                     ]),
-                    // Dynamic cell values
-                    ...displayColumns.map(col => 
-                      m('td.px-4.py-3.text-sm.whitespace-nowrap.text-gray-700', 
+                    // Dynamic cell values (first column sticky left with box-shadow)
+                    ...displayColumns.map((col, i) => 
+                      m('td.px-4.py-3.text-sm.whitespace-nowrap.text-gray-700.bg-white',
+                        i === 0 ? { style: 'position: sticky; left: 40px; z-index: 5; box-shadow: 4px 0 8px -4px rgba(0,0,0,0.08);' } : {},
                         formatCellValue(record[col.name], col)
                       )
                     ),
-                    // Sticky actions cell
+                    // Sticky actions cell (sticky right, box-shadow on left)
                     m('td.px-4.py-3.text-sm.text-right.whitespace-nowrap.bg-white', {
-                      style: 'position: sticky; right: 0; box-shadow: -4px 0 8px -4px rgba(0,0,0,0.05);',
+                      style: 'position: sticky; right: 0; z-index: 5; box-shadow: -4px 0 8px -4px rgba(0,0,0,0.08);',
                     }, [
-                      m('button.inline-flex.items-center.px-2.py-1.text-sm.text-indigo-600.hover:text-indigo-800.hover:bg-indigo-50.rounded.mr-1.transition-colors', {
-                        onclick: () => {
-                          state.currentRecord = record;
-                          state.editing = true;
-                          m.route.set('/models/' + modelName + '/edit/' + record[primaryKey]);
-                        }
-                      }, 'Edit'),
-                      m('button.inline-flex.items-center.px-2.py-1.text-sm.text-red-600.hover:text-red-800.hover:bg-red-50.rounded.transition-colors', {
-                        onclick: async () => {
-                          if (confirm('Are you sure you want to delete this record?')) {
-                            try {
-                              await api.delete('/models/' + modelName + '/records/' + record[primaryKey]);
-                              loadRecords(modelName, state.pagination.page);
-                            } catch (err) {
-                              alert('Error: ' + err.message);
-                            }
-                          }
-                        }
-                      }, 'Delete'),
+                      state.trashedView && modelMeta?.softDelete
+                        ? m('button.inline-flex.items-center.px-2.py-1.text-sm.text-green-600.hover:text-green-800.hover:bg-green-50.rounded.transition-colors', {
+                            onclick: async () => {
+                              try {
+                                await api.post('/models/' + modelName + '/records/' + record[primaryKey] + '/restore');
+                                loadRecords(modelName, state.pagination.page);
+                              } catch (err) {
+                                alert('Error: ' + err.message);
+                              }
+                            },
+                          }, 'Restore')
+                        : [
+                            m('button.inline-flex.items-center.px-2.py-1.text-sm.text-indigo-600.hover:text-indigo-800.hover:bg-indigo-50.rounded.mr-1.transition-colors', {
+                              onclick: () => {
+                                state.currentRecord = record;
+                                state.editing = true;
+                                m.route.set('/models/' + modelName + '/edit/' + record[primaryKey]);
+                              },
+                            }, 'Edit'),
+                            m('button.inline-flex.items-center.px-2.py-1.text-sm.text-red-600.hover:text-red-800.hover:bg-red-50.rounded.transition-colors', {
+                              onclick: async () => {
+                                if (confirm('Are you sure you want to delete this record?')) {
+                                  try {
+                                    await api.delete('/models/' + modelName + '/records/' + record[primaryKey]);
+                                    loadRecords(modelName, state.pagination.page);
+                                  } catch (err) {
+                                    alert('Error: ' + err.message);
+                                  }
+                                }
+                              },
+                            }, 'Delete'),
+                          ],
                     ]),
                   ])
                 )),

package/plugins/admin-panel/core/api-extensions.js

@@ -8,10 +8,15 @@
  * Build query with filters applied
  * @param {Object} repo - Repository instance
  * @param {Object} filters - Filter object from frontend
+ * @param {Object} [options] - Options
+ * @param {boolean} [options.onlyTrashed] - For soft delete: only trashed records
  * @returns {Object} Query builder with filters applied
  */
-function buildFilteredQuery(repo, filters) {
+function buildFilteredQuery(repo, filters, options = {}) {
   let query = repo.query();
+  if (options.onlyTrashed) {
+    query = query.onlyTrashed();
+  }
   
   if (!filters || Object.keys(filters).length === 0) {
     return query;
@@ -20,7 +25,7 @@ function buildFilteredQuery(repo, filters) {
   for (const [column, filter] of Object.entries(filters)) {
     if (!filter || (filter.value === '' && !filter.from && !filter.to)) continue;
     
-    const op = filter.op || 'contains';
+    const op = filter.op || filter.operator || 'contains';
     
     switch (op) {
       case 'contains':
@@ -67,13 +72,14 @@ function buildFilteredQuery(repo, filters) {
 
 /**
  * Get all record IDs matching filters (for selectAll mode)
- * @param {Object} repo - Repository instance  
+ * @param {Object} repo - Repository instance
  * @param {Object} filters - Filter object
  * @param {string} primaryKey - Primary key column name
+ * @param {Object} [options] - Options (onlyTrashed for soft delete)
  * @returns {Promise<Array>} Array of IDs
  */
-async function getAllMatchingIds(repo, filters, primaryKey = 'id') {
-  const query = buildFilteredQuery(repo, filters);
+async function getAllMatchingIds(repo, filters, primaryKey = 'id', options = {}) {
+  const query = buildFilteredQuery(repo, filters, options);
   const records = await query.select(primaryKey).list();
   return records.map(r => r[primaryKey]);
 }
@@ -178,7 +184,7 @@ function createExtensionApiHandlers(options) {
   async function bulkActionHandler(req, res) {
     try {
       const { actionId, model: modelName } = req.params;
-      const { ids, selectAll, filters } = req.body;
+      const { ids, selectAll, filters, trashed } = req.body;
 
       const action = registry.bulkActions.get(actionId);
 
@@ -194,17 +200,20 @@ function createExtensionApiHandlers(options) {
         }
       }
 
-      // Get repository
+      const { getModel } = require('../../../core/orm/model');
+      const model = db.getModel ? db.getModel(modelName) : getModel(modelName);
+      const primaryKey = model?.primaryKey || 'id';
       const repo = db.getRepository(modelName);
-      
+
+      // Options for getAllMatchingIds (e.g. onlyTrashed for bulk-restore)
+      const fetchOptions = (actionId === 'bulk-restore' && trashed && model?.scopes?.softDelete)
+        ? { onlyTrashed: true }
+        : {};
+
       // Determine IDs to process
       let recordIds;
       if (selectAll) {
-        // Get all matching record IDs based on filters
-        const { getModel } = require('../../../core/orm/model');
-        const model = db.getModel ? db.getModel(modelName) : getModel(modelName);
-        const primaryKey = model?.primaryKey || 'id';
-        recordIds = await getAllMatchingIds(repo, filters, primaryKey);
+        recordIds = await getAllMatchingIds(repo, filters, primaryKey, fetchOptions);
       } else {
         if (!ids || !Array.isArray(ids) || ids.length === 0) {
           return res.status(400).json({ error: 'No records selected' });
@@ -216,12 +225,15 @@ function createExtensionApiHandlers(options) {
         return res.status(400).json({ error: 'No records match the criteria' });
       }
 
-      // Get records
-      const records = [];
-      for (const id of recordIds) {
-        const record = await repo.findById(id);
-        if (record) {
-          records.push(record);
+      // Get records (for bulk-restore with trashed, findById won't find them - pass minimal { id })
+      let records;
+      if (actionId === 'bulk-restore' && trashed && model?.scopes?.softDelete) {
+        records = recordIds.map(id => ({ id }));
+      } else {
+        records = [];
+        for (const id of recordIds) {
+          const record = await repo.findById(id);
+          if (record) records.push(record);
         }
       }
 
@@ -488,12 +500,10 @@ function createExtensionApiHandlers(options) {
     try {
       const updates = req.body || {};
       
-      // Merge with existing settings
+      // Merge with existing settings (configure expects flat key-value at top level)
       const currentSettings = registry.settings || {};
       const newSettings = { ...currentSettings, ...updates };
-      
-      // Update registry settings
-      registry.configure({ settings: newSettings });
+      registry.settings = newSettings;
       
       res.json({ success: true, settings: registry.settings });
     } catch (error) {
@@ -511,8 +521,19 @@ function createExtensionApiHandlers(options) {
       // Support both path param and query param for model name
       const modelName = req.params.model || req.query.model;
       const format = req.query.format || 'json';
-      const { selectAll, filters } = req.body || {};
-      
+      // Support selectAll and filters from body (POST) or query (GET)
+      const body = req.body || {};
+      let selectAll = body.selectAll ?? req.query.selectAll;
+      let filters = body.filters ?? req.query.filters;
+      if (typeof selectAll === 'string') selectAll = selectAll === 'true';
+      if (typeof filters === 'string') {
+        try {
+          filters = JSON.parse(filters);
+        } catch {
+          filters = undefined;
+        }
+      }
+
       // Support IDs from query string (GET) or body (POST)
       let idList = null;
       if (req.body?.ids && Array.isArray(req.body.ids)) {

package/plugins/admin-panel/index.js

@@ -270,6 +270,7 @@ function adminPanelPlugin(options = {}) {
       ctx.addRoute('post', `${adminPath}/api/models/:model/records`, requireAuth, apiHandlers.createRecordHandler);
       ctx.addRoute('put', `${adminPath}/api/models/:model/records/:id`, requireAuth, apiHandlers.updateRecordHandler);
       ctx.addRoute('delete', `${adminPath}/api/models/:model/records/:id`, requireAuth, apiHandlers.deleteRecordHandler);
+      ctx.addRoute('post', `${adminPath}/api/models/:model/records/:id/restore`, requireAuth, apiHandlers.restoreRecordHandler);
 
       // Relation API routes (auth required)
       ctx.addRoute('get', `${adminPath}/api/models/:model/relations/:relation`, requireAuth, apiHandlers.relationHandler);

package/plugins/admin-panel/modules/bulk-actions.js

@@ -13,6 +13,34 @@
 function registerDefaultBulkActions(options) {
   const { registry, db } = options;
 
+  // Bulk restore (soft delete models only - use with trashed view)
+  registry.registerBulkAction('bulk-restore', {
+    label: 'Restore Selected',
+    icon: 'check',
+    color: 'green',
+    models: '*',
+    confirm: true,
+    confirmMessage: 'Restore the selected records?',
+    handler: async (records, modelName, { db }) => {
+      const { getModel } = require('../../../core/orm/model');
+      const model = db.getModel ? db.getModel(modelName) : getModel(modelName);
+      if (!model?.scopes?.softDelete) {
+        return { message: 'Model does not support restore', error: true };
+      }
+      const repo = db.getRepository(modelName);
+      let restored = 0;
+      for (const record of records) {
+        try {
+          const result = await repo.restore(record.id);
+          if (result) restored++;
+        } catch (e) {
+          console.error(`Failed to restore record ${record.id}:`, e.message);
+        }
+      }
+      return { message: `${restored} of ${records.length} records restored`, restored };
+    },
+  });
+
   // Bulk delete
   registry.registerBulkAction('bulk-delete', {
     label: 'Delete Selected',