Skip to content

Commit 5b4803f

Browse files
committed
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.
1 parent 96b25a0 commit 5b4803f

File tree

7 files changed

+4
-63
lines changed

7 files changed

+4
-63
lines changed

src/commons/application/ApplicationTypes.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -409,13 +409,6 @@ export const defaultWorkspaceManager: WorkspaceManagerState = {
409409
currentQuestion: undefined,
410410
hasUnsavedChanges: false
411411
},
412-
teamFormation: {
413-
...createDefaultWorkspace('teamFormation'),
414-
teamFormationTableFilters: {
415-
columnFilters: [],
416-
globalFilter: null
417-
}
418-
},
419412
playground: {
420413
...createDefaultWorkspace('playground'),
421414
usingSubst: false,
@@ -556,7 +549,6 @@ export const defaultSideContentManager: SideContentManagerState = {
556549
assessment: defaultSideContent,
557550
grading: defaultSideContent,
558551
playground: defaultSideContent,
559-
teamFormation: defaultSideContent,
560552
sicp: defaultSideContent,
561553
sourcecast: defaultSideContent,
562554
sourcereel: defaultSideContent,

src/commons/workspace/WorkspaceActions.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ import {
5050
SET_TOKEN_COUNT,
5151
SHIFT_EDITOR_TAB,
5252
SubmissionsTableFilters,
53-
TeamFormationsTableFilters,
5453
TOGGLE_EDITOR_AUTORUN,
5554
TOGGLE_FOLDER_MODE,
5655
TOGGLE_UPDATE_CSE,
@@ -71,7 +70,6 @@ import {
7170
UPDATE_STEPSTOTAL,
7271
UPDATE_SUBLANGUAGE,
7372
UPDATE_SUBMISSIONS_TABLE_FILTERS,
74-
UPDATE_TEAM_FORMATIONS_TABLE_FILTERS,
7573
UPDATE_WORKSPACE,
7674
WorkspaceLocation,
7775
WorkspaceLocationsWithTools,
@@ -402,11 +400,6 @@ export const updateSubmissionsTableFilters = createAction(
402400
(filters: SubmissionsTableFilters) => ({ payload: { filters } })
403401
);
404402

405-
export const updateTeamFormationsTableFilters = createAction(
406-
UPDATE_TEAM_FORMATIONS_TABLE_FILTERS,
407-
(filters: TeamFormationsTableFilters) => ({ payload: { filters } })
408-
);
409-
410403
export const updateCurrentAssessmentId = createAction(
411404
UPDATE_CURRENT_ASSESSMENT_ID,
412405
(assessmentId: number, questionId: number) => ({ payload: { assessmentId, questionId } })

src/commons/workspace/WorkspaceReducer.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ import {
8989
UPDATE_STEPSTOTAL,
9090
UPDATE_SUBLANGUAGE,
9191
UPDATE_SUBMISSIONS_TABLE_FILTERS,
92-
UPDATE_TEAM_FORMATIONS_TABLE_FILTERS,
9392
UPDATE_WORKSPACE,
9493
WorkspaceLocation,
9594
WorkspaceManagerState
@@ -627,14 +626,6 @@ const oldWorkspaceReducer: Reducer<WorkspaceManagerState, SourceActionType> = (
627626
submissionsTableFilters: action.payload.filters
628627
}
629628
};
630-
case UPDATE_TEAM_FORMATIONS_TABLE_FILTERS:
631-
return {
632-
...state,
633-
teamFormation: {
634-
...state.teamFormation,
635-
teamFormationTableFilters: action.payload.filters
636-
}
637-
};
638629
case UPDATE_CURRENT_ASSESSMENT_ID:
639630
return {
640631
...state,

src/commons/workspace/WorkspaceTypes.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ export const TOGGLE_USING_SUBST = 'TOGGLE_USING_SUBST';
4040
export const TOGGLE_USING_CSE = 'TOGGLE_USING_CSE';
4141
export const TOGGLE_UPDATE_CSE = 'TOGGLE_UPDATE_CSE';
4242
export const UPDATE_SUBMISSIONS_TABLE_FILTERS = 'UPDATE_SUBMISSIONS_TABLE_FILTERS';
43-
export const UPDATE_TEAM_FORMATIONS_TABLE_FILTERS = 'UPDATE_TEAM_FORMATIONS_TABLE_FILTERS';
4443
export const UPDATE_CURRENT_ASSESSMENT_ID = 'UPDATE_CURRENT_ASSESSMENT_ID';
4544
export const UPDATE_CURRENT_SUBMISSION_ID = 'UPDATE_CURRENT_SUBMISSION_ID';
4645
export const TOGGLE_FOLDER_MODE = 'TOGGLE_FOLDER_MODE';
@@ -84,14 +83,8 @@ type GradingWorkspaceAttr = {
8483
readonly hasUnsavedChanges: boolean;
8584
};
8685

87-
type TeamFormationWorkspaceAttr = {
88-
readonly teamFormationTableFilters: TeamFormationsTableFilters;
89-
};
90-
9186
type GradingWorkspaceState = GradingWorkspaceAttr & WorkspaceState;
9287

93-
type TeamFormationWorkspaceState = TeamFormationWorkspaceAttr & WorkspaceState;
94-
9588
type PlaygroundWorkspaceAttr = {
9689
readonly usingSubst: boolean;
9790
readonly usingCse: boolean;
@@ -107,7 +100,6 @@ export type SicpWorkspaceState = PlaygroundWorkspaceState;
107100
export type WorkspaceManagerState = {
108101
readonly assessment: AssessmentWorkspaceState;
109102
readonly grading: GradingWorkspaceState;
110-
readonly teamFormation: TeamFormationWorkspaceState;
111103
readonly playground: PlaygroundWorkspaceState;
112104
readonly sourcecast: SourcecastWorkspaceState;
113105
readonly sourcereel: SourcereelWorkspaceState;

src/commons/workspace/__tests__/WorkspaceReducer.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,6 @@ function generateDefaultWorkspace(payload: any = {}): WorkspaceManagerState {
116116
stories: {
117117
...defaultWorkspaceManager.stories,
118118
...cloneDeep(payload)
119-
},
120-
teamFormation: {
121-
...defaultWorkspaceManager.teamFormation,
122-
...cloneDeep(payload)
123119
}
124120
};
125121
}

src/pages/academy/teamFormation/subcomponents/TeamFormationTable.tsx

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,7 @@ import {
2727
Text,
2828
TextInput
2929
} from '@tremor/react';
30-
import React from 'react';
31-
import { useEffect, useState } from 'react';
32-
import { useDispatch } from 'react-redux';
33-
import { useTypedSelector } from 'src/commons/utils/Hooks';
34-
import { updateTeamFormationsTableFilters } from 'src/commons/workspace/WorkspaceActions';
30+
import React, { useState } from 'react';
3531
import { TeamFormationOverview } from 'src/features/teamFormation/TeamFormationTypes';
3632

3733
import { AssessmentTypeBadge } from '../../teamFormation/subcomponents/TeamFormationBadges';
@@ -85,25 +81,16 @@ type TeamFormationTableProps = {
8581
};
8682

8783
const TeamFormationTable: React.FC<TeamFormationTableProps> = ({ group, teams }) => {
88-
const dispatch = useDispatch();
89-
const tableFilters = useTypedSelector(
90-
state => state.workspaces.teamFormation.teamFormationTableFilters
91-
);
92-
9384
const defaultFilters = [];
94-
if (group && !tableFilters.columnFilters.find(filter => filter.id === 'groupName')) {
85+
if (group) {
9586
defaultFilters.push({
9687
id: 'groupName',
9788
value: group
9889
});
9990
}
10091

101-
const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([
102-
...tableFilters.columnFilters,
103-
...defaultFilters
104-
]);
105-
106-
const [globalFilter, setGlobalFilter] = useState<string | null>(tableFilters.globalFilter);
92+
const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([...defaultFilters]);
93+
const [globalFilter, setGlobalFilter] = useState<string | null>(null);
10794

10895
const globalFilterFn = (
10996
row: Row<TeamFormationOverview>,
@@ -147,15 +134,6 @@ const TeamFormationTable: React.FC<TeamFormationTableProps> = ({ group, teams })
147134
setColumnFilters(newFilters);
148135
};
149136

150-
useEffect(() => {
151-
dispatch(
152-
updateTeamFormationsTableFilters({
153-
columnFilters,
154-
globalFilter
155-
})
156-
);
157-
}, [columnFilters, globalFilter, dispatch]);
158-
159137
return (
160138
<>
161139
<Flex marginTop="mt-2" justifyContent="justify-between" alignItems="items-center">

src/pages/fileSystem/createInBrowserFileSystem.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import { EditorTabState, WorkspaceManagerState } from '../../commons/workspace/W
1616
export const WORKSPACE_BASE_PATHS: Record<keyof WorkspaceManagerState, string> = {
1717
assessment: '',
1818
grading: '',
19-
teamFormation: '',
2019
playground: '/playground',
2120
sicp: '/sicp',
2221
sourcecast: '',

0 commit comments

Comments
 (0)