Cleanup to subnavigation and titling (CFM-31) (#229)

* Cleanup to subnavigation and titling (CFM-31) * Trivial cleanup (CFM-31) * More trivial cleanup (CFM-31) * Even more trivial cleanup (CFM-31)
COmanage · Oct 2, 2024 · d206890 · d206890
1 parent f064512
commit d206890
Show file tree

Hide file tree

Showing 14 changed files with 36 additions and 22 deletions.
diff --git a/app/plugins/CoreEnroller/src/Model/Table/AttributeCollectorsTable.php b/app/plugins/CoreEnroller/src/Model/Table/AttributeCollectorsTable.php
@@ -40,6 +40,7 @@
 class AttributeCollectorsTable extends Table {
   use \App\Lib\Traits\AutoViewVarsTrait;
   use \App\Lib\Traits\CoLinkTrait;
+  use \App\Lib\Traits\LayoutTrait;
   use \App\Lib\Traits\PermissionsTrait;
   use \App\Lib\Traits\PrimaryLinkTrait;
   use \App\Lib\Traits\TabTrait;

diff --git a/app/plugins/CoreEnroller/src/Model/Table/EnrollmentAttributesTable.php b/app/plugins/CoreEnroller/src/Model/Table/EnrollmentAttributesTable.php
@@ -47,7 +47,7 @@ class EnrollmentAttributesTable extends Table {
   use \App\Lib\Traits\TableMetaTrait;
   use \App\Lib\Traits\ValidationTrait;
   use \App\Lib\Traits\TabTrait;
-
+  
   /**
    * Perform Cake Model initialization.
    *
@@ -77,8 +77,8 @@ public function initialize(array $config): void {
 
     $this->setPrimaryLink('CoreEnroller.attribute_collector_id');
     $this->setRequiresCO(true);
-    $this->setRedirectGoal(action: 'add', goal: 'self');
-    $this->setRedirectGoal(action: 'edit', goal: 'self');
+    $this->setRedirectGoal(action: 'add', goal: 'index');
+    $this->setRedirectGoal(action: 'edit', goal: 'index');
 
     $this->setAutoViewVars([
       'addressRequiredFields' => [

diff --git a/app/plugins/CoreEnroller/templates/AttributeCollectors/fields.inc b/app/plugins/CoreEnroller/templates/AttributeCollectors/fields.inc
@@ -31,3 +31,5 @@ declare(strict_types = 1);
 
 $this->Field->disableFormEditMode();
 
+print __d('information', 'plugin.config.none');
+
diff --git a/app/plugins/CoreEnroller/templates/EnrollmentAttributes/columns.inc b/app/plugins/CoreEnroller/templates/EnrollmentAttributes/columns.inc
@@ -33,7 +33,6 @@ $indexColumns = [
   'label' => [
     'type' => 'link',
     'sortable' => true,
-    'class' => 'cm-modal-link nospin', // launch this in a modal
     'dataAttrs' => [
       ['data-cm-modal-title', __d('operation', 'EnrollmentAttributes', 1)]
     ]
@@ -89,7 +88,7 @@ $action_args = array();
 // and we will use the username instead.
 $action_args['vv_attr_id'] = $vv_user['username'];
 $action_args['vv_actions_type'] = 'mvea-add-menu';
-$action_args['vv_actions_title'] = __d('operation', 'add');
+$action_args['vv_actions_title'] = __d('operation', 'add.attribute');
 $action_args['vv_actions_icon'] = 'add_circle';
 $action_args['vv_actions_class'] = 'mvea-add-menu';
 $actionOrderDefault = $this->Menu->getMenuOrder('Default');

diff --git a/app/resources/locales/en_US/information.po b/app/resources/locales/en_US/information.po
@@ -111,6 +111,9 @@ msgstr "Active"
 msgid "plugin.active.only"
 msgstr "Active, Cannot Be Disabled"
 
+msgid "plugin.config.none"
+msgstr "This plugin requires no configuration."
+
 msgid "plugin.inactive"
 msgstr "Inactive"
 

diff --git a/app/resources/locales/en_US/operation.po b/app/resources/locales/en_US/operation.po
@@ -36,6 +36,9 @@ msgstr "Add"
 msgid "add.a"
 msgstr "Add a New {0}"
 
+msgid "add.attribute"
+msgstr "Add attribute"
+
 msgid "add.member"
 msgstr "Add member: "
 

diff --git a/app/src/Model/Table/EnrollmentFlowStepsTable.php b/app/src/Model/Table/EnrollmentFlowStepsTable.php
@@ -41,13 +41,14 @@ class EnrollmentFlowStepsTable extends Table {
   use \App\Lib\Traits\AutoViewVarsTrait;
   use \App\Lib\Traits\ChangelogBehaviorTrait;
   use \App\Lib\Traits\CoLinkTrait;
+  use \App\Lib\Traits\LayoutTrait;
   use \App\Lib\Traits\PermissionsTrait;
   use \App\Lib\Traits\PluggableModelTrait;
   use \App\Lib\Traits\PrimaryLinkTrait;
   use \App\Lib\Traits\TabTrait;
   use \App\Lib\Traits\TableMetaTrait;
   use \App\Lib\Traits\ValidationTrait;
-
+    
   /**
    * Perform Cake Model initialization.
    *

diff --git a/app/src/Model/Table/ExternalIdentityRolesTable.php b/app/src/Model/Table/ExternalIdentityRolesTable.php
@@ -144,7 +144,7 @@ public function initialize(array $config): void {
             // render in index mode for the same use case/context
             // XXX edit should go first.
             'ExternalIdentities' => ['edit', 'view'],
-            'ExternalIdentityRoles' => ['index'],
+            'ExternalIdentityRoles' => ['edit', 'view', 'index'],
           ],
           // What model will have a counter-badge after the tab title
           'counter' => ['ExternalIdentityRoles'],

diff --git a/app/src/Model/Table/PersonRolesTable.php b/app/src/Model/Table/PersonRolesTable.php
@@ -175,7 +175,7 @@ public function initialize(array $config): void {
           // render in index mode for the same use case/context
           // XXX edit should go first.
           'People' => ['edit', 'view'],
-          'PersonRoles' => ['edit', 'view', 'index'],
+          'PersonRoles' => ['edit','view','index'],
           'ExternalIdentities' => ['index'],
         ],
         // What model will have a counter-badge after the tab title

diff --git a/app/src/Model/Table/PetitionsTable.php b/app/src/Model/Table/PetitionsTable.php
@@ -168,7 +168,7 @@ public function initialize(array $config): void {
       [
         // Ordered list of Tabs
         'tabs' => ['EnrollmentFlows', 'EnrollmentFlowSteps', 'Petitions'],
-        // What actions will inlcude the subnavigation header
+        // What actions will include the subnavigation header
         'action' => [
           // If a model renders in a subnavigation mode in edit/view mode, it cannot
           // render in index mode for the same use case/context

diff --git a/app/templates/EnrollmentFlowSteps/columns.inc b/app/templates/EnrollmentFlowSteps/columns.inc
@@ -32,7 +32,11 @@ $indexColumns = [
   ],
   'description' => [
     'type' => 'link',
-    'sortable' => true
+    'sortable' => true,
+    'class' => 'cm-modal-link nospin row-link', // launch this in a modal
+    'dataAttrs' => [
+      ['data-cm-modal-title', __d('controller', 'EnrollmentFlowSteps', 1)]
+    ]
   ],
   'actor_type' => [
     'type' => 'enum',
@@ -57,8 +61,3 @@ $rowActions = [
     'icon'    => 'electrical_services'
   ]
 ];
-
-$subnav = [
-  'name' => 'enrollment_flow',
-  'active' => 'steps'
-];
diff --git a/app/templates/Standard/add-edit-view.php b/app/templates/Standard/add-edit-view.php
@@ -66,14 +66,16 @@
 }
 
 // Subnavigation
+$hasSubnav = false;
 if(file_exists(ROOT . DS . 'templates' . DS . 'Standard/subnavigation.inc')) {
   include(ROOT . DS . 'templates' . DS . 'Standard/subnavigation.inc');
+  $hasSubnav = $this->get('hasSupertitle');
 }
 ?>
 
 <div class="page-title-container">
   <div class="page-title">
-    <?php if(empty($subnav)): ?>
+    <?php if(!$hasSubnav): ?>
       <h1><?= $vv_title ?></h1>
     <?php else: ?>
       <h2><?= $vv_title ?></h2>
@@ -156,9 +158,8 @@
     }
   ?>
 </div>
-
-<!-- If we have an iframe we alway render the flash messages -->
-<?php if(empty($subnav) || $this->getLayout() === 'iframe'): ?>
+
+<?php if(!$hasSubnav): ?>
   <?php /* Flash Messages are placed below the main title when there's no subnavigation. */ ?>
   <?= $this->element('flash', $flashArgs) ?>
 <?php endif; ?>

diff --git a/app/templates/Standard/index.php b/app/templates/Standard/index.php
@@ -83,14 +83,16 @@
 }
 
 // Subnavigation
+$hasSubnav = false;  
 if(file_exists(ROOT . DS . 'templates' . DS . 'Standard/subnavigation.inc')) {
   include(ROOT . DS . 'templates' . DS . 'Standard/subnavigation.inc');
+  $hasSubnav = $this->get('hasSupertitle');
 }
 ?>
 
 <div class="page-title-container">
   <div class="page-title">
-    <?php if(empty($subnav)): ?>
+    <?php if(!$hasSubnav): ?>
       <h1><?= $vv_title; ?></h1>
     <?php else: ?>
       <h2><?= $vv_title; ?></h2>
@@ -184,8 +186,7 @@
   <?php endif; ?>
 </div>
 
-<?php if(empty($subnav)): ?>
-  <!-- Subnavigation -->
+<?php if(!$hasSubnav): ?>
   <?php /* Flash Messages are placed below the main title when there's no subnavigation. */ ?>
   <?= $this->element('flash', $flashArgs); ?>
 <?php endif; ?>

diff --git a/app/templates/element/subnavigation/supertitle.php b/app/templates/element/subnavigation/supertitle.php
@@ -41,6 +41,10 @@
   default                                                => __d('information','global.title.none')
 };
 
+// This allows us to know that we have subnavigation in the
+// Standard views (index.php, add-edit-view.php).
+$this->set('hasSupertitle', true);
+
 ?>
 
 <h1><?= $supertitle ?></h1>