Remove team formation from workspace slice

The filters never belonged there in the first place as it is not a workspace. The functionality is not restored as we will be moving back to AG Grid for tables.
source-academy · Mar 26, 2024 · f8e4ba9 · f8e4ba9
1 parent a8da641
commit f8e4ba9
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 63 deletions.
diff --git a/src/commons/application/ApplicationTypes.ts b/src/commons/application/ApplicationTypes.ts
@@ -405,13 +405,6 @@ export const defaultWorkspaceManager: WorkspaceManagerState = {
     currentQuestion: undefined,
     hasUnsavedChanges: false
   },
-  teamFormation: {
-    ...createDefaultWorkspace('teamFormation'),
-    teamFormationTableFilters: {
-      columnFilters: [],
-      globalFilter: null
-    }
-  },
   playground: {
     ...createDefaultWorkspace('playground'),
     usingSubst: false,
@@ -548,7 +541,6 @@ export const defaultSideContentManager: SideContentManagerState = {
   assessment: defaultSideContent,
   grading: defaultSideContent,
   playground: defaultSideContent,
-  teamFormation: defaultSideContent,
   sicp: defaultSideContent,
   sourcecast: defaultSideContent,
   sourcereel: defaultSideContent,

diff --git a/src/commons/workspace/WorkspaceActions.ts b/src/commons/workspace/WorkspaceActions.ts
@@ -50,7 +50,6 @@ import {
   SET_TOKEN_COUNT,
   SHIFT_EDITOR_TAB,
   SubmissionsTableFilters,
-  TeamFormationsTableFilters,
   TOGGLE_EDITOR_AUTORUN,
   TOGGLE_FOLDER_MODE,
   TOGGLE_UPDATE_CSE,
@@ -71,7 +70,6 @@ import {
   UPDATE_STEPSTOTAL,
   UPDATE_SUBLANGUAGE,
   UPDATE_SUBMISSIONS_TABLE_FILTERS,
-  UPDATE_TEAM_FORMATIONS_TABLE_FILTERS,
   UPDATE_WORKSPACE,
   WorkspaceLocation,
   WorkspaceLocationsWithTools,
@@ -402,11 +400,6 @@ export const updateSubmissionsTableFilters = createAction(
   (filters: SubmissionsTableFilters) => ({ payload: { filters } })
 );
 
-export const updateTeamFormationsTableFilters = createAction(
-  UPDATE_TEAM_FORMATIONS_TABLE_FILTERS,
-  (filters: TeamFormationsTableFilters) => ({ payload: { filters } })
-);
-
 export const updateCurrentAssessmentId = createAction(
   UPDATE_CURRENT_ASSESSMENT_ID,
   (assessmentId: number, questionId: number) => ({ payload: { assessmentId, questionId } })

diff --git a/src/commons/workspace/WorkspaceReducer.ts b/src/commons/workspace/WorkspaceReducer.ts
@@ -89,7 +89,6 @@ import {
   UPDATE_STEPSTOTAL,
   UPDATE_SUBLANGUAGE,
   UPDATE_SUBMISSIONS_TABLE_FILTERS,
-  UPDATE_TEAM_FORMATIONS_TABLE_FILTERS,
   UPDATE_WORKSPACE,
   WorkspaceLocation,
   WorkspaceManagerState
@@ -627,14 +626,6 @@ const oldWorkspaceReducer: Reducer<WorkspaceManagerState, SourceActionType> = (
           submissionsTableFilters: action.payload.filters
         }
       };
-    case UPDATE_TEAM_FORMATIONS_TABLE_FILTERS:
-      return {
-        ...state,
-        teamFormation: {
-          ...state.teamFormation,
-          teamFormationTableFilters: action.payload.filters
-        }
-      };
     case UPDATE_CURRENT_ASSESSMENT_ID:
       return {
         ...state,

diff --git a/src/commons/workspace/WorkspaceTypes.ts b/src/commons/workspace/WorkspaceTypes.ts
@@ -39,7 +39,6 @@ export const TOGGLE_USING_SUBST = 'TOGGLE_USING_SUBST';
 export const TOGGLE_USING_CSE = 'TOGGLE_USING_CSE';
 export const TOGGLE_UPDATE_CSE = 'TOGGLE_UPDATE_CSE';
 export const UPDATE_SUBMISSIONS_TABLE_FILTERS = 'UPDATE_SUBMISSIONS_TABLE_FILTERS';
-export const UPDATE_TEAM_FORMATIONS_TABLE_FILTERS = 'UPDATE_TEAM_FORMATIONS_TABLE_FILTERS';
 export const UPDATE_CURRENT_ASSESSMENT_ID = 'UPDATE_CURRENT_ASSESSMENT_ID';
 export const UPDATE_CURRENT_SUBMISSION_ID = 'UPDATE_CURRENT_SUBMISSION_ID';
 export const TOGGLE_FOLDER_MODE = 'TOGGLE_FOLDER_MODE';
@@ -83,14 +82,8 @@ type GradingWorkspaceAttr = {
   readonly hasUnsavedChanges: boolean;
 };
 
-type TeamFormationWorkspaceAttr = {
-  readonly teamFormationTableFilters: TeamFormationsTableFilters;
-};
-
 type GradingWorkspaceState = GradingWorkspaceAttr & WorkspaceState;
 
-type TeamFormationWorkspaceState = TeamFormationWorkspaceAttr & WorkspaceState;
-
 type PlaygroundWorkspaceAttr = {
   readonly usingSubst: boolean;
   readonly usingCse: boolean;
@@ -106,7 +99,6 @@ export type SicpWorkspaceState = PlaygroundWorkspaceState;
 export type WorkspaceManagerState = {
   readonly assessment: AssessmentWorkspaceState;
   readonly grading: GradingWorkspaceState;
-  readonly teamFormation: TeamFormationWorkspaceState;
   readonly playground: PlaygroundWorkspaceState;
   readonly sourcecast: SourcecastWorkspaceState;
   readonly sourcereel: SourcereelWorkspaceState;

diff --git a/src/commons/workspace/__tests__/WorkspaceReducer.ts b/src/commons/workspace/__tests__/WorkspaceReducer.ts
@@ -116,10 +116,6 @@ function generateDefaultWorkspace(payload: any = {}): WorkspaceManagerState {
     stories: {
       ...defaultWorkspaceManager.stories,
       ...cloneDeep(payload)
-    },
-    teamFormation: {
-      ...defaultWorkspaceManager.teamFormation,
-      ...cloneDeep(payload)
     }
   };
 }

diff --git a/src/pages/academy/teamFormation/subcomponents/TeamFormationTable.tsx b/src/pages/academy/teamFormation/subcomponents/TeamFormationTable.tsx
@@ -27,11 +27,7 @@ import {
   Text,
   TextInput
 } from '@tremor/react';
-import React from 'react';
-import { useEffect, useState } from 'react';
-import { useDispatch } from 'react-redux';
-import { useTypedSelector } from 'src/commons/utils/Hooks';
-import { updateTeamFormationsTableFilters } from 'src/commons/workspace/WorkspaceActions';
+import React, { useState } from 'react';
 import { TeamFormationOverview } from 'src/features/teamFormation/TeamFormationTypes';
 
 import { AssessmentTypeBadge } from '../../teamFormation/subcomponents/TeamFormationBadges';
@@ -85,25 +81,16 @@ type TeamFormationTableProps = {
 };
 
 const TeamFormationTable: React.FC<TeamFormationTableProps> = ({ group, teams }) => {
-  const dispatch = useDispatch();
-  const tableFilters = useTypedSelector(
-    state => state.workspaces.teamFormation.teamFormationTableFilters
-  );
-
   const defaultFilters = [];
-  if (group && !tableFilters.columnFilters.find(filter => filter.id === 'groupName')) {
+  if (group) {
     defaultFilters.push({
       id: 'groupName',
       value: group
     });
   }
 
-  const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([
-    ...tableFilters.columnFilters,
-    ...defaultFilters
-  ]);
-
-  const [globalFilter, setGlobalFilter] = useState<string | null>(tableFilters.globalFilter);
+  const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([...defaultFilters]);
+  const [globalFilter, setGlobalFilter] = useState<string | null>(null);
 
   const globalFilterFn = (
     row: Row<TeamFormationOverview>,
@@ -147,15 +134,6 @@ const TeamFormationTable: React.FC<TeamFormationTableProps> = ({ group, teams })
     setColumnFilters(newFilters);
   };
 
-  useEffect(() => {
-    dispatch(
-      updateTeamFormationsTableFilters({
-        columnFilters,
-        globalFilter
-      })
-    );
-  }, [columnFilters, globalFilter, dispatch]);
-
   return (
     <>
       <Flex marginTop="mt-2" justifyContent="justify-between" alignItems="items-center">

diff --git a/src/pages/fileSystem/createInBrowserFileSystem.ts b/src/pages/fileSystem/createInBrowserFileSystem.ts
@@ -16,7 +16,6 @@ import { EditorTabState, WorkspaceManagerState } from '../../commons/workspace/W
 export const WORKSPACE_BASE_PATHS: Record<keyof WorkspaceManagerState, string> = {
   assessment: '',
   grading: '',
-  teamFormation: '',
   playground: '/playground',
   sicp: '/sicp',
   sourcecast: '',