{{ "edithelp.alert"|trans }}:
-
-
-
-
- {% if not ez_field_is_empty(documentation, 'image') %}
- {{ ez_render_field(documentation, 'image') }}
- {% endif %}
-
-
- {% if not ez_field_is_empty(documentation, 'title') %}
-
- {{ ez_render_field(documentation, 'title') }}
- {% endif %} - {% if not ez_field_is_empty(documentation, 'body') %} - {{ ez_render_field(documentation, 'body') }} - {% endif %} -
+
+
+
{{ "edithelp.alert"|trans }}:
+
-
-
{% endif %}
diff --git a/components/EditHelpBundle/bundle/Resources/views/themes/admin/fields/simple_ezimage_field.html.twig b/components/EditHelpBundle/bundle/Resources/views/themes/admin/fields/simple_ezimage_field.html.twig
new file mode 100644
index 000000000..39c768db5
--- /dev/null
+++ b/components/EditHelpBundle/bundle/Resources/views/themes/admin/fields/simple_ezimage_field.html.twig
@@ -0,0 +1,18 @@
+{% extends '@IbexaAdminUi/themes/admin/ui/field_type/preview/content_fields.html.twig' %}
+
+{% block ezimage_field %}
+ {% apply spaceless %}
+ {% if not ibexa_field_is_empty( content, field ) %}
+ {% set imageAlias = ibexa_image_alias( field, versionInfo, parameters.alias|default( 'original' ) ) %}
+ {% set src = imageAlias ? asset( imageAlias.uri ) : "//:0" %}
+ {% set attr = attr|merge({'class': (attr.class|default('') ~ ' ez-field-preview ez-field-preview--ezimage')|trim}) %}
+
+
+ {% endif %}
+ {% endapply %}
+{% endblock %}
\ No newline at end of file
diff --git a/components/EditHelpBundle/bundle/Services/FetchDocumentation.php b/components/EditHelpBundle/bundle/Services/FetchDocumentation.php
index 4bb6b0344..4947968c0 100644
--- a/components/EditHelpBundle/bundle/Services/FetchDocumentation.php
+++ b/components/EditHelpBundle/bundle/Services/FetchDocumentation.php
@@ -14,38 +14,31 @@
namespace Novactive\Bundle\NovaeZEditHelpBundle\Services;
-use eZ\Publish\API\Repository\Repository;
-use eZ\Publish\API\Repository\Values\Content\Content;
-use eZ\Publish\API\Repository\Values\Content\LocationQuery;
-use eZ\Publish\API\Repository\Values\Content\Query;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Field;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\LogicalAnd;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\ParentLocationId;
-use eZ\Publish\Core\Repository\Values\ContentType\ContentType;
+use Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException;
+use Ibexa\Contracts\Core\Repository\Exceptions\InvalidCriterionArgumentException;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\LocationQuery;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query;
+use Ibexa\Contracts\Core\Repository\Values\Content\Search\SearchHit;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
+use Ibexa\Core\Repository\SiteAccessAware\Repository;
class FetchDocumentation
{
public const TOOLTIP_CONTENT_TYPE = 'nova_help_tooltip';
- /**
- * @var Repository
- */
- protected $repository;
-
- public function __construct(Repository $repository)
- {
- $this->repository = $repository;
- }
+ public function __construct(
+ protected Repository $repository
+ ) { }
public function getByContentType(ContentType $contentType): ?Content
{
$query = new Query(
[
- 'filter' => new LogicalAnd(
+ 'filter' => new Query\Criterion\LogicalAnd(
[
- new Criterion\ContentTypeIdentifier([self::TOOLTIP_CONTENT_TYPE]),
- new Field('identifier', '=', $contentType->identifier),
+ new Query\Criterion\ContentTypeIdentifier([self::TOOLTIP_CONTENT_TYPE]),
+ new Query\Criterion\Field('identifier', '=', $contentType->identifier),
]
),
]
@@ -55,19 +48,29 @@ public function getByContentType(ContentType $contentType): ?Content
$searchResult = $searchService->findContent($query);
// Content is found
if ($searchResult->totalCount > 0) {
- return $searchResult->searchHits[0]->valueObject;
+ $hit = $searchResult->searchHits[0];
+ $valueObject = $hit->valueObject;
+ if ($valueObject instanceof Content) {
+ return $valueObject;
+ }
}
return null;
}
+ /**
+ * @param int $locationId
+ * @return SearchHit[] de Content.
+ * @throws InvalidArgumentException
+ * @throws InvalidCriterionArgumentException
+ */
public function getChildrenByLocationId(int $locationId): array
{
$query = new LocationQuery(
[
- 'filter' => new LogicalAnd(
+ 'filter' => new Query\Criterion\LogicalAnd(
[
- new ParentLocationId($locationId),
+ new Query\Criterion\ParentLocationId($locationId),
]
),
]
diff --git a/components/EditHelpBundle/composer.json b/components/EditHelpBundle/composer.json
index 95aea31e9..8e964dc7f 100644
--- a/components/EditHelpBundle/composer.json
+++ b/components/EditHelpBundle/composer.json
@@ -8,7 +8,7 @@
"ezplatform"
],
"homepage": "https://github.com/Novactive/NovaeZEditHelpBundle",
- "type": "ezplatform-bundle",
+ "type": "ibexa-bundle",
"authors": [
{
"name": "AlmaviaCX",
@@ -20,7 +20,7 @@
"MIT"
],
"require": {
- "php": "^7.3"
+ "php": "^8.1"
},
"autoload": {
"psr-4": {
+
+
+ 
+
+