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

fix(v1.6.0): ensure clients and server are always on the same version #7486

Merged
merged 35 commits into from
Sep 17, 2024

Conversation

github-actions[bot]
Copy link

Automated PR to merge changes from develop to release-v1.6.0

I failed to cherry-pick the changes automatically because of the following:

[auto-pr-release-v1.6.0-7351-9484 b81de33eb] feat: include `X-Version header` in all gateway responses
Author: jamil314 <[email protected]>
Date: Fri Jul 5 18:37:45 2024 +0600
1 file changed, 8 insertions(+), 1 deletion(-)
[auto-pr-release-v1.6.0-7351-9484 94af62834] fix: exposing `X-Version` header from gateway response
Author: jamil314 <[email protected]>
Date: Tue Jul 9 19:35:17 2024 +0600
1 file changed, 3 insertions(+)
[auto-pr-release-v1.6.0-7351-9484 ece38d031] feat: added modal when version does not match between login and gateway
Author: jamil314 <[email protected]>
Date: Tue Jul 9 19:39:07 2024 +0600
7 files changed, 106 insertions(+), 1 deletion(-)
create mode 100644 packages/login/src/views/ReloadModal.tsx
[auto-pr-release-v1.6.0-7351-9484 1dc9689ed] chore: remove unnecessary console.log
Author: jamil314 <[email protected]>
Date: Tue Jul 9 19:50:22 2024 +0600
1 file changed, 1 deletion(-)
[auto-pr-release-v1.6.0-7351-9484 454572473] chore: remove unnecessary console.log
Author: jamil314 <[email protected]>
Date: Tue Jul 9 20:16:35 2024 +0600
1 file changed, 1 deletion(-)
[auto-pr-release-v1.6.0-7351-9484 6390510d0] amend: added declaration of APP_VERSION in env.d.ts
Author: jamil314 <[email protected]>
Date: Tue Jul 9 20:17:34 2024 +0600
2 files changed, 7 insertions(+), 4 deletions(-)
[auto-pr-release-v1.6.0-7351-9484 deec7dd87] feat: add middleware to compare gateway version, trigger a reload
Author: jamil314 <[email protected]>
Date: Wed Aug 7 22:14:03 2024 +0600
7 files changed, 133 insertions(+), 3 deletions(-)
create mode 100644 packages/client/src/reload/actions.ts
create mode 100644 packages/client/src/reload/reducer.ts
create mode 100644 packages/client/src/views/Modals/ReloadModal.tsx
[auto-pr-release-v1.6.0-7351-9484 900cd1a34] chore: add license, misc
Author: jamil314 <[email protected]>
Date: Wed Aug 7 22:23:31 2024 +0600
4 files changed, 24 insertions(+), 2 deletions(-)
[auto-pr-release-v1.6.0-7351-9484 d94021007] fix: periodically look for new client
Author: jamil314 <[email protected]>
Date: Thu Aug 8 18:08:52 2024 +0600
2 files changed, 54 insertions(+), 20 deletions(-)
[auto-pr-release-v1.6.0-7351-9484 64c15161d] fix: failed tests
Author: jamil314 <[email protected]>
Date: Thu Aug 8 20:40:32 2024 +0600
3 files changed, 3 insertions(+), 2 deletions(-)
Auto-merging packages/client/src/utils/referenceApi.ts
Auto-merging packages/config/src/handlers/application/applicationConfigHandler.ts
[auto-pr-release-v1.6.0-7351-9484 372b78cc7] feat: include `X-Version` header in all request to country config
Author: jamil314 <[email protected]>
Date: Sat Aug 10 00:20:55 2024 +0600
15 files changed, 58 insertions(+), 14 deletions(-)
Auto-merging packages/config/src/handlers/application/applicationConfigHandler.ts
[auto-pr-release-v1.6.0-7351-9484 0e2ed8e5f] fix: propagate country config error
Author: jamil314 <[email protected]>
Date: Tue Aug 13 12:54:26 2024 +0600
5 files changed, 54 insertions(+), 27 deletions(-)
Auto-merging packages/client/src/utils/referenceApi.ts
[auto-pr-release-v1.6.0-7351-9484 595f7613c] feat: show toast on version mismatch
Author: jamil314 <[email protected]>
Date: Tue Aug 13 18:37:55 2024 +0600
6 files changed, 25 insertions(+), 22 deletions(-)
[auto-pr-release-v1.6.0-7351-9484 922398505] feat: add i18n
Author: jamil314 <[email protected]>
Date: Wed Aug 14 09:21:35 2024 +0600
7 files changed, 118 insertions(+), 12 deletions(-)
create mode 100644 packages/client/src/i18n/messages/views/reloadModal.ts
[auto-pr-release-v1.6.0-7351-9484 7cf6a5829] fix: toast id
Author: jamil314 <[email protected]>
Date: Wed Aug 14 09:25:54 2024 +0600
1 file changed, 1 insertion(+), 1 deletion(-)
[auto-pr-release-v1.6.0-7351-9484 0260ca7c6] fix: add reducer for version error
Author: jamil314 <[email protected]>
Date: Wed Aug 14 13:40:50 2024 +0600
2 files changed, 8 insertions(+)
[auto-pr-release-v1.6.0-7351-9484 ab3e095ce] amend: remove version mismatch toast
Author: jamil314 <[email protected]>
Date: Wed Aug 14 13:58:12 2024 +0600
5 files changed, 5 insertions(+), 75 deletions(-)
[auto-pr-release-v1.6.0-7351-9484 c424a9f66] fix: update reload modal
Author: jamil314 <[email protected]>
Date: Wed Aug 14 18:15:36 2024 +0600
3 files changed, 73 insertions(+), 77 deletions(-)
[auto-pr-release-v1.6.0-7351-9484 154c0f29d] feat: make close button optional
Author: jamil314 <[email protected]>
Date: Wed Aug 14 18:16:16 2024 +0600
1 file changed, 7 insertions(+), 3 deletions(-)
[auto-pr-release-v1.6.0-7351-9484 3afc3b58e] fix: application name in modal body
Author: jamil314 <[email protected]>
Date: Wed Aug 14 18:34:40 2024 +0600
2 files changed, 5 insertions(+), 2 deletions(-)
Auto-merging packages/client/src/utils/referenceApi.ts
Auto-merging packages/config/src/handlers/application/applicationConfigHandler.ts
[auto-pr-release-v1.6.0-7351-9484 9355c588d] amend: remove `x-version` from country-config communication
Author: jamil314 <[email protected]>
Date: Wed Aug 14 19:26:46 2024 +0600
15 files changed, 40 insertions(+), 111 deletions(-)
[auto-pr-release-v1.6.0-7351-9484 a8cb82c75] fix: reloadModal of login
Author: jamil314 <[email protected]>
Date: Wed Aug 14 19:33:52 2024 +0600
2 files changed, 84 insertions(+), 14 deletions(-)
create mode 100644 packages/login/src/i18n/messages/views/reloadModal.ts
[auto-pr-release-v1.6.0-7351-9484 ab1916aa9] chore: remove console log
Author: jamil314 <[email protected]>
Date: Wed Aug 14 19:53:08 2024 +0600
2 files changed, 28 insertions(+), 42 deletions(-)
[auto-pr-release-v1.6.0-7351-9484 3c99a691a] amend: remove comment, change variable to uppercase
Author: jamil314 <[email protected]>
Date: Thu Aug 15 14:06:16 2024 +0600
3 files changed, 5 insertions(+), 6 deletions(-)
Auto-merging packages/client/package.json
[auto-pr-release-v1.6.0-7351-9484 4f42c974d] chore: remove redundant app versions
Author: jamil314 <[email protected]>
Date: Thu Aug 15 16:57:37 2024 +0600
4 files changed, 1 insertion(+), 5 deletions(-)
Auto-merging CHANGELOG.md
CONFLICT (content): Merge conflict in CHANGELOG.md
error: could not apply 4ce13c4c2... chore: update changelog

To continue manually you can use these commands:

git fetch origin auto-pr-release-v1.6.0-7351-9484:auto-pr-release-v1.6.0-7351-9484
git fetch origin ocrvs-6695:ocrvs-6695

git checkout auto-pr-release-v1.6.0-7351-9484
git reset --hard HEAD~1  # Remove placeholder commit
git cherry-pick bb3e2cb3d 7f148b307 4416f2139 8cd3e03bb 0fe0a09a7 556edb7d3 aa1bea5d6 f72f36629 02ab4c15a ecf68a120 b59ddc39c 530f0d683 4579eb98f 4fb2f82b9 f53b4dde6 7051d257f a629de644 e0bf2a90e f769f502c b64c99f17 ead504972 175e05cf3 7f1e82ae7 e97220379 d9964fd92 4ce13c4c2 381f7e1fa dcb554ef5 8df8b1324

@Zangetsu101 Zangetsu101 merged commit 2a36902 into release-v1.6.0 Sep 17, 2024
21 of 22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants