move quicker sign buttons to SignBtn folder

add manifest service module for business logic related to the uniform hazardous waste manifest move api related web service modules to a subdirectory called APIs
USEPA · Nov 29, 2023 · 2fe6776 · 2fe6776
1 parent ac73212
commit 2fe6776
Show file tree

Hide file tree

Showing 15 changed files with 181 additions and 125 deletions.
diff --git a/client/src/components/Manifest/ManifestForm.tsx b/client/src/components/Manifest/ManifestForm.tsx
@@ -11,11 +11,11 @@ import { Alert, Button, Col, Form, Row } from 'react-bootstrap';
 import { FormProvider, SubmitHandler, useFieldArray, useForm } from 'react-hook-form';
 import { useNavigate } from 'react-router-dom';
 import { toast } from 'react-toastify';
-import { manifestApi } from 'services/manifestApi';
+import { manifest, manifestApi } from 'services';
 import { ContactForm, PhoneForm } from './Contact';
 import { AddHandler, GeneratorForm, Handler } from './Handler';
 import { Manifest, manifestSchema, ManifestStatus } from './manifestSchema';
-import { QuickerSignData, QuickerSignModal, QuickerSignModalBtn } from './QuickerSign';
+import { HandlerSignBtn, QuickerSignData, QuickerSignModal } from './QuickerSign';
 import { Transporter, TransporterTable } from './Transporter';
 import { EditWasteModal, WasteLineTable } from './WasteLine';
 
@@ -34,6 +34,7 @@ export interface ManifestContextType {
   setTsdfStateCode: React.Dispatch<React.SetStateAction<string | undefined>>;
   editWasteLineIndex?: number;
   setEditWasteLineIndex: React.Dispatch<React.SetStateAction<number | undefined>>;
+  signingSite?: string | undefined;
 }
 
 interface ManifestFormProps {
@@ -51,6 +52,7 @@ export const ManifestContext = createContext<ManifestContextType>({
   setTsdfStateCode: () => {},
   editWasteLineIndex: undefined,
   setEditWasteLineIndex: () => {},
+  signingSite: undefined,
 });
 
 /**
@@ -138,7 +140,7 @@ export function ManifestForm({
   const [showSignForm, setShowSignForm] = useState<boolean>(false);
   const [quickerSignHandler, setQuickerSignHandler] = useState<QuickerSignData>({
     handler: undefined,
-    siteType: 'Generator', // ToDo initialize to undefined
+    siteType: 'Generator',
   });
   const toggleQuickerSignShow = () => setShowSignForm(!showSignForm);
   const setupSign = (signContext: QuickerSignData) => {
@@ -178,6 +180,7 @@ export function ManifestForm({
           setTsdfStateCode: setTsdfStateCode,
           editWasteLineIndex: editWasteLine,
           setEditWasteLineIndex: setEditWasteLine,
+          signingSite: manifest.getNextSigner(manifestData),
         }}
       >
         <FormProvider {...manifestForm}>
@@ -389,7 +392,7 @@ export function ManifestForm({
                     <ContactForm handlerType="generator" readOnly={readOnly} />
                     <div className="d-flex justify-content-between">
                       <Col className="text-end">
-                        <QuickerSignModalBtn
+                        <HandlerSignBtn
                           siteType={'Generator'}
                           mtnHandler={generator}
                           handleClick={setupSign}
@@ -399,8 +402,6 @@ export function ManifestForm({
                     </div>
                   </>
                 ) : generator && !showGeneratorForm ? (
-                  // If the form holds a value for generator, but they don't need to edit the
-                  // generators values (allowed) then display the site details in a nice read only way
                   <>
                     <RcraSiteDetails handler={generator} />
                     <PhoneForm handlerType={'generator'} />
@@ -409,16 +410,12 @@ export function ManifestForm({
                     </div>
                   </>
                 ) : showGeneratorForm ? (
-                  // Show the Handler form with current value for the generator
-                  // The HandlerForm allows for fine-grained control over the handler inputs
                   <>
                     <GeneratorForm readOnly={readOnly} />
                     <h4>Emergency Contact Information</h4>
                     <ContactForm handlerType="generator" readOnly={readOnly} />
                   </>
                 ) : (
-                  // default on a blank manifest, ask if they'd like to search for a generator to
-                  // add, or if the user would like to manually enter the generator's info.
                   <>
                     <Row className="mb-2">
                       <HtButton
@@ -453,7 +450,6 @@ export function ManifestForm({
             <HtCard id="transporter-form-card">
               <HtCard.Header title="Transporters" />
               <HtCard.Body className="pb-4">
-                {/* List transporters */}
                 <TransporterTable
                   transporters={transporters}
                   arrayFieldMethods={transporterForm}
