Skip to content

Commit

Permalink
Feature/blais5 4274 fix merge conflicts preprod and main branches (#360)
Browse files Browse the repository at this point in the history
* Promote from main to preprod (#354)

* refactor: Add DEFAULT to RoleToServerParksMap, renamed heading "Default Server Park" to "Server Parks"
    ClientConfig reads RoleToServerParksMap from json file
    Read role_to_serverparks_map_json from json file
    Rename RoleToServerParksMap to RoleToServerParksMap
    Server side RoleToServerParksDict config change
    Client side RoleToServerParksDict config changes

fix: Add resolveJsonModule to tsconfig.server.json

* fix: Updated snapshot for UTs on users component tests.

* refactor: using blaise-api-node-client v1.1.0

* ci: Do not fail CI build if coverage is low. Coverage will be increased in separate ticket for adding more tests.

* refactor: Add whitespace after comma in server parks list.

---------

Co-authored-by: am-ons <[email protected]>
Co-authored-by: Elinor Thorne <[email protected]>

* Promote from main to preprod (#358)

* refactor: Add DEFAULT to RoleToServerParksMap, renamed heading "Default Server Park" to "Server Parks"
    ClientConfig reads RoleToServerParksMap from json file
    Read role_to_serverparks_map_json from json file
    Rename RoleToServerParksMap to RoleToServerParksMap
    Server side RoleToServerParksDict config change
    Client side RoleToServerParksDict config changes

fix: Add resolveJsonModule to tsconfig.server.json

* fix: Updated snapshot for UTs on users component tests.

* refactor: using blaise-api-node-client v1.1.0

* ci: Do not fail CI build if coverage is low. Coverage will be increased in separate ticket for adding more tests.

* refactor: Add whitespace after comma in server parks list.

* BLAIS5-4274 increase unit test coverage in bam (#356)

* chore: fail_ci_if_error: true

* refactor: Protected server API endpoint test passes successfully

* feat: Add all tests to cover the code in /api/users POST endpoint

* fix: Prevent disk I/O each time GET * request hits server

* fix: Fix formatting: yarn eslint . --fix
fix: Add typemoq as dependency

* feat: Add all tests to cover the code in /api/users DELETE endpoint

* feat: Add all tests to cover the code in /api/users GET endpoint

* feat: Add all tests to cover the code in /api/roles GET endpoint

* feat: Add all tests to cover the code in /api/change_password/:user GET endpoint

* fix: Fix Linting with ESLINT: yarn eslint . --fix

* fix: Load .env variables if current env is not PROD.

* fix: Remove launch.json from source control as it should be dev local file.

* feat: Add test for "external Blaise API changePassword endpoint rejects request with error message"

* chore: No changes in yarn.lock file.

* refactor: Removed redundant json map from client. We don't trust client side script, mapping happens on server side so only one json map file needed that is on the server side.

---------

Co-authored-by: am-ons <[email protected]>
Co-authored-by: Elinor Thorne <[email protected]>

* refactor: Add DEFAULT to RoleToServerParksMap, renamed heading "Default Server Park" to "Server Parks"
    ClientConfig reads RoleToServerParksMap from json file
    Read role_to_serverparks_map_json from json file
    Rename RoleToServerParksMap to RoleToServerParksMap
    Server side RoleToServerParksDict config change
    Client side RoleToServerParksDict config changes

fix: Add resolveJsonModule to tsconfig.server.json

* refactor: using blaise-api-node-client v1.1.0

* BLAIS5-4274 increase unit test coverage in bam (#356)

* chore: fail_ci_if_error: true

* refactor: Protected server API endpoint test passes successfully

* feat: Add all tests to cover the code in /api/users POST endpoint

* fix: Prevent disk I/O each time GET * request hits server

* fix: Fix formatting: yarn eslint . --fix
fix: Add typemoq as dependency

* feat: Add all tests to cover the code in /api/users DELETE endpoint

* feat: Add all tests to cover the code in /api/users GET endpoint

* feat: Add all tests to cover the code in /api/roles GET endpoint

* feat: Add all tests to cover the code in /api/change_password/:user GET endpoint

* fix: Fix Linting with ESLINT: yarn eslint . --fix

* fix: Load .env variables if current env is not PROD.

* fix: Remove launch.json from source control as it should be dev local file.

* feat: Add test for "external Blaise API changePassword endpoint rejects request with error message"

* chore: No changes in yarn.lock file.

* refactor: Removed redundant json map from client. We don't trust client side script, mapping happens on server side so only one json map file needed that is on the server side.

---------

Co-authored-by: Matthew Palmer <[email protected]>
Co-authored-by: Elinor Thorne <[email protected]>
Co-authored-by: Nik Webb <[email protected]>
Co-authored-by: Alistair Grew <[email protected]>
Co-authored-by: Richmond Rice <[email protected]>
Co-authored-by: Sidra Javed <[email protected]>
Co-authored-by: James Anthony Williams <[email protected]>
Co-authored-by: motalm_ONS <[email protected]>
Co-authored-by: Kristian T <[email protected]>
Co-authored-by: Cal <[email protected]>
Co-authored-by: BenjaminLambe_ONS <[email protected]>
Co-authored-by: social-surveys-blaise-concourse <79969802+social-surveys-blaise-concourse@users.noreply.github.com>
  • Loading branch information
13 people authored Jun 21, 2024
1 parent a2d7dbc commit e2cfee2
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit e2cfee2

Please sign in to comment.