diff --git a/.env.example b/.env.example index 190aadd..92a57a9 100644 --- a/.env.example +++ b/.env.example @@ -10,7 +10,7 @@ PROJECT_NAME=jama # Image version to run (set by build.sh, or use 'latest') -JAMA_VERSION=0.9.34 +JAMA_VERSION=0.9.35 # App port — the host port Docker maps to the container PORT=3000 diff --git a/backend/package.json b/backend/package.json index 3be53b8..3340383 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "jama-backend", - "version": "0.9.34", + "version": "0.9.35", "description": "TeamChat backend server", "main": "src/index.js", "scripts": { diff --git a/backend/src/models/db.js b/backend/src/models/db.js index 7bcfb5c..6db40f6 100644 --- a/backend/src/models/db.js +++ b/backend/src/models/db.js @@ -216,6 +216,10 @@ function initDb() { insertSetting.run('registration_code', ''); insertSetting.run('feature_branding', 'false'); insertSetting.run('feature_group_manager', 'false'); + insertSetting.run('feature_schedule_manager', 'false'); + insertSetting.run('app_type', 'JAMA-Chat'); + insertSetting.run('team_group_managers', ''); -- JSON array of user_group IDs + insertSetting.run('team_schedule_managers', ''); -- JSON array of user_group IDs // Migration: add hide_admin_tag if upgrading from older version try { diff --git a/backend/src/routes/settings.js b/backend/src/routes/settings.js index 3939f64..66909c0 100644 --- a/backend/src/routes/settings.js +++ b/backend/src/routes/settings.js @@ -137,8 +137,12 @@ router.post('/reset', authMiddleware, adminMiddleware, (req, res) => { // ── Registration code ───────────────────────────────────────────────────────── // Valid codes — in production these would be stored/validated server-side const VALID_CODES = { - 'JAMA-FULL-2024': { branding: true, groupManager: true }, - 'JAMA-BRAND-2024': { branding: true, groupManager: false }, + // JAMA-Team: full access — chat, branding, group manager, schedule manager + 'JAMA-TEAM-2024': { appType: 'JAMA-Team', branding: true, groupManager: true, scheduleManager: true }, + // JAMA-Brand: chat + branding only + 'JAMA-BRAND-2024': { appType: 'JAMA-Brand', branding: true, groupManager: false, scheduleManager: false }, + // Legacy codes — map to new tiers + 'JAMA-FULL-2024': { appType: 'JAMA-Team', branding: true, groupManager: true, scheduleManager: true }, }; router.post('/register', authMiddleware, adminMiddleware, (req, res) => { @@ -149,19 +153,33 @@ router.post('/register', authMiddleware, adminMiddleware, (req, res) => { if (!code?.trim()) { // Clear registration upd.run('registration_code', '', ''); + upd.run('app_type', 'JAMA-Chat', 'JAMA-Chat'); upd.run('feature_branding', 'false', 'false'); upd.run('feature_group_manager', 'false', 'false'); - return res.json({ success: true, features: { branding: false, groupManager: false } }); + upd.run('feature_schedule_manager', 'false', 'false'); + return res.json({ success: true, features: { branding: false, groupManager: false, scheduleManager: false, appType: 'JAMA-Chat' } }); } const match = VALID_CODES[code.trim().toUpperCase()]; if (!match) return res.status(400).json({ error: 'Invalid registration code' }); upd.run('registration_code', code.trim(), code.trim()); - upd.run('feature_branding', match.branding ? 'true' : 'false', match.branding ? 'true' : 'false'); - upd.run('feature_group_manager', match.groupManager ? 'true' : 'false', match.groupManager ? 'true' : 'false'); + upd.run('app_type', match.appType || 'JAMA-Chat', match.appType || 'JAMA-Chat'); + upd.run('feature_branding', match.branding ? 'true' : 'false', match.branding ? 'true' : 'false'); + upd.run('feature_group_manager', match.groupManager ? 'true' : 'false', match.groupManager ? 'true' : 'false'); + upd.run('feature_schedule_manager', match.scheduleManager ? 'true' : 'false', match.scheduleManager ? 'true' : 'false'); - res.json({ success: true, features: { branding: match.branding, groupManager: match.groupManager } }); + res.json({ success: true, features: { branding: match.branding, groupManager: match.groupManager, scheduleManager: match.scheduleManager, appType: match.appType } }); +}); + +// Save team management group assignments +router.patch('/team', authMiddleware, adminMiddleware, (req, res) => { + const { groupManagers, scheduleManagers } = req.body; + const db = getDb(); + const upd = db.prepare("INSERT INTO settings (key, value) VALUES (?, ?) ON CONFLICT(key) DO UPDATE SET value = ?, updated_at = datetime('now')"); + if (groupManagers !== undefined) upd.run('team_group_managers', JSON.stringify(groupManagers || []), JSON.stringify(groupManagers || [])); + if (scheduleManagers !== undefined) upd.run('team_schedule_managers', JSON.stringify(scheduleManagers || []), JSON.stringify(scheduleManagers || [])); + res.json({ success: true }); }); module.exports = router; diff --git a/build.sh b/build.sh index 277a6cb..abe433e 100644 --- a/build.sh +++ b/build.sh @@ -13,7 +13,7 @@ # ───────────────────────────────────────────────────────────── set -euo pipefail -VERSION="${1:-0.9.34}" +VERSION="${1:-0.9.35}" ACTION="${2:-}" REGISTRY="${REGISTRY:-}" IMAGE_NAME="jama" diff --git a/frontend/package.json b/frontend/package.json index dce2381..4293370 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "jama-frontend", - "version": "0.9.34", + "version": "0.9.35", "private": true, "scripts": { "dev": "vite", diff --git a/frontend/src/components/NavDrawer.jsx b/frontend/src/components/NavDrawer.jsx index a1ccfd9..67d312d 100644 --- a/frontend/src/components/NavDrawer.jsx +++ b/frontend/src/components/NavDrawer.jsx @@ -11,12 +11,18 @@ const NAV_ICON = { settings: , }; -export default function NavDrawer({ open, onClose, onMessages, onGroupManager, onBranding, onSettings, onUsers, features = {} }) { +export default function NavDrawer({ open, onClose, onMessages, onGroupManager, onScheduleManager, onBranding, onSettings, onUsers, features = {} }) { const { user } = useAuth(); const drawerRef = useRef(null); const isAdmin = user?.role === 'admin'; const isMobile = window.matchMedia('(pointer: coarse)').matches || window.innerWidth < 768; + // Team-managed access: check if user is in any of the designated manager groups + // (frontend-only — no API enforcement yet) + const userGroupIds = features.userGroupMemberships || []; + const canAccessGroupManager = isAdmin || (features.teamGroupManagers || []).some(gid => userGroupIds.includes(gid)); + const canAccessScheduleManager = isAdmin || (features.teamScheduleManagers || []).some(gid => userGroupIds.includes(gid)); + // Close on outside click useEffect(() => { if (!open) return; @@ -72,10 +78,10 @@ export default function NavDrawer({ open, onClose, onMessages, onGroupManager, o <>
Admin
{item(NAV_ICON.users, 'User Manager', onUsers)} - {features.groupManager && !isMobile && item(NAV_ICON.groups, 'Group Manager', onGroupManager)} - {features.branding && item(NAV_ICON.branding, 'Branding', onBranding)} - {!isMobile && item(NAV_ICON.schedules, 'Schedule Manager', () => {}, true)} - {item(NAV_ICON.settings, 'Settings', onSettings)} + {features.groupManager && !isMobile && canAccessGroupManager && item(NAV_ICON.groups, 'Group Manager', onGroupManager)} + {features.scheduleManager && !isMobile && canAccessScheduleManager && item(NAV_ICON.schedules, 'Schedule Manager', onScheduleManager || (() => {}))} + {features.branding && item(NAV_ICON.branding, 'Branding', onBranding)} + {isAdmin && item(NAV_ICON.settings, 'Settings', onSettings)} )} diff --git a/frontend/src/components/SettingsModal.jsx b/frontend/src/components/SettingsModal.jsx index e38a06a..0f9a945 100644 --- a/frontend/src/components/SettingsModal.jsx +++ b/frontend/src/components/SettingsModal.jsx @@ -2,27 +2,224 @@ import { useState, useEffect } from 'react'; import { api } from '../utils/api.js'; import { useToast } from '../contexts/ToastContext.jsx'; -export default function SettingsModal({ onClose, onFeaturesChanged }) { +// ── Helpers ─────────────────────────────────────────────────────────────────── + +const APP_TYPES = { + 'JAMA-Chat': { label: 'JAMA-Chat', desc: 'Chat only. No Branding, Group Manager or Schedule Manager.' }, + 'JAMA-Brand': { label: 'JAMA-Brand', desc: 'Chat and Branding.' }, + 'JAMA-Team': { label: 'JAMA-Team', desc: 'Chat, Branding, Group Manager and Schedule Manager.' }, +}; + +// ── Team Management Tab ─────────────────────────────────────────────────────── +function TeamManagementTab({ features }) { + const toast = useToast(); + const [userGroups, setUserGroups] = useState([]); + const [groupManagers, setGroupManagers] = useState([]); + const [scheduleManagers, setScheduleManagers] = useState([]); + const [saving, setSaving] = useState(false); + + useEffect(() => { + api.getUserGroups().then(({ groups }) => setUserGroups(groups || [])).catch(() => {}); + api.getSettings().then(({ settings }) => { + setGroupManagers(JSON.parse(settings.team_group_managers || '[]')); + setScheduleManagers(JSON.parse(settings.team_schedule_managers || '[]')); + }).catch(() => {}); + }, []); + + const toggle = (id, list, setList) => { + setList(prev => prev.includes(id) ? prev.filter(x => x !== id) : [...prev, id]); + }; + + const handleSave = async () => { + setSaving(true); + try { + await api.updateTeamSettings({ groupManagers, scheduleManagers }); + toast('Team settings saved', 'success'); + window.dispatchEvent(new Event('jama:settings-changed')); + } catch (e) { toast(e.message, 'error'); } + finally { setSaving(false); } + }; + + const GroupSelectList = ({ title, description, selected, onToggle }) => ( +
+
{title}
+

{description}

+ {userGroups.length === 0 ? ( +

No user groups created yet. Create groups in the Group Manager first.

+ ) : ( +
+ {userGroups.map(g => ( + + ))} +
+ )} + {selected.length === 0 && ( +

No groups selected — admins only.

+ )} +
+ ); + + return ( +
+ toggle(id, groupManagers, setGroupManagers)} + /> + toggle(id, scheduleManagers, setScheduleManagers)} + /> + +
+ ); +} + +// ── Registration Tab ────────────────────────────────────────────────────────── +function RegistrationTab({ onFeaturesChanged }) { + const toast = useToast(); + const [settings, setSettings] = useState({}); + const [regCode, setRegCode] = useState(''); + const [regLoading, setRegLoading] = useState(false); + const [copied, setCopied] = useState(false); + + useEffect(() => { + api.getSettings().then(({ settings }) => setSettings(settings)).catch(() => {}); + }, []); + + const appType = settings.app_type || 'JAMA-Chat'; + const activeCode = settings.registration_code || ''; + const adminEmail = settings.admin_email || '—'; + + // Placeholder serial number derived from hostname + const serialNumber = btoa(window.location.hostname).replace(/[^A-Z0-9]/gi, '').toUpperCase().slice(0, 16).padEnd(16, '0'); + + const handleCopySerial = async () => { + await navigator.clipboard.writeText(serialNumber).catch(() => {}); + setCopied(true); + setTimeout(() => setCopied(false), 2000); + }; + + const handleRegister = async () => { + if (!regCode.trim()) return toast('Enter a registration code', 'error'); + setRegLoading(true); + try { + const { features: f } = await api.registerCode(regCode.trim()); + setRegCode(''); + const fresh = await api.getSettings(); + setSettings(fresh.settings); + toast('Registration applied successfully.', 'success'); + window.dispatchEvent(new Event('jama:settings-changed')); + onFeaturesChanged && onFeaturesChanged(f); + } catch (e) { toast(e.message || 'Invalid registration code', 'error'); } + finally { setRegLoading(false); } + }; + + const handleClear = async () => { + try { + const { features: f } = await api.registerCode(''); + const fresh = await api.getSettings(); + setSettings(fresh.settings); + toast('Registration cleared.', 'success'); + window.dispatchEvent(new Event('jama:settings-changed')); + onFeaturesChanged && onFeaturesChanged(f); + } catch (e) { toast(e.message, 'error'); } + }; + + const typeInfo = APP_TYPES[appType] || APP_TYPES['JAMA-Chat']; + const siteUrl = window.location.origin; + + return ( +
+ {/* Info box */} +
+