@@ -483,7 +479,6 @@ export function ManifestForm({
             <HtCard id="waste-form-card">
               <HtCard.Header title="Waste" />
               <HtCard.Body className="pb-4">
-                {/* Table Showing current Waste Lines included on the manifest */}
                 <WasteLineTable
                   wastes={allWastes}
                   toggleWLModal={toggleWlFormShow}
@@ -506,7 +501,6 @@ export function ManifestForm({
                 />
               </HtCard.Body>
             </HtCard>
-            {/* Where The Tsdf information is added and displayed */}
             <HtCard id="tsdf-form-card">
               <HtCard.Header title="Designated Facility" />
               <HtCard.Body className="pb-4">
@@ -517,7 +511,7 @@ export function ManifestForm({
                     <div className="d-flex justify-content-between">
                       {/* Button to bring up the Quicker Sign modal*/}
                       <Col className="text-end">
-                        <QuickerSignModalBtn
+                        <HandlerSignBtn
                           siteType={'Tsdf'}
                           mtnHandler={tsdf}
                           handleClick={setupSign}
@@ -549,7 +543,6 @@ export function ManifestForm({
               </HtCard.Body>
             </HtCard>
             <HtCard id="manifest-additional-info-card">
-              {/* Additional information for the manifest, such as reference information*/}
               <HtCard.Header title={'Additional info'} />
               <HtCard.Body className="px-3">
                 <AdditionalInfoForm readOnly={readOnly} />

diff --git a/client/src/components/Manifest/QuickerSign/QuickerSignForm.tsx b/client/src/components/Manifest/QuickerSign/QuickerSignForm.tsx
@@ -2,16 +2,37 @@ import { faFileSignature } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { AxiosError } from 'axios';
 import { Handler, RcraSiteType } from 'components/Manifest/manifestSchema';
-import { QuickerSignature } from 'components/Manifest/QuickerSign/quickerSignSchema';
 import { Transporter } from 'components/Manifest/Transporter';
 import { HtForm } from 'components/UI';
 import React from 'react';
 import { Button, Col, Container, Form, ListGroup, Row } from 'react-bootstrap';
 import { SubmitHandler, useForm } from 'react-hook-form';
 import { useNavigate } from 'react-router-dom';
 import { toast } from 'react-toastify';
-import { manifestApi } from 'services/manifestApi';
+import { manifestApi } from 'services';
 import { selectUserName, useAppSelector } from 'store';
+import { z } from 'zod';
+
+const siteType = z.enum(['Transporter', 'Generator', 'Tsdf', 'Broker']);
+/**
+ * The EPA Quicker Sign schema
+ */
+const quickerSignatureSchema = z.object({
+  siteId: z.string(),
+  siteType: siteType,
+  transporterOrder: z.number().optional(),
+  printedSignatureName: z.string(),
+  printedSignatureDate: z.string(),
+  manifestTrackingNumbers: z.string().array(),
+});
+
+const quickerSignDataSchema = z.object({
+  handler: z.any(),
+  siteType: z.enum(['Generator', 'Transporter', 'Tsdf']),
+});
+
+export type QuickerSignData = z.infer<typeof quickerSignDataSchema>;
+export type QuickerSignature = z.infer<typeof quickerSignatureSchema>;
 
 interface QuickerSignProps {
   mtn: Array<string>;

diff --git a/.../QuickerSign/QuickerSignModalBtn.spec.tsx → ...ickerSign/SignBtn/HandlerSignBtn.spec.tsx b/.../QuickerSign/QuickerSignModalBtn.spec.tsx → ...ickerSign/SignBtn/HandlerSignBtn.spec.tsx
@@ -1,5 +1,5 @@
 import '@testing-library/jest-dom';
-import { QuickerSignModalBtn } from 'components/Manifest/QuickerSign/index';
+import { HandlerSignBtn } from 'components/Manifest/QuickerSign/index';
 import React from 'react';
 import { cleanup, renderWithProviders, screen } from 'test-utils';
 import { createMockMTNHandler } from 'test-utils/fixtures';
@@ -13,11 +13,7 @@ describe('QuickerSignModalBtn', () => {
   test('renders', () => {
     const handler = createMockMTNHandler();
     renderWithProviders(
-      <QuickerSignModalBtn
-        siteType={'Generator'}
-        mtnHandler={handler}
-        handleClick={() => undefined}
-      />
+      <HandlerSignBtn siteType={'Generator'} mtnHandler={handler} handleClick={() => undefined} />
     );
     expect(screen.getByRole('button')).toBeInTheDocument();
   });
@@ -26,7 +22,7 @@ describe('QuickerSignModalBtn', () => {
       signed: true,
     });
     renderWithProviders(
-      <QuickerSignModalBtn
+      <HandlerSignBtn
         siteType={'Generator'}
         mtnHandler={signed_handler}
         handleClick={() => undefined}
@@ -41,7 +37,7 @@ describe('QuickerSignModalBtn', () => {
       electronicSignaturesInfo: undefined,
     });
     renderWithProviders(
-      <QuickerSignModalBtn
+      <HandlerSignBtn
         siteType={'Generator'}
         mtnHandler={unsigned_handler}
         handleClick={() => undefined}
@@ -73,7 +69,7 @@ describe('QuickerSignModalBtn', () => {
       signed: true,
     });
     renderWithProviders(
-      <QuickerSignModalBtn
+      <HandlerSignBtn
         siteType={'Generator'}
         mtnHandler={unsigned_handler}
         handleClick={() => undefined}

diff --git a/...ifest/QuickerSign/QuickerSignModalBtn.tsx → ...st/QuickerSign/SignBtn/HandlerSignBtn.tsx b/...ifest/QuickerSign/QuickerSignModalBtn.tsx → ...st/QuickerSign/SignBtn/HandlerSignBtn.tsx
@@ -1,8 +1,9 @@
 import { faFeather } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { ManifestContext } from 'components/Manifest/ManifestForm';
 import { Handler, RcraSiteType } from 'components/Manifest/manifestSchema';
 import { RcraApiUserBtn } from 'components/Rcrainfo';
-import React from 'react';
+import React, { useContext } from 'react';
 import { ButtonProps } from 'react-bootstrap';
 import { siteByEpaIdSelector, useAppSelector } from 'store';
 
@@ -23,24 +24,26 @@ interface QuickerSignModalBtnProps extends ButtonProps {
  * The button will be disabled if siteId (the EPA ID number) is not provided
  * @constructor
  */
-export function QuickerSignModalBtn({
+export function HandlerSignBtn({
   siteType,
   mtnHandler,
   handleClick,
   disabled,
   iconOnly = false,
 }: QuickerSignModalBtnProps) {
-  if (!useAppSelector(siteByEpaIdSelector(mtnHandler?.epaSiteId))) {
-    return <></>;
-  }
+  const { signingSite } = useContext(ManifestContext);
+  if (!useAppSelector(siteByEpaIdSelector(mtnHandler?.epaSiteId))) return <></>;
+
+  if (mtnHandler?.epaSiteId !== signingSite) return <></>;
+
   return (
     <RcraApiUserBtn
       onClick={() => {
         handleClick({ handler: mtnHandler, siteType: siteType });
       }}
       disabled={disabled}
     >
-      {iconOnly ? '' : 'Quicker Sign '}
+      {iconOnly ? '' : 'Sign '}
       <FontAwesomeIcon icon={faFeather} />
     </RcraApiUserBtn>
   );

diff --git a/client/src/components/Manifest/QuickerSign/index.ts b/client/src/components/Manifest/QuickerSign/index.ts
@@ -1,7 +1,6 @@
-import { QuickerSignForm } from './QuickerSignForm';
+import { HandlerSignBtn } from 'components/Manifest/QuickerSign/SignBtn/HandlerSignBtn';
+import { QuickerSignature, QuickerSignData, QuickerSignForm } from './QuickerSignForm';
 import { QuickerSignModal } from './QuickerSignModal';
-import { QuickerSignModalBtn } from './QuickerSignModalBtn';
-import { QuickerSignature, QuickerSignData } from './quickerSignSchema';
 
-export { QuickerSignForm, QuickerSignModal, QuickerSignModalBtn };
+export { QuickerSignForm, QuickerSignModal, HandlerSignBtn };
 export type { QuickerSignature, QuickerSignData };
diff --git a/client/src/components/Manifest/QuickerSign/quickerSignSchema.ts b/client/src/components/Manifest/QuickerSign/quickerSignSchema.ts
diff --git a/client/src/components/Manifest/Transporter/TransporterTable.tsx b/client/src/components/Manifest/Transporter/TransporterTable.tsx
@@ -3,7 +3,7 @@ import { faAngleRight, faCheck, faSignature } from '@fortawesome/free-solid-svg-
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { Transporter } from 'components/Manifest';
 import { Manifest } from 'components/Manifest/manifestSchema';
-import { QuickerSignData, QuickerSignModalBtn } from 'components/Manifest/QuickerSign';
+import { HandlerSignBtn, QuickerSignData } from 'components/Manifest/QuickerSign';
 import React, { useState } from 'react';
 import { Accordion, Button, Card, Col, Row, Table, useAccordionButton } from 'react-bootstrap';
 import { UseFieldArrayReturn } from 'react-hook-form';
@@ -67,7 +67,7 @@ function TransporterTable({
                 </Col>
                 <Col xs={1}>
                   {readOnly ? (
-                    <QuickerSignModalBtn
+                    <HandlerSignBtn
                       siteType={'Transporter'}
                       mtnHandler={transporter}
                       handleClick={setupSign}