Provide possibility to set Views field GraphQL response type (#23)

Author: LeStatV

src/Plugin/Deriver/Fields/ViewRowFieldDeriver.php

@@ -33,11 +33,12 @@ public function getDerivativeDefinitions($basePluginDefinition) {
         foreach ($display->getHandlers('field') as $name => $field) {
           $id = implode('-', [$viewId, $displayId, 'field', $name]);
           $alias = $rowPlugin->getFieldKeyAlias($name);
+          $type = $rowPlugin->getFieldType($name);
 
           $this->derivatives[$id] = [
             'id' => $id,
             'name' => $alias,
-            'type' => 'String',
+            'type' => $type,
             'parents' => [$display->getGraphQLRowName()],
             'view' => $viewId,
             'display' => $displayId,

src/Plugin/views/row/GraphQLFieldRow.php

@@ -38,6 +38,13 @@ class GraphQLFieldRow extends RowPluginBase {
    */
   protected $rawOutputOptions = [];
 
+  /**
+   * Stores an array of field GrpahQL type.
+   *
+   * @var array
+   */
+  protected $typeOptions = [];
+
   /**
    * {@inheritdoc}
    */
@@ -51,6 +58,7 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o
       $this->replacementAliases = array_filter(array_map('trim', $aliases));
       // Prepare an array of raw output field options.
       $this->rawOutputOptions = static::extractFromOptionsArray('raw_output', $options);
+      $this->typeOptions = static::extractFromOptionsArray('type', $options);
     }
   }
 
@@ -72,7 +80,12 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
 
     $form['field_options'] = [
       '#type' => 'table',
-      '#header' => [$this->t('Field'), $this->t('Alias'), $this->t('Raw output')],
+      '#header' => [
+        $this->t('Field'),
+        $this->t('Alias'),
+        $this->t('Raw output'),
+        $this->t('Type'),
+      ],
       '#empty' => $this->t('You have no fields. Add some to your view.'),
       '#tree' => TRUE,
     ];
@@ -104,6 +117,17 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
           '#type' => 'checkbox',
           '#default_value' => isset($options[$id]['raw_output']) ? $options[$id]['raw_output'] : '',
         ];
+
+        $form['field_options'][$id]['type'] = [
+          '#type' => 'select',
+          '#options' => [
+            'String' => $this->t('String'),
+            'Int' => $this->t('Int'),
+            'Float' => $this->t('Float'),
+            'Boolean' => $this->t('Boolean'),
+          ],
+          '#default_value' => isset($options[$id]['type']) ? $options[$id]['type'] : 'String',
+        ];
       }
     }
   }
@@ -173,6 +197,23 @@ public function getFieldKeyAlias($id) {
     return $id;
   }
 
+  /**
+   * Return a GraphQL field type, as set in the options form.
+   *
+   * @param string $id
+   *   The field id to lookup a type for.
+   *
+   * @return string
+   *   The matches user entered type, or String.
+   */
+  public function getFieldType($id) {
+    if (isset($this->typeOptions[$id])) {
+      return $this->typeOptions[$id];
+    }
+
+    return 'String';
+  }
+
   /**
    * Extracts a set of option values from a nested options array.
    *

tests/src/Kernel/ViewsTest.php

@@ -20,15 +20,6 @@ protected function defaultCacheContexts() {
     ], parent::defaultCacheContexts());
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  protected function defaultCacheTags() {
-    return array_merge([
-      'config:field.storage.node.field_tags',
-    ], parent::defaultCacheTags());
-  }
-
   /**
    * Test that the view returns both nodes.
    */
@@ -47,7 +38,6 @@ public function testSimpleView() {
         ],
       ],
     ], $this->defaultCacheMetaData()->addCacheTags([
-      'config:views.view.graphql_bundle_test',
       'config:views.view.graphql_test',
       'node:1',
       'node:2',
@@ -91,7 +81,6 @@ public function testPagedView() {
         ],
       ],
     ], $this->defaultCacheMetaData()->addCacheTags([
-      'config:views.view.graphql_bundle_test',
       'config:views.view.graphql_test',
       'node:1',
       'node:2',
@@ -146,7 +135,6 @@ public function testSortedView() {
         ],
       ],
     ], $this->defaultCacheMetaData()->addCacheTags([
-      'config:views.view.graphql_bundle_test',
       'config:views.view.graphql_test',
       'node:1',
       'node:2',
@@ -184,7 +172,6 @@ public function testFilteredView() {
         ],
       ],
     ], $this->defaultCacheMetaData()->addCacheTags([
-      'config:views.view.graphql_bundle_test',
       'config:views.view.graphql_test',
       'node:1',
       'node:4',
@@ -218,7 +205,6 @@ public function testMultiValueFilteredView() {
         ],
       ],
     ], $this->defaultCacheMetaData()->addCacheTags([
-      'config:views.view.graphql_bundle_test',
       'config:views.view.graphql_test',
       'node:1',
       'node:2',
@@ -259,7 +245,6 @@ public function testComplexFilteredView() {
         ],
       ],
     ], $this->defaultCacheMetaData()->addCacheTags([
-      'config:views.view.graphql_bundle_test',
       'config:views.view.graphql_test',
       'node:1',
       'node:2',
@@ -289,7 +274,6 @@ public function testSingleValueBundleFilterView() {
       ],
     ], $this->defaultCacheMetaData()->addCacheTags([
       'config:views.view.graphql_bundle_test',
-      'config:views.view.graphql_test',
       'node:1',
       'node_list',
     ]));