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

refactor(sanity): fix type issues with collate, update tests and readQueryResult #7587

Merged
merged 2 commits into from
Oct 4, 2024

Conversation

RitaDias
Copy link
Contributor

@RitaDias RitaDias commented Oct 4, 2024

Description

  • Re-adds QueryResult interface
  • Changing the type in the collate to not explode when versions are present.

When rebasing against next something went wrong specifically around this PR. I wasn't able to fix it by using rebasing however this unblocks us and allows us to continue work.

I imagine that the fix will likely be more around making sure that the collate prop type stayed the same (making the changes in the ENABLE_LRU_MEMO changes however I don't know the larger impact of making that change, so, for now I've set this up.

Folks that are more knowledgeable around this should weight in before I merge since this is more like a temporary bandaid than a fix 🥲

Ash set up a branch corel-pre-rebase-20241003 in case if you want to give the rebase another stab to avoid some of these issues. Keep in mind that you'll need to cherry pick StickParams commits as well

@RitaDias RitaDias requested review from bjoerge and juice49 October 4, 2024 08:15
@RitaDias RitaDias requested review from a team as code owners October 4, 2024 08:15
Copy link

vercel bot commented Oct 4, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
page-building-studio ❌ Failed (Inspect) Oct 4, 2024 8:23am
performance-studio ❌ Failed (Inspect) 💬 Add feedback Oct 4, 2024 8:23am
test-compiled-studio ❌ Failed (Inspect) Oct 4, 2024 8:23am
test-next-studio ❌ Failed (Inspect) Oct 4, 2024 8:23am
test-studio ❌ Failed (Inspect) Oct 4, 2024 8:23am
1 Skipped Deployment
Name Status Preview Comments Updated (UTC)
studio-workshop ⬜️ Ignored (Inspect) Visit Preview Oct 4, 2024 8:23am

@RitaDias
Copy link
Contributor Author

RitaDias commented Oct 4, 2024

Spoke with Ash and to allow us to continue doing some work in COREL I'm merging, however we are trying to have a more successful rebase from the branch to be able to develop without so many issues.

@RitaDias RitaDias marked this pull request as ready for review October 4, 2024 08:32
@RitaDias RitaDias merged commit 53020c1 into corel Oct 4, 2024
30 of 47 checks passed
@RitaDias RitaDias deleted the fix-collate branch October 4, 2024 08:33
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