Improve Flange UI, and fix incorrect tab links (CFM-523)

app/availableplugins/ApiConnector/templates/ApiSources/fields.inc

@@ -25,19 +25,8 @@
  * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
  */
 
-$alerts = [
-  [
-    'type' => 'information',
-    'message' => __d('information', 'plugin.config.none')
-  ]
-];
-
-// 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')
-  ]
-];
+// There are currently no directly configurable fields for this model.
+$showNoConfigMessage = true;
 
 $subnav = [
   'tabs' => ['ExternalIdentitySources', 'ApiConnector.ApiSources', 'ExternalIdentitySources@action.search'],

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.
    *

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.
    *

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.
    *

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.
    *

app/availableplugins/PipelineToolkit/templates/IdentifierMappers/fields.inc

@@ -25,20 +25,9 @@
  * @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;
+// There are currently no directly configurable fields for this model.
+$showNoConfigMessage = true;
+
+$subnav = 'flanges';
 
-// 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' => ''
-];
 ?>

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';

app/availableplugins/PipelineToolkit/templates/LoginIdentifierTypes/fields.inc

@@ -29,3 +29,5 @@ $fields = [
   'type_id',
   'login'
 ];
+
+$subnav = 'flanges';

app/availableplugins/PipelineToolkit/templates/PersonRoleMappers/fields.inc

@@ -25,21 +25,9 @@
  * @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;
+// There are currently no directly configurable fields for this model.
+$showNoConfigMessage = 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' => ''
-];
+$subnav = 'flanges';
 
 ?>

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';

app/availableplugins/PipelineToolkit/templates/PersonRoleMappings/fields.inc

@@ -38,6 +38,8 @@ $fields = [
   'ordr'
 ];
 
+$subnav = 'flanges';
+
 ?>
 
 <script nonce="<?= $vv_js_nonce ?>">

app/plugins/SshKeyAuthenticator/templates/SshKeyAuthenticators/fields.inc

@@ -27,6 +27,9 @@
 
 declare(strict_types = 1);
 
+// There are currently no directly configurable fields for this model.
+$showNoConfigMessage = true;
+
 $this->Field->disableFormEditMode();
 
 $subnav = [
@@ -35,12 +38,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')
-  ]
 ];

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' => [