Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove authorizer and external authorizer attributes used in test data #3214

Merged
merged 5 commits into from
Jan 21, 2025
Merged

Remove authorizer and external authorizer attributes used in test data #3214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
62b79f9
refactor: remove authorizer and external authorizer attributes
maiyerlee Dec 12, 2024
379a4e7
chore: merge from main
maiyerlee Jan 21, 2025
790802a
chore: fix merge conflicts
maiyerlee Jan 21, 2025
3dcd117
chore: fix merge conflict data error
maiyerlee Jan 21, 2025
ac39032
chore: fix merge conflict data error again
maiyerlee Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions ...rc/components/Agreements/AgreementCANReviewAccordion/AgreementCANReviewAccordion.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,6 @@ const selectedBudgetLines = [
can: {
appropriation_date: "2023-10-01T00:00:00.000000Z",
active_period: 1,
authorizer_id: 26,
description: "Social Science Research and Development",
display_name: "G99PHS9",
expiration_date: "2024-09-01T00:00:00.000000Z",
Expand Down Expand Up @@ -452,7 +451,6 @@ const selectedBudgetLines = [
can: {
appropriation_date: "2022-10-01T00:00:00.000000Z",
active_period: 1,
authorizer_id: 26,
description: "Example CAN",
display_name: "G99XXX8",
expiration_date: "2023-09-01T00:00:00.000000Z",
Expand Down Expand Up @@ -1244,8 +1242,6 @@ const canFundingCardData = {
appropriation_date: "2023-10-01T00:00:00.000000Z",
active_period: 1,
arrangement_type: "OPRE_APPROPRIATION",
authorizer: 26,
authorizer_id: 26,
budget_line_items: [15011, 15017, 15020],
can_type: null,
created_by: null,
Expand All @@ -1255,7 +1251,6 @@ const canFundingCardData = {
display_name: "G99PHS9",
division_id: 6,
expiration_date: "2024-09-01T00:00:00.000000Z",
external_authorizer_id: null,
funding_sources: [26],
id: 502,
managing_portfolio: 8,
Expand Down Expand Up @@ -1297,8 +1292,6 @@ const canFundingCardData2 = {
appropriation_date: "2022-10-01T00:00:00.000000Z",
active_period: 1,
arrangement_type: "OPRE_APPROPRIATION",
authorizer: 26,
authorizer_id: 26,
budget_line_items: [15018, 15021],
can_type: null,
created_by: null,
Expand All @@ -1308,7 +1301,6 @@ const canFundingCardData2 = {
display_name: "G99XXX8",
division_id: 4,
expiration_date: "2023-09-01T00:00:00.000000Z",
external_authorizer_id: null,
funding_sources: [26],
id: 512,
managing_portfolio: 3,
Expand Down Expand Up @@ -1348,8 +1340,6 @@ const canFundingCard_G994426 = {
appropriation_date: "2023-10-01T00:00:00.000000Z",
active_period: 1,
arrangement_type: "OPRE_APPROPRIATION",
authorizer: 26,
authorizer_id: 26,
budget_line_items: [15000, 15001, 15012, 15022, 15023],
can_type: null,
created_by: null,
Expand All @@ -1359,7 +1349,6 @@ const canFundingCard_G994426 = {
display_name: "G994426",
division_id: 4,
expiration_date: "2024-09-01T00:00:00.000000Z",
external_authorizer_id: null,
funding_sources: [26],
id: 504,
managing_portfolio: 2,
Expand Down Expand Up @@ -1398,7 +1387,6 @@ const selectedBudgetLinesToAmount = [
can: {
appropriation_date: "2022-10-01T00:00:00.000000Z",
active_period: 1,
authorizer_id: 26,
description: "Example CAN",
display_name: "G99XXX8",
expiration_date: "2023-09-01T00:00:00.000000Z",
Expand Down
4 changes: 0 additions & 4 deletions frontend/src/components/CANs/CANFundingCard/CanFundingCard.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ describe("CanFundingCard", () => {
const canData = {
appropriation_date: "2023-10-01T00:00:00.000000Z",
active_period: 1,
authorizer_id: 26,
description: "Social Science Research and Development",
display_name: "G99PHS9",
expiration_date: "2024-09-01T00:00:00.000000Z",
Expand All @@ -61,8 +60,6 @@ const canFundingCardData = {
appropriation_date: "2023-10-01T00:00:00.000000Z",
active_period: 1,
arrangement_type: "OPRE_APPROPRIATION",
authorizer: 26,
authorizer_id: 26,
budget_line_items: [15011, 15017, 15020],
can_type: null,
created_by: null,
Expand All @@ -72,7 +69,6 @@ const canFundingCardData = {
display_name: "G99PHS9",
division_id: 6,
expiration_date: "2024-09-01T00:00:00.000000Z",
external_authorizer_id: null,
funding_sources: [26],
id: 502,
managing_portfolio: 8,
Expand Down
2 changes: 0 additions & 2 deletions frontend/src/components/CANs/CanCard/CanCard.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ const mockCan = {
display_name: "G994426",
division_id: 4,
expiration_date: "2024-09-01T00:00:00.000000Z",
external_authorizer_id: null,
funding_sources: [26],
id: 504,
managing_portfolio: 2,
Expand Down Expand Up @@ -109,7 +108,6 @@ const mockCanFundingData = {
display_name: "G994426",
division_id: 4,
expiration_date: "2024-09-01T00:00:00.000000Z",
external_authorizer_id: null,
funding_sources: [26],
id: 504,
managing_portfolio: 2,
Expand Down
12 changes: 3 additions & 9 deletions frontend/src/tests/data.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
export const budgetLine = {
agreement_id: 1,
agreement: {
name: "Contract #1: African American Child and Family Research Center",
agreement_type: "AgreementType.CONTRACT",
awarding_entity_id: 1
name: "Contract #1: African American Child and Family Research Center",
agreement_type: "AgreementType.CONTRACT",
awarding_entity_id: 1
},
amount: 1_000_000,
can: {
appropriation_date: "2023-10-01T00:00:00.000000Z",
active_period: 1,
authorizer_id: 525,
description: "Head Start Research",
expiration_date: "2024-09-01T00:00:00.000000Z",
id: 5,
Expand Down Expand Up @@ -54,7 +53,6 @@ export const agreement = {
can: {
appropriation_date: "2023-10-01T00:00:00.000000Z",
active_period: 1,
authorizer_id: 525,
description: "Head Start Research",
expiration_date: "2024-09-01T00:00:00.000000Z",
id: 5,
Expand Down Expand Up @@ -110,7 +108,6 @@ export const agreement = {
can: {
appropriation_date: "2023-10-01T00:00:00.000000Z",
active_period: 1,
authorizer_id: 525,
description: "Head Start Research",
expiration_date: "2024-09-01T00:00:00.000000Z",
id: 5,
Expand Down Expand Up @@ -602,7 +599,6 @@ export const budgetLineWithBudgetChangeRequest = {
can: {
appropriation_date: "2022-10-01T00:00:00.000000Z",
active_period: 1,
authorizer_id: 26,
description: "Example CAN",
display_name: "G99XXX8",
expiration_date: "2023-09-01T00:00:00.000000Z",
Expand Down Expand Up @@ -753,7 +749,6 @@ export const budgetLineWithStatusChangeRequestToPlanned = {
can: {
appropriation_date: "2023-10-01T00:00:00.000000Z",
active_period: 1,
authorizer_id: 26,
description: "Head Start Research",
display_name: "G994426",
expiration_date: "2024-09-01T00:00:00.000000Z",
Expand Down Expand Up @@ -852,7 +847,6 @@ export const budgetLineWithStatusChangeRequestToExecuting = {
can: {
appropriation_date: "2023-10-01T00:00:00.000000Z",
active_period: 1,
authorizer_id: 26,
description: "Social Science Research and Development",
display_name: "G99PHS9",
expiration_date: "2024-09-01T00:00:00.000000Z",
Expand Down
Loading