Merge pull request #21 from 21TORR/next

Build catalog value on IntegrationField & Bug Fix
21TORR · Dec 2, 2021 · 47858a7 · 47858a7
2 parents a58c141 + 293b7e0
commit 47858a7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+4.0.0-beta.5
+============
+
+*   (improvement) Build `catalog` value on `IntegrationField`.
+*   (bug) Add check if property `kind` in `LinkField` is `image` to return `ImageValue`.
+
+
 4.0.0-beta.4
 ============
 

diff --git a/src/Structure/Field/IntegrationField.php b/src/Structure/Field/IntegrationField.php
@@ -19,11 +19,14 @@ public function __construct (
 		string $label,
 		string $catalog,
 		?string $placeholder = null,
+		?string $catalogRepository = null,
 	)
 	{
+		$catalogRepository = $catalogRepository ?? $_ENV['PRISMIC_REPOSITORY'];
+
 		parent::__construct(self::TYPE_KEY, FilterFieldsHelper::filterOptionalFields([
 			"label" => $label,
-			"catalog" => $catalog,
+			"catalog" => "{$catalogRepository}--{$catalog}",
 			"placeholder" => $placeholder,
 		]));
 	}

diff --git a/src/Structure/Field/LinkField.php b/src/Structure/Field/LinkField.php
@@ -72,6 +72,7 @@ public function getValidationConstraints () : array
 	public function transformValue (mixed $data, FieldValueTransformer $valueTransformer) : mixed
 	{
 		$type = $data["link_type"] ?? null;
+		$kind = $data["kind"] ?? null;
 
 		if ("Web" === $type)
 		{
@@ -82,7 +83,7 @@ public function transformValue (mixed $data, FieldValueTransformer $valueTransfo
 		{
 			// return as an image, if specifically an image was asked for
 			// @todo always return it this way (and use ImageValue or FileValue)
-			if (self::SELECT_MEDIA === $this->select)
+			if ("image" === $kind)
 			{
 				return new ImageValue(
 					$data["url"],