Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
965a319
Merge pull request #619 from usdoj/develop
brockfanning Apr 10, 2024
a0ccd5d
Merge pull request #621 from usdoj/develop
brockfanning Apr 10, 2024
51a82b0
Merge pull request #616 from usdoj/release-9.0.0
catchenry Apr 12, 2024
76ae4f5
Merge pull request #624 from usdoj/release-9.1.0
ameshkin May 13, 2024
e486646
Merge pull request #629 from usdoj/develop
ameshkin Jul 9, 2024
c0011c3
Merge pull request #628 from usdoj/release-9.2.0
ameshkin Jul 9, 2024
4871378
Merge pull request #640 from usdoj/release-9.3.0
ameshkin Aug 13, 2024
cd65031
Merge pull request #651 from usdoj/develop
brockfanning Sep 10, 2024
3913c1a
Merge pull request #650 from usdoj/release-9.4.0
ameshkin Sep 10, 2024
1f6aae9
Merge pull request #656 from usdoj/release-9.4.1
brockfanning Oct 17, 2024
0dbcd1e
Merge pull request #668 from usdoj/develop
rgristroph-usdoj Oct 29, 2024
ab6d523
Merge pull request #666 from usdoj/release-9.4.2
rgristroph-usdoj Oct 29, 2024
bc4b13d
Merge pull request #671 from usdoj/release-9.4.3
rgristroph-usdoj Oct 31, 2024
b7b8070
Merge pull request #681 from usdoj/release-9.4.4
rgristroph-usdoj Nov 12, 2024
cf30840
Merge pull request #702 from usdoj/uat-9.4.6
rgristroph-usdoj Mar 6, 2025
f479bf9
Merge pull request #705 from usdoj/release-9.4.7
rgristroph-usdoj Mar 7, 2025
03b540c
Merge pull request #709 from usdoj/release-9.5.0
rgristroph-usdoj Apr 8, 2025
0e06847
Merge pull request #713 from usdoj/release-9.7
rgristroph-usdoj May 13, 2025
f557c0d
Merge pull request #716 from usdoj/release-9.7.1
rgristroph-usdoj May 20, 2025
a86c5f2
Merge pull request #725 from usdoj/develop
rgristroph-usdoj Aug 26, 2025
d637840
Merge pull request #731 from usdoj/release-10.0
rgristroph-usdoj Sep 16, 2025
514e92f
Merge pull request #739 from usdoj/develop
brockfanning Jan 12, 2026
1bfda6d
Merge pull request #742 from usdoj/develop
brockfanning Jan 14, 2026
e933f96
Merge branch 'develop' into release-26.0.0
rgristroph-usdoj Jan 15, 2026
860ee14
Merge pull request #743 from usdoj/release-26.0.0
rgristroph-usdoj Jan 15, 2026
9fa48f6
Merge branch 'develop' into release-26.0.0
rgristroph-usdoj Jan 15, 2026
8914ccd
Merge pull request #746 from usdoj/release-26.0.0
brockfanning Jan 15, 2026
012f17f
Merge pull request #752 from usdoj/develop
brockfanning Mar 23, 2026
4f136be
Merge pull request #755 from usdoj/develop
brockfanning Mar 25, 2026
e2a4e6f
Merge branch 'develop' into release-26.1.0
brockfanning Mar 26, 2026
6d08f81
Merge pull request #757 from usdoj/release-26.1.0
rgristroph-usdoj Mar 26, 2026
09d28ee
WSJ-1004: Drupal security update.
rgristroph-usdoj May 20, 2026
00052d4
WSJ-1003: Fixing tests for security update.
rgristroph May 21, 2026
ac6c699
WSJ-1003: Adding webform configs changed on prod since last release.
rgristroph May 21, 2026
d836845
Merge pull request #765 from usdoj/release-26.2.1
rgristroph-usdoj May 21, 2026
aafc11e
WS-0000: Fixing conflicts on merge of main to develop.
rgristroph-usdoj Jun 9, 2026
6bd7425
FOIA-0000: Retain FDA form pattern.
brockfanning Jun 9, 2026
d32022c
Merge branch 'develop' into WS-0000-update-develop-from-main
rgristroph-usdoj Jun 9, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

336 changes: 336 additions & 0 deletions config/default/webform.webform.doj_frd.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,336 @@
uuid: 7c7551c2-0c0b-401f-8553-714804ebaf10
langcode: en
status: open
dependencies:
module:
- foia_webform
weight: 0
open: null
close: null
uid: 4751
template: false
archive: false
id: doj_frd
title: DOJ-FRD
description: ''
categories: { }
elements: |-
name_first:
'#type': textfield
'#title': 'First name'
'#required': true
name_last:
'#type': textfield
'#title': 'Last name'
'#required': true
company_organization:
'#type': textfield
'#title': 'Your organization'
email:
'#type': email
'#title': 'Email address'
'#help': |-
In order for us to communicate with you about your request,<br />
you must provide at least one form of contact information.
phone_number:
'#type': tel
'#title': 'Phone number'
fax_number:
'#type': tel
'#title': 'Fax number'
address_line1:
'#type': textfield
'#title': 'Mailing address 1'
address_line2:
'#type': textfield
'#title': 'Mailing address 2'
address_city:
'#type': textfield
'#title': City
address_state_province:
'#type': textfield
'#title': 'State or province'
address_zip_postal_code:
'#type': textfield
'#title': 'Zip or postal code'
address_country:
'#type': select
'#title': Country
'#default_value': 'United States'
'#options': country_names
request_category:
'#type': select
'#title': 'What type of requester are you?'
'#help': 'Please select the category that best fits you. This information helps FOIA personnel determine what fees, if any, may be applicable.'
'#options':
media: 'Representative of the news media'
educational: 'Educational Institution'
scientific: 'Non-commercial scientific institution'
commercial: 'Commercial-use requester'
other: 'All other requester'
request_description:
'#type': textarea
'#maxlength': 10000
'#title': 'Your request'
'#help': "A brief and clear description of the information you'd like to receive. Please be as specific as possible."
'#required': true
fee_waiver:
'#type': select
'#title': 'Fee waiver'
'#default_value': 'no'
'#options':
'no': 'No'
'yes': 'Yes'
fee_waiver_explanation:
'#type': textarea
'#maxlength': 10000
'#title': 'Fee waiver justification'
'#help': 'Leave this blank if you are not requesting a fee waiver. When making a request for a fee waiver you must explain how your request meets the fee waiver standard described above.'
fee_amount_willing:
'#type': textfield
'#title': 'The amount of money you’re willing to pay in fees, if any'
'#help': 'There is no initial fee required to submit a FOIA request, but the FOIA does allow people requesting records to be charged certain types of fees in some instances.'
'#pattern': '^(?=.)([+\-\$]?([0-9]*)(\.([0-9]+))?)$'
'#counter_type': word
'#counter_maximum': 1
expedited_processing:
'#type': select
'#title': 'Expedited processing'
'#default_value': 'no'
'#options':
'no': 'No'
'yes': 'Yes'
expedited_processing_explanation:
'#type': textarea
'#maxlength': 10000
'#title': 'Justification for expedited processing'
'#help': 'Leave this blank if you are not requesting expedited processing. When making a request for expedited processing you must explain how your request meets one of the expedition standards described above.&nbsp;&nbsp;This agency has additional criteria for expedited processing detailed at <a href="https://www.ecfr.gov/cgi-bin/retrieveECFR?gp=&amp;SID=a41b3b79fe629d968f90008e116d5f2e&amp;mc=true&amp;n=pt28.1.16&amp;r=PART&amp;ty=HTML#se28.1.16_15">28&nbsp;C.F.R. &sect; 16.5(e).</a>'
attachments_supporting_documentation:
'#type': managed_file
'#title': 'Upload additional documentation'
'#help': |-
If you are seeking records about yourself, additional documentation<br />
is required to verify your identity. <a href="https://www.ecfr.gov/cgi-bin/text-idx?SID=0793c853161160d5e01f0ff18c51b96a&amp;mc=true&amp;node=sp28.1.16.a&amp;rgn=div6#se28.1.16_13">28&nbsp;C.F.R. &sect; 16.3(a)(3).</a>&nbsp;You can use this&nbsp;<a href="https://www.justice.gov/sites/default/files/oip/legacy/2014/07/23/cert_ind.pdf">form</a>&nbsp;to verify your identity.
'#multiple': true
css: ''
javascript: ''
settings:
ajax: false
ajax_scroll_top: form
ajax_progress_type: ''
ajax_effect: ''
ajax_speed: null
page: true
page_submit_path: ''
page_confirm_path: ''
page_theme_name: ''
form_title: both
form_submit_once: false
form_open_message: ''
form_close_message: ''
form_exception_message: ''
form_previous_submissions: true
form_confidential: false
form_confidential_message: ''
form_disable_remote_addr: false
form_convert_anonymous: false
form_prepopulate: false
form_prepopulate_source_entity: false
form_prepopulate_source_entity_required: false
form_prepopulate_source_entity_type: ''
form_unsaved: false
form_disable_back: false
form_submit_back: false
form_disable_autocomplete: false
form_novalidate: false
form_disable_inline_errors: false
form_required: false
form_autofocus: false
form_details_toggle: false
form_reset: false
form_access_denied: default
form_access_denied_title: ''
form_access_denied_message: ''
form_access_denied_attributes: { }
form_file_limit: ''
form_attributes: { }
form_method: ''
form_action: ''
share: false
share_node: false
share_theme_name: ''
share_title: true
share_page_body_attributes: { }
submission_label: ''
submission_exception_message: ''
submission_locked_message: ''
submission_log: false
submission_excluded_elements: { }
submission_exclude_empty: false
submission_exclude_empty_checkbox: false
submission_views: { }
submission_views_replace: { }
submission_user_columns: { }
submission_user_duplicate: false
submission_access_denied: default
submission_access_denied_title: ''
submission_access_denied_message: ''
submission_access_denied_attributes: { }
previous_submission_message: ''
previous_submissions_message: ''
autofill: false
autofill_message: ''
autofill_excluded_elements: { }
wizard_progress_bar: true
wizard_progress_pages: false
wizard_progress_percentage: false
wizard_progress_link: false
wizard_progress_states: false
wizard_start_label: ''
wizard_preview_link: false
wizard_confirmation: true
wizard_confirmation_label: ''
wizard_auto_forward: true
wizard_auto_forward_hide_next_button: false
wizard_keyboard: true
wizard_track: ''
wizard_prev_button_label: ''
wizard_next_button_label: ''
wizard_toggle: false
wizard_toggle_show_label: ''
wizard_toggle_hide_label: ''
wizard_page_type: container
wizard_page_title_tag: h2
preview: 0
preview_label: ''
preview_title: ''
preview_message: ''
preview_attributes: { }
preview_excluded_elements: { }
preview_exclude_empty: true
preview_exclude_empty_checkbox: false
draft: none
draft_multiple: false
draft_auto_save: false
draft_saved_message: ''
draft_loaded_message: ''
draft_pending_single_message: ''
draft_pending_multiple_message: ''
confirmation_type: page
confirmation_url: ''
confirmation_title: ''
confirmation_message: ''
confirmation_attributes: { }
confirmation_back: true
confirmation_back_label: ''
confirmation_back_attributes: { }
confirmation_exclude_query: false
confirmation_exclude_token: false
confirmation_update: false
limit_total: null
limit_total_interval: null
limit_total_message: ''
limit_total_unique: false
limit_user: null
limit_user_interval: null
limit_user_message: ''
limit_user_unique: false
entity_limit_total: null
entity_limit_total_interval: null
entity_limit_user: null
entity_limit_user_interval: null
purge: none
purge_days: null
results_disabled: false
results_disabled_ignore: false
results_customize: false
token_view: false
token_update: false
token_delete: false
serial_disabled: false
access:
create:
roles:
- anonymous
- authenticated
users: { }
permissions: { }
view_any:
roles: { }
users: { }
permissions: { }
update_any:
roles: { }
users: { }
permissions: { }
delete_any:
roles: { }
users: { }
permissions: { }
purge_any:
roles: { }
users: { }
permissions: { }
view_own:
roles: { }
users: { }
permissions: { }
update_own:
roles: { }
users: { }
permissions: { }
delete_own:
roles: { }
users: { }
permissions: { }
administer:
roles: { }
users: { }
permissions: { }
test:
roles: { }
users: { }
permissions: { }
configuration:
roles: { }
users: { }
permissions: { }
handlers:
foia_submission_queue:
id: foia_submission_queue
handler_id: foia_submission_queue
label: 'FOIA Submission Queue'
notes: ''
status: true
conditions: { }
weight: 0
settings:
states:
- completed
to_mail: ''
to_options: { }
bcc_mail: ''
bcc_options: { }
cc_mail: ''
cc_options: { }
from_mail: default
from_options: { }
from_name: default
reply_to: ''
return_path: ''
sender_mail: ''
sender_name: ''
subject: 'FOIA Request Submission'
body: '[webform_submission:values:message:value]'
excluded_elements: { }
ignore_access: false
exclude_empty: true
html: true
attachments: false
debug: false
exclude_empty_checkbox: false
exclude_attachments: false
twig: false
theme_name: ''
parameters: { }
variants: { }
4 changes: 2 additions & 2 deletions tests/behat/features/Administrator.feature
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ Feature: Agency Administrator role
@api
Scenario: Agency Administrator can view unpublished content
Given "agency" terms:
| name |field_agency_abbreviation| description |format | language |
| test |DOJ | description |plain_text| en |
| name |field_agency_abbreviation| description |
| test |DOJ | description |
And I am logged in as a user with the 'Agency Administrator' role
When I am at 'node/add/agency_component'
And for 'Agency Component Name' I enter 'A Test Agency Component'
Expand Down
4 changes: 2 additions & 2 deletions tests/behat/features/AgencyComponent.feature
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ Feature: Agency Component Feature

Background:
Given agency terms:
| name | field_agency_abbreviation | description |format | language |
| A Test Agency | FTA | description |plain_text| en |
| name | field_agency_abbreviation | description |
| A Test Agency | FTA | description |

@api
Scenario: Agency Component name in title tag for Agency Component node.
Expand Down
4 changes: 2 additions & 2 deletions tests/behat/features/AnnualFOIAReportData.feature
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ Feature: Annual FOIA Report Data Feature

Background:
Given agency terms:
| name | field_agency_abbreviation | description |format | language |
| Federal Testing Agency | FTA | description |plain_text| en |
| name | field_agency_abbreviation | description |
| Federal Testing Agency | FTA | description |
Given agency_component content:
| title | field_agency | field_rep_start | field_agency_comp_abbreviation |
| Test Agency Component 1 | Federal Testing Agency | 2019-01-01 | ABCDEF |
Expand Down
Loading