Merge branch 'main' into nurguly/update-webonyx-graphql-php

Author: dadish

Changelog.md

@@ -1,3 +1,17 @@
+## [1.4.2](https://github.com/dadish/ProcessGraphQL/compare/v1.4.1...v1.4.2) (2023-05-14)
+
+
+### Bug Fixes
+
+* **FeildtypeOptions:** fix error for empty values when it's a single option ([7a02e9d](https://github.com/dadish/ProcessGraphQL/commit/7a02e9d1af24dda78fd40ebb4a96710a55fe67e4))
+
+## [1.4.2-rc.1](https://github.com/dadish/ProcessGraphQL/compare/v1.4.1...v1.4.2-rc.1) (2023-05-14)
+
+
+### Bug Fixes
+
+* **FeildtypeOptions:** fix error for empty values when it's a single option ([7a02e9d](https://github.com/dadish/ProcessGraphQL/commit/7a02e9d1af24dda78fd40ebb4a96710a55fe67e4))
+
 ## [1.4.1](https://github.com/dadish/ProcessGraphQL/compare/v1.4.0...v1.4.1) (2022-07-30)
 
 

ProcessGraphQL.module

@@ -15,7 +15,7 @@ class ProcessGraphQL extends Process implements Module {
 	{
 		return array(
 			'title' => 'GraphQL',
-			'version' => '1.4.1',
+			'version' => '1.4.2',
 			'summary' => 'GraphQL for ProcessWire.',
 			'href' => 'https://github.com/dadish/ProcessGraphql',
 			'singular' => true,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "processgraphql",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "GraphQL for ProcessWire",
   "main": "index.js",
   "directories": {

src/Type/Fieldtype/FieldtypeOptions.php

@@ -9,9 +9,10 @@
 use ProcessWire\GraphQL\Utils;
 use ProcessWire\GraphQL\Type\Fieldtype\Traits\SetValueTrait;
 use ProcessWire\GraphQL\Type\Fieldtype\Traits\FieldTrait;
+use ProcessWire\Page;
 
 class FieldtypeOptions
-{ 
+{
   use FieldTrait;
   use SetValueTrait;
 
@@ -63,6 +64,34 @@ public static function type($field)
     return $type;
   }
 
+  public static function field($field)
+  {
+    return Cache::field($field->name, function () use ($field) {
+      // description
+      $desc = $field->description;
+      if (!$desc) {
+        $desc = "Field with the type of {$field->type}";
+      }
+
+      return [
+        'name' => $field->name,
+        'description' => $desc,
+        'type' => self::type($field),
+        'resolve' => function (Page $page, array $args) use ($field) {
+          $fieldName = $field->name;
+
+          // If a single option field does not have an id, then it means it's empty.
+          if (!self::isMultiple($field) && !$page->$fieldName->id) {
+            return null;
+          }
+
+          return $page->$fieldName;
+        }
+      ];
+    });
+  }
+
+
   public static function inputType($field)
   {
     return Cache::type(self::getName($field), function () use ($field) {

test/Field/Page/Fieldtype/FieldtypeOptions/CaseFiveTest.php

@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * Empty options field should return null.
+ */
+
+namespace ProcessWire\GraphQL\Test\FieldtypeOptions;
+
+use ProcessWire\GraphQL\Utils;
+use ProcessWire\GraphQL\Test\GraphQLTestCase;
+
+class CaseFiveTest extends GraphQLTestCase
+{
+  const settings = [
+    "login" => "admin",
+    "legalTemplates" => ["city"],
+    "legalFields" => ["options_single"],
+  ];
+
+  public function testValue()
+  {
+    $city = Utils::pages()->get("template=city, options_single=''");
+    $query = "{
+      city (s: \"id=$city->id\") {
+        list {
+          options_single {
+            title
+            value
+            id
+          }
+        }
+      }
+    }";
+    $res = self::execute($query);
+    self::assertNull($res->data->city->list[0]->options_single, "Empty option field should return null.");
+  }
+}