Merge pull request #43 from VectorInstitute/add_active_users_metric

Add active users metric

Author: amrit110

services/analytics/app/components/templates-table.tsx

@@ -47,13 +47,13 @@ export function TemplatesTable({ templates }: TemplatesTableProps) {
                 </Tooltip>
               </th>
               <th className="px-6 py-4 text-right text-xs font-semibold text-slate-700 dark:text-slate-300 uppercase tracking-wider">
-                <Tooltip content="Sum of all workspace lifetime hours (from creation to now) for this template" position="right">
-                  Total Hours
+                <Tooltip content="Number of unique users who have used this template in the last 7 days">
+                  Active Users
                 </Tooltip>
               </th>
               <th className="px-6 py-4 text-right text-xs font-semibold text-slate-700 dark:text-slate-300 uppercase tracking-wider">
-                <Tooltip content="Average workspace lifetime hours across all workspaces for this template" position="right">
-                  Avg Hours
+                <Tooltip content="Sum of all workspace lifetime hours (from creation to now) for this template" position="right">
+                  Total Hours
                 </Tooltip>
               </th>
               <th className="px-6 py-4 text-right text-xs font-semibold text-slate-700 dark:text-slate-300 uppercase tracking-wider">
@@ -95,11 +95,13 @@ export function TemplatesTable({ templates }: TemplatesTableProps) {
                     {template.active_workspaces}
                   </span>
                 </td>
-                <td className="px-6 py-4 text-right text-sm text-slate-700 dark:text-slate-300">
-                  {template.total_workspace_hours.toLocaleString()}h
+                <td className="px-6 py-4 text-right text-sm">
+                  <span className="inline-flex items-center px-3 py-1 rounded-full text-xs font-medium bg-vector-violet/10 text-vector-violet border border-vector-violet/30">
+                    {template.unique_active_users}
+                  </span>
                 </td>
                 <td className="px-6 py-4 text-right text-sm text-slate-700 dark:text-slate-300">
-                  {template.avg_workspace_hours.toLocaleString()}h
+                  {template.total_workspace_hours.toLocaleString()}h
                 </td>
                 <td className="px-6 py-4 text-right">
                   <Link

services/analytics/app/template/[templateName]/template-teams-content.tsx

@@ -5,6 +5,7 @@ import Link from 'next/link';
 import { ArrowLeft, Users } from 'lucide-react';
 import type { User } from '@vector-institute/aieng-auth-core';
 import type { AnalyticsSnapshot, TeamMetrics } from '@/lib/types';
+import { Tooltip } from '@/app/components/tooltip';
 
 interface TemplateTeamsContentProps {
   user: User | null;
@@ -154,7 +155,7 @@ export default function TemplateTeamsContent({ user, templateName }: TemplateTea
       {/* Main Content */}
       <div className="max-w-7xl mx-auto px-4 md:px-8 pb-8">
         {/* Summary Cards */}
-        <div className="grid gap-6 md:grid-cols-4 mb-8 animate-fade-in">
+        <div className="grid gap-6 md:grid-cols-3 mb-8 animate-fade-in">
           <div className="bg-white dark:bg-slate-800 rounded-2xl shadow-xl border-2 border-slate-200 dark:border-slate-700 p-6">
             <div className="text-sm font-semibold text-slate-600 dark:text-slate-400 uppercase tracking-wider mb-2">
               Total Workspaces
@@ -181,15 +182,6 @@ export default function TemplateTeamsContent({ user, templateName }: TemplateTea
               {template.total_workspace_hours.toLocaleString()}h
             </div>
           </div>
-
-          <div className="bg-white dark:bg-slate-800 rounded-2xl shadow-xl border-2 border-slate-200 dark:border-slate-700 p-6">
-            <div className="text-sm font-semibold text-slate-600 dark:text-slate-400 uppercase tracking-wider mb-2">
-              Avg Hours
-            </div>
-            <div className="text-3xl font-bold text-slate-900 dark:text-white">
-              {template.avg_workspace_hours.toLocaleString()}h
-            </div>
-          </div>
         </div>
 
         {/* Teams Table */}
@@ -213,16 +205,24 @@ export default function TemplateTeamsContent({ user, templateName }: TemplateTea
                       Team
                     </th>
                     <th className="px-6 py-4 text-right text-xs font-semibold text-slate-700 dark:text-slate-300 uppercase tracking-wider">
-                      Workspaces
+                      <Tooltip content="Number of workspaces created by this team from this template">
+                        Workspaces
+                      </Tooltip>
                     </th>
                     <th className="px-6 py-4 text-right text-xs font-semibold text-slate-700 dark:text-slate-300 uppercase tracking-wider">
-                      Total Hours
+                      <Tooltip content="Number of unique team members who have used workspaces in the last 7 days">
+                        Active Users
+                      </Tooltip>
                     </th>
                     <th className="px-6 py-4 text-right text-xs font-semibold text-slate-700 dark:text-slate-300 uppercase tracking-wider">
-                      Avg Hours
+                      <Tooltip content="Sum of all workspace lifetime hours for this team">
+                        Total Hours
+                      </Tooltip>
                     </th>
                     <th className="px-6 py-4 text-right text-xs font-semibold text-slate-700 dark:text-slate-300 uppercase tracking-wider">
-                      Active Days
+                      <Tooltip content="Number of days with activity in the last 7 days for this team" position="right">
+                        Active Days
+                      </Tooltip>
                     </th>
                   </tr>
                 </thead>
@@ -240,11 +240,13 @@ export default function TemplateTeamsContent({ user, templateName }: TemplateTea
                       <td className="px-6 py-4 text-right text-sm text-slate-700 dark:text-slate-300">
                         {team.workspaces_for_template}
                       </td>
-                      <td className="px-6 py-4 text-right text-sm text-slate-700 dark:text-slate-300">
-                        {team.total_workspace_hours.toLocaleString()}h
+                      <td className="px-6 py-4 text-right text-sm">
+                        <span className="inline-flex items-center px-3 py-1 rounded-full text-xs font-medium bg-vector-violet/10 text-vector-violet border border-vector-violet/30">
+                          {team.unique_active_users}
+                        </span>
                       </td>
                       <td className="px-6 py-4 text-right text-sm text-slate-700 dark:text-slate-300">
-                        {team.avg_workspace_hours.toLocaleString()}h
+                        {team.total_workspace_hours.toLocaleString()}h
                       </td>
                       <td className="px-6 py-4 text-right text-sm text-vector-turquoise">
                         {team.active_days}

services/analytics/lib/metrics.ts

@@ -261,9 +261,18 @@ export function aggregateByTeam(workspaces: WorkspaceMetrics[]): TeamMetrics[] {
     // Sort members by last active (most recent first)
     members.sort((a, b) => new Date(b.last_active).getTime() - new Date(a.last_active).getTime());
 
+    // Count unique active users (users with at least one active workspace in last 7 days)
+    const activeUsers = new Set<string>();
+    teamWorkspaces.forEach((workspace) => {
+      if (workspace.activity_status === 'active') {
+        activeUsers.add(workspace.owner_github_handle);
+      }
+    });
+
     return {
       team_name: teamName,
       total_workspaces: teamWorkspaces.length,
+      unique_active_users: activeUsers.size,
       total_workspace_hours: Math.round(totalWorkspaceHours),
       avg_workspace_hours: Math.round(avgWorkspaceHours * 10) / 10,
       active_days: activeDates.size,
@@ -370,12 +379,19 @@ export function calculateTemplateMetrics(
       teamDistribution[workspace.team_name] = count + 1;
     });
 
+    // Count unique active users for this template (users with at least one active workspace in last 7 days)
+    const activeUsers = new Set<string>();
+    activeWorkspaces.forEach((workspace) => {
+      activeUsers.add(workspace.owner_github_handle);
+    });
+
     return {
       template_id: template.id,
       template_name: template.name,
       template_display_name: template.display_name,
       total_workspaces: templateWorkspaces.length,
       active_workspaces: activeWorkspaces.length,
+      unique_active_users: activeUsers.size,
       total_workspace_hours: Math.round(totalWorkspaceHours),
       avg_workspace_hours: Math.round(avgWorkspaceHours * 10) / 10,
       team_distribution: teamDistribution,

services/analytics/lib/types.ts

@@ -138,6 +138,7 @@ export interface TeamMetrics {
 
   // Counts
   total_workspaces: number;
+  unique_active_users: number;    // Number of unique users with activity in last 7 days
 
   // Time-based metrics
   total_workspace_hours: number;  // Sum of all workspace lifetime hours
@@ -187,6 +188,7 @@ export interface TemplateMetrics {
   template_display_name: string;
   total_workspaces: number;
   active_workspaces: number;
+  unique_active_users: number;    // Number of unique users with activity in last 7 days
   total_workspace_hours: number;  // Sum of all workspace lifetime hours for this template
   avg_workspace_hours: number;    // Average workspace lifetime hours
   team_distribution: Record<string, number>;