From 80ee866700abed563cc5a1e86fdf9b0e53f4327a Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Tue, 27 Oct 2026 16:41:57 -0500
Subject: [PATCH 1/2] Improve Flange UI, and fix incorrect tab links (CFM-523)

---
 .../templates/ApiSources/fields.inc           |   8 +-
 .../Model/Table/IdentifierMappersTable.php    |  13 ++
 .../Model/Table/LoginIdentifierTypesTable.php |  13 ++
 .../Model/Table/PersonRoleMappersTable.php    |  13 ++
 .../Model/Table/PersonRoleMappingsTable.php   |  15 ++-
 .../templates/IdentifierMappers/fields.inc    |  24 ++--
 .../LoginIdentifierTypes/columns.inc          |  10 +-
 .../templates/LoginIdentifierTypes/fields.inc |   2 +
 .../templates/PersonRoleMappers/fields.inc    |  23 ++--
 .../templates/PersonRoleMappings/columns.inc  |  10 +-
 .../templates/PersonRoleMappings/fields.inc   |   2 +
 .../templates/SshKeyAuthenticators/fields.inc |  16 +--
 app/src/Model/Table/FlangesTable.php          |  15 +++
 app/src/View/Helper/TabHelper.php             | 113 ++++++++++++++++--
 app/templates/Flanges/columns.inc             |  14 ++-
 app/templates/Flanges/fields.inc              |   2 +
 app/templates/Pipelines/fields.inc            |  14 +--
 app/templates/Standard/index.php              |   3 +-
 app/templates/Standard/subnavigation.inc      |  29 ++++-
 .../element/subnavigation/supertitle.php      |   8 +-
 .../element/subnavigation/tabList.php         |   2 +-
 app/webroot/css/co-base.css                   |  27 ++---
 22 files changed, 271 insertions(+), 105 deletions(-)

diff --git a/app/availableplugins/ApiConnector/templates/ApiSources/fields.inc b/app/availableplugins/ApiConnector/templates/ApiSources/fields.inc
index e3178098d..b7da8af0b 100644
--- a/app/availableplugins/ApiConnector/templates/ApiSources/fields.inc
+++ b/app/availableplugins/ApiConnector/templates/ApiSources/fields.inc
@@ -25,6 +25,7 @@
  * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
  */
 
+// There are currently no directly configurable fields for this model.
 $alerts = [
   [
     'type' => 'information',
@@ -32,13 +33,6 @@ $alerts = [
   ]
 ];
 
-// XXX Revisit this - what's the "Push Mode" text attempting to convey here (with no other information)?
-$fields = [
-  'SUBTITLE' => [
-    'subtitle' => __d('api_connector', 'field.ApiSources.push_mode')
-  ]
-];
-
 $subnav = [
   'tabs' => ['ExternalIdentitySources', 'ApiConnector.ApiSources', 'ExternalIdentitySources@action.search'],
   'action' => [
diff --git a/app/availableplugins/PipelineToolkit/src/Model/Table/IdentifierMappersTable.php b/app/availableplugins/PipelineToolkit/src/Model/Table/IdentifierMappersTable.php
index bcf15f191..42c34e508 100644
--- a/app/availableplugins/PipelineToolkit/src/Model/Table/IdentifierMappersTable.php
+++ b/app/availableplugins/PipelineToolkit/src/Model/Table/IdentifierMappersTable.php
@@ -41,6 +41,19 @@ class IdentifierMappersTable extends Table {
   use \App\Lib\Traits\TableMetaTrait;
   use \App\Lib\Traits\ValidationTrait;
 
+  /**
+   * Provide the default layout
+   *
+   * @since  COmanage Registry v5.4.0
+   * @return string  Type of redirect
+   */
+  public function getLayout(string $action = ''): string {
+    return match($action) {
+      'index','add','edit','view','deleted' => 'iframe',
+      default => 'default'
+    };
+  }
+  
   /**
    * Perform Cake Model initialization.
    *
diff --git a/app/availableplugins/PipelineToolkit/src/Model/Table/LoginIdentifierTypesTable.php b/app/availableplugins/PipelineToolkit/src/Model/Table/LoginIdentifierTypesTable.php
index 3e72832c7..5d592e1a6 100644
--- a/app/availableplugins/PipelineToolkit/src/Model/Table/LoginIdentifierTypesTable.php
+++ b/app/availableplugins/PipelineToolkit/src/Model/Table/LoginIdentifierTypesTable.php
@@ -43,6 +43,19 @@ class LoginIdentifierTypesTable extends Table {
   use \App\Lib\Traits\TableMetaTrait;
   use \App\Lib\Traits\ValidationTrait;
 
+  /**
+   * Provide the default layout
+   *
+   * @since  COmanage Registry v5.4.0
+   * @return string  Type of redirect
+   */
+  public function getLayout(string $action = ''): string {
+    return match($action) {
+      'index','add','edit','view','deleted' => 'iframe',
+      default => 'default'
+    };
+  }
+  
   /**
    * Perform Cake Model initialization.
    *
diff --git a/app/availableplugins/PipelineToolkit/src/Model/Table/PersonRoleMappersTable.php b/app/availableplugins/PipelineToolkit/src/Model/Table/PersonRoleMappersTable.php
index 437bbefb2..9387ccff4 100644
--- a/app/availableplugins/PipelineToolkit/src/Model/Table/PersonRoleMappersTable.php
+++ b/app/availableplugins/PipelineToolkit/src/Model/Table/PersonRoleMappersTable.php
@@ -41,6 +41,19 @@ class PersonRoleMappersTable extends Table {
   use \App\Lib\Traits\TableMetaTrait;
   use \App\Lib\Traits\ValidationTrait;
 
+  /**
+   * Provide the default layout
+   *
+   * @since  COmanage Registry v5.4.0
+   * @return string  Type of redirect
+   */
+  public function getLayout(string $action = ''): string {
+    return match($action) {
+      'index','add','edit','view','deleted' => 'iframe',
+      default => 'default'
+    };
+  }
+  
   /**
    * Perform Cake Model initialization.
    *
diff --git a/app/availableplugins/PipelineToolkit/src/Model/Table/PersonRoleMappingsTable.php b/app/availableplugins/PipelineToolkit/src/Model/Table/PersonRoleMappingsTable.php
index cd4fd5415..8d0977295 100644
--- a/app/availableplugins/PipelineToolkit/src/Model/Table/PersonRoleMappingsTable.php
+++ b/app/availableplugins/PipelineToolkit/src/Model/Table/PersonRoleMappingsTable.php
@@ -42,7 +42,20 @@ class PersonRoleMappingsTable extends Table {
   use \App\Lib\Traits\PrimaryLinkTrait;
   use \App\Lib\Traits\TableMetaTrait;
   use \App\Lib\Traits\ValidationTrait;
-
+  
+  /**
+   * Provide the default layout
+   *
+   * @since  COmanage Registry v5.4.0
+   * @return string  Type of redirect
+   */
+  public function getLayout(string $action = ''): string {
+    return match($action) {
+      'index','add','edit','view','deleted' => 'iframe',
+      default => 'default'
+    };
+  }
+  
   /**
    * Perform Cake Model initialization.
    *
diff --git a/app/availableplugins/PipelineToolkit/templates/IdentifierMappers/fields.inc b/app/availableplugins/PipelineToolkit/templates/IdentifierMappers/fields.inc
index 403f3f929..b6d9d1700 100644
--- a/app/availableplugins/PipelineToolkit/templates/IdentifierMappers/fields.inc
+++ b/app/availableplugins/PipelineToolkit/templates/IdentifierMappers/fields.inc
@@ -25,20 +25,14 @@
  * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
  */
 
-// There are currently no directly configurable fields for this model.)
-$suppress_submit = true;
-
-// Top Links
-$topLinks[] = [
-  'icon'  => 'transform',
-  'order' => 'Default',
-  'label' => __d('pipeline_toolkit', 'controller.LoginIdentifierTypes', [99]),
-  'link'  => [
-    'plugin'                => 'PipelineToolkit',
-    'controller'            => 'LoginIdentifierTypes',
-    'action'                => 'index',
-    'identifier_mapper_id'  => $vv_obj->id
-  ],
-  'class' => ''
+// There are currently no directly configurable fields for this model.
+$alerts = [
+  [
+    'type' => 'information',
+    'message' => __d('information', 'plugin.config.none')
+  ]
 ];
+
+$subnav = 'flanges';
+
 ?>
diff --git a/app/availableplugins/PipelineToolkit/templates/LoginIdentifierTypes/columns.inc b/app/availableplugins/PipelineToolkit/templates/LoginIdentifierTypes/columns.inc
index f287f169c..aee3bf653 100644
--- a/app/availableplugins/PipelineToolkit/templates/LoginIdentifierTypes/columns.inc
+++ b/app/availableplugins/PipelineToolkit/templates/LoginIdentifierTypes/columns.inc
@@ -39,10 +39,6 @@ $indexColumns = [
   ]
 ];
 
-/*
-// When the $bulkActions variable exists in a columns.inc config, the "Bulk edit" switch will appear in the index. 
-$bulkActions = [
-  // TODO: develop bulk actions. For now, use a placeholder.
-  'delete' => true
-];
-*/
+$inIframe = true;
+
+$subnav = 'flanges';
diff --git a/app/availableplugins/PipelineToolkit/templates/LoginIdentifierTypes/fields.inc b/app/availableplugins/PipelineToolkit/templates/LoginIdentifierTypes/fields.inc
index 69c161ed5..8cf27d5c0 100644
--- a/app/availableplugins/PipelineToolkit/templates/LoginIdentifierTypes/fields.inc
+++ b/app/availableplugins/PipelineToolkit/templates/LoginIdentifierTypes/fields.inc
@@ -29,3 +29,5 @@ $fields = [
   'type_id',
   'login'
 ];
+
+$subnav = 'flanges';
diff --git a/app/availableplugins/PipelineToolkit/templates/PersonRoleMappers/fields.inc b/app/availableplugins/PipelineToolkit/templates/PersonRoleMappers/fields.inc
index 5579fb55a..8257e7411 100644
--- a/app/availableplugins/PipelineToolkit/templates/PersonRoleMappers/fields.inc
+++ b/app/availableplugins/PipelineToolkit/templates/PersonRoleMappers/fields.inc
@@ -25,21 +25,14 @@
  * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
  */
 
-// There are currently no directly configurable fields for this model.)
-$suppress_submit = true;
-
-// Top Links
-$topLinks[] = [
-  'icon'  => 'transform',
-  'order' => 'Default',
-  'label' => __d('pipeline_toolkit', 'controller.PersonRoleMappings', [99]),
-  'link'  => [
-    'plugin'                => 'PipelineToolkit',
-    'controller'            => 'PersonRoleMappings',
-    'action'                => 'index',
-    'person_role_mapper_id' => $vv_obj->id
-  ],
-  'class' => ''
+// There are currently no directly configurable fields for this model.
+$alerts = [
+  [
+    'type' => 'information',
+    'message' => __d('information', 'plugin.config.none')
+  ]
 ];
 
+$subnav = 'flanges';
+
 ?>
diff --git a/app/availableplugins/PipelineToolkit/templates/PersonRoleMappings/columns.inc b/app/availableplugins/PipelineToolkit/templates/PersonRoleMappings/columns.inc
index 8b442abea..65c1d7197 100644
--- a/app/availableplugins/PipelineToolkit/templates/PersonRoleMappings/columns.inc
+++ b/app/availableplugins/PipelineToolkit/templates/PersonRoleMappings/columns.inc
@@ -45,10 +45,6 @@ $indexColumns = [
   ]
 ];
 
-/*
-// When the $bulkActions variable exists in a columns.inc config, the "Bulk edit" switch will appear in the index. 
-$bulkActions = [
-  // TODO: develop bulk actions. For now, use a placeholder.
-  'delete' => true
-];
-*/
+$inIframe = true;
+
+$subnav = 'flanges';
diff --git a/app/availableplugins/PipelineToolkit/templates/PersonRoleMappings/fields.inc b/app/availableplugins/PipelineToolkit/templates/PersonRoleMappings/fields.inc
index 5ad27c9d3..395117e59 100644
--- a/app/availableplugins/PipelineToolkit/templates/PersonRoleMappings/fields.inc
+++ b/app/availableplugins/PipelineToolkit/templates/PersonRoleMappings/fields.inc
@@ -38,6 +38,8 @@ $fields = [
   'ordr'
 ];
 
+$subnav = 'flanges';
+
 ?>
 
 <script nonce="<?= $vv_js_nonce ?>">
diff --git a/app/plugins/SshKeyAuthenticator/templates/SshKeyAuthenticators/fields.inc b/app/plugins/SshKeyAuthenticator/templates/SshKeyAuthenticators/fields.inc
index e22c09e37..5958e729d 100644
--- a/app/plugins/SshKeyAuthenticator/templates/SshKeyAuthenticators/fields.inc
+++ b/app/plugins/SshKeyAuthenticator/templates/SshKeyAuthenticators/fields.inc
@@ -27,6 +27,14 @@
 
 declare(strict_types = 1);
 
+// There are currently no directly configurable fields for this model.
+$alerts = [
+  [
+    'type' => 'information',
+    'message' => __d('information', 'plugin.config.none')
+  ]
+];
+
 $this->Field->disableFormEditMode();
 
 $subnav = [
@@ -35,12 +43,4 @@ $subnav = [
     'Authenticators' => ['edit'],
     'SshKeyAuthenticator.SshKeyAuthenticators' => ['edit']
   ]
-];
-
-// There are currently no configurable options for the SSH Key Authenticator
-$alerts = [
-  [
-    'type' => 'information',
-    'message' => __d('information', 'plugin.config.none')
-  ]
 ];
\ No newline at end of file
diff --git a/app/src/Model/Table/FlangesTable.php b/app/src/Model/Table/FlangesTable.php
index aa0967dca..9eb164a3a 100644
--- a/app/src/Model/Table/FlangesTable.php
+++ b/app/src/Model/Table/FlangesTable.php
@@ -45,6 +45,19 @@ class FlangesTable extends Table {
   use \App\Lib\Traits\PrimaryLinkTrait;
   use \App\Lib\Traits\TableMetaTrait;
   use \App\Lib\Traits\ValidationTrait;
+
+  /**
+   * Provide the default layout
+   *
+   * @since  COmanage Registry v5.4.0
+   * @return string  Type of redirect
+   */
+  public function getLayout(string $action = ''): string {
+    return match($action) {
+      'add','edit','view','deleted' => 'iframe',
+      default => 'default'
+    };
+  }
   
   /**
    * Perform Cake Model initialization.
@@ -71,6 +84,8 @@ public function initialize(array $config): void {
     
     $this->setPrimaryLink('pipeline_id');
     $this->setRequiresCO(true);
+    $this->setRedirectGoal('self');
+    $this->setRedirectGoal(action: 'delete', goal: 'deleted');
 
     $this->setAutoViewVars([
       'plugins' => [
diff --git a/app/src/View/Helper/TabHelper.php b/app/src/View/Helper/TabHelper.php
index 493a967be..666054075 100644
--- a/app/src/View/Helper/TabHelper.php
+++ b/app/src/View/Helper/TabHelper.php
@@ -75,10 +75,28 @@ public function constructLinkUrl(string $tab, string|int $curId, bool $isNested
 
     // Controller + Plugin calculation
     if(str_ends_with($tab, '.Plugin')) {
-      // This is always the second tab of the plugin and it is configuration
-      $controller = $curController;
-      $plugin = $this->getView()->getPlugin();
-      $plugin = !empty($plugin) ? $plugin : null;
+      // This is always the second tab of a plugin model and it is configuration.
+      // The core model is everything before the trailing ".Plugin"
+      $coreModel = substr($tab, 0, strrpos($tab, '.'));
+      $request = $this->getView()->getRequest();
+      $requesterModel = StringUtilities::getQualifiedName($request->getParam('plugin'), $curController);
+      $pluginModel = $this->retrievePluginName($tab, (int)$curId, $requesterModel);
+
+      if ($requesterModel === $coreModel || $requesterModel === $pluginModel) {
+        // We are on the core model or on the plugin's own model: existing behavior
+        $controller = $curController;
+        $plugin = $this->getView()->getPlugin();
+        $plugin = !empty($plugin) ? $plugin : null;
+      } else {
+        // We are on a descendant page (e.g. a plugin child model's add/edit/index).
+        // Route through the core model's configure action instead of the current controller.
+        if (str_contains($coreModel, '.')) {
+          [$plugin, $controller] = explode('.', $coreModel, 2);
+        } else {
+          $plugin = null;
+          $controller = $coreModel;
+        }
+      }
       $action = 'configure';
     } else if (str_ends_with($tab, '.Hierarchy')) {
       $modelName = $this->retrievePluginName($tab, (int)$curId);
@@ -226,7 +244,7 @@ public function getDeepNestedId(array $linkFilter, ?string $linkFilterModel = nu
    * @return string
    * @since  COmanage Registry v5.0.0
    */
-  public function getLinkClass(string $tab, bool $isNested = false, array $nestings = []): string
+  public function getLinkClass(string $tab, bool $isNested = false, array $nestings = [], ?int $curId = null): string
   {
     $vv_sub_nav_attributes = $this->getView()->get('vv_sub_nav_attributes');
 
@@ -242,6 +260,30 @@ public function getLinkClass(string $tab, bool $isNested = false, array $nesting
     // that will be set as active
     $parentModelForNested = $vv_sub_nav_attributes['nested']['tabs'][0] ?? 0;
 
+    // Is this the plugin's configuration page? Either an explicit configure action,
+    // or the plugin model's own edit/view page (where core configure redirects to).
+    $pluginConfigActive = false;
+    if (str_ends_with($tab, '.Plugin')) {
+      if ($curAction === 'configure') {
+        $pluginConfigActive = isset($plugin)
+          || $fullModelName === substr($tab, 0, strrpos($tab, '.'));
+      } elseif ($curId !== null && \in_array($curAction, ['edit', 'view'], true)) {
+        $pluginConfigActive = $this->retrievePluginName($tab, $curId, $fullModelName) === $fullModelName;
+      }
+    }
+
+    // Keep the Hierarchy tab active on its index and on its child add/edit/view pages
+    $hierarchyActive = false;
+    if (str_ends_with($tab, '.Hierarchy')) {
+      if ($curId !== null) {
+        $hierarchyActive = \in_array($curAction, ['index', 'add', 'edit', 'view'], true)
+          && $this->getHierarchyModel($tab, $curId, $fullModelName) === $fullModelName;
+      } else {
+        // Legacy behavior for callers that don't pass an ID
+        $hierarchyActive = isset($plugin) && $curAction === 'index';
+      }
+    }
+
     // Calculate Tab Style Class(es)
     return match(true) {
       // Matches the tab to the current controller. It addresses the simple subnavigation
@@ -250,8 +292,8 @@ public function getLinkClass(string $tab, bool $isNested = false, array $nesting
       // Always mark active the parent Tab
       !$isNested && $parentModelForNested !== null && $tab === $parentModelForNested && in_array($fullModelName, $nestings),
       // Match Configuration and Hierarchy tabs
-      isset($plugin) && str_contains($tab, '.Plugin') && $curAction === 'configure',
-      isset($plugin) && str_contains($tab, '.Hierarchy') && $curAction === 'index',
+      $pluginConfigActive,
+      $hierarchyActive,
       // Matches the action tab links, e.g. FileSource/search
       $tab === "{$curController}@action.{$curAction}" => 'nav-link active',
       default => 'nav-link'
@@ -376,6 +418,24 @@ public function getHasManyAssociationModels(string $modelName): \Generator
     }
   }
 
+  /**
+   * Resolve the model a .Hierarchy tab points to: the first hasMany/hasOne
+   * association of the plugin model stored on the core record.
+   *
+   * @param string $tab    e.g. "Flanges.Hierarchy"
+   * @param int    $curId  ID of the core record (e.g. the Flange)
+   * @param string|null $requesterModel
+   * @return string|null   e.g. "PipelineToolkit.SomeChildModel", or null if none
+   */
+  public function getHierarchyModel(string $tab, int $curId, ?string $requesterModel = null): ?string
+  {
+    $pluginModel = $this->retrievePluginName($tab, $curId, $requesterModel);
+    if(empty($pluginModel)) {
+      return null;
+    }
+    // current() primes the generator and returns its first yield (null if no associations)
+    return $this->getHasManyAssociationModels($pluginModel)->current();
+  }
 
   /**
    * Check if a specified model supports the 'view' functionality.
@@ -684,6 +744,45 @@ public function getPersonPrimaryName(int $personId): string
     return $response?->full_name;
   }
 
+  /**
+   * Get the display value (the title) of the subnavigation's root record (the first tab's model),
+   * resolved from the current object or, when there is none, from the primary link query param.
+   *
+   * @return string|null
+   * @since  COmanage Registry v5.x
+   */
+  public function getRootModelTitle(): ?string
+  {
+    $attrs = $this->getView()->get('vv_sub_nav_attributes');
+    $rootTab = $attrs['tabs'][0] ?? null;
+    $rootModel = is_array($rootTab) ? ($rootTab['tabModel'] ?? null) : $rootTab;
+    if (empty($rootModel)) {
+      return null;
+    }
+
+    $request = $this->getView()->getRequest();
+    $curModel = StringUtilities::getQualifiedName($request->getParam('plugin'), $request->getParam('controller'));
+    $vv_obj = $this->getView()->get('vv_obj');
+    $primaryLink = $this->getView()->get('vv_primary_link');
+
+    $results = [];
+    if (!empty($vv_obj?->id)) {
+      TableUtilities::treeTraversalFromId($curModel, (int)$vv_obj->id, $results);
+    } elseif (!empty($primaryLink) && $request->getQuery($primaryLink) !== null) {
+      TableUtilities::treeTraversalFromPrimaryLink($primaryLink, (int)$request->getQuery($primaryLink), $results, null, $curModel);
+    }
+
+    $rootId = $results[$rootModel] ?? null;
+    if (empty($rootId)) {
+      return null;
+    }
+
+    $table = TableRegistry::getTableLocator()->get($rootModel);
+    $entity = $table->find()->where(['id' => (int)$rootId])->first();
+
+    return $entity?->get($table->getDisplayField());
+  }
+
   /**
    * @return string|null
    * @since  COmanage Registry v5.0.0
diff --git a/app/templates/Flanges/columns.inc b/app/templates/Flanges/columns.inc
index 85e235f55..d90d36084 100644
--- a/app/templates/Flanges/columns.inc
+++ b/app/templates/Flanges/columns.inc
@@ -28,7 +28,11 @@
 $indexColumns = [
   'description' => [
     'type' => 'link',
-    'sortable' => true
+    'sortable' => true,
+    'class' => 'cm-modal-link nospin', // launch this in a modal
+    'dataAttrs' => [
+      ['data-cm-modal-title', __d('controller', 'Flanges', 1)]
+    ]
   ],
   'plugin' => [
     'type' => 'echo',
@@ -45,11 +49,17 @@ $indexColumns = [
   ]
 ];
 
+$subnav = 'pipelines';
+
 // $rowActions appear as row-level menu items in the index view gear icon
 $rowActions = [
   [
     'action'  => 'configure',
     'label'   => __d('operation', 'configure.plugin'),
-    'icon'    => 'electrical_services'
+    'icon'    => 'electrical_services',
+    'class' => 'cm-modal-link nospin', // launch this in a modal
+    'dataAttrs' => [
+      ['data-cm-modal-title', __d('controller', 'Flanges', 1)]
+    ]
   ]
 ];
diff --git a/app/templates/Flanges/fields.inc b/app/templates/Flanges/fields.inc
index 015913472..364d305f3 100644
--- a/app/templates/Flanges/fields.inc
+++ b/app/templates/Flanges/fields.inc
@@ -31,3 +31,5 @@ $fields = [
   'plugin',
   'ordr'
 ];
+
+$subnav = 'flanges';
diff --git a/app/templates/Pipelines/fields.inc b/app/templates/Pipelines/fields.inc
index 0e172f8e3..ef036d600 100644
--- a/app/templates/Pipelines/fields.inc
+++ b/app/templates/Pipelines/fields.inc
@@ -44,18 +44,8 @@ $fields = [
   // XXX Connections
 ];
 
-// Top Links
-$topLinks[] = [
-  'icon'  => 'nest_thermostat_gen_3',
-  'order' => 'Default',
-  'label' => __d('controller', 'Flanges', [99]),
-  'link'  => [
-    'controller'  => 'flanges',
-    'action'      => 'index',
-    'pipeline_id'      => $vv_obj->id
-  ],
-  'class' => ''
-];
+$subnav = 'pipelines';
+
 ?>
 
 <script nonce="<?= $vv_js_nonce ?>">
diff --git a/app/templates/Standard/index.php b/app/templates/Standard/index.php
index cd6512cf3..ac35de67c 100644
--- a/app/templates/Standard/index.php
+++ b/app/templates/Standard/index.php
@@ -135,7 +135,8 @@
       ];
 
       // Check to see if the model names a specific layout
-      if(method_exists($modelsTable, 'getLayout')) {
+      // XXX This currently assumes that only the iframe layout will be named.
+      if(!isset($inIframe) && method_exists($modelsTable, 'getLayout')) {
         $action_configuration['class'] = 'cm-modal-link nospin'; // launch this in a modal
         $modalTitle = '';
         if(!empty($supertitle)) {
diff --git a/app/templates/Standard/subnavigation.inc b/app/templates/Standard/subnavigation.inc
index c9d5871af..980cb311c 100644
--- a/app/templates/Standard/subnavigation.inc
+++ b/app/templates/Standard/subnavigation.inc
@@ -152,6 +152,25 @@ $subnavConfig = [
       'ExternalIdentitySources@action.search' => [],
     ],
   ],
+  
+  // FLANGES
+  'flanges' => [
+    'tabs' => ['Flanges','Flanges.Plugin','Flanges.Hierarchy'],
+    'action' => [
+      'Flanges' => ['edit', 'view'],
+      'Flanges.Plugin' => ['edit'],
+      'Flanges.Hierarchy' => ['index'],
+    ],
+  ],
+  
+  // PIPELINES
+  'pipelines' => [
+    'tabs' => ['Pipelines', 'Flanges'],
+    'action' => [
+      'Pipelines' => ['edit', 'view'],
+      'Flanges' => ['index','edit'],
+    ],
+  ],
 ];
 
 // Do not render subnavigation if $subnav is empty or if we have no configuration array. 
@@ -179,8 +198,14 @@ if(!empty($subnav) && (is_array($subnav) || (is_string($subnav) && !empty($subna
       && in_array($vv_action, $tabsConfiguration['nested']['action'][$fullModelsName], true)
     )
     ||
-    ( // Special case enrollment flow steps
-      $subnav = 'steps'
+    ( // Special case enrollment flow steps and tabs from x.Hierarchy
+      $subnav === 'steps' 
+      || !empty(
+        array_filter(
+          $tabsConfiguration['tabs'], 
+          fn($t) => is_string($t) && str_ends_with($t, '.Hierarchy')
+        )
+      )
     )
   ) {
     print $this->element('subnavigation/navBar', ['subNavAttributes' => $tabsConfiguration]);
diff --git a/app/templates/element/subnavigation/supertitle.php b/app/templates/element/subnavigation/supertitle.php
index f08d75591..d81f85439 100644
--- a/app/templates/element/subnavigation/supertitle.php
+++ b/app/templates/element/subnavigation/supertitle.php
@@ -62,13 +62,13 @@
 if (
   (!empty($vv_obj) || !empty($$objectName))
   && !empty($this->getPlugin())
-  && $vv_subnavigation_tabs[0] !== $vv_bc_parent_obj->getSource()
+  && $vv_subnavigation_tabs[0] !== $vv_bc_parent_obj?->getSource()
 ) {
   $object = $vv_obj ?? $$objectName?->items()?->first();
   if ($object === null) {
-    // This is a deep nested association that has not been initialized yet. The controller name
-    // will become the supertitle
-    $vv_subnavigation_tabsSupertitle = Inflector::humanize($vv_controller);
+    // Deep nested association that has not been initialized (there is no object yet).
+    // Resolve the root record via the primary link; fall back to the controller name.
+    $vv_subnavigation_tabsSupertitle = $this->Tab->getRootModelTitle() ?? Inflector::humanize($vv_controller);
   } else {
     // If we get here, it means that neither the request object nor its parent can give us a supertitle.
     // We need to fetch all the ids and get the supertitle from the root tab/node
diff --git a/app/templates/element/subnavigation/tabList.php b/app/templates/element/subnavigation/tabList.php
index 0bc9c8023..d0409cc79 100644
--- a/app/templates/element/subnavigation/tabList.php
+++ b/app/templates/element/subnavigation/tabList.php
@@ -66,7 +66,7 @@
     // Construct Target URL
     $url = $this->Tab->constructLinkUrl($tab, $curId, $isNested);
     // Calculate Tab Style Class(es)
-    $linkClass = $this->Tab->getLinkClass($tab, $isNested, $nestings);
+    $linkClass = $this->Tab->getLinkClass($tab, $isNested, $nestings, (int)$curId);
     // Import <a> element in the DOM
     print $this->Html->link($title, $url, ['class' => $linkClass, 'escape' => false]);
     ?>
diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css
index 214ff1294..a5807a905 100644
--- a/app/webroot/css/co-base.css
+++ b/app/webroot/css/co-base.css
@@ -104,7 +104,7 @@ a {
   position: relative;
   background-color: var(--cmg-color-btn-bg-001);
   color: var(--cmg-color-txt-inverse);
-  padding: 0 1em 0.25em ;
+  padding: 0 1em 0.25em;
   border-bottom-left-radius: 10px;
   border-bottom-right-radius: 10px;
   border-color: var(--cmg-color-btn-bg-001);
@@ -181,7 +181,7 @@ body.cos.select #top-bar {
   margin-right: -8px;
 }
 #top-controls {
-  display: flex; 
+  display: flex;
   flex: 1;
 }
 /* Mobile menu icon */
@@ -338,7 +338,7 @@ body.cos.select #top-bar {
 #user-panel-id {
   margin: 0.25em 0;
   max-width: 60vw;
-  word-wrap:break-word;
+  word-wrap: break-word;
 }
 #user-panel-user-info {
   padding: 1em;
@@ -472,7 +472,7 @@ body.cos.select #top-bar {
 .co-alert.alert-information {
   background-color: var(--cmg-color-highlight-004);
   color: var(--cmg-color-highlight-003);
-  border-color:  var(--cmg-color-highlight-017);
+  border-color: var(--cmg-color-highlight-017);
 }
 .co-alert .alert-icon {
   margin-right: 0.1rem;
@@ -548,7 +548,7 @@ ul.form-list li.alert-banner .co-alert {
   text-decoration: none;
   color: var(--cmg-color-body-txt);
   position: relative;
-  overflow:hidden;
+  overflow: hidden;
   width: 100%;
 }
 #main-menu > li a:hover,
@@ -1820,7 +1820,7 @@ html.dark-mode .form-check-input:checked {
   display: inline;
   margin: 0;
 }
-.form-check-input:disabled ~ .form-check-label, 
+.form-check-input:disabled ~ .form-check-label,
 .form-check-input[disabled] ~ .form-check-label {
   opacity: 0.65; /* adjust Bootstrapism for accessibility */
 }
@@ -2015,8 +2015,8 @@ ul.form-list .cm-time-picker-vals li {
   margin-left: 1em;
 }
 .cm-autocomplete-panel .disabled {
-  pointer-events:none;
-  opacity:0.65;
+  pointer-events: none;
+  opacity: 0.65;
   box-shadow: inset 0 0 0.2em var(--cmg-color-highlight-007);
 }
 input.cm-autocomplete {
@@ -2225,7 +2225,7 @@ body.dispatch .submit-extra {
   font-size: 1.1em;
 }
 #dispatch-list-container ul.fields li.fields-accepted .field,
-#dispatch-list-container ul.fields li.fields-approved .field  {
+#dispatch-list-container ul.fields li.fields-approved .field {
   background-color: var(--cmg-color-bg-001);
   border: 1px solid var(--cmg-color-bg-006);
   padding: 1em 1.5em 1.5em;
@@ -2240,7 +2240,7 @@ body.dispatch .submit-extra {
   border-color: var(--cmg-color-highlight-017);
   border-bottom: none;
 }
-#dispatch-list-container ul.fields li.fields-approved .field  {
+#dispatch-list-container ul.fields li.fields-approved .field {
   border-bottom: none;
 }
 #dispatch-list-container ul.fields li.fields-accepted .field-info label,
@@ -2333,11 +2333,6 @@ td .co-dialog {
   width: 100%;
   height: 100%;
 }
-#comanage-iframe-wrapper #subnavigation .supertitle-container,
-#comanage-iframe-wrapper #subnavigation #cm-person-subnav-tabs,
-#comanage-iframe-wrapper #subnavigation #cm-person-subnav-links {
-  display: none;
-}
 #comanage-iframe-wrapper #content {
   padding: 1rem 2em 0;
 }
@@ -3136,7 +3131,7 @@ html.density-large .field-data {
   border-radius: 0;
   border: 1px solid var(--cmg-color-bg-005)
 }
-#changelog .accordion-body, 
+#changelog .accordion-body,
 #changelog .accordion-body ul {
   margin: 0;
   padding: 0;

From cef5fd7f1c421551c65d745cd16c928baa42805f Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Tue, 27 Oct 2026 16:56:01 -0500
Subject: [PATCH 2/2] Add a flag for displaying the "no configuration" message
 (CFM-523)

---
 .../ApiConnector/templates/ApiSources/fields.inc       |  7 +------
 .../templates/IdentifierMappers/fields.inc             |  7 +------
 .../templates/PersonRoleMappers/fields.inc             |  7 +------
 .../templates/SshKeyAuthenticators/fields.inc          |  7 +------
 app/templates/Standard/add-edit-view.php               | 10 ++++++++++
 5 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/app/availableplugins/ApiConnector/templates/ApiSources/fields.inc b/app/availableplugins/ApiConnector/templates/ApiSources/fields.inc
index b7da8af0b..1df48194a 100644
--- a/app/availableplugins/ApiConnector/templates/ApiSources/fields.inc
+++ b/app/availableplugins/ApiConnector/templates/ApiSources/fields.inc
@@ -26,12 +26,7 @@
  */
 
 // There are currently no directly configurable fields for this model.
-$alerts = [
-  [
-    'type' => 'information',
-    'message' => __d('information', 'plugin.config.none')
-  ]
-];
+$showNoConfigMessage = true;
 
 $subnav = [
   'tabs' => ['ExternalIdentitySources', 'ApiConnector.ApiSources', 'ExternalIdentitySources@action.search'],
diff --git a/app/availableplugins/PipelineToolkit/templates/IdentifierMappers/fields.inc b/app/availableplugins/PipelineToolkit/templates/IdentifierMappers/fields.inc
index b6d9d1700..85c05b844 100644
--- a/app/availableplugins/PipelineToolkit/templates/IdentifierMappers/fields.inc
+++ b/app/availableplugins/PipelineToolkit/templates/IdentifierMappers/fields.inc
@@ -26,12 +26,7 @@
  */
 
 // There are currently no directly configurable fields for this model.
-$alerts = [
-  [
-    'type' => 'information',
-    'message' => __d('information', 'plugin.config.none')
-  ]
-];
+$showNoConfigMessage = true;
 
 $subnav = 'flanges';
 
diff --git a/app/availableplugins/PipelineToolkit/templates/PersonRoleMappers/fields.inc b/app/availableplugins/PipelineToolkit/templates/PersonRoleMappers/fields.inc
index 8257e7411..5142b3d0f 100644
--- a/app/availableplugins/PipelineToolkit/templates/PersonRoleMappers/fields.inc
+++ b/app/availableplugins/PipelineToolkit/templates/PersonRoleMappers/fields.inc
@@ -26,12 +26,7 @@
  */
 
 // There are currently no directly configurable fields for this model.
-$alerts = [
-  [
-    'type' => 'information',
-    'message' => __d('information', 'plugin.config.none')
-  ]
-];
+$showNoConfigMessage = true;
 
 $subnav = 'flanges';
 
diff --git a/app/plugins/SshKeyAuthenticator/templates/SshKeyAuthenticators/fields.inc b/app/plugins/SshKeyAuthenticator/templates/SshKeyAuthenticators/fields.inc
index 5958e729d..92921d601 100644
--- a/app/plugins/SshKeyAuthenticator/templates/SshKeyAuthenticators/fields.inc
+++ b/app/plugins/SshKeyAuthenticator/templates/SshKeyAuthenticators/fields.inc
@@ -28,12 +28,7 @@
 declare(strict_types = 1);
 
 // There are currently no directly configurable fields for this model.
-$alerts = [
-  [
-    'type' => 'information',
-    'message' => __d('information', 'plugin.config.none')
-  ]
-];
+$showNoConfigMessage = true;
 
 $this->Field->disableFormEditMode();
 
diff --git a/app/templates/Standard/add-edit-view.php b/app/templates/Standard/add-edit-view.php
index 0f197e01c..3d51b9649 100644
--- a/app/templates/Standard/add-edit-view.php
+++ b/app/templates/Standard/add-edit-view.php
@@ -71,6 +71,16 @@
   ];
 }
 
+// The view has signaled that it has no configuration, so show a message.
+// We do not always want to show this message simply when $fields is empty,
+// so we look for the specific flag.  
+if(!empty($showNoConfigMessage)) {
+  $alertMessages[] = [
+    'type' => 'information',
+    'message' => __d('information', 'plugin.config.none')
+  ]; 
+}
+
 // Include any configured messages from the $alerts array in the fields file
 $alertMessages = array_merge($alertMessages, $alerts ?? []);