Merge pull request #162 from flocko-motion/development

janosbrodbeck · web-flow · commit 9ad3c390c643 · 2026-02-11T14:34:17.000+01:00
Version 1.44 for prod
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -198,25 +198,17 @@ jobs:
           echo "Release version: ${{ needs.semantic-release.outputs.version }}"
           
           if [ "${{ github.ref_name }}" = "main" ]; then
-            # Production: trigger omnitopos only
-            echo "Triggering production webhook..."
+            echo "Triggering Coolify prod webhook..."
             curl -X POST \
-              -u "${{ secrets.OMNITOPOS_USERNAME }}:${{ secrets.OMNITOPOS_PASSWORD }}" \
+              -H "Authorization: Bearer ${{ secrets.COOLIFY_WEBHOOK_TOKEN }}" \
               -f \
-              "https://omnitopos.net/dashctl/cgl-prod/restart"
+              "${{ secrets.COOLIFY_WEBHOOK_URL_PROD }}" || echo "⚠️ Coolify prod webhook failed"
           else
-            # Development: trigger both omnitopos and coolify
-            echo "Triggering omnitopos dev webhook..."
-            curl -X POST \
-              -u "${{ secrets.OMNITOPOS_USERNAME }}:${{ secrets.OMNITOPOS_PASSWORD }}" \
-              -f \
-              "https://omnitopos.net/dashctl/cgl-dev/restart" || echo "⚠️ Omnitopos webhook failed"
-            
             echo "Triggering Coolify dev webhook..."
             curl -X POST \
               -H "Authorization: Bearer ${{ secrets.COOLIFY_WEBHOOK_TOKEN }}" \
               -f \
-              "${{ secrets.COOLIFY_WEBHOOK_URL }}" || echo "⚠️ Coolify webhook failed"
+              "${{ secrets.COOLIFY_WEBHOOK_URL }}" || echo "⚠️ Coolify dev webhook failed"
           fi
 
   summary:
diff --git a/server/db/api_key_shares.go b/server/db/api_key_shares.go
@@ -139,6 +139,11 @@ func DeleteApiKey(ctx context.Context, userID uuid.UUID, shareID uuid.UUID) erro
 		return obj.ErrServerError("failed to clear game sponsored api key references")
 	}
 
+	// Clear system free-use key reference if it points to this key
+	if err := queries().ClearSystemSettingsFreeUseApiKey(ctx, uuid.NullUUID{UUID: key.ID, Valid: true}); err != nil {
+		return obj.ErrServerError("failed to clear system free-use api key reference")
+	}
+
 	wasDefault := key.IsDefault
 
 	// Delete all shares
diff --git a/server/db/queries/system_settings.sql b/server/db/queries/system_settings.sql
@@ -29,6 +29,13 @@ SET
   free_use_api_key_id = $1,
   modified_at = now();
 
+-- name: ClearSystemSettingsFreeUseApiKey :exec
+UPDATE system_settings
+SET
+  free_use_api_key_id = NULL,
+  modified_at = now()
+WHERE free_use_api_key_id = $1;
+
 -- name: InitSystemSettings :exec
 INSERT INTO system_settings (id, default_ai_quality_tier)
 VALUES ('00000000-0000-0000-0000-000000000001'::uuid, $1)
