Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Release 2024-21 #5651

Merged
merged 28 commits into from
May 21, 2024
Merged

Release 2024-21 #5651

merged 28 commits into from
May 21, 2024

Conversation

avaek
Copy link
Contributor

@avaek avaek commented May 20, 2024 •
edited by rohan-bes
Loading

Manual release steps

Pre release

  • Add Route 53 entry for tupaia-web.tupaia.org (@rohan-bes)
  • Update tags on production to add tupaia-web as a gateway domain (@rohan-bes)
  • Remove MS1_COMPLETENESS map overlay (as it's the only one that uses checkTimeliness measureBuilder and the time scale type) (@rohan-bes)

Features ⭐

  • RN-1220: Request country access in DataTrak account settings
  • RN-1124: Export option sets from the Admin Panel

Tweaks ⚖️

  • RN-1284: Update Admin Panel tables
  • RN-1292: Update Admin Panel nav link hover state
  • RN-1298: Update Admin Panel home link hover state
  • RN-1192: Update Admin Panel modal styles
  • RN-1197: Update columns in Admin Panel tables
  • RN-1209: More clearly label “New” and “Edit” modals in Admin Panel
  • RN-1316: Improve performance of Condition and Arithmetic questions in MediTrak

Bug fixes 🐛

  • RN-1290: Handle multiple underscores in measure level
  • RN-1286: Removed empty 'Most Recent Data Date' column from map overlay data table

Infrastructure and maintenance 🛠️

  • RN-737: Merge LESMIS deployment logic into mainline branch
  • RN-1209: Refactor how headings in Admin Panel resource pages are generated

rohan-bes and others added 18 commits May 7, 2024 16:03
@rohan-bes
Merge pull request #5621 from beyondessential/master
d40e3a8 
merge: release-2024-19 master -> dev
@alexd-bes @jaskfla @rohan-bes
refactor(adminPanel): RN-1284: Update admin panel tables (#5602)
db276b7 
* Update tables to use v7 package

* Sorting

* WIP

* Update DataFetchingTableNew.jsx

* Styling

* Fix disableSortBy value

* Rename new datafetching table

* Remove comment

* Update packages/admin-panel/src/table/DataFetchingTable/DataFetchingTable.jsx

Co-authored-by: Jasper Lai <33956381+jaskfla@users.noreply.github.com>

* refactor(adminPanel): RN-1284: Update admin panel tables PART 2 (#5610)

* WIP

* Upgrade react router

* WIP

* Table styling and breadcrumbs

* Breadcrumbs and links

* surveys pages

* user routes

* WIP

* Remove recursive function

* Remove recursive func

* Use new routes syntax

* Use correct icons

* Allow custom link generation

* Update QrCodeButton.jsx

* Stop filtering on button columns

* Make filter cells sticky

* Tidy ups

* Update SecondaryNavbar.jsx

* Make navbar work on re-render

* Handle redirects

* Error and no data handling

* Fix react router type issue

* Remove commented out redirect

* Update handling of admin panel routes

* Add back in permissions

* Update packages/admin-panel/src/table/DataFetchingTable/Cells.jsx

Co-authored-by: Rohan Port <59544282+rohan-bes@users.noreply.github.com>

* refactor(lesmis): RN-1284: Rejig admin panel tables PART 3 (#5617)

* WIP

* Upgrade react router

* WIP

* Table styling and breadcrumbs

* Breadcrumbs and links

* surveys pages

* user routes

* WIP

* Remove recursive function

* Remove recursive func

* Use new routes syntax

* Use correct icons

* Allow custom link generation

* Update QrCodeButton.jsx

* Stop filtering on button columns

* Make filter cells sticky

* Tidy ups

* Update SecondaryNavbar.jsx

* Make navbar work on re-render

* Handle redirects

* Error and no data handling

* Fix react router type issue

* WIP

* Remove commented out redirect

* working main app

* exports

* Update handling of admin panel routes

* WIP

* WIP

* WIP

* Add back in permissions

* WIP

* Move all routes to new format

* re-arrange imports

* Add back in redirects, and styling

* Tidy ups

* Remove comment

* Tidy ups

* remove spread

* Fix build

* Fix build

* Fix imports

* Updates from review

* Fix export filename issue

* Changes to UI

* Fix home link

* Fix header cell overflow

* Update width handling

* Fix prop type errors

* LESMIS tidy ups

---------

Co-authored-by: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Co-authored-by: Rohan Port <59544282+rohan-bes@users.noreply.github.com>
@alexd-bes @jaskfla
tweak(adminPanel): RN-1292: Update hover styling for admin nav panel (#…
a37825c 
…5623)

* tweak(adminPanel): RN-1292: Update hover styling for admin nav panel

* Update packages/admin-panel/src/layout/navigation/NavPanel.jsx

Co-authored-by: Jasper Lai <33956381+jaskfla@users.noreply.github.com>

---------

Co-authored-by: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
@alexd-bes @jaskfla
tweak(adminPanel): RN-1298: Remove home link hover state (#5624)
b6c3c2d 
* tweak(adminPanel): RN-1298: Remove home link hover state

* Update packages/admin-panel/src/layout/navigation/HomeLink.jsx

Co-authored-by: Jasper Lai <33956381+jaskfla@users.noreply.github.com>

---------

Co-authored-by: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
@alexd-bes
Merge pull request #5627 from beyondessential/master
0ffd7c0 
merge: Hotfix 2024-19-1 master-> dev
@alexd-bes @jaskfla
tweak(adminPanel): RN-1192: General modal styling updates (#5622)
c3f19bd 
* WIP

* WIP

* WIP

* WIP

* WIP

* Remove old confirm delete modal

* Match modal styling

* Match heading styles

* resusable centred content

* Update packages/admin-panel/src/qrCode/QrCodeModal.jsx

Co-authored-by: Jasper Lai <33956381+jaskfla@users.noreply.github.com>

---------

Co-authored-by: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
@alexd-bes
fix(adminPanel): Fix undefined component (#5630)
d1e9b8f
@jaskfla @avaek @alexd-bes
feat(datatrakWeb): RN-1220: request country access (#5421)
adaa0c8 
* more descriptive `CountryAccess` typing

* prepare `ProjectResponse` for country access req

* regenerate JSON schema

* use baseline alignment on buttons

* introduce `ChangeProjectButton` component

* use `ChangeProjectButton` component

* export `Icons` before `ChangeProjectButton`

* fix export/initialisation order

* code style in `UserInfo`

* ProjectSelectForm styling when child of paragraph

* update copyright header comment

* fix legacy `UserMenu` usage

and some code formatting style

* code style

* clearer `AccountSettingsColumn` layout

* update login redirect test to use `/survey`

* fix project button font in header

* extend `useRequestProjectAccess` callbacks

* add initial data for `useCountryAccessList`

* tweak `AccountSettingsSection` layout

* update copyright header comment

* introduce `AccessGrantedCountryList`

* partially implement `RequestCountryAccessForm`

* fix `RequestCountryAccessSection` heading spacing

* streamline `RequestCoutryAccessForm` import/export

* trivial refactor (use destructuring)

* Squashed commit of the following:

commit 1e92c29
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Thu Feb 22 12:00:08 2024 +1300

    remove `ensure()`… again 🥲

commit 124b0ee
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Thu Feb 22 11:00:52 2024 +1300

    fix mobile layout quirks

commit 6dc3f9a
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Thu Feb 22 10:30:39 2024 +1300

    reuse a variable

commit b401d42
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Thu Feb 22 10:27:11 2024 +1300

    🚑 add `tsutils` to `yarn.lock`

commit 03c3ca0
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Tue Feb 20 16:48:52 2024 +1300

    🚑 fix dependency spelling

commit bfbaafd
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Tue Feb 20 16:43:11 2024 +1300

    reintroduce `ensure()`

commit 4ebc20a
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Tue Feb 20 16:41:48 2024 +1300

    add `tsutils` as dep of DataTrak

commit 5944a62
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Tue Feb 20 16:28:09 2024 +1300

    typo

commit 5ecb1c4
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Tue Feb 20 16:28:06 2024 +1300

    restore RequestableCountryChecklist behaviour

commit 1a89ef8
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Tue Feb 20 15:53:30 2024 +1300

    use `assertIsNotNullish()` instead of `ensure()`

commit ebe1f2d
Merge: 4a9f887 fea259f
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Tue Feb 20 15:11:02 2024 +1300

    Merge branch 'waitp-1468-request-country-access-3' into waitp-1468-headbanging

commit 4a9f887
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Tue Feb 20 15:06:40 2024 +1300

    use `project`

commit 1f53f1e
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Tue Feb 20 15:01:00 2024 +1300

    Revert "`CurrentUserContext` logs"

    This reverts commit c003df9.

commit 9247f15
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Tue Feb 20 14:07:55 2024 +1300

    remove use of `ensure()`

commit 34485bd
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Tue Feb 20 13:30:06 2024 +1300

    push change to trigger redeployment

commit cbf668c
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Tue Feb 20 11:28:21 2024 +1300

    access project code

commit 2f67ac5
Merge: 59d88b9 886ad37
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Tue Feb 20 10:20:24 2024 +1300

    Merge branch 'dev' into waitp-1468-headbanging

    # Conflicts:
    #	packages/datatrak-web/src/features/ProjectSelectForm.tsx
    #	packages/server-boilerplate/README.md

commit 59d88b9
Merge: e4ae447 ee32cd8
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Tue Feb 20 10:16:56 2024 +1300

    Merge branch 'dev' into waitp-1468-headbanging

commit e4ae447
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Tue Feb 20 09:44:45 2024 +1300

    call `useCurrentUser()`

commit c003df9
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Mon Feb 19 16:57:18 2024 +1300

    `CurrentUserContext` logs

commit 14fc6b4
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Mon Feb 19 15:15:21 2024 +1300

    put things back

commit 0eddc2c
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Mon Feb 19 14:13:09 2024 +1300

    remove `useCurrentUser()` usage

commit 6bb9287
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Mon Feb 19 09:51:07 2024 +1300

    remove `useCountryAccessList` usage

commit 89a269c
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Fri Feb 16 16:51:26 2024 +1300

    Revert "editorial nitpicks"

    This reverts commit de98244.

commit c2fea6d
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Fri Feb 16 16:51:26 2024 +1300

    Revert "curly apostrophe"

    This reverts commit 85678eb.

commit 2f13b9f
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Fri Feb 16 16:51:25 2024 +1300

    Revert "editorial nitpicks"

    This reverts commit f687526.

commit 3c327b6
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Fri Feb 16 16:51:23 2024 +1300

    Revert "standardise spelling of “microservice”"

    This reverts commit 4f76822.

commit de98244
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Fri Feb 16 16:34:16 2024 +1300

    editorial nitpicks

commit 85678eb
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Fri Feb 16 16:33:32 2024 +1300

    curly apostrophe

commit f687526
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Fri Feb 16 16:32:49 2024 +1300

    editorial nitpicks

commit 4f76822
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Fri Feb 16 16:31:10 2024 +1300

    standardise spelling of “microservice”

commit 7598d65
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Fri Feb 16 16:24:52 2024 +1300

    remove `register()` usage

commit 66e54c4
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Fri Feb 16 15:25:16 2024 +1300

    comment some stuff out

commit 79a1216
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Fri Feb 16 15:25:11 2024 +1300

    rename a variable

commit a843395
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Fri Feb 16 15:00:14 2024 +1300

    remove placeholder

commit ef341d9
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Fri Feb 16 14:40:53 2024 +1300

    introduce `RequestableCountryChecklist`

commit 1e6e14d
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Fri Feb 16 13:04:35 2024 +1300

    comment out more stuff

commit 28cc1b2
Author: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Date:   Fri Feb 16 09:21:55 2024 +1300

    ⚗️ remove use of `useTheme`

* correct inline comment

* fix larger size class layout

* code style

* refactor, refine sm/md size class layout

* show only relevant granted countries

* fix imports

and a typo

* remove rogue log

Co-authored-by: alexd-bes <129009580+alexd-bes@users.noreply.github.com>

* accept that `project` may be nullish

* share `ProjectCountryAccessListRequest` type

* fix typing error

* update copyright date

* fix build error

* regenerate schemas

* use new shared type

* use new `CountryAccessObject` type

* fix a build error

* `projectCountryAccessList` API endpoint

* refactor out dead logic

* refactor out more dead logic

* fix export order

* fix import/build error

merging dev somehow missed this

* fix import

* feat(centralServer): RN-1220: centralise `countryAccessList` & make project-dependent (#5503)

* organise imports

* move/rename `ProjectCountryAccessListRequest` type

* consolidate country access list types

* use new `useCountryAccessList` signature

* un-export `CountryAccessObject`

* remove explicit usages of `CountryAccessObject`

* fix typing error

* consolidate country access list routes

* include `projectCode` as query param

* throw 400 error if no project code

* destructure `models`

* destructure `country`

* return `hasPendingAccess`, not access req list

* add `countries()` to project model

* optimise query for entities

* wait for array of promises

* header comment

* the big refactor

* inline variable

* adapt `ProjectAccessForm` to new behaviour

* amend AccessGrantedCountryList to new behaviour

* add example call in `examples.http`

* newline at EOF

* clean up diff

* more diff clean-up

* again

* update copyright header comments

* rename type to `ProjectCountryAccessListRequest`

* deprecate tupaia-web-server version

* specify HTTP version

* remove redundant leading slash

* make query key match endpoint path

Co-authored-by: alexd-bes <129009580+alexd-bes@users.noreply.github.com>

---------

Co-authored-by: alexd-bes <129009580+alexd-bes@users.noreply.github.com>

* update models

* inconsequential code style

* regenerate types

* use correct db to generate types

* no submission when has access to all countries

* performancee: prefer `concat` to `...`

* fix cache invalidation

* fix query invalidation in DataTrak

* code style

* fix project list not updating after access request

* invalidate country list after project request

* code style

* delete unused code 💣

* re-fix query invalidation in DataTrak

---------

Co-authored-by: Andrew <vanbeekandrew@gmail.com>
Co-authored-by: alexd-bes <129009580+alexd-bes@users.noreply.github.com>
@rohan-bes
fix(vizBuilder): Fixed up a couple presentation config schema options (…
990b093 
…#5639)

* fix(vizBuilder): Fixed up a couple presentation config schema options

* Add null support for all valueToColor functions
@jaskfla @alexd-bes
feat(adminPanel): RN-1124: Option set export (#5605)
13a457b 
* use correct variable

* avoid interpolation

* document `/optionSets` endpoint

* set up front-end for export

* augment `OptionSet` model with `options()`

* document example call

* WIP: export option set endpoint

* copyright message

* remove unused variable

* WIP: respond with XLSX file

* add auth header in example call

* don’t sort in model

* fix crash cauesd by duplicate ID

* fix workbook initialisation

* sort in model

* regenerate types

* support multiple attributes

* remove test response

* content type for XLSX and use different example

* reorder

* restore correct endpoint

* shallow copy

* more consistent API endpoint (plural form)

* remove commented-out property

Co-authored-by: alexd-bes <129009580+alexd-bes@users.noreply.github.com>

---------

Co-authored-by: alexd-bes <129009580+alexd-bes@users.noreply.github.com>
@jaskfla
ci: fix never-ending run_tests (#5635)
fa27825
@rohan-bes
merge(lesmis): Merge deployment logic from lesmis-on-premise into mai…
53c0bd1 
…nline (#5606)
@alexd-bes @avaek
fix(tupaiaWeb): RN-1290: Handle multiple underscores in measure level (…
8718d96 
…#5637)

Co-authored-by: Andrew <vanbeekandrew@gmail.com>
@jaskfla @avaek
feat(adminPanel): RN-1197: update table columns (#5634)
9462062 
* update Permissions page

* update Users page

* update Survey Responses page

update copyright message

* update Surveys page

update copyright message

* update Map Overlay Groups page

use even column widths

* update Map Overlay Group Relations Page

autocomplete for child code

* restore Approval Status on Survey Responses page

* fix map overlay group relation creation

* revert to IDs for map overlay group relations

* update map overlay page columns

* Revert "update map overlay page columns"

This reverts commit 3313355.

* update columns without hiding from ‘Edit’

* remove unneeded properties

* use endpoint const

* fix null modal content

* Permissions page: fix missing Last Name column

---------

Co-authored-by: Andrew <vanbeekandrew@gmail.com>
@alexd-bes
fix(adminPanel): Fix re-render issue on tables (#5648)
19b5a39 
* fix(adminPanel): Fix re-render issue on tables

* Reset sorting when table is reinitialised

* Update Cells.jsx
@jaskfla @avaek
tweak(adminPanel): RN-1209: standardise titles in creation modals (#5629
da27417 
)

* introduce `resourceName` prop

* use prop in `SecondaryNavbar`

* helper functions

* move helpers

* use dynamic title in breadcrumbs

* fix `generateTitle`

* reorder

* resource name in `TreeResourcePage`

* define `RESOURCE_NAME`S

* update Visualisation tabs

* update dashboard items page

* update copyright messages

* sentence case in surveys page

ditto survey page

* ditto data elements

* ditto data groups

* ditto data mapping

* ditto options sets

* ditto question

* ditto survey responses

* ditto sync groups

* ditto access requests

* use `RESOURCE_NAME` in permission groups page

* em dash

* sentence case permissions

* ditto users

* ditto users tab routes

* ditto entity hierarchy

* ditto projects

* `RESOURCE_NAME` in superset instances page

* ditto entities

* use `RESOURCE_NAME` in landing pages

* sentence case in dashboard items

* fix straggling title case labels

* sentence casing on Strive page

* remove redundant spread

* fix “New dashboard relation” modal header

* fix modal title in Users page

* sentence casing in Permissions page

* parameterise modal title in Permissons page

* fix: use custom titles in `openBulkEditModal`

* shorter “New dashboard relation” title

---------

Co-authored-by: Andrew <vanbeekandrew@gmail.com>
@jaskfla
tweak(database): fix straggling “type” symbol name to use “record” (#…
662d621 
…5642)

fix straggler database “type” symbol name
@rohan-bes @avaek
fix(mapOverlay): RN-1286: Remove 'Most Recent Data Date' from map ove…
cd4a8e5 
…rlay tables (#5517)

no-issue: Remove 'Most Recent Data Date' from map overlay tables
- Removed checkTimeliness measureBuilder as it is not used by any map overlays
- Removed 'time' scale type

Co-authored-by: Rohan Port <rohan@bes.au>
Co-authored-by: Andrew <vanbeekandrew@gmail.com>
@avaek avaek mentioned this pull request May 20, 2024
Closed
3 tasks
alexd-bes and others added 10 commits May 20, 2024 14:26
@avaek avaek merged commit bd2afa6 into master May 21, 2024
44 checks passed
@avaek avaek deleted the release-2024-21 branch May 21, 2024 22:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexd-bes alexd-bes alexd-bes approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@avaek @alexd-bes @rohan-bes @jaskfla