+ Registration {activeCode ? 'is' : 'required:'} +

+

+ JAMA {activeCode ? 'is' : 'will be'} registered to:
+ Type: {typeInfo.label}
+ URL: {siteUrl} +

+
+ + {/* Type */} +
+
Application Type
+
+
+ {typeInfo.label} +
+ {typeInfo.desc} +
+
+ + {/* Serial Number */} +
+
Serial Number
+
+ + +
+
+ + {/* Registration Code */} +
+
Registration Code
+
+ setRegCode(e.target.value)} onKeyDown={e => e.key === 'Enter' && handleRegister()} /> + +
+
+ + {activeCode && ( +
+ + + Registered — {typeInfo.label} + + +
+ )} + +

+ Registration codes unlock application features. Contact your JAMA provider for a code.
+ JAMA-Brand — unlocks Branding.  + JAMA-Team — unlocks Branding, Group Manager and Schedule Manager. +

+
+ ); +} + +// ── Web Push Tab ────────────────────────────────────────────────────────────── +function WebPushTab() { const toast = useToast(); const [vapidPublic, setVapidPublic] = useState(''); const [loading, setLoading] = useState(true); const [generating, setGenerating] = useState(false); const [showRegenWarning, setShowRegenWarning] = useState(false); - // Registration - const [regCode, setRegCode] = useState(''); - const [activeCode, setActiveCode] = useState(''); - const [features, setFeatures] = useState({ branding: false, groupManager: false }); - const [regLoading, setRegLoading] = useState(false); - useEffect(() => { api.getSettings().then(({ settings }) => { setVapidPublic(settings.vapid_public || ''); - setActiveCode(settings.registration_code || ''); - setFeatures({ - branding: settings.feature_branding === 'true', - groupManager: settings.feature_group_manager === 'true', - }); setLoading(false); }).catch(() => setLoading(false)); }, []); @@ -36,41 +233,81 @@ export default function SettingsModal({ onClose, onFeaturesChanged }) { toast('VAPID keys generated. Push notifications are now active.', 'success'); } catch (e) { toast(e.message || 'Failed to generate keys', 'error'); - } finally { - setGenerating(false); - } + } finally { setGenerating(false); } }; - const handleGenerateClick = () => { - if (vapidPublic) setShowRegenWarning(true); - else doGenerate(); - }; + if (loading) return