diff --git a/server/db/sqlc/system_settings.sql.go b/server/db/sqlc/system_settings.sql.go
diff --git a/web/src/common/lib/roles.ts b/web/src/common/lib/roles.ts
@@ -53,7 +53,7 @@ const ROLE_MAP: Record<RoleString, Role> = {
 const ROLE_LABELS: Record<Role, string> = {
   [Role.Participant]: "Participant",
   [Role.Individual]: "Individual",
-  [Role.Staff]: "Staff",
+  [Role.Staff]: "Workshop Lead",
   [Role.Head]: "Head",
   [Role.Admin]: "Admin",
 };
diff --git a/web/src/features/admin/components/ServerSettings.tsx b/web/src/features/admin/components/ServerSettings.tsx
@@ -132,21 +132,6 @@ export function ServerSettings() {
                   {t("serverSettings.freeUseKey.remove")}
                 </Button>
               </Group>
-            ) : currentKeyId ? (
-              <Group gap="sm" wrap="wrap">
-                <Badge color="orange" variant="light" size="lg">
-                  {t("serverSettings.freeUseKey.unknownKey")}
-                </Badge>
-                <Button
-                  variant="subtle"
-                  color="red"
-                  size="xs"
-                  onClick={() => setFreeUseKey.mutate({ apiKeyId: null })}
-                  loading={setFreeUseKey.isPending}
-                >
-                  {t("serverSettings.freeUseKey.remove")}
-                </Button>
-              </Group>
             ) : (
               <Select
                 placeholder={t("serverSettings.freeUseKey.selectPlaceholder")}
diff --git a/web/src/features/admin/components/UserManagement.tsx b/web/src/features/admin/components/UserManagement.tsx
@@ -74,7 +74,7 @@ export function UserManagement() {
     null,
   );
   const [userToEdit, setUserToEdit] = useState<ObjUser | null>(null);
-  const [editEmail, setEditEmail] = useState("");
+  const [editName, setEditName] = useState("");
   const [
     deleteModalOpened,
     { open: openDeleteModal, close: closeDeleteModal },
@@ -141,20 +141,14 @@ export function UserManagement() {
 
   // Update user mutation
   const updateUserMutation = useMutation({
-    mutationFn: async ({
-      userId,
-      email,
-    }: {
-      userId: string;
-      email: string;
-    }) => {
-      await api.users.usersCreate(userId, { email });
+    mutationFn: async ({ userId, name }: { userId: string; name: string }) => {
+      await api.users.usersCreate(userId, { name });
     },
     onSuccess: () => {
       queryClient.invalidateQueries({ queryKey: queryKeys.adminUsers });
       closeEditModal();
       setUserToEdit(null);
-      setEditEmail("");
+      setEditName("");
     },
   });
 
@@ -229,7 +223,7 @@ export function UserManagement() {
   const handleEdit = useCallback(
     (user: ObjUser) => {
       setUserToEdit(user);
-      setEditEmail(user.email || "");
+      setEditName(user.name || "");
       openEditModal();
     },
     [openEditModal],
@@ -264,8 +258,11 @@ export function UserManagement() {
     if (!users) return [];
 
     return users.filter((user) => {
-      // Filter out guests if toggle is on
-      if (hideGuests && user.role?.role === "participant") {
+      // Filter out guests and participants if toggle is on
+      if (
+        hideGuests &&
+        (!user.role?.role || user.role.role === "participant")
+      ) {
         return false;
       }
 
@@ -330,7 +327,8 @@ export function UserManagement() {
   // Count guests for display
   const guestCount = useMemo(() => {
     if (!users) return 0;
-    return users.filter((u) => u.role?.role === "participant").length;
+    return users.filter((u) => !u.role?.role || u.role.role === "participant")
+      .length;
   }, [users]);
 
   if (error) {
@@ -482,7 +480,7 @@ export function UserManagement() {
                               </ActionIcon>
                             </Tooltip>
                           )}
-                          <Tooltip label={t("admin.users.editEmail")}>
+                          <Tooltip label={t("admin.users.editName")}>
                             <ActionIcon
                               variant="subtle"
                               color="blue"
@@ -590,7 +588,7 @@ export function UserManagement() {
                               </ActionIcon>
                             </Tooltip>
                           )}
-                          <Tooltip label={t("admin.users.editEmail")}>
+                          <Tooltip label={t("admin.users.editName")}>
                             <ActionIcon
                               variant="subtle"
                               color="blue"
@@ -760,10 +758,10 @@ export function UserManagement() {
             {t("admin.users.editingUser", { name: userToEdit?.name })}
           </Text>
           <TextInput
-            label={t("admin.users.email")}
-            placeholder={t("admin.users.emailPlaceholder")}
-            value={editEmail}
-            onChange={(e) => setEditEmail(e.currentTarget.value)}
+            label={t("admin.users.name")}
+            placeholder={t("admin.users.namePlaceholder")}
+            value={editName}
+            onChange={(e) => setEditName(e.currentTarget.value)}
           />
           <Group justify="flex-end">
             <Text
@@ -782,11 +780,11 @@ export function UserManagement() {
                 userToEdit?.id &&
                 updateUserMutation.mutate({
                   userId: userToEdit.id,
-                  email: editEmail,
+                  name: editName,
                 })
               }
               loading={updateUserMutation.isPending}
-              disabled={editEmail === (userToEdit?.email || "")}
+              disabled={editName === (userToEdit?.name || "")}
             >
               <IconEdit size={16} />
             </ActionIcon>
diff --git a/web/src/i18n/locales/de.json b/web/src/i18n/locales/de.json
@@ -1190,6 +1190,7 @@
     "you": "Du"
   },
   "navigation": {
+    "adminPanel": "Admin-Bereich",
     "allGames": "Alle Spiele",
     "create": "Eigene Spiele erstellen",
     "createGame": "Spiel erstellen",
diff --git a/web/src/i18n/locales/en.json b/web/src/i18n/locales/en.json
@@ -1141,6 +1141,7 @@
     "you": "You"
   },
   "navigation": {
+    "adminPanel": "Admin Panel",
     "allGames": "All Games",
     "create": "Create Your Own Game",
     "createGame": "Create Game",
diff --git a/web/src/routes/__root.tsx b/web/src/routes/__root.tsx
@@ -11,6 +11,7 @@ import {
   IconSchool,
   IconSettings,
   IconTools,
+  IconShield,
 } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
 import { useEffect } from "react";
@@ -233,26 +234,34 @@ function RootComponent() {
 
   // Admin-only navigation items
   if (isAdmin(backendUser)) {
-    navItems.push(
-      {
-        label: t("serverSettings"),
-        icon: <IconSettings size={18} />,
-        onClick: () => navigate({ to: ROUTES.ADMIN_SERVER_SETTINGS as "/" }),
-        active: pathname.startsWith(ROUTES.ADMIN_SERVER_SETTINGS),
-      },
-      {
-        label: t("manageOrganizations"),
-        icon: <IconBuilding size={18} />,
-        onClick: () => navigate({ to: ROUTES.ADMIN_ORGANIZATIONS as "/" }),
-        active: pathname.startsWith(ROUTES.ADMIN_ORGANIZATIONS),
-      },
-      {
-        label: t("manageUsers"),
-        icon: <IconUsers size={18} />,
-        onClick: () => navigate({ to: ROUTES.ADMIN_USERS as "/" }),
-        active: pathname.startsWith(ROUTES.ADMIN_USERS),
-      },
-    );
+    navItems.push({
+      label: t("adminPanel"),
+      icon: <IconShield size={18} />,
+      active:
+        pathname.startsWith(ROUTES.ADMIN_SERVER_SETTINGS) ||
+        pathname.startsWith(ROUTES.ADMIN_ORGANIZATIONS) ||
+        pathname.startsWith(ROUTES.ADMIN_USERS),
+      children: [
+        {
+          label: t("serverSettings"),
+          icon: <IconSettings size={18} />,
+          onClick: () => navigate({ to: ROUTES.ADMIN_SERVER_SETTINGS as "/" }),
+          active: pathname.startsWith(ROUTES.ADMIN_SERVER_SETTINGS),
+        },
+        {
+          label: t("manageOrganizations"),
+          icon: <IconBuilding size={18} />,
+          onClick: () => navigate({ to: ROUTES.ADMIN_ORGANIZATIONS as "/" }),
+          active: pathname.startsWith(ROUTES.ADMIN_ORGANIZATIONS),
+        },
+        {
+          label: t("manageUsers"),
+          icon: <IconUsers size={18} />,
+          onClick: () => navigate({ to: ROUTES.ADMIN_USERS as "/" }),
+          active: pathname.startsWith(ROUTES.ADMIN_USERS),
+        },
+      ],
+    });
   }
 
   // Header navigation callbacks
