@a83/orbiter-admin 0.3.12 → 0.3.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@a83/orbiter-admin",
-  "version": "0.3.12",
+  "version": "0.3.13",
   "description": "Standalone admin server for Orbiter CMS",
   "type": "module",
   "main": "./src/server.js",

package/public/editor.html

@@ -116,6 +116,10 @@
     .btn-schedule:hover { background:var(--accent-bg); }
     .schedule-picker { display:none; gap:4px; margin-bottom:5px; }
     .schedule-picker.open { display:flex; }
+    .expiry-picker { display:none; gap:4px; margin-bottom:5px; }
+    .expiry-picker.open { display:flex; }
+    .btn-expiry { display:block; width:100%; padding:8px; background:transparent; border:1px solid var(--line); color:var(--muted); font-family:var(--mono); font-size:10px; cursor:pointer; transition:all .12s; border-radius:var(--radius); margin-bottom:5px; }
+    .btn-expiry:hover { border-color:var(--mid); color:var(--text); }
 
     /* Schema fields in sidebar */
     .field-input,.field-select { width:100%; background:var(--bg0); border:1px solid var(--line); padding:6px 8px; color:var(--heading); font-family:var(--mono); font-size:11px; outline:none; appearance:none; transition:border-color .15s; border-radius:var(--radius); box-sizing:border-box; }
@@ -399,6 +403,7 @@
           <button type="button" class="view-btn"        id="vbtn-preview" onclick="setViewMode('preview')">Preview</button>
         </div>
         <a id="btn-preview-link" href="#" target="_blank" rel="noopener" title="Open preview" style="display:none;font-size:11px;color:var(--muted);text-decoration:none;padding:4px 8px;border:1px solid var(--line);border-radius:var(--radius);">↗ Preview</a>
+        <button class="search-trigger" id="search-btn" title="Search (⌘K)" style="background:none;border:none;color:var(--muted);cursor:pointer;padding:4px 8px;font-size:13px;">⌘K</button>
         <button class="scheme-toggle" id="scheme-toggle" title="Toggle scheme">◐</button>
         <span class="user" id="topbar-user"></span>
         <span class="logout" id="logout-btn">Sign out</span>
@@ -563,8 +568,10 @@
       const panel = document.getElementById('meta-panel');
       const status    = IS_NEW ? 'draft' : (entryData?.status ?? 'draft');
       const updatedAt = entryData?.updated_at;
-      const publishAt = entryData?.publish_at ?? null;
-      const publishAtInput = publishAt ? publishAt.replace(' ', 'T').slice(0, 16) : '';
+      const publishAt    = entryData?.publish_at   ?? null;
+      const unpublishAt  = entryData?.unpublish_at ?? null;
+      const publishAtInput   = publishAt   ? publishAt.replace(' ', 'T').slice(0, 16)   : '';
+      const unpublishAtInput = unpublishAt ? unpublishAt.replace(' ', 'T').slice(0, 16) : '';
 
       let fieldsHtml = '';
       const seoFields = {};
@@ -688,6 +695,13 @@
             <button type="button" id="btn-schedule-confirm" style="padding:5px 10px;background:var(--accent);border:none;color:var(--bg0);font-family:var(--mono);font-size:10px;cursor:pointer;border-radius:var(--radius);white-space:nowrap;">Set</button>
           </div>
           <button type="button" class="btn-schedule" id="btn-schedule">${status==='scheduled'?'Reschedule':'Schedule'}</button>
+          ${status==='published'?`
+          <div class="expiry-picker${unpublishAt?' open':''}" id="expiry-picker">
+            <input type="datetime-local" class="field-input" id="unpublish-at-input" value="${unpublishAtInput}" style="flex:1;font-size:10px;padding:5px 8px;" />
+            <button type="button" id="btn-expiry-confirm" style="padding:5px 10px;background:var(--bg3);border:1px solid var(--line);color:var(--text);font-family:var(--mono);font-size:10px;cursor:pointer;border-radius:var(--radius);white-space:nowrap;">Set</button>
+          </div>
+          <button type="button" class="btn-expiry" id="btn-expiry">${unpublishAt?'Change expiry':'Set expiry'}</button>
+          `:''}
         </div>
         <div class="meta-section">
           <div class="meta-label">Details</div>
@@ -790,6 +804,12 @@
         if (!val) { alert('Please select a date and time.'); return; }
         saveEntry('scheduled');
       });
+      document.getElementById('btn-expiry')?.addEventListener('click', () => {
+        document.getElementById('expiry-picker').classList.toggle('open');
+      });
+      document.getElementById('btn-expiry-confirm')?.addEventListener('click', () => {
+        saveEntry('published');
+      });
 
       // Version restore buttons
       panel.querySelectorAll('.v-restore-btn').forEach(btn => {
@@ -1006,6 +1026,12 @@
         if (!raw) { if (!isAutosave) alert('Please select a date and time.'); return; }
         publish_at = raw.replace('T', ' ') + ':00';
       }
+      // Resolve unpublish_at for published entries with expiry
+      let unpublish_at = null;
+      if (status === 'published') {
+        const raw = document.getElementById('unpublish-at-input')?.value;
+        unpublish_at = raw ? raw.replace('T', ' ') + ':00' : null;
+      }
 
       const title = document.getElementById('title-input').value;
       syncToHidden();
@@ -1029,6 +1055,22 @@
         }
       }
 
+      // Required field validation (skip on autosave)
+      if (!isAutosave) {
+        const missing = extraFields
+          .filter(([key, field]) => {
+            if (!field.required) return false;
+            const val = data[key];
+            if (Array.isArray(val)) return val.length === 0;
+            return val === '' || val === null || val === undefined;
+          })
+          .map(([key, field]) => field.label || key);
+        if (missing.length) {
+          alert(`Required field${missing.length > 1 ? 's' : ''} missing: ${missing.join(', ')}`);
+          return;
+        }
+      }
+
       if (IS_NEW && !currentSlug) {
         // Create new entry
         const res = await fetch(`/api/collections/${COLLECTION}/entries`,{
@@ -1053,7 +1095,7 @@
         const res = await fetch(`/api/collections/${COLLECTION}/entries/${targetSlug}`,{
           method:'PUT', credentials:'include',
           headers:{'Content-Type':'application/json'},
-          body: JSON.stringify({ slug, data, status, publish_at }),
+          body: JSON.stringify({ slug, data, status, publish_at, unpublish_at }),
         });
         if (res.ok) {
           const json = await res.json();
@@ -1941,6 +1983,7 @@
   <input type="file" id="img-file-inp" accept="image/*" style="display:none">
 
   <script src="/sidebar.js"></script>
+  <script src="/search.js"></script>
   <script src="/router.js"></script>
 </body>
 </html>

package/src/routes/entries.js

@@ -274,14 +274,15 @@ entryRoutes.post('/:collectionId/entries/:slug/duplicate', (c) => {
 // PATCH /api/collections/:id/entries/:slug/status
 entryRoutes.patch('/:collectionId/entries/:slug/status', async (c) => {
   const { collectionId, slug } = c.req.param();
-  const { status, publish_at } = await c.req.json();
+  const { status, publish_at, unpublish_at } = await c.req.json();
   if (!['draft', 'published', 'scheduled'].includes(status)) return c.json({ error: 'Invalid status' }, 400);
   if (status === 'scheduled' && !publish_at) return c.json({ error: 'publish_at required for scheduled status' }, 400);
   const db    = openPod(c.get('podPath'));
   const entry = db.getEntry(collectionId, slug);
   if (!entry) { db.close(); return c.json({ error: 'Not found' }, 404); }
-  const pa = status === 'scheduled' ? publish_at : null;
-  db.updateEntry(collectionId, slug, { slug, data: entry.data, status, publish_at: pa });
+  const pa  = status === 'scheduled' ? publish_at : null;
+  const ua  = status === 'published' ? (unpublish_at ?? null) : null;
+  db.updateEntry(collectionId, slug, { slug, data: entry.data, status, publish_at: pa, unpublish_at: ua });
   const username = c.get('user')?.username ?? 'unknown';
   if (status === 'scheduled') db.logAudit(entry.id, username, 'schedule');
   db.close();

package/src/server.js

@@ -101,17 +101,23 @@ serve({ fetch: createApp(POD_PATH).fetch, port: PORT }, () => {
 setInterval(() => {
   try {
     const db  = openPod(POD_PATH);
-    const due = db.getScheduledDue();
-    if (!due.length) { db.close(); return; }
+    const due     = db.getScheduledDue();
+    const expired = db.getExpiredDue();
+    if (!due.length && !expired.length) { db.close(); return; }
     const now = new Date().toISOString().replace('T', ' ').replace(/\.\d{3}Z$/, '');
     for (const entry of due) {
       db.db.prepare("UPDATE _entries SET status = 'published', publish_at = NULL, updated_at = ? WHERE id = ?").run(now, entry.id);
       db.logAudit(entry.id, 'scheduler', 'publish');
     }
+    for (const entry of expired) {
+      db.db.prepare("UPDATE _entries SET status = 'draft', unpublish_at = NULL, updated_at = ? WHERE id = ?").run(now, entry.id);
+      db.logAudit(entry.id, 'scheduler', 'unpublish');
+    }
     const webhookUrl = db.getMeta('build.webhook_url') ?? '';
     if (webhookUrl) db.setMeta('build.last_triggered', new Date().toISOString());
     db.close();
-    console.log(`[scheduler] Published ${due.length} scheduled entr${due.length === 1 ? 'y' : 'ies'}`);
+    if (due.length)     console.log(`[scheduler] Published ${due.length} scheduled entr${due.length === 1 ? 'y' : 'ies'}`);
+    if (expired.length) console.log(`[scheduler] Unpublished ${expired.length} expired entr${expired.length === 1 ? 'y' : 'ies'}`);
     if (webhookUrl) fetch(webhookUrl, { method: 'POST' }).catch(() => {});
   } catch (e) {
     console.warn('[scheduler]', e.message);