From d57f1f68840671fbcdd257e26d948519397c6eb1 Mon Sep 17 00:00:00 2001 From: Sasha Dresden Date: Tue, 15 Oct 2024 11:36:12 -0400 Subject: [PATCH 01/68] Commenting out dead links --- .../header-links/header-links.component.html | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/front-end/src/app/layout/header/header-links/header-links.component.html b/front-end/src/app/layout/header/header-links/header-links.component.html index c4526beff..125fc6cb7 100644 --- a/front-end/src/app/layout/header/header-links/header-links.component.html +++ b/front-end/src/app/layout/header/header-links/header-links.component.html @@ -6,11 +6,11 @@
  • Reports
    • -
  • +
  • Contacts
    • @@ -28,19 +28,19 @@ -
  • - - + - Notifications -
    • + -->
  • Account Users - Switch Committees - User Profile + + Logout
    • From 73b7afd6e98d56d757c2ff13b0c819c17db1a62a Mon Sep 17 00:00:00 2001 From: Sasha Dresden Date: Wed, 16 Oct 2024 17:16:29 -0400 Subject: [PATCH 02/68] Fix issues with page overflow when sidebar screens --- front-end/src/app/layout/layout.component.html | 6 ++---- front-end/src/app/layout/layout.component.scss | 7 +++++-- .../transaction-list/transaction-list.component.html | 2 +- front-end/src/assets/styles/theme.css | 1 + 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/front-end/src/app/layout/layout.component.html b/front-end/src/app/layout/layout.component.html index 93cb98318..4b220fa2f 100644 --- a/front-end/src/app/layout/layout.component.html +++ b/front-end/src/app/layout/layout.component.html @@ -17,10 +17,8 @@ -
    -
    - -
    +
    +
    diff --git a/front-end/src/app/layout/layout.component.scss b/front-end/src/app/layout/layout.component.scss index 63958a662..98e50a56c 100644 --- a/front-end/src/app/layout/layout.component.scss +++ b/front-end/src/app/layout/layout.component.scss @@ -1,5 +1,8 @@ #sidebar-container { min-height: calc(100vh - 2rem); + width: 250px; + min-width: 250px; + max-width: 250px; } .main-content { @@ -11,7 +14,7 @@ .sidebar-content-container > .main-content { margin-left: 32px; margin-right: 0; - width: 100%; + width: calc(100% - 64px); } .header-container { @@ -38,7 +41,7 @@ app-footer { .sidebar-content-container { min-height: calc(100vh - 2rem); - width: 100%; + width: calc(100% - 250px); display: flex; flex-direction: column; } diff --git a/front-end/src/app/reports/transactions/transaction-list/transaction-list.component.html b/front-end/src/app/reports/transactions/transaction-list/transaction-list.component.html index 34b3f9867..2d363b036 100644 --- a/front-end/src/app/reports/transactions/transaction-list/transaction-list.component.html +++ b/front-end/src/app/reports/transactions/transaction-list/transaction-list.component.html @@ -1,4 +1,4 @@ -
    +
    diff --git a/front-end/src/assets/styles/theme.css b/front-end/src/assets/styles/theme.css index 2a5b3b098..2fdd6c6a1 100644 --- a/front-end/src/assets/styles/theme.css +++ b/front-end/src/assets/styles/theme.css @@ -3827,6 +3827,7 @@ p-treeselect.p-treeselect-clearable .p-treeselect-clear-icon { .p-paginator { background: #ffffff; color: #112e51; + min-width: 167px; } .p-paginator .p-paginator-first, From 9ebb947a3bc746c77d30e2f49ab5b8ab9dc88ad4 Mon Sep 17 00:00:00 2001 From: Sasha Dresden Date: Wed, 16 Oct 2024 17:37:27 -0400 Subject: [PATCH 03/68] Make dates validate on change instead of blur --- .../f3x/create-workflow/cash-on-hand.component.ts | 4 +++- .../double-transaction-type-base.component.ts | 4 +++- .../reatt-redes-transaction-type-base.component.ts | 9 ++++++--- .../triple-transaction-type-base.component.ts | 4 +++- front-end/src/app/shared/utils/schema.utils.ts | 6 +++++- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/front-end/src/app/reports/f3x/create-workflow/cash-on-hand.component.ts b/front-end/src/app/reports/f3x/create-workflow/cash-on-hand.component.ts index c4586da72..79a0278ff 100644 --- a/front-end/src/app/reports/f3x/create-workflow/cash-on-hand.component.ts +++ b/front-end/src/app/reports/f3x/create-workflow/cash-on-hand.component.ts @@ -21,7 +21,9 @@ export class CashOnHandComponent extends DestroyerComponent implements OnInit { formProperties: string[] = ['L6a_cash_on_hand_jan_1_ytd', 'cash_on_hand_date']; report: Form3X | undefined; formSubmitted = false; - form: FormGroup = this.fb.group(SchemaUtils.getFormGroupFields(this.formProperties), { updateOn: 'blur' }); + form: FormGroup = this.fb.group(SchemaUtils.getFormGroupFieldsNoBlur(this.formProperties, this.fb), { + updateOn: 'blur', + }); constructor( public router: Router, diff --git a/front-end/src/app/shared/components/transaction-type-base/double-transaction-type-base.component.ts b/front-end/src/app/shared/components/transaction-type-base/double-transaction-type-base.component.ts index 6eaa152c4..e94811206 100644 --- a/front-end/src/app/shared/components/transaction-type-base/double-transaction-type-base.component.ts +++ b/front-end/src/app/shared/components/transaction-type-base/double-transaction-type-base.component.ts @@ -65,7 +65,9 @@ export abstract class DoubleTransactionTypeBaseComponent this.childTemplateMap = this.childTransactionType.templateMap; this.childContactTypeOptions = getContactTypeOptions(this.childTransactionType.contactTypeOptions ?? []); this.childFormProperties = this.childTransactionType.getFormControlNames(); - this.childForm = this.fb.group(SchemaUtils.getFormGroupFields(this.childFormProperties), { updateOn: 'blur' }); + this.childForm = this.fb.group(SchemaUtils.getFormGroupFieldsNoBlur(this.childFormProperties, this.fb), { + updateOn: 'blur', + }); if ( this.childTransactionType diff --git a/front-end/src/app/shared/components/transaction-type-base/reatt-redes-transaction-type-base.component.ts b/front-end/src/app/shared/components/transaction-type-base/reatt-redes-transaction-type-base.component.ts index 9e0108e39..b5d9368a2 100644 --- a/front-end/src/app/shared/components/transaction-type-base/reatt-redes-transaction-type-base.component.ts +++ b/front-end/src/app/shared/components/transaction-type-base/reatt-redes-transaction-type-base.component.ts @@ -104,9 +104,12 @@ export abstract class ReattRedesTransactionTypeBaseComponent reatRedes.transactionType.contactTypeOptions ?? [], ); - this.reattributedData.form = this.fb.group(SchemaUtils.getFormGroupFields(this.reattributedData.formProperties), { - updateOn: 'blur', - }); + this.reattributedData.form = this.fb.group( + SchemaUtils.getFormGroupFieldsNoBlur(this.reattributedData.formProperties, this.fb), + { + updateOn: 'blur', + }, + ); this.reattributedData.contactIdMap = {}; this.reattributedData.memoCodeCheckboxLabel$ = this.getMemoCodeCheckboxLabel$( this.reattributedData.form, diff --git a/front-end/src/app/shared/components/transaction-type-base/triple-transaction-type-base.component.ts b/front-end/src/app/shared/components/transaction-type-base/triple-transaction-type-base.component.ts index 2671c8b95..a46bb8112 100644 --- a/front-end/src/app/shared/components/transaction-type-base/triple-transaction-type-base.component.ts +++ b/front-end/src/app/shared/components/transaction-type-base/triple-transaction-type-base.component.ts @@ -65,7 +65,9 @@ export abstract class TripleTransactionTypeBaseComponent this.childTemplateMap_2 = this.childTransactionType_2.templateMap; this.childContactTypeOptions_2 = getContactTypeOptions(this.childTransactionType_2.contactTypeOptions ?? []); this.childFormProperties_2 = this.childTransactionType_2.getFormControlNames(); - this.childForm_2 = this.fb.group(SchemaUtils.getFormGroupFields(this.childFormProperties_2), { updateOn: 'blur' }); + this.childForm_2 = this.fb.group(SchemaUtils.getFormGroupFieldsNoBlur(this.childFormProperties_2, this.fb), { + updateOn: 'blur', + }); if ( this.childTransactionType_2 diff --git a/front-end/src/app/shared/utils/schema.utils.ts b/front-end/src/app/shared/utils/schema.utils.ts index bb8e72f1a..9234a673b 100644 --- a/front-end/src/app/shared/utils/schema.utils.ts +++ b/front-end/src/app/shared/utils/schema.utils.ts @@ -41,12 +41,16 @@ export class SchemaUtils { static getFormGroupFieldsNoBlur(properties: string[], fb: FormBuilder) { const group: any = {}; // eslint-disable-line @typescript-eslint/no-explicit-any properties.forEach((property) => { - group[property] = fb.control('', SchemaUtils.noBlur.includes(property) ? { updateOn: 'change' } : {}); + group[property] = fb.control('', SchemaUtils.isNoBlur(property) ? { updateOn: 'change' } : {}); }); return group; } + private static isNoBlur(property: string) { + return property.includes('date') || SchemaUtils.noBlur.includes(property); + } + /** * * @param {FormGroup} form From d3fd7b6fb286a7fbeea1231292c529f4c33587e5 Mon Sep 17 00:00:00 2001 From: David Heitzer Date: Thu, 17 Oct 2024 00:22:42 -0400 Subject: [PATCH 04/68] 1118 add update coh page --- .../cash-on-hand-override.component.html | 65 +++++++++++++++++++ .../cash-on-hand-override.component.scss | 0 .../cash-on-hand-override.component.spec.ts | 33 ++++++++++ .../cash-on-hand-override.component.ts | 55 ++++++++++++++++ .../shared/services/form-3x.service.spec.ts | 13 ++++ .../app/shared/services/form-3x.service.ts | 27 +++++++- 6 files changed, 191 insertions(+), 2 deletions(-) create mode 100644 front-end/src/app/reports/f3x/cash-on-hand-override/cash-on-hand-override.component.html create mode 100644 front-end/src/app/reports/f3x/cash-on-hand-override/cash-on-hand-override.component.scss create mode 100644 front-end/src/app/reports/f3x/cash-on-hand-override/cash-on-hand-override.component.spec.ts create mode 100644 front-end/src/app/reports/f3x/cash-on-hand-override/cash-on-hand-override.component.ts diff --git a/front-end/src/app/reports/f3x/cash-on-hand-override/cash-on-hand-override.component.html b/front-end/src/app/reports/f3x/cash-on-hand-override/cash-on-hand-override.component.html new file mode 100644 index 000000000..77a294c05 --- /dev/null +++ b/front-end/src/app/reports/f3x/cash-on-hand-override/cash-on-hand-override.component.html @@ -0,0 +1,65 @@ +

    Line 6a override

    +
    +
    +
    + WHAT IS A LINE 6A OVERRIDE? +

    + When there is a discrepancy between the reported (FECFile-calculated) cash on hand and the correct + (committee-calculated) cash on hand, committees filing a Form 3X can override the reported cash on hand by + manually entering an amount for Line 6(a). If your committee overrides Line 6(a), it will adjust the cash on hand + for any reports in that calendar year (submitted or in-progress) and amendments may need to be submitted. Further, + if the cash on hand is overridden on a report from a prior year, reports in subsequent years will also be adjusted + and amendments may be needed. +

    + NEED HELP? +

    + If you’re unsure whether an override is the right choice for your committee, please reach out to your assigned campaign finance analyst for guidance. +

    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    diff --git a/front-end/src/app/reports/f3x/cash-on-hand-override/cash-on-hand-override.component.scss b/front-end/src/app/reports/f3x/cash-on-hand-override/cash-on-hand-override.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/front-end/src/app/reports/f3x/cash-on-hand-override/cash-on-hand-override.component.spec.ts b/front-end/src/app/reports/f3x/cash-on-hand-override/cash-on-hand-override.component.spec.ts new file mode 100644 index 000000000..344164091 --- /dev/null +++ b/front-end/src/app/reports/f3x/cash-on-hand-override/cash-on-hand-override.component.spec.ts @@ -0,0 +1,33 @@ +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { provideMockStore } from '@ngrx/store/testing'; +import { testMockStore } from 'app/shared/utils/unit-test.utils'; +import { SharedModule } from 'primeng/api'; +import { DividerModule } from 'primeng/divider'; +import { DropdownModule } from 'primeng/dropdown'; +import { CashOnHandOverrideComponent } from './cash-on-hand-override.component'; + +describe('CashOnHandOverrideComponent', () => { + let component: CashOnHandOverrideComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + providers: [provideMockStore(testMockStore)], + declarations: [CashOnHandOverrideComponent], + imports: [DividerModule, DropdownModule, HttpClientTestingModule, FormsModule, ReactiveFormsModule, SharedModule], + }).compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(CashOnHandOverrideComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + +}); diff --git a/front-end/src/app/reports/f3x/cash-on-hand-override/cash-on-hand-override.component.ts b/front-end/src/app/reports/f3x/cash-on-hand-override/cash-on-hand-override.component.ts new file mode 100644 index 000000000..547b24595 --- /dev/null +++ b/front-end/src/app/reports/f3x/cash-on-hand-override/cash-on-hand-override.component.ts @@ -0,0 +1,55 @@ +import { Component, OnInit } from '@angular/core'; +import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { DestroyerComponent } from 'app/shared/components/app-destroyer.component'; +import { Form3XService } from 'app/shared/services/form-3x.service'; +import { takeUntil } from 'rxjs'; + +@Component({ + selector: 'app-cash-on-hand-override', + templateUrl: './cash-on-hand-override.component.html', + styleUrls: ['./cash-on-hand-override.component.scss'], +}) +export class CashOnHandOverrideComponent extends DestroyerComponent implements OnInit { + yearFormControl = new FormControl(null, Validators.required); + currentAmountFormControl = new FormControl(null, Validators.required); + newAmountFormControl = new FormControl(null, Validators.required); + yearOptions: number[] = []; + numberOfYearOptions = 25 + + form: FormGroup = new FormGroup({ + year: this.yearFormControl, + currentAmount: this.currentAmountFormControl, + newAmount: this.newAmountFormControl, + }); + + constructor( + private form3XService: Form3XService, + ) { + super(); + } + + ngOnInit(): void { + this.yearFormControl.valueChanges.pipe(takeUntil(this.destroy$)) + .subscribe((year) => { + if (year) { + this.form3XService.getJan1CashOnHand(year).then(cashOnHandForYear => { + this.currentAmountFormControl.setValue(cashOnHandForYear); + }); + } + }); + + const currentYear = new Date().getFullYear(); + this.yearOptions = Array.from( + { length: this.numberOfYearOptions }, + (value, index) => currentYear - this.numberOfYearOptions + index + ); + this.yearFormControl.setValue(this.yearOptions[this.yearOptions.length - 1]); + } + + updateLine6a(): void { + if (this.form.valid) { + this.form3XService.updateJan1CashOnHand(this.form.get('year')?.value, + this.form.get('amount')?.value).then(() => { }); + } + } +} diff --git a/front-end/src/app/shared/services/form-3x.service.spec.ts b/front-end/src/app/shared/services/form-3x.service.spec.ts index 84f34c1c5..fd1cccc42 100644 --- a/front-end/src/app/shared/services/form-3x.service.spec.ts +++ b/front-end/src/app/shared/services/form-3x.service.spec.ts @@ -65,6 +65,19 @@ describe('Form3XService', () => { httpTestingController.verify(); }); + it('#delete() should DELETE a record2', () => { + const form3X: Form3X = Form3X.fromJSON({ id: '999' }); + + service.delete(form3X).subscribe((response: null) => { + expect(response).toBeTrue(); + }); + + const req = httpTestingController.expectOne(`${environment.apiUrl}/reports/form-3x/999`); + expect(req.request.method).toEqual('DELETE'); + req.flush(null); + httpTestingController.verify(); + }); + describe('getFutureReports', () => { it('should return a list of Form3X reports whose coverage through is after the submitted value', () => { service.getFutureReports('2024-01-20').subscribe((reports) => { diff --git a/front-end/src/app/shared/services/form-3x.service.ts b/front-end/src/app/shared/services/form-3x.service.ts index a1c7989dc..378a0cb60 100644 --- a/front-end/src/app/shared/services/form-3x.service.ts +++ b/front-end/src/app/shared/services/form-3x.service.ts @@ -4,10 +4,10 @@ import { BehaviorSubject, Observable, firstValueFrom } from 'rxjs'; import { map } from 'rxjs/operators'; import { CommitteeAccount } from '../models/committee-account.model'; import { F3xCoverageDates, Form3X } from '../models/form-3x.model'; -import { ApiService } from './api.service'; -import { ReportService } from './report.service'; import { Report } from '../models/report.model'; import { F3xReportCodes } from '../utils/report-code.utils'; +import { ApiService } from './api.service'; +import { ReportService } from './report.service'; @Injectable({ providedIn: 'root', @@ -51,6 +51,29 @@ export class Form3XService extends ReportService { .pipe(map((response) => response.map((r) => Form3X.fromJSON(r)))); } + public getJan1CashOnHand(year: number): Promise { + return firstValueFrom( + this.apiService + .get(`${this.apiEndpoint}/jan1_cash_on_hand?year=${year}`) + .pipe( + map((response) => response), + ), + ); + } + + public updateJan1CashOnHand(year: number, amount: number): Promise { + return firstValueFrom( + this.apiService + .put(`${this.apiEndpoint}/jan1_cash_on_hand`, { + "year": year, + "amount": amount, + }) + .pipe( + map((response) => response), + ), + ); + } + // eslint-disable-next-line @typescript-eslint/no-unused-vars public isQualifiedCommittee(committeeAccount?: CommitteeAccount) { return true; From f8cdb6b23f9ca9f636cc0ac5f8432964afbcda16 Mon Sep 17 00:00:00 2001 From: David Heitzer Date: Thu, 17 Oct 2024 20:47:02 -0400 Subject: [PATCH 05/68] 1118 local testing --- .../header-links/header-links.component.html | 2 +- .../cash-on-hand-override.component.spec.ts | 33 ------------ .../cash-on-hand-override.component.html | 6 +-- .../cash-on-hand-override.component.scss | 0 .../cash-on-hand-override.component.spec.ts | 52 +++++++++++++++++++ .../cash-on-hand-override.component.ts | 4 +- .../src/app/tools/tools-routing.module.ts | 15 ++++-- front-end/src/app/tools/tools.module.ts | 22 ++++++-- 8 files changed, 88 insertions(+), 46 deletions(-) delete mode 100644 front-end/src/app/reports/f3x/cash-on-hand-override/cash-on-hand-override.component.spec.ts rename front-end/src/app/{reports/f3x => tools}/cash-on-hand-override/cash-on-hand-override.component.html (94%) rename front-end/src/app/{reports/f3x => tools}/cash-on-hand-override/cash-on-hand-override.component.scss (100%) create mode 100644 front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.spec.ts rename front-end/src/app/{reports/f3x => tools}/cash-on-hand-override/cash-on-hand-override.component.ts (97%) diff --git a/front-end/src/app/layout/header/header-links/header-links.component.html b/front-end/src/app/layout/header/header-links/header-links.component.html index c4526beff..aab6dfb64 100644 --- a/front-end/src/app/layout/header/header-links/header-links.component.html +++ b/front-end/src/app/layout/header/header-links/header-links.component.html @@ -30,7 +30,7 @@ Import Export - Update cash on hand + Update cash on hand FECFile Help diff --git a/front-end/src/app/reports/f3x/cash-on-hand-override/cash-on-hand-override.component.spec.ts b/front-end/src/app/reports/f3x/cash-on-hand-override/cash-on-hand-override.component.spec.ts deleted file mode 100644 index 344164091..000000000 --- a/front-end/src/app/reports/f3x/cash-on-hand-override/cash-on-hand-override.component.spec.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { provideMockStore } from '@ngrx/store/testing'; -import { testMockStore } from 'app/shared/utils/unit-test.utils'; -import { SharedModule } from 'primeng/api'; -import { DividerModule } from 'primeng/divider'; -import { DropdownModule } from 'primeng/dropdown'; -import { CashOnHandOverrideComponent } from './cash-on-hand-override.component'; - -describe('CashOnHandOverrideComponent', () => { - let component: CashOnHandOverrideComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - providers: [provideMockStore(testMockStore)], - declarations: [CashOnHandOverrideComponent], - imports: [DividerModule, DropdownModule, HttpClientTestingModule, FormsModule, ReactiveFormsModule, SharedModule], - }).compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(CashOnHandOverrideComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); - -}); diff --git a/front-end/src/app/reports/f3x/cash-on-hand-override/cash-on-hand-override.component.html b/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.html similarity index 94% rename from front-end/src/app/reports/f3x/cash-on-hand-override/cash-on-hand-override.component.html rename to front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.html index 77a294c05..bf163a4ce 100644 --- a/front-end/src/app/reports/f3x/cash-on-hand-override/cash-on-hand-override.component.html +++ b/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.html @@ -1,6 +1,6 @@

    Line 6a override

    -
    +
    WHAT IS A LINE 6A OVERRIDE?

    @@ -31,7 +31,7 @@

    Line 6a override

    @@ -42,7 +42,7 @@

    Line 6a override

    diff --git a/front-end/src/app/reports/f3x/cash-on-hand-override/cash-on-hand-override.component.scss b/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.scss similarity index 100% rename from front-end/src/app/reports/f3x/cash-on-hand-override/cash-on-hand-override.component.scss rename to front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.scss diff --git a/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.spec.ts b/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.spec.ts new file mode 100644 index 000000000..c88616c58 --- /dev/null +++ b/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.spec.ts @@ -0,0 +1,52 @@ +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { Router } from '@angular/router'; +import { provideMockStore } from '@ngrx/store/testing'; +import { ReportsModule } from 'app/reports/reports.module'; +import { Form3XService } from 'app/shared/services/form-3x.service'; +import { testMockStore } from 'app/shared/utils/unit-test.utils'; +import { CashOnHandOverrideComponent } from './cash-on-hand-override.component'; + +describe('CashOnHandOverrideComponent', () => { + let component: CashOnHandOverrideComponent; + let router: Router; + let fixture: ComponentFixture; + let form3XService: Form3XService; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [CashOnHandOverrideComponent], + imports: [ + HttpClientTestingModule, + ReportsModule, + ], + providers: [Form3XService, provideMockStore(testMockStore)], + }).compileComponents(); + }); + + beforeEach(() => { + router = TestBed.inject(Router); + form3XService = TestBed.inject(Form3XService); + fixture = TestBed.createComponent(CashOnHandOverrideComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + expect(router).toBeTruthy(); + expect(form3XService).toBeTruthy(); + }); + + it('should call updateJan1CashOnHand', () => { + spyOn(component.form3XService, 'updateJan1CashOnHand').and.resolveTo(); + component.yearFormControl.setValue(2024); + component.currentAmountFormControl.setValue(0.00); + component.newAmountFormControl.setValue(25.00); + + component.updateLine6a(); + + expect(component.form3XService.updateJan1CashOnHand).toHaveBeenCalledTimes(1); + }); + +}); diff --git a/front-end/src/app/reports/f3x/cash-on-hand-override/cash-on-hand-override.component.ts b/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.ts similarity index 97% rename from front-end/src/app/reports/f3x/cash-on-hand-override/cash-on-hand-override.component.ts rename to front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.ts index 547b24595..1b630d260 100644 --- a/front-end/src/app/reports/f3x/cash-on-hand-override/cash-on-hand-override.component.ts +++ b/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.ts @@ -23,7 +23,7 @@ export class CashOnHandOverrideComponent extends DestroyerComponent implements O }); constructor( - private form3XService: Form3XService, + public form3XService: Form3XService, ) { super(); } @@ -41,7 +41,7 @@ export class CashOnHandOverrideComponent extends DestroyerComponent implements O const currentYear = new Date().getFullYear(); this.yearOptions = Array.from( { length: this.numberOfYearOptions }, - (value, index) => currentYear - this.numberOfYearOptions + index + (value, index) => currentYear - this.numberOfYearOptions + index + 1, ); this.yearFormControl.setValue(this.yearOptions[this.yearOptions.length - 1]); } diff --git a/front-end/src/app/tools/tools-routing.module.ts b/front-end/src/app/tools/tools-routing.module.ts index 89bcbe571..1dbba5e9d 100644 --- a/front-end/src/app/tools/tools-routing.module.ts +++ b/front-end/src/app/tools/tools-routing.module.ts @@ -1,10 +1,19 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; +import { CashOnHandOverrideComponent } from './cash-on-hand-override/cash-on-hand-override.component'; -const routes: Routes = [{ path: '**', redirectTo: '' }]; +const routes: Routes = [ + { + path: 'update-cash-on-hand', + component: CashOnHandOverrideComponent, + title: 'Update cash on hand', + pathMatch: 'full', + }, + { path: '**', redirectTo: '' }, +]; @NgModule({ imports: [RouterModule.forChild(routes)], exports: [RouterModule], }) -export class ToolsRoutingModule {} +export class ToolsRoutingModule { } diff --git a/front-end/src/app/tools/tools.module.ts b/front-end/src/app/tools/tools.module.ts index 137ae6613..751e79fc9 100644 --- a/front-end/src/app/tools/tools.module.ts +++ b/front-end/src/app/tools/tools.module.ts @@ -1,8 +1,22 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { SharedModule } from 'app/shared/shared.module'; +import { DropdownModule } from 'primeng/dropdown'; +import { CashOnHandOverrideComponent } from './cash-on-hand-override/cash-on-hand-override.component'; +import { ToolsRoutingModule } from './tools-routing.module'; @NgModule({ - declarations: [], - imports: [CommonModule], + declarations: [ + CashOnHandOverrideComponent, + ], + imports: [ + CommonModule, + FormsModule, + ReactiveFormsModule, + DropdownModule, + SharedModule, + ToolsRoutingModule, + ], }) -export class ToolsModule {} +export class ToolsModule { } From b21e65e777ff22ce164b29dc8ea54886d6357cc8 Mon Sep 17 00:00:00 2001 From: David Heitzer Date: Fri, 18 Oct 2024 01:00:44 -0400 Subject: [PATCH 06/68] 1118 local testing --- .../app/shared/services/form-3x.service.ts | 14 +- .../cash-on-hand-override.component.html | 121 +++++++++--------- .../cash-on-hand-override.component.spec.ts | 10 +- .../cash-on-hand-override.component.ts | 28 ++-- .../src/app/tools/tools-routing.module.ts | 2 +- front-end/src/app/tools/tools.module.ts | 10 +- 6 files changed, 92 insertions(+), 93 deletions(-) diff --git a/front-end/src/app/shared/services/form-3x.service.ts b/front-end/src/app/shared/services/form-3x.service.ts index 378a0cb60..d45e45d1a 100644 --- a/front-end/src/app/shared/services/form-3x.service.ts +++ b/front-end/src/app/shared/services/form-3x.service.ts @@ -55,22 +55,18 @@ export class Form3XService extends ReportService { return firstValueFrom( this.apiService .get(`${this.apiEndpoint}/jan1_cash_on_hand?year=${year}`) - .pipe( - map((response) => response), - ), + .pipe(map((response) => response)), ); } public updateJan1CashOnHand(year: number, amount: number): Promise { return firstValueFrom( this.apiService - .put(`${this.apiEndpoint}/jan1_cash_on_hand`, { - "year": year, - "amount": amount, + .put(`${this.apiEndpoint}/jan1_cash_on_hand/`, { + year: year, + amount: amount, }) - .pipe( - map((response) => response), - ), + .pipe(map((response) => response)), ); } diff --git a/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.html b/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.html index bf163a4ce..5f30a6af1 100644 --- a/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.html +++ b/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.html @@ -1,65 +1,70 @@ -

    Line 6a override

    -
    - -
    - WHAT IS A LINE 6A OVERRIDE? -

    - When there is a discrepancy between the reported (FECFile-calculated) cash on hand and the correct - (committee-calculated) cash on hand, committees filing a Form 3X can override the reported cash on hand by - manually entering an amount for Line 6(a). If your committee overrides Line 6(a), it will adjust the cash on hand - for any reports in that calendar year (submitted or in-progress) and amendments may need to be submitted. Further, - if the cash on hand is overridden on a report from a prior year, reports in subsequent years will also be adjusted - and amendments may be needed. -

    - NEED HELP? -

    - If you’re unsure whether an override is the right choice for your committee, please reach out to your assigned campaign finance analyst for guidance. -

    -
    -
    -
    -
    -
    - - -
    -
    +
    +

    Line 6a override

    +
    + +
    + WHAT IS A LINE 6A OVERRIDE? +

    + When there is a discrepancy between the reported (FECFile-calculated) cash on hand and the correct + (committee-calculated) cash on hand, committees filing a Form 3X can override the reported cash on hand by + manually entering an amount for Line 6(a). If your committee overrides Line 6(a), it will adjust the cash on + hand for any reports in that calendar year (submitted or in-progress) and amendments may need to be submitted. + Further, if the cash on hand is overridden on a report from a prior year, reports in subsequent years will also + be adjusted and amendments may be needed. +

    + NEED HELP? +

    + If you’re unsure whether an override is the right choice for your committee, please reach out to your assigned + campaign finance analyst for guidance. +

    -
    -
    -
    - - +
    +
    +
    +
    + + +
    -
    -
    - - +
    +
    +
    + + +
    +
    +
    +
    + + +
    -
    -
    -
    - +
    +
    + +
    -
    -
    - +
    + +
    diff --git a/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.spec.ts b/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.spec.ts index c88616c58..3b26e93ec 100644 --- a/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.spec.ts +++ b/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.spec.ts @@ -16,10 +16,7 @@ describe('CashOnHandOverrideComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ declarations: [CashOnHandOverrideComponent], - imports: [ - HttpClientTestingModule, - ReportsModule, - ], + imports: [HttpClientTestingModule, ReportsModule], providers: [Form3XService, provideMockStore(testMockStore)], }).compileComponents(); }); @@ -41,12 +38,11 @@ describe('CashOnHandOverrideComponent', () => { it('should call updateJan1CashOnHand', () => { spyOn(component.form3XService, 'updateJan1CashOnHand').and.resolveTo(); component.yearFormControl.setValue(2024); - component.currentAmountFormControl.setValue(0.00); - component.newAmountFormControl.setValue(25.00); + component.currentAmountFormControl.setValue(0.0); + component.newAmountFormControl.setValue(25.0); component.updateLine6a(); expect(component.form3XService.updateJan1CashOnHand).toHaveBeenCalledTimes(1); }); - }); diff --git a/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.ts b/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.ts index 1b630d260..a15f151a5 100644 --- a/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.ts +++ b/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.ts @@ -14,7 +14,7 @@ export class CashOnHandOverrideComponent extends DestroyerComponent implements O currentAmountFormControl = new FormControl(null, Validators.required); newAmountFormControl = new FormControl(null, Validators.required); yearOptions: number[] = []; - numberOfYearOptions = 25 + numberOfYearOptions = 25; form: FormGroup = new FormGroup({ year: this.yearFormControl, @@ -22,21 +22,18 @@ export class CashOnHandOverrideComponent extends DestroyerComponent implements O newAmount: this.newAmountFormControl, }); - constructor( - public form3XService: Form3XService, - ) { + constructor(public form3XService: Form3XService) { super(); } ngOnInit(): void { - this.yearFormControl.valueChanges.pipe(takeUntil(this.destroy$)) - .subscribe((year) => { - if (year) { - this.form3XService.getJan1CashOnHand(year).then(cashOnHandForYear => { - this.currentAmountFormControl.setValue(cashOnHandForYear); - }); - } - }); + this.yearFormControl.valueChanges.pipe(takeUntil(this.destroy$)).subscribe((year) => { + if (year) { + this.form3XService.getJan1CashOnHand(year).then((cashOnHandForYear) => { + this.currentAmountFormControl.setValue(cashOnHandForYear); + }); + } + }); const currentYear = new Date().getFullYear(); this.yearOptions = Array.from( @@ -48,8 +45,11 @@ export class CashOnHandOverrideComponent extends DestroyerComponent implements O updateLine6a(): void { if (this.form.valid) { - this.form3XService.updateJan1CashOnHand(this.form.get('year')?.value, - this.form.get('amount')?.value).then(() => { }); + if (this.yearFormControl.value && this.newAmountFormControl.value) { + this.form3XService + .updateJan1CashOnHand(this.yearFormControl.value, this.newAmountFormControl.value) + .then(() => {}); + } } } } diff --git a/front-end/src/app/tools/tools-routing.module.ts b/front-end/src/app/tools/tools-routing.module.ts index 1dbba5e9d..4526a7259 100644 --- a/front-end/src/app/tools/tools-routing.module.ts +++ b/front-end/src/app/tools/tools-routing.module.ts @@ -16,4 +16,4 @@ const routes: Routes = [ imports: [RouterModule.forChild(routes)], exports: [RouterModule], }) -export class ToolsRoutingModule { } +export class ToolsRoutingModule {} diff --git a/front-end/src/app/tools/tools.module.ts b/front-end/src/app/tools/tools.module.ts index 751e79fc9..ba159f8e7 100644 --- a/front-end/src/app/tools/tools.module.ts +++ b/front-end/src/app/tools/tools.module.ts @@ -5,11 +5,11 @@ import { SharedModule } from 'app/shared/shared.module'; import { DropdownModule } from 'primeng/dropdown'; import { CashOnHandOverrideComponent } from './cash-on-hand-override/cash-on-hand-override.component'; import { ToolsRoutingModule } from './tools-routing.module'; +import { CardModule } from 'primeng/card'; +import { ButtonModule } from 'primeng/button'; @NgModule({ - declarations: [ - CashOnHandOverrideComponent, - ], + declarations: [CashOnHandOverrideComponent], imports: [ CommonModule, FormsModule, @@ -17,6 +17,8 @@ import { ToolsRoutingModule } from './tools-routing.module'; DropdownModule, SharedModule, ToolsRoutingModule, + CardModule, + ButtonModule, ], }) -export class ToolsModule { } +export class ToolsModule {} From 2e6486574527c020cdfa48ecad562de97df4f405 Mon Sep 17 00:00:00 2001 From: Elaine Krauss Date: Fri, 18 Oct 2024 15:15:48 -0400 Subject: [PATCH 07/68] Fixes the login process by removing the fixture that was being used to stub out the real response --- front-end/cypress/e2e/pages/loginPage.ts | 8 +- .../fixtures/FEC_Get_Committee_Account.json | 87 ------------------- 2 files changed, 2 insertions(+), 93 deletions(-) delete mode 100644 front-end/cypress/fixtures/FEC_Get_Committee_Account.json diff --git a/front-end/cypress/e2e/pages/loginPage.ts b/front-end/cypress/e2e/pages/loginPage.ts index a5236f7b3..ee1effe94 100644 --- a/front-end/cypress/e2e/pages/loginPage.ts +++ b/front-end/cypress/e2e/pages/loginPage.ts @@ -56,12 +56,8 @@ function getLoginIntervalString(sessionDur: number): string { } function loginDotGovLogin() { - const committeeID = Cypress.env('COMMITTEE_ID'); - cy.intercept('GET', 'http://localhost:8080/api/v1/oidc/login-redirect').as('GetLoggedIn'); - cy.intercept('GET', `http://localhost:8080/api/v1/openfec/${committeeID}/committee/?check_can_create=false`, { - fixture: 'FEC_Get_Committee_Account', - }).as('GetCommitteeAccounts'); + cy.intercept('GET', 'http://localhost:8080/api/v1/committees/').as('GetCommitteeAccounts'); cy.intercept('POST', 'http://localhost:8080/api/v1/committees/*/activate/').as('ActivateCommittee'); cy.visit('/'); @@ -74,7 +70,7 @@ function loginDotGovLogin() { cy.wait('@GetCommitteeAccounts'); cy.get('.committee-list .committee-info').first().click(); cy.wait('@ActivateCommittee'); - cy.visit('/dashboard'); + //cy.visit('/dashboard'); } function retrieveAuthToken() { diff --git a/front-end/cypress/fixtures/FEC_Get_Committee_Account.json b/front-end/cypress/fixtures/FEC_Get_Committee_Account.json deleted file mode 100644 index 1d72b943b..000000000 --- a/front-end/cypress/fixtures/FEC_Get_Committee_Account.json +++ /dev/null @@ -1,87 +0,0 @@ -{ - "api_version":"1.0", - "results":[ - { - "custodian_name_2":null, - "custodian_name_middle":null, - "last_file_date":"2017-01-25", - "treasurer_phone":null, - "treasurer_name_title":null, - "treasurer_name":"Test McTest", - "party_type_full":null, - "designation":"U", - "custodian_street_1":null, - "custodian_state":null, - "treasurer_zip":"12345", - "custodian_name_title":null, - "party":null, - "treasurer_city":"Testville", - "committee_id":"C99999999", - "lobbyist_registrant_pac":null, - "treasurer_state":null, - "leadership_pac":null, - "first_file_date":"1992-10-22", - "affiliated_committee_name":null, - "sponsor_candidate_ids":null, - "treasurer_street_1":"123 Test Ln", - "custodian_phone":null, - "state":"MO", - "filing_frequency":"A", - "custodian_city":null, - "name":"PAC Your Bags", - "last_f1_date":"2012-12-21", - "email":"test@pacyourbags.csv", - "party_type":null, - "custodian_street_2":null, - "party_full":null, - "treasurer_name_suffix":"III", - "state_full":"Missouri", - "treasurer_name_prefix":"Mr.", - "designation_full":"Unauthorized", - "first_f1_date":"1992-10-22", - "committee_type_full":"PAC - Nonqualified", - "fax":null, - "street_2":null, - "organization_type":null, - "city":"KANSAS CITY", - "treasurer_name_1":"Test", - "treasurer_name_middle":"Thomas", - "custodian_name_full":null, - "custodian_zip":null, - "organization_type_full":null, - "website":null, - "street_1":"920 TEST STREET SUITE 300", - "treasurer_name_2":"McTest", - "committee_type":"N", - "zip":"64105", - "form_type":"F1", - "treasurer_street_2":null, - "cycles":[ - 1992, - 1994, - 1996, - 1998, - 2000, - 2002, - 2004, - 2006, - 2008, - 2010, - 2012, - 2014, - 2016, - 2018 - ], - "custodian_name_1":null, - "candidate_ids":[], - "custodian_name_suffix":null, - "custodian_name_prefix":null - } - ], - "pagination":{ - "page":1, - "per_page":20, - "pages":1, - "count":1 - } -} \ No newline at end of file From b867df6a3a6ed782eb6c90413677058f5392e8a0 Mon Sep 17 00:00:00 2001 From: Sasha Dresden Date: Mon, 21 Oct 2024 11:19:17 -0400 Subject: [PATCH 08/68] Delete commented out code --- .../header-links/header-links.component.html | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/front-end/src/app/layout/header/header-links/header-links.component.html b/front-end/src/app/layout/header/header-links/header-links.component.html index 125fc6cb7..2a3bf2c6e 100644 --- a/front-end/src/app/layout/header/header-links/header-links.component.html +++ b/front-end/src/app/layout/header/header-links/header-links.component.html @@ -6,11 +6,6 @@
  • Reports
    • -
  • Contacts
    • @@ -27,28 +22,9 @@ Tools
      - - Update cash on hand -
    - - -
  • Account Users Switch Committees - - Logout
    • From 9addd241111a0dc4766b36ca7906591ab72cd40b Mon Sep 17 00:00:00 2001 From: Sasha Dresden Date: Mon, 21 Oct 2024 14:41:38 -0400 Subject: [PATCH 09/68] Add the missing /login/ to fix the back to select committee link --- .../committee/create-committee/create-committee.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front-end/src/app/committee/create-committee/create-committee.component.html b/front-end/src/app/committee/create-committee/create-committee.component.html index 62a42ccdb..788888235 100644 --- a/front-end/src/app/committee/create-committee/create-committee.component.html +++ b/front-end/src/app/committee/create-committee/create-committee.component.html @@ -7,7 +7,7 @@

    Create an account

    - GO BACK + GO BACK

    Find your committee

    From 6a345c89f90b1364bdca9e530220404af12db47f Mon Sep 17 00:00:00 2001 From: David Heitzer Date: Mon, 21 Oct 2024 16:06:13 -0400 Subject: [PATCH 10/68] 1648 FEA Payment to Payroll should have entity type of org, not com --- ...EDERAL_ELECTION_ACTIVITY_PAYMENT_TO_PAYROLL.model.spec.ts | 5 +++++ .../FEDERAL_ELECTION_ACTIVITY_PAYMENT_TO_PAYROLL.model.ts | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/front-end/src/app/shared/models/transaction-types/FEDERAL_ELECTION_ACTIVITY_PAYMENT_TO_PAYROLL.model.spec.ts b/front-end/src/app/shared/models/transaction-types/FEDERAL_ELECTION_ACTIVITY_PAYMENT_TO_PAYROLL.model.spec.ts index 974981552..b42f0ced0 100644 --- a/front-end/src/app/shared/models/transaction-types/FEDERAL_ELECTION_ACTIVITY_PAYMENT_TO_PAYROLL.model.spec.ts +++ b/front-end/src/app/shared/models/transaction-types/FEDERAL_ELECTION_ACTIVITY_PAYMENT_TO_PAYROLL.model.spec.ts @@ -1,3 +1,4 @@ +import { ORGANIZATION } from 'app/shared/utils/transaction-type-properties'; import { SchBTransaction, ScheduleBTransactionTypes } from '../schb-transaction.model'; import { FEDERAL_ELECTION_ACTIVITY_PAYMENT_TO_PAYROLL } from './FEDERAL_ELECTION_ACTIVITY_PAYMENT_TO_PAYROLL.model'; @@ -24,4 +25,8 @@ describe('FEDERAL_ELECTION_ACTIVITY_PAYMENT_TO_PAYROLL', () => { it('#generatePurposeDescription() should be the correct value', () => { expect(transactionType.generatePurposeDescription()).toBe('Payroll: See Below'); }); + + it('#contextTypeOptions should be org', () => { + expect(transactionType.contactTypeOptions).toEqual(ORGANIZATION); + }); }); diff --git a/front-end/src/app/shared/models/transaction-types/FEDERAL_ELECTION_ACTIVITY_PAYMENT_TO_PAYROLL.model.ts b/front-end/src/app/shared/models/transaction-types/FEDERAL_ELECTION_ACTIVITY_PAYMENT_TO_PAYROLL.model.ts index 17dc747e5..797d68d5c 100644 --- a/front-end/src/app/shared/models/transaction-types/FEDERAL_ELECTION_ACTIVITY_PAYMENT_TO_PAYROLL.model.ts +++ b/front-end/src/app/shared/models/transaction-types/FEDERAL_ELECTION_ACTIVITY_PAYMENT_TO_PAYROLL.model.ts @@ -1,14 +1,14 @@ import { LabelUtils } from 'app/shared/utils/label.utils'; +import { ORGANIZATION, ORGANIZATION_NO_AGGREGATE_B_FORM_FIELDS } from 'app/shared/utils/transaction-type-properties'; import { schema } from 'fecfile-validate/fecfile_validate_js/dist/DISBURSEMENT_PARENTS_FEA'; import { SchBTransactionType } from '../schb-transaction-type.model'; import { SchBTransaction, ScheduleBTransactionTypeLabels, ScheduleBTransactionTypes } from '../schb-transaction.model'; import { STANDARD_PARENT_CONTROLS, TransactionNavigationControls } from '../transaction-navigation-controls.model'; import { AggregationGroups } from '../transaction.model'; -import { COMMITTEE, ORGANIZATION_NO_AGGREGATE_B_FORM_FIELDS } from 'app/shared/utils/transaction-type-properties'; export class FEDERAL_ELECTION_ACTIVITY_PAYMENT_TO_PAYROLL extends SchBTransactionType { formFields = ORGANIZATION_NO_AGGREGATE_B_FORM_FIELDS; - contactTypeOptions = COMMITTEE; + contactTypeOptions = ORGANIZATION; title = LabelUtils.get( ScheduleBTransactionTypeLabels, ScheduleBTransactionTypes.FEDERAL_ELECTION_ACTIVITY_PAYMENT_TO_PAYROLL, From 85a7965d49b8fa56c000fe643e8b43742e51054b Mon Sep 17 00:00:00 2001 From: Sasha Dresden Date: Mon, 21 Oct 2024 17:49:02 -0400 Subject: [PATCH 11/68] Setup Loan Repayment Received to override the contact_1 details from the parent transaction --- .../transaction-input/transaction-input.component.html | 3 ++- .../transaction-types/LOAN_REPAYMENT_RECEIVED.model.ts | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/front-end/src/app/reports/transactions/transaction-input/transaction-input.component.html b/front-end/src/app/reports/transactions/transaction-input/transaction-input.component.html index ed1b5d8dd..3cbe9fe1c 100644 --- a/front-end/src/app/reports/transactions/transaction-input/transaction-input.component.html +++ b/front-end/src/app/reports/transactions/transaction-input/transaction-input.component.html @@ -4,7 +4,8 @@ isEditable && !transactionType?.getUseParentContact(transaction) && !transactionType?.hideContactLookup && - transaction?.transaction_type_identifier !== 'LOAN_REPAYMENT_MADE' + transaction?.transaction_type_identifier !== 'LOAN_REPAYMENT_MADE' && + transaction?.transaction_type_identifier !== 'LOAN_REPAYMENT_RECEIVED' " >
    diff --git a/front-end/src/app/shared/models/transaction-types/LOAN_REPAYMENT_RECEIVED.model.ts b/front-end/src/app/shared/models/transaction-types/LOAN_REPAYMENT_RECEIVED.model.ts index 457c6f9af..2a9896c4a 100644 --- a/front-end/src/app/shared/models/transaction-types/LOAN_REPAYMENT_RECEIVED.model.ts +++ b/front-end/src/app/shared/models/transaction-types/LOAN_REPAYMENT_RECEIVED.model.ts @@ -4,7 +4,12 @@ import { SchATransactionType } from '../scha-transaction-type.model'; import { SchATransaction, ScheduleATransactionTypeLabels, ScheduleATransactionTypes } from '../scha-transaction.model'; import { STANDARD_CONTROLS, TransactionNavigationControls } from '../transaction-navigation-controls.model'; import { AggregationGroups } from '../transaction.model'; -import { COMMITTEE, ORGANIZATION_FORM_FIELDS } from 'app/shared/utils/transaction-type-properties'; +import { + COMMITTEE, + COMMITTEE_FORM_FIELDS, + ORGANIZATION_FORM_FIELDS, +} from 'app/shared/utils/transaction-type-properties'; +import { TemplateMapKeyType } from '../transaction-type.model'; export class LOAN_REPAYMENT_RECEIVED extends SchATransactionType { formFields = ORGANIZATION_FORM_FIELDS; @@ -12,6 +17,7 @@ export class LOAN_REPAYMENT_RECEIVED extends SchATransactionType { title = LabelUtils.get(ScheduleATransactionTypeLabels, ScheduleATransactionTypes.LOAN_REPAYMENT_RECEIVED); schema = schema; override navigationControls: TransactionNavigationControls = STANDARD_CONTROLS; + override inheritedFields = [...COMMITTEE_FORM_FIELDS] as TemplateMapKeyType[]; getNewTransaction() { return SchATransaction.fromJSON({ From bc3243aa1b68b89ea5b1f353b89a381f830e48c9 Mon Sep 17 00:00:00 2001 From: David Heitzer Date: Tue, 22 Oct 2024 00:30:02 -0400 Subject: [PATCH 12/68] 1118 finish dev for coh override --- .../src/app/shared/models/form-3x.model.ts | 14 +++-- .../shared/services/form-3x.service.spec.ts | 2 +- .../app/shared/services/form-3x.service.ts | 21 ++++--- .../cash-on-hand-override.component.spec.ts | 23 +++++-- .../cash-on-hand-override.component.ts | 63 ++++++++++++++----- 5 files changed, 91 insertions(+), 32 deletions(-) diff --git a/front-end/src/app/shared/models/form-3x.model.ts b/front-end/src/app/shared/models/form-3x.model.ts index d81e5b88f..e6090ae5f 100644 --- a/front-end/src/app/shared/models/form-3x.model.ts +++ b/front-end/src/app/shared/models/form-3x.model.ts @@ -1,8 +1,8 @@ import { plainToClass, plainToInstance, Transform } from 'class-transformer'; import { schema as f3xSchema } from 'fecfile-validate/fecfile_validate_js/dist/F3X'; +import { F3xReportCodes } from '../utils/report-code.utils'; import { BaseModel } from './base.model'; import { Report, ReportStatus, ReportTypes } from './report.model'; -import { F3xReportCodes } from '../utils/report-code.utils'; export enum F3xFormTypes { F3XN = 'F3XN', @@ -12,6 +12,12 @@ export enum F3xFormTypes { export type F3xFormType = F3xFormTypes.F3XN | F3xFormTypes.F3XA | F3xFormTypes.F3XT; +export class F3xLine6aOverride { + id?: string; + year?: string; + cash_on_hand?: number; +} + export class F3xCoverageDates { @Transform(BaseModel.dateTransform) coverage_from_date: Date | undefined; @Transform(BaseModel.dateTransform) coverage_through_date: Date | undefined; @@ -20,9 +26,9 @@ export class F3xCoverageDates { // prettier-ignore static fromJSON(json: any, reportCodeLabel: string): F3xCoverageDates { // eslint-disable-line @typescript-eslint/no-explicit-any - json.report_code_label = reportCodeLabel; - return plainToClass(F3xCoverageDates, json); - } + json.report_code_label = reportCodeLabel; + return plainToClass(F3xCoverageDates, json); + } } export const F3xQualifiedCommitteeTypeCodes = ['Q', 'W', 'Y']; diff --git a/front-end/src/app/shared/services/form-3x.service.spec.ts b/front-end/src/app/shared/services/form-3x.service.spec.ts index fd1cccc42..787df969c 100644 --- a/front-end/src/app/shared/services/form-3x.service.spec.ts +++ b/front-end/src/app/shared/services/form-3x.service.spec.ts @@ -65,7 +65,7 @@ describe('Form3XService', () => { httpTestingController.verify(); }); - it('#delete() should DELETE a record2', () => { + it('#delete() should DELETE a record', () => { const form3X: Form3X = Form3X.fromJSON({ id: '999' }); service.delete(form3X).subscribe((response: null) => { diff --git a/front-end/src/app/shared/services/form-3x.service.ts b/front-end/src/app/shared/services/form-3x.service.ts index d45e45d1a..13b440a39 100644 --- a/front-end/src/app/shared/services/form-3x.service.ts +++ b/front-end/src/app/shared/services/form-3x.service.ts @@ -3,7 +3,7 @@ import { Store } from '@ngrx/store'; import { BehaviorSubject, Observable, firstValueFrom } from 'rxjs'; import { map } from 'rxjs/operators'; import { CommitteeAccount } from '../models/committee-account.model'; -import { F3xCoverageDates, Form3X } from '../models/form-3x.model'; +import { F3xCoverageDates, F3xLine6aOverride, Form3X } from '../models/form-3x.model'; import { Report } from '../models/report.model'; import { F3xReportCodes } from '../utils/report-code.utils'; import { ApiService } from './api.service'; @@ -51,21 +51,26 @@ export class Form3XService extends ReportService { .pipe(map((response) => response.map((r) => Form3X.fromJSON(r)))); } - public getJan1CashOnHand(year: number): Promise { + public getF3xLine6aOverride(year: string): Promise { return firstValueFrom( this.apiService - .get(`${this.apiEndpoint}/jan1_cash_on_hand?year=${year}`) + .get(`/f3x_line6a_overrides/?year=${year}`) + .pipe(map((response) => (response.length === 1 ? response[0] : undefined))), + ); + } + + public createF3xLine6aOverride(f3xLine6aOverride: F3xLine6aOverride): Promise { + return firstValueFrom( + this.apiService + .post(`/f3x_line6a_overrides/`, f3xLine6aOverride) .pipe(map((response) => response)), ); } - public updateJan1CashOnHand(year: number, amount: number): Promise { + public updateF3xLine6aOverride(f3xLine6aOverride: F3xLine6aOverride): Promise { return firstValueFrom( this.apiService - .put(`${this.apiEndpoint}/jan1_cash_on_hand/`, { - year: year, - amount: amount, - }) + .put(`/f3x_line6a_overrides/${f3xLine6aOverride.id}/`, f3xLine6aOverride) .pipe(map((response) => response)), ); } diff --git a/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.spec.ts b/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.spec.ts index 3b26e93ec..e6e0f21c9 100644 --- a/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.spec.ts +++ b/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.spec.ts @@ -5,6 +5,7 @@ import { provideMockStore } from '@ngrx/store/testing'; import { ReportsModule } from 'app/reports/reports.module'; import { Form3XService } from 'app/shared/services/form-3x.service'; import { testMockStore } from 'app/shared/utils/unit-test.utils'; +import { MessageService } from 'primeng/api'; import { CashOnHandOverrideComponent } from './cash-on-hand-override.component'; describe('CashOnHandOverrideComponent', () => { @@ -17,7 +18,7 @@ describe('CashOnHandOverrideComponent', () => { await TestBed.configureTestingModule({ declarations: [CashOnHandOverrideComponent], imports: [HttpClientTestingModule, ReportsModule], - providers: [Form3XService, provideMockStore(testMockStore)], + providers: [Form3XService, MessageService, provideMockStore(testMockStore)], }).compileComponents(); }); @@ -35,14 +36,26 @@ describe('CashOnHandOverrideComponent', () => { expect(form3XService).toBeTruthy(); }); - it('should call updateJan1CashOnHand', () => { - spyOn(component.form3XService, 'updateJan1CashOnHand').and.resolveTo(); - component.yearFormControl.setValue(2024); + it('should call createF3xLine6aOverride', () => { + spyOn(component.form3XService, 'createF3xLine6aOverride').and.resolveTo(); + component.yearFormControl.setValue('2024'); component.currentAmountFormControl.setValue(0.0); component.newAmountFormControl.setValue(25.0); component.updateLine6a(); - expect(component.form3XService.updateJan1CashOnHand).toHaveBeenCalledTimes(1); + expect(component.form3XService.createF3xLine6aOverride).toHaveBeenCalledTimes(1); + }); + + it('should call updateF3xLine6aOverride', () => { + spyOn(component.form3XService, 'updateF3xLine6aOverride').and.resolveTo(); + component.yearFormControl.setValue('2024'); + component.currentAmountFormControl.setValue(0.0); + component.newAmountFormControl.setValue(25.0); + component.selectedF3xLine6aOverrideId = 'test_id'; + + component.updateLine6a(); + + expect(component.form3XService.updateF3xLine6aOverride).toHaveBeenCalledTimes(1); }); }); diff --git a/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.ts b/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.ts index a15f151a5..a5e0668ae 100644 --- a/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.ts +++ b/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.ts @@ -1,7 +1,10 @@ import { Component, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { Router } from '@angular/router'; import { DestroyerComponent } from 'app/shared/components/app-destroyer.component'; +import { F3xLine6aOverride } from 'app/shared/models/form-3x.model'; import { Form3XService } from 'app/shared/services/form-3x.service'; +import { MessageService } from 'primeng/api'; import { takeUntil } from 'rxjs'; @Component({ @@ -10,11 +13,12 @@ import { takeUntil } from 'rxjs'; styleUrls: ['./cash-on-hand-override.component.scss'], }) export class CashOnHandOverrideComponent extends DestroyerComponent implements OnInit { - yearFormControl = new FormControl(null, Validators.required); + yearFormControl = new FormControl(null, Validators.required); currentAmountFormControl = new FormControl(null, Validators.required); newAmountFormControl = new FormControl(null, Validators.required); - yearOptions: number[] = []; + yearOptions: string[] = []; numberOfYearOptions = 25; + selectedF3xLine6aOverrideId?: string; form: FormGroup = new FormGroup({ year: this.yearFormControl, @@ -22,34 +26,65 @@ export class CashOnHandOverrideComponent extends DestroyerComponent implements O newAmount: this.newAmountFormControl, }); - constructor(public form3XService: Form3XService) { + constructor( + private router: Router, + private messageService: MessageService, + public form3XService: Form3XService, + ) { super(); } ngOnInit(): void { - this.yearFormControl.valueChanges.pipe(takeUntil(this.destroy$)).subscribe((year) => { - if (year) { - this.form3XService.getJan1CashOnHand(year).then((cashOnHandForYear) => { - this.currentAmountFormControl.setValue(cashOnHandForYear); + this.yearFormControl.valueChanges.pipe(takeUntil(this.destroy$)).subscribe((selectedYear) => { + if (selectedYear) { + this.form3XService.getF3xLine6aOverride(selectedYear).then((f3xLine6aOverride) => { + this.selectedF3xLine6aOverrideId = f3xLine6aOverride?.id; + this.currentAmountFormControl.setValue(f3xLine6aOverride?.cash_on_hand || 0); + this.newAmountFormControl.setValue(0); }); } }); const currentYear = new Date().getFullYear(); - this.yearOptions = Array.from( - { length: this.numberOfYearOptions }, - (value, index) => currentYear - this.numberOfYearOptions + index + 1, + this.yearOptions = Array.from({ length: this.numberOfYearOptions }, (value, index) => + (currentYear - index).toString(), ); - this.yearFormControl.setValue(this.yearOptions[this.yearOptions.length - 1]); + this.yearFormControl.setValue(this.yearOptions[0]); } updateLine6a(): void { if (this.form.valid) { if (this.yearFormControl.value && this.newAmountFormControl.value) { - this.form3XService - .updateJan1CashOnHand(this.yearFormControl.value, this.newAmountFormControl.value) - .then(() => {}); + const payload = new F3xLine6aOverride(); + payload.id = this.selectedF3xLine6aOverrideId; + payload.year = this.yearFormControl.value; + payload.cash_on_hand = this.newAmountFormControl.value; + this.savePayload(payload).then(() => { + this.router.navigate(['reports']); + }); } } } + + savePayload(payload: F3xLine6aOverride) { + if (payload.id) { + return this.form3XService.updateF3xLine6aOverride(payload).then(() => { + this.messageService.add({ + severity: 'success', + summary: 'Successful', + detail: 'Cash On Hand Updated', + life: 3000, + }); + }); + } else { + return this.form3XService.createF3xLine6aOverride(payload).then(() => { + this.messageService.add({ + severity: 'success', + summary: 'Successful', + detail: 'Cash On Hand Created', + life: 3000, + }); + }); + } + } } From 70b0aab33731a03e881828575b5b2e69b0f5a516 Mon Sep 17 00:00:00 2001 From: David Heitzer Date: Tue, 22 Oct 2024 00:36:35 -0400 Subject: [PATCH 13/68] 1118 remove dup test --- .../shared/services/form-3x.service.spec.ts | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/front-end/src/app/shared/services/form-3x.service.spec.ts b/front-end/src/app/shared/services/form-3x.service.spec.ts index 787df969c..73e772908 100644 --- a/front-end/src/app/shared/services/form-3x.service.spec.ts +++ b/front-end/src/app/shared/services/form-3x.service.spec.ts @@ -1,10 +1,10 @@ -import { TestBed } from '@angular/core/testing'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { TestBed } from '@angular/core/testing'; import { provideMockStore } from '@ngrx/store/testing'; +import { environment } from '../../../environments/environment'; +import { Form3X } from '../models/form-3x.model'; import { testMockStore } from '../utils/unit-test.utils'; import { Form3XService } from './form-3x.service'; -import { Form3X } from '../models/form-3x.model'; -import { environment } from '../../../environments/environment'; describe('Form3XService', () => { let service: Form3XService; @@ -65,19 +65,6 @@ describe('Form3XService', () => { httpTestingController.verify(); }); - it('#delete() should DELETE a record', () => { - const form3X: Form3X = Form3X.fromJSON({ id: '999' }); - - service.delete(form3X).subscribe((response: null) => { - expect(response).toBeTrue(); - }); - - const req = httpTestingController.expectOne(`${environment.apiUrl}/reports/form-3x/999`); - expect(req.request.method).toEqual('DELETE'); - req.flush(null); - httpTestingController.verify(); - }); - describe('getFutureReports', () => { it('should return a list of Form3X reports whose coverage through is after the submitted value', () => { service.getFutureReports('2024-01-20').subscribe((reports) => { From 491a80d62ea799f9531b7d1a20eab31cf86f2db9 Mon Sep 17 00:00:00 2001 From: David Heitzer Date: Tue, 22 Oct 2024 15:00:46 -0400 Subject: [PATCH 14/68] 1118 cleanup --- .../cash-on-hand-override.component.scss | 0 .../cash-on-hand-override.component.spec.ts | 9 +++++---- .../cash-on-hand-override.component.ts | 7 +++---- 3 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.scss diff --git a/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.scss b/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.spec.ts b/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.spec.ts index e6e0f21c9..2a4d2f0a0 100644 --- a/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.spec.ts +++ b/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.spec.ts @@ -6,6 +6,7 @@ import { ReportsModule } from 'app/reports/reports.module'; import { Form3XService } from 'app/shared/services/form-3x.service'; import { testMockStore } from 'app/shared/utils/unit-test.utils'; import { MessageService } from 'primeng/api'; +import { of } from 'rxjs'; import { CashOnHandOverrideComponent } from './cash-on-hand-override.component'; describe('CashOnHandOverrideComponent', () => { @@ -37,18 +38,18 @@ describe('CashOnHandOverrideComponent', () => { }); it('should call createF3xLine6aOverride', () => { - spyOn(component.form3XService, 'createF3xLine6aOverride').and.resolveTo(); + spyOn(component.form3XService.apiService, 'post').and.returnValue(of()); component.yearFormControl.setValue('2024'); component.currentAmountFormControl.setValue(0.0); component.newAmountFormControl.setValue(25.0); component.updateLine6a(); - expect(component.form3XService.createF3xLine6aOverride).toHaveBeenCalledTimes(1); + expect(component.form3XService.apiService.post).toHaveBeenCalledTimes(1); }); it('should call updateF3xLine6aOverride', () => { - spyOn(component.form3XService, 'updateF3xLine6aOverride').and.resolveTo(); + spyOn(component.form3XService.apiService, 'put').and.returnValue(of()); component.yearFormControl.setValue('2024'); component.currentAmountFormControl.setValue(0.0); component.newAmountFormControl.setValue(25.0); @@ -56,6 +57,6 @@ describe('CashOnHandOverrideComponent', () => { component.updateLine6a(); - expect(component.form3XService.updateF3xLine6aOverride).toHaveBeenCalledTimes(1); + expect(component.form3XService.apiService.put).toHaveBeenCalledTimes(1); }); }); diff --git a/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.ts b/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.ts index a5e0668ae..becf2bae1 100644 --- a/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.ts +++ b/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.ts @@ -10,7 +10,6 @@ import { takeUntil } from 'rxjs'; @Component({ selector: 'app-cash-on-hand-override', templateUrl: './cash-on-hand-override.component.html', - styleUrls: ['./cash-on-hand-override.component.scss'], }) export class CashOnHandOverrideComponent extends DestroyerComponent implements OnInit { yearFormControl = new FormControl(null, Validators.required); @@ -27,8 +26,8 @@ export class CashOnHandOverrideComponent extends DestroyerComponent implements O }); constructor( - private router: Router, - private messageService: MessageService, + private readonly router: Router, + private readonly messageService: MessageService, public form3XService: Form3XService, ) { super(); @@ -39,7 +38,7 @@ export class CashOnHandOverrideComponent extends DestroyerComponent implements O if (selectedYear) { this.form3XService.getF3xLine6aOverride(selectedYear).then((f3xLine6aOverride) => { this.selectedF3xLine6aOverrideId = f3xLine6aOverride?.id; - this.currentAmountFormControl.setValue(f3xLine6aOverride?.cash_on_hand || 0); + this.currentAmountFormControl.setValue(f3xLine6aOverride?.cash_on_hand ?? 0); this.newAmountFormControl.setValue(0); }); } From 7ee13d77a3d359593531cb6e3290fdf98a4e193f Mon Sep 17 00:00:00 2001 From: David Heitzer Date: Tue, 22 Oct 2024 16:10:24 -0400 Subject: [PATCH 15/68] 1118 unit tests --- .../shared/services/form-3x.service.spec.ts | 80 ++++++++++++++++++- 1 file changed, 78 insertions(+), 2 deletions(-) diff --git a/front-end/src/app/shared/services/form-3x.service.spec.ts b/front-end/src/app/shared/services/form-3x.service.spec.ts index 73e772908..9764f2d60 100644 --- a/front-end/src/app/shared/services/form-3x.service.spec.ts +++ b/front-end/src/app/shared/services/form-3x.service.spec.ts @@ -1,8 +1,8 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; -import { TestBed } from '@angular/core/testing'; +import { fakeAsync, TestBed, tick } from '@angular/core/testing'; import { provideMockStore } from '@ngrx/store/testing'; import { environment } from '../../../environments/environment'; -import { Form3X } from '../models/form-3x.model'; +import { F3xLine6aOverride, Form3X } from '../models/form-3x.model'; import { testMockStore } from '../utils/unit-test.utils'; import { Form3XService } from './form-3x.service'; @@ -65,6 +65,82 @@ describe('Form3XService', () => { httpTestingController.verify(); }); + it('#getF3xLine6aOverride() should get a record', fakeAsync(() => { + let retval = new F3xLine6aOverride(); + service.getF3xLine6aOverride('2024').then((response) => { + if (response) { + retval = response; + } + }); + + const req = httpTestingController.expectOne(`${environment.apiUrl}/f3x_line6a_overrides/?year=2024`); + expect(req.request.method).toEqual('GET'); + const apiRetval = new F3xLine6aOverride(); + apiRetval.id = 'test_id'; + req.flush([apiRetval]); + httpTestingController.verify(); + tick(500); + + expect(retval.id).toEqual('test_id'); + })); + + it('#getF3xLine6aOverride() should get a record', fakeAsync(() => { + let retval = new F3xLine6aOverride(); + service.getF3xLine6aOverride('2024').then((response) => { + if (response) { + retval = response; + } + }); + + const req = httpTestingController.expectOne(`${environment.apiUrl}/f3x_line6a_overrides/?year=2024`); + expect(req.request.method).toEqual('GET'); + const apiRetval = new F3xLine6aOverride(); + apiRetval.id = 'test_id'; + req.flush([apiRetval]); + httpTestingController.verify(); + tick(500); + + expect(retval.id).toEqual('test_id'); + })); + + it('#createF3xLine6aOverride() should get a record', fakeAsync(() => { + const payload = new F3xLine6aOverride(); + let retval: F3xLine6aOverride | undefined; + payload.id = 'test_id'; + service.createF3xLine6aOverride(payload).then((response) => { + retval = response; + }); + + const req = httpTestingController.expectOne(`${environment.apiUrl}/f3x_line6a_overrides/`); + expect(req.request.method).toEqual('POST'); + const apiRetval = new F3xLine6aOverride(); + apiRetval.id = 'test_id'; + req.flush(apiRetval); + httpTestingController.verify(); + tick(500); + + expect(retval?.id).toEqual('test_id'); + })); + + it('#updateF3xLine6aOverride() should get a record', fakeAsync(() => { + const payload = new F3xLine6aOverride(); + let retval: F3xLine6aOverride | undefined; + payload.id = 'test_id'; + service.updateF3xLine6aOverride(payload).then((response) => { + retval = response; + }); + + const req = httpTestingController.expectOne(`${environment.apiUrl}/f3x_line6a_overrides/test_id/`); + expect(req.request.method).toEqual('PUT'); + const apiRetval = new F3xLine6aOverride(); + apiRetval.id = 'test_id'; + req.flush(apiRetval); + httpTestingController.verify(); + tick(500); + + expect(retval?.id).toEqual('test_id'); + })); + describe('getFutureReports', () => { it('should return a list of Form3X reports whose coverage through is after the submitted value', () => { service.getFutureReports('2024-01-20').subscribe((reports) => { From 084b151d434eb1ea9af5cdfbb521e77880cfa798 Mon Sep 17 00:00:00 2001 From: Sasha Dresden Date: Tue, 22 Oct 2024 17:59:23 -0400 Subject: [PATCH 16/68] Fix which fields get inherited to limit to just the Committee and address fields --- .../transaction-types/LOAN_REPAYMENT_RECEIVED.model.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/front-end/src/app/shared/models/transaction-types/LOAN_REPAYMENT_RECEIVED.model.ts b/front-end/src/app/shared/models/transaction-types/LOAN_REPAYMENT_RECEIVED.model.ts index 2a9896c4a..ac13db130 100644 --- a/front-end/src/app/shared/models/transaction-types/LOAN_REPAYMENT_RECEIVED.model.ts +++ b/front-end/src/app/shared/models/transaction-types/LOAN_REPAYMENT_RECEIVED.model.ts @@ -5,8 +5,9 @@ import { SchATransaction, ScheduleATransactionTypeLabels, ScheduleATransactionTy import { STANDARD_CONTROLS, TransactionNavigationControls } from '../transaction-navigation-controls.model'; import { AggregationGroups } from '../transaction.model'; import { + ADDRESS_FIELDS, + COM_FIELDS, COMMITTEE, - COMMITTEE_FORM_FIELDS, ORGANIZATION_FORM_FIELDS, } from 'app/shared/utils/transaction-type-properties'; import { TemplateMapKeyType } from '../transaction-type.model'; @@ -17,7 +18,7 @@ export class LOAN_REPAYMENT_RECEIVED extends SchATransactionType { title = LabelUtils.get(ScheduleATransactionTypeLabels, ScheduleATransactionTypes.LOAN_REPAYMENT_RECEIVED); schema = schema; override navigationControls: TransactionNavigationControls = STANDARD_CONTROLS; - override inheritedFields = [...COMMITTEE_FORM_FIELDS] as TemplateMapKeyType[]; + override inheritedFields = [...COM_FIELDS, ...ADDRESS_FIELDS] as TemplateMapKeyType[]; getNewTransaction() { return SchATransaction.fromJSON({ From f7b7a45a3510d1debd9fb861b9cff48a93da5026 Mon Sep 17 00:00:00 2001 From: Sasha Dresden Date: Thu, 17 Oct 2024 14:23:30 -0400 Subject: [PATCH 17/68] Add Security Notification page --- .../app/layout/footer/footer.component.html | 9 ++-- .../src/app/layout/layout.component.html | 22 +++----- .../notifications-routing.module.ts | 16 +++++- .../app/notifications/notifications.module.ts | 9 +++- .../security-notification.component.html | 35 +++++++++++++ .../security-notification.component.scss | 51 +++++++++++++++++++ .../security-notification.component.spec.ts | 22 ++++++++ .../security-notification.component.ts | 8 +++ 8 files changed, 150 insertions(+), 22 deletions(-) create mode 100644 front-end/src/app/notifications/security-notification/security-notification.component.html create mode 100644 front-end/src/app/notifications/security-notification/security-notification.component.scss create mode 100644 front-end/src/app/notifications/security-notification/security-notification.component.spec.ts create mode 100644 front-end/src/app/notifications/security-notification/security-notification.component.ts diff --git a/front-end/src/app/layout/footer/footer.component.html b/front-end/src/app/layout/footer/footer.component.html index 399386ca8..6ad3a88ba 100644 --- a/front-end/src/app/layout/footer/footer.component.html +++ b/front-end/src/app/layout/footer/footer.component.html @@ -4,11 +4,10 @@

    Need help? Contact us

    -
    -

    Feedback

    -
    -
    -

    Legal Disclaimer

    +
    + +

    Security notification

    +
    diff --git a/front-end/src/app/layout/layout.component.html b/front-end/src/app/layout/layout.component.html index 4b220fa2f..f2bae5c85 100644 --- a/front-end/src/app/layout/layout.component.html +++ b/front-end/src/app/layout/layout.component.html @@ -32,22 +32,16 @@
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    +
    + +
    +
    +
    +
    +
    +
    diff --git a/front-end/src/app/notifications/notifications-routing.module.ts b/front-end/src/app/notifications/notifications-routing.module.ts index 74da76ab2..7e0b367b1 100644 --- a/front-end/src/app/notifications/notifications-routing.module.ts +++ b/front-end/src/app/notifications/notifications-routing.module.ts @@ -1,7 +1,21 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; +import { loggedInGuard } from 'app/shared/guards/logged-in.guard'; +import { nameGuard } from 'app/shared/guards/name.guard'; +import { SecurityNotificationComponent } from './security-notification/security-notification.component'; -const routes: Routes = [{ path: '**', redirectTo: '' }]; +const routes: Routes = [ + { + path: 'security', + component: SecurityNotificationComponent, + title: 'Security Notice', + canActivate: [loggedInGuard, nameGuard], + data: { + showCommitteeBanner: false, + }, + }, + { path: '**', redirectTo: '' }, +]; @NgModule({ imports: [RouterModule.forChild(routes)], diff --git a/front-end/src/app/notifications/notifications.module.ts b/front-end/src/app/notifications/notifications.module.ts index 31664cf77..66a4a4827 100644 --- a/front-end/src/app/notifications/notifications.module.ts +++ b/front-end/src/app/notifications/notifications.module.ts @@ -1,8 +1,13 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { SharedModule } from 'primeng/api'; +import { SecurityNotificationComponent } from '../notifications/security-notification/security-notification.component'; +import { ButtonModule } from 'primeng/button'; +import { CardModule } from 'primeng/card'; +import { NotificationsRoutingModule } from './notifications-routing.module'; @NgModule({ - declarations: [], - imports: [CommonModule], + declarations: [SecurityNotificationComponent], + imports: [CommonModule, NotificationsRoutingModule, SharedModule, ButtonModule, CardModule], }) export class NotificationsModule {} diff --git a/front-end/src/app/notifications/security-notification/security-notification.component.html b/front-end/src/app/notifications/security-notification/security-notification.component.html new file mode 100644 index 000000000..9185f6e30 --- /dev/null +++ b/front-end/src/app/notifications/security-notification/security-notification.component.html @@ -0,0 +1,35 @@ +
    +

    Security notification

    +
    + +

    Warning

    +

    + This version of the application is for testing new features and functionality and gathering user feedback. Any + submitted reports do not constitute official filings with the Federal Election Commission (FEC). Any information you + enter at this time is subject to deletion and will not be retained. +

    +

    Disclaimer

    +

    + If you need to file a statement or report to meet your disclosure requirements, please use your normal method of + submitting that information to the FEC. Submitting a report or statement through this system during the testing + phase of this software release does not constitute an official filing with the Federal Election Commission. +

    +

    While using this system please do not:

    +
      +

      +

    • prevent other users from accessing FECFile Online;
      • +
    • overload FECFile Online;
      • +
    • share committee or user accounts;
      • +
    • + attempt to gain unauthorized access to FECFile Online or related systems or networks or to defeat, avoid, + bypass, remove, deactivate, or otherwise circumvent any software protection or monitoring mechanisms of FECFile + Online; +
      • +
    • create committee or user accounts in bulk.
      • +

      +
    +

    Legal disclosure

    +

    + This is a U.S. Federal Government system that is for official use only. Unauthorized use is strictly prohibited. +

    +
    diff --git a/front-end/src/app/notifications/security-notification/security-notification.component.scss b/front-end/src/app/notifications/security-notification/security-notification.component.scss new file mode 100644 index 000000000..c79d0dfb0 --- /dev/null +++ b/front-end/src/app/notifications/security-notification/security-notification.component.scss @@ -0,0 +1,51 @@ +p, +li { + margin-bottom: 32px; + padding-top: 0; +} + +p + ul { + margin-top: 0; +} + +ul li { + list-style-type: disc; + margin-left: 16px; +} + +h1 { + font-size: 36px; +} + +h2 { + font-size: 28px; + margin: 0; +} + +.top-line { + margin: 20px 0; +} + +p { + font-size: 18px; +} + +.notice-box { + max-width: min(648px, 100vw); + margin: 0; +} +@media screen and (max-width: 767px) { + .notice-box { + margin: 0 32px; + } +} +@media screen and (min-width: 768px) { + .notice-box { + width: 66.666666666667vw; + } +} +@media screen and (min-width: 1200px) { + .notice-box { + width: 50vw; + } +} diff --git a/front-end/src/app/notifications/security-notification/security-notification.component.spec.ts b/front-end/src/app/notifications/security-notification/security-notification.component.spec.ts new file mode 100644 index 000000000..510ddc6e2 --- /dev/null +++ b/front-end/src/app/notifications/security-notification/security-notification.component.spec.ts @@ -0,0 +1,22 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { SecurityNotificationComponent } from './security-notification.component'; + +describe('SecurityNotificationComponent', () => { + let component: SecurityNotificationComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [SecurityNotificationComponent], + }).compileComponents(); + + fixture = TestBed.createComponent(SecurityNotificationComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/front-end/src/app/notifications/security-notification/security-notification.component.ts b/front-end/src/app/notifications/security-notification/security-notification.component.ts new file mode 100644 index 000000000..bb6c52060 --- /dev/null +++ b/front-end/src/app/notifications/security-notification/security-notification.component.ts @@ -0,0 +1,8 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-security-notification', + templateUrl: './security-notification.component.html', + styleUrl: './security-notification.component.scss', +}) +export class SecurityNotificationComponent {} From 5d8199c1f710938c2acf8cfd80e0e684882e33d0 Mon Sep 17 00:00:00 2001 From: Sasha Dresden Date: Wed, 23 Oct 2024 10:59:22 -0400 Subject: [PATCH 18/68] Update so login security notice and the security notification screen both use the same component --- front-end/src/app/login/login.module.ts | 1 + .../security-notice.component.html | 143 +++++++++--------- .../security-notice.component.scss | 66 +++++--- .../security-notice.component.ts | 7 +- .../notifications-routing.module.ts | 4 +- .../app/notifications/notifications.module.ts | 2 - .../security-notification.component.html | 35 ----- .../security-notification.component.scss | 51 ------- .../security-notification.component.spec.ts | 22 --- .../security-notification.component.ts | 8 - 10 files changed, 122 insertions(+), 217 deletions(-) delete mode 100644 front-end/src/app/notifications/security-notification/security-notification.component.html delete mode 100644 front-end/src/app/notifications/security-notification/security-notification.component.scss delete mode 100644 front-end/src/app/notifications/security-notification/security-notification.component.spec.ts delete mode 100644 front-end/src/app/notifications/security-notification/security-notification.component.ts diff --git a/front-end/src/app/login/login.module.ts b/front-end/src/app/login/login.module.ts index 322d426f6..b750be84d 100644 --- a/front-end/src/app/login/login.module.ts +++ b/front-end/src/app/login/login.module.ts @@ -31,5 +31,6 @@ import { DialogModule } from 'primeng/dialog'; PasswordModule, DialogModule, ], + exports: [SecurityNoticeComponent], }) export class LoginModule {} diff --git a/front-end/src/app/login/security-notice/security-notice.component.html b/front-end/src/app/login/security-notice/security-notice.component.html index a4f282244..a1a88469e 100644 --- a/front-end/src/app/login/security-notice/security-notice.component.html +++ b/front-end/src/app/login/security-notice/security-notice.component.html @@ -1,83 +1,78 @@ - -FECFile Seal and Title +
    + -
    - - -
    -

    Security notification

    -
    -
    -     +

    Security notification

    +
    - WARNING -

    - This version of the application is for testing new features and functionality and gathering user feedback. Any - submitted reports do not constitute official filings with the Federal Election Commission (FEC). Any information - you enter at this time is subject to deletion and will not be retained. -

    - DISCLAIMER +

    Warning

    +

    + This version of the application is for testing new features and functionality and gathering user feedback. Any + submitted reports do not constitute official filings with the Federal Election Commission (FEC). Any information + you enter at this time is subject to deletion and will not be retained. +

    +

    Disclaimer

    +

    + If you need to file a statement or report to meet your disclosure requirements, please use your normal method of + submitting that information to the FEC. Submitting a report or statement through this system during the testing + phase of this software release does not constitute an official filing with the Federal Election Commission. +

    +

    While using this system please do not:

    +

      - If you need to file a statement or report to meet your disclosure requirements, please use your normal method of - submitting that information to the FEC. Submitting a report or statement through this system during the testing - phase of this software release does not constitute an official filing with the Federal Election Commission. -

      -

      While using this system please do not:

      -
        -

        -

      • prevent other users from accessing FECFile Online;
        • -
      • overload FECFile Online;
        • -
      • share committee or user accounts;
        • -
      • - attempt to gain unauthorized access to FECFile Online or related systems or networks or to defeat, avoid, - bypass, remove, deactivate, or otherwise circumvent any software protection or monitoring mechanisms of - FECFile Online; -
        • -
      • create committee or user accounts in bulk.
        • -

        -
      - LEGAL DISCLOSURE -

      - This is a U.S. Federal Government system that is for official use only. Unauthorized use is strictly prohibited. +

    • prevent other users from accessing FECFile Online;
      • +
    • overload FECFile Online;
      • +
    • share committee or user accounts;
      • +
    • + attempt to gain unauthorized access to FECFile Online or related systems or networks or to defeat, avoid, + bypass, remove, deactivate, or otherwise circumvent any software protection or monitoring mechanisms of + FECFile Online; +
      • +
    • create committee or user accounts in bulk.

      • +
    +

    Legal disclosure

    +

    + This is a U.S. Federal Government system that is for official use only. Unauthorized use is strictly prohibited. +

    +
    - -
    -
    -
    - -
    -
    -
    - - -
    -     - +
    +
    +
    +
    + +
    +
    +
    + + +
    -
    +
    diff --git a/front-end/src/app/login/security-notice/security-notice.component.scss b/front-end/src/app/login/security-notice/security-notice.component.scss index 95dc73f6f..4ccfbb8f5 100644 --- a/front-end/src/app/login/security-notice/security-notice.component.scss +++ b/front-end/src/app/login/security-notice/security-notice.component.scss @@ -32,28 +32,6 @@ p + ul { } :host ::ng-deep { - .p-card { - box-shadow: none; - margin-top: 0px; - border-radius: 8px; - border-width: 1px; - border-color: #000000; - border-style: solid; - } - - .p-card-content, - .p-card-footer { - padding: 0px; - } - - .p-card-body { - padding: 20px; - } - - .p-checkbox { - margin-left: 30px; - } - .p-checkbox-label { font-style: italic; font-family: gandhi-regular, serif; @@ -79,3 +57,47 @@ ul li { list-style-type: disc; margin-left: 16px; } + +h1 { + font-size: 36px; +} + +h2 { + font-size: 28px; + margin: 0; +} + +.top-line { + margin: 20px 0; +} + +p { + font-size: 18px; +} + +.notice-box { + max-width: min(648px, 100vw); + margin: 0; +} +@media screen and (max-width: 767px) { + .notice-box { + margin: 0 32px; + } +} +@media screen and (min-width: 768px) { + .notice-box { + width: 66.666666666667vw; + } +} +@media screen and (min-width: 1200px) { + .notice-box { + width: 50vw; + } +} + +.security-container { + background-color: white; + margin-top: 80px; + padding: 20px; + border-radius: 8px; +} diff --git a/front-end/src/app/login/security-notice/security-notice.component.ts b/front-end/src/app/login/security-notice/security-notice.component.ts index 8154dced7..6ef1927d8 100644 --- a/front-end/src/app/login/security-notice/security-notice.component.ts +++ b/front-end/src/app/login/security-notice/security-notice.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; -import { Router } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; import { Store } from '@ngrx/store'; import { DestroyerComponent } from 'app/shared/components/app-destroyer.component'; import { UserLoginData } from 'app/shared/models/user.model'; @@ -21,6 +21,7 @@ import { map, takeUntil } from 'rxjs'; export class SecurityNoticeComponent extends DestroyerComponent implements OnInit { public localLoginAvailable = false; formSubmitted = false; + showForm = true; userLoginData?: UserLoginData; form = new FormGroup( @@ -35,8 +36,12 @@ export class SecurityNoticeComponent extends DestroyerComponent implements OnIni private router: Router, public loginService: LoginService, private usersService: UsersService, + private activatedRoute: ActivatedRoute, ) { super(); + this.activatedRoute.data.subscribe((d) => { + this.showForm = !!d['backgroundStyle']; + }); } ngOnInit() { diff --git a/front-end/src/app/notifications/notifications-routing.module.ts b/front-end/src/app/notifications/notifications-routing.module.ts index 7e0b367b1..36e385157 100644 --- a/front-end/src/app/notifications/notifications-routing.module.ts +++ b/front-end/src/app/notifications/notifications-routing.module.ts @@ -2,12 +2,12 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import { loggedInGuard } from 'app/shared/guards/logged-in.guard'; import { nameGuard } from 'app/shared/guards/name.guard'; -import { SecurityNotificationComponent } from './security-notification/security-notification.component'; +import { SecurityNoticeComponent } from 'app/login/security-notice/security-notice.component'; const routes: Routes = [ { path: 'security', - component: SecurityNotificationComponent, + component: SecurityNoticeComponent, title: 'Security Notice', canActivate: [loggedInGuard, nameGuard], data: { diff --git a/front-end/src/app/notifications/notifications.module.ts b/front-end/src/app/notifications/notifications.module.ts index 66a4a4827..7b51b7bc0 100644 --- a/front-end/src/app/notifications/notifications.module.ts +++ b/front-end/src/app/notifications/notifications.module.ts @@ -1,13 +1,11 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { SharedModule } from 'primeng/api'; -import { SecurityNotificationComponent } from '../notifications/security-notification/security-notification.component'; import { ButtonModule } from 'primeng/button'; import { CardModule } from 'primeng/card'; import { NotificationsRoutingModule } from './notifications-routing.module'; @NgModule({ - declarations: [SecurityNotificationComponent], imports: [CommonModule, NotificationsRoutingModule, SharedModule, ButtonModule, CardModule], }) export class NotificationsModule {} diff --git a/front-end/src/app/notifications/security-notification/security-notification.component.html b/front-end/src/app/notifications/security-notification/security-notification.component.html deleted file mode 100644 index 9185f6e30..000000000 --- a/front-end/src/app/notifications/security-notification/security-notification.component.html +++ /dev/null @@ -1,35 +0,0 @@ -
    -

    Security notification

    -
    - -

    Warning

    -

    - This version of the application is for testing new features and functionality and gathering user feedback. Any - submitted reports do not constitute official filings with the Federal Election Commission (FEC). Any information you - enter at this time is subject to deletion and will not be retained. -

    -

    Disclaimer

    -

    - If you need to file a statement or report to meet your disclosure requirements, please use your normal method of - submitting that information to the FEC. Submitting a report or statement through this system during the testing - phase of this software release does not constitute an official filing with the Federal Election Commission. -

    -

    While using this system please do not:

    -
      -

      -

    • prevent other users from accessing FECFile Online;
      • -
    • overload FECFile Online;
      • -
    • share committee or user accounts;
      • -
    • - attempt to gain unauthorized access to FECFile Online or related systems or networks or to defeat, avoid, - bypass, remove, deactivate, or otherwise circumvent any software protection or monitoring mechanisms of FECFile - Online; -
      • -
    • create committee or user accounts in bulk.
      • -

      -
    -

    Legal disclosure

    -

    - This is a U.S. Federal Government system that is for official use only. Unauthorized use is strictly prohibited. -

    -
    diff --git a/front-end/src/app/notifications/security-notification/security-notification.component.scss b/front-end/src/app/notifications/security-notification/security-notification.component.scss deleted file mode 100644 index c79d0dfb0..000000000 --- a/front-end/src/app/notifications/security-notification/security-notification.component.scss +++ /dev/null @@ -1,51 +0,0 @@ -p, -li { - margin-bottom: 32px; - padding-top: 0; -} - -p + ul { - margin-top: 0; -} - -ul li { - list-style-type: disc; - margin-left: 16px; -} - -h1 { - font-size: 36px; -} - -h2 { - font-size: 28px; - margin: 0; -} - -.top-line { - margin: 20px 0; -} - -p { - font-size: 18px; -} - -.notice-box { - max-width: min(648px, 100vw); - margin: 0; -} -@media screen and (max-width: 767px) { - .notice-box { - margin: 0 32px; - } -} -@media screen and (min-width: 768px) { - .notice-box { - width: 66.666666666667vw; - } -} -@media screen and (min-width: 1200px) { - .notice-box { - width: 50vw; - } -} diff --git a/front-end/src/app/notifications/security-notification/security-notification.component.spec.ts b/front-end/src/app/notifications/security-notification/security-notification.component.spec.ts deleted file mode 100644 index 510ddc6e2..000000000 --- a/front-end/src/app/notifications/security-notification/security-notification.component.spec.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { SecurityNotificationComponent } from './security-notification.component'; - -describe('SecurityNotificationComponent', () => { - let component: SecurityNotificationComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [SecurityNotificationComponent], - }).compileComponents(); - - fixture = TestBed.createComponent(SecurityNotificationComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/front-end/src/app/notifications/security-notification/security-notification.component.ts b/front-end/src/app/notifications/security-notification/security-notification.component.ts deleted file mode 100644 index bb6c52060..000000000 --- a/front-end/src/app/notifications/security-notification/security-notification.component.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-security-notification', - templateUrl: './security-notification.component.html', - styleUrl: './security-notification.component.scss', -}) -export class SecurityNotificationComponent {} From b357a47cab2ffd718d58fe47e427c6e637d69398 Mon Sep 17 00:00:00 2001 From: David Heitzer Date: Wed, 23 Oct 2024 11:07:31 -0400 Subject: [PATCH 19/68] 1118 cr comments --- .../layout/header/header-links/header-links.component.html | 4 ---- .../cash-on-hand-override.component.html | 2 +- .../cash-on-hand-override/cash-on-hand-override.component.ts | 4 ++-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/front-end/src/app/layout/header/header-links/header-links.component.html b/front-end/src/app/layout/header/header-links/header-links.component.html index e42289530..be6594a97 100644 --- a/front-end/src/app/layout/header/header-links/header-links.component.html +++ b/front-end/src/app/layout/header/header-links/header-links.component.html @@ -22,11 +22,7 @@ Tools
  • diff --git a/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.html b/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.html index 5f30a6af1..bbee397ec 100644 --- a/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.html +++ b/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.html @@ -57,7 +57,7 @@

    Line 6a override

    type="button" pButton pRipple - [disabled]="!form.valid" + [disabled]="!newAmountFormControl.dirty" label="Update LINE 6a" class="p-button-primary" (click)="updateLine6a()" diff --git a/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.ts b/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.ts index becf2bae1..cb4fac173 100644 --- a/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.ts +++ b/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.ts @@ -39,7 +39,7 @@ export class CashOnHandOverrideComponent extends DestroyerComponent implements O this.form3XService.getF3xLine6aOverride(selectedYear).then((f3xLine6aOverride) => { this.selectedF3xLine6aOverrideId = f3xLine6aOverride?.id; this.currentAmountFormControl.setValue(f3xLine6aOverride?.cash_on_hand ?? 0); - this.newAmountFormControl.setValue(0); + this.newAmountFormControl.reset(); }); } }); @@ -53,7 +53,7 @@ export class CashOnHandOverrideComponent extends DestroyerComponent implements O updateLine6a(): void { if (this.form.valid) { - if (this.yearFormControl.value && this.newAmountFormControl.value) { + if (this.yearFormControl.value !== null && this.newAmountFormControl.value) { const payload = new F3xLine6aOverride(); payload.id = this.selectedF3xLine6aOverrideId; payload.year = this.yearFormControl.value; From fd345d7d6de88de85e386b7bb365e8fbff31ff1a Mon Sep 17 00:00:00 2001 From: David Heitzer Date: Wed, 23 Oct 2024 11:25:52 -0400 Subject: [PATCH 20/68] 1118 cr changes (missed one) --- .../cash-on-hand-override/cash-on-hand-override.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.ts b/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.ts index cb4fac173..3feba489d 100644 --- a/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.ts +++ b/front-end/src/app/tools/cash-on-hand-override/cash-on-hand-override.component.ts @@ -53,7 +53,7 @@ export class CashOnHandOverrideComponent extends DestroyerComponent implements O updateLine6a(): void { if (this.form.valid) { - if (this.yearFormControl.value !== null && this.newAmountFormControl.value) { + if (this.yearFormControl.value !== null && this.newAmountFormControl.value !== null) { const payload = new F3xLine6aOverride(); payload.id = this.selectedF3xLine6aOverrideId; payload.year = this.yearFormControl.value; From 28b47455304abdfaac91c23cc0e415e5637524d6 Mon Sep 17 00:00:00 2001 From: Sasha Dresden Date: Wed, 23 Oct 2024 12:06:37 -0400 Subject: [PATCH 21/68] Set login security notice padding to 32px and fix empty white bar which pops up sometimes on security notice --- front-end/src/app/layout/layout.component.ts | 4 ++-- .../app/login/security-notice/security-notice.component.scss | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/front-end/src/app/layout/layout.component.ts b/front-end/src/app/layout/layout.component.ts index b63377ed2..339464921 100644 --- a/front-end/src/app/layout/layout.component.ts +++ b/front-end/src/app/layout/layout.component.ts @@ -42,10 +42,10 @@ export class LayoutComponent extends DestroyerComponent implements OnInit, After const height = contentOffset.offsetHeight; let headerFooterOffset = window.innerWidth < 768 ? 332 : 265; if (this.layoutControls.showUpperFooter) headerFooterOffset += 80; - const marginBottom = Math.max(64, window.innerHeight - height - headerFooterOffset); + const paddingBottom = Math.max(64, window.innerHeight - height - headerFooterOffset); // Apply the margin-bottom to the div - contentOffset.style.marginBottom = marginBottom + 'px'; + contentOffset.style.paddingBottom = paddingBottom + 'px'; } ngOnInit(): void { diff --git a/front-end/src/app/login/security-notice/security-notice.component.scss b/front-end/src/app/login/security-notice/security-notice.component.scss index 4ccfbb8f5..8cc32c0d0 100644 --- a/front-end/src/app/login/security-notice/security-notice.component.scss +++ b/front-end/src/app/login/security-notice/security-notice.component.scss @@ -98,6 +98,6 @@ p { .security-container { background-color: white; margin-top: 80px; - padding: 20px; + padding: 32px; border-radius: 8px; } From d51a6ab5e3f42e62753b1fb197d5f41ec5961ad9 Mon Sep 17 00:00:00 2001 From: Sasha Dresden Date: Wed, 23 Oct 2024 12:13:59 -0400 Subject: [PATCH 22/68] Set link to prod link on prod, stage link everywhere else --- .../committee-info.component.spec.ts | 54 ++++++++++++++++--- .../committee-info.component.ts | 8 ++- 2 files changed, 53 insertions(+), 9 deletions(-) diff --git a/front-end/src/app/committee/committee-info/committee-info.component.spec.ts b/front-end/src/app/committee/committee-info/committee-info.component.spec.ts index 4e692b3ee..04e524c51 100644 --- a/front-end/src/app/committee/committee-info/committee-info.component.spec.ts +++ b/front-end/src/app/committee/committee-info/committee-info.component.spec.ts @@ -8,33 +8,71 @@ import { SharedModule } from 'primeng/api'; import { DividerModule } from 'primeng/divider'; import { DropdownModule } from 'primeng/dropdown'; import { CommitteeInfoComponent } from './committee-info.component'; +import { environment } from 'environments/environment'; describe('CommitteeInfoComponent', () => { let component: CommitteeInfoComponent; let fixture: ComponentFixture; + let originalEnvironment = { + production: false, + name: 'development', + apiUrl: 'https://localhost/api/v1', + appTitle: 'FECfile', + dcfConverterApiUrl: 'https://dev-efile-api.efdev.fec.gov/dcf_converter/v1', + fecApiUrl: 'https://api.open.fec.gov/v1/', + userCanSetFilingFrequency: true, + loginDotGovAuthUrl: 'http://localhost:8080/oidc/authenticate', + loginDotGovLogoutUrl: '', + ffapiLoginDotGovCookieName: 'ffapi_login_dot_gov', + sessionIdCookieName: 'sessionid', + committee_data_source: 'test', + }; - beforeEach(async () => { + beforeAll(() => { + // Save the original environment to restore after the tests + originalEnvironment = { ...environment }; + }); + + afterAll(() => { + // Restore the original environment after all tests + Object.assign(environment, originalEnvironment); + }); + + // This method sets the environment before TestBed.configureTestingModule() is called + async function setEnvironment(production: boolean) { + Object.assign(environment, { production }); + // Now configure and compile TestBed with the updated environment await TestBed.configureTestingModule({ providers: [provideMockStore(testMockStore)], declarations: [CommitteeInfoComponent, FecInternationalPhoneInputComponent], imports: [DividerModule, DropdownModule, HttpClientTestingModule, FormsModule, ReactiveFormsModule, SharedModule], }).compileComponents(); - }); - beforeEach(() => { + // Create the component (constructor will be called here) fixture = TestBed.createComponent(CommitteeInfoComponent); component = fixture.componentInstance; fixture.detectChanges(); - }); + } - it('should create', () => { - expect(component).toBeTruthy(); + it('should use the production link in production environment', async () => { + await setEnvironment(true); + + const link = 'https://webforms.stage.gov/webforms/form1/index.htm'; + expect(component.link).toBe(link); + spyOn(window, 'open'); + const f1FormLink = fixture.debugElement.nativeElement.querySelector('#update-form-1-link'); + f1FormLink.click(); + expect(window.open).toHaveBeenCalledWith(link, '_blank', 'noopener'); }); - it('opens FEC form', () => { + it('should use the staging link in non-production environment', async () => { + await setEnvironment(false); + + const link = 'https://webforms.stage.efo.fec.gov/webforms/form1/index.htm'; + expect(component.link).toBe(link); spyOn(window, 'open'); const f1FormLink = fixture.debugElement.nativeElement.querySelector('#update-form-1-link'); f1FormLink.click(); - expect(window.open).toHaveBeenCalledWith('https://webforms.fec.gov/webforms/form1/index.htm', '_blank', 'noopener'); + expect(window.open).toHaveBeenCalledWith(link, '_blank', 'noopener'); }); }); diff --git a/front-end/src/app/committee/committee-info/committee-info.component.ts b/front-end/src/app/committee/committee-info/committee-info.component.ts index 07f21d9ac..870abd5cb 100644 --- a/front-end/src/app/committee/committee-info/committee-info.component.ts +++ b/front-end/src/app/committee/committee-info/committee-info.component.ts @@ -7,6 +7,7 @@ import { SchemaUtils } from 'app/shared/utils/schema.utils'; import { selectCommitteeAccount } from 'app/store/committee-account.selectors'; import { Observable, takeUntil } from 'rxjs'; import { DestroyerComponent } from 'app/shared/components/app-destroyer.component'; +import { environment } from 'environments/environment'; @Component({ selector: 'app-committee-info', @@ -40,12 +41,17 @@ export class CommitteeInfoComponent extends DestroyerComponent implements OnInit 'custodian_name_full', ]; + link: string; + constructor( private store: Store, private fb: FormBuilder, private readonly changeDetectorRef: ChangeDetectorRef, ) { super(); + this.link = environment.production + ? 'https://webforms.stage.gov/webforms/form1/index.htm' + : 'https://webforms.stage.efo.fec.gov/webforms/form1/index.htm'; } ngAfterViewInit(): void { this.committeeAccount$ = this.store.select(selectCommitteeAccount); @@ -81,6 +87,6 @@ export class CommitteeInfoComponent extends DestroyerComponent implements OnInit * This sends the user to fec.gov to update their Form 1. */ updateForm1(): void { - window.open('https://webforms.fec.gov/webforms/form1/index.htm', '_blank', 'noopener'); + window.open(this.link, '_blank', 'noopener'); } } From 18338d4de264bcfebcd11e23bbf0fe982e9f4f9b Mon Sep 17 00:00:00 2001 From: David Heitzer Date: Wed, 23 Oct 2024 15:19:28 -0400 Subject: [PATCH 23/68] 1692 remove old coh page --- ...reports-f24-independent-expenditures.cy.ts | 1 - .../e2e/F3X/reports-f3x-amendments.cy.ts | 6 -- .../e2e/F3X/reports-f3x-loans-bank.cy.ts | 7 +- front-end/cypress/e2e/F3X/reports-f3x.cy.ts | 8 +- .../cypress/e2e/models/ReportFormModel.ts | 2 - .../cypress/e2e/pages/f3xCashOnHandPage.ts | 18 ---- front-end/cypress/e2e/pages/reportListPage.ts | 14 +--- .../sidebar/menus/f3x/f3x-menu.component.ts | 9 -- .../cash-on-hand.component.html | 79 ------------------ .../cash-on-hand.component.spec.ts | 81 ------------------ .../create-workflow/cash-on-hand.component.ts | 83 ------------------- .../create-f3x-step1.component.spec.ts | 3 +- .../create-f3x-step1.component.ts | 6 +- .../src/app/reports/f3x/f3x-routing.module.ts | 10 --- .../report-list/report-list.component.html | 1 - .../report-list/report-list.component.spec.ts | 2 - .../report-list/report-list.component.ts | 27 ++---- front-end/src/app/reports/reports.module.ts | 2 - .../shared/guards/cash-on-hand.guard.spec.ts | 28 ------- .../app/shared/guards/cash-on-hand.guard.ts | 17 ---- .../src/app/shared/models/form-3x.model.ts | 1 - .../src/app/shared/models/report.model.ts | 1 - 22 files changed, 15 insertions(+), 391 deletions(-) delete mode 100644 front-end/cypress/e2e/pages/f3xCashOnHandPage.ts delete mode 100644 front-end/src/app/reports/f3x/create-workflow/cash-on-hand.component.html delete mode 100644 front-end/src/app/reports/f3x/create-workflow/cash-on-hand.component.spec.ts delete mode 100644 front-end/src/app/reports/f3x/create-workflow/cash-on-hand.component.ts delete mode 100644 front-end/src/app/shared/guards/cash-on-hand.guard.spec.ts delete mode 100644 front-end/src/app/shared/guards/cash-on-hand.guard.ts diff --git a/front-end/cypress/e2e/F24/reports-f24-independent-expenditures.cy.ts b/front-end/cypress/e2e/F24/reports-f24-independent-expenditures.cy.ts index e3fcde422..21949dac4 100644 --- a/front-end/cypress/e2e/F24/reports-f24-independent-expenditures.cy.ts +++ b/front-end/cypress/e2e/F24/reports-f24-independent-expenditures.cy.ts @@ -32,7 +32,6 @@ describe('Form 24 Independent Expenditures', () => { it('Independent Expenditures created on a Form 24 should be linked to a Form 3X', () => { const f3x_report_data = { ...defaultForm3XData, - cash_on_hand: 500, }; F3XSetup({ individual: true, candidate: true, report: f3x_report_data }); F24Setup(); diff --git a/front-end/cypress/e2e/F3X/reports-f3x-amendments.cy.ts b/front-end/cypress/e2e/F3X/reports-f3x-amendments.cy.ts index c85fe0be6..bc6c8ea8e 100644 --- a/front-end/cypress/e2e/F3X/reports-f3x-amendments.cy.ts +++ b/front-end/cypress/e2e/F3X/reports-f3x-amendments.cy.ts @@ -31,13 +31,7 @@ describe('Amendments', () => { F3xCreateReportPage.enterFormData(reportFormData); PageUtils.clickButton('Save and continue'); - // Cash on hand - PageUtils.clickSidebarItem('Cash on hand'); const alias = PageUtils.getAlias(''); - PageUtils.enterValue('#L6a_cash_on_hand_jan_1_ytd', 60000); - PageUtils.calendarSetValue('p-calendar', new Date('05/27/2024'), alias); - PageUtils.clickButton('Save & continue'); - PageUtils.urlCheck('/list'); PageUtils.clickSidebarItem('SUBMIT YOUR REPORT'); PageUtils.clickLink('Submit report'); diff --git a/front-end/cypress/e2e/F3X/reports-f3x-loans-bank.cy.ts b/front-end/cypress/e2e/F3X/reports-f3x-loans-bank.cy.ts index 457c60378..c68165516 100644 --- a/front-end/cypress/e2e/F3X/reports-f3x-loans-bank.cy.ts +++ b/front-end/cypress/e2e/F3X/reports-f3x-loans-bank.cy.ts @@ -6,7 +6,6 @@ import { ReportListPage } from '../pages/reportListPage'; import { TransactionDetailPage } from '../pages/transactionDetailPage'; import { StartTransaction } from './start-transaction/start-transaction'; import { F3XSetup, reportFormDataApril, reportFormDataJuly, Setup } from './f3x-setup'; -import { defaultFormData as cohFormData, F3xCashOnHandPage } from '../pages/f3xCashOnHandPage'; const formData = { ...defaultLoanFormData, @@ -21,12 +20,8 @@ const formData = { }, }; -function setupLoanFromBank(setup: Setup, addCoh = false) { +function setupLoanFromBank(setup: Setup) { F3XSetup(setup); - if (addCoh) { - F3xCashOnHandPage.enterFormData(cohFormData); - PageUtils.clickButton('Save & continue'); - } StartTransaction.Loans().FromBank(); PageUtils.searchBoxInput(organizationFormData.name); diff --git a/front-end/cypress/e2e/F3X/reports-f3x.cy.ts b/front-end/cypress/e2e/F3X/reports-f3x.cy.ts index 28660c329..7cf0066d0 100644 --- a/front-end/cypress/e2e/F3X/reports-f3x.cy.ts +++ b/front-end/cypress/e2e/F3X/reports-f3x.cy.ts @@ -1,6 +1,5 @@ import { Initialize } from '../pages/loginPage'; import { ReportListPage } from '../pages/reportListPage'; -import { defaultFormData as cohFormData, F3xCashOnHandPage } from '../pages/f3xCashOnHandPage'; import { ReportLevelMemoPage } from '../pages/reportLevelMemoPage'; import { currentYear, PageUtils } from '../pages/pageUtils'; import { defaultForm3XData } from '../models/ReportFormModel'; @@ -67,7 +66,6 @@ describe('Manage reports', () => { it('Create a report error for overlapping coverage dates', () => { // Create report #1 ReportListPage.createF3X(); - F3xCashOnHandPage.enterFormData(cohFormData); PageUtils.clickButton('Save & continue'); ReportListPage.goToPage(); @@ -97,12 +95,8 @@ describe('Manage reports', () => { cy.get('label[for="12G"]').should('have.class', 'p-disabled'); }); - it('Create report and save cash on hand', () => { + it('Create report and save', () => { ReportListPage.createF3X(); - - F3xCashOnHandPage.enterFormData(cohFormData); - PageUtils.clickButton('Save & continue'); - cy.contains('Cash on hand').should('exist'); }); xit('Check values on the Summary Page', () => { diff --git a/front-end/cypress/e2e/models/ReportFormModel.ts b/front-end/cypress/e2e/models/ReportFormModel.ts index 2b729d508..29e3fae15 100644 --- a/front-end/cypress/e2e/models/ReportFormModel.ts +++ b/front-end/cypress/e2e/models/ReportFormModel.ts @@ -8,7 +8,6 @@ export class F3xCreateReportFormData { coverage_through_date: Date; date_of_election: Date; state_of_election: string; - cash_on_hand?: number; constructor(formData: F3xCreateReportFormData) { this.filing_frequency = formData.filing_frequency; @@ -18,7 +17,6 @@ export class F3xCreateReportFormData { this.coverage_from_date = formData.coverage_from_date; this.date_of_election = formData.date_of_election; this.state_of_election = formData.state_of_election; - this.cash_on_hand = formData.cash_on_hand; } } diff --git a/front-end/cypress/e2e/pages/f3xCashOnHandPage.ts b/front-end/cypress/e2e/pages/f3xCashOnHandPage.ts deleted file mode 100644 index bcebe3e85..000000000 --- a/front-end/cypress/e2e/pages/f3xCashOnHandPage.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { currentYear, PageUtils } from './pageUtils'; - -export type F3xCashOnHandFormData = { - cashOnHand: string; - date: Date; -}; - -export const defaultFormData: F3xCashOnHandFormData = { - cashOnHand: '5000', - date: new Date(currentYear, 5 - 1, 2), -}; - -export class F3xCashOnHandPage { - static enterFormData(formData: F3xCashOnHandFormData) { - cy.get('app-input-number[formcontrolname="L6a_cash_on_hand_jan_1_ytd"]').safeType(formData['cashOnHand']); - PageUtils.calendarSetValue('p-calendar[formcontrolname="cash_on_hand_date"]', formData['date']); - } -} diff --git a/front-end/cypress/e2e/pages/reportListPage.ts b/front-end/cypress/e2e/pages/reportListPage.ts index 9dcd3aeee..e4b279135 100644 --- a/front-end/cypress/e2e/pages/reportListPage.ts +++ b/front-end/cypress/e2e/pages/reportListPage.ts @@ -1,7 +1,6 @@ import { F3xCreateReportPage } from './f3xCreateReportPage'; import { defaultForm24Data, defaultForm3XData as defaultReportFormData } from '../models/ReportFormModel'; import { PageUtils } from './pageUtils'; -import { defaultFormData as cohFormData, F3xCashOnHandPage } from './f3xCashOnHandPage'; export class ReportListPage { static goToPage() { @@ -51,14 +50,7 @@ export class ReportListPage { F3xCreateReportPage.waitForCoverage(); F3xCreateReportPage.enterFormData(fd); PageUtils.clickButton('Save and continue'); - if (fd.cash_on_hand) { - F3xCashOnHandPage.enterFormData({ - cashOnHand: fd.cash_on_hand.toString(), - date: fd.coverage_from_date, - }); - PageUtils.clickButton('Save & continue'); - cy.contains('Transactions in this report').should('exist'); - } + cy.contains('Transactions in this report').should('exist'); } static createF1M() { @@ -81,10 +73,8 @@ export class ReportListPage { cy.wait(500); } - static submitReport(reportName: string, fd = cohFormData) { + static submitReport(reportName: string) { ReportListPage.editReport(reportName); - F3xCashOnHandPage.enterFormData(fd); - PageUtils.clickButton('Save & continue'); PageUtils.clickSidebarItem('SUBMIT YOUR REPORT'); PageUtils.clickSidebarItem('Submit report'); const alias = PageUtils.getAlias(''); diff --git a/front-end/src/app/layout/sidebar/menus/f3x/f3x-menu.component.ts b/front-end/src/app/layout/sidebar/menus/f3x/f3x-menu.component.ts index ee234680e..67699825c 100644 --- a/front-end/src/app/layout/sidebar/menus/f3x/f3x-menu.component.ts +++ b/front-end/src/app/layout/sidebar/menus/f3x/f3x-menu.component.ts @@ -56,15 +56,6 @@ export class F3XMenuComponent extends AbstractMenuComponent implements OnInit { }, { label: 'Add other transactions', styleClass: 'menu-item-disabled' }, ]; - if (activeReport?.is_first) { - transactionItems = [ - { - label: 'Cash on hand', - routerLink: `/reports/f3x/create/cash-on-hand/${activeReport?.id}`, - }, - ...transactionItems, - ]; - } const reviewReport = this.reviewReport(sidebarState); reviewReport.items = [ { diff --git a/front-end/src/app/reports/f3x/create-workflow/cash-on-hand.component.html b/front-end/src/app/reports/f3x/create-workflow/cash-on-hand.component.html deleted file mode 100644 index edefe2215..000000000 --- a/front-end/src/app/reports/f3x/create-workflow/cash-on-hand.component.html +++ /dev/null @@ -1,79 +0,0 @@ -
    - -

    Cash on hand

    -
    - You will need to enter your cash on hand this first time. In the future, this will be automatically calculated for - you. -
    -
    -
    -
    -
    - - - -
    -
    -
    -
    - - - - This is a required field. - -
    -
    -
    -
    - -
    -
    - -
    -
    -
    - -
    -
    - -
    -
    -     -
    diff --git a/front-end/src/app/reports/f3x/create-workflow/cash-on-hand.component.spec.ts b/front-end/src/app/reports/f3x/create-workflow/cash-on-hand.component.spec.ts deleted file mode 100644 index 38cf07c0c..000000000 --- a/front-end/src/app/reports/f3x/create-workflow/cash-on-hand.component.spec.ts +++ /dev/null @@ -1,81 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { of } from 'rxjs'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { Router } from '@angular/router'; -import { FormBuilder, FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { SharedModule } from 'app/shared/shared.module'; -import { MessageService } from 'primeng/api'; -import { CalendarModule } from 'primeng/calendar'; -import { ButtonModule } from 'primeng/button'; -import { InputNumberModule } from 'primeng/inputnumber'; -import { RouterTestingModule } from '@angular/router/testing'; -import { provideMockStore } from '@ngrx/store/testing'; -import { testMockStore } from 'app/shared/utils/unit-test.utils'; -import { CashOnHandComponent } from './cash-on-hand.component'; -import { ToastModule } from 'primeng/toast'; -import { CardModule } from 'primeng/card'; -import { Form3X } from '../../../shared/models/form-3x.model'; -import { Form3XService } from '../../../shared/services/form-3x.service'; -import { singleClickEnableAction } from '../../../store/single-click.actions'; - -describe('CashOnHandComponent', () => { - let component: CashOnHandComponent; - let router: Router; - let fixture: ComponentFixture; - let form3XService: Form3XService; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [CashOnHandComponent], - imports: [ - ToastModule, - CardModule, - HttpClientTestingModule, - SharedModule, - CalendarModule, - InputNumberModule, - ButtonModule, - FormsModule, - ReactiveFormsModule, - RouterTestingModule.withRoutes([]), - ], - providers: [Form3XService, FormBuilder, MessageService, provideMockStore(testMockStore)], - }).compileComponents(); - }); - - beforeEach(() => { - router = TestBed.inject(Router); - form3XService = TestBed.inject(Form3XService); - fixture = TestBed.createComponent(CashOnHandComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); - - describe('save', () => { - it('should save', () => { - const f3x = Form3X.fromJSON({ id: '999' }); - spyOn(form3XService, 'update').and.returnValue(of(f3x)); - const navigateSpy = spyOn(router, 'navigateByUrl'); - component.report = f3x; - component.form.patchValue({ - L6a_cash_on_hand_jan_1_ytd: 200.0, - cash_on_hand_date: new Date(), - }); - - component.save(); - - expect(navigateSpy).toHaveBeenCalledWith('/reports/transactions/report/999/list'); - }); - - it('should stop if form is invalid', () => { - expect(component.form.invalid).toBeTrue(); - const spy = spyOn(component.store, 'dispatch'); - component.save(); - expect(spy).toHaveBeenCalledWith(singleClickEnableAction()); - }); - }); -}); diff --git a/front-end/src/app/reports/f3x/create-workflow/cash-on-hand.component.ts b/front-end/src/app/reports/f3x/create-workflow/cash-on-hand.component.ts deleted file mode 100644 index 79a0278ff..000000000 --- a/front-end/src/app/reports/f3x/create-workflow/cash-on-hand.component.ts +++ /dev/null @@ -1,83 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { Router } from '@angular/router'; -import { Store } from '@ngrx/store'; -import { DestroyerComponent } from 'app/shared/components/app-destroyer.component'; -import { Form3X } from 'app/shared/models/form-3x.model'; -import { Form3XService } from 'app/shared/services/form-3x.service'; -import { SchemaUtils } from 'app/shared/utils/schema.utils'; -import { selectActiveReport } from 'app/store/active-report.selectors'; -import { schema as f3xSchema } from 'fecfile-validate/fecfile_validate_js/dist/F3X'; -import { MessageService } from 'primeng/api'; -import { takeUntil } from 'rxjs'; -import { singleClickEnableAction } from '../../../store/single-click.actions'; -import { blurActiveInput } from 'app/shared/utils/form.utils'; - -@Component({ - selector: 'app-cash-on-hand', - templateUrl: './cash-on-hand.component.html', -}) -export class CashOnHandComponent extends DestroyerComponent implements OnInit { - formProperties: string[] = ['L6a_cash_on_hand_jan_1_ytd', 'cash_on_hand_date']; - report: Form3X | undefined; - formSubmitted = false; - form: FormGroup = this.fb.group(SchemaUtils.getFormGroupFieldsNoBlur(this.formProperties, this.fb), { - updateOn: 'blur', - }); - - constructor( - public router: Router, - private form3XService: Form3XService, - private fb: FormBuilder, - private messageService: MessageService, - public store: Store, - ) { - super(); - } - - ngOnInit(): void { - this.store - .select(selectActiveReport) - .pipe(takeUntil(this.destroy$)) - .subscribe((report) => (this.report = report as Form3X)); - - // Initialize validation tracking of current JSON schema and form data - this.form.controls['L6a_cash_on_hand_jan_1_ytd'].addValidators([Validators.required]); - this.form.controls['cash_on_hand_date'].addValidators([Validators.required]); - - // Set form default values - this.form.patchValue({ ...this.report }); - } - - public save(): void { - this.formSubmitted = true; - blurActiveInput(this.form); - if (this.form.invalid) { - this.store.dispatch(singleClickEnableAction()); - return; - } - - const payload: Form3X = Form3X.fromJSON({ - ...this.report, - ...SchemaUtils.getFormValues(this.form, f3xSchema, this.formProperties), - ...{ - calculation_status: null, - cash_on_hand_date: this.form.controls['cash_on_hand_date'].value, - L6a_year_for_above_ytd: String(this.form.controls['cash_on_hand_date'].value.getYear() + 1900), - }, - }); - - this.form3XService.update(payload, this.formProperties).subscribe(() => { - if (this.report) { - this.router.navigateByUrl(`/reports/transactions/report/${this.report.id}/list`); - } - - this.messageService.add({ - severity: 'success', - summary: 'Successful', - detail: 'Report Updated', - life: 3000, - }); - }); - } -} diff --git a/front-end/src/app/reports/f3x/create-workflow/create-f3x-step1.component.spec.ts b/front-end/src/app/reports/f3x/create-workflow/create-f3x-step1.component.spec.ts index a0c9c82c5..bd3501e15 100644 --- a/front-end/src/app/reports/f3x/create-workflow/create-f3x-step1.component.spec.ts +++ b/front-end/src/app/reports/f3x/create-workflow/create-f3x-step1.component.spec.ts @@ -34,7 +34,6 @@ describe('CreateF3XStep1Component', () => { coverage_through_date: '2022-06-25', form_type: 'F3XN', report_code: 'Q1', - is_first: true, }); const first = new Date('01/01/2024'); @@ -144,7 +143,7 @@ describe('CreateF3XStep1Component', () => { navigateSpy.calls.reset(); component.form.patchValue({ ...f3x }); component.save('continue'); - expect(navigateSpy).toHaveBeenCalledWith('/reports/f3x/create/cash-on-hand/999'); + expect(navigateSpy).toHaveBeenCalledWith('/reports/transactions/report/999/list'); }); it('#save should not save with invalid f3x record', () => { diff --git a/front-end/src/app/reports/f3x/create-workflow/create-f3x-step1.component.ts b/front-end/src/app/reports/f3x/create-workflow/create-f3x-step1.component.ts index e71f99a88..b75e5500a 100644 --- a/front-end/src/app/reports/f3x/create-workflow/create-f3x-step1.component.ts +++ b/front-end/src/app/reports/f3x/create-workflow/create-f3x-step1.component.ts @@ -203,11 +203,7 @@ export class CreateF3XStep1Component extends DestroyerComponent implements OnIni //Create the report create$.subscribe((report) => { if (jump === 'continue') { - if (report.is_first) { - this.router.navigateByUrl(`/reports/f3x/create/cash-on-hand/${report.id}`); - } else { - this.router.navigateByUrl(`/reports/transactions/report/${report.id}/list`); - } + this.router.navigateByUrl(`/reports/transactions/report/${report.id}/list`); } else { this.router.navigateByUrl('/reports'); this.messageService.add({ diff --git a/front-end/src/app/reports/f3x/f3x-routing.module.ts b/front-end/src/app/reports/f3x/f3x-routing.module.ts index 6fde31094..c4713e508 100644 --- a/front-end/src/app/reports/f3x/f3x-routing.module.ts +++ b/front-end/src/app/reports/f3x/f3x-routing.module.ts @@ -6,8 +6,6 @@ import { ReportDetailedSummaryComponent } from './report-detailed-summary/report import { ReportResolver } from 'app/shared/resolvers/report.resolver'; import { ReportLevelMemoComponent } from '../shared/report-level-memo/report-level-memo.component'; import { PrintPreviewComponent } from 'app/reports/shared/print-preview/print-preview.component'; -import { CashOnHandComponent } from './create-workflow/cash-on-hand.component'; -import { CashOnHandGuard } from 'app/shared/guards/cash-on-hand.guard'; import { ReportIsEditableGuard } from '../../shared/guards/report-is-editable.guard'; import { ReportSidebarSection } from 'app/layout/sidebar/sidebar.component'; import { SubmitReportStep1Component } from '../submission-workflow/submit-report-step1.component'; @@ -23,14 +21,6 @@ import { SubmitReportStatusComponent } from '../submission-workflow/submit-repor // 2) The ReportResolver should not be declared on routes with a ReportIsEditableGuard declared. const routes: Routes = [ - { - path: 'create/cash-on-hand/:reportId', - title: 'Cash on hand', - component: CashOnHandComponent, - canActivate: [ReportIsEditableGuard, CashOnHandGuard], - data: { sidebarSection: ReportSidebarSection.TRANSACTIONS }, - runGuardsAndResolvers: 'always', - }, { path: 'create/step1', title: 'Create a report', diff --git a/front-end/src/app/reports/report-list/report-list.component.html b/front-end/src/app/reports/report-list/report-list.component.html index 4a7d2e4af..967a414c5 100644 --- a/front-end/src/app/reports/report-list/report-list.component.html +++ b/front-end/src/app/reports/report-list/report-list.component.html @@ -29,7 +29,6 @@

    Manage reports

    icon="pi pi-plus" class="add-button" (click)="showDialog()" - [disabled]="noCashOnHand()" > diff --git a/front-end/src/app/reports/report-list/report-list.component.spec.ts b/front-end/src/app/reports/report-list/report-list.component.spec.ts index f51ab00fd..d9c89be4e 100644 --- a/front-end/src/app/reports/report-list/report-list.component.spec.ts +++ b/front-end/src/app/reports/report-list/report-list.component.spec.ts @@ -80,8 +80,6 @@ describe('ReportListComponent', () => { it('#editItem should route properly', () => { const navigateSpy = spyOn(router, 'navigateByUrl'); - component.editItem({ id: '999', is_first: true, report_type: ReportTypes.F3X } as Form3X); // 999 is the cash on hand report - expect(navigateSpy).toHaveBeenCalledWith('/reports/f3x/create/cash-on-hand/999'); component.editItem({ id: '888', report_type: ReportTypes.F3X } as Report); expect(navigateSpy).toHaveBeenCalledWith('/reports/transactions/report/888/list'); component.editItem({ diff --git a/front-end/src/app/reports/report-list/report-list.component.ts b/front-end/src/app/reports/report-list/report-list.component.ts index 53ec5e8d2..4b35b1d93 100644 --- a/front-end/src/app/reports/report-list/report-list.component.ts +++ b/front-end/src/app/reports/report-list/report-list.component.ts @@ -1,16 +1,16 @@ import { Component, ElementRef, OnDestroy, OnInit } from '@angular/core'; -import { firstValueFrom, lastValueFrom } from 'rxjs'; -import { ConfirmationService, MessageService } from 'primeng/api'; -import { TableAction, TableListBaseComponent } from '../../shared/components/table-list-base/table-list-base.component'; -import { Report, ReportStatus, ReportTypes } from '../../shared/models/report.model'; -import { ReportService } from '../../shared/services/report.service'; -import { Form3X } from 'app/shared/models/form-3x.model'; import { Router } from '@angular/router'; import { Store } from '@ngrx/store'; -import { selectCommitteeAccount } from 'app/store/committee-account.selectors'; import { CommitteeAccount } from 'app/shared/models/committee-account.model'; -import { Form3XService } from 'app/shared/services/form-3x.service'; +import { Form3X } from 'app/shared/models/form-3x.model'; import { DotFecService } from 'app/shared/services/dot-fec.service'; +import { Form3XService } from 'app/shared/services/form-3x.service'; +import { selectCommitteeAccount } from 'app/store/committee-account.selectors'; +import { ConfirmationService, MessageService } from 'primeng/api'; +import { firstValueFrom, lastValueFrom } from 'rxjs'; +import { TableAction, TableListBaseComponent } from '../../shared/components/table-list-base/table-list-base.component'; +import { Report, ReportStatus, ReportTypes } from '../../shared/models/report.model'; +import { ReportService } from '../../shared/services/report.service'; @Component({ selector: 'app-report-list', @@ -81,11 +81,7 @@ export class ReportListComponent extends TableListBaseComponent implemen switch (item.report_type) { case ReportTypes.F3X: - if (item.is_first) { - await this.router.navigateByUrl(`/reports/f3x/create/cash-on-hand/${item.id}`); - } else { - await this.router.navigateByUrl(`/reports/transactions/report/${item.id}/list`); - } + await this.router.navigateByUrl(`/reports/transactions/report/${item.id}/list`); break; case ReportTypes.F99: await this.router.navigateByUrl(`/reports/f99/edit/${item.id}`); @@ -160,11 +156,6 @@ export class ReportListComponent extends TableListBaseComponent implemen return item.form_type ?? ''; } - public noCashOnHand(): boolean { - const f3xItems = this.items.filter((i) => i.report_type === ReportTypes.F3X); - return f3xItems.length === 1 && !(f3xItems[0] as Form3X).cash_on_hand_date; - } - public showDialog(): void { this.dialogVisible = true; } diff --git a/front-end/src/app/reports/reports.module.ts b/front-end/src/app/reports/reports.module.ts index 3004fbb3d..bd6792027 100644 --- a/front-end/src/app/reports/reports.module.ts +++ b/front-end/src/app/reports/reports.module.ts @@ -22,7 +22,6 @@ import { TooltipModule } from 'primeng/tooltip'; import { DialogModule } from 'primeng/dialog'; import { InputNumberModule } from 'primeng/inputnumber'; import { SharedModule } from 'app/shared/shared.module'; -import { CashOnHandComponent } from './f3x/create-workflow/cash-on-hand.component'; import { CreateF3XStep1Component } from './f3x/create-workflow/create-f3x-step1.component'; import { ReportDetailedSummaryComponent } from './f3x/report-detailed-summary/report-detailed-summary.component'; import { ReportLevelMemoComponent } from './shared/report-level-memo/report-level-memo.component'; @@ -49,7 +48,6 @@ import { PasswordModule } from 'primeng/password'; ReportDetailedSummaryComponent, ReportLevelMemoComponent, PrintPreviewComponent, - CashOnHandComponent, FormTypeDialogComponent, MainFormComponent, ], diff --git a/front-end/src/app/shared/guards/cash-on-hand.guard.spec.ts b/front-end/src/app/shared/guards/cash-on-hand.guard.spec.ts deleted file mode 100644 index aae328159..000000000 --- a/front-end/src/app/shared/guards/cash-on-hand.guard.spec.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { TestBed } from '@angular/core/testing'; -import { ActivatedRouteSnapshot } from '@angular/router'; -import { provideMockStore } from '@ngrx/store/testing'; -import { testMockStore } from '../utils/unit-test.utils'; -import { CashOnHandGuard } from './cash-on-hand.guard'; - -describe('CashOnHandGuard', () => { - let guard: CashOnHandGuard; - const mockRoute = {} as ActivatedRouteSnapshot; - - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], - providers: [provideMockStore(testMockStore)], - }); - guard = TestBed.inject(CashOnHandGuard); - }); - - it('should be created', () => { - expect(guard).toBeTruthy(); - }); - - it('should provide status of COH need', () => { - const result = guard.canActivate(mockRoute); - expect(result).toBeTruthy(); - }); -}); diff --git a/front-end/src/app/shared/guards/cash-on-hand.guard.ts b/front-end/src/app/shared/guards/cash-on-hand.guard.ts deleted file mode 100644 index 6c5a12567..000000000 --- a/front-end/src/app/shared/guards/cash-on-hand.guard.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot } from '@angular/router'; -import { Observable, map } from 'rxjs'; -import { ReportService } from '../services/report.service'; - -@Injectable({ - providedIn: 'root', -}) -export class CashOnHandGuard { - constructor(private reportService: ReportService) {} - - canActivate(route: ActivatedRouteSnapshot): Observable { - return this.reportService - .get(route.paramMap?.get('reportId') ?? '') - .pipe(map((report) => report?.is_first ?? false)); - } -} diff --git a/front-end/src/app/shared/models/form-3x.model.ts b/front-end/src/app/shared/models/form-3x.model.ts index d81e5b88f..7633d26e1 100644 --- a/front-end/src/app/shared/models/form-3x.model.ts +++ b/front-end/src/app/shared/models/form-3x.model.ts @@ -45,7 +45,6 @@ export class Form3X extends Report { treasurer_prefix: string | undefined; treasurer_suffix: string | undefined; @Transform(BaseModel.dateTransform) date_signed: Date | undefined; - @Transform(BaseModel.dateTransform) cash_on_hand_date: Date | undefined; L6b_cash_on_hand_beginning_period: number | undefined; L6c_total_receipts_period: number | undefined; L6d_subtotal_period: number | undefined; diff --git a/front-end/src/app/shared/models/report.model.ts b/front-end/src/app/shared/models/report.model.ts index 60c50db60..44d1667ab 100644 --- a/front-end/src/app/shared/models/report.model.ts +++ b/front-end/src/app/shared/models/report.model.ts @@ -23,7 +23,6 @@ export abstract class Report extends BaseModel { report_id: string | undefined; // FEC assigned report ID confirmation_email_1: string | undefined; confirmation_email_2: string | undefined; - is_first: boolean | undefined; @Type(() => UploadSubmission) @Transform(UploadSubmission.transform) upload_submission: UploadSubmission | undefined; From e72d1ab15fd67104fe283ee08bd9801664df588d Mon Sep 17 00:00:00 2001 From: David Heitzer Date: Wed, 23 Oct 2024 15:29:50 -0400 Subject: [PATCH 24/68] 1692 lint compaints --- .../src/app/layout/sidebar/menus/f3x/f3x-menu.component.ts | 2 +- .../src/app/reports/f1m/main-form/main-form.component.html | 2 +- .../src/app/reports/f99/main-form/main-form.component.html | 2 +- .../shared/components/save-cancel/save-cancel.component.html | 2 +- .../app/shared/components/save-cancel/save-cancel.component.ts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/front-end/src/app/layout/sidebar/menus/f3x/f3x-menu.component.ts b/front-end/src/app/layout/sidebar/menus/f3x/f3x-menu.component.ts index 67699825c..126040185 100644 --- a/front-end/src/app/layout/sidebar/menus/f3x/f3x-menu.component.ts +++ b/front-end/src/app/layout/sidebar/menus/f3x/f3x-menu.component.ts @@ -37,7 +37,7 @@ export class F3XMenuComponent extends AbstractMenuComponent implements OnInit { } getMenuItems(sidebarState: SidebarState, activeReport: Report | undefined, isEditable: boolean): MenuItem[] { - let transactionItems = [ + const transactionItems = [ { label: 'Manage your transactions', routerLink: `/reports/transactions/report/${activeReport?.id}/list`, diff --git a/front-end/src/app/reports/f1m/main-form/main-form.component.html b/front-end/src/app/reports/f1m/main-form/main-form.component.html index a71069021..da101e3bf 100644 --- a/front-end/src/app/reports/f1m/main-form/main-form.component.html +++ b/front-end/src/app/reports/f1m/main-form/main-form.component.html @@ -436,6 +436,6 @@

    Candidate #{{ i + 1 }}

    • - + diff --git a/front-end/src/app/reports/f99/main-form/main-form.component.html b/front-end/src/app/reports/f99/main-form/main-form.component.html index f9449f98b..a5ffc2391 100644 --- a/front-end/src/app/reports/f99/main-form/main-form.component.html +++ b/front-end/src/app/reports/f99/main-form/main-form.component.html @@ -80,4 +80,4 @@

    Text Information

    - + diff --git a/front-end/src/app/shared/components/save-cancel/save-cancel.component.html b/front-end/src/app/shared/components/save-cancel/save-cancel.component.html index da9df4489..7db050710 100644 --- a/front-end/src/app/shared/components/save-cancel/save-cancel.component.html +++ b/front-end/src/app/shared/components/save-cancel/save-cancel.component.html @@ -1,6 +1,6 @@
    - +
    diff --git a/front-end/src/app/shared/components/save-cancel/save-cancel.component.ts b/front-end/src/app/shared/components/save-cancel/save-cancel.component.ts index 9b167c40f..75037f2dd 100644 --- a/front-end/src/app/shared/components/save-cancel/save-cancel.component.ts +++ b/front-end/src/app/shared/components/save-cancel/save-cancel.component.ts @@ -6,5 +6,5 @@ import { Component, EventEmitter, Output } from '@angular/core'; }) export class SaveCancelComponent { @Output() save = new EventEmitter<'continue' | undefined>(); - @Output() cancel = new EventEmitter(); + @Output() cancelForm = new EventEmitter(); } From 483a97db6a45d43c1f64d5d0d7b5a982081a082b Mon Sep 17 00:00:00 2001 From: David Heitzer Date: Wed, 23 Oct 2024 17:16:32 -0400 Subject: [PATCH 25/68] 1692 e2e --- front-end/cypress/e2e/F3X/reports-f3x.cy.ts | 2 -- front-end/cypress/e2e/pages/reportListPage.ts | 1 - 2 files changed, 3 deletions(-) diff --git a/front-end/cypress/e2e/F3X/reports-f3x.cy.ts b/front-end/cypress/e2e/F3X/reports-f3x.cy.ts index 7cf0066d0..0595f7cd6 100644 --- a/front-end/cypress/e2e/F3X/reports-f3x.cy.ts +++ b/front-end/cypress/e2e/F3X/reports-f3x.cy.ts @@ -66,8 +66,6 @@ describe('Manage reports', () => { it('Create a report error for overlapping coverage dates', () => { // Create report #1 ReportListPage.createF3X(); - PageUtils.clickButton('Save & continue'); - ReportListPage.goToPage(); // Create report #2 const formData = { diff --git a/front-end/cypress/e2e/pages/reportListPage.ts b/front-end/cypress/e2e/pages/reportListPage.ts index e4b279135..4054e6c8c 100644 --- a/front-end/cypress/e2e/pages/reportListPage.ts +++ b/front-end/cypress/e2e/pages/reportListPage.ts @@ -50,7 +50,6 @@ export class ReportListPage { F3xCreateReportPage.waitForCoverage(); F3xCreateReportPage.enterFormData(fd); PageUtils.clickButton('Save and continue'); - cy.contains('Transactions in this report').should('exist'); } static createF1M() { From 0609af5a8c4919576a95bb7fc35d38276dcf1967 Mon Sep 17 00:00:00 2001 From: Sasha Dresden Date: Thu, 24 Oct 2024 09:00:09 -0400 Subject: [PATCH 26/68] Convert it to being an environment variable --- .../committee-info.component.spec.ts | 39 ++++++++++--------- .../committee-info.component.ts | 7 +--- .../manage-committee.component.spec.ts | 3 +- .../environments/environment.cloud.gov.dev.ts | 1 + .../environment.cloud.gov.prod.ts | 1 + .../environment.cloud.gov.stage.ts | 1 + .../environment.cloud.gov.test.ts | 1 + .../src/environments/environment.local.ts | 1 + front-end/src/environments/environment.ts | 1 + 9 files changed, 30 insertions(+), 25 deletions(-) diff --git a/front-end/src/app/committee/committee-info/committee-info.component.spec.ts b/front-end/src/app/committee/committee-info/committee-info.component.spec.ts index 04e524c51..18ec0e4f0 100644 --- a/front-end/src/app/committee/committee-info/committee-info.component.spec.ts +++ b/front-end/src/app/committee/committee-info/committee-info.component.spec.ts @@ -26,21 +26,12 @@ describe('CommitteeInfoComponent', () => { ffapiLoginDotGovCookieName: 'ffapi_login_dot_gov', sessionIdCookieName: 'sessionid', committee_data_source: 'test', + form1m_link: 'https://webforms.stage.efo.fec.gov/webforms/form1/index.htm', }; - beforeAll(() => { - // Save the original environment to restore after the tests - originalEnvironment = { ...environment }; - }); - - afterAll(() => { - // Restore the original environment after all tests - Object.assign(environment, originalEnvironment); - }); - // This method sets the environment before TestBed.configureTestingModule() is called - async function setEnvironment(production: boolean) { - Object.assign(environment, { production }); + async function setEnvironment(form1m_link?: string) { + if (form1m_link) Object.assign(environment, { form1m_link }); // Now configure and compile TestBed with the updated environment await TestBed.configureTestingModule({ providers: [provideMockStore(testMockStore)], @@ -54,11 +45,25 @@ describe('CommitteeInfoComponent', () => { fixture.detectChanges(); } - it('should use the production link in production environment', async () => { - await setEnvironment(true); + beforeAll(() => { + // Save the original environment to restore after the tests + originalEnvironment = { ...environment }; + }); + + afterAll(() => { + // Restore the original environment after all tests + Object.assign(environment, originalEnvironment); + }); + + it('should create', () => { + setEnvironment(); + expect(component).toBeTruthy(); + }); + it('should use the production link in production environment', async () => { const link = 'https://webforms.stage.gov/webforms/form1/index.htm'; - expect(component.link).toBe(link); + await setEnvironment(link); + spyOn(window, 'open'); const f1FormLink = fixture.debugElement.nativeElement.querySelector('#update-form-1-link'); f1FormLink.click(); @@ -66,10 +71,8 @@ describe('CommitteeInfoComponent', () => { }); it('should use the staging link in non-production environment', async () => { - await setEnvironment(false); - const link = 'https://webforms.stage.efo.fec.gov/webforms/form1/index.htm'; - expect(component.link).toBe(link); + await setEnvironment(link); spyOn(window, 'open'); const f1FormLink = fixture.debugElement.nativeElement.querySelector('#update-form-1-link'); f1FormLink.click(); diff --git a/front-end/src/app/committee/committee-info/committee-info.component.ts b/front-end/src/app/committee/committee-info/committee-info.component.ts index 870abd5cb..8d1f889f9 100644 --- a/front-end/src/app/committee/committee-info/committee-info.component.ts +++ b/front-end/src/app/committee/committee-info/committee-info.component.ts @@ -41,17 +41,12 @@ export class CommitteeInfoComponent extends DestroyerComponent implements OnInit 'custodian_name_full', ]; - link: string; - constructor( private store: Store, private fb: FormBuilder, private readonly changeDetectorRef: ChangeDetectorRef, ) { super(); - this.link = environment.production - ? 'https://webforms.stage.gov/webforms/form1/index.htm' - : 'https://webforms.stage.efo.fec.gov/webforms/form1/index.htm'; } ngAfterViewInit(): void { this.committeeAccount$ = this.store.select(selectCommitteeAccount); @@ -87,6 +82,6 @@ export class CommitteeInfoComponent extends DestroyerComponent implements OnInit * This sends the user to fec.gov to update their Form 1. */ updateForm1(): void { - window.open(this.link, '_blank', 'noopener'); + window.open(environment.form1m_link, '_blank', 'noopener'); } } diff --git a/front-end/src/app/committee/manage-committee/manage-committee.component.spec.ts b/front-end/src/app/committee/manage-committee/manage-committee.component.spec.ts index 67ddae22e..1d12a4d2b 100644 --- a/front-end/src/app/committee/manage-committee/manage-committee.component.spec.ts +++ b/front-end/src/app/committee/manage-committee/manage-committee.component.spec.ts @@ -13,6 +13,7 @@ import { ConfirmDialogModule } from 'primeng/confirmdialog'; import { ManageCommitteeComponent } from './manage-committee.component'; import { CommitteeMember } from 'app/shared/models/committee-member.model'; import { of } from 'rxjs'; +import { CommitteeMemberDialogComponent } from 'app/shared/components/committee-member-dialog/committee-member-dialog.component'; describe('ManageCommitteeComponent', () => { let component: ManageCommitteeComponent; @@ -39,7 +40,7 @@ describe('ManageCommitteeComponent', () => { FileUploadModule, ConfirmDialogModule, ], - declarations: [ManageCommitteeComponent], + declarations: [ManageCommitteeComponent, CommitteeMemberDialogComponent], providers: [ConfirmationService, MessageService, FormBuilder, provideMockStore(testMockStore)], }).compileComponents(); }); diff --git a/front-end/src/environments/environment.cloud.gov.dev.ts b/front-end/src/environments/environment.cloud.gov.dev.ts index 0d4548cfc..85b55a155 100644 --- a/front-end/src/environments/environment.cloud.gov.dev.ts +++ b/front-end/src/environments/environment.cloud.gov.dev.ts @@ -16,6 +16,7 @@ export const environment = { ffapiLoginDotGovCookieName: 'ffapi_login_dot_gov', sessionIdCookieName: 'sessionid', committee_data_source: 'test', + form1m_link: 'https://webforms.stage.efo.fec.gov/webforms/form1/index.htm', }; /* diff --git a/front-end/src/environments/environment.cloud.gov.prod.ts b/front-end/src/environments/environment.cloud.gov.prod.ts index 6f52340e9..e633b2bef 100644 --- a/front-end/src/environments/environment.cloud.gov.prod.ts +++ b/front-end/src/environments/environment.cloud.gov.prod.ts @@ -16,6 +16,7 @@ export const environment = { ffapiLoginDotGovCookieName: 'ffapi_login_dot_gov', sessionIdCookieName: 'sessionid', committee_data_source: 'production', + form1m_link: 'https://webforms.fec.gov/webforms/form1/index.htm', }; /* diff --git a/front-end/src/environments/environment.cloud.gov.stage.ts b/front-end/src/environments/environment.cloud.gov.stage.ts index b7a4074e4..4952a184d 100644 --- a/front-end/src/environments/environment.cloud.gov.stage.ts +++ b/front-end/src/environments/environment.cloud.gov.stage.ts @@ -16,6 +16,7 @@ export const environment = { ffapiLoginDotGovCookieName: 'ffapi_login_dot_gov', sessionIdCookieName: 'sessionid', committee_data_source: 'test', + form1m_link: 'https://webforms.stage.efo.fec.gov/webforms/form1/index.htm', }; /* diff --git a/front-end/src/environments/environment.cloud.gov.test.ts b/front-end/src/environments/environment.cloud.gov.test.ts index db28add2d..12d274a65 100644 --- a/front-end/src/environments/environment.cloud.gov.test.ts +++ b/front-end/src/environments/environment.cloud.gov.test.ts @@ -16,6 +16,7 @@ export const environment = { ffapiLoginDotGovCookieName: 'ffapi_login_dot_gov', sessionIdCookieName: 'sessionid', committee_data_source: 'test', + form1m_link: 'https://webforms.stage.efo.fec.gov/webforms/form1/index.htm', }; /* diff --git a/front-end/src/environments/environment.local.ts b/front-end/src/environments/environment.local.ts index 3d701fb60..79f39f5ed 100644 --- a/front-end/src/environments/environment.local.ts +++ b/front-end/src/environments/environment.local.ts @@ -12,4 +12,5 @@ export const environment = { ffapiLoginDotGovCookieName: 'ffapi_login_dot_gov', sessionIdCookieName: 'sessionid', committee_data_source: 'test', + form1m_link: 'https://webforms.stage.efo.fec.gov/webforms/form1/index.htm', }; diff --git a/front-end/src/environments/environment.ts b/front-end/src/environments/environment.ts index f125d69b5..15909f2cd 100644 --- a/front-end/src/environments/environment.ts +++ b/front-end/src/environments/environment.ts @@ -15,6 +15,7 @@ export const environment = { ffapiLoginDotGovCookieName: 'ffapi_login_dot_gov', sessionIdCookieName: 'sessionid', committee_data_source: 'test', + form1m_link: 'https://webforms.stage.efo.fec.gov/webforms/form1/index.htm', }; /* From c04aa4526e3f1b315b117bb53a01125028d3bdde Mon Sep 17 00:00:00 2001 From: Sasha Dresden Date: Thu, 24 Oct 2024 12:26:57 -0400 Subject: [PATCH 27/68] Fix e2e breaking because committee is now auto-populated for receive loan repayment --- front-end/cypress/e2e/F3X/reports-f3x-loans-committee.cy.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/front-end/cypress/e2e/F3X/reports-f3x-loans-committee.cy.ts b/front-end/cypress/e2e/F3X/reports-f3x-loans-committee.cy.ts index 769666a79..b07530e47 100644 --- a/front-end/cypress/e2e/F3X/reports-f3x-loans-committee.cy.ts +++ b/front-end/cypress/e2e/F3X/reports-f3x-loans-committee.cy.ts @@ -47,7 +47,6 @@ describe('Loans', () => { cy.contains('Receive loan repayment').click({ force: true }); PageUtils.urlCheck('LOAN_REPAYMENT_RECEIVED'); - PageUtils.searchBoxInput(committeeFormData.committee_id); formData.date_received = new Date(currentYear, 4 - 1, 27); PageUtils.calendarSetValue('p-calendar[inputid="date"]', formData.date_received); PageUtils.enterValue('#amount', formData.amount); From da63b751014606ef841f51cd75d933a38ead245f Mon Sep 17 00:00:00 2001 From: Sasha Dresden Date: Thu, 24 Oct 2024 10:30:08 -0400 Subject: [PATCH 28/68] Fix width of header on large screens and fix issue with footer spacer --- .../src/app/layout/layout.component.html | 6 +- .../src/app/layout/layout.component.spec.ts | 58 +++++++++++++++++++ front-end/src/app/layout/layout.component.ts | 22 ++++--- 3 files changed, 78 insertions(+), 8 deletions(-) diff --git a/front-end/src/app/layout/layout.component.html b/front-end/src/app/layout/layout.component.html index f2bae5c85..48cce3c32 100644 --- a/front-end/src/app/layout/layout.component.html +++ b/front-end/src/app/layout/layout.component.html @@ -32,7 +32,11 @@
    -
    +
    diff --git a/front-end/src/app/layout/layout.component.spec.ts b/front-end/src/app/layout/layout.component.spec.ts index fb20328de..4d4c6b9a6 100644 --- a/front-end/src/app/layout/layout.component.spec.ts +++ b/front-end/src/app/layout/layout.component.spec.ts @@ -21,7 +21,65 @@ describe('LayoutComponent', () => { fixture.detectChanges(); }); + function setup(width: number, height: number) { + spyOnProperty(window, 'innerWidth').and.returnValue(width); + spyOnProperty(window, 'innerHeight').and.returnValue(height); + } + + function getCurrentPadding(): number { + return component.contentOffset.style.paddingBottom === '' + ? 0 + : parseInt(component.contentOffset.style.paddingBottom, 10); + } + it('should create', () => { expect(component).toBeTruthy(); }); + + it('should return early if showSidebar is true', () => { + component.layoutControls.showSidebar = true; + const rendererSpy = jasmine.createSpyObj('Renderer2', ['selectRootElement']); + component.updateContentOffset(); + + expect(rendererSpy.selectRootElement).not.toHaveBeenCalled(); + }); + + it('should correctly calculate paddingBottom for mobile layout', () => { + // Simulate a mobile width + const height = 700; + + setup(500, height); + + const value = + height - component.FOOTER_OFFSET_LARGE - 80 - component.contentOffset.offsetHeight + getCurrentPadding(); + component.updateContentOffset(); + + expect(component.contentOffset.style.paddingBottom).toBe(value + 'px'); + }); + + it('should not increase headerFooterOffset when showUpperFooter is false', () => { + expect(component.layoutControls.showSidebar).toBeFalse(); + const height = 900; + setup(1024, height); + + component.layoutControls.showUpperFooter = false; + const value = height - component.FOOTER_OFFSET_SMALL - component.contentOffset.offsetHeight + getCurrentPadding(); + component.updateContentOffset(); + expect(component.contentOffset).toBeTruthy(); + + expect(component.contentOffset.style.paddingBottom).toBe(value + 'px'); + }); + + it('should increase headerFooterOffset when showUpperFooter is true', () => { + expect(component.layoutControls.showSidebar).toBeFalse(); + const height = 900; + setup(1024, height); + + const value = + height - component.FOOTER_OFFSET_SMALL - 80 - component.contentOffset.offsetHeight + getCurrentPadding(); + component.updateContentOffset(); + expect(component.contentOffset).toBeTruthy(); + + expect(component.contentOffset.style.paddingBottom).toBe(value + 'px'); + }); }); diff --git a/front-end/src/app/layout/layout.component.ts b/front-end/src/app/layout/layout.component.ts index 339464921..e947d6bf0 100644 --- a/front-end/src/app/layout/layout.component.ts +++ b/front-end/src/app/layout/layout.component.ts @@ -22,7 +22,7 @@ export class LayoutComponent extends DestroyerComponent implements OnInit, After @ViewChild(FeedbackOverlayComponent) feedbackOverlay!: FeedbackOverlayComponent; layoutControls = new LayoutControls(); - private renderer: Renderer2; + renderer: Renderer2; constructor( private router: Router, @@ -35,17 +35,25 @@ export class LayoutComponent extends DestroyerComponent implements OnInit, After this.updateContentOffset(); } + contentOffset = { + offsetHeight: 0, + style: { paddingBottom: '' }, + }; + FOOTER_OFFSET_LARGE = 332; + FOOTER_OFFSET_SMALL = 266; updateContentOffset() { if (this.layoutControls.showSidebar) return; - const contentOffset = this.renderer.selectRootElement('#content-offset', true); - if (!contentOffset) return; - const height = contentOffset.offsetHeight; - let headerFooterOffset = window.innerWidth < 768 ? 332 : 265; + this.contentOffset = this.renderer.selectRootElement('#content-offset', true); + if (!this.contentOffset) return; + const height = this.contentOffset.offsetHeight; + let headerFooterOffset = window.innerWidth < 768 ? this.FOOTER_OFFSET_LARGE : this.FOOTER_OFFSET_SMALL; if (this.layoutControls.showUpperFooter) headerFooterOffset += 80; - const paddingBottom = Math.max(64, window.innerHeight - height - headerFooterOffset); + const currentPadding = + this.contentOffset.style.paddingBottom === '' ? 0 : parseInt(this.contentOffset.style.paddingBottom, 10); + const paddingBottom = Math.max(64, window.innerHeight - height - headerFooterOffset + currentPadding); // Apply the margin-bottom to the div - contentOffset.style.paddingBottom = paddingBottom + 'px'; + this.contentOffset.style.paddingBottom = paddingBottom + 'px'; } ngOnInit(): void { From fbbda8f04df949e88a9edc860ce026a43884e538 Mon Sep 17 00:00:00 2001 From: Sasha Dresden Date: Fri, 25 Oct 2024 11:07:17 -0400 Subject: [PATCH 29/68] Update styling so for dates errors don't happen until a selection is first made --- .../error-messages/error-messages.component.html | 6 +++++- front-end/src/app/shared/utils/schema.utils.ts | 10 +++++----- front-end/src/styles.scss | 4 ++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/front-end/src/app/shared/components/error-messages/error-messages.component.html b/front-end/src/app/shared/components/error-messages/error-messages.component.html index 4d8685d0e..e1a101f68 100644 --- a/front-end/src/app/shared/components/error-messages/error-messages.component.html +++ b/front-end/src/app/shared/components/error-messages/error-messages.component.html @@ -1,4 +1,8 @@ - + {{ requiredErrorMessage }} {{ uniqueFecIdMessage }} {{ requiredTrueErrorMessage }} diff --git a/front-end/src/app/shared/utils/schema.utils.ts b/front-end/src/app/shared/utils/schema.utils.ts index 9234a673b..16d27b0bc 100644 --- a/front-end/src/app/shared/utils/schema.utils.ts +++ b/front-end/src/app/shared/utils/schema.utils.ts @@ -41,16 +41,16 @@ export class SchemaUtils { static getFormGroupFieldsNoBlur(properties: string[], fb: FormBuilder) { const group: any = {}; // eslint-disable-line @typescript-eslint/no-explicit-any properties.forEach((property) => { - group[property] = fb.control('', SchemaUtils.isNoBlur(property) ? { updateOn: 'change' } : {}); + if (property.includes('date')) { + group[property] = fb.control(null, { updateOn: 'change' }); + } else { + group[property] = fb.control('', SchemaUtils.noBlur.includes(property) ? { updateOn: 'change' } : {}); + } }); return group; } - private static isNoBlur(property: string) { - return property.includes('date') || SchemaUtils.noBlur.includes(property); - } - /** * * @param {FormGroup} form diff --git a/front-end/src/styles.scss b/front-end/src/styles.scss index 540582aa3..f3e589510 100644 --- a/front-end/src/styles.scss +++ b/front-end/src/styles.scss @@ -58,8 +58,8 @@ mark { p-dropdown.ng-invalid.ng-touched div.p-dropdown, .ng-submitted p-inputnumber.ng-invalid input.p-inputtext, p-inputnumber.ng-invalid.ng-touched input.p-inputtext, -.ng-submitted p-calendar.ng-invalid input.p-inputtext, -p-calendar.ng-invalid.ng-touched input.p-inputtext, +.ng-submitted p-calendar.ng-dirty.ng-invalid input.p-inputtext, +p-calendar.ng-dirty.ng-invalid.ng-touched input.p-inputtext, .ng-submitted p-autocomplete.ng-invalid input.p-inputtext, p-autocomplete.ng-invalid.ng-touched input.p-inputtext { border-color: #dc3545; From b1c496f54f53a99cf288915ca5cabe5b278b9057 Mon Sep 17 00:00:00 2001 From: Sasha Dresden Date: Fri, 25 Oct 2024 13:49:21 -0400 Subject: [PATCH 30/68] Fix landing page styling --- .../layout/header/header-links/header-links.component.html | 2 +- front-end/src/app/login/login/login.component.html | 4 ++-- front-end/src/app/login/login/login.component.scss | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/front-end/src/app/layout/header/header-links/header-links.component.html b/front-end/src/app/layout/header/header-links/header-links.component.html index 2a3bf2c6e..7c0ab69d6 100644 --- a/front-end/src/app/layout/header/header-links/header-links.component.html +++ b/front-end/src/app/layout/header/header-links/header-links.component.html @@ -54,7 +54,7 @@
  • - Log In + SIGN IN
    • diff --git a/front-end/src/app/login/login/login.component.html b/front-end/src/app/login/login/login.component.html index 0f65f5940..b7a4715ad 100644 --- a/front-end/src/app/login/login/login.component.html +++ b/front-end/src/app/login/login/login.component.html @@ -15,7 +15,7 @@

    Built to work anywhere.

    -
    +
    -
    -
    {{ report?.getBlocker() }}
    -
    diff --git a/front-end/src/app/shared/models/form-3x.model.ts b/front-end/src/app/shared/models/form-3x.model.ts index 4392d4ee8..8e404f897 100644 --- a/front-end/src/app/shared/models/form-3x.model.ts +++ b/front-end/src/app/shared/models/form-3x.model.ts @@ -175,9 +175,4 @@ export class Form3X extends Report { return plainToInstance(Form3X, json); } - override getBlocker() { - if (!this.L6a_cash_on_hand_jan_1_ytd) - return '*** You may not submit a report until you have entered an amount for Cash on Hand ***'; - return; - } } diff --git a/front-end/src/app/shared/models/report.model.ts b/front-end/src/app/shared/models/report.model.ts index 44d1667ab..87178f984 100644 --- a/front-end/src/app/shared/models/report.model.ts +++ b/front-end/src/app/shared/models/report.model.ts @@ -1,9 +1,9 @@ import { Transform, Type } from 'class-transformer'; +import { JsonSchema } from '../interfaces/json-schema.interface'; +import { LabelList } from '../utils/label.utils'; import { BaseModel } from './base.model'; import { UploadSubmission } from './upload-submission.model'; import { WebPrintSubmission } from './webprint-submission.model'; -import { JsonSchema } from '../interfaces/json-schema.interface'; -import { LabelList } from '../utils/label.utils'; export abstract class Report extends BaseModel { id: string | undefined; @@ -54,10 +54,6 @@ export abstract class Report extends BaseModel { return false; } - getBlocker(): string | undefined { - return; - } - getLongLabel(): string { return this.form_type; } From 50dc51232be5f24e49767cba6e650a70babdce07 Mon Sep 17 00:00:00 2001 From: David Heitzer Date: Mon, 28 Oct 2024 11:31:11 -0400 Subject: [PATCH 32/68] 1692 fix failing test in other module --- .../committee/committee-info/committee-info.component.spec.ts | 4 ++-- front-end/src/app/shared/models/form-3x.model.ts | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/front-end/src/app/committee/committee-info/committee-info.component.spec.ts b/front-end/src/app/committee/committee-info/committee-info.component.spec.ts index 18ec0e4f0..ede635ed4 100644 --- a/front-end/src/app/committee/committee-info/committee-info.component.spec.ts +++ b/front-end/src/app/committee/committee-info/committee-info.component.spec.ts @@ -55,8 +55,8 @@ describe('CommitteeInfoComponent', () => { Object.assign(environment, originalEnvironment); }); - it('should create', () => { - setEnvironment(); + it('should create', async () => { + await setEnvironment(); expect(component).toBeTruthy(); }); diff --git a/front-end/src/app/shared/models/form-3x.model.ts b/front-end/src/app/shared/models/form-3x.model.ts index 8e404f897..7630cc708 100644 --- a/front-end/src/app/shared/models/form-3x.model.ts +++ b/front-end/src/app/shared/models/form-3x.model.ts @@ -174,5 +174,4 @@ export class Form3X extends Report { // json['form_type'] = F3xFormTypes.F3XT; return plainToInstance(Form3X, json); } - } From ccaf46eaa8353598c448080016798c15268dd866 Mon Sep 17 00:00:00 2001 From: Elaine Krauss Date: Mon, 28 Oct 2024 12:57:16 -0400 Subject: [PATCH 33/68] Updates Conduit Earmark transactions to shorten the contact names without shortening the purpose description's parenthetical --- .../CONDUIT_EARMARK_OUT.model.spec.ts | 17 +++++++++++++++++ .../CONDUIT_EARMARK_OUT.model.ts | 7 ++++++- .../CONDUIT_EARMARK_RECEIPT.model.spec.ts | 13 +++++++++++++ .../CONDUIT_EARMARK_RECEIPT.model.ts | 7 ++++++- 4 files changed, 42 insertions(+), 2 deletions(-) diff --git a/front-end/src/app/shared/models/transaction-types/CONDUIT_EARMARK_OUT.model.spec.ts b/front-end/src/app/shared/models/transaction-types/CONDUIT_EARMARK_OUT.model.spec.ts index 77963c8dc..8791030e7 100644 --- a/front-end/src/app/shared/models/transaction-types/CONDUIT_EARMARK_OUT.model.spec.ts +++ b/front-end/src/app/shared/models/transaction-types/CONDUIT_EARMARK_OUT.model.spec.ts @@ -37,4 +37,21 @@ describe('CONDUIT_EARMARK_OUT', () => { const descrip = transaction.transactionType?.generatePurposeDescription?.(transaction); expect(descrip).toBe('Earmarked from Joe Schmoe (Individual)'); }); + + it('#generatePurposeDescription() should not yield too long of a description', () => { + const parentTransaction = getTestTransactionByType( + ScheduleATransactionTypes.CONDUIT_EARMARK_RECEIPT_DEPOSITED, + ) as SchATransaction; + parentTransaction.entity_type = ContactTypes.INDIVIDUAL; + parentTransaction.contributor_first_name = 'Joe'; + parentTransaction.contributor_last_name = + 'Alibaster Theodore Benjamin Worthington Daniel-Struthing Nilesback Adilade Dourson Schmoe IV'; + + transaction.parent_transaction = parentTransaction; + + const descrip = transaction.transactionType?.generatePurposeDescription?.(transaction); + expect(descrip).toBe( + 'Earmarked from Joe Alibaster Theodore Benjamin Worthington Daniel-Struthing Nilesbac... (Individual)', + ); + }); }); diff --git a/front-end/src/app/shared/models/transaction-types/CONDUIT_EARMARK_OUT.model.ts b/front-end/src/app/shared/models/transaction-types/CONDUIT_EARMARK_OUT.model.ts index 140cb203c..cf2e0bbf1 100644 --- a/front-end/src/app/shared/models/transaction-types/CONDUIT_EARMARK_OUT.model.ts +++ b/front-end/src/app/shared/models/transaction-types/CONDUIT_EARMARK_OUT.model.ts @@ -36,7 +36,12 @@ export class CONDUIT_EARMARK_OUT extends CommonConduitEarmarkOut { conduit = `${earmark.contributor_first_name || ''} ${earmark.contributor_last_name || ''}`; } if (conduit) { - return `Earmarked from ${conduit} (Individual)`; + let conduitClause = `Earmarked from ${conduit}`; + const parenthetical = ' (Individual)'; + if ((conduitClause + parenthetical).length > 100) { + conduitClause = conduitClause.slice(0, 97 - parenthetical.length) + '...'; + } + return conduitClause + parenthetical; } return ''; } diff --git a/front-end/src/app/shared/models/transaction-types/CONDUIT_EARMARK_RECEIPT.model.spec.ts b/front-end/src/app/shared/models/transaction-types/CONDUIT_EARMARK_RECEIPT.model.spec.ts index 36a05ced3..89aafbb67 100644 --- a/front-end/src/app/shared/models/transaction-types/CONDUIT_EARMARK_RECEIPT.model.spec.ts +++ b/front-end/src/app/shared/models/transaction-types/CONDUIT_EARMARK_RECEIPT.model.spec.ts @@ -34,4 +34,17 @@ describe('CONDUIT_EARMARK_RECEIPT', () => { const descrip = transaction.transactionType?.generatePurposeDescription?.(transaction); expect(descrip).toBe('Earmarked for Joe (Committee)'); }); + + it('#generatePurposeDescription() should not yield too long of a description', () => { + const childTransaction = getTestTransactionByType(ScheduleBTransactionTypes.CONDUIT_EARMARK_OUT) as SchBTransaction; + childTransaction.entity_type = ContactTypes.COMMITTEE; + childTransaction.payee_organization_name = + 'Joe Alibaster Theodore Benjamin Worthington Daniel-Struthing Nilesback Adilade Dourson Schmoe IV'; + transaction.children = [childTransaction]; + + const descrip = transaction.transactionType?.generatePurposeDescription?.(transaction); + expect(descrip).toBe( + 'Earmarked for Joe Alibaster Theodore Benjamin Worthington Daniel-Struthing Nilesback ... (Committee)', + ); + }); }); diff --git a/front-end/src/app/shared/models/transaction-types/CONDUIT_EARMARK_RECEIPT.model.ts b/front-end/src/app/shared/models/transaction-types/CONDUIT_EARMARK_RECEIPT.model.ts index 21f1edb58..382d1d53a 100644 --- a/front-end/src/app/shared/models/transaction-types/CONDUIT_EARMARK_RECEIPT.model.ts +++ b/front-end/src/app/shared/models/transaction-types/CONDUIT_EARMARK_RECEIPT.model.ts @@ -20,7 +20,12 @@ export class CONDUIT_EARMARK_RECEIPT extends CONDUIT_EARMARK { const earmarkMemo: SchBTransaction = transaction.children[0] as SchBTransaction; if (earmarkMemo.payee_organization_name) { const conduit = earmarkMemo.payee_organization_name; - return `Earmarked for ${conduit} (Committee)`; + let conduitClause = `Earmarked for ${conduit}`; + const parenthetical = ' (Committee)'; + if ((conduitClause + parenthetical).length > 100) { + conduitClause = conduitClause.slice(0, 97 - parenthetical.length) + '...'; + } + return conduitClause + parenthetical; } return ''; } From 58d75e68724405d6605a22095781c5b5bcea8705 Mon Sep 17 00:00:00 2001 From: Sasha Dresden Date: Mon, 28 Oct 2024 14:18:57 -0400 Subject: [PATCH 34/68] Update to force fixed width on login/security-notice version of page --- .../app/login/security-notice/security-notice.component.html | 2 +- .../app/login/security-notice/security-notice.component.scss | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/front-end/src/app/login/security-notice/security-notice.component.html b/front-end/src/app/login/security-notice/security-notice.component.html index a1a88469e..31a12ad8c 100644 --- a/front-end/src/app/login/security-notice/security-notice.component.html +++ b/front-end/src/app/login/security-notice/security-notice.component.html @@ -7,7 +7,7 @@
    -
    +

    Security notification

    diff --git a/front-end/src/app/login/security-notice/security-notice.component.scss b/front-end/src/app/login/security-notice/security-notice.component.scss index 8cc32c0d0..e001fbb0e 100644 --- a/front-end/src/app/login/security-notice/security-notice.component.scss +++ b/front-end/src/app/login/security-notice/security-notice.component.scss @@ -75,6 +75,11 @@ p { font-size: 18px; } +.notice-box-form { + width: 80vw; + margin: 0 32px; +} + .notice-box { max-width: min(648px, 100vw); margin: 0; From ee0e5e7ab8594a9f488078002038491af394ed1d Mon Sep 17 00:00:00 2001 From: Sasha Dresden Date: Mon, 28 Oct 2024 16:00:21 -0400 Subject: [PATCH 35/68] Fix transaction table width and add box shadow to indicate table edge --- .../src/app/layout/layout.component.html | 35 ++++++++++--------- .../transaction-list.component.html | 3 +- .../app/reports/transactions/transaction.scss | 33 +++++++++++------ 3 files changed, 42 insertions(+), 29 deletions(-) diff --git a/front-end/src/app/layout/layout.component.html b/front-end/src/app/layout/layout.component.html index 48cce3c32..83f97b57c 100644 --- a/front-end/src/app/layout/layout.component.html +++ b/front-end/src/app/layout/layout.component.html @@ -40,24 +40,25 @@
    -
    -
    - -
    +
    + +
    - + + +
    + + + +
    - - - -
    diff --git a/front-end/src/app/reports/transactions/transaction-list/transaction-list.component.html b/front-end/src/app/reports/transactions/transaction-list/transaction-list.component.html index 2d363b036..91cc85dac 100644 --- a/front-end/src/app/reports/transactions/transaction-list/transaction-list.component.html +++ b/front-end/src/app/reports/transactions/transaction-list/transaction-list.component.html @@ -1,4 +1,4 @@ -
    +
    @@ -23,6 +23,7 @@

    Transactions in this report

    > + tr > th, + .p-datatable .p-datatable-tbody > tr { + background-color: transparent; + } } .gandhi-bold { @@ -64,8 +80,3 @@ hr { border-top: 2px solid; opacity: 1; } - -:host::ng-deep.p-toolbar { - border-bottom: 2px solid !important; - padding-bottom: 8px; -} From ad5170e1220338e6575a24038ad5be7f0395248e Mon Sep 17 00:00:00 2001 From: Sasha Dresden Date: Mon, 28 Oct 2024 13:27:36 -0400 Subject: [PATCH 36/68] Update contact lookup ui --- .../contact-lookup.component.html | 13 ++-- .../contact-lookup.component.scss | 73 ++++++++++++++++--- .../contact-lookup.component.ts | 2 +- .../src/app/shared/models/contact.model.ts | 8 +- .../img/contact_lookup_magnifying_glass.svg | 2 +- 5 files changed, 78 insertions(+), 20 deletions(-) diff --git a/front-end/src/app/shared/components/contact-lookup/contact-lookup.component.html b/front-end/src/app/shared/components/contact-lookup/contact-lookup.component.html index 6b8275c8a..37161ab95 100644 --- a/front-end/src/app/shared/components/contact-lookup/contact-lookup.component.html +++ b/front-end/src/app/shared/components/contact-lookup/contact-lookup.component.html @@ -2,7 +2,7 @@ {{ candidateOfficeLabel }} candidates only
    -
    +
    -
    +
    -
    {{ group.label }}
    +
    {{ group.label }}
    Try another search or create a new contact
    - - In contacts +
    + + In contacts +
    Magnifying lens diff --git a/front-end/src/app/shared/components/contact-lookup/contact-lookup.component.scss b/front-end/src/app/shared/components/contact-lookup/contact-lookup.component.scss index 39a03d4b3..6c97f6ab7 100644 --- a/front-end/src/app/shared/components/contact-lookup/contact-lookup.component.scss +++ b/front-end/src/app/shared/components/contact-lookup/contact-lookup.component.scss @@ -1,4 +1,8 @@ :host ::ng-deep { + mark { + opacity: 50%; + background-color: #36bdbb; + } .dropdown-with-search .p-dropdown { border-radius: 4px 0 0 4px; } @@ -8,18 +12,31 @@ } .p-dropdown { - border-color: #aeb0b5; - background-color: #eeeeee; + border: 2px solid #aeb0b5; + background-color: #f1f1f1; } .p-dropdown-label { - color: black; + color: #212121; + font-family: karla-bold, sans-serif; + font-size: 16px; + width: 132px; + height: 42px; } .p-autocomplete-input { - border-radius: 0 4px 4px 0; - border-left: 0px; - border-color: #aeb0b5; + background-color: white; + border: 2px solid #aeb0b5; + border-left: 0; + border-radius: 0; + color: #212121; + font-family: karla, sans-serif; + font-size: 16px; + width: 342px; + } + + .p-autocomplete-input::placeholder { + opacity: 0.5; } .p-button-icon-only { @@ -32,9 +49,34 @@ border: none; } + .p-autocomplete-panel { + border: 1px solid #5b616b; + border-radius: 0; + } + + .p-autocomplete-panel .p-autocomplete-items .p-autocomplete-item-group { + padding: 10px 0 10px 10px; + } + + .p-autocomplete-panel .p-autocomplete-items .p-autocomplete-item { + padding: 10px 0 20px 10px; + border-bottom: 0.5px solid #e8e8e8; + border-left: 4px solid transparent; + } + + .p-autocomplete-panel .p-autocomplete-items .p-autocomplete-item:hover { + background-color: #f1f1f1; + border-left: 4px solid #36bdbb; + } + .readonly { pointer-events: none; } + + .dropdownIcon { + color: #212121; + background-color: white; + } } .ng-submitted .transaction-contact-invalid :host ::ng-deep .p-autocomplete-input { @@ -45,19 +87,26 @@ border: 2px solid #aeb0b5; } +.contact-label-container { + display: flex; + justify-content: space-between; +} + .contact-label { - float: left; - width: 50%; + width: 75%; + font-size: 12px; white-space: normal; } .in-contacts { - float: right; + float: 25%; + font-size: 12px; font-style: italic; } .try-another-search-text { font-weight: lighter; + font-size: 12px; font-style: italic; } @@ -78,3 +127,9 @@ .contact-lookup-container { max-width: 65em; } + +.option-group-header { + font-family: karla, sans-serif; + font-size: 12px; + color: #112e51; +} diff --git a/front-end/src/app/shared/components/contact-lookup/contact-lookup.component.ts b/front-end/src/app/shared/components/contact-lookup/contact-lookup.component.ts index 4c1d59931..8a959344c 100644 --- a/front-end/src/app/shared/components/contact-lookup/contact-lookup.component.ts +++ b/front-end/src/app/shared/components/contact-lookup/contact-lookup.component.ts @@ -27,7 +27,7 @@ export class ContactLookupComponent extends DestroyerComponent implements OnInit @Input() showCreateNewContactButton = true; @Input() showSearchBoxCallback = () => true; - @Input() maxFecCommitteeResults = 5; + @Input() maxFecCommitteeResults = 10; @Input() maxFecfileCommitteeResults = 5; @Input() maxFecfileIndividualResults = 10; @Input() maxFecfileOrganizationResults = 10; diff --git a/front-end/src/app/shared/models/contact.model.ts b/front-end/src/app/shared/models/contact.model.ts index b76ae3698..d3a9be3bf 100644 --- a/front-end/src/app/shared/models/contact.model.ts +++ b/front-end/src/app/shared/models/contact.model.ts @@ -289,7 +289,7 @@ export class FecApiCandidateLookupData extends FecApiLookupData { return { // TODO: Will need to update this to last/first name fields // when FEC updates their candidate API to add those fields - label: `${this.name} (${this.candidate_id})`, + label: `${this.name}
    (${this.candidate_id})`, value: this, }; } @@ -303,7 +303,7 @@ export class FecfileCandidateLookupData extends Contact { toSelectItem(): SelectItem { return { - label: `${this.last_name}, ${this.first_name} (${this.candidate_id})`, + label: `${this.last_name}, ${this.first_name}
    (${this.candidate_id})`, value: this, }; } @@ -356,7 +356,7 @@ export class FecApiCommitteeLookupData extends FecApiLookupData { toSelectItem(): SelectItem { return { - label: `${this.name} (${this.id})`, + label: `${this.name}
    (${this.id})`, value: this, }; } @@ -370,7 +370,7 @@ export class FecfileCommitteeLookupData extends Contact { toSelectItem(): SelectItem { return { - label: `${this.name} (${this.committee_id})`, + label: `${this.name}
    (${this.committee_id})`, value: this, }; } diff --git a/front-end/src/assets/img/contact_lookup_magnifying_glass.svg b/front-end/src/assets/img/contact_lookup_magnifying_glass.svg index b962b802a..0a3bbaab5 100644 --- a/front-end/src/assets/img/contact_lookup_magnifying_glass.svg +++ b/front-end/src/assets/img/contact_lookup_magnifying_glass.svg @@ -1,3 +1,3 @@ - + From 3d6157232236f9843e6d34fc44c61b73f0a3bf4e Mon Sep 17 00:00:00 2001 From: Sasha Dresden Date: Tue, 29 Oct 2024 11:01:45 -0400 Subject: [PATCH 37/68] Backout layout fix which should be part of 1600 --- .../src/app/layout/layout.component.html | 35 +++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/front-end/src/app/layout/layout.component.html b/front-end/src/app/layout/layout.component.html index 83f97b57c..48cce3c32 100644 --- a/front-end/src/app/layout/layout.component.html +++ b/front-end/src/app/layout/layout.component.html @@ -40,25 +40,24 @@
    -
    - - +
    +
    + +
    - - - +
    - - - -
    + + + +
    From 5eec90d9ed1fd6953854cbfba3c53ef1714a13bc Mon Sep 17 00:00:00 2001 From: Sasha Dresden Date: Tue, 29 Oct 2024 11:43:50 -0400 Subject: [PATCH 38/68] Fix issue with layout container --- .../src/app/layout/layout.component.html | 49 ++++++++++--------- front-end/src/app/layout/layout.component.ts | 1 + .../create-f3x-step1.component.html | 20 +------- 3 files changed, 27 insertions(+), 43 deletions(-) diff --git a/front-end/src/app/layout/layout.component.html b/front-end/src/app/layout/layout.component.html index 48cce3c32..6dd1d1020 100644 --- a/front-end/src/app/layout/layout.component.html +++ b/front-end/src/app/layout/layout.component.html @@ -2,32 +2,32 @@ -
    -
    - diff --git a/front-end/src/app/layout/footer/footer.component.scss b/front-end/src/app/layout/footer/footer.component.scss index 440c5f369..975ea73c4 100644 --- a/front-end/src/app/layout/footer/footer.component.scss +++ b/front-end/src/app/layout/footer/footer.component.scss @@ -20,18 +20,12 @@ footer label { } #footer-lower { - height: 300px; + height: fit-content; background-color: #164f85; padding: 5px; padding-left: 28px; } -@media (min-width: 768px) { - #footer-lower { - height: 234px; - } -} - #fec-seal { height: 100px; width: 100px; diff --git a/front-end/src/app/layout/layout.component.scss b/front-end/src/app/layout/layout.component.scss index 98e50a56c..d248ed47b 100644 --- a/front-end/src/app/layout/layout.component.scss +++ b/front-end/src/app/layout/layout.component.scss @@ -34,9 +34,8 @@ app-footer { padding: 32px 0 0 0; } -#page-container { - position: relative; - min-height: 100vh; +#content-offset { + overflow-x: hidden; } .sidebar-content-container { diff --git a/front-end/src/app/layout/layout.component.ts b/front-end/src/app/layout/layout.component.ts index ee1daac7b..43490bb9f 100644 --- a/front-end/src/app/layout/layout.component.ts +++ b/front-end/src/app/layout/layout.component.ts @@ -40,18 +40,21 @@ export class LayoutComponent extends DestroyerComponent implements OnInit, After offsetHeight: 0, style: { paddingBottom: '' }, }; - FOOTER_OFFSET_LARGE = 332; - FOOTER_OFFSET_SMALL = 266; + updateContentOffset() { if (this.layoutControls.showSidebar) return; this.contentOffset = this.renderer.selectRootElement('#content-offset', true); if (!this.contentOffset) return; const height = this.contentOffset.offsetHeight; - let headerFooterOffset = window.innerWidth < 768 ? this.FOOTER_OFFSET_LARGE : this.FOOTER_OFFSET_SMALL; - if (this.layoutControls.showUpperFooter) headerFooterOffset += 80; + + const footerElement = this.renderer.selectRootElement('footer', true); + const footerHeight = footerElement ? footerElement.offsetHeight : 0; + const usaBanner = this.renderer.selectRootElement('.usa-banner', true); + const bannerHeight = usaBanner ? usaBanner.offsetHeight : 0; + const currentPadding = this.contentOffset.style.paddingBottom === '' ? 0 : parseInt(this.contentOffset.style.paddingBottom, 10); - const paddingBottom = Math.max(64, window.innerHeight - height - headerFooterOffset + currentPadding); + const paddingBottom = Math.max(64, window.innerHeight - height - footerHeight - bannerHeight + currentPadding); // Apply the margin-bottom to the div this.contentOffset.style.paddingBottom = paddingBottom + 'px'; From daf2feb592e04b35994aed63e299e8651be55a16 Mon Sep 17 00:00:00 2001 From: toddlees Date: Tue, 29 Oct 2024 17:22:21 -0400 Subject: [PATCH 41/68] Handles Pac conduit --- .../PAC_CONDUIT_EARMARK.model.spec.ts | 15 +++++++++++++++ .../PAC_CONDUIT_EARMARK.model.ts | 7 ++++++- .../PAC_CONDUIT_EARMARK_OUT.model.spec.ts | 15 +++++++++++++++ .../PAC_CONDUIT_EARMARK_OUT.model.ts | 7 ++++++- 4 files changed, 42 insertions(+), 2 deletions(-) diff --git a/front-end/src/app/shared/models/transaction-types/PAC_CONDUIT_EARMARK.model.spec.ts b/front-end/src/app/shared/models/transaction-types/PAC_CONDUIT_EARMARK.model.spec.ts index 45ef986fb..07f67fbfe 100644 --- a/front-end/src/app/shared/models/transaction-types/PAC_CONDUIT_EARMARK.model.spec.ts +++ b/front-end/src/app/shared/models/transaction-types/PAC_CONDUIT_EARMARK.model.spec.ts @@ -36,4 +36,19 @@ describe('PAC_PAC_CONDUIT_EARMARK', () => { const descrip = transaction.transactionType?.generatePurposeDescription?.(transaction); expect(descrip).toBe('Earmarked for Joe (Committee)'); }); + + it('#generatePurposeDescription() should not yield too long of a description', () => { + const childTransaction = getTestTransactionByType( + ScheduleBTransactionTypes.PAC_CONDUIT_EARMARK_OUT, + ) as SchBTransaction; + childTransaction.entity_type = ContactTypes.COMMITTEE; + childTransaction.payee_organization_name = + 'Joe Alibaster Theodore Benjamin Worthington Daniel-Struthing Nilesback Adilade Dourson Schmoe IV'; + transaction.children = [childTransaction]; + + const descrip = transaction.transactionType?.generatePurposeDescription?.(transaction); + expect(descrip).toBe( + 'Earmarked for Joe Alibaster Theodore Benjamin Worthington Daniel-Struthing Nilesback ... (Committee)', + ); + }); }); diff --git a/front-end/src/app/shared/models/transaction-types/PAC_CONDUIT_EARMARK.model.ts b/front-end/src/app/shared/models/transaction-types/PAC_CONDUIT_EARMARK.model.ts index 641638c43..1c236b9fe 100644 --- a/front-end/src/app/shared/models/transaction-types/PAC_CONDUIT_EARMARK.model.ts +++ b/front-end/src/app/shared/models/transaction-types/PAC_CONDUIT_EARMARK.model.ts @@ -19,7 +19,12 @@ export class PAC_CONDUIT_EARMARK extends CONDUIT_EARMARK { const earmarkMemo: SchBTransaction = transaction.children[0] as SchBTransaction; const conduit = earmarkMemo.payee_organization_name; if (conduit) { - return `Earmarked for ${conduit} (Committee)`; + let conduitClause = `Earmarked for ${conduit}`; + const parenthetical = ' (Committee)'; + if ((conduitClause + parenthetical).length > 100) { + conduitClause = conduitClause.slice(0, 97 - parenthetical.length) + '...'; + } + return conduitClause + parenthetical; } return ''; } diff --git a/front-end/src/app/shared/models/transaction-types/PAC_CONDUIT_EARMARK_OUT.model.spec.ts b/front-end/src/app/shared/models/transaction-types/PAC_CONDUIT_EARMARK_OUT.model.spec.ts index e9c4c9339..841d96ebe 100644 --- a/front-end/src/app/shared/models/transaction-types/PAC_CONDUIT_EARMARK_OUT.model.spec.ts +++ b/front-end/src/app/shared/models/transaction-types/PAC_CONDUIT_EARMARK_OUT.model.spec.ts @@ -38,4 +38,19 @@ describe('PAC_CONDUIT_EARMARK_OUT', () => { const descrip = transaction.transactionType?.generatePurposeDescription?.(transaction); expect(descrip).toBe('Earmarked from Joe (Committee)'); }); + it('#generatePurposeDescription() should not yield too long of a description', () => { + const parentTransaction = getTestTransactionByType( + ScheduleATransactionTypes.PAC_CONDUIT_EARMARK_RECEIPT_DEPOSITED, + ) as SchATransaction; + parentTransaction.entity_type = ContactTypes.INDIVIDUAL; + parentTransaction.contributor_organization_name = + 'Alibaster Theodore Benjamin Worthington Daniel-Struthing Nilesback Adilade Dourson Schmoe IV'; + + transaction.parent_transaction = parentTransaction; + + const descrip = transaction.transactionType?.generatePurposeDescription?.(transaction); + expect(descrip).toBe( + 'Earmarked from Alibaster Theodore Benjamin Worthington Daniel-Struthing Nilesback Adi... (Committee)', + ); + }); }); diff --git a/front-end/src/app/shared/models/transaction-types/PAC_CONDUIT_EARMARK_OUT.model.ts b/front-end/src/app/shared/models/transaction-types/PAC_CONDUIT_EARMARK_OUT.model.ts index 1a29b40ae..1e518e816 100644 --- a/front-end/src/app/shared/models/transaction-types/PAC_CONDUIT_EARMARK_OUT.model.ts +++ b/front-end/src/app/shared/models/transaction-types/PAC_CONDUIT_EARMARK_OUT.model.ts @@ -26,7 +26,12 @@ export class PAC_CONDUIT_EARMARK_OUT extends CONDUIT_EARMARK_OUT { const earmark: SchATransaction = transaction.parent_transaction as SchATransaction; const conduit = earmark.contributor_organization_name; if (conduit) { - return `Earmarked from ${conduit} (Committee)`; + let conduitClause = `Earmarked from ${conduit}`; + const parenthetical = ' (Committee)'; + if ((conduitClause + parenthetical).length > 100) { + conduitClause = conduitClause.slice(0, 97 - parenthetical.length) + '...'; + } + return conduitClause + parenthetical; } return ''; } From 2b0e2e8ce6c55262556f12a1e2e7112f2e255385 Mon Sep 17 00:00:00 2001 From: Sasha Dresden Date: Tue, 29 Oct 2024 17:51:24 -0400 Subject: [PATCH 42/68] Fix unit tests --- .../app/layout/banner/banner.component.html | 2 +- .../src/app/layout/banner/banner.component.ts | 7 +- .../app/layout/footer/footer.component.html | 2 +- .../src/app/layout/footer/footer.component.ts | 7 +- .../src/app/layout/layout.component.html | 10 +- .../src/app/layout/layout.component.spec.ts | 104 +++++++++--------- front-end/src/app/layout/layout.component.ts | 37 +++---- 7 files changed, 89 insertions(+), 80 deletions(-) diff --git a/front-end/src/app/layout/banner/banner.component.html b/front-end/src/app/layout/banner/banner.component.html index 4ffe9ad70..10ac9ea76 100644 --- a/front-end/src/app/layout/banner/banner.component.html +++ b/front-end/src/app/layout/banner/banner.component.html @@ -1,4 +1,4 @@ -
    +
    diff --git a/front-end/src/app/layout/banner/banner.component.ts b/front-end/src/app/layout/banner/banner.component.ts index e5241fce9..ac10ea385 100644 --- a/front-end/src/app/layout/banner/banner.component.ts +++ b/front-end/src/app/layout/banner/banner.component.ts @@ -1,4 +1,4 @@ -import { Component } from '@angular/core'; +import { Component, ElementRef, ViewChild } from '@angular/core'; @Component({ selector: 'app-banner', @@ -7,6 +7,11 @@ import { Component } from '@angular/core'; }) export class BannerComponent { expanded = false; + @ViewChild('banner') bannerElement!: ElementRef; + + getBannerElement(): HTMLElement { + return this.bannerElement.nativeElement; + } onBannerClick() { this.expanded = !this.expanded; diff --git a/front-end/src/app/layout/footer/footer.component.html b/front-end/src/app/layout/footer/footer.component.html index 82181718d..484a9ddf6 100644 --- a/front-end/src/app/layout/footer/footer.component.html +++ b/front-end/src/app/layout/footer/footer.component.html @@ -1,4 +1,4 @@ -