chore:fixed migrations and other erros after rebase

bcgov · Nov 8, 2024 · fc73628 · fc73628
1 parent a3cf56d
commit fc73628
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/...rations/0022_reportversion_report_type.py → ...rations/0031_reportversion_report_type.py b/...rations/0022_reportversion_report_type.py → ...rations/0031_reportversion_report_type.py
@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('reporting', '0021_report_additional_data'),
+        ('reporting', '0030_report_non_attributable_emissions'),
     ]
 
     operations = [

diff --git a/bciers/apps/reporting/src/app/components/operations/OperationReview.tsx b/bciers/apps/reporting/src/app/components/operations/OperationReview.tsx
@@ -10,9 +10,9 @@ import {
   updateSchema,
 } from "@reporting/src/data/jsonSchema/operations";
 import { TaskListElement } from "@bciers/components/navigation/reportingTaskList/types";
-import safeJsonParse from "@bciers/utils/safeJsonParse";
 import { actionHandler } from "@bciers/actions";
 import { formatDate } from "@reporting/src/app/utils/formatDate";
+import safeJsonParse from "@bciers/utils/src/safeJsonParse";
 
 interface Props {
   formData: any;
@@ -220,7 +220,7 @@ export default function OperationReview({
       formData={formDataState}
       baseUrl={baseUrl}
       cancelUrl={cancelUrl}
-      onSubmit={(data) => submitHandler(data, version_id)}
+      onSubmit={(data: { formData?: any }) => submitHandler(data, version_id)}
       onChange={onChangeHandler}
     />
   );

diff --git a/bciers/apps/reporting/src/app/components/operations/OperationReviewFormData.tsx b/bciers/apps/reporting/src/app/components/operations/OperationReviewFormData.tsx
@@ -1,20 +1,19 @@
-import OperationReview from "./OperationReview";
-import { getReportingYear } from "@reporting/src/app/utils/getReportingYear";
-import { getReportingOperation } from "@reporting/src/app/utils/getReportingOperation";
 import { getAllActivities } from "@reporting/src/app/utils/getAllReportingActivities";
-import { getAllRegulatedProducts } from "@reporting/src/app/utils/getAllRegulatedProducts";
+import { getReportingOperation } from "@reporting/src/app/utils/getReportingOperation";
+import { getReportingYear } from "@reporting/src/app/utils/getReportingYear";
 import { getReportType } from "@reporting/src/app/utils/getReportType";
+import { getRegulatedProducts } from "@bciers/actions/api";
 import { getRegistrationPurpose } from "@reporting/src/app/utils/getRegistrationPurpose";
 import { getFacilityReport } from "@reporting/src/app/utils/getFacilityReport";
-
+import OperationReview from "./OperationReview";
 export default async function OperationReviewFormData({
   version_id,
 }: {
   version_id: number;
 }) {
   const reportOperation = await getReportingOperation(version_id);
   const allActivities = await getAllActivities();
-  const allRegulatedProducts = await getAllRegulatedProducts();
+  const allRegulatedProducts = await getRegulatedProducts();
   const reportingYear = await getReportingYear();
   const reportType = await getReportType(version_id);
   const registrationPurpose = await getRegistrationPurpose(version_id);