Promote from BLAIS5-4274-extension to main #368

social-surveys-blaise-concourse · 2024-07-09T09:52:35Z

Auto generated by concourse:

Promote from BLAIS5-4274-extension to main

Promote from main to preprod

Promote from preprod to prod

Promote from main to preprod

Promote from preprod to prod

Promote from main to preprod

Promote from preprod to prod

Promote from main to preprod

Promote from preprod to prod

Promote from main to preprod

Promote from preprod to prod

Promote from main to preprod

Promote from preprod to prod

Promote from main to preprod

Promote from preprod to prod

Promote from main to preprod

Promote from preprod to prod

Promote from main to preprod

Promote from preprod to prod

Promote from main to preprod

Promote from preprod to prod

Promote from main to preprod

Promote from preprod to prod

Promote from main to preprod

Promote from preprod to prod

Promote from main to preprod

Promote from preprod to prod

Promote from main to preprod

Promote from preprod to prod

Promote from main to preprod

Promote from preprod to prod

Promote from main to preprod

Promote from preprod to prod

Promote from main to preprod

Promote from preprod to prod

Promote from main to preprod

Promote from preprod to prod

* 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]>

* 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 * 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. * Feature/blais5 4274 fix merge conflicts preprod and main branches (#360) * 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> --------- Co-authored-by: am-ons <[email protected]> Co-authored-by: Elinor Thorne <[email protected]> Co-authored-by: Matthew Palmer <[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]>

# Conflicts: # server/server.ts # server/tests/index.test.ts # src/pages/users/UserUpload/NewUser.tsx # src/pages/users/UsersTable.tsx # src/pages/users/__snapshots__/Users.test.tsx.snap

codecov · 2024-07-09T12:31:38Z

Codecov Report

Attention: Patch coverage is 0% with 4 lines in your changes missing coverage. Please review.

Project coverage is 60.63%. Comparing base (133f65f) to head (8206b3b).

Files	Patch %	Lines
src/ClientConfig.ts	0.00%	3 Missing ⚠️
src/pages/users/UserUpload/NewUser.tsx	0.00%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #368      +/-   ##
==========================================
- Coverage   60.93%   60.63%   -0.30%     
==========================================
  Files          35       36       +1     
  Lines         814      818       +4     
  Branches      185      185              
==========================================
  Hits          496      496              
- Misses        318      322       +4

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

matthewandrewpalmer and others added 30 commits March 15, 2021 12:02

Merge pull request #47 from ONSdigital/main

d928040

Promote from main to preprod

Merge pull request #50 from ONSdigital/preprod

c9858fe

Promote from preprod to prod

Merge pull request #68 from ONSdigital/main

42b5550

Promote from main to preprod

Merge pull request #70 from ONSdigital/preprod

a6a4ae2

Promote from preprod to prod

Merge pull request #74 from ONSdigital/main

40e959a

Promote from main to preprod

Merge pull request #77 from ONSdigital/preprod

be3dacd

Promote from preprod to prod

Merge pull request #82 from ONSdigital/main

3ddc3ee

Promote from main to preprod

Merge pull request #92 from ONSdigital/preprod

0a1e926

Promote from preprod to prod

Merge pull request #90 from ONSdigital/main

3560f7b

Promote from main to preprod

Merge pull request #104 from ONSdigital/main

7b2e24c

Promote from main to preprod

Merge pull request #98 from ONSdigital/preprod

68e2d91

Promote from preprod to prod

Merge pull request #116 from ONSdigital/main

35d825c

Promote from main to preprod

Merge pull request #139 from ONSdigital/main

6b63442

Promote from main to preprod

Merge pull request #141 from ONSdigital/preprod

60d98ec

Promote from preprod to prod

Merge pull request #168 from ONSdigital/main

5d44d4f

Promote from main to preprod

Merge pull request #176 from ONSdigital/preprod

193299d

Promote from preprod to prod

Merge pull request #246 from ONSdigital/main

0313225

Promote from main to preprod

Merge pull request #247 from ONSdigital/preprod

7d3b74d

Promote from preprod to prod

Merge pull request #249 from ONSdigital/main

4d54e04

Promote from main to preprod

Merge pull request #250 from ONSdigital/preprod

2b7ab47

Promote from preprod to prod

Merge pull request #255 from ONSdigital/main

279df4e

Promote from main to preprod

Merge pull request #256 from ONSdigital/preprod

f5e938b

Promote from preprod to prod

Merge pull request #267 from ONSdigital/main

b4c529f

Promote from main to preprod

Merge pull request #269 from ONSdigital/preprod

7e34104

Promote from preprod to prod

Merge pull request #271 from ONSdigital/main

6481c40

Promote from main to preprod

Merge pull request #272 from ONSdigital/preprod

2c54944

Promote from preprod to prod

Merge pull request #274 from ONSdigital/main

f210b5a

Promote from main to preprod

Merge pull request #275 from ONSdigital/preprod

7f42d13

Promote from preprod to prod

Merge pull request #279 from ONSdigital/main

c3f2b88

Promote from main to preprod

Merge pull request #280 from ONSdigital/preprod

ff9131a

Promote from preprod to prod

kristian4res and others added 15 commits April 9, 2024 13:47

Merge pull request #336 from ONSdigital/main

9b1e6eb

Promote from main to preprod

Merge pull request #337 from ONSdigital/preprod

34e7b0a

Promote from preprod to prod

Merge pull request #338 from ONSdigital/main

b329d64

Promote from main to preprod

Merge pull request #339 from ONSdigital/preprod

d5d855f

Promote from preprod to prod

Merge pull request #347 from ONSdigital/main

471dc7c

Promote from main to preprod

Merge pull request #348 from ONSdigital/preprod

9275e13

Promote from preprod to prod

Merge pull request #350 from ONSdigital/main

8ded634

Promote from main to preprod

Merge pull request #351 from ONSdigital/preprod

cbc6216

Promote from preprod to prod

Merge branch 'prod' into preprod

2cd7a23

fail_ci_if_error set to true

3b45f5b

social-surveys-blaise-concourse requested a review from a team July 9, 2024 09:52

motalm added 2 commits July 9, 2024 11:02

fail_ci_if_error to false

4223335

set it back to true again

a797fdf

elthorne marked this pull request as ready for review July 9, 2024 10:35

elthorne marked this pull request as draft July 9, 2024 10:36

lambeb marked this pull request as ready for review July 9, 2024 10:49

lambeb marked this pull request as draft July 9, 2024 10:50

motalm marked this pull request as ready for review July 9, 2024 11:20

lambeb added 2 commits July 9, 2024 13:11

Merge branch 'refs/heads/main' into BLAIS5-4274-extension

1991365

# Conflicts: # server/server.ts # server/tests/index.test.ts # src/pages/users/UserUpload/NewUser.tsx # src/pages/users/UsersTable.tsx # src/pages/users/__snapshots__/Users.test.tsx.snap

Merged changes from main to branch

61527d1

Put test back in

8206b3b

motalm approved these changes Jul 9, 2024

View reviewed changes

motalm merged commit f4447a3 into main Jul 9, 2024
5 checks passed

motalm deleted the BLAIS5-4274-extension branch July 9, 2024 14:26

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Promote from BLAIS5-4274-extension to main #368

Promote from BLAIS5-4274-extension to main #368

social-surveys-blaise-concourse commented Jul 9, 2024

codecov bot commented Jul 9, 2024 •

edited

Loading

Promote from BLAIS5-4274-extension to main #368

Promote from BLAIS5-4274-extension to main #368

Conversation

social-surveys-blaise-concourse commented Jul 9, 2024

codecov bot commented Jul 9, 2024 • edited Loading

Codecov Report

codecov bot commented Jul 9, 2024 •

edited

Loading