Factor out drupal_static for resource display

modules/datastore/src/Form/ResourceSettingsForm.php

@@ -2,6 +2,7 @@
 
 namespace Drupal\datastore\Form;
 
+use Drupal\common\DataResource;
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
 
@@ -24,7 +25,7 @@ public function getFormId() {
    * {@inheritdoc}
    */
   protected function getEditableConfigNames() {
-    return ['datastore.settings'];
+    return ['datastore.settings', 'metastore.settings'];
   }
 
   /**
@@ -52,6 +53,18 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       '#default_value' => $this->config('datastore.settings')->get('delete_local_resource'),
       '#description' => $this->t('Delete local copy of remote files after the datastore import is complete'),
     ];
+    $form['resource_perspective_display'] = [
+      '#type' => 'select',
+      '#title' => $this->t('Resource download url display'),
+      '#description' => $this->t('Choose to display either the source or local path to a resource file in the 
+        metadata. Note that "Local URL" display only makes sense if "Delete local resource" is unchecked.'),
+      '#options' => [
+        DataResource::DEFAULT_SOURCE_PERSPECTIVE => $this->t('Source'),
+        'local_url' => $this->t('Local URL'),
+      ],
+      '#default_value' => $this->config('metastore.settings')->get('resource_perspective_display')
+      ?: DataResource::DEFAULT_SOURCE_PERSPECTIVE,
+    ];
     return parent::buildForm($form, $form_state);
   }
 
@@ -64,6 +77,9 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
       ->set('purge_file', $form_state->getValue('purge_file'))
       ->set('delete_local_resource', $form_state->getValue('delete_local_resource'))
       ->save();
+    $this->config('metastore.settings')
+      ->set('resource_perspective_display', $form_state->getValue('resource_perspective_display'))
+      ->save();
     parent::submitForm($form, $form_state);
   }
 

modules/metastore/config/install/metastore.settings.yml

@@ -19,3 +19,4 @@ property_list:
   'spatial': 0
   'temporal': 0
   'isPartOf': 0
+resource_perspective_display: source

modules/metastore/config/schema/metastore.schema.yml

@@ -13,4 +13,7 @@ metastore.settings:
       label: 'Property List'
       sequence:
         type: string
-        label: 'Property'
+        label: 'Property'
+    resource_perspective_display:
+      type: string
+      label: 'Resource download url display'

modules/metastore/metastore.module

@@ -4,7 +4,6 @@
  * @file
  */
 
-use Drupal\common\DataResource;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
 use Drupal\Core\Entity\EntityInterface;
@@ -53,13 +52,6 @@ function metastore_entity_bundle_field_info_alter(&$fields, EntityTypeInterface
   }
 }
 
-/**
- * Helper method to retrieve the static value for a resource's display.
- */
-function resource_mapper_display() {
-  return drupal_static('metastore_resource_mapper_display', DataResource::DEFAULT_SOURCE_PERSPECTIVE);
-}
-
 /**
  * Helper method to retrieve the static value for a resource's revisioning.
  */

modules/metastore/metastore.services.yml

@@ -16,6 +16,7 @@ services:
       - '@date.formatter'
       - '@dkan.metastore.storage'
       - '@queue'
+      - '@config.factory'
   dkan.metastore.schema_retriever:
     class: \Drupal\metastore\SchemaRetriever
     arguments:

modules/metastore/src/LifeCycle/LifeCycle.php

@@ -5,6 +5,7 @@
 use Drupal\common\EventDispatcherTrait;
 use Drupal\common\DataResource;
 use Drupal\common\UrlHostTokenResolver;
+use Drupal\Core\Config\ConfigFactory;
 use Drupal\Core\Datetime\DateFormatter;
 use Drupal\Core\Queue\QueueFactory;
 use Drupal\metastore\MetastoreItemInterface;
@@ -72,6 +73,13 @@ class LifeCycle {
    */
   protected $queueFactory;
 
+  /**
+   * The config factory service.
+   *
+   * @var \Drupal\Core\Config\ConfigFactory
+   */
+  protected $configFactory;
+
   /**
    * Constructor.
    */
@@ -82,7 +90,8 @@ public function __construct(
     ResourceMapper $resourceMapper,
     DateFormatter $dateFormatter,
     DataFactory $dataFactory,
-    QueueFactory $queueFactory
+    QueueFactory $queueFactory,
+    ConfigFactory $configFactory
   ) {
     $this->referencer = $referencer;
     $this->dereferencer = $dereferencer;
@@ -91,6 +100,7 @@ public function __construct(
     $this->dateFormatter = $dateFormatter;
     $this->dataFactory = $dataFactory;
     $this->queueFactory = $queueFactory;
+    $this->configFactory = $configFactory;
   }
 
   /**
@@ -227,7 +237,8 @@ private function retrieveDownloadUrlFromResourceMapper(string $resourceIdentifie
     }
 
     $reference[] = $this->createResourceReference($sourceResource);
-    $perspective = \resource_mapper_display();
+    $perspective = $this->configFactory->get('metastore.settings')->get('resource_perspective_display')
+      ?: DataResource::DEFAULT_SOURCE_PERSPECTIVE;
     $resource = $sourceResource;
 
     if (

tests/src/Functional/DatasetTest.php

@@ -307,8 +307,10 @@ private function datastoreImportAndQuery() {
   }
 
   private function changeDatasetsResourceOutputPerspective(string $perspective = DataResource::DEFAULT_SOURCE_PERSPECTIVE) {
-    $display = &drupal_static('metastore_resource_mapper_display');
-    $display = $perspective;
+    $configFactory = \Drupal::service('config.factory');
+    $config = $configFactory->getEditable('metastore.settings');
+    $config->set('resource_perspective_display', $perspective);
+    $config->save();
   }
 
   private function getResourceDatastoreTable(object $resource) {