Commit Graph
3707 Commits
Author SHA1 Message Date
Tim Lowden a9d65f80c3 Delivery Status, Text Messages, Nav cleanup 2022-11-23 09:58:54 -05:00
stvnrlly a2b58c926e more test fixes & letter trimming 2022-11-22 22:50:47 -05:00
stvnrlly ca1897973a test time fixes and bonus letter removal 2022-11-22 17:03:42 -05:00
stvnrlly 46723b6c11 initial timezone pass, which breaks many tests 2022-11-22 12:00:29 -05:00
stvnrlly 3386317f5b trim non-existant pages further 2022-11-02 11:02:32 -04:00
stvnrlly 14a8afee12 streamline navs & menus 2022-11-01 15:27:29 -04:00
stvnrlly 218eb3559f Merge branch 'main' into stvnrlly-remove-broadcasts 2022-10-26 01:27:44 +00:00
Steven Reilly 04aba21296 Merge pull request #139 from GSA/stvnrlly-hide-letters
Hide letters in non-admin UI
2022-10-18 11:35:44 -04:00
stvnrlly b6a6a14bc7 now with even fewer letters 2022-10-18 15:27:13 +00:00
Steven Reilly 345516606f Merge pull request #59 from GSA/stvnrlly-update-form-flow
Update services for post-sign-up tour
2022-10-17 09:43:32 -04:00
stvnrlly 80b45fbb78 switch to team preference for no default org type selection 2022-10-14 00:11:41 +00:00
stvnrlly aec9f03410 set federal as default for new services 2022-10-13 20:41:06 +00:00
stvnrlly 067b4b3742 swap dollar symbols for pound symbols 2022-10-12 20:16:22 +00:00
stvnrlly f16b5dd1c4 remove broadcast-related code 2022-10-04 03:04:13 +00:00
Ryan Ahearn 5f1a1f083a Proactively specify aws region for s3 operations 2022-09-26 10:25:03 -04:00
stvnrlly 3e7b5b4370 update tests based on updated orgs 2022-09-15 18:47:04 +00:00
stvnrlly 7b51d1e7a6 remove nhs and gpo forms 2022-09-13 13:20:54 +00:00
jimmoffet f3f3b914a1 remove unnecessary noqa comment 2022-09-12 17:51:32 -07:00
stvnrlly 0db9653638 remove org categories from service setup flow 2022-09-12 16:30:15 +00:00
jimmoffet 69abec0bb3 change dashboard test to reflect demo changes to uploads view 2022-09-09 17:02:48 -07:00
jimmoffet 68e6efdad0 remove redis debug config var 2022-09-08 09:07:54 -07:00
Ryan Ahearn a2913f8b9c Fix static-scan findings 2022-08-26 17:55:31 +00:00
jimmoffet dad051a662 2767 passing 2022-08-05 00:25:03 -07:00
James Moffet c3541ddcb5 UI tweaks 2022-07-29 15:28:10 -07:00
James Moffet c697596d1a fix indent 2022-07-26 12:37:13 -07:00
James Moffet 1a204ae872 remove extra logs 2022-07-26 11:39:00 -07:00
James Moffet 4c25a81004 disable cache until we can fix on cloud deployment 2022-07-26 11:17:43 -07:00
James Moffet c782d5d80b images and overrides 2022-07-21 18:25:23 -07:00
James Moffet e53d12733a branding 2022-07-20 15:23:54 -07:00
Jim Moffet b932294a9c formatting 2022-07-01 11:49:31 -07:00
Jim Moffet 1c5d432427 clean up and turn off auth for test env 2022-07-01 11:19:58 -07:00
Jim Moffet 1e979ad519 fix basic auth for live environment 2022-07-01 07:58:58 -07:00
Jim Moffet 509cce38f4 set up basicauth config to protect staging site 2022-06-30 17:05:42 -07:00
Ben Thorner 543be77776 Merge pull request #4258 from alphagov/speed-up-templates-page-179736794
Optimise load time for service "Templates" page
2022-06-08 13:37:58 +01:00
Chris Hill-Scott 197e98d891 Refactor support ticket into a template
This is the same thing we do for go live requests and branding requests.

It’s easier to do templating logic in a templating language than in
Python.
2022-06-07 13:50:24 +01:00
Chris Hill-Scott 8b7f2fbf04 Stop using _external=True in tests
It looks like, by default, Flask no longer makes full URLs, for example
`https://example.com/path`. Instead it does `/path`. This will still
work fine, and if anything is better because it reduces the number of
bytes of HTML we are sending.

It won’t mean that requests go over `http` instead of `https` without
the protocol because we set the appropriate HSTS header here:
https://github.com/alphagov/notifications-aws/blob/0c57da7781260c56575b796062795a9d8e1f8c87/ansible/roles/paas-proxy/templates/admin.conf.j2#L11

This commit changes all our tests to reflect that URLs no longer have
the protocol and domain in them. `_external=True` is Flask’s way of
saying whether a URL should be generated with the domain and protocol
(`True`) or without it (`False`).

