Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

02/20/2025 Prod Deploy #2285

Open
wants to merge 150 commits into
base: production
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
150 commits
Select commit Hold shift + click to select a range
17f758b
added id and also refactor error message on templates page
heyitsmebev Dec 13, 2024
b731cd6
adding error annoucement
heyitsmebev Dec 13, 2024
12636d6
adding error annoucement
heyitsmebev Dec 13, 2024
56381f5
adding id
heyitsmebev Dec 17, 2024
ca5e5ce
Merge branch 'main' into 2125-send-message-a11y-audit-unique-ids
heyitsmebev Dec 17, 2024
1df019e
adding required html field
heyitsmebev Dec 18, 2024
1e261fd
fixed testing
heyitsmebev Dec 18, 2024
a3db0a9
first round
heyitsmebev Jan 7, 2025
9d09f75
draft dash
heyitsmebev Jan 10, 2025
30293d9
draft dash
heyitsmebev Jan 10, 2025
6d008d4
clean up
heyitsmebev Jan 13, 2025
ce87e21
clean up
heyitsmebev Jan 14, 2025
2159a9d
clean up
heyitsmebev Jan 14, 2025
5c0eb91
poetry
heyitsmebev Jan 14, 2025
82179c0
Merge branch 'main' into 2199-add-pending-message-data-to-daily-and-u…
heyitsmebev Jan 14, 2025
5e61fb8
jest test
heyitsmebev Jan 14, 2025
cd90682
fixed drop down
heyitsmebev Jan 14, 2025
607e112
updated fetching interval
heyitsmebev Jan 15, 2025
8754c03
updating job status states
heyitsmebev Jan 15, 2025
ae083f4
update banner with different status states
heyitsmebev Jan 16, 2025
3e8015e
get rid of some noise in status updates
Jan 16, 2025
6f7202e
fix test
Jan 16, 2025
1c77f8d
fix test
Jan 16, 2025
c6ed4a8
changed pending state
heyitsmebev Jan 16, 2025
7c51799
update verbage
heyitsmebev Jan 16, 2025
dfe421b
refactor code
heyitsmebev Jan 17, 2025
79e8f02
refactor code partial
heyitsmebev Jan 17, 2025
839bd0b
remove service
heyitsmebev Jan 17, 2025
7422b61
Reformat
heyitsmebev Jan 17, 2025
9942ecf
ajax applied to status
heyitsmebev Jan 18, 2025
3f1058f
jest testing
heyitsmebev Jan 18, 2025
028a154
Merge pull request #2268 from GSA/notify-admin-2245
terrazoon Jan 20, 2025
f13595f
merge main
heyitsmebev Jan 20, 2025
b6b1107
flake8 and fixing conditionals
heyitsmebev Jan 20, 2025
82230f9
fixed testing
heyitsmebev Jan 20, 2025
261c231
Bump rollup from 4.30.1 to 4.31.0
dependabot[bot] Jan 20, 2025
7be1872
clean up templates
heyitsmebev Jan 20, 2025
f91af94
removed comments
heyitsmebev Jan 21, 2025
8248833
Merge pull request #2279 from GSA/dependabot/npm_and_yarn/rollup-4.31.0
alexjanousekGSA Jan 21, 2025
2ab7244
fix test and arrival session
heyitsmebev Jan 21, 2025
ac79edf
Update pull_request_template.md
sheevdave Jan 21, 2025
5cde70a
Removed redundant customize copy
alexjanousekGSA Jan 21, 2025
561b2a3
Reverted change that accidentally pushed to main
alexjanousekGSA Jan 21, 2025
564db4c
Removing redundant text
alexjanousekGSA Jan 21, 2025
16b43fa
Removed whitespace to trigger file change for PR
alexjanousekGSA Jan 21, 2025
4a773a5
Merge pull request #2284 from GSA/bugfix/copy-change
ccostino Jan 21, 2025
24cad0f
fix test
heyitsmebev Jan 21, 2025
6615d4f
Merge pull request #2206 from GSA/2125-send-message-a11y-audit-unique…
heyitsmebev Jan 21, 2025
5cedf04
Merge branch 'main' into 2199-add-pending-message-data-to-daily-and-u…
heyitsmebev Jan 22, 2025
fb1609e
merge main
heyitsmebev Jan 22, 2025
38675e8
jest
heyitsmebev Jan 22, 2025
56af196
Merge pull request #2283 from GSA/sheevdave-patch-1
heyitsmebev Jan 22, 2025
084a5e3
Revert "Send Message A11Y Audit - Unique IDs and also refactor error …
heyitsmebev Jan 22, 2025
17c6cd6
Update no-cost service details
ccostino Jan 22, 2025
a4f6dd7
redis report
Jan 22, 2025
86dfdb6
Merge pull request #2287 from GSA/revert-2206-2125-send-message-a11y-…
heyitsmebev Jan 22, 2025
0dfad83
Merge pull request #2288 from GSA/update-join-notify-template
heyitsmebev Jan 22, 2025
cb41d9e
changing guidance to how-do
heyitsmebev Jan 22, 2025
aa03fc1
Sentence case
heyitsmebev Jan 22, 2025
c47033a
Update pull_request_template.md
sheevdave Jan 22, 2025
cfb966c
redis report
Jan 22, 2025
5d565ab
fix black and isort forever
Jan 22, 2025
dafe86a
Merge pull request #2290 from GSA/2234-relabel-guidance-to-how-to
heyitsmebev Jan 22, 2025
954f1cc
Merge pull request #2266 from GSA/2168-when-a-user-schedules-a-job-th…
heyitsmebev Jan 23, 2025
8f30f93
Merge branch 'main' into 2199-add-pending-message-data-to-daily-and-u…
heyitsmebev Jan 23, 2025
cae2ec1
refactor naming
heyitsmebev Jan 23, 2025
4e33556
Update issue_template.yml
sheevdave Jan 23, 2025
933348b
Fix jest
heyitsmebev Jan 23, 2025
fc755c1
test
heyitsmebev Jan 23, 2025
1566198
Bump playwright from 1.49.1 to 1.50.0
dependabot[bot] Jan 23, 2025
c6dfc6c
Merge pull request #2294 from GSA/dependabot/npm_and_yarn/playwright-…
alexjanousekGSA Jan 24, 2025
296a964
Bump @babel/core from 7.26.0 to 7.26.7
dependabot[bot] Jan 24, 2025
53b1e12
Bump rollup from 4.31.0 to 4.32.0
dependabot[bot] Jan 24, 2025
cc92642
Merge pull request #2297 from GSA/dependabot/npm_and_yarn/rollup-4.32.0
alexjanousekGSA Jan 27, 2025
db13416
Merge pull request #2296 from GSA/dependabot/npm_and_yarn/babel/core-…
alexjanousekGSA Jan 27, 2025
03984bc
Bump @babel/preset-env from 7.26.0 to 7.26.7
dependabot[bot] Jan 27, 2025
a5e2fd4
Merge pull request #2271 from GSA/1706-updaterevise-status-banner-on-…
heyitsmebev Jan 27, 2025
22fcc70
Update issue_template.yml
sheevdave Jan 27, 2025
7776f99
added id and required field
heyitsmebev Jan 28, 2025
88b114f
test
heyitsmebev Jan 28, 2025
088da55
Merge pull request #2295 from GSA/dependabot/npm_and_yarn/babel/prese…
alexjanousekGSA Jan 28, 2025
6c3d6ee
Merge pull request #2250 from GSA/2199-add-pending-message-data-to-da…
heyitsmebev Jan 28, 2025
6ea4da2
Adding back classes
heyitsmebev Jan 29, 2025
adf9c61
clean log messages
Jan 29, 2025
9630d08
Update .github/workflows/checks.yml
terrazoon Jan 29, 2025
709b704
code review feedback
Jan 29, 2025
48b317e
format
Jan 29, 2025
4feace4
code review feedback
Jan 29, 2025
3e37915
Merge pull request #2292 from GSA/sheevdave-patch-2
sheevdave Jan 29, 2025
229842b
pluralization and fixing conditionals
heyitsmebev Jan 30, 2025
5f8d599
cleaning up dup codes
heyitsmebev Jan 30, 2025
057ed6f
Update .github/ISSUE_TEMPLATE/issue_template.yml
sheevdave Jan 30, 2025
653f3f5
Merge pull request #2293 from GSA/sheevdave-patch-3
ccostino Jan 30, 2025
5020964
height more visible for stacked bars
heyitsmebev Jan 30, 2025
6ccf1bb
fixed arrived from preview page
heyitsmebev Jan 30, 2025
2d896da
Merge branch 'main' into 2171-clean-up-titles
heyitsmebev Jan 30, 2025
41001b7
Merge pull request #2309 from GSA/clean_log_messages
terrazoon Jan 30, 2025
704fe32
Merge pull request #2300 from GSA/2125-send-message-a11y-audit---uniq…
heyitsmebev Jan 30, 2025
4ae351b
This changeset explicitly enables the FEATURE_ABOUT_PAGE_ENABLED feat…
ccostino Jan 30, 2025
0ba489d
Update reference to zaproxy/action-baseline to 0.14.0
ccostino Jan 31, 2025
d627ba6
Update reference in daily check action
ccostino Jan 31, 2025
9e1ec46
Merge pull request #2313 from GSA/enable-about-page-in-dynamic-scans
terrazoon Jan 31, 2025
91faaeb
Bump playwright from 1.50.0 to 1.50.1
dependabot[bot] Jan 31, 2025
bd619af
merge from main
Feb 3, 2025
d29260d
Bump rollup from 4.32.0 to 4.34.1
dependabot[bot] Feb 3, 2025
0a538c4
Merge pull request #2317 from GSA/dependabot/npm_and_yarn/playwright-…
alexjanousekGSA Feb 4, 2025
5ffb4dd
Merge pull request #2319 from GSA/dependabot/npm_and_yarn/rollup-4.34.1
alexjanousekGSA Feb 4, 2025
12a2290
dynamic scan warnings
Feb 5, 2025
545bf10
tuple
Feb 5, 2025
23e10b1
tuple
Feb 5, 2025
af8f8a9
Bump rollup from 4.34.1 to 4.34.4
dependabot[bot] Feb 5, 2025
b12f124
Merge pull request #2322 from GSA/dependabot/npm_and_yarn/rollup-4.34.4
alexjanousekGSA Feb 6, 2025
5c6b413
try to remove comments
Feb 6, 2025
39fd870
try to remove comments
Feb 6, 2025
d16eb70
try to fix svg content type
Feb 6, 2025
515419e
try to block serving node files
Feb 6, 2025
afd3d94
try again
Feb 6, 2025
208891a
ignore source code disclosure java as a false positive
Feb 6, 2025
38fad44
Bump rollup from 4.34.4 to 4.34.6
dependabot[bot] Feb 7, 2025
22f729d
Merge pull request #2289 from GSA/notify-admin-2286
ccostino Feb 10, 2025
a4963b8
Merge pull request #2321 from GSA/notify-admin-2315
ccostino Feb 10, 2025
4726143
Bump vulture from 2.13 to 2.14
dependabot[bot] Feb 10, 2025
3016aff
Merge pull request #2261 from GSA/dependabot/pip/vulture-2.14
ccostino Feb 10, 2025
78cfafa
Bump @babel/core from 7.26.7 to 7.26.8
dependabot[bot] Feb 10, 2025
d70a80f
Merge pull request #2328 from GSA/dependabot/npm_and_yarn/babel/core-…
alexjanousekGSA Feb 11, 2025
0c1dd12
Merge pull request #2326 from GSA/dependabot/npm_and_yarn/rollup-4.34.6
alexjanousekGSA Feb 11, 2025
cc6a66f
Bump cryptography from 43.0.3 to 44.0.1
dependabot[bot] Feb 11, 2025
479cca3
Merge pull request #2330 from GSA/dependabot/pip/cryptography-44.0.1
A-Shumway42 Feb 12, 2025
89cfbd9
Bump botocore from 1.35.51 to 1.35.99
dependabot[bot] Feb 12, 2025
e795326
Merge pull request #2329 from GSA/dependabot/pip/botocore-1.35.99
A-Shumway42 Feb 13, 2025
db1f929
Bump newrelic from 10.2.0 to 10.6.0
dependabot[bot] Feb 13, 2025
2fdedc1
Bump @babel/preset-env from 7.26.7 to 7.26.9
dependabot[bot] Feb 14, 2025
34e8647
Bump sass-embedded from 1.83.4 to 1.85.0
dependabot[bot] Feb 14, 2025
5b88eef
Bump rollup from 4.34.6 to 4.34.8
dependabot[bot] Feb 17, 2025
ab497be
Merge pull request #2341 from GSA/dependabot/npm_and_yarn/rollup-4.34.8
alexjanousekGSA Feb 19, 2025
91bea21
Merge pull request #2339 from GSA/dependabot/npm_and_yarn/sass-embedd…
alexjanousekGSA Feb 19, 2025
5b46a4e
Merge pull request #2337 from GSA/dependabot/npm_and_yarn/babel/prese…
alexjanousekGSA Feb 19, 2025
4477834
Bump @babel/core from 7.26.8 to 7.26.9
dependabot[bot] Feb 19, 2025
ad1f83e
Merge branch 'main' into 2171-clean-up-titles
heyitsmebev Feb 19, 2025
0405c92
Merge pull request #2311 from GSA/2171-clean-up-titles
ccostino Feb 19, 2025
bcd7ead
Merge pull request #2338 from GSA/dependabot/npm_and_yarn/babel/core-…
alexjanousekGSA Feb 19, 2025
1bbc49c
reverting back to 250,000
heyitsmebev Feb 19, 2025
84acce4
Merge pull request #2335 from GSA/dependabot/pip/newrelic-10.6.0
A-Shumway42 Feb 19, 2025
05a746a
Bump pyproj from 3.6.1 to 3.7.1
dependabot[bot] Feb 19, 2025
a8d036a
Merge pull request #2340 from GSA/dependabot/pip/pyproj-3.7.1
A-Shumway42 Feb 19, 2025
77248b8
Merge pull request #2345 from GSA/2344-reverting-back-100000-messages…
ccostino Feb 19, 2025
eadd8dd
Update GitHub Action References
ccostino Feb 19, 2025
d20f887
Merge pull request #2346 from GSA/update-github-actions
heyitsmebev Feb 19, 2025
fe6921e
Update Terraform installation and configuration
ccostino Feb 20, 2025
f9fd580
Merge pull request #2350 from GSA/fix-terraform-actions
ccostino Feb 20, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update banner with different status states
heyitsmebev committed Jan 16, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit ae083f4b52e3806ed583da50aa657aff4d23bbd5
1 change: 1 addition & 0 deletions app/main/views/jobs.py
Original file line number Diff line number Diff line change
@@ -407,6 +407,7 @@ def get_job_partials(job):
session["arrived_from_preview_page"] = False

arrived_from_preview_page_url = session.get("arrived_from_preview_page", False)
print('job', dir(job))

return {
"counts": counts,
43 changes: 33 additions & 10 deletions app/templates/partials/jobs/status.html
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ <h2>Delivery Status</h2>

<div class="ajax-block-container">
<p class='bottom-gutter'>
{% if job.still_processing or arrived_from_preview_page_url %}
{% if not job.finished_processing or arrived_from_preview_page_url %}
{% if job.scheduled_for %}
<div class="usa-alert usa-alert--info">
<div class="usa-alert__body">
@@ -33,16 +33,39 @@ <h2 class="usa-alert__heading">Your text has been scheduled</h2>
</div>
{{display_message_status}}
{% else %}
<div class="usa-alert usa-alert--success">
<div class="usa-alert__body">
<h2 class="usa-alert__heading">Your text has been sent</h2>
<p class="usa-alert__text">
{{ job.template_name }} - {{ current_service.name }} was sent on {% if job.processing_started %}
{{ job.processing_started|format_datetime_table }} {% else %}
{{ job.created_at|format_datetime_table }} {% endif %} by {{ job.created_by.name }}
</p>
{% if job.finished_processing or job.processing_started %}
<div class="usa-alert usa-alert--success">
<div class="usa-alert__body">
<h2 class="usa-alert__heading">
{% if job.finished_processing %}
Your text has been sent
{% else %}
Your text is sending
{% endif %}
</h2>
<p class="usa-alert__text">
{{ job.template_name }} - {{ current_service.name }}
{% if job.finished_processing %}
was sent on {{job.processing_started|format_datetime_normal}}
{% else %}
has been sending since {{job.processing_started| format_datetime_normal}}
{% endif %} by {{ job.created_by.name }}
</p>
</div>
</div>
</div>
{% else %}
<div class="usa-alert usa-alert--info">
<div class="usa-alert__body">
<h2 class="usa-alert__heading">
Your text is pending
</h2>
<p class="usa-alert__text">
{{ job.template_name }} - {{ current_service.name }}
has been pending since {{job.created_at|format_datetime_normal}} by {{ job.created_by.name }}
</p>
</div>
</div>
{% endif %}
{{display_message_status}}
{% endif %}
{% endif %}