Skip to content

Commit 2959b2a

Browse files
Merge pull request #5072 from bcgov/renovate/node
fix(deps): update node dependencies
2 parents b61358a + 27e175d commit 2959b2a

55 files changed

Lines changed: 700 additions & 421 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

bciers/apps/administration/app/components/operations/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export interface OperationRow {
1010
sfo_facility_name: string | null;
1111
operation__bcghg_id: string | null;
1212
operation__bc_obps_regulated_operation: string | null;
13-
operation__registration_purpose: string;
13+
operation__registration_purpose?: string;
1414
id: number;
1515
operator__legal_name: string;
1616
status: string;

bciers/apps/administration/proxies/withRulesAppliedAdmin.test.ts

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { getToken } from "@bciers/testConfig/mocks";
55
import { mockIndustryUserToken } from "@bciers/testConfig/data/tokens";
66
import { DashboardRoutes } from "@bciers/proxies";
77
import getCurrentUserOperator from "@/administration/app/components/userOperators/getCurrentUserOperator";
8+
import { UserOperator } from "@/administration/app/components/userOperators/types";
89

910
vi.mock("@/administration/app/components/userOperators/getCurrentUserOperator");
1011

@@ -18,7 +19,9 @@ describe("withRulesAppliedAdmin proxy", () => {
1819

1920
it("redirects /operations for industry users if their userOperator is not found", async () => {
2021
getToken.mockResolvedValue(mockIndustryUserToken);
21-
vi.mocked(getCurrentUserOperator).mockResolvedValueOnce(undefined);
22+
vi.mocked(getCurrentUserOperator).mockResolvedValueOnce(
23+
undefined as unknown as UserOperator,
24+
);
2225

2326
const result = await proxy(
2427
mockRequest("/administration/operations"),
@@ -106,7 +109,9 @@ describe("withRulesAppliedAdmin proxy", () => {
106109

107110
it("proceeds /select-operator when userOperator resolves to undefined", async () => {
108111
getToken.mockResolvedValue(mockIndustryUserToken);
109-
vi.mocked(getCurrentUserOperator).mockResolvedValueOnce(undefined);
112+
vi.mocked(getCurrentUserOperator).mockResolvedValueOnce(
113+
undefined as unknown as UserOperator,
114+
);
110115

111116
const result = await proxy(
112117
mockRequest("/administration/select-operator"),
@@ -138,7 +143,9 @@ describe("withRulesAppliedAdmin proxy", () => {
138143

139144
it("redirects /contacts for industry users if their userOperator is not found", async () => {
140145
getToken.mockResolvedValue(mockIndustryUserToken);
141-
vi.mocked(getCurrentUserOperator).mockResolvedValueOnce(undefined);
146+
vi.mocked(getCurrentUserOperator).mockResolvedValueOnce(
147+
undefined as unknown as UserOperator,
148+
);
142149

143150
const result = await proxy(
144151
mockRequest("/administration/contacts"),

bciers/apps/administration/tests/components/contacts/ContactForm.test.tsx

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,11 @@ import {
88
useSearchParams,
99
useParams,
1010
} from "@bciers/testConfig/mocks";
11-
import {
12-
contactsSchema,
13-
contactsUiSchema,
14-
} from "apps/administration/app/data/jsonSchema/contact";
11+
import { contactsSchema } from "apps/administration/app/data/jsonSchema/contact";
1512
import ContactForm from "apps/administration/app/components/contacts/ContactForm";
1613
import { createContactSchema } from "apps/administration/app/components/contacts/createContactSchema";
1714
import { FrontendMessages } from "@bciers/utils/src/enums";
15+
import { ContactFormData } from "@/administration/app/components/contacts/types";
1816

1917
const mockReplace = vi.fn();
2018
const mockRouterPush = vi.fn();
@@ -28,7 +26,7 @@ useParams.mockReturnValue({
2826
contactId: "123",
2927
});
3028

31-
const contactFormData = {
29+
const contactFormData: ContactFormData = {
3230
id: 123,
3331
first_name: "John",
3432
last_name: "Doe",
@@ -178,7 +176,6 @@ describe("ContactForm component", () => {
178176
render(
179177
<ContactForm
180178
schema={createContactSchema(contactsSchema, true)}
181-
uiSchema={contactsUiSchema}
182179
formData={{}}
183180
isCreating
184181
/>,

bciers/apps/administration/tests/components/facilities/FacilitiesDataGrid.test.tsx

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
import { useSearchParams } from "@bciers/testConfig/mocks";
1010
import FacilityDataGrid from "apps/administration/app/components/facilities/FacilitiesDataGrid";
1111
import { QueryParams } from "@bciers/testConfig/types";
12+
import { FacilityInitialData } from "@/administration/app/components/facilities/types";
1213
import extractParams from "@bciers/testConfig/helpers/extractParams";
1314
import userEvent from "@testing-library/user-event";
1415

@@ -18,21 +19,27 @@ useSearchParams.mockReturnValue({
1819
get: vi.fn(),
1920
} as QueryParams);
2021

21-
const mockResponse = {
22+
const mockResponse: FacilityInitialData = {
2223
rows: [
2324
{
24-
id: 1,
25+
id: "3b5b95ea-2a1a-450d-8e2e-2e15feed96c1",
2526
facility__name: "Facility 1",
2627
facility__type: "Single Facility",
2728
facility__bcghg_id__id: "12111130001",
28-
facility__id: 1,
29+
facility__id: "3b5b95ea-2a1a-450d-8e2e-2e15feed96c1",
30+
status: "Active",
31+
facility__latitude_of_largest_emissions: "48.4",
32+
facility__longitude_of_largest_emissions: "-123.4",
2933
},
3034
{
31-
id: 2,
35+
id: "d99725a7-1c3a-47cb-a59b-e2388ce0fa18",
3236
facility__name: "Facility 2",
3337
facility__type: "Large Facility",
3438
facility__bcghg_id__id: "1-211113-0002",
35-
facility__id: 2,
39+
facility__id: "d99725a7-1c3a-47cb-a59b-e2388ce0fa18",
40+
status: "Active",
41+
facility__latitude_of_largest_emissions: "49.2",
42+
facility__longitude_of_largest_emissions: "-123.1",
3643
},
3744
],
3845
row_count: 2,
@@ -78,11 +85,11 @@ describe("FacilitiesDataGrid component", () => {
7885
// we don't care about the exact href, just that it contains the facilityId
7986
expect(viewDetailsLinks[0]).toHaveAttribute(
8087
"href",
81-
"/administration/operations/randomOperationUUID/facilities/1?operations_title=undefined&facilities_title=Facility 1",
88+
"/administration/operations/randomOperationUUID/facilities/3b5b95ea-2a1a-450d-8e2e-2e15feed96c1?operations_title=undefined&facilities_title=Facility 1",
8289
);
8390
expect(viewDetailsLinks[1]).toHaveAttribute(
8491
"href",
85-
"/administration/operations/randomOperationUUID/facilities/2?operations_title=undefined&facilities_title=Facility 2",
92+
"/administration/operations/randomOperationUUID/facilities/d99725a7-1c3a-47cb-a59b-e2388ce0fa18?operations_title=undefined&facilities_title=Facility 2",
8693
);
8794
});
8895
it("makes API call with correct params when sorting", async () => {

bciers/apps/administration/tests/components/facilities/FacilityForm.test.tsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ useRouter.mockReturnValue({
5252
const sfoFormData = {
5353
name: "Monkeyfuzz",
5454
type: "Single Facility",
55-
latitude_of_largest_emissions: "3.000000",
56-
longitude_of_largest_emissions: "4.000000",
55+
latitude_of_largest_emissions: 3,
56+
longitude_of_largest_emissions: 4,
5757
street_address: "adf",
5858
municipality: "ad",
5959
postal_code: "h0h0h0",
@@ -66,8 +66,8 @@ const lfoFormData = {
6666
name: "Monkeyfuzz",
6767
type: "Large Facility",
6868
well_authorization_numbers: ["24546", "54321"],
69-
latitude_of_largest_emissions: "3.000000",
70-
longitude_of_largest_emissions: "4.000000",
69+
latitude_of_largest_emissions: 3,
70+
longitude_of_largest_emissions: 4,
7171
street_address: "adf",
7272
municipality: "ad",
7373
postal_code: "h0h0h0",
@@ -480,10 +480,10 @@ describe("FacilityForm component", () => {
480480
).toHaveTextContent("h0h0h0");
481481
expect(
482482
container.querySelector("#root_section2_latitude_of_largest_emissions"),
483-
).toHaveTextContent("3.000000");
483+
).toHaveTextContent("3");
484484
expect(
485485
container.querySelector("#root_section2_longitude_of_largest_emissions"),
486-
).toHaveTextContent(".000000");
486+
).toHaveTextContent("4");
487487
});
488488
it("loads existing readonly LFO (Large Facility) form data", async () => {
489489
const { container } = render(
@@ -530,10 +530,10 @@ describe("FacilityForm component", () => {
530530
).toHaveTextContent("h0h0h0");
531531
expect(
532532
container.querySelector("#root_section1_latitude_of_largest_emissions"),
533-
).toHaveTextContent("3.000000");
533+
).toHaveTextContent("3");
534534
expect(
535535
container.querySelector("#root_section1_longitude_of_largest_emissions"),
536-
).toHaveTextContent(".000000");
536+
).toHaveTextContent("4");
537537
});
538538
it("loads existing readonly LFO (Small Aggregate) form data", async () => {
539539
const { container } = render(

bciers/apps/administration/tests/components/operations/OperationInformationForm.test.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ const optInFormData = {
188188
meets_producing_gger_schedule_a1_regulated_product: true,
189189
meets_reporting_and_regulated_obligations: true,
190190
meets_notification_to_director_on_criteria_change: true,
191+
final_reporting_year: null,
191192
},
192193
};
193194

bciers/apps/administration/tests/components/operations/OperationInformationPage.test.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ describe("the OperationInformationPage component", () => {
8585
});
8686
});
8787
it("renders the OperationInformationPage component without Registration Information", async () => {
88-
getOperationWithDocuments.mockResolvedValueOnce(formData);
88+
vi.mocked(getOperationWithDocuments).mockResolvedValueOnce(formData);
8989
render(await OperationInformationPage({ operationId }));
9090

9191
expect(
@@ -112,7 +112,7 @@ describe("the OperationInformationPage component", () => {
112112
});
113113

114114
it("should render the form without Registration Information", async () => {
115-
getOperationWithDocuments.mockResolvedValueOnce(formData);
115+
vi.mocked(getOperationWithDocuments).mockResolvedValueOnce(formData);
116116

117117
render(await OperationInformationPage({ operationId }));
118118

@@ -121,7 +121,7 @@ describe("the OperationInformationPage component", () => {
121121
expect(screen.getByText(/212114 - Bituminous coal mining/i)).toBeVisible();
122122
});
123123
it("should render the form with Registration Information", async () => {
124-
getOperationWithDocuments.mockResolvedValueOnce({
124+
vi.mocked(getOperationWithDocuments).mockResolvedValueOnce({
125125
status: OperationStatus.REGISTERED,
126126
});
127127

0 commit comments

Comments
 (0)