Issue CollaboraOnline#27: Use the media entity from the field items i…

…n the field formatter.

src/Cool/CoolUtils.php

@@ -38,21 +38,6 @@ public static function setMediaSource(Media $media, File $source) {
         $media->set($name, $source);
     }
 
-    /** Get the media source entity for the file.
-     *  It will get the first in the list if there are more than one.
-     */
-    public static function getMediaSourceForFile(File $file) {
-        $media_entities = \Drupal::entityTypeManager()->getStorage('media')->loadByProperties([
-            'field_media_document' => $file->id(),
-        ]);
-        if (!is_array($media_entities)) {
-            \Drupal::logger('cool')->error('Media for file ' . $file->id() . ' not found.');
-            return NULL;
-        }
-
-        return array_pop($media_entities);
-    }
-
     /** Obtain the signing key from the key storage */
     static function getKey() {
         $default_config = \Drupal::config('collabora_online.settings');

src/Plugin/Field/FieldFormatter/CoolPreview.php

@@ -41,13 +41,14 @@ public function settingsSummary() {
      */
     public function viewElements(FieldItemListInterface $items, $langcode) {
         $element = [];
+        $media = $items->getEntity();
+        if (!$media instanceof MediaInterface) {
+            // The formatter is being used on the wrong entity type.
+            // @todo Log this.
+            return [];
+        }
 
         foreach ($this->getEntitiesToView($items, $langcode) as $delta => $file) {
-            $media = CoolUtils::getMediaSourceForFile($file);
-            if (!$media) {
-                continue;
-            }
-
             $url = CoolUtils::getEditorUrl($media, false);
 
             $render_array = [