Loading…

; - const handleRegister = async () => { - setRegLoading(true); - try { - const { features: f } = await api.registerCode(regCode.trim()); - setFeatures(f); - setActiveCode(regCode.trim()); - setRegCode(''); - toast(regCode.trim() ? 'Registration code applied.' : 'Registration cleared.', 'success'); - window.dispatchEvent(new Event('jama:settings-changed')); - onFeaturesChanged && onFeaturesChanged(f); - } catch (e) { - toast(e.message || 'Invalid code', 'error'); - } finally { - setRegLoading(false); - } - }; + return ( +
+
Web Push Notifications (VAPID)
- const featureList = [ - features.branding && 'Branding', - features.groupManager && 'Group Manager', + {vapidPublic ? ( +
+
+
Public Key
+ {vapidPublic} +
+ + + Push notifications active + +
+ ) : ( +

+ No VAPID keys found. Generate keys to enable Web Push notifications. +

+ )} + + {showRegenWarning && ( +
+

⚠️ Regenerate VAPID keys?

+

+ Generating new keys will invalidate all existing push subscriptions. Users will need to re-enable notifications. +

+
+ + +
+
+ )} + {!showRegenWarning && ( + + )} +

+ Requires HTTPS. On iOS, the app must be installed to the home screen first. +

+
+ ); +} + +// ── Main modal ──────────────────────────────────────────────────────────────── +export default function SettingsModal({ onClose, onFeaturesChanged }) { + const [tab, setTab] = useState('registration'); + const [appType, setAppType] = useState('JAMA-Chat'); + + useEffect(() => { + api.getSettings().then(({ settings }) => { + setAppType(settings.app_type || 'JAMA-Chat'); + }).catch(() => {}); + const handler = () => api.getSettings().then(({ settings }) => setAppType(settings.app_type || 'JAMA-Chat')).catch(() => {}); + window.addEventListener('jama:settings-changed', handler); + return () => window.removeEventListener('jama:settings-changed', handler); + }, []); + + const isTeam = appType === 'JAMA-Team'; + + const tabs = [ + isTeam && { id: 'team', label: 'Team Management' }, + { id: 'registration', label: 'Registration' }, + { id: 'webpush', label: 'Web Push' }, ].filter(Boolean); return (
e.target === e.currentTarget && onClose()}> -
+

