Allow inactive groups in the graders table to be toggled for display

Changelog.md

@@ -18,6 +18,7 @@
 - Ensure starter files are passed to autotester in sorted order (#6771)
 - Resolved issue 6677 by taking timed assessment's duration into account when determining when grading can begin (#6845)
 - Fix loading results page when group is created after the due date (#6863)
+- Allow inactive groups in the graders table to be toggled for display (#6778)
 - Autocomplete with active students only for matching process in 'assign scans' (#6844)
 - Fix member filtering in Groups table (#6842)
 

app/assets/javascripts/Components/__tests__/graders_manager.test.jsx

@@ -0,0 +1,83 @@
+/***
+ * Tests for GradersManager Component
+ */
+
+import {GradersManager} from "../graders_manager";
+import {render, screen, fireEvent} from "@testing-library/react";
+
+jest.mock("@fortawesome/react-fontawesome", () => ({
+ FontAwesomeIcon: () => {
+ return null;
+ },
+}));
+
+describe("For the GradersManager's display of inactive groups", () => {
+ let groups_sample;
+ beforeEach(() => {
+ groups_sample = [
+ {
+ _id: 15,
+ members: [
+ ["c9nielse", "inviter", true],
+ ["c8szyman", "accepted", true],
+ ],
+ inactive: false,
+ grace_credits: 5,
+ remaining_grace_credits: 4,
+ group_name: "group_0015",
+ graders: [],
+ criteria_coverage_count: 0,
+ },
+ {
+ _id: 15,
+ members: [
+ ["d2lifese", "inviter", false],
+ ["a3kjcbod", "accepted", false],
+ ],
+ inactive: false,
+ grace_credits: 5,
+ remaining_grace_credits: 4,
+ group_name: "group_0014",
+ graders: [],
+ criteria_coverage_count: 0,
+ },
+ ];
+ fetch.mockReset();
+ fetch.mockResolvedValueOnce({
+ ok: true,
+ json: jest.fn().mockResolvedValueOnce({
+ graders: [],
+ criteria: [],
+ assign_graders_to_criteria: false,
+ loading: false,
+ sections: {},
+ anonymize_groups: false,
+ hide_unassigned_criteria: false,
+ isGraderDistributionModalOpen: false,
+ groups: groups_sample,
+ }),
+ });
+ render(<GradersManager sections={{}} course_id={1} assignment_id={1} />);
+ });
+
+ it("contains the correct amount of inactive groups in the hidden tooltip", () => {
+ expect(screen.getByTestId("show_hidden_groups_tooltip").getAttribute("title")).toEqual(
+ "1 inactive group"
+ );
+ });
+
+ it("initially contains the active group", () => {
+ expect(screen.getByText("group_0014")).toBeInTheDocument();
+ });
+
+ it("contains the inactive group after a single toggle", () => {
+ fireEvent.click(screen.getByTestId("show_hidden_groups"));
+ expect(screen.getByText("group_0015")).toBeInTheDocument();
+ });
+
+ it("doesn't contain the inactive group after two toggles", () => {
+ fireEvent.click(screen.getByTestId("show_hidden_groups"));
+ fireEvent.click(screen.getByTestId("show_hidden_groups"));
+ expect(screen.queryByText("group_0015")).not.toBeInTheDocument();
+ });
+});

app/assets/javascripts/Components/graders_manager.jsx

@@ -23,7 +23,9 @@ class GradersManager extends React.Component {
  sections: {},
  isGraderDistributionModalOpen: false,
  show_hidden: false,
+ show_hidden_groups: false,
  hidden_graders_count: 0,
+ inactive_groups_count: 0,
  };
  }
 
@@ -66,6 +68,15 @@ class GradersManager extends React.Component {
  if (this.groupsTable) this.groupsTable.resetSelection();
  if (this.criteriaTable) this.criteriaTable.resetSelection();
 
+ let inactive_groups_count = 0;
+ res.groups.forEach(group => {
+ if (group.members.length && group.members.every(member => member[2])) {
+ group.inactive = true;
+ inactive_groups_count += 1;
+ } else {
+ group.inactive = false;
+ }
+ });
  this.setState({
  graders: res.graders,
  groups: res.groups,
@@ -77,6 +88,7 @@ class GradersManager extends React.Component {
  hide_unassigned_criteria: res.hide_unassigned_criteria,
  isGraderDistributionModalOpen: false,
  hidden_graders_count: res.graders.filter(grader => grader.hidden).length,
+ inactive_groups_count: inactive_groups_count,
  });
  });
  };
@@ -282,6 +294,11 @@ class GradersManager extends React.Component {
  this.setState({show_hidden});
  };
 
+ toggleShowHiddenGroups = event => {
+ let show_hidden_groups = event.target.checked;
+ this.setState({show_hidden_groups});
+ };
+
  render() {
  return (
  <div>
@@ -290,8 +307,11 @@ class GradersManager extends React.Component {
  openGraderDistributionModal={this.openGraderDistributionModal}
  unassignAll={this.unassignAll}
  showHidden={this.state.show_hidden}
+ showHiddenGroups={this.state.show_hidden_groups}
  updateShowHidden={this.toggleShowHidden}
+ updateShowHiddenGroups={this.toggleShowHiddenGroups}
  hiddenGradersCount={this.state.loading ? null : this.state.hidden_graders_count}
+ hiddenGroupsCount={this.state.loading ? null : this.state.inactive_groups_count}
  />
  <div className="mapping-tables">
  <div className="mapping-table">
@@ -346,6 +366,7 @@ class GradersManager extends React.Component {
  sections={this.state.sections}
  numCriteria={this.state.criteria.length}
  showCoverage={this.state.assign_graders_to_criteria}
+ showInactive={this.state.show_hidden_groups}
  />
  </TabPanel>
  <TabPanel>
@@ -509,6 +530,14 @@ class RawGroupsTable extends React.Component {
 
  getColumns = () => {
  return [
+ {
+ accessor: "inactive",
+ id: "inactive",
+ width: 0,
+ className: "rt-hidden",
+ headerClassName: "rt-hidden",
+ resizable: false,
+ },
  {
  show: false,
  accessor: "_id",
@@ -582,6 +611,19 @@ class RawGroupsTable extends React.Component {
  ];
  };
 
+ static getDerivedStateFromProps(props, state) {
+ let filtered = state.filtered.filter(group => group.id !== "inactive");
+
+ if (!props.showInactive) {
+ filtered.push({id: "inactive", value: false});
+ }
+ return {filtered};
+ }
+
+ onFilteredChange = filtered => {
+ this.setState({filtered});
+ };
+
  render() {
  return (
  <CheckboxTable
@@ -595,6 +637,8 @@ class RawGroupsTable extends React.Component {
  ]}
  loading={this.props.loading}
  filterable
+ filtered={this.state.filtered}
+ onFilteredChange={this.onFilteredChange}
  {...this.props.getCheckboxProps()}
  />
  );
@@ -682,11 +726,15 @@ const CriteriaTable = withSelection(RawCriteriaTable);
 
 class GradersActionBox extends React.Component {
  render = () => {
- let showHiddenTooltip = "";
- if (this.props.hiddenGradersCount !== null) {
- showHiddenTooltip = I18n.t("graders.inactive_graders_count", {
- count: this.props.hiddenGradersCount || 0,
- });
+ let showHiddenGraderTooltip = "";
+ let showHiddenGroupsTooltip = "";
+ if (this.props.hiddenGradersCount !== null && this.props.hiddenGroupsCount !== null) {
+ showHiddenGraderTooltip = `${I18n.t("graders.inactive_graders_count", {
+ count: this.props.hiddenGradersCount,
+ })}`;
+ showHiddenGroupsTooltip = `${I18n.t("activerecord.attributes.grouping.inactive_groups", {
+ count: this.props.hiddenGroupsCount,
+ })}`;
  }
 
  return (
@@ -700,10 +748,28 @@ class GradersActionBox extends React.Component {
  onChange={this.props.updateShowHidden}
  className={"hide-user-checkbox"}
  />
- <label title={showHiddenTooltip} htmlFor="show_hidden">
+ <label title={showHiddenGraderTooltip} htmlFor="show_hidden">
  {I18n.t("tas.display_inactive")}
  </label>
  </span>
+ <span>
+ <input
+ id="show_hidden_groups"
+ name="show_hidden_groups"
+ type="checkbox"
+ checked={this.props.showHiddenGroups}
+ onChange={this.props.updateShowHiddenGroups}
+ className={"hide-user-checkbox"}
+ data-testid={"show_hidden_groups"}
+ />
+ <label
+ title={showHiddenGroupsTooltip}
+ htmlFor="show_hidden_groups"
+ data-testid={"show_hidden_groups_tooltip"}
+ >
+ {I18n.t("groups.display_inactive")}
+ </label>
+ </span>
  <button onClick={this.props.assignAll}>
  <FontAwesomeIcon icon="fa-solid fa-user-plus" />
  {I18n.t("graders.actions.assign_grader")}
@@ -724,3 +790,4 @@ class GradersActionBox extends React.Component {
 export function makeGradersManager(elem, props) {
  render(<GradersManager {...props} />, elem);
 }
+export {GradersManager};

app/models/assignment.rb

@@ -1082,7 +1082,7 @@ def current_grader_data
  }
  end
 
- {
+ result = {
  groups: groups,
  criteria: criteria,
  graders: graders,
@@ -1091,6 +1091,19 @@ def current_grader_data
  hide_unassigned_criteria: self.hide_unassigned_criteria,
  sections: assignment.course.sections.pluck(:id, :name).to_h
  }
+
+ result.default_proc = proc { |h, k| h[k] = [] }
+
+ members_data = assignment.groupings.joins(student_memberships: { role: :user })
+ .pluck('groupings.id', 'users.user_name', 'memberships.membership_status', 'roles.hidden')
+
+ grouped_data = members_data.group_by { |x| x[0] }
+ grouped_data.each_value { |a| a.each { |b| b.delete_at(0) } }
+ grouped_data.default_proc = proc { |h, k| h[k] = [] }
+
+ result[:groups].each { |group| group[:members] = grouped_data[group[:_id]] }
+
+ result
  end
 
  # Retrieve data for submissions table.

config/locales/views/groups/en.yml

@@ -21,6 +21,7 @@ en:
  destroy:
  errors:
  do_not_have_a_group: You do not currently have a group.
+ display_inactive: Display inactive groups
  due_date_extension: Due Date Extension
  duration_extension: Duration Extension
  empty: Empty Group

spec/models/assignment_spec.rb

@@ -2573,6 +2573,7 @@ def grouping_count(groupings)
  context 'groupings that have graders' do
  let(:section) { create :section }
  let(:student) { create :student, section: section }
+ let(:student2) { create :student, section: section }
  let(:grouping) { create :grouping_with_inviter, inviter: student, assignment: assignment }
  let(:ta) { create :ta }
  it 'returns correct graders' do
@@ -2588,6 +2589,22 @@ def grouping_count(groupings)
  }
  expect(received_grader_info).to eq(expected_grader_info)
  end
+ it 'returns correct member data' do
+ grouping.add_member(student2) # adding a second member to the grouping
+ Grouping.assign_all_tas([grouping], [ta.id], assignment)
+
+ received_data = assignment.current_grader_data
+
+ expect(received_data[:groups].size).to eq(1) # there should only be one group
+
+ # What the :members key of each group object in :groups should be (in the 'received_data' object)
+ expected_members_data = [student, student2].map do |s|
+ [s.user.user_name, s.memberships[0].membership_status, s.hidden]
+ end
+ actual_members_data = received_data[:groups][0][:members]
+
+ expect(actual_members_data).to eq(expected_members_data)
+ end
  context 'graders are hidden' do
  it 'returns correct hidden grader info' do
  ta.update!(hidden: true)
@@ -2601,6 +2618,62 @@ def grouping_count(groupings)
  end
  end
  end
+
+ # Ensures that the object returned by the Assignment.current_grader_data method has the desired structure
+ # which is expected (contractually) by front end code (that requests this data).
+ context 'structure of output data' do
+ it 'follows required structure' do
+ filled_assignment = create(:assignment_with_peer_review_and_groupings_results)
+
+ result = filled_assignment.current_grader_data
+
+ expect(result).to include(
+ groups: be_an(Array),
+ criteria: be_an(Array),
+ graders: be_an(Array),
+ assign_graders_to_criteria: be_in([true, false]),
+ anonymize_groups: be_in([true, false]),
+ hide_unassigned_criteria: be_in([true, false]),
+ sections: be_a(Hash)
+ )
+
+ result[:groups].each do |group|
+ expect(group).to include(members: be_an(Array))
+
+ group[:members].each do |member|
+ expect(member.length).to eq(3)
+ end
+ end
+ end
+ end
+
+ # Ensures that the object returned by the Assignment.current_grader_data method has the desired structure
+ # which is expected (contractually) by front end code (that requests this data).
+ context 'structure of output data' do
+ it 'follows required structure' do
+ filled_assignment = create(:assignment_with_peer_review_and_groupings_results)
+
+ result = filled_assignment.current_grader_data
+
+ expect(result).to include(
+ groups: be_an(Array),
+ criteria: be_an(Array),
+ graders: be_an(Array),
+ assign_graders_to_criteria: be_in([true, false]),
+ anonymize_groups: be_in([true, false]),
+ hide_unassigned_criteria: be_in([true, false]),
+ sections: be_a(Hash)
+ )
+
+ result[:groups].each do |group|
+ expect(group).to include(members: be_an(Array))
+
+ group[:members].each do |member|
+ expect(member.length).to eq(3)
+ end
+ end
+ end
+ end
  end
 
  describe '#current_results' do