Changeset 7881080 in Klonkt for src/routes

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/routes

Files:

• account.js (modified) (2 diffs)
• admin-sites.js (modified) (2 diffs)
• admin.js (modified) (2 diffs)
• hub.js (modified) (2 diffs)

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;