EWPP-4984: Remove social feed widget type from the Webtools media sou…

…rce options.
openeuropa · Dec 10, 2024 · 1e41947 · 1e41947
1 parent a40310e
commit 1e41947
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 22 deletions.
diff --git a/modules/oe_webtools_media/src/Plugin/Validation/Constraint/WebtoolsMediaConstraint.php b/modules/oe_webtools_media/src/Plugin/Validation/Constraint/WebtoolsMediaConstraint.php
@@ -31,6 +31,13 @@ class WebtoolsMediaConstraint extends Constraint {
    */
   public $blacklistMessage = 'This service is supported by a dedicated asset type or feature, please use that instead.';
 
+  /**
+   * The unsupported widget type message.
+   *
+   * @var string
+   */
+  public $unsupportedWidgetTypeMessage = 'The service "%widget_type" is no longer supported.';
+
   /**
    * The incorrect WCLOUD URL message.
    *

diff --git a/...s/oe_webtools_media/src/Plugin/Validation/Constraint/WebtoolsMediaConstraintValidator.php b/...s/oe_webtools_media/src/Plugin/Validation/Constraint/WebtoolsMediaConstraintValidator.php
@@ -92,6 +92,11 @@ public function validate($value, Constraint $constraint) {
       $snippet['service'] = $snippet['utility'];
     }
 
+    if (!isset($widget_types[$constraint->widgetType])) {
+      $this->context->addViolation($constraint->unsupportedWidgetTypeMessage, ['%widget_type' => $constraint->widgetType]);
+      return;
+    }
+
     // Add violation in case incorrect services.
     $services = $widget_types[$constraint->widgetType]['services'] ?? [$widget_types[$constraint->widgetType]['service']];
     if (empty($snippet['service']) || (!empty($services) && !in_array($snippet['service'], $services))) {

diff --git a/modules/oe_webtools_media/src/Plugin/media/Source/Webtools.php b/modules/oe_webtools_media/src/Plugin/media/Source/Webtools.php
@@ -202,14 +202,6 @@ public function getWidgetTypes() {
         'default_thumbnail' => 'maps-embed-no-bg.png',
         'blacklist' => [],
       ],
-      'social_feed' => [
-        'name' => $this->t('Social feed'),
-        // @deprecated Use services key instead.
-        'service' => '',
-        'services' => ['smk'],
-        'default_thumbnail' => 'twitter-embed-no-bg.png',
-        'blacklist' => [],
-      ],
       'opwidget' => [
         'name' => $this->t('OP Publication list'),
         // @deprecated Use services key instead.

diff --git a/modules/oe_webtools_media/tests/src/FunctionalJavascript/MediaSourceWebtoolsTest.php b/modules/oe_webtools_media/tests/src/FunctionalJavascript/MediaSourceWebtoolsTest.php
@@ -195,7 +195,7 @@ public function getTestMediaWebtoolsSourceData(): array {
         'charts',
         'service',
         '/charts-embed-no-bg.png',
-        'smk',
+        'map',
         '',
       ],
       [
@@ -204,7 +204,7 @@ public function getTestMediaWebtoolsSourceData(): array {
         'chart',
         'service',
         '/charts-embed-no-bg.png',
-        'smk',
+        'map',
         '',
       ],
       [
@@ -213,25 +213,16 @@ public function getTestMediaWebtoolsSourceData(): array {
         'racing',
         'service',
         '/charts-embed-no-bg.png',
-        'smk',
+        'map',
         '',
       ],
-      ['map', 'Map', 'map', 'service', '/maps-embed-no-bg.png', 'smk', ''],
+      ['map', 'Map', 'map', 'service', '/maps-embed-no-bg.png', 'chart', ''],
       [
         'chart',
         'Chart',
         'qlik',
         'service',
         '/charts-embed-no-bg.png',
-        'smk',
-        '',
-      ],
-      [
-        'social_feed',
-        'Social feed',
-        'smk',
-        'service',
-        '/twitter-embed-no-bg.png',
         'map',
         '',
       ],
@@ -241,7 +232,7 @@ public function getTestMediaWebtoolsSourceData(): array {
         'opwidget',
         'utility',
         '/generic.png',
-        'smk',
+        'chart',
         '',
       ],
       ['cdown', 'Countdown', 'cdown', 'service', '/generic.png', 'map', ''],