feat: change admin dashboard's access (#2463)

rolling-scopes · Apr 17, 2024 · b24a74a · b24a74a
1 parent 32f1e2e
commit b24a74a
Show file tree

Hide file tree

Showing 30 changed files with 58 additions and 58 deletions.
diff --git a/client/src/components/Sider/data/menuItems.tsx b/client/src/components/Sider/data/menuItems.tsx
@@ -143,12 +143,6 @@ export function getAdminMenuItems(session: Session): MenuItemsRenderData[] {
 }
 
 const courseManagementMenuItems: CourseManagementMenuItemsData[] = [
-  {
-    name: 'Dashboard',
-    key: 'courseDashboard',
-    getUrl: (course: Course) => `/course/admin/dashboard?course=${course.alias}`,
-    courseAccess: some(isCourseManager, isCourseSupervisor, isDementor),
-  },
   {
     name: 'Course Events',
     key: 'courseEvents',

diff --git a/client/src/modules/AdminDashboard/index.tsx b/client/src/modules/AdminDashboard/index.tsx
diff --git a/...ponents/CountriesChart/CountriesChart.tsx → ...ponents/CountriesChart/CountriesChart.tsx b/...ponents/CountriesChart/CountriesChart.tsx → ...ponents/CountriesChart/CountriesChart.tsx
@@ -2,7 +2,7 @@ import { Bar, BarConfig } from '@ant-design/plots';
 import { Flex, Image, Typography } from 'antd';
 import { CountryStatDto } from 'api';
 import { useCallback, useMemo } from 'react';
-import { Colors } from '../data';
+import { Colors } from '../../data';
 
 type Props = {
   data: CountryStatDto[];

diff --git a/...oard/components/DonutChart/DonutChart.tsx → ...tics/components/DonutChart/DonutChart.tsx b/...oard/components/DonutChart/DonutChart.tsx → ...tics/components/DonutChart/DonutChart.tsx
diff --git a/...MentorsStatsCard/EpamMentorsStatsCard.tsx → ...MentorsStatsCard/EpamMentorsStatsCard.tsx b/...MentorsStatsCard/EpamMentorsStatsCard.tsx → ...MentorsStatsCard/EpamMentorsStatsCard.tsx
@@ -1,7 +1,7 @@
 import { Card, Typography } from 'antd';
 import { CourseMentorsStatsDto } from 'api';
 import dynamic from 'next/dynamic';
-import { Colors } from '../data';
+import { Colors } from '../../data';
 
 type Props = {
   mentorsStats: CourseMentorsStatsDto;

diff --git a/...components/EpamMentorsStatsCard/index.tsx → ...components/EpamMentorsStatsCard/index.tsx b/...components/EpamMentorsStatsCard/index.tsx → ...components/EpamMentorsStatsCard/index.tsx
diff --git a/...rd/components/LiquidChart/LiquidChart.tsx → ...cs/components/LiquidChart/LiquidChart.tsx b/...rd/components/LiquidChart/LiquidChart.tsx → ...cs/components/LiquidChart/LiquidChart.tsx
@@ -1,5 +1,5 @@
 import { Liquid, LiquidConfig } from '@ant-design/plots';
-import { Colors } from '../data';
+import { Colors } from '../../data';
 
 type Props = {
   count: number;

diff --git a/...orsCountriesCard/MentorsCountriesCard.tsx → ...orsCountriesCard/MentorsCountriesCard.tsx b/...orsCountriesCard/MentorsCountriesCard.tsx → ...orsCountriesCard/MentorsCountriesCard.tsx
@@ -1,14 +1,16 @@
 import { Card } from 'antd';
 import { CountriesStatsDto } from 'api';
 import dynamic from 'next/dynamic';
-import { Colors } from '../data';
+import { Colors } from '../../data';
 
 type Props = {
   countriesStats: CountriesStatsDto;
   activeCount: number;
 };
 
-const CountriesChart = dynamic(() => import('../CountriesChart/CountriesChart'), { ssr: false });
+const CountriesChart = dynamic(() => import('../CountriesChart/CountriesChart'), {
+  ssr: false,
+});
 
 export const MentorsCountriesCard = ({ countriesStats, activeCount }: Props) => {
   const { countries } = countriesStats;

diff --git a/.../components/MentorsCountriesCard/index.ts → .../components/MentorsCountriesCard/index.ts b/.../components/MentorsCountriesCard/index.ts → .../components/MentorsCountriesCard/index.ts
diff --git a/...tsCountriesCard/StudentsCountriesCard.tsx → ...tsCountriesCard/StudentsCountriesCard.tsx b/...tsCountriesCard/StudentsCountriesCard.tsx → ...tsCountriesCard/StudentsCountriesCard.tsx
@@ -7,7 +7,9 @@ type Props = {
   activeStudentsCount: number;
 };
 
-const CountriesChart = dynamic(() => import('../CountriesChart/CountriesChart'), { ssr: false });
+const CountriesChart = dynamic(() => import('../CountriesChart/CountriesChart'), {
+  ssr: false,
+});
 
 export const StudentsCountriesCard = ({ studentsCountriesStats, activeStudentsCount }: Props) => {
   const { countries } = studentsCountriesStats;

diff --git a/...omponents/StudentsCountriesCard/index.tsx → ...omponents/StudentsCountriesCard/index.tsx b/...omponents/StudentsCountriesCard/index.tsx → ...omponents/StudentsCountriesCard/index.tsx
diff --git a/.../StudentsEligibleForCertificationCard.tsx → .../StudentsEligibleForCertificationCard.tsx b/.../StudentsEligibleForCertificationCard.tsx → .../StudentsEligibleForCertificationCard.tsx
@@ -1,15 +1,17 @@
 import { Card, Typography } from 'antd';
 import { CourseStatsDto } from 'api';
 import dynamic from 'next/dynamic';
-import { Colors } from '../data';
+import { Colors } from '../../data';
 
 type Props = {
   studentsStats: CourseStatsDto;
 };
 
 const { Text } = Typography;
 
-const LiquidChart = dynamic(() => import('../LiquidChart/LiquidChart'), { ssr: false });
+const LiquidChart = dynamic(() => import('../LiquidChart/LiquidChart'), {
+  ssr: false,
+});
 
 export const StudentsEligibleForCertificationCard = ({ studentsStats }: Props) => {
   return (

diff --git a/...ntsEligibleForCertificationCard/index.tsx → ...ntsEligibleForCertificationCard/index.tsx b/...ntsEligibleForCertificationCard/index.tsx → ...ntsEligibleForCertificationCard/index.tsx
diff --git a/...s/StudentsStatsCard/StudentsStatsCard.tsx → ...s/StudentsStatsCard/StudentsStatsCard.tsx b/...s/StudentsStatsCard/StudentsStatsCard.tsx → ...s/StudentsStatsCard/StudentsStatsCard.tsx
@@ -8,7 +8,9 @@ type Props = {
 
 const { Text } = Typography;
 
-const StudentsStatsChart = dynamic(() => import('../LiquidChart/LiquidChart'), { ssr: false });
+const StudentsStatsChart = dynamic(() => import('../LiquidChart/LiquidChart'), {
+  ssr: false,
+});
 
 export const StudentsStatsCard = ({ studentsStats }: Props) => {
   return (

diff --git a/...rd/components/StudentsStatsCard/index.tsx → ...cs/components/StudentsStatsCard/index.tsx b/...rd/components/StudentsStatsCard/index.tsx → ...cs/components/StudentsStatsCard/index.tsx
diff --git a/...icateCard/StudentsWithCertificateCard.tsx → ...icateCard/StudentsWithCertificateCard.tsx b/...icateCard/StudentsWithCertificateCard.tsx → ...icateCard/StudentsWithCertificateCard.tsx
@@ -1,15 +1,17 @@
 import { Card, Typography } from 'antd';
 import { CourseStatsDto } from 'api';
 import dynamic from 'next/dynamic';
-import { Colors } from '../data';
+import { Colors } from '../../data';
 
 type Props = {
   studentsStats: CourseStatsDto;
 };
 
 const { Text } = Typography;
 
-const LiquidChart = dynamic(() => import('../LiquidChart/LiquidChart'), { ssr: false });
+const LiquidChart = dynamic(() => import('../LiquidChart/LiquidChart'), {
+  ssr: false,
+});
 
 export const StudentsWithCertificateCard = ({ studentsStats }: Props) => {
   return (

diff --git a/...nts/StudentsWithCertificateCard/index.tsx → ...nts/StudentsWithCertificateCard/index.tsx b/...nts/StudentsWithCertificateCard/index.tsx → ...nts/StudentsWithCertificateCard/index.tsx
diff --git a/...thMentorsCard/StudentsWithMentorsCard.tsx → ...thMentorsCard/StudentsWithMentorsCard.tsx b/...thMentorsCard/StudentsWithMentorsCard.tsx → ...thMentorsCard/StudentsWithMentorsCard.tsx
@@ -1,15 +1,17 @@
 import { Card, Typography } from 'antd';
 import { CourseStatsDto } from 'api';
 import dynamic from 'next/dynamic';
-import { Colors } from '../data';
+import { Colors } from '../../data';
 
 type Props = {
   studentsStats: CourseStatsDto;
 };
 
 const { Text } = Typography;
 
-const LiquidChart = dynamic(() => import('../LiquidChart/LiquidChart'), { ssr: false });
+const LiquidChart = dynamic(() => import('../LiquidChart/LiquidChart'), {
+  ssr: false,
+});
 
 export const StudentsWithMentorsCard = ({ studentsStats }: Props) => {
   return (

diff --git a/...ponents/StudentsWithMentorsCard/index.tsx → ...ponents/StudentsWithMentorsCard/index.tsx b/...ponents/StudentsWithMentorsCard/index.tsx → ...ponents/StudentsWithMentorsCard/index.tsx
diff --git a/...skPerformanceCard/TaskPerformanceCard.tsx → ...skPerformanceCard/TaskPerformanceCard.tsx b/...skPerformanceCard/TaskPerformanceCard.tsx → ...skPerformanceCard/TaskPerformanceCard.tsx
@@ -5,7 +5,7 @@ import { useActiveCourseContext } from 'modules/Course/contexts';
 import dynamic from 'next/dynamic';
 import { useState } from 'react';
 import { useAsync } from 'react-use';
-import { Colors } from '../data';
+import { Colors } from '../../data';
 
 const courseStatsApi = new CourseStatsApi();
 

diff --git a/.../components/TaskPerformanceCard/index.tsx → .../components/TaskPerformanceCard/index.tsx b/.../components/TaskPerformanceCard/index.tsx → .../components/TaskPerformanceCard/index.tsx
diff --git a/...modules/AdminDashboard/components/data.ts → client/src/modules/CourseStatistics/data.ts b/...modules/AdminDashboard/components/data.ts → client/src/modules/CourseStatistics/data.ts
diff --git a/...src/modules/AdminDashboard/hooks/index.ts → ...c/modules/CourseStatistics/hooks/index.ts b/...src/modules/AdminDashboard/hooks/index.ts → ...c/modules/CourseStatistics/hooks/index.ts
diff --git a/...d/hooks/useCourseStats/useCourseStats.tsx → ...s/hooks/useCourseStats/useCourseStats.tsx b/...d/hooks/useCourseStats/useCourseStats.tsx → ...s/hooks/useCourseStats/useCourseStats.tsx
diff --git a/client/src/modules/CourseStatistics/index.tsx b/client/src/modules/CourseStatistics/index.tsx
@@ -0,0 +1 @@
+export { default as CourseStatistics } from './pages/CourseStatistics';
diff --git a/...s/AdminDashboard/pages/AdminDashboard.tsx → ...urseStatistics/pages/CourseStatistics.tsx b/...s/AdminDashboard/pages/AdminDashboard.tsx → ...urseStatistics/pages/CourseStatistics.tsx
@@ -1,4 +1,4 @@
-import { AdminPageLayout } from 'components/PageLayout';
+import { PageLayout } from 'components/PageLayout';
 import { useActiveCourseContext } from 'modules/Course/contexts';
 import Masonry from 'react-masonry-css';
 import { StudentsCountriesCard } from '../components/StudentsCountriesCard';
@@ -14,8 +14,8 @@ import { TaskPerformanceCard } from '../components/TaskPerformanceCard';
 
 const gapSize = 24;
 
-function AdminDashboard() {
-  const { course, courses } = useActiveCourseContext();
+function CourseStatistic() {
+  const { course } = useActiveCourseContext();
   const { loading, value: stats } = useCourseStats(course.id);
 
   const masonryBreakPoints = {
@@ -73,13 +73,7 @@ function AdminDashboard() {
   ].filter(Boolean);
 
   return (
-    <AdminPageLayout
-      courses={courses}
-      styles={{ background: '#e5e5e5' }}
-      loading={loading}
-      title="Dashboard"
-      showCourseName
-    >
+    <PageLayout loading={loading} title="Course Statistics" showCourseName background="#F0F2F5">
       <Masonry
         breakpointCols={masonryBreakPoints}
         className={masonryClassName}
@@ -93,7 +87,7 @@ function AdminDashboard() {
       </Masonry>
       {masonryStyles}
       {masonryColumnStyles}
-    </AdminPageLayout>
+    </PageLayout>
   );
 }
 
@@ -112,4 +106,4 @@ const { className: masonryColumnClassName, styles: masonryColumnStyles } = css.r
   }
 `;
 
-export default AdminDashboard;
+export default CourseStatistic;
diff --git a/client/src/modules/Home/data/links.tsx b/client/src/modules/Home/data/links.tsx
@@ -138,6 +138,12 @@ const links: LinkData[] = [
     access: some(isCourseManager, isActiveStudent, isDementor),
     courseAccess: everyCourse(isCourseNotCompleted),
   },
+  {
+    name: 'Course Statistics',
+    icon: <AppstoreOutlined />,
+    getUrl: (course: Course) => `/course/stats?course=${course.alias}`,
+    access: anyAccess,
+  },
 ];
 
 export function getCourseLinks(session: Session, activeCourse: Course | null): LinkRenderData[] {

diff --git a/client/src/pages/course/admin/dashboard.tsx b/client/src/pages/course/admin/dashboard.tsx
diff --git a/client/src/pages/course/stats.tsx b/client/src/pages/course/stats.tsx
@@ -0,0 +1,14 @@
+import { CourseStatistics } from 'modules/CourseStatistics';
+import { ActiveCourseProvider, SessionProvider } from 'modules/Course/contexts';
+
+function Page() {
+  return (
+    <ActiveCourseProvider>
+      <SessionProvider>
+        <CourseStatistics />
+      </SessionProvider>
+    </ActiveCourseProvider>
+  );
+}
+
+export default Page;
diff --git a/nestjs/src/courses/stats/course-stats.controller.ts b/nestjs/src/courses/stats/course-stats.controller.ts
@@ -10,12 +10,11 @@ import {
 } from '@nestjs/common';
 import { CacheInterceptor, CacheTTL } from '@nestjs/cache-manager';
 import { ApiBadRequestResponse, ApiOkResponse, ApiOperation, ApiTags } from '@nestjs/swagger';
-import { CurrentRequest, DefaultGuard, RequiredRoles, Role, RoleGuard } from '../../auth';
+import { CourseGuard, CurrentRequest, DefaultGuard } from '../../auth';
 import { ONE_HOUR_CACHE_TTL } from '../../constants';
 import { CourseAccessService } from '../course-access.service';
 import { CourseStatsService } from './course-stats.service';
 import { CourseStatsDto, CountriesStatsDto, CourseMentorsStatsDto, TaskPerformanceStatsDto } from './dto';
-import { CourseRole } from '@entities/index';
 
 @Controller('courses/:courseId/stats')
 @ApiTags('course stats')
@@ -42,11 +41,10 @@ export class CourseStatsController {
   @Get('/mentors')
   @CacheTTL(ONE_HOUR_CACHE_TTL)
   @UseInterceptors(CacheInterceptor)
-  @UseGuards(RoleGuard)
+  @UseGuards(DefaultGuard, CourseGuard)
   @ApiOperation({ operationId: 'getCourseMentors' })
   @ApiOkResponse({ type: CourseMentorsStatsDto })
   @ApiBadRequestResponse()
-  @RequiredRoles([CourseRole.Manager, CourseRole.Supervisor, Role.Admin, CourseRole.Dementor], true)
   public async getMentors(@Param('courseId', ParseIntPipe) courseId: number) {
     const data = await this.courseStatsService.getMentors(courseId);
     return new CourseMentorsStatsDto(data);
@@ -55,11 +53,10 @@ export class CourseStatsController {
   @Get('/mentors/countries')
   @CacheTTL(ONE_HOUR_CACHE_TTL)
   @UseInterceptors(CacheInterceptor)
-  @UseGuards(RoleGuard)
+  @UseGuards(DefaultGuard, CourseGuard)
   @ApiOperation({ operationId: 'getCourseMentorCountries' })
   @ApiOkResponse({ type: CountriesStatsDto })
   @ApiBadRequestResponse()
-  @RequiredRoles([CourseRole.Manager, CourseRole.Supervisor, Role.Admin, CourseRole.Dementor], true)
   public async getMentorCountries(@Param('courseId', ParseIntPipe) courseId: number): Promise<CountriesStatsDto> {
     const data = await this.courseStatsService.getMentorCountries(courseId);
     return data;
@@ -68,11 +65,10 @@ export class CourseStatsController {
   @Get('/students/countries')
   @CacheTTL(ONE_HOUR_CACHE_TTL)
   @UseInterceptors(CacheInterceptor)
-  @UseGuards(RoleGuard)
+  @UseGuards(DefaultGuard, CourseGuard)
   @ApiOperation({ operationId: 'getCourseStudentCountries' })
   @ApiOkResponse({ type: CountriesStatsDto })
   @ApiBadRequestResponse()
-  @RequiredRoles([CourseRole.Manager, CourseRole.Supervisor, Role.Admin, CourseRole.Dementor], true)
   public async getStudentCountries(@Param('courseId', ParseIntPipe) courseId: number): Promise<CountriesStatsDto> {
     const data = await this.courseStatsService.getStudentCountries(courseId);
     return data;
@@ -81,11 +77,10 @@ export class CourseStatsController {
   @Get('/task/:taskId/performance')
   @CacheTTL(ONE_HOUR_CACHE_TTL)
   @UseInterceptors(CacheInterceptor)
-  @UseGuards(RoleGuard)
+  @UseGuards(DefaultGuard, CourseGuard)
   @ApiOperation({ operationId: 'getTaskPerformance' })
   @ApiOkResponse({ type: TaskPerformanceStatsDto })
   @ApiBadRequestResponse()
-  @RequiredRoles([CourseRole.Manager, CourseRole.Supervisor, Role.Admin, CourseRole.Dementor], true)
   public async getTaskPerformance(
     @Param('courseId', ParseIntPipe) _courseId: number,
     @Param('taskId', ParseIntPipe) taskId: number,