Paginate Operations Form

bc_obps/registration/api/operation.py

@@ -49,14 +49,15 @@ def create_operation(request, payload: OperationIn):
             delattr(payload, field_name)
 
     operation = Operation.objects.create(**payload.dict())
-    return {"name": operation.name}
+
+    return {"name": operation.name, "id": operation.id}
 
 
 ##### PUT #####
 
 
 @router.put("/operations/{operation_id}")
-def update_operation(request, operation_id: int, payload: OperationIn):
+def update_operation(request, operation_id: int, submit, payload: OperationIn):
     operation = get_object_or_404(Operation, id=operation_id)
     if "operator" in payload.dict():
         operator = payload.dict()["operator"]
@@ -87,8 +88,10 @@ def update_operation(request, operation_id: int, payload: OperationIn):
     for attr, value in payload.dict().items():
         if attr not in excluded_fields:
             setattr(operation, attr, value)
-        # set the operation status to 'pending' on update
-        operation.status = "Pending"
+            # set the operation status to 'pending' on update
+        if submit == "true":
+            operation.status = Operation.Statuses.PENDING
+
         operation.save()
         return {"name": operation.name}
 

bc_obps/registration/migrations/0002_alter_operation_status.py

@@ -0,0 +1,27 @@
+# Generated by Django 4.2.6 on 2023-11-22 23:59
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('registration', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='operation',
+            name='status',
+            field=models.CharField(
+                choices=[
+                    ('not_registered', 'Not Registered'),
+                    ('pending', 'Pending'),
+                    ('approved', 'Approved'),
+                    ('rejected', 'Rejected'),
+                ],
+                db_comment='The status of an operation in the app (e.g. pending review)',
+                default='not_registered',
+                max_length=1000,
+            ),
+        ),
+    ]

bc_obps/registration/migrations/0003_alter_operation_status.py

@@ -0,0 +1,27 @@
+# Generated by Django 4.2.6 on 2023-11-23 00:11
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('registration', '0002_alter_operation_status'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='operation',
+            name='status',
+            field=models.CharField(
+                choices=[
+                    ('not_registered', 'Not Registered'),
+                    ('pending', 'Pending'),
+                    ('approved', 'Approved'),
+                    ('rejected', 'Rejected'),
+                ],
+                db_comment='The status of an operation in the app (e.g. pending review)',
+                default='pending',
+                max_length=1000,
+            ),
+        ),
+    ]

bc_obps/registration/models.py

@@ -465,7 +465,7 @@ class Statuses(models.TextChoices):
     status = models.CharField(
         max_length=1000,
         choices=Statuses.choices,
-        default=Statuses.PENDING,
+        default=Statuses.NOT_REGISTERED,
         db_comment="The status of an operation in the app (e.g. pending review)",
     )
     # temporary handling, many-to-many handled in #138

bc_obps/registration/tests/test_endpoints.py

@@ -90,10 +90,11 @@ def test_post_new_operation(self, client):
         )
         post_response = client.post(self.endpoint, content_type=content_type_json, data=mock_operation.json())
         assert post_response.status_code == 200
-        assert post_response.json() == {"name": "Springfield Nuclear Power Plant"}
+        assert post_response.json().get('name') == "Springfield Nuclear Power Plant"
+        assert post_response.json().get('id') is not None
         # check that the default status of pending was applied
         get_response = client.get(self.endpoint).json()[0]
-        assert 'status' in get_response and get_response['status'] == 'pending'
+        assert 'status' in get_response and get_response['status'] == 'not_registered'
 
     def test_post_new_malformed_operation(self, client):
         response = client.post(
@@ -105,7 +106,7 @@ def test_post_new_malformed_operation(self, client):
 
     def test_put_operation_update_status_approved(self, client):
         operation = baker.make(Operation)
-        assert operation.status == Operation.Statuses.PENDING
+        assert operation.status == Operation.Statuses.NOT_REGISTERED
 
         url = self.build_update_status_url(operation_id=operation.id)
 
@@ -128,7 +129,7 @@ def test_put_operation_update_status_approved(self, client):
 
     def test_put_operation_update_status_rejected(self, client):
         operation = baker.make(Operation)
-        assert operation.status == Operation.Statuses.PENDING
+        assert operation.status == Operation.Statuses.NOT_REGISTERED
 
         url = self.build_update_status_url(operation_id=operation.id)
 
@@ -151,7 +152,7 @@ def test_put_operation_update_status_rejected(self, client):
 
     def test_put_operation_not_verified_when_not_registered(self, client):
         operation = baker.make(Operation)
-        assert operation.status == Operation.Statuses.PENDING
+        assert operation.status == Operation.Statuses.NOT_REGISTERED
 
         url = self.build_update_status_url(operation_id=operation.id)
 
@@ -173,7 +174,7 @@ def test_put_operation_not_verified_when_not_registered(self, client):
     def test_put_operation_update_status_invalid_data(self, client):
         def send_put_invalid_data():
             operation = baker.make(Operation)
-            assert operation.status == Operation.Statuses.PENDING
+            assert operation.status == Operation.Statuses.NOT_REGISTERED
 
             url = self.build_update_status_url(operation_id=operation.id)
 
@@ -198,7 +199,7 @@ def test_get_method_for_200_status(self, client):
         response = client.get(self.endpoint + str(operation.id))
         assert response.status_code == 200
 
-    def test_put_operation(self, client):
+    def test_put_operation_without_submit(self, client):
         naics_code = baker.make(NaicsCode)
         naics_category = baker.make(NaicsCategory)
         document = baker.make(Document)
@@ -229,15 +230,53 @@ def test_put_operation(self, client):
         )
 
         response = client.put(
-            self.endpoint + str(operation.id), content_type=content_type_json, data=mock_operation.json()
+            self.endpoint + str(operation.id) + "?submit=false",
+            content_type=content_type_json,
+            data=mock_operation.json(),
         )
         assert response.status_code == 200
         assert response.json() == {"name": "New name"}
 
