moar data to one

Author: mluukkai

src/client/Router.tsx

@@ -14,6 +14,7 @@ import Courses from './components/Courses'
 import Course from './components/Courses/Course'
 import NoAccess from './components/NoAccess'
 import Chats from './components/Chats'
+import Statistics from './components/Admin/Statistics'
 
 const router = createBrowserRouter(
   createRoutesFromElements(
@@ -25,6 +26,7 @@ const router = createBrowserRouter(
       <Route path="/admin/*" element={<Admin />} />
       <Route path="/noaccess" element={<NoAccess />} />
       <Route path="/chats" element={<Chats />} />
+      <Route path="/statistics" element={<Statistics />} />
     </Route>
   ),
   {

src/client/components/NavBar/index.tsx

@@ -90,6 +90,14 @@ const NavBar = () => {
                 </Button>
               </Link>
             )}
+            {user.isStatsViewer && (
+              <Link to="/statistics" style={{ textDecoration: 'none' }}>
+                <Button>
+                  <AdminPanelSettingsOutlined sx={styles.icon} />{' '}
+                  {t('admin:courseStats')}
+                </Button>
+              </Link>
+            )}
             <Button
               ref={anchorRef}
               id="composition-button"

src/client/locales/sv.json

@@ -68,6 +68,14 @@
     "noAccessInfo": "You do not currently have access to CurreChat"
   },
   "admin": {
+    "showing": "Showing",
+    "timePeriodStart": "Starting",
+    "timePeriodStop": "ending",
+    "courseStats": "Course stats",
+    "courseTerms": "Terms",
+    "courseCodes": "Course codes",
+    "programCodes": "Programmes",
+    "studentCount": "Students",
     "accessGroups": "Access groups",
     "createAccessGroup": "Create new access group",
     "confirmAccessGroupDelete": "Are you sure you want to delete this access group?",

src/client/types.ts

@@ -47,6 +47,7 @@ export interface User {
   hasIamAccess?: boolean
   lastRestart: string
   enrolledCourses: ChatInstance[]
+  isStatsViewer: boolean
 }
 
 export type Prompt = {

src/server/db/models/chatInstance.ts

@@ -56,7 +56,7 @@ ChatInstance.init(
     model: {
       type: DataTypes.STRING,
       allowNull: false,
-      defaultValue: 'gpt-4o-mini',
+      defaultValue: 'gpt-4o',
     },
     usageLimit: {
       type: DataTypes.INTEGER,

src/server/middleware/user.ts

@@ -1,7 +1,7 @@
 import { inCI, inDevelopment } from '../../config'
 import { User as UserModel } from '../db/models'
 import { User } from '../types'
-import { adminIams, powerUserIam } from '../util/config'
+import { adminIams, powerUserIam, statsViewerIams } from '../util/config'
 
 const parseIamGroups = (iamGroups: string) =>
   iamGroups?.split(';').filter(Boolean) ?? []
@@ -40,6 +40,7 @@ const userMiddleware = async (req: any, _res: any, next: any) => {
     iamGroups,
     isAdmin: checkAdmin(iamGroups),
     isPowerUser: isPowerUser(iamGroups),
+    isStatsViewer: statsViewerIams.some((iam) => iamGroups.includes(iam)),
   }
 
   const adminLoggedInAsId = req.headers['x-admin-logged-in-as']
@@ -49,7 +50,15 @@ const userMiddleware = async (req: any, _res: any, next: any) => {
     if (!hijackedUser) {
       return next(new Error('User not found'))
     }
-    req.user = { email: acualUser.email, ...hijackedUser.toJSON() }
+    const isStatsViewer = statsViewerIams.some((iam) =>
+      hijackedUser.iamGroups.includes(iam)
+    )
+
+    req.user = {
+      email: acualUser.email,
+      ...hijackedUser.toJSON(),
+      isStatsViewer,
+    }
     req.hijackedBy = acualUser
   } else {
     req.user = acualUser

src/server/routes/admin.ts

@@ -6,14 +6,21 @@ import { ChatInstance, UserChatInstanceUsage, User, Prompt } from '../db/models'
 import { getCourse } from '../util/importer'
 import { run as runUpdater } from '../updater'
 import InfoText from '../db/models/infotext'
+import { statsViewerIams } from '../util/config'
 
 const adminRouter = express.Router()
 
 adminRouter.use((req, _, next) => {
   const request = req as RequestWithUser
   const { user } = request
 
-  if (!user.isAdmin) throw new Error('Unauthorized')
+  const isStatsViewer = statsViewerIams.some((iam) =>
+    user.iamGroups.includes(iam)
+  )
+  const isAllowed =
+    user.isAdmin || (isStatsViewer && req.path.includes('/statistics'))
+
+  if (!isAllowed) throw new Error('Unauthorized')
 
   return next()
 })
@@ -58,6 +65,7 @@ adminRouter.get('/statistics', async (req, res) => {
       label: {
         en: `spring ${y}`,
         fi: `kevät ${y}`,
+        sv: `vår ${y}`,
       },
       id,
       startDate: `${y}-01-01`,
@@ -68,6 +76,7 @@ adminRouter.get('/statistics', async (req, res) => {
       label: {
         en: `fall ${y}`,
         fi: `syksy ${y}`,
+        sv: `höst ${y}`,
       },
       id: id + 1,
       startDate: `${y}-08-01`,

src/server/types.ts

@@ -14,6 +14,7 @@ export interface User {
   isPowerUser: boolean
   activeCourseIds?: string[]
   ownCourses?: string[]
+  isStatsViewer: boolean
 }
 
 export interface RequestWithUser extends Request {

src/server/util/config.ts

@@ -35,6 +35,8 @@ export const IMPORTER_URL =
 
 export const REDIS_HOST = process.env.REDIS_HOST || 'redis'
 
+export const statsViewerIams = ['hy-one']
+
 export const adminIams = ['grp-toska', 'hy-ypa-opa-ote']
 
 export const basicUserIam = 'grp-currechat'