From 0ab9719d79a0712a460f972d6f8ce65233e13cd7 Mon Sep 17 00:00:00 2001 From: Andrew Date: Mon, 11 Nov 2024 14:30:26 -0500 Subject: [PATCH] Revert "Remove surveyor from assignment button (#644)" This reverts commit b1d167a573b7c6d5b55f89e967a811e5fc0e6ae5. --- backend/Gemfile.lock | 1 + .../src/pages/Admin/assignment/AssignTable.js | 23 ++++++++----------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/backend/Gemfile.lock b/backend/Gemfile.lock index 36ea6253..abd2944f 100644 --- a/backend/Gemfile.lock +++ b/backend/Gemfile.lock @@ -279,6 +279,7 @@ GEM rubocop (>= 1.52.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (1.13.0) + ruby2_keywords (0.0.5) ruby_http_client (3.5.5) sendgrid-actionmailer (3.2.0) mail (~> 2.7) diff --git a/frontend/front/src/pages/Admin/assignment/AssignTable.js b/frontend/front/src/pages/Admin/assignment/AssignTable.js index 9eb19db2..ef1faf68 100644 --- a/frontend/front/src/pages/Admin/assignment/AssignTable.js +++ b/frontend/front/src/pages/Admin/assignment/AssignTable.js @@ -1,4 +1,4 @@ -import { Box, Button, Chip, MenuItem, Stack } from "@mui/material"; +import { Box, Button, MenuItem, Stack } from "@mui/material"; import React, { useMemo, useState } from "react"; import { useAddAssignmentsToSurveyorMutation, @@ -135,24 +135,21 @@ const AssignTable = () => { maxWidth="100%" justifyContent="flex-start" overflow="scroll" - sx={{ overflowY: "auto", overflowX: "auto", pl: 2 }} + sx={{ overflowY: "auto", overflowX: "auto" }} flexWrap="wrap" > {params.row.surveyorData.map((surveyor) => { return ( - handleUserLink(surveyor)} - onDelete={() => - removeAssignmentsFromSurveyor({ - surveyorId: surveyor.id, - assignmentIds: [params.row.id], - }) - } - /> + sx={{ + textAlign: "left", + minWidth: "max-content", + }} + > + {`${surveyor.firstname} ${surveyor.lastname}`} + ); })}