+        get_response = client.get(self.endpoint + str(operation.id)).json()
+        assert get_response["status"] == Operation.Statuses.NOT_REGISTERED
+
+    def test_put_operation_with_submit(self, client):
+        naics_code = baker.make(NaicsCode)
+        naics_category = baker.make(NaicsCategory)
+        document = baker.make(Document)
+        contact = baker.make(Contact, postal_code="V1V 1V2")
+        operator = baker.make(Operator)
+        activity = baker.make(ReportingActivity)
+        operation = baker.make(Operation)
+        operation.reporting_activities.set([activity.id])
+
+        mock_operation = OperationIn(
+            name="New name",
+            type="Single Facility Operation",
+            naics_code_id=naics_code.id,
+            reporting_activities=[1],
+            regulated_products=[1],
+            naics_category_id=naics_category.id,
+            documents=[document.id],
+            contacts=[contact.id],
+            operator_id=operator.id,
+        )
+
+        response = client.put(
+            self.endpoint + str(operation.id) + "?submit=true",
+            content_type=content_type_json,
+            data=mock_operation.json(),
+        )
+        assert response.status_code == 200
+        assert response.json() == {"name": "New name"}
+
+        get_response = client.get(self.endpoint + str(operation.id)).json()
+        assert get_response["status"] == Operation.Statuses.PENDING
+
     def test_put_malformed_operation(self, client):
         operation = baker.make(Operation)
         response = client.put(
-            self.endpoint + str(operation.id),
+            self.endpoint + str(operation.id) + "?submit=false",
             content_type=content_type_json,
             data={"garbage": "i am bad data"},
         )

client/app/(authenticated)/dashboard/operations/[operation]/page.tsx → client/app/(authenticated)/dashboard/operations/[operation]/[formSection]/page.tsx

@@ -4,10 +4,8 @@ import Loading from "@/app/components/loading/SkeletonForm";
 
 export default function Page({ params }: { params: { operation: number } }) {
   return (
-    <>
-      <Suspense fallback={<Loading />}>
-        <Operation numRow={params.operation} />
-      </Suspense>
-    </>
+    <Suspense fallback={<Loading />}>
+      <Operation numRow={params.operation} />
+    </Suspense>
   );
 }

client/app/(authenticated)/dashboard/operations/page.tsx

@@ -8,7 +8,7 @@ export default function Page() {
   return (
     <>
       <h1>Operations List</h1>
-      <Link href="/dashboard/operations/create">
+      <Link href="/dashboard/operations/0/1">
         <Button variant="contained">Add Operation</Button>
       </Link>
       <Suspense fallback={<Loading />}>

client/app/(authenticated)/dashboard/page.tsx

@@ -48,7 +48,6 @@ export default function Page() {
       fetchData();
     }
   }, [role]); // dependencies array
-
   return (
     <div>
       {/* 🪜 create a grid layout using container prop to create a container that wraps the grid items */}

client/app/components/datagrid/DataGrid.tsx

@@ -32,7 +32,7 @@ const DataGrid: React.FC<Props> = ({ rows, columns, cntxt }) => {
               renderCell: (params: GridRenderCellParams) => (
                 <div>
                   {/* 🔗 Add reg or details link */}
-                  <Link href={`operations/${params.row.id}`}>
+                  <Link href={`operations/${params.row.id}/1`}>
                     <Button variant="contained">
                       {params.row.status === "Not Registered"
                         ? "Start Registration"

client/app/components/form/MultiStepButtons.tsx

@@ -0,0 +1,72 @@
+"use client";
+
+import { Button } from "@mui/material";
+import { useFormStatus } from "react-dom";
+import Link from "next/link";
+
+interface SubmitButtonProps {
+  baseUrl: string;
+  cancelUrl: string;
+  classNames?: string;
+  step: number;
+  steps: string[];
+  submitEveryStep?: boolean;
+}
+
+const SubmitButton: React.FunctionComponent<SubmitButtonProps> = ({
+  baseUrl,
+  step,
+  steps,
+  cancelUrl,
+  classNames,
+  submitEveryStep,
+}) => {
+  const { pending } = useFormStatus();
+  const isFinalStep = step === steps.length - 1;
+  return (
+    <div className={`flex w-full mt-8 justify-between ${classNames}`}>
+      {cancelUrl && (
+        <Link href={cancelUrl}>
+          <Button variant="outlined">Cancel</Button>
+        </Link>
+      )}
+      <div>
+        {step !== 0 ? (
+          <Link href={`${baseUrl}/${step}`}>
+            <Button
+              variant="contained"
+              type="button"
+              disabled={step === 0}
+              className="mr-4"
+            >
+              Back
+            </Button>
+          </Link>
+        ) : (
+          <Button variant="contained" type="button" disabled className="mr-4">
+            Back
+          </Button>
+        )}
+        {!isFinalStep && !submitEveryStep && (
+          <Link href={`${baseUrl}/${step + 2}`}>
+            <Button variant="contained" type="button" disabled={isFinalStep}>
+              Next
+            </Button>
+          </Link>
+        )}
+        {isFinalStep && !submitEveryStep && (
+          <Button type="submit" aria-disabled={pending} variant="contained">
+            Submit
+          </Button>
+        )}
+        {submitEveryStep && (
+          <Button type="submit" aria-disabled={pending} variant="contained">
+            {!isFinalStep ? "Next" : "Submit"}
+          </Button>
+        )}
+      </div>
+    </div>
+  );
+};
+
+export default SubmitButton;