Issue Summary

When performing a hierarchy configuration update that doesn't actually alter the hierarchy (for example renaming a hierarchy configuration) a warning will still pop up on some sites warning that parent relationships will be deleted

When performing a hierarchy configuration update that does alter the hierarchy and cause invalid relationships to be removed, the warning modal shows both the existing and new invalid parent relationships

This issue only affects instances with existing invalid parent data

This is reproducible on Data Center: no

Steps to Reproduce

1. Open the hierarchy configuration settings page
2. Rename a hierarchy level
3. Hit "Save"

Expected Results

A warning modal will pop up if the proposed hierarchy configuration change will cause parent relationships to become invalid

Existing invalid relationships are not included in the warning, and aren't deleted as part of the operation

Actual Results

A warning modal pops up showing existing invalid parent data, not related to the proposed hierarchy configuration change.

Existing invalid relationships are included in the warning, but aren't deleted as part of the operation

Workaround

The actual hierarchy configuration change operation should still complete successfully after clicking through the warning modal.

Warning: as existing invalid relationships are mixed in with the new invalid relationships, it won't be immediately clear how many parent relationships are actually going to be deleted by proceeding with the change. Please exercise caution when proceeding with this workaround