Merge pull request #308 from mbta/cm/remove-remove-location-button

Cm/remove remove location button
mbta · Apr 25, 2024 · 309bb2d · 309bb2d
2 parents 628da1e + 33fc3e1
commit 309bb2d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 64 deletions.
diff --git a/assets/css/dashboard/configure-screens-workflow-page.scss b/assets/css/dashboard/configure-screens-workflow-page.scss
@@ -43,6 +43,8 @@
         td,
         th {
           padding: 10px 24px;
+          color: $text-primary;
+          background-color: transparent;
         }
 
         .screen-id {

diff --git a/assets/js/components/Dashboard/PermanentConfiguration/BottomActionBar.tsx b/assets/js/components/Dashboard/PermanentConfiguration/BottomActionBar.tsx
@@ -9,7 +9,6 @@ interface BottomActionBarProps {
   onBack?: () => void;
   onForward?: () => void;
   onCancel?: () => void;
-  forwardButtonDisabled?: boolean;
 }
 
 const BottomActionBar: ComponentType<BottomActionBarProps> = ({
@@ -19,7 +18,6 @@ const BottomActionBar: ComponentType<BottomActionBarProps> = ({
   onBack,
   onForward,
   onCancel,
-  forwardButtonDisabled,
 }: BottomActionBarProps) => {
   return (
     <Navbar variant="dark" data-bs-theme="dark">
@@ -36,11 +34,7 @@ const BottomActionBar: ComponentType<BottomActionBarProps> = ({
           </Button>
         )}
         {forwardButtonLabel && (
-          <Button
-            onClick={onForward}
-            disabled={forwardButtonDisabled}
-            className="forward"
-          >
+          <Button onClick={onForward} className="forward">
             {forwardButtonLabel}
             <ArrowRight className="bottom-action-bar-container__icon" />
           </Button>

diff --git a/.../js/components/Dashboard/PermanentConfiguration/Workflows/GlEink/ConfigureScreensPage.tsx b/.../js/components/Dashboard/PermanentConfiguration/Workflows/GlEink/ConfigureScreensPage.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable react/no-unescaped-entities */
 import React, {
   ComponentType,
   ForwardedRef,
@@ -59,7 +58,6 @@ interface ConfigureScreensWorkflowPageProps {
   setPlacesAndScreensToUpdate: React.Dispatch<
     React.SetStateAction<PlaceIdsAndNewScreens>
   >;
-  handleRemoveLocation: (place: Place) => void;
   setConfigVersion: React.Dispatch<React.SetStateAction<string>>;
   isEditing: boolean;
 }
@@ -69,7 +67,6 @@ const ConfigureScreensWorkflowPage: ComponentType<
 > = ({
   selectedPlaces,
   setPlacesAndScreensToUpdate,
-  handleRemoveLocation,
   setConfigVersion,
   isEditing,
 }: ConfigureScreensWorkflowPageProps) => {
@@ -116,31 +113,19 @@ const ConfigureScreensWorkflowPage: ComponentType<
     });
   };
 
-  let layout;
-  if (selectedPlaces.length) {
-    layout = selectedPlaces.map((place) => {
-      return (
-        <ConfigurePlaceCard
-          key={place.id}
-          place={place}
-          existingScreens={existingScreens[place.id]}
-          setPlacesAndScreensToUpdate={setPlacesAndScreensToUpdate}
-          handleRemoveLocation={() => handleRemoveLocation(place)}
-        />
-      );
-    });
-  } else {
-    layout = (
-      <div>
-        All locations have been removed. Select "Back" to select new locations.
-      </div>
-    );
-  }
-
   return (
     <Container className="workflow-container">
       <div className="h3 text-white mb-5">{getTitle()}</div>
-      {layout}
+      {selectedPlaces.map((place) => {
+        return (
+          <ConfigurePlaceCard
+            key={place.id}
+            place={place}
+            existingScreens={existingScreens[place.id]}
+            setPlacesAndScreensToUpdate={setPlacesAndScreensToUpdate}
+          />
+        );
+      })}
     </Container>
   );
 };
@@ -151,14 +136,12 @@ interface ConfigurePlaceCardProps {
   setPlacesAndScreensToUpdate: React.Dispatch<
     React.SetStateAction<PlaceIdsAndNewScreens>
   >;
-  handleRemoveLocation: () => void;
 }
 
 const ConfigurePlaceCard: ComponentType<ConfigurePlaceCardProps> = ({
   place,
   existingScreens,
   setPlacesAndScreensToUpdate,
-  handleRemoveLocation,
 }: ConfigurePlaceCardProps) => {
   const [existingPendingScreens, setExistingPendingScreens] = useState<{
     [screen_id: string]: ScreenConfiguration;
@@ -325,14 +308,6 @@ const ConfigurePlaceCard: ComponentType<ConfigurePlaceCardProps> = ({
       <Row className="header">
         <Col className="h5 my-auto header-name">{place.name.toUpperCase()}</Col>
         <Col className="body--medium my-auto">Station ID: {place.id}</Col>
-        <Col className="d-flex">
-          <Button
-            className="remove-location-button"
-            onClick={handleRemoveLocation}
-          >
-            Remove Location
-          </Button>
-        </Col>
       </Row>
       {hasRows && (
         <Row className="screens-table-container">

diff --git a/assets/js/components/Dashboard/PermanentConfiguration/Workflows/GlEink/GlEinkWorkflow.tsx b/assets/js/components/Dashboard/PermanentConfiguration/Workflows/GlEink/GlEinkWorkflow.tsx
@@ -5,7 +5,6 @@ import ConfigureScreensWorkflowPage, {
 import BottomActionBar from "../../BottomActionBar";
 import { useLocation, useNavigate } from "react-router-dom";
 import StationSelectPage from "./StationSelectPage";
-import { Place } from "../../../../../models/place";
 import { Alert, Button, Modal } from "react-bootstrap";
 import { ExclamationCircleFill } from "react-bootstrap-icons";
 import {
@@ -63,24 +62,6 @@ const GlEinkWorkflow: ComponentType = () => {
     }
   }, [location]);
 
-  const handleRemoveLocation = (place: Place) => {
-    const newSelectedPlaces = new Set(selectedPlaces);
-    newSelectedPlaces.delete(place.id);
-    delete newScreenValidationErrors[place.id];
-    delete pendingScreenValidationErrors[place.id];
-    dispatch({
-      type: "SET_VALIDATION_ERRORS",
-      newScreenValidationErrors,
-      pendingScreenValidationErrors,
-    });
-    setSelectedPlaces(newSelectedPlaces);
-    setPlacesAndScreensToUpdate((placesAndScreens) => {
-      const { [place.id]: _discarded, ...newPlacesAndScreens } =
-        placesAndScreens;
-      return newPlacesAndScreens;
-    });
-  };
-
   const generateErrorMessage = (errorSet: Set<string>) => {
     if (errorSet.size === 0) {
       return "";
@@ -213,7 +194,6 @@ const GlEinkWorkflow: ComponentType = () => {
   let onForward;
   let onCancel;
   let layout;
-  const forwardButtonDisabled = selectedPlaces.size === 0;
   switch (configStep) {
     case 0:
       cancelButtonLabel = "Cancel";
@@ -314,7 +294,6 @@ const GlEinkWorkflow: ComponentType = () => {
               selectedPlaces.has(place.id),
             )}
             setPlacesAndScreensToUpdate={setPlacesAndScreensToUpdate}
-            handleRemoveLocation={handleRemoveLocation}
             setConfigVersion={setConfigVersion}
             isEditing={isEditing}
           />
@@ -350,7 +329,6 @@ const GlEinkWorkflow: ComponentType = () => {
           onCancel={onCancel}
           onBack={onBack}
           onForward={onForward}
-          forwardButtonDisabled={forwardButtonDisabled}
         />
       </div>
     </>