Merge pull request #780 from City-of-Helsinki/UHF-10555

UHF-10555: Deprecated image style cleanup
City-of-Helsinki · Dec 5, 2024 · f0844a0 · f0844a0
2 parents c1df24c + 7e849f1
commit f0844a0
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 282 deletions.
diff --git a/conf/cmi/core.entity_view_display.node.news_item.card_teaser.yml b/conf/cmi/core.entity_view_display.node.news_item.card_teaser.yml
@@ -16,7 +16,6 @@ dependencies:
     - field.field.node.news_item.field_news_neighbourhoods
     - field.field.node.news_item.field_radioactivity
     - field.field.node.news_item.field_short_title
-    - image.style.3_2_m
     - node.type.news_item
   module:
     - media

diff --git a/public/modules/custom/helfi_etusivu/helfi_etusivu.install b/public/modules/custom/helfi_etusivu/helfi_etusivu.install
@@ -49,7 +49,7 @@ function helfi_etusivu_install() : void {
       // Never override image style settings.
       if ($consumer->get('image_styles')->isEmpty()) {
         $consumer->set('image_styles', [
-          'original_l',
+          'orig_1264w_free',
         ])
           ->save();
       }
@@ -288,3 +288,29 @@ function helfi_etusivu_update_9012(): void {
     PathAlias::create($path)->save();
   }
 }
+
+/**
+ * UHF-10555: Update the deprecated consumer image style.
+ */
+function helfi_etusivu_update_9013(): void {
+  /** @var \Drupal\Core\Extension\ModuleHandler $moduleHandler */
+  $moduleHandler = \Drupal::service('module_handler');
+
+  if ($moduleHandler->moduleExists('consumer_image_styles')) {
+    $storage = \Drupal::entityTypeManager()->getStorage('consumer');
+
+    /** @var \Drupal\consumers\Entity\Consumer $consumer */
+    foreach ($storage->loadMultiple() as $consumer) {
+      if (!$consumer->get('third_party')->value) {
+        continue;
+      }
+
+      if (!$consumer->hasField('image_styles')) {
+        continue;
+      }
+
+      // Update the consumer image styles.
+      $consumer->set('image_styles', ['orig_1264w_free'])->save();
+    }
+  }
+}
diff --git a/...ic/modules/custom/helfi_etusivu/src/Plugin/Field/FieldFormatter/RssEnclosureFormatter.php b/...ic/modules/custom/helfi_etusivu/src/Plugin/Field/FieldFormatter/RssEnclosureFormatter.php
@@ -52,7 +52,7 @@ public function viewElements(FieldItemListInterface $items, $langcode) : array {
         $item->entity instanceof MediaInterface &&
         $item->entity->hasField('field_media_image')
       ) {
-        $image_style = $storage->load('og_image');
+        $image_style = $storage->load('1.9_1200w_630h');
         // @phpstan-ignore-next-line
         $image_entity = $item->entity->field_media_image;
 

diff --git a/...lfi_etusivu_config/config/rewrite/core.entity_view_display.node.news_item.card_teaser.yml b/...lfi_etusivu_config/config/rewrite/core.entity_view_display.node.news_item.card_teaser.yml
@@ -15,7 +15,6 @@ dependencies:
     - field.field.node.news_item.field_news_neighbourhoods
     - field.field.node.news_item.field_radioactivity
     - field.field.node.news_item.field_short_title
-    - image.style.3_2_m
     - node.type.news_item
   module:
     - media

diff --git a/...de_news_article/config/install/core.entity_view_display.node.news_article.card_teaser.yml b/...de_news_article/config/install/core.entity_view_display.node.news_article.card_teaser.yml
@@ -16,7 +16,6 @@ dependencies:
     - field.field.node.news_article.field_news_neighbourhoods
     - field.field.node.news_article.field_radioactivity
     - field.field.node.news_article.field_short_title
-    - image.style.3_2_m
     - node.type.news_article
   module:
     - media