Resolving merge conflicts from @whikloj's branch

islandora.install

@@ -5,6 +5,8 @@
  * Install/update hook implementations.
  */
 
+use Drupal\islandora\Form\IslandoraSettingsForm;
+
 /**
  * Implements hook_schema().
  */
@@ -52,3 +54,26 @@ function islandora_update_8001(&$sandbox) {
     $action->delete();
   }
 }
+
+/**
+ * Add in default Gemini URI and Pseudo bundle setting values.
+ */
+function islandora_update_8002(&$sandbox) {
+  $config_factory = \Drupal::service('config.factory')->getEditable(IslandoraSettingsForm::CONFIG_NAME);
+
+  $changed = FALSE;
+  $gemini_url = $config_factory->get(IslandoraSettingsForm::GEMINI_URL);
+  $pseudo_bundles = $config_factory->get(IslandoraSettingsForm::GEMINI_PSEUDO);
+  if (!isset($gemini_url)) {
+    $config_factory->set(IslandoraSettingsForm::GEMINI_URL, '');
+    $changed = TRUE;
+  }
+  if (!isset($pseudo_bundles)) {
+    $config_factory->set(IslandoraSettingsForm::GEMINI_PSEUDO, []);
+    $changed = TRUE;
+  }
+  if ($changed) {
+    $config_factory->save();
+  }
+
+}

islandora.module

@@ -381,9 +381,16 @@ function islandora_entity_extra_field_info() {
  * Implements hook_entity_view().
  */
 function islandora_entity_view(array &$build, EntityInterface $entity, EntityViewDisplayInterface $display, $view_mode) {
-  $route_match_item = \Drupal::routeMatch()->getParameters()->get($entity->getEntityTypeId());
+  $config_factory = \Drupal::service('config.factory')->get(IslandoraSettingsForm::CONFIG_NAME);
-  // Ensure the entity matches the route.
+  $gemini_url = $config_factory->get(IslandoraSettingsForm::GEMINI_URL);
-  if ($entity === $route_match_item) {
+  $pseudo_fields = $config_factory->get(IslandoraSettingsForm::GEMINI_PSEUDO);
+  // If we aren't configured then don't display.
+  if (!empty($gemini_url) && count($pseudo_fields) > 0) {
+    $route_match_item = \Drupal::routeMatch()->getParameters()->all();
+    // Get the parameter, which might be node, media or taxonomy term.
+    $current_entity = reset($route_match_item);
+    // Match exactly to ensure they are the same entity type too.
+    if ($entity === $current_entity) {
       if ($display->getComponent('field_gemini_uri')) {
         $gemini = \Drupal::service('islandora.gemini.lookup');
         if ($gemini instanceof GeminiLookup) {
@@ -409,6 +416,7 @@ function islandora_entity_view(array &$build, EntityInterface $entity, EntityVie
       }
     }
   }
+}
 
 /**
  * Implements hook_preprocess_views_view_table().