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): return first child location from query #7867

Merged
merged 11 commits into from
Oct 30, 2024

Conversation

ocrvs-bot
Copy link
Collaborator

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-7789-27527 3df5fc1b9] fix: return first child "location" from query
Author: Tameem Bin Haider <[email protected]>
Date: Thu Oct 17 10:44:00 2024 +0600
2 files changed, 48 insertions(+), 5 deletions(-)
[auto-pr-release-v1.6.0-7789-27527 87af55abd] chore: include _count param to get all locations
Author: Tameem Bin Haider <[email protected]>
Date: Wed Oct 23 17:15:14 2024 +0600
1 file changed, 1 insertion(+), 1 deletion(-)
Auto-merging packages/client/src/utils/gateway.ts
[auto-pr-release-v1.6.0-7789-27527 6018a8288] feat: define isLeafLevelLocation query in client
Author: Tameem Bin Haider <[email protected]>
Date: Thu Oct 24 14:00:21 2024 +0600
3 files changed, 120 insertions(+), 73 deletions(-)
[auto-pr-release-v1.6.0-7789-27527 674884a8f] refactor: use the new isLeafLevelLocation query
Author: Tameem Bin Haider <[email protected]>
Date: Thu Oct 24 14:58:41 2024 +0600
1 file changed, 148 insertions(+), 140 deletions(-)
Auto-merging packages/gateway/src/graphql/schema.d.ts
Auto-merging packages/gateway/src/graphql/schema.graphql
[auto-pr-release-v1.6.0-7789-27527 fba3c4132] feat: create isLeafLevelLocation query
Author: Tameem Bin Haider <[email protected]>
Date: Thu Oct 24 15:13:41 2024 +0600
4 files changed, 29 insertions(+), 5 deletions(-)
[auto-pr-release-v1.6.0-7789-27527 57ee46de7] fix: prevent disabled filter from being selected
Author: Tameem Bin Haider <[email protected]>
Date: Thu Oct 24 15:20:13 2024 +0600
1 file changed, 8 insertions(+), 1 deletion(-)
[auto-pr-release-v1.6.0-7789-27527 81e647ed1] test: update mocks to use new query
Author: Tameem Bin Haider <[email protected]>
Date: Thu Oct 24 16:05:45 2024 +0600
1 file changed, 6 insertions(+), 48 deletions(-)
[auto-pr-release-v1.6.0-7789-27527 5ac7c1d9f] test: add tests for isLeafLevelLocation query
Author: Tameem Bin Haider <[email protected]>
Date: Thu Oct 24 16:29:21 2024 +0600
1 file changed, 36 insertions(+)
Auto-merging packages/client/src/utils/gateway.ts
Auto-merging packages/gateway/src/graphql/schema.d.ts
Auto-merging packages/gateway/src/graphql/schema.graphql
[auto-pr-release-v1.6.0-7789-27527 3ebc1f2a8] chore!: remove hasChildLocation query
Author: Tameem Bin Haider <[email protected]>
Date: Thu Oct 24 18:05:19 2024 +0600
12 files changed, 246 insertions(+), 343 deletions(-)
Auto-merging CHANGELOG.md
CONFLICT (content): Merge conflict in CHANGELOG.md
error: could not apply d7287330b... docs: add entry about the deleted & new query

To continue manually you can use these commands:

git fetch origin auto-pr-release-v1.6.0-7789-27527:auto-pr-release-v1.6.0-7789-27527
git fetch origin ocrvs-7782:ocrvs-7782

git checkout auto-pr-release-v1.6.0-7789-27527
git reset --hard HEAD~1  # Remove placeholder commit
git cherry-pick 46583d732 646f8bd70 b19add67e 92e927fef ea36f0237 565a694ea 4a81cb7d3 5809acd1c d963fe134 d7287330b 37a13bdde

@Zangetsu101 Zangetsu101 force-pushed the auto-pr-release-v1.6.0-7789-27527 branch from 80f7798 to b914c60 Compare October 30, 2024 11:44
@Zangetsu101 Zangetsu101 merged commit 9511088 into release-v1.6.0 Oct 30, 2024
22 checks passed
@Zangetsu101 Zangetsu101 deleted the auto-pr-release-v1.6.0-7789-27527 branch October 30, 2024 12:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants