Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up team assessments #2875

Merged
merged 8 commits into from
Mar 26, 2024
Merged

Clean up team assessments #2875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e1e6db0
Migrate Ground Control back to AG-Grid
RichDom2185 Mar 25, 2024
dde3d60
Delete unused component
RichDom2185 Mar 25, 2024
549f44f
Use selectors for Ground Control state
RichDom2185 Mar 25, 2024
a51641f
Remove ground control from file system
RichDom2185 Mar 25, 2024
c8f498f
Remove unnecessary styles
RichDom2185 Mar 25, 2024
f44df07
Remove remaining traces of old Ground Control
RichDom2185 Mar 25, 2024
a8da641
Fix format
RichDom2185 Mar 25, 2024
f8e4ba9
Remove team formation from workspace slice
RichDom2185 Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions src/commons/application/ApplicationTypes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,19 +405,6 @@ export const defaultWorkspaceManager: WorkspaceManagerState = {
currentQuestion: undefined,
hasUnsavedChanges: false
},
teamFormation: {
...createDefaultWorkspace('teamFormation'),
teamFormationTableFilters: {
columnFilters: [],
globalFilter: null
}
},
groundControl: {
...createDefaultWorkspace('groundControl'),
GroundControlTableFilters: {
columnFilters: []
}
},
playground: {
...createDefaultWorkspace('playground'),
usingSubst: false,
Expand Down Expand Up @@ -554,8 +541,6 @@ export const defaultSideContentManager: SideContentManagerState = {
assessment: defaultSideContent,
grading: defaultSideContent,
playground: defaultSideContent,
groundControl: defaultSideContent,
teamFormation: defaultSideContent,
sicp: defaultSideContent,
sourcecast: defaultSideContent,
sourcereel: defaultSideContent,
Expand Down
14 changes: 0 additions & 14 deletions src/commons/workspace/WorkspaceActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ import {
EVAL_EDITOR_AND_TESTCASES,
EVAL_REPL,
EVAL_TESTCASE,
GroundControlTableFilters,
MOVE_CURSOR,
NAV_DECLARATION,
PLAYGROUND_EXTERNAL_SELECT,
Expand All @@ -51,7 +50,6 @@ import {
SET_TOKEN_COUNT,
SHIFT_EDITOR_TAB,
SubmissionsTableFilters,
TeamFormationsTableFilters,
TOGGLE_EDITOR_AUTORUN,
TOGGLE_FOLDER_MODE,
TOGGLE_UPDATE_CSE,
Expand All @@ -65,15 +63,13 @@ import {
UPDATE_CURRENTSTEP,
UPDATE_EDITOR_BREAKPOINTS,
UPDATE_EDITOR_VALUE,
UPDATE_GROUND_CONTROL_TABLE_FILTERS,
UPDATE_HAS_UNSAVED_CHANGES,
UPDATE_LAST_DEBUGGER_RESULT,
UPDATE_LAST_NON_DET_RESULT,
UPDATE_REPL_VALUE,
UPDATE_STEPSTOTAL,
UPDATE_SUBLANGUAGE,
UPDATE_SUBMISSIONS_TABLE_FILTERS,
UPDATE_TEAM_FORMATIONS_TABLE_FILTERS,
UPDATE_WORKSPACE,
WorkspaceLocation,
WorkspaceLocationsWithTools,
Expand Down Expand Up @@ -404,16 +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 updateGroundControlTableFilters = createAction(
UPDATE_GROUND_CONTROL_TABLE_FILTERS,
(filters: GroundControlTableFilters) => ({ payload: { filters } })
);

export const updateCurrentAssessmentId = createAction(
UPDATE_CURRENT_ASSESSMENT_ID,
(assessmentId: number, questionId: number) => ({ payload: { assessmentId, questionId } })
Expand Down
9 changes: 0 additions & 9 deletions src/commons/workspace/WorkspaceReducer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ import {
UPDATE_STEPSTOTAL,
UPDATE_SUBLANGUAGE,
UPDATE_SUBMISSIONS_TABLE_FILTERS,
UPDATE_TEAM_FORMATIONS_TABLE_FILTERS,
UPDATE_WORKSPACE,
WorkspaceLocation,
WorkspaceManagerState
Expand Down Expand Up @@ -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,
Expand Down
19 changes: 0 additions & 19 deletions src/commons/workspace/WorkspaceTypes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +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_GROUND_CONTROL_TABLE_FILTERS = 'UPDATE_GROUND_CONTROL_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';
Expand Down Expand Up @@ -84,19 +82,8 @@ type GradingWorkspaceAttr = {
readonly hasUnsavedChanges: boolean;
};

type TeamFormationWorkspaceAttr = {
readonly teamFormationTableFilters: TeamFormationsTableFilters;
};

type GradingWorkspaceState = GradingWorkspaceAttr & WorkspaceState;

type TeamFormationWorkspaceState = TeamFormationWorkspaceAttr & WorkspaceState;

type GroundControlWorkspaceAttr = {
readonly GroundControlTableFilters: GroundControlTableFilters;
};
type GroundControlWorkspaceState = GroundControlWorkspaceAttr & WorkspaceState;

type PlaygroundWorkspaceAttr = {
readonly usingSubst: boolean;
readonly usingCse: boolean;
Expand All @@ -112,8 +99,6 @@ export type SicpWorkspaceState = PlaygroundWorkspaceState;
export type WorkspaceManagerState = {
readonly assessment: AssessmentWorkspaceState;
readonly grading: GradingWorkspaceState;
readonly teamFormation: TeamFormationWorkspaceState;
readonly groundControl: GroundControlWorkspaceState;
readonly playground: PlaygroundWorkspaceState;
readonly sourcecast: SourcecastWorkspaceState;
readonly sourcereel: SourcereelWorkspaceState;
Expand Down Expand Up @@ -188,7 +173,3 @@ export type TeamFormationsTableFilters = {
columnFilters: { id: string; value: unknown }[];
globalFilter: string | null;
};

export type GroundControlTableFilters = {
columnFilters: { id: string; value: unknown }[];
};
8 changes: 0 additions & 8 deletions src/commons/workspace/__tests__/WorkspaceReducer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,14 +116,6 @@ function generateDefaultWorkspace(payload: any = {}): WorkspaceManagerState {
stories: {
...defaultWorkspaceManager.stories,
...cloneDeep(payload)
},
teamFormation: {
...defaultWorkspaceManager.teamFormation,
...cloneDeep(payload)
},
groundControl: {
...defaultWorkspaceManager.groundControl,
...cloneDeep(payload)
}
};
}
Expand Down
Loading
Loading