Removed event "rep.value.html" when exporting as html.

Daniel-KM · Jul 8, 2024 · e8afe35 · e8afe35
1 parent 67bbceb
commit e8afe35
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 4 deletions.
diff --git a/src/Form/Writer/FormatTrait.php b/src/Form/Writer/FormatTrait.php
@@ -33,7 +33,9 @@ public function appendFormats()
                     'label' => 'Format of values', // @translate
                     'value_options' => [
                         'string' => 'String', // @translate
-                        'html' => 'Html (may contain output of modules)', // @translate
+                        'html' => 'Html', // @translate
+                        // TODO Add output for html with event for modules? Probably useless.
+                        // 'html_modules' => 'Html (with output of modules)', // @translate
                     ],
                 ],
                 'attributes' => [

diff --git a/src/Formatter/AbstractFormatter.php b/src/Formatter/AbstractFormatter.php
@@ -49,6 +49,11 @@ abstract class AbstractFormatter implements FormatterInterface
      */
     protected $api;
 
+    /**
+     * @var \Omeka\DataType\Manager
+     */
+    protected $dataTypeManager;
+
     /**
      * @var \Common\Stdlib\EasyMeta
      */
@@ -69,6 +74,11 @@ abstract class AbstractFormatter implements FormatterInterface
      */
     protected $translator;
 
+    /**
+     * @var \Laminas\View\Renderer\PhpRenderer
+     */
+    protected $viewRenderer;
+
     /**
      * @var \Omeka\Api\Representation\AbstractResourceEntityRepresentation[]
      */
@@ -156,6 +166,8 @@ public function __construct(ServiceLocatorInterface $services)
         $this->logger = $this->services->get('Omeka\Logger');
         $this->translator = $this->services->get('MvcTranslator');
         $this->easyMeta = $services->get('EasyMeta');
+        $this->viewRenderer = $services->get('ViewRenderer');
+        $this->dataTypeManager = $services->get('Omeka\DataTypeManager');
     }
 
     public function getLabel(): string

diff --git a/src/Traits/MetadataToStringTrait.php b/src/Traits/MetadataToStringTrait.php
@@ -246,13 +246,13 @@ protected function stringMetadata(AbstractResourceRepresentation $resource, $met
                             break;
                         case 'html':
                         case 'rdf:HTML':
-                            $v = $v->asHtml();
+                            $v = $this->asHtmlWithoutEvent($v);
                             break;
                         case 'literal':
                         // case $baseType === 'literal':
                         default:
                             $v = $params['format_generic'] === 'html'
-                                ? $v->asHtml()
+                                ? $this->asHtmlWithoutEvent($v)
                                 : (string) $v;
                             break;
                     }
@@ -269,7 +269,7 @@ protected function stringifyUri(ValueRepresentation $value, array $params): stri
                 $v = (string) $value->uri();
                 break;
             case 'html':
-                $v = $value->asHtml();
+                $v = $this->asHtmlWithoutEvent($value);
                 break;
             case 'uri_label':
             default:
@@ -386,4 +386,19 @@ protected function isAdminRequest(): bool
         return $isAdminRequest
             ?? $isAdminRequest = $this->services->get('Omeka\Status')->isAdminRequest();
     }
+
+    /**
+     * Get a value like method asHtml() but without triggering event "rep.value.html".
+     *
+     * This is useful in particular for modules AdvancedResourceTemplate,
+     * MetadataBrowse and RedactValues.
+     *
+     * @see \Omeka\Api\Representation\ValueRepresentation::asHtml()
+     */
+    protected function asHtmlWithoutEvent(ValueRepresentation $value): string
+    {
+        return $this->dataTypeManager
+            ->get($value->type())
+            ->render($this->viewRenderer, $value);
+    }
 }
diff --git a/src/Writer/AbstractWriter.php b/src/Writer/AbstractWriter.php
@@ -36,6 +36,11 @@ abstract class AbstractWriter implements WriterInterface, Configurable, Parametr
      */
     protected $api;
 
+    /**
+     * @var \Omeka\DataType\Manager
+     */
+    protected $dataTypeManager;
+
     /**
      * @var \Common\Stdlib\EasyMeta
      */
@@ -51,6 +56,11 @@ abstract class AbstractWriter implements WriterInterface, Configurable, Parametr
      */
     protected $translator;
 
+    /**
+     * @var \Laminas\View\Renderer\PhpRenderer
+     */
+    protected $viewRenderer;
+
     /**
      * @var Job
      */
@@ -120,6 +130,8 @@ public function __construct(ServiceLocatorInterface $services)
         $this->logger = $services->get('Omeka\Logger');
         $this->translator = $services->get('MvcTranslator');
         $this->easyMeta = $services->get('EasyMeta');
+        $this->viewRenderer = $services->get('ViewRenderer');
+        $this->dataTypeManager = $services->get('Omeka\DataTypeManager');
 
         /** @var \Omeka\Module\Manager $moduleManager */
         $moduleManager = $this->getServiceLocator()->get('Omeka\ModuleManager');