[superset] branch john-bodley--fix-24749 updated (74aaa6049a -> e6747b9230)

[jo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

johnbodley pushed a change to branch john-bodley--fix-24749
in repository https://gitbox.apache.org/repos/asf/superset.git


    omit 74aaa6049a fix(migration): Ensure cascadeParentIds key exists
     add a50c43e0fa fix: Alembic migration head (#24832)
     add 5bb8e0da89 fix: Removes unnecessary query on filters (#24814)
     new e6747b9230 fix(migration): Ensure cascadeParentIds key exists

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (74aaa6049a)
            \
             N -- N -- N   refs/heads/john-bodley--fix-24749 (e6747b9230)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../components/Select/SelectFilterPlugin.test.tsx  | 47 +++++++++++-----------
 .../components/Select/SelectFilterPlugin.tsx       | 17 +-------
 ...9_17-54_ee179a490af9_deckgl_path_width_units.py |  4 +-
 3 files changed, 26 insertions(+), 42 deletions(-)

[superset] 01/01: fix(migration): Ensure cascadeParentIds key exists

[jo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

johnbodley pushed a commit to branch john-bodley--fix-24749
in repository https://gitbox.apache.org/repos/asf/superset.git

commit e6747b92309f3dc7ba69dd720b4f7fe472d4a17b
Author: John Bodley <45...@users.noreply.github.com>
AuthorDate: Thu Jul 27 22:03:33 2023 -0700

    fix(migration): Ensure cascadeParentIds key exists
---
 ...023-07-19_16-48_a23c6f8b1280_cleanup_erroneous_parent_filter_ids.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/superset/migrations/versions/2023-07-19_16-48_a23c6f8b1280_cleanup_erroneous_parent_filter_ids.py b/superset/migrations/versions/2023-07-19_16-48_a23c6f8b1280_cleanup_erroneous_parent_filter_ids.py
index 17ad592b22..f5bdb29a96 100644
--- a/superset/migrations/versions/2023-07-19_16-48_a23c6f8b1280_cleanup_erroneous_parent_filter_ids.py
+++ b/superset/migrations/versions/2023-07-19_16-48_a23c6f8b1280_cleanup_erroneous_parent_filter_ids.py
@@ -61,14 +61,13 @@ def upgrade():
                     filter_ids = {fltr["id"] for fltr in filters}
 
                     for fltr in filters:
-                        for parent_id in fltr["cascadeParentIds"][:]:
+                        for parent_id in fltr.get("cascadeParentIds", [])[:]:
                             if parent_id not in filter_ids:
                                 fltr["cascadeParentIds"].remove(parent_id)
                                 updated = True
 
                 if updated:
                     dashboard.json_metadata = json.dumps(json_metadata)
-
             except Exception:
                 logging.exception(
                     f"Unable to parse JSON metadata for dashboard {dashboard.id}"