Again, I can’t find the changelog or diff where this was introuduced,
but if you’d like to go spelunking then here’s a starting point:
https://github.com/pallets/flask/blob/50374e3cfe815acd24fd390c861561a0dd17bfbb/src/flask/helpers.py#L192
2022-06-06 12:12:52 +01:00
Chris Hill-Scott 2a62586799 Reflect change in argument name
`filename_or_fp` was changed to `path_or_file` here:
https://github.com/pallets/flask/pull/3828/files#diff-1f51c8ded4d4ff7e13badab599ef22436c529c2b5f9c25dc6250c1f9fd985440R479
2022-06-06 12:12:52 +01:00
Ben Thorner ad4ef12251 Reuse TemplateList to display move-to options
This is slightly less efficient than getting the folder dicts from
"get_user_template_folders" directly, since:

- TemplateList returns both templates and folders.
- TemplateList encapsulates the dicts in model classes.

We'll compensate for this later on:

- We'll introduce a new caching approach to make the call fast.
- We'll expose a property to avoid the "if" in the comprehension.
2022-06-06 10:36:48 +01:00
Ben Thorner f500db44f1 Reuse TemplateList class when deleting a folder
Part of moving "get_template_folders" et al. into TemplateList so we
can cache it more effectively. This is slightly less efficient as
iterating a TemplateList will instantiate an object for each item
in the folder; but the difference is minimal.

Note that:

- The default template_type for TemplateList is "all".
- We need to pass realistic template "JSON" in the test now.
2022-06-06 10:36:47 +01:00
Ben Thorner ee3d2d1804 Bump utils to version 56.0.0
The only impactful change is the major version itself, where I've
fixed the breaking changes due to the upgrade of PyPDF2 [^1] and
checked there are no deprecation warnings when I run the tests.

[^1]: https://github.com/alphagov/notifications-utils/pull/973
2022-06-01 13:29:54 +01:00
Katie Smith d00c438802 Include placeholders in letter length check
When filling in the letter address having clicked 'back'
(https://www.pivotaltracker.com/story/show/181513431).
2022-05-16 15:44:52 +01:00
David McDonald 19e6e38426 Calculate page count based on template values when previewing
Similar to the bug shown here
https://www.pivotaltracker.com/story/show/181513431, but to fix the case
when previewing a letter send using a CSV upload it wasn't using
template values to calculate the page length.
2022-05-16 15:44:05 +01:00
David McDonald 732bfffb93 Remove duplicative call to get_page_count_for_letter
For some reason we were calling it twice. We can just reuse the
value already calculated
2022-05-16 11:26:05 +01:00
Ben Thorner 4abb6110c8 Fix keys used to render monthly usage
These were out-of-sync with the API.
2022-05-11 13:28:33 +01:00
Ben Thorner 84dde0f824 Merge pull request #4229 from alphagov/monthly-usage-multirate-181935935
Support multiple rates in monthly SMS usage
2022-05-11 11:26:44 +01:00
Ben Thorner bb0fb73bc8 Minor tweaks in response to PR comments
In response to [^1] and [^2].

[^1]: https://github.com/alphagov/notifications-admin/pull/4229#discussion_r869181152
[^2]: https://github.com/alphagov/notifications-admin/pull/4229#discussion_r869186063
2022-05-10 17:00:51 +01:00
Chris Hill-Scott a136b92078 Rename constant for clarity 2022-05-04 15:04:06 +01:00
Ben Thorner 3449ccd923 Support multiple SMS rates per month on usage page 2022-05-03 16:01:13 +01:00
Ben Thorner 91e902bc2c Tidy up "format" method for monthly letter usage
This did more than it said and had some unconventional behaviour:

- It modified the input data. We can avoid this by computing the
postage group on-the-fly and using "sorted" instead of "sort".

- It defined a custom, named tuple. This isn't necessary as Jinja
allows us to access elements by qualification (".") already.

We can also use the same lambda function to group and sort items,
since the sort predicate is the same one we use to group them.
2022-05-03 16:01:09 +01:00
Ben Thorner fb7c116046 Finish migration from billing_units to API fields
This is now only used for letters and represents the number sent
[^1].  We could use the chargeable_units field, but using "_sent"
is more consistent with the annual attributes [^2].

In fact, chargeable_units isn't actually used anywhere, but I've
kept it in the test data as it is part of the real API and helps
clarify the other values for SMS - free vs. charged.

Note: for SMS I've used an arbitrary "1234" for "chargeable_units"
to indicate it's not used and may be different to the number sent -
for SMS it's related to the number of fragments.

[^1]: https://github.com/alphagov/notifications-api/blob/bb62d22f2555db192ab9de66440409158524d790/app/dao/fact_billing_dao.py#L339
[^2]: https://github.com/alphagov/notifications-admin/blob/3a1ac189ff6800d4789b22e4763e5550719e8802/app/main/views/dashboard.py#L339
2022-05-03 16:01:08 +01:00