Settings

- {/* Registration Code */} -
-
Feature Registration
- {activeCode && featureList.length > 0 && ( -
- - Active — unlocks: {featureList.join(', ')} -
- )} -
- setRegCode(e.target.value)} - onKeyDown={e => e.key === 'Enter' && handleRegister()} - /> - -
- {activeCode && ( - - )} -

- A registration code unlocks Branding and Group Manager features. Contact your jama provider for a code. -

+ ))}
-
-
Web Push Notifications (VAPID)
- {loading ? ( -

Loading…

- ) : ( - <> - {vapidPublic ? ( -
-
-
Public Key
- {vapidPublic} -
- - - Push notifications active - -
- ) : ( -

- No VAPID keys found. Generate keys to enable Web Push notifications. -

- )} - {showRegenWarning && ( -
-

⚠️ Regenerate VAPID keys?

-

- Generating new keys will invalidate all existing push subscriptions. Users will need to re-enable notifications. -

-
- - -
-
- )} - {!showRegenWarning && ( - - )} -

- Requires HTTPS. On iOS, the app must be installed to the home screen first. -

- - )} -
+ {tab === 'team' && } + {tab === 'registration' && } + {tab === 'webpush' && }
); diff --git a/frontend/src/pages/Chat.jsx b/frontend/src/pages/Chat.jsx index f2d9d39..f34813e 100644 --- a/frontend/src/pages/Chat.jsx +++ b/frontend/src/pages/Chat.jsx @@ -38,7 +38,7 @@ export default function Chat() { const [unreadGroups, setUnreadGroups] = useState(new Map()); const [modal, setModal] = useState(null); // 'profile' | 'users' | 'settings' | 'newchat' | 'help' | 'groupmanager' const [drawerOpen, setDrawerOpen] = useState(false); - const [features, setFeatures] = useState({ branding: false, groupManager: false }); + const [features, setFeatures] = useState({ branding: false, groupManager: false, scheduleManager: false, appType: 'JAMA-Chat', teamGroupManagers: [], teamScheduleManagers: [] }); const [helpDismissed, setHelpDismissed] = useState(true); // true until status loaded const [isMobile, setIsMobile] = useState(window.innerWidth < 768); const [showSidebar, setShowSidebar] = useState(true); @@ -73,14 +73,22 @@ export default function Chat() { useEffect(() => { api.getSettings().then(({ settings }) => { setFeatures({ - branding: settings.feature_branding === 'true', - groupManager: settings.feature_group_manager === 'true', + branding: settings.feature_branding === 'true', + groupManager: settings.feature_group_manager === 'true', + scheduleManager: settings.feature_schedule_manager === 'true', + appType: settings.app_type || 'JAMA-Chat', + teamGroupManagers: JSON.parse(settings.team_group_managers || '[]'), + teamScheduleManagers: JSON.parse(settings.team_schedule_managers || '[]'), }); }).catch(() => {}); const handler = () => api.getSettings().then(({ settings }) => { setFeatures({ - branding: settings.feature_branding === 'true', - groupManager: settings.feature_group_manager === 'true', + branding: settings.feature_branding === 'true', + groupManager: settings.feature_group_manager === 'true', + scheduleManager: settings.feature_schedule_manager === 'true', + appType: settings.app_type || 'JAMA-Chat', + teamGroupManagers: JSON.parse(settings.team_group_managers || '[]'), + teamScheduleManagers: JSON.parse(settings.team_schedule_managers || '[]'), }); }).catch(() => {}); window.addEventListener('jama:settings-changed', handler); diff --git a/frontend/src/utils/api.js b/frontend/src/utils/api.js index 875e782..4c9f0aa 100644 --- a/frontend/src/utils/api.js +++ b/frontend/src/utils/api.js @@ -102,6 +102,7 @@ export const api = { updateAppName: (name) => req('PATCH', '/settings/app-name', { name }), updateColors: (body) => req('PATCH', '/settings/colors', body), registerCode: (code) => req('POST', '/settings/register', { code }), + updateTeamSettings: (body) => req('PATCH', '/settings/team', body), // User groups (Group Manager) getUserGroups: () => req('GET', '/usergroups'),