CFM-474_Pipeline_Toolkit_problems

app/availableplugins/PipelineToolkit/src/Controller/LoginIdentifierTypesController.php

@@ -30,11 +30,28 @@
 namespace PipelineToolkit\Controller;
 
 use App\Controller\StandardPluginController;
+use PipelineToolkit\Model\Table\IdentifierMappersTable;
 
 class LoginIdentifierTypesController extends StandardPluginController {
   protected array $paginate = [
     'order' => [
       'LoginIdentifierTypes.id' => 'asc'
     ]
   ];
+  /**
+   * Callback before views are rendered.
+   *
+   * @param \Cake\Event\EventInterface $event
+   * @return void
+   * @since  COmanage Registry v5.2.0
+   */
+
+  public function beforeRender(\Cake\Event\EventInterface $event): void
+  {
+    // Used by the parent controller to construct the breadcrumbs
+    $this->set('vv_pluginClassName', IdentifierMappersTable::class);
+    $this->set('vv_pluginForeignKey', 'identifier_mapper_id');
+
+    parent::beforeRender($event);
+  }
 }

app/availableplugins/PipelineToolkit/src/Model/Table/IdentifierMappersTable.php

@@ -29,6 +29,7 @@
 
 namespace PipelineToolkit\Model\Table;
 
+use App\Model\Entity\Flange;
 use Cake\ORM\Table;
 use Cake\Validation\Validator;
 
@@ -38,6 +39,7 @@ class IdentifierMappersTable extends Table {
   use \App\Lib\Traits\LabeledLogTrait;
   use \App\Lib\Traits\PermissionsTrait;
   use \App\Lib\Traits\PrimaryLinkTrait;
+  use \App\Lib\Traits\QueryModificationTrait;
   use \App\Lib\Traits\TableMetaTrait;
   use \App\Lib\Traits\ValidationTrait;
 
@@ -68,6 +70,19 @@ public function initialize(array $config): void {
     $this->setPrimaryLink(['flange_id']);
     $this->setRequiresCO(true);
 
+    $this->setViewContains([
+      'Flanges',
+    ]);
+
+    $this->setEditContains([
+      'Flanges',
+    ]);
+
+    // Required for deep Breadcrumb calculations
+    $this->setIndexContains([
+      'Flanges',
+    ]);
+
     $this->setPermissions([
       // Actions that operate over an entity (ie: require an $id)
       'entity' => [
@@ -135,6 +150,22 @@ public function buildRelatedAttributes(
     return $retdata;
   }
 
+  /**
+   * Table specific logic to generate a display field.
+   *
+   * @since  COmanage Registry v5.2.0
+   * @param  \PipelineToolkit\Model\Entity\IdentifierMapper $entity Entity to generate display field for
+   * @return string|null         Display field
+   */
+  public function generateDisplayField(\PipelineToolkit\Model\Entity\IdentifierMapper $entity): ?string {
+    // Fail gracefully if the Flange association is not set/loaded
+    if (empty($entity->flange) || empty($entity->flange->description)) {
+      return null;
+    }
+
+    return $entity->flange->description;
+  }
+
   /**
    * Set validation rules.
    * 

app/availableplugins/PipelineToolkit/src/Model/Table/LoginIdentifierTypesTable.php

@@ -40,6 +40,7 @@ class LoginIdentifierTypesTable extends Table {
   use \App\Lib\Traits\LabeledLogTrait;
   use \App\Lib\Traits\PermissionsTrait;
   use \App\Lib\Traits\PrimaryLinkTrait;
+  use \App\Lib\Traits\QueryModificationTrait;
   use \App\Lib\Traits\TableMetaTrait;
   use \App\Lib\Traits\ValidationTrait;
 
@@ -75,6 +76,14 @@ public function initialize(array $config): void {
       ]
     ]);
 
+    $this->setViewContains([
+      'IdentifierMappers' => ['Flanges'],
+    ]);
+
+    $this->setEditContains([
+      'IdentifierMappers' => ['Flanges'],
+    ]);
+
     $this->setPermissions([
       // Actions that operate over an entity (ie: require an $id)
       'entity' => [
@@ -109,6 +118,17 @@ public function buildRules(RulesChecker $rules): RulesChecker {
     return $rules;
   }
 
+  /**
+   * Table specific logic to generate a display field.
+   *
+   * @since  COmanage Registry v5.2.0
+   * @param  \PipelineToolkit\Model\Entity\LoginIdentifierType $entity Entity to generate display field for
+   * @return string         Display field
+   */
+  public function generateDisplayField(\PipelineToolkit\Model\Entity\LoginIdentifierType $entity): string {
+    return __d('pipeline_toolkit', 'controller.LoginIdentifierTypes', [1]);
+  }
+
   /**
    * Application Rule to determine if a specific Type is already configured.
    *

app/availableplugins/SqlConnector/src/Model/Table/SqlSourcesTable.php

@@ -248,8 +248,14 @@ protected function getChanges(
    * @param  \SqlConnector\Model\Entity\SqlSource $entity Entity to generate display field for
    * @return string         Display field
    */
-  public function generateDisplayField(\SqlConnector\Model\Entity\SqlSource $entity): string {
-    return __d('sql_connector', 'display.SqlSource', [$entity->external_identity_source->description]);
+  public function generateDisplayField(\SqlConnector\Model\Entity\SqlSource $entity): ?string {
+    // Fail gracefully if the External Identity Source association is not set/loaded
+    if (empty($entity->external_identity_source) || empty($entity->external_identity_source->description)) {
+      return null;
+    }
+
+    $value =  $entity->external_identity_source->description;
+    return __d('sql_connector', 'display.SqlSource', [$value]);
   }
 
 

app/plugins/EnvSource/src/Model/Table/EnvSourcesTable.php

@@ -170,10 +170,15 @@ public function initialize(array $config): void {
    *
    * @since  COmanage Registry v5.2.0
    * @param \EnvSource\Model\Entity\EnvSource $entity Entity to generate display field for
-   * @return string         Display field
+   * @return string|null         Display field
    */
-  public function generateDisplayField(\EnvSource\Model\Entity\EnvSource $entity): string {
-    return __d('env_source', 'display.EnvSource', [$entity->external_identity_source->description]);
+  public function generateDisplayField(\EnvSource\Model\Entity\EnvSource $entity): ?string {
+    // Fail gracefully if the External Identity Source association is not set
+    if (empty($entity->external_identity_source) || empty($entity->external_identity_source->description)) {
+      return null;
+    }
+    $value =  $entity->external_identity_source->description;
+    return __d('env_source', 'display.EnvSource', [$value]);
   }
 
   /**

app/plugins/SshKeyAuthenticator/src/Model/Table/SshKeyAuthenticatorsTable.php

@@ -103,9 +103,14 @@ public function initialize(array $config): void {
    *
    * @since  COmanage Registry v5.2.0
    * @param \SshKeyAuthenticator\Model\Entity\SshKeyAuthenticator $entity Entity to generate display field for
-   * @return string         Display field
+   * @return string|null         Display field
    */
-  public function generateDisplayField(\SshKeyAuthenticator\Model\Entity\SshKeyAuthenticator $entity): string {
+  public function generateDisplayField(\SshKeyAuthenticator\Model\Entity\SshKeyAuthenticator $entity): ?string {
+    // Fail gracefully if the Authenticator is not set
+    if (empty($entity->authenticator) || empty($entity->authenticator->description)) {
+      return null;
+    }
+
     return $entity->authenticator->description;
   }
 

app/resources/locales/en_US/error.po

@@ -412,6 +412,9 @@ msgstr "Type {0} is in use as a default (via CO Settings)"
 msgid "unknown"
 msgstr "Unknown value \"{0}\""
 
+msgid "unresolved.association"
+msgstr "Unable to resolve association"
+
 msgid "unknown.identifier"
 msgstr "Unknown Identifier \"{0}\""
 

app/resources/locales/en_US/information.po

@@ -46,10 +46,10 @@ msgid "cos.select"
 msgstr "Please select the collaboration (CO) you wish to manage."
 
 msgid "cmp.config.notice"
-msgstr "<a href="{0}">Platform-wide configurations</a> are available in the <a href="{1}">COmanage CO</a>."
+msgstr "<a href=\"{0}\">Platform-wide configurations</a> are available in the <a href=\"{1}\">COmanage CO</a>."
 
 msgid "cmp.co.notice"
-msgstr "This is the COmanage CO, which is used for platform wide <a href="{0}">configurations</a>."
+msgstr "This is the COmanage CO, which is used for platform wide <a href=\"{0}\">configurations</a>."
 
 msgid "entity.id"
 msgstr "ID: {0}"
@@ -88,7 +88,7 @@ msgid "ExternalIdentitySourceRecords.metadata"
 msgstr "Metadata"
 
 msgid "ExternalIdentitySourceRecords.view"
-msgstr "This is the latest record from the source as cached by Registry. <a href="{0}" target="_top">Retrieve the current record directly from the source</a>."
+msgstr "This is the latest record from the source as cached by Registry. <a href=\"{0}\" target=\"_top\">Retrieve the current record directly from the source</a>."
 
 msgid "ExternalIdentitySources.search.attrs.none"
 msgstr "The External Identity Source cannot be searched."

app/src/Controller/AppController.php

@@ -36,12 +36,11 @@
 use App\Lib\Util\StringUtilities;
 use Cake\Controller\Controller;
 use Cake\Datasource\Exception\RecordNotFoundException;
-use Cake\Http\Exception\UnauthorizedException;
 use Cake\Event\EventManager;
+use Cake\Http\Exception\UnauthorizedException;
 use Cake\ORM\TableRegistry;
 use Cake\Utility\Hash;
 
-
 /**
  * @property \App\Controller\Component\RegistryAuthComponent $RegistryAuth
  * @property \App\Controller\Component\BreadcrumbComponent $Breadcrumb
@@ -273,17 +272,27 @@ public function getCOID(): ?int {
    */
   public function getCurrentTable(): \Cake\ORM\Table
   {
-    /** @var string $modelsName */
-    $modelsName = $this->getName();
+    return $this->fetchTable($this->getQualifiedName());
+  }
 
-    $alias = $this->getPlugin() !== null
-      ? $this->getPlugin() . '.' . $modelsName
-      : $modelsName;
+  /**
+   * Get the fully-qualified controller/model name with plugin prefix when present.
+   *
+   * Examples:
+   * - Core controller "Users" => "Users"
+   * - Plugin controller "MyPlugin.Users" => "MyPlugin.Users"
+   *
+   * @since COmanage Registry v5.2.0
+   * @return string
+   */
+  public function getQualifiedName(): string
+  {
+    $name = $this->getName();
+    $plugin = $this->getPlugin();
 
-    return $this->fetchTable($alias);
+    return StringUtilities::getQualifiedName($plugin, $name);
   }
 
-
   /**
    * @param   string  $potentialPrimaryLink
    *