fix: add default value for githubId and name fields and fix reset bug (…

…#2389)
rolling-scopes · Dec 19, 2023 · 2d77c56 · 2d77c56
1 parent 44264ea
commit 2d77c56
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/client/src/modules/Score/components/ScoreTable/index.tsx b/client/src/modules/Score/components/ScoreTable/index.tsx
@@ -108,6 +108,8 @@ export function ScoreTable(props: Props) {
       setCourseTasks(sortedTasks);
       setColumns(
         getColumns({
+          githubId,
+          name,
           cityName,
           mentor,
           handleSettings: () => setIsVisibleSettings(true),

diff --git a/client/src/modules/Score/data/getColumns.tsx b/client/src/modules/Score/data/getColumns.tsx
@@ -8,6 +8,8 @@ import Link from 'next/link';
 
 type Props = {
   taskColumns: Record<string, any>[];
+  githubId?: string | string[];
+  name?: string | string[];
   cityName?: string | string[];
   mentor?: string | string[];
   handleSettings: () => void;
@@ -19,7 +21,7 @@ const getSearchProps = (key: string) => ({
 });
 
 export function getColumns(props: Props): ColumnType<ScoreStudentDto>[] {
-  const { cityName, mentor, handleSettings, taskColumns } = props;
+  const { githubId, name, cityName, mentor, handleSettings, taskColumns } = props;
 
   return [
     {
@@ -37,6 +39,7 @@ export function getColumns(props: Props): ColumnType<ScoreStudentDto>[] {
       key: 'githubId',
       dataIndex: 'githubId',
       sorter: 'githubId',
+      defaultFilteredValue: githubId ? (isArray(githubId) ? githubId : [githubId]) : undefined,
       width: 150,
       render: (value: string) => (
         <div>
@@ -54,6 +57,7 @@ export function getColumns(props: Props): ColumnType<ScoreStudentDto>[] {
       dataIndex: 'name',
       width: 150,
       sorter: 'name',
+      defaultFilteredValue: name ? (isArray(name) ? name : [name]) : undefined,
       render: (value, record) => (
         <Link prefetch={false} href={`/profile?githubId=${record.githubId}`}>
           {value}

diff --git a/client/src/modules/Score/hooks/useScorePaging.tsx b/client/src/modules/Score/hooks/useScorePaging.tsx
@@ -8,7 +8,7 @@ import { ScoreOrder, ScoreTableFilters } from './types';
 
 export function useScorePaging(router: NextRouter, courseService: CourseService, activeOnly: boolean) {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  const { ['mentor.githubId']: mentor, cityName, ...currentQuery } = router.query;
+  const { githubId, name, ['mentor.githubId']: mentor, cityName, ...currentQuery } = router.query;
 
   const setQueryParams = useCallback(
     (query: ParsedUrlQuery) => {