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 for unhandled datatable maps in custom dimensions #20044
Conversation
You can probably base this off 4.x-dev and aim for 4.13.0 |
@bx80 When changing the base branch of the PR, you need to rebase the branch on the new base branch. Merging this branch in won't remove all the additional commits from the original base. If you need help with that, let me know. |
7f8a35b
to
846b532
Compare
@sgiehl Thanks, I've rebased the branch from 4.x-dev and force pushed the changes, it's still showing extra commits though. It's fairly painful to rebase 5.x-dev to 4.x-dev at the moment with the Angular removal changes. Might be cleaner if I just create a new branch / PR? |
@bx80 rebasing should only be painful when you have dozens of merge conflicts. But in this case there shouldn't be any conflicts. So it should be a simple rebase on the branch, while removing all commits that don't belong to this PR... |
846b532
to
3a8de55
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've rebased the branch, and removed all the commits left over from 5.x-dev
.
If tests are passing, this one should be good to merge.
Thanks @sgiehl! 😃 I was mistakenly attempting to merge in the other 5.x commits rather than just removing them 🙄 |
Description:
If the
Archive::createDataTableFromArchive()
method returns aDataTable\Map
instead of aDataTable
object thengetCustomDimension()
tries to use it as a single DataTable object resulting in errors. This fix checks if the returned object is aDataTable\Map
and if so uses a different method to retrieve the required data.Fixes #20043
Review