Changeset 7881080 in Klonkt

Timestamp:

06/18/2026 03:28:34 AM (3 months ago)

Author:

roboburr <roboburr@…>

Branches:

main

Children:

8398935

Parents:

98ecf51

Message:

Hub #3: explicit is_primary flag + shared getPrimarySite() (DRY)

The "oldest site = primary site" assumption was duplicated independently in
resolveSite, hub.js, account.js and admin.js (fragile: if the oldest happened
to be an artist site, the hub home would be wrong). Now:

• sites.is_primary column + backfill (marks the oldest if none is primary yet; ensurePrimarySite sets it on fresh installs) → existing behaviour exactly preserved.
• one getPrimarySite() helper (is_primary, fallback oldest) replaces the 4 copies.
• god can CHOOSE the primary/main site: ★ button + "primary" badge on /admin/sites (exactly one primary via a transaction).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@…>

Location:

src

Files:

• config/database.js (modified) (1 diff)
• middleware/site.js (modified) (2 diffs)
• routes/account.js (modified) (2 diffs)
• routes/admin-sites.js (modified) (2 diffs)
• routes/admin.js (modified) (2 diffs)
• routes/hub.js (modified) (2 diffs)
• services/ensurePrimarySite.js (modified) (1 diff)
• views/pages/admin-sites.ejs (modified) (3 diffs)

src/config/database.js

@@ -50 +50 @@
   ensureColumn('sites', 'allow_circle', 'INTEGER DEFAULT 1');
 
+  // Eén EXPLICIETE primaire/hoofd-site (= de bedrijfs-/labelsite in hub-modus,
+  // de enige site in solo) i.p.v. de fragiele "oudste = hoofd"-conventie die op
+  // 4 plekken gedupliceerd stond. Backfill: markeer de oudste als er nog geen
+  // primaire site is, zodat bestaand gedrag exact behouden blijft.
+  ensureColumn('sites', 'is_primary', 'INTEGER DEFAULT 0');
+  try {
+    const hasPrimary = db.prepare('SELECT 1 FROM sites WHERE is_primary = 1 LIMIT 1').get();
+    if (!hasPrimary) {
+      const oldest = db.prepare('SELECT id FROM sites ORDER BY created_at ASC LIMIT 1').get();
+      if (oldest) db.prepare('UPDATE sites SET is_primary = 1 WHERE id = ?').run(oldest.id);
+    }
+  } catch (e) { /* sites-tabel nog leeg/afwezig bij verse init — ensurePrimarySite regelt 't */ }
+
   // v9 audit additions —————————————————————————————————————————
   // SEO/social columns the v9 template uses (most live in 001-init.sql already

src/middleware/site.js

@@ -12 +12 @@
 import db from '../config/database.js';
 import { getTenancy } from '../services/SettingsService.js';
+
+/**
+ * De primaire/hoofd-site — ÉÉN bron van waarheid (vervangt de "oudste site ="
+ * hoofd"-aanname die voorheen los in resolveSite/hub/account/admin stond).
+ * Leest de expliciete is_primary-vlag; valt terug op de oudste als die (nog)
+ * nergens staat, zodat bestaand gedrag exact behouden blijft.
+ */
+export function getPrimarySite() {
+  return db.prepare('SELECT * FROM sites WHERE is_primary = 1 LIMIT 1').get()
+      || db.prepare('SELECT * FROM sites ORDER BY created_at ASC LIMIT 1').get()
+      || null;
+}
 
 export function resolveSite(req, res, next) {
@@ -43 +55 @@
   }
 
-  // Solo (of hub zonder match): de primaire/owner-site (eerste aangemaakte).
-  const defaultSite = db.prepare('SELECT * FROM sites ORDER BY created_at ASC LIMIT 1').get();
+  // Solo (of hub zonder match): pin op de primaire/hoofd-site.
+  const defaultSite = getPrimarySite();
   if (defaultSite) {
     res.locals.site = defaultSite;

src/routes/account.js

@@ -21 +21 @@
 import { v4 as uuid } from 'uuid';
 import db from '../config/database.js';
+import { getPrimarySite } from '../middleware/site.js';
 import { renderPage } from '../middleware/render.js';
 import { requireAuth } from '../middleware/auth.js';
@@ -80 +81 @@
   let site = db.prepare('SELECT id, title, tagline, slug, owner_id FROM sites WHERE owner_id = ? ORDER BY created_at LIMIT 1').get(user.id);
   if (!site && user.role === 'god') {
-    site = db.prepare('SELECT id, title, tagline, slug, owner_id FROM sites ORDER BY created_at LIMIT 1').get();
+    site = getPrimarySite(); // primaire/hoofd-site als fallback
   }
   return site || null;

src/routes/admin-sites.js

@@ -161 +161 @@
   const sites = db.prepare(`
     SELECT s.id, s.slug, s.title, s.description, s.created_at,
-           s.is_public, s.robots_index,
+           s.is_public, s.robots_index, s.is_primary,
            u.username AS owner_username,
            (SELECT COUNT(*) FROM posts WHERE site_id = s.id) AS post_count
     FROM sites s LEFT JOIN users u ON u.id = s.owner_id
-    ORDER BY s.created_at DESC
+    ORDER BY s.is_primary DESC, s.created_at DESC
   `).all();
 
@@ -354 +354 @@
 });
 
+// ==================== MAAK PRIMAIR ====================
+// God kiest welke site de primaire/hoofd-site is (de label-/bedrijfssite in hub;
+// in solo dé site). Precies één site is primair → eerst alles uit, dan deze aan.
+router.post('/:slug/make-primary', requireGod, (req, res) => {
+  const site = db.prepare('SELECT id FROM sites WHERE slug = ?').get(req.params.slug);
+  if (!site) return res.redirect('/admin/sites?error=Niet+gevonden');
+  db.transaction(() => {
+    db.prepare('UPDATE sites SET is_primary = 0').run();
+    db.prepare('UPDATE sites SET is_primary = 1 WHERE id = ?').run(site.id);
+  })();
+  res.redirect('/admin/sites?success=' + encodeURIComponent('Primaire site bijgewerkt'));
+});
+
 // ==================== DELETE ====================
 router.post('/:slug/delete', requireGod, (req, res) => {

src/routes/admin.js

@@ -10 +10 @@
 import { requireAuth } from '../middleware/auth.js';
 import { getTenancy } from '../services/SettingsService.js';
+import { getPrimarySite } from '../middleware/site.js';
 
 const router = express.Router();
@@ -59 +60 @@
   const tenancy = getTenancy();
 
-  // De primaire/owner-site — in solo dé site, in hub de hoofdsite. Geeft de
+  // De primaire/hoofd-site — in solo dé site, in hub de hoofdsite. Geeft de
   // "Uiterlijk"-tegel z'n edit-link + de posts/concepten-lijst.
-  const primarySite = db.prepare(
-    'SELECT id, slug, title FROM sites ORDER BY created_at ASC LIMIT 1'
-  ).get() || null;
+  const primarySite = getPrimarySite();
 
   const stats = {

src/routes/hub.js

@@ -35 +35 @@
   `).all();
 
-  // De hoofd-/labelsite (oudste = de bedrijfs-/hoofdaccount) is GEEN artiest;
-  // die tonen we apart bovenaan, niet in de Artiesten-roster.
+  // De hoofd-/labelsite (de expliciet primaire = de bedrijfs-/hoofdaccount) is
+  // GEEN artiest; die tonen we apart bovenaan, niet in de Artiesten-roster.
   const mainSite = db.prepare(`
     SELECT s.id, s.slug, s.title, s.tagline, s.profile_photo, s.accent,
@@ -43 +43 @@
     FROM sites s
     LEFT JOIN users u ON u.id = s.owner_id
-    ORDER BY s.created_at ASC
+    WHERE s.is_primary = 1
     LIMIT 1
   `).get() || null;

src/services/ensurePrimarySite.js

@@ -40 +40 @@
       language, palette, accent, profile_photo,
       is_public, robots_index, require_login_to_comment, enable_audio_player,
-      feed_view_default, comments_moderation_mode
-    ) VALUES (?, ?, ?, '', '', ?, 'nl', 'sage', '#c2410c', NULL, 1, 1, 0, 1, 'grid', 'moderate')
+      feed_view_default, comments_moderation_mode, is_primary
+    ) VALUES (?, ?, ?, '', '', ?, 'nl', 'sage', '#c2410c', NULL, 1, 1, 0, 1, 'grid', 'moderate', 1)
   `).run(siteId, slug, defaultTitle(), owner.id);
 

src/views/pages/admin-sites.ejs

@@ -36 +36 @@
               <div class="ax-site-name">
                 <a href="/sites/<%= s.slug %>"><%= s.title %></a>
+                <% if (s.is_primary) { %>
+                  <span class="ax-pill ax-pill-primary" title="Hoofd-/labelsite van deze installatie">★ primair</span>
+                <% } %>
                 <% if (s.is_public) { %>
                   <span class="ax-pill ax-pill-ok" title="Publiek zichtbaar">✓ public</span>
@@ -67 +70 @@
 
           <div class="ax-site-controls">
+            <% if (!s.is_primary && (typeof canMutate === 'undefined' || canMutate)) { %>
+              <form method="post" action="/admin/sites/<%= s.slug %>/make-primary" style="margin:0;display:inline"
+                    onsubmit="return confirm('Deze site instellen als de primaire/hoofd-site?')">
+                <button type="submit" class="ax-icon-btn" aria-label="Maak primair" title="Maak primaire/hoofd-site">★</button>
+              </form>
+            <% } %>
             <a href="/admin/sites/<%= s.slug %>/edit" class="ax-icon-btn" aria-label="Bewerken" title="Bewerken">✎</a>
             <form method="post" action="/admin/sites/<%= s.slug %>/delete" class="ax-delete-form"
@@ -198 +207 @@
   background: rgba(40,160,90,0.12);
 }
+.ax-pill-primary {
+  color: var(--accent);
+  background: color-mix(in srgb, var(--accent) 14%, transparent);
+  font-weight: 600;
+}
 
 /* ─── Stats (2 mini-columns for sites) ────────────────────────── */