New base table third party setting + Drupal 10.2 fixes

tripal_chado/src/Plugin/Field/FieldType/ChadoAdditionalTypeTypeDefault.php

@@ -381,31 +381,25 @@ public function isCompatible(TripalEntityType $entity_type) : bool {
 
     // Get the base table for the content type.
     $base_table = $entity_type->getThirdPartySetting('tripal', 'chado_base_table');
-    if ($base_table) {
 
-      /** @var \Drupal\tripal_chado\Database\ChadoConnection $chado **/
-      $chado = \Drupal::service('tripal_chado.database');
-      $schema = $chado->schema();
+    /** @var \Drupal\tripal_chado\Database\ChadoConnection $chado **/
+    $chado = \Drupal::service('tripal_chado.database');
+    $schema = $chado->schema();
 
-      // If the base table has a 'type_id' column, then it is compatible.
-      $base_table_def = $schema->getTableDef($base_table, ['format' => 'Drupal']);
-      if (isset($base_table_def['fields']['type_id'])) {
-        $compatible = TRUE;
-      }
+    // If the base table has a 'type_id' column, then it is compatible.
+    $base_table_def = $schema->getTableDef($base_table, ['format' => 'Drupal']);
+    if (isset($base_table_def['fields']['type_id'])) {
+      $compatible = TRUE;
+    }
 
-      $prop_def = $schema->getTableDef($base_table . 'prop', ['format' => 'Drupal']);
-      // If the property table exists, and has a foreign key to the base table,
-      // then this content type is compatible.
-      if ($prop_def) {
-        if (array_key_exists($base_table, $prop_def['foreign keys'])) {
-          $compatible = TRUE;
-        }
+    $prop_def = $schema->getTableDef($base_table . 'prop', ['format' => 'Drupal']);
+    // If the property table exists, and has a foreign key to the base table,
+    // then this content type is compatible.
+    if ($prop_def) {
+      if (array_key_exists($base_table, $prop_def['foreign keys'])) {
+        $compatible = TRUE;
       }
     }
-    else {
-      // If base table is not defined, assume compatible
-      $compatible = TRUE;
-    }
 
     return $compatible;
   }

tripal_chado/src/Plugin/Field/FieldType/ChadoAnalysisTypeDefault.php

@@ -280,11 +280,9 @@ public function isCompatible(TripalEntityType $entity_type) : bool {
 
     // Get the base table for the content type.
     $base_table = $entity_type->getThirdPartySetting('tripal', 'chado_base_table');
-    if ($base_table) {
-      $linker_tables = $this->getLinkerTables(self::$object_table, $base_table);
-      if (count($linker_tables) < 1) {
-        $compatible = FALSE;
-      }
+    $linker_tables = $this->getLinkerTables(self::$object_table, $base_table);
+    if (count($linker_tables) < 1) {
+      $compatible = FALSE;
     }
     return $compatible;
   }

tripal_chado/src/Plugin/Field/FieldType/ChadoArrayDesignTypeDefault.php

@@ -353,11 +353,9 @@ public function isCompatible(TripalEntityType $entity_type) : bool {
 
     // Get the base table for the content type.
     $base_table = $entity_type->getThirdPartySetting('tripal', 'chado_base_table');
-    if ($base_table) {
-      $linker_tables = $this->getLinkerTables(self::$object_table, $base_table);
-      if (count($linker_tables) < 1) {
-        $compatible = FALSE;
-      }
+    $linker_tables = $this->getLinkerTables(self::$object_table, $base_table);
+    if (count($linker_tables) < 1) {
+      $compatible = FALSE;
     }
     return $compatible;
   }

tripal_chado/src/Plugin/Field/FieldType/ChadoAssayTypeDefault.php

@@ -298,11 +298,9 @@ public function isCompatible(TripalEntityType $entity_type) : bool {
 
     // Get the base table for the content type.
     $base_table = $entity_type->getThirdPartySetting('tripal', 'chado_base_table');
-    if ($base_table) {
-      $linker_tables = $this->getLinkerTables(self::$object_table, $base_table);
-      if (count($linker_tables) < 1) {
-        $compatible = FALSE;
-      }
+    $linker_tables = $this->getLinkerTables(self::$object_table, $base_table);
+    if (count($linker_tables) < 1) {
+      $compatible = FALSE;
     }
     return $compatible;
   }

tripal_chado/src/Plugin/Field/FieldType/ChadoBiomaterialTypeDefault.php

@@ -310,11 +310,9 @@ public function isCompatible(TripalEntityType $entity_type) : bool {
 
     // Get the base table for the content type.
     $base_table = $entity_type->getThirdPartySetting('tripal', 'chado_base_table');
-    if ($base_table) {
-      $linker_tables = $this->getLinkerTables(self::$object_table, $base_table);
-      if (count($linker_tables) < 1) {
-        $compatible = FALSE;
-      }
+    $linker_tables = $this->getLinkerTables(self::$object_table, $base_table);
+    if (count($linker_tables) < 1) {
+      $compatible = FALSE;
     }
     return $compatible;
   }

tripal_chado/src/Plugin/Field/FieldType/ChadoBooleanTypeDefault.php

@@ -98,11 +98,9 @@ public function isCompatible(TripalEntityType $entity_type) : bool {
 
     // Get the base table for the content type.
     $base_table = $entity_type->getThirdPartySetting('tripal', 'chado_base_table');
-    if ($base_table) {
-      $table_columns = $this->getTableColumns($base_table, self::$valid_base_column_types);
-      if (count($table_columns) < 1) {
-        $compatible = FALSE;
-      }
+    $table_columns = $this->getTableColumns($base_table, self::$valid_base_column_types);
+    if (count($table_columns) < 1) {
+      $compatible = FALSE;
     }
     return $compatible;
   }

tripal_chado/src/Plugin/Field/FieldType/ChadoContactTypeDefault.php

@@ -235,11 +235,9 @@ public function isCompatible(TripalEntityType $entity_type) : bool {
 
     // Get the base table for the content type.
     $base_table = $entity_type->getThirdPartySetting('tripal', 'chado_base_table');
-    if ($base_table) {
-      $linker_tables = $this->getLinkerTables(self::$object_table, $base_table);
-      if (count($linker_tables) < 1) {
-        $compatible = FALSE;
-      }
+    $linker_tables = $this->getLinkerTables(self::$object_table, $base_table);
+    if (count($linker_tables) < 1) {
+      $compatible = FALSE;
     }
     return $compatible;
   }

tripal_chado/src/Plugin/Field/FieldType/ChadoDbxrefTypeDefault.php

@@ -278,11 +278,9 @@ public function isCompatible(TripalEntityType $entity_type) : bool {
 
     // Get the base table for the content type.
     $base_table = $entity_type->getThirdPartySetting('tripal', 'chado_base_table');
-    if ($base_table) {
-      $linker_tables = $this->getLinkerTables(self::$object_table, $base_table);
-      if (count($linker_tables) < 1) {
-        $compatible = FALSE;
-      }
+    $linker_tables = $this->getLinkerTables(self::$object_table, $base_table);
+    if (count($linker_tables) < 1) {
+      $compatible = FALSE;
     }
     return $compatible;
   }

tripal_chado/src/Plugin/Field/FieldType/ChadoFeatureMapTypeDefault.php

@@ -225,11 +225,9 @@ public function isCompatible(TripalEntityType $entity_type) : bool {
 
     // Get the base table for the content type.
     $base_table = $entity_type->getThirdPartySetting('tripal', 'chado_base_table');
-    if ($base_table) {
-      $linker_tables = $this->getLinkerTables(self::$object_table, $base_table);
-      if (count($linker_tables) < 1) {
-        $compatible = FALSE;
-      }
+    $linker_tables = $this->getLinkerTables(self::$object_table, $base_table);
+    if (count($linker_tables) < 1) {
+      $compatible = FALSE;
     }
     return $compatible;
   }

tripal_chado/src/Plugin/Field/FieldType/ChadoFeatureTypeDefault.php

@@ -352,11 +352,9 @@ public function isCompatible(TripalEntityType $entity_type) : bool {
 
     // Get the base table for the content type.
     $base_table = $entity_type->getThirdPartySetting('tripal', 'chado_base_table');
-    if ($base_table) {
-      $linker_tables = $this->getLinkerTables(self::$object_table, $base_table);
-      if (count($linker_tables) < 1) {
-        $compatible = FALSE;
-      }
+    $linker_tables = $this->getLinkerTables(self::$object_table, $base_table);
+    if (count($linker_tables) < 1) {
+      $compatible = FALSE;
     }
     return $compatible;
   }

tripal_chado/src/Plugin/Field/FieldType/ChadoIntegerTypeDefault.php

@@ -106,11 +106,9 @@ public function isCompatible(TripalEntityType $entity_type) : bool {
 
     // Get the base table for the content type.
     $base_table = $entity_type->getThirdPartySetting('tripal', 'chado_base_table');
-    if ($base_table) {
-      $table_columns = $this->getTableColumns($base_table, self::$valid_base_column_types);
-      if (count($table_columns) < 1) {
-        $compatible = FALSE;
-      }
+    $table_columns = $this->getTableColumns($base_table, self::$valid_base_column_types);
+    if (count($table_columns) < 1) {
+      $compatible = FALSE;
     }
     return $compatible;
   }

tripal_chado/src/Plugin/Field/FieldType/ChadoOrganismTypeDefault.php

@@ -272,11 +272,9 @@ public function isCompatible(TripalEntityType $entity_type) : bool {
 
     // Get the base table for the content type.
     $base_table = $entity_type->getThirdPartySetting('tripal', 'chado_base_table');
-    if ($base_table) {
-      $linker_tables = $this->getLinkerTables(self::$object_table, $base_table);
-      if (count($linker_tables) < 1) {
-        $compatible = FALSE;
-      }
+    $linker_tables = $this->getLinkerTables(self::$object_table, $base_table);
+    if (count($linker_tables) < 1) {
+      $compatible = FALSE;
     }
     return $compatible;
   }

tripal_chado/src/Plugin/Field/FieldType/ChadoProjectTypeDefault.php

@@ -215,11 +215,9 @@ public function isCompatible(TripalEntityType $entity_type) : bool {
 
     // Get the base table for the content type.
     $base_table = $entity_type->getThirdPartySetting('tripal', 'chado_base_table');
-    if ($base_table) {
-      $linker_tables = $this->getLinkerTables(self::$object_table, $base_table);
-      if (count($linker_tables) < 1) {
-        $compatible = FALSE;
-      }
+    $linker_tables = $this->getLinkerTables(self::$object_table, $base_table);
+    if (count($linker_tables) < 1) {
+      $compatible = FALSE;
     }
     return $compatible;
   }

tripal_chado/src/Plugin/Field/FieldType/ChadoPropertyTypeDefault.php

@@ -236,30 +236,23 @@ public static function storageSettingsFormValidate(array $form, FormStateInterfa
    * @see \Drupal\tripal_chado\TripalField\ChadoFieldItemBase::isCompatible()
    */
   public function isCompatible(TripalEntityType $entity_type) : bool {
-    $compatible = TRUE;
+    $compatible = FALSE;
 
     // Get the base table for the content type.
     $base_table = $entity_type->getThirdPartySetting('tripal', 'chado_base_table');
-    if ($base_table) {
 
-      /** @var \Drupal\tripal_chado\Database\ChadoConnection $chado **/
-      $chado = \Drupal::service('tripal_chado.database');
-      $schema = $chado->schema();
+    /** @var \Drupal\tripal_chado\Database\ChadoConnection $chado **/
+    $chado = \Drupal::service('tripal_chado.database');
+    $schema = $chado->schema();
 
-      // If the property table exists, and has a foreign key to the base table,
-      // then this content type is compatible.
-      $prop_def = $schema->getTableDef($base_table . 'prop', ['format' => 'Drupal']);
-      if ($prop_def) {
-        if (array_key_exists($base_table, $prop_def['foreign keys'])) {
-          $compatible = FALSE;
-        }
+    // If the property table exists, and has a foreign key to the base table,
+    // then this content type is compatible.
+    $prop_def = $schema->getTableDef($base_table . 'prop', ['format' => 'Drupal']);
+    if ($prop_def) {
+      if (array_key_exists($base_table, $prop_def['foreign keys'])) {
+        $compatible = TRUE;
       }
     }
-    else {
-      // If base table is not defined, assume compatible
-      $compatible = TRUE;
-    }
-
     return $compatible;
   }
 

tripal_chado/src/Plugin/Field/FieldType/ChadoProtocolTypeDefault.php

@@ -284,11 +284,9 @@ public function isCompatible(TripalEntityType $entity_type) : bool {
 
     // Get the base table for the content type.
     $base_table = $entity_type->getThirdPartySetting('tripal', 'chado_base_table');
-    if ($base_table) {
-      $linker_tables = $this->getLinkerTables(self::$object_table, $base_table);
-      if (count($linker_tables) < 1) {
-        $compatible = FALSE;
-      }
+    $linker_tables = $this->getLinkerTables(self::$object_table, $base_table);
+    if (count($linker_tables) < 1) {
+      $compatible = FALSE;
     }
     return $compatible;
   }

tripal_chado/src/Plugin/Field/FieldType/ChadoPubTypeDefault.php

@@ -322,11 +322,9 @@ public function isCompatible(TripalEntityType $entity_type) : bool {
 
     // Get the base table for the content type.
     $base_table = $entity_type->getThirdPartySetting('tripal', 'chado_base_table');
-    if ($base_table) {
-      $linker_tables = $this->getLinkerTables(self::$object_table, $base_table);
-      if (count($linker_tables) < 1) {
-        $compatible = FALSE;
-      }
+    $linker_tables = $this->getLinkerTables(self::$object_table, $base_table);
+    if (count($linker_tables) < 1) {
+      $compatible = FALSE;
     }
     return $compatible;
   }

tripal_chado/src/Plugin/Field/FieldType/ChadoSequenceChecksumTypeDefault.php

@@ -101,13 +101,13 @@ public static function tripalTypes($field_definition) {
    * @see \Drupal\tripal_chado\TripalField\ChadoFieldItemBase::isCompatible()
    */
   public function isCompatible(TripalEntityType $entity_type) : bool {
-    $compatible = TRUE;
+    $compatible = FALSE;
 
     // Get the base table for the content type.
     $base_table = $entity_type->getThirdPartySetting('tripal', 'chado_base_table');
     // This is a "specialty" field for a single content type
     // If base table is not defined, assume compatible
-    if (!$base_table or ($base_table == 'feature')) {
+    if ($base_table == 'feature') {
       $compatible = TRUE;
     }
     return $compatible;

tripal_chado/src/Plugin/Field/FieldType/ChadoSequenceCoordinatesDefault.php

@@ -133,13 +133,14 @@ public static function tripalTypes($field_definition) {
    * @see \Drupal\tripal_chado\TripalField\ChadoFieldItemBase::isCompatible()
    */
   public function isCompatible(TripalEntityType $entity_type) : bool {
-    $compatible = TRUE;
+    $compatible = FALSE;
 
     // Get the base table for the content type.
     $base_table = $entity_type->getThirdPartySetting('tripal', 'chado_base_table');
+
     // This is a "specialty" field for a single content type
     // If base table is not defined, assume compatible
-    if (!$base_table or ($base_table == 'feature')) {
+    if ($base_table == 'feature') {
       $compatible = TRUE;
     }
     return $compatible;

tripal_chado/src/Plugin/Field/FieldType/ChadoSequenceLengthTypeDefault.php

@@ -89,13 +89,13 @@ public static function tripalTypes($field_definition) {
    * @see \Drupal\tripal_chado\TripalField\ChadoFieldItemBase::isCompatible()
    */
   public function isCompatible(TripalEntityType $entity_type) : bool {
-    $compatible = TRUE;
+    $compatible = FALSE;
 
     // Get the base table for the content type.
     $base_table = $entity_type->getThirdPartySetting('tripal', 'chado_base_table');
     // This is a "specialty" field for a single content type
     // If base table is not defined, assume compatible
-    if (!$base_table or ($base_table == 'feature')) {
+    if ($base_table == 'feature') {
       $compatible = TRUE;
     }
     return $compatible;

tripal_chado/src/Plugin/Field/FieldType/ChadoSequenceTypeDefault.php

@@ -109,13 +109,13 @@ public static function tripalTypes($field_definition) {
    * @see \Drupal\tripal_chado\TripalField\ChadoFieldItemBase::isCompatible()
    */
   public function isCompatible(TripalEntityType $entity_type) : bool {
-    $compatible = TRUE;
+    $compatible = FALSE;
 
     // Get the base table for the content type.
     $base_table = $entity_type->getThirdPartySetting('tripal', 'chado_base_table');
     // This is a "specialty" field for a single content type
     // If base table is not defined, assume compatible
-    if (!$base_table or ($base_table == 'feature')) {
+    if ($base_table == 'feature') {
       $compatible = TRUE;
     }
     return $compatible;

tripal_chado/src/Plugin/Field/FieldType/ChadoSourceDataTypeDefault.php

@@ -109,13 +109,13 @@ public static function tripalTypes($field_definition)  {
    * @see \Drupal\tripal_chado\TripalField\ChadoFieldItemBase::isCompatible()
    */
   public function isCompatible(TripalEntityType $entity_type) : bool {
-    $compatible = TRUE;
+    $compatible = FALSE;
 
     // Get the base table for the content type.
     $base_table = $entity_type->getThirdPartySetting('tripal', 'chado_base_table');
     // This is a "specialty" field for a single content type
     // If base table is not defined, assume compatible
-    if (!$base_table or ($base_table == 'analysis')) {
+    if ($base_table == 'analysis') {
       $compatible = TRUE;
     }
     return $compatible;

tripal_chado/src/Plugin/Field/FieldType/ChadoStockTypeDefault.php

@@ -322,11 +322,9 @@ public function isCompatible(TripalEntityType $entity_type) : bool {
 
     // Get the base table for the content type.
     $base_table = $entity_type->getThirdPartySetting('tripal', 'chado_base_table');
-    if ($base_table) {
-      $linker_tables = $this->getLinkerTables(self::$object_table, $base_table);
-      if (count($linker_tables) < 1) {
-        $compatible = FALSE;
-      }
+    $linker_tables = $this->getLinkerTables(self::$object_table, $base_table);
+    if (count($linker_tables) < 1) {
+      $compatible = FALSE;
     }
     return $compatible;
   }