With the Drupal 7 migrations being added to core, in some cases we've found they were identical to the Drupal 6 migrations and consolidated into a single migration for both versions. Naturally, we've removed the "Drupal 6" from the labels of the consolidated migrations. This means when running migrations through the upgrade UI (#2281691: User interface for migration-based upgrades), the feedback shows a mix of label styles - "Menu UI configuration" may be followed by "Drupal 6 custom blocks". We should remove Drupal X from all labels for consistent messaging.

In addition, certain migrations are lacking labels entirely, we need to add them.

CommentFileSizeAuthor
#19 interdiff-2565791-14-18.txt1.86 KBsubhojit777
#19 fix_migration_labels-2565791-18.patch48.3 KBsubhojit777
#16 fix_migration_labels-2565791-14.patch50.16 KBmikeryan
#7 interdiff-fix_migration_labels-6-7.txt326 bytesquietone
#7 fix_migration_labels-2565791-7.patch50.62 KBquietone
#6 interdiff.txt1.09 KBmikeryan
#6 fix_migration_labels-2565791-6.patch50.16 KBmikeryan
#3 generify_migration_labels-2565791-3.patch49.44 KBmikeryan

Comments

mikeryan created an issue. See original summary.

phenaproxima’s picture

phenaproxima
he/him
Primary language English
Location Massachusetts
commented

BIG +1 for this.

mikeryan’s picture

mikeryan
he/him
Primary language English
Location Pittsfield, MA, USA
commented
Status: Active » Needs review
StatusFileSize
new generify_migration_labels-2565791-3.patch49.44 KB

Lots of files touched, but real simple. Except that MigrateNodeBuilderTest broke, because it was accidentally testing labels derived from migration_templates/d6_node.yml instead of the in-memory template it was supposed to test - that's fixed here.

phenaproxima’s picture

phenaproxima
he/him
Primary language English
Location Massachusetts
commented
Status: Needs review » Reviewed & tested by the community

This has passed DrupalCI, so preemptively RTBC.

mikeryan’s picture

mikeryan
he/him
Primary language English
Location Pittsfield, MA, USA
commented
Title: Generify migration labels » Fix migration labels
Issue summary: View changes
Status: Reviewed & tested by the community » Needs work

Broadening the scope slightly - discovered a few migrations (e.g., d7_field_instance) don't even have labels.

mikeryan’s picture

mikeryan
he/him
Primary language English
Location Pittsfield, MA, USA
commented
Status: Needs work » Needs review
StatusFileSize
new fix_migration_labels-2565791-6.patch50.16 KB
new interdiff.txt1.09 KB

Adding missing labels, and also taking out migration removed by #2410875: Migration for Drupal 7 Taxonomy vocabularies and terms.

quietone’s picture

quietone commented
StatusFileSize
new fix_migration_labels-2565791-7.patch50.62 KB
new interdiff-fix_migration_labels-6-7.txt326 bytes

Ran a migration and saw '6' go by. I found it in the logs, then played with old friends grep and awk and we couldn't find any other labels that need changing.

Status: Needs review » Needs work

The last submitted patch, 7: fix_migration_labels-2565791-7.patch, failed testing.

quietone queued 7: fix_migration_labels-2565791-7.patch for re-testing.

quietone’s picture

quietone commented
Status: Needs work » Needs review
subhojit777’s picture

subhojit777
he/him
Primary language Bengali
commented
Status: Needs review » Reviewed & tested by the community

+1 RTBC

phenaproxima’s picture

phenaproxima
he/him
Primary language English
Location Massachusetts
commented 
+++ b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBuilderTest.php
@@ -7,6 +7,7 @@
 use Drupal\migrate\Entity\Migration;

This might be unnecessary since we're no longer calling Migration::load(), but it's not worth delaying this patch over. +1 for RTBC.

webchick’s picture

webchick
she/they
Primary language English
Location Vancouver 🇨🇦
commented
Status: Reviewed & tested by the community » Needs work
Issue tags: +Needs reroll

This needs a small re-roll after the taxonomy patch went in!!

subhojit777’s picture

subhojit777
he/him
Primary language Bengali
commented
Assigned: Unassigned » subhojit777
phenaproxima’s picture

phenaproxima
he/him
Primary language English
Location Massachusetts
commented

@subhojit777: While you're at it, will you fix #12? :)

mikeryan’s picture

mikeryan
he/him
Primary language English
Location Pittsfield, MA, USA
commented
Status: Needs work » Needs review
Issue tags: -Needs reroll
StatusFileSize
new fix_migration_labels-2565791-14.patch50.16 KB

Removed change to file deleted in the taxonomy patch.

subhojit777’s picture

subhojit777
he/him
Primary language Bengali
commented
Assigned: subhojit777 » Unassigned

@mikeryan: While you're at it, will you fix #12? :)

mikeryan’s picture

mikeryan
he/him
Primary language English
Location Pittsfield, MA, USA
commented

@mikeryan: While you're at it, will you fix #12?

No, I won't;). Migration is still referenced:

$this->assertTrue($migration instanceof Migration);
subhojit777’s picture

subhojit777
he/him
Primary language Bengali
commented
StatusFileSize
new fix_migration_labels-2565791-18.patch48.3 KB
new interdiff-2565791-14-18.txt1.86 KB
phenaproxima’s picture

phenaproxima
he/him
Primary language English
Location Massachusetts
commented

Sorry @subhojit777 -- #19 is incorrect. It removes the fixes to MigrateNodeBuilderTest, so I'm thinking it won't pass testbot; #16 is correct.

Status: Needs review » Needs work

The last submitted patch, 19: fix_migration_labels-2565791-18.patch, failed testing.

phenaproxima’s picture

phenaproxima
he/him
Primary language English
Location Massachusetts
commented
Status: Needs work » Reviewed & tested by the community

#16 has passed DrupalCI, so I'd say that one is RTBC.

webchick’s picture

webchick
she/they
Primary language English
Location Vancouver 🇨🇦
commented
Status: Reviewed & tested by the community » Fixed

Committed and pushed #16 to 8.0.x. Thanks!

  • webchick committed dc644d1 on 8.0.x 
    Issue #2565791 by mikeryan, subhojit777, quietone, phenaproxima: Fix...

Status: Fixed » Needs work

The last submitted patch, 19: fix_migration_labels-2565791-18.patch, failed testing.

subhojit777’s picture

subhojit777
he/him
Primary language Bengali
commented
Status: Needs work » Fixed

Wrong patch got failed.

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.