From 9e5974b711fe0f167a23e90ce7f6e4e4de73ea91 Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Tue, 4 Apr 2023 14:34:49 -0400
Subject: [PATCH 01/18] Provide modal add/edit for person canvas vuejs
 components (CFM-249)

---
 app/src/Controller/MVEAController.php         |   6 +
 app/src/View/Helper/VueHelper.php             |   3 +
 app/templates/element/javascript.php          |  11 ++
 app/templates/element/menuAction.php          |  12 +-
 app/templates/element/mveaJs.php              |  16 +-
 app/templates/element/mveaModal.php           | 110 ++++++++++++++
 app/templates/layout/iframe.php               | 137 ++++++++++++++++++
 app/webroot/css/co-base.css                   |  30 ++++
 .../js/comanage/components/mvea/mvea-item.js  |   7 +-
 .../js/comanage/components/mvea/mvea-modal.js |  49 +++++++
 .../js/comanage/components/mvea/mveas.js      |   5 +
 11 files changed, 378 insertions(+), 8 deletions(-)
 create mode 100644 app/templates/element/mveaModal.php
 create mode 100644 app/templates/layout/iframe.php
 create mode 100644 app/webroot/js/comanage/components/mvea/mvea-modal.js

diff --git a/app/src/Controller/MVEAController.php b/app/src/Controller/MVEAController.php
index 7a5fb97f0..aaa648ec6 100644
--- a/app/src/Controller/MVEAController.php
+++ b/app/src/Controller/MVEAController.php
@@ -121,6 +121,12 @@ public function beforeRender(\Cake\Event\EventInterface $event) {
         $this->set('vv_default_type', $settings->$defaultTypeField);
       }
     }
+  
+    // Check to see if we're in iframe mode
+    $isIframe = $this->request->getQuery('iframe',false);
+    if($isIframe){
+      $this->viewBuilder()->setLayout('iframe');  
+    }
     
     return parent::beforeRender($event);
   }
diff --git a/app/src/View/Helper/VueHelper.php b/app/src/View/Helper/VueHelper.php
index 7230ba524..37672e4f6 100644
--- a/app/src/View/Helper/VueHelper.php
+++ b/app/src/View/Helper/VueHelper.php
@@ -45,6 +45,9 @@ class VueHelper extends Helper {
     'information' => [
       'global.value.none',
       'datepicker.hour'
+    ],
+    'operation' => [
+      'close'
     ]
   ];
 
diff --git a/app/templates/element/javascript.php b/app/templates/element/javascript.php
index 248eb605d..65f23bb54 100644
--- a/app/templates/element/javascript.php
+++ b/app/templates/element/javascript.php
@@ -204,6 +204,17 @@
         });
       }
     });
+    
+    // Person canvas "Add" links
+    // Launch the MVEA modal window, load the Add url, and refresh the appropriate component when done.
+    $('#person-actions .person-actions-add-menu ul a').click(function(e) {
+      e.preventDefault();
+      e.stopPropagation();
+      var title = $(this).find('.action-link-text').text();
+      var url = $(this).prop('href');
+      var componentRef = 'mvea' + $(this).data('cm-mveatype');
+      window.cmMveaModal.launch(title,url,componentRef);
+    });
 
     // Bulk edit switch
     $('#bulk-edit-switch').click(function() {
diff --git a/app/templates/element/menuAction.php b/app/templates/element/menuAction.php
index ee4549b6d..b712d81e9 100644
--- a/app/templates/element/menuAction.php
+++ b/app/templates/element/menuAction.php
@@ -61,10 +61,18 @@ class="<?= $actionsMenuClass; ?>">
   ?>
   <ul id="action-list_<?= $actionsMenuUid; ?>" class="dropdown-menu nospin">
     <?php foreach($vv_actions as $action): ?>
+      <?php 
+        $actionDataAttrs = '';
+        if(!empty($action['dataAttrs'])) {
+          foreach($action['dataAttrs'] as $dataAttr) {
+            $actionDataAttrs = ' ' . $dataAttr[0] . '="' . $dataAttr[1] . '"';
+          }
+        } 
+      ?>
       <li class="action-list-item">
         <?php $actionCssClass = (!empty($action['class'])) ? "dropdown-item " . $action['class'] : "dropdown-item"; ?>
         <?php if(empty($action['onclick'])): ?>
-          <a class="<?= $actionCssClass; ?>" href="<?= $action['url']; ?>">
+          <a class="<?= $actionCssClass; ?>" href="<?= $action['url']; ?>"<?= !(empty($actionDataAttrs)) ? $actionDataAttrs : '' ?>>
             <?php if(!empty($action['icon'])): ?>
               <?php if(!empty($action['iconClass'])): ?>
                 <em class="<?= $action['iconClass']; ?>"><?= $action['icon']; ?></em>
@@ -72,7 +80,7 @@ class="<?= $actionsMenuClass; ?>">
                 <em class="material-icons"><?= $action['icon']; ?></em>
               <?php endif; ?>
             <?php endif; ?>
-            <?= $action['label']; ?>
+            <span class="action-link-text"><?= $action['label']; ?></span>
           </a>
         <?php else: ?>
           <?php
diff --git a/app/templates/element/mveaJs.php b/app/templates/element/mveaJs.php
index aa404dae2..9518b6498 100644
--- a/app/templates/element/mveaJs.php
+++ b/app/templates/element/mveaJs.php
@@ -47,8 +47,10 @@
 <script type="module">
   <?php if(Cake\Core\Configure::read('debug')): ?>
     import Mveas from "<?= $this->Url->script('comanage/components/mvea/mveas.js') ?>?time=<?= time() ?>";
+    import MveaModal from "<?= $this->Url->script('comanage/components/mvea/mvea-modal.js') ?>?time=<?= time() ?>";
   <?php else: ?>
     import Mveas from "<?= $this->Url->script('comanage/components/mvea/mveas.js') ?>";
+    import MveaModal from "<?= $this->Url->script('comanage/components/mvea/mvea-modal.js') ?>";
   <?php endif; ?>
   
   const app = Vue.createApp({
@@ -60,6 +62,7 @@
           parentId: '<?= $parentId ?>',
           mveaType: '<?= $mveaType ?>',
           mveaController: '<?= Cake\Utility\Inflector::dasherize($mveaController) ?>',
+          mveaTitle: '<?= $title ?>',
           webroot: '<?= $this->request->getAttribute('webroot') ?>'
         },
         txt: JSON.parse('<?= json_encode($vueHelper->locales()) ?>'),
@@ -100,19 +103,26 @@
         this.successTxt = '';
         if(xhr.statusText != undefined && xhr.statusText != '') {
           this.setError(xhr.statusText)
-          console.log('Status Code:', xhr.status)
+          console.log('Status Code: ', xhr.status)
         } else {
           console.error(xhr);
           this.setError(this.txt.error500);
         }
+      },
+      launchModal(title,url,componentRef) {
+        window.cmMveaModal.launch(title,url,componentRef);
+      },
+      refreshComponent() {
+        this.getMveas('<?= $mveaType ?>', '<?= $entityType ?>');
       }
     },
     created() {
-      this.getMveas('<?= $mveaType ?>', '<?= $entityType ?>');
+      this.refreshComponent();
     }
   });
 
-  app.mount("#<?= $htmlId ?>");
+  // Mount the component and provide a global reference for this app instance.
+  window.mvea<?= $mveaType ?> = app.mount("#<?= $htmlId ?>");
 </script>
 
 <div id="<?= $htmlId ?>" class="col cm-mvea-col">
diff --git a/app/templates/element/mveaModal.php b/app/templates/element/mveaModal.php
new file mode 100644
index 000000000..8e5b32d29
--- /dev/null
+++ b/app/templates/element/mveaModal.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * COmanage Registry MVEA Vue.js Modal Component
+ *
+ * Portions licensed to the University Corporation for Advanced Internet
+ * Development, Inc. ("UCAID") under one or more contributor license agreements.
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @link          https://www.internet2.edu/comanage COmanage Project
+ * @package       registry
+ * @since         COmanage Registry v5.0.0
+ * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+ */
+
+// Get the CSRF Token in JavaScript  
+$token = $this->request->getAttribute('csrfToken');
+// Load my helper functions
+$vueHelper = $this->loadHelper('Vue');
+
+
+// Create a modal for handling MVEA adds/edits via iframe. XXX We may rename to a generic modal at some point.
+?>
+
+<script type="module">
+  <?php if(Cake\Core\Configure::read('debug')): ?>
+    import MveaModal from "<?= $this->Url->script('comanage/components/mvea/mvea-modal.js') ?>?time=<?= time() ?>";
+  <?php else: ?>
+    import MveaModal from "<?= $this->Url->script('comanage/components/mvea/mvea-modal.js') ?>";
+  <?php endif; ?>
+  
+  const mveaModalApp = Vue.createApp({
+    data() {
+      return {
+        componentRef: null,
+        mveaModal: null,
+        modalElement: null,
+        core: {
+          webroot: '<?= $this->request->getAttribute('webroot') ?>'
+        },
+        isLoading: true,
+        modal: {
+          title: '',
+          url: ''
+        },
+        txt: JSON.parse('<?= json_encode($vueHelper->locales()) ?>')
+      }
+    },
+    components: {
+      MveaModal
+    },
+    methods: {
+      launch(title, url, componentRef) {
+        this.modal.title = title;
+        this.modal.url = url;
+        this.componentRef = componentRef;
+        this.mveaModal.show();
+      },
+      refreshMveaComponent() {
+        // Get a reference to the MVEA component we're updating
+        const ref = window[this.componentRef];
+        if (typeof (ref) === "undefined") {
+          // The component doesn't exist, so reload the page to construct the new 
+          // MVEA component on the canvas (at least for now)
+          location.reload();
+        } else {
+          // refresh the existing component via ajax
+          ref.refreshComponent();
+        }
+        // Clear the modal after a refresh
+        this.modal.title = '';
+        this.modal.url = '';
+        //this.componentRef = null;
+      }
+    },
+    mounted() {
+      this.modalElement = document.getElementById('mvea-modal');
+      this.mveaModal = new bootstrap.Modal(this.modalElement);
+      var thisComponent = this;
+      // When the modal is hidden, refresh the relevant component
+      this.modalElement.addEventListener('hide.bs.modal', function (e) {
+        //e.stopPropagation();
+        thisComponent.refreshMveaComponent();
+      })
+    }
+  });
+  
+  // Mount the component and provide a global reference for this app instance.
+  window.cmMveaModal = mveaModalApp.mount("#mvea-modal-container");
+</script>
+
+<div id="mvea-modal-container">
+  <mvea-modal
+    :modal="this.modal"
+    :core="this.core"
+    :txt="this.txt">
+  </mvea-modal>
+</div>
diff --git a/app/templates/layout/iframe.php b/app/templates/layout/iframe.php
new file mode 100644
index 000000000..7c138d69d
--- /dev/null
+++ b/app/templates/layout/iframe.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * COmanage Registry Iframe Content Layout
+ *
+ * Portions licensed to the University Corporation for Advanced Internet
+ * Development, Inc. ("UCAID") under one or more contributor license agreements.
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @link          https://www.internet2.edu/comanage COmanage Project
+ * @package       registry
+ * @since         COmanage Registry v5.0.0
+ * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+ */
+
+declare(strict_types = 1);
+
+// As a general rule, all Registry pages are post-login and so shouldn't be cached
+header("Expires: Thursday, 10-Jan-69 00:00:00 GMT");
+header("Cache-Control: no-store, no-cache, max-age=0, must-revalidate");
+header("Pragma: no-cache");
+
+// Add X-UA-Compatible header for IE
+if(isset($_SERVER['HTTP_USER_AGENT']) && (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false)) {
+  header('X-UA-Compatible: IE=edge,chrome=1');
+}
+?>
+<!DOCTYPE html>
+<html lang="<?= __('registry.meta.lang'); ?>">
+  <head>
+    <?= $this->Html->meta('viewport', 'width=device-width, initial-scale=1.0') . PHP_EOL ?>
+    <?= $this->Html->charset(); ?>
+
+    <title><?= (!empty($vv_title) ? $vv_title : __('registry.meta.registry')); ?></title>
+    <!-- <?php
+      // Include version number, but only if logged in
+      if(!empty($vv_user)) {
+        print __('registry.meta.version', [chop(file_get_contents(CONFIG . DS . "VERSION"))]);
+      }
+    ?> -->
+
+    <!-- favicon.ico -->
+    <?= $this->Html->meta('favicon.ico', '/favicon.ico', array('type' => 'icon')) . PHP_EOL ?>
+
+    <!-- Load CSS -->
+    <?= $this->Html->css([
+      'bootstrap/bootstrap.min',
+      'select2/select2.min',
+      'co-color',
+      'co-base',
+      'co-responsive'
+    ]) . PHP_EOL ?>
+
+    <!-- Load Bootstrap and jQuery (other scripts at bottom) -->
+    <?= $this->Html->script([
+      'bootstrap/bootstrap.bundle.min.js',
+      'jquery/jquery.min.js',
+      'select2/select2.min.js'
+    ]) . PHP_EOL ?>
+
+    <!-- Include external files and scripts -->
+    <?= $this->fetch('meta') ?>
+    <?= $this->fetch('css') ?>
+    <?= $this->fetch('script') ?>
+  </head>
+
+  <?php
+    // cleanse the controller and action strings and insert them into the body classes
+    $controller_stripped = preg_replace('/[^a-zA-Z0-9\-_]/', '', strtolower($this->request->getParam('controller')));
+    $action_stripped = preg_replace('/[^a-zA-Z0-9\-_]/', '', strtolower($this->request->getParam('action')));
+    $bodyClasses = $controller_stripped . ' ' . $action_stripped . ' in-iframe';
+    $isCoSelectView = $controller_stripped == 'cos' && $action_stripped == 'select';
+    $isDashboard = $controller_stripped == 'dashboards' && $action_stripped == 'dashboard';
+
+    // add further body classes as needed
+    if(!empty($vv_user)) {
+      $bodyClasses .= ' logged-in';
+    } else {
+      $bodyClasses .= ' logged-out';
+    }
+  ?>
+  <body class="<?= $bodyClasses ?>" onload="js_onload_call_hooks()">
+    <!-- Iframe layout -->
+    <div id="comanage-iframe-wrapper">
+      <main id="main">
+        <div id="content">
+          <!-- insert the page internal content -->
+          <?= $this->fetch('content') ?>
+        </div>
+      </main>
+    </div>
+
+    <!-- loading animation -->
+    <div id="co-loading"><span></span><span></span><span></span></div>
+
+    <!-- modal dialog box -->
+    <?= $this->element('dialog') ?>
+
+    <!-- Get timezone detection -->
+    <?= $this->Html->script('jstimezonedetect/jstz.min.js') ?>
+    <script>
+      // Determines the time zone of the browser client
+      var tz = jstz.determine();
+      // This won't be available for the first delivered page, but after that the
+      // server side should see it and process it
+      document.cookie = "cm_registry_tz_auto=" + tz.name() + "; path=/";
+    </script>
+
+    <!-- Load Javascript -->
+    <!-- XXX js-cookie should be deprecated -->
+    <?= $this->Html->script([      
+      'vue/vue-3.2.31.global.prod.js',
+      'js-cookie/js.cookie-2.1.3.min.js',
+      'comanage/comanage.js'
+    ]) . PHP_EOL ?>
+
+    <!-- Duet Datepicker should be loaded as a module -->
+    <?= $this->Html->script('duet-datepicker/duet/duet.esm.js',['type' => 'module']) ?>
+    <?= $this->Html->script('duet-datepicker/duet/duet.js',['nomodule' => '']) ?>
+
+    <!-- COmanage JavaScript onload scripts -->
+    <?php print $this->element('javascript'); ?>
+
+  </body>
+</html>
diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css
index b245c7fe2..ac3ac0fd2 100644
--- a/app/webroot/css/co-base.css
+++ b/app/webroot/css/co-base.css
@@ -1338,6 +1338,36 @@ ul.form-list .cm-time-picker-vals li {
 #dialog .modal-footer {
   border-top: none;
 }
+/* MVEA MODAL */
+.mvea-modal .modal-dialog {
+  max-width: 90vw;
+}
+.mvea-modal .modal-header {
+  padding: 0.5rem 1rem;
+  background-color: var(--cmg-color-lightgray-004);
+  border-bottom: none;
+}
+.mvea-modal .modal-content {
+  height: 80vh;
+}
+.mvea-modal .modal-body {
+  padding-top: 0;
+}
+.mvea-modal iframe {
+  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;
+}
+#comanage-iframe-wrapper .pageTitleContainer {
+  margin: 1em 0;
+}
 /* GENERAL */
 .hidden,
 .invisible,
diff --git a/app/webroot/js/comanage/components/mvea/mvea-item.js b/app/webroot/js/comanage/components/mvea/mvea-item.js
index 7a1df06d5..f4169c82c 100644
--- a/app/webroot/js/comanage/components/mvea/mvea-item.js
+++ b/app/webroot/js/comanage/components/mvea/mvea-item.js
@@ -36,8 +36,7 @@ export default {
   },
   computed: {
     mveaLink: function() {
-      // For now, link to the underlying PHP form. We will change this behavior as we develop the JS forms.
-      return this.core.webroot + this.core.mveaController + '/edit/' + this.mvea.id;
+      return this.core.webroot + this.core.mveaController + '/edit/' + this.mvea.id + '?iframe=true';
     }
   },
   methods: {
@@ -45,7 +44,9 @@ export default {
       return constructLanguageString(lang)
     },
     followRowLink() {
-      location.href = this.mveaLink;
+      //location.href = this.mveaLink;
+      var componentReference = 'mvea' + this.core.mveaType;
+      this.$parent.$parent.launchModal(this.core.mveaTitle,this.mveaLink,componentReference);
     }
   },
   mounted() {
diff --git a/app/webroot/js/comanage/components/mvea/mvea-modal.js b/app/webroot/js/comanage/components/mvea/mvea-modal.js
new file mode 100644
index 000000000..014d52357
--- /dev/null
+++ b/app/webroot/js/comanage/components/mvea/mvea-modal.js
@@ -0,0 +1,49 @@
+/**
+ * COmanage Registry MVEA Modal JavaScript
+ *
+ * Portions licensed to the University Corporation for Advanced Internet
+ * Development, Inc. ("UCAID") under one or more contributor license agreements.
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @link          https://www.internet2.edu/comanage COmanage Project
+ * @package       registry
+ * @since         COmanage Registry v5.0.0
+ * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+ */
+
+export default {
+  props: {
+    modal: Object,
+    core: Object,
+    txt: Object
+  },
+  template: `
+    <div className="modal fade mvea-modal" id="mvea-modal" aria-labelledby="mvea-modal-title" tabIndex="-1" aria-hidden="true">
+      <div className="modal-dialog modal-dialog-centered">
+        <div className="modal-content">
+          <div className="modal-header">
+            <h2 class="modal-title" id="mvea-modal-title">{{ this.modal.title }}</h2>
+            <button type="button" className="btn-close nospin" data-bs-dismiss="modal"
+                    :aria-label="txt.close"></button>
+          </div>
+          <div id="dialog-text" className="modal-body">
+            <iframe :src="this.modal.url"/>
+          </div>
+        </div>
+      </div>
+    </div>
+  `
+}
\ No newline at end of file
diff --git a/app/webroot/js/comanage/components/mvea/mveas.js b/app/webroot/js/comanage/components/mvea/mveas.js
index 2b98a5292..bd3a7bfa0 100644
--- a/app/webroot/js/comanage/components/mvea/mveas.js
+++ b/app/webroot/js/comanage/components/mvea/mveas.js
@@ -48,6 +48,11 @@ export default {
       return this.mveas?.[camelize(this.core.mveaType)]
     }
   },
+  methods: {
+    refresh() {
+      this.$parent.refreshComponent();
+    }
+  },
   template: `
     <ul class="cm-mvea fields data-list">
       <mvea-item 

From 862fdf86cd3cf90c0daeb5d1d5040dfd2e5743e4 Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Wed, 5 Apr 2023 14:09:24 -0400
Subject: [PATCH 02/18] Post-rebase cleanup to ensure Add menu works with vue
 components and modal (CFM-249)

---
 app/templates/element/javascript.php   |  2 +-
 app/templates/element/personCanvas.php | 12 ++++++++----
 app/webroot/css/co-base.css            |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/templates/element/javascript.php b/app/templates/element/javascript.php
index 65f23bb54..45c5ef147 100644
--- a/app/templates/element/javascript.php
+++ b/app/templates/element/javascript.php
@@ -207,7 +207,7 @@
     
     // Person canvas "Add" links
     // Launch the MVEA modal window, load the Add url, and refresh the appropriate component when done.
-    $('#person-actions .person-actions-add-menu ul a').click(function(e) {
+    $('#person-actions-add-menu-container ul a').click(function(e) {
       e.preventDefault();
       e.stopPropagation();
       var title = $(this).find('.action-link-text').text();
diff --git a/app/templates/element/personCanvas.php b/app/templates/element/personCanvas.php
index dcdd4c987..6b624fec3 100644
--- a/app/templates/element/personCanvas.php
+++ b/app/templates/element/personCanvas.php
@@ -50,28 +50,31 @@
     $actionOrder = !empty($a['order']) ? $a['order'] : $actionOrderDefault++;
     $actionIcon = !empty($a['icon']) ? $a['icon'] : $this->Menu->getMenuIcon('Default');
     $actionIconClass = !empty($a['iconClass']) ? $a['iconClass'] : '';
-    $actionClass = !empty($a['class']) ? $a['class'] : '';
+    $actionClass = !empty($a['class']) ? $a['class'] . ' nospin' : 'nospin';
     $actionUrl = $this->Url->build(
       [
         'controller' => $a['controller'],
         'action' => $a['action'],
         '?' => [
-          'person_id' => $curId
+          'person_id' => $curId,
+          'iframe' => 'true'
         ]
       ]
     );
     $actionLabel = __d('controller', Cake\Utility\Inflector::camelize($a['controller']), [1]);
+    $actionDataAttrs = [['data-cm-mveatype',$a['controller']]];
     $action_args['vv_actions'][] = [
       'order' => $actionOrder,
       'icon' => $actionIcon,
       'iconClass' => $actionIconClass,
       'url' => $actionUrl,
       'class' => $actionClass,
-      'label' => $actionLabel
+      'label' => $actionLabel,
+      'dataAttrs' => $actionDataAttrs
     ];
   }
 ?>
-<div class="field-actions person-actions-add-menu-container">
+<div id="person-actions-add-menu-container" class="field-actions">
   <?= $this->element('menuAction', $action_args) ?>
 </div>
 
@@ -121,6 +124,7 @@
         }
       }
       // XXX Add the DOB as its own special card.
+      print $this->element('mveaModal');
     ?>
   </div>
 </div>
\ No newline at end of file
diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css
index ac3ac0fd2..e4f1c4b9d 100644
--- a/app/webroot/css/co-base.css
+++ b/app/webroot/css/co-base.css
@@ -1022,7 +1022,7 @@ table.index-table .form-check {
 #person-actions .action-menu-toggle {
   white-space: nowrap;
 }
-.person-actions-add-menu-container {
+#person-actions-add-menu-container {
   float: right;
 }
 #person-canvas {

From 039a28b711c7c5036e45cb97e77bb073bb82e208 Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Wed, 5 Apr 2023 15:24:04 -0400
Subject: [PATCH 03/18] Set MVEAs to redirect to "self" (CFM-249)

---
 app/src/Model/Table/AdHocAttributesTable.php  | 10 ++++++++++
 app/src/Model/Table/AddressesTable.php        | 10 ++++++++++
 app/src/Model/Table/EmailAddressesTable.php   | 10 ++++++++++
 app/src/Model/Table/IdentifiersTable.php      | 10 ++++++++++
 app/src/Model/Table/NamesTable.php            | 10 ++++++++++
 app/src/Model/Table/PronounsTable.php         | 10 ++++++++++
 app/src/Model/Table/TelephoneNumbersTable.php | 10 ++++++++++
 app/src/Model/Table/UrlsTable.php             | 10 ++++++++++
 app/templates/element/personCanvas.php        |  2 +-
 app/webroot/css/co-base.css                   |  1 +
 10 files changed, 82 insertions(+), 1 deletion(-)

diff --git a/app/src/Model/Table/AdHocAttributesTable.php b/app/src/Model/Table/AdHocAttributesTable.php
index b7857f8d2..a922a3ba1 100644
--- a/app/src/Model/Table/AdHocAttributesTable.php
+++ b/app/src/Model/Table/AdHocAttributesTable.php
@@ -42,6 +42,16 @@ class AdHocAttributesTable extends Table {
   use \App\Lib\Traits\ValidationTrait;
   use \App\Lib\Traits\SearchFilterTrait;
   
+  /**
+   * Provide the default redirect
+   *
+   * @since  COmanage Registry v5.0.0
+   * @return string  Type of redirect
+   */
+  public function getRedirectGoal(): string {
+    return "self";
+  }
+  
   /**
    * Perform Cake Model initialization.
    *
diff --git a/app/src/Model/Table/AddressesTable.php b/app/src/Model/Table/AddressesTable.php
index a149dd445..2e7fd8116 100644
--- a/app/src/Model/Table/AddressesTable.php
+++ b/app/src/Model/Table/AddressesTable.php
@@ -56,6 +56,16 @@ class AddressesTable extends Table {
       'postal'
     ]
   ];
+
+  /**
+   * Provide the default redirect 
+   *   
+   * @since  COmanage Registry v5.0.0
+   * @return string  Type of redirect
+   */
+  public function getRedirectGoal(): string {
+    return "self";
+  }
   
   /**
    * Perform Cake Model initialization.
diff --git a/app/src/Model/Table/EmailAddressesTable.php b/app/src/Model/Table/EmailAddressesTable.php
index 7d48c5218..4ff949672 100644
--- a/app/src/Model/Table/EmailAddressesTable.php
+++ b/app/src/Model/Table/EmailAddressesTable.php
@@ -58,6 +58,16 @@ class EmailAddressesTable extends Table {
     ]
   ];
   
+  /**
+   * Provide the default redirect
+   *
+   * @since  COmanage Registry v5.0.0
+   * @return string  Type of redirect
+   */
+  public function getRedirectGoal(): string {
+    return "self";
+  }
+  
   /**
    * Perform Cake Model initialization.
    *
diff --git a/app/src/Model/Table/IdentifiersTable.php b/app/src/Model/Table/IdentifiersTable.php
index 241eef6cb..387388808 100644
--- a/app/src/Model/Table/IdentifiersTable.php
+++ b/app/src/Model/Table/IdentifiersTable.php
@@ -70,6 +70,16 @@ class IdentifiersTable extends Table {
     ]
   ];
   
+  /**
+   * Provide the default redirect
+   *
+   * @since  COmanage Registry v5.0.0
+   * @return string  Type of redirect
+   */
+  public function getRedirectGoal(): string {
+    return "self";
+  }
+  
   /**
    * Perform Cake Model initialization.
    *
diff --git a/app/src/Model/Table/NamesTable.php b/app/src/Model/Table/NamesTable.php
index a09777c64..819625708 100644
--- a/app/src/Model/Table/NamesTable.php
+++ b/app/src/Model/Table/NamesTable.php
@@ -62,6 +62,16 @@ class NamesTable extends Table {
     ]
   ];
   
+  /**
+   * Provide the default redirect
+   *
+   * @since  COmanage Registry v5.0.0
+   * @return string  Type of redirect
+   */
+  public function getRedirectGoal(): string {
+    return "self";
+  }
+    
   /**
    * Perform Cake Model initialization.
    *
diff --git a/app/src/Model/Table/PronounsTable.php b/app/src/Model/Table/PronounsTable.php
index b7b1bc702..56bc8574a 100644
--- a/app/src/Model/Table/PronounsTable.php
+++ b/app/src/Model/Table/PronounsTable.php
@@ -53,6 +53,16 @@ class PronounsTable extends Table {
     ]
   ];
   
+  /**
+   * Provide the default redirect
+   *
+   * @since  COmanage Registry v5.0.0
+   * @return string  Type of redirect
+   */
+  public function getRedirectGoal(): string {
+    return "self";
+  }
+  
   /**
    * Perform Cake Model initialization.
    *
diff --git a/app/src/Model/Table/TelephoneNumbersTable.php b/app/src/Model/Table/TelephoneNumbersTable.php
index 3044435ed..1be20a2f4 100644
--- a/app/src/Model/Table/TelephoneNumbersTable.php
+++ b/app/src/Model/Table/TelephoneNumbersTable.php
@@ -57,6 +57,16 @@ class TelephoneNumbersTable extends Table {
     ]
   ];
   
+  /**
+   * Provide the default redirect
+   *
+   * @since  COmanage Registry v5.0.0
+   * @return string  Type of redirect
+   */
+  public function getRedirectGoal(): string {
+    return "self";
+  }
+  
   /**
    * Perform Cake Model initialization.
    *
diff --git a/app/src/Model/Table/UrlsTable.php b/app/src/Model/Table/UrlsTable.php
index 914d051ee..1ce6b7030 100644
--- a/app/src/Model/Table/UrlsTable.php
+++ b/app/src/Model/Table/UrlsTable.php
@@ -53,6 +53,16 @@ class UrlsTable extends Table {
     ]
   ];
   
+  /**
+   * Provide the default redirect
+   *
+   * @since  COmanage Registry v5.0.0
+   * @return string  Type of redirect
+   */
+  public function getRedirectGoal(): string {
+    return "self";
+  }
+  
   /**
    * Perform Cake Model initialization.
    *
diff --git a/app/templates/element/personCanvas.php b/app/templates/element/personCanvas.php
index 6b624fec3..7d7a95783 100644
--- a/app/templates/element/personCanvas.php
+++ b/app/templates/element/personCanvas.php
@@ -123,7 +123,7 @@
           );
         }
       }
-      // XXX Add the DOB as its own special card.
+      // TODO: Add the DOB as its own special card (CFM-261)
       print $this->element('mveaModal');
     ?>
   </div>
diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css
index e4f1c4b9d..bd958f4d8 100644
--- a/app/webroot/css/co-base.css
+++ b/app/webroot/css/co-base.css
@@ -1024,6 +1024,7 @@ table.index-table .form-check {
 }
 #person-actions-add-menu-container {
   float: right;
+  margin: 1em 0 0;
 }
 #person-canvas {
   clear: both;

From 53da87b46b94402f446584951d538745b048ef7c Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Fri, 7 Apr 2023 10:08:44 -0400
Subject: [PATCH 04/18] Set MVEAs to default to the "iframe" layout (CFM-249)

---
 app/src/Controller/MVEAController.php         |  6 -----
 app/src/Controller/StandardController.php     |  5 ++++
 app/src/Model/Table/AdHocAttributesTable.php  | 12 +++++++++-
 app/src/Model/Table/AddressesTable.php        | 14 +++++++++--
 app/src/Model/Table/EmailAddressesTable.php   | 12 +++++++++-
 app/src/Model/Table/IdentifiersTable.php      | 12 +++++++++-
 app/src/Model/Table/NamesTable.php            | 12 +++++++++-
 app/src/Model/Table/PronounsTable.php         | 12 +++++++++-
 app/src/Model/Table/TelephoneNumbersTable.php | 12 +++++++++-
 app/src/Model/Table/UrlsTable.php             | 12 +++++++++-
 app/templates/element/personCanvas.php        |  3 +--
 .../js/comanage/components/mvea/mvea-item.js  | 24 ++++++++++---------
 12 files changed, 108 insertions(+), 28 deletions(-)

diff --git a/app/src/Controller/MVEAController.php b/app/src/Controller/MVEAController.php
index aaa648ec6..7a5fb97f0 100644
--- a/app/src/Controller/MVEAController.php
+++ b/app/src/Controller/MVEAController.php
@@ -121,12 +121,6 @@ public function beforeRender(\Cake\Event\EventInterface $event) {
         $this->set('vv_default_type', $settings->$defaultTypeField);
       }
     }
-  
-    // Check to see if we're in iframe mode
-    $isIframe = $this->request->getQuery('iframe',false);
-    if($isIframe){
-      $this->viewBuilder()->setLayout('iframe');  
-    }
     
     return parent::beforeRender($event);
   }
diff --git a/app/src/Controller/StandardController.php b/app/src/Controller/StandardController.php
index e3490a4ad..360189cd3 100644
--- a/app/src/Controller/StandardController.php
+++ b/app/src/Controller/StandardController.php
@@ -166,6 +166,11 @@ public function beforeRender(\Cake\Event\EventInterface $event) {
     }
 
     $this->set('vv_template_path', $vv_template_path);
+  
+    // Check to see if the model names a specific layout
+    if(method_exists($table, "getLayout")) {
+       $this->viewBuilder()->setLayout($table->getLayout());
+    }
 
     return parent::beforeRender($event);
   }
diff --git a/app/src/Model/Table/AdHocAttributesTable.php b/app/src/Model/Table/AdHocAttributesTable.php
index a922a3ba1..f88bc9179 100644
--- a/app/src/Model/Table/AdHocAttributesTable.php
+++ b/app/src/Model/Table/AdHocAttributesTable.php
@@ -43,7 +43,17 @@ class AdHocAttributesTable extends Table {
   use \App\Lib\Traits\SearchFilterTrait;
   
   /**
-   * Provide the default redirect
+   * Provide the default layout
+   *
+   * @since  COmanage Registry v5.0.0
+   * @return string  Type of redirect
+   */
+  public function getLayout(): string {
+    return "iframe";
+  }
+  
+  /**
+   * Provide the default redirect goal
    *
    * @since  COmanage Registry v5.0.0
    * @return string  Type of redirect
diff --git a/app/src/Model/Table/AddressesTable.php b/app/src/Model/Table/AddressesTable.php
index 2e7fd8116..8ee0c64e0 100644
--- a/app/src/Model/Table/AddressesTable.php
+++ b/app/src/Model/Table/AddressesTable.php
@@ -56,9 +56,19 @@ class AddressesTable extends Table {
       'postal'
     ]
   ];
-
+  
+  /**
+   * Provide the default layout
+   *
+   * @since  COmanage Registry v5.0.0
+   * @return string  Type of redirect
+   */
+  public function getLayout(): string {
+    return "iframe";
+  }
+  
   /**
-   * Provide the default redirect 
+   * Provide the default redirect goal
    *   
    * @since  COmanage Registry v5.0.0
    * @return string  Type of redirect
diff --git a/app/src/Model/Table/EmailAddressesTable.php b/app/src/Model/Table/EmailAddressesTable.php
index 4ff949672..4a98b199b 100644
--- a/app/src/Model/Table/EmailAddressesTable.php
+++ b/app/src/Model/Table/EmailAddressesTable.php
@@ -59,7 +59,17 @@ class EmailAddressesTable extends Table {
   ];
   
   /**
-   * Provide the default redirect
+   * Provide the default layout
+   *
+   * @since  COmanage Registry v5.0.0
+   * @return string  Type of redirect
+   */
+  public function getLayout(): string {
+    return "iframe";
+  }
+  
+  /**
+   * Provide the default redirect goal
    *
    * @since  COmanage Registry v5.0.0
    * @return string  Type of redirect
diff --git a/app/src/Model/Table/IdentifiersTable.php b/app/src/Model/Table/IdentifiersTable.php
index 387388808..1aabfd673 100644
--- a/app/src/Model/Table/IdentifiersTable.php
+++ b/app/src/Model/Table/IdentifiersTable.php
@@ -71,7 +71,17 @@ class IdentifiersTable extends Table {
   ];
   
   /**
-   * Provide the default redirect
+   * Provide the default layout
+   *
+   * @since  COmanage Registry v5.0.0
+   * @return string  Type of redirect
+   */
+  public function getLayout(): string {
+    return "iframe";
+  }
+  
+  /**
+   * Provide the default redirect goal
    *
    * @since  COmanage Registry v5.0.0
    * @return string  Type of redirect
diff --git a/app/src/Model/Table/NamesTable.php b/app/src/Model/Table/NamesTable.php
index 819625708..d49d34eee 100644
--- a/app/src/Model/Table/NamesTable.php
+++ b/app/src/Model/Table/NamesTable.php
@@ -63,7 +63,17 @@ class NamesTable extends Table {
   ];
   
   /**
-   * Provide the default redirect
+   * Provide the default layout
+   *
+   * @since  COmanage Registry v5.0.0
+   * @return string  Type of redirect
+   */
+  public function getLayout(): string {
+    return "iframe";
+  }
+  
+  /**
+   * Provide the default redirect goal
    *
    * @since  COmanage Registry v5.0.0
    * @return string  Type of redirect
diff --git a/app/src/Model/Table/PronounsTable.php b/app/src/Model/Table/PronounsTable.php
index 56bc8574a..0149274d2 100644
--- a/app/src/Model/Table/PronounsTable.php
+++ b/app/src/Model/Table/PronounsTable.php
@@ -54,7 +54,17 @@ class PronounsTable extends Table {
   ];
   
   /**
-   * Provide the default redirect
+   * Provide the default layout
+   *
+   * @since  COmanage Registry v5.0.0
+   * @return string  Type of redirect
+   */
+  public function getLayout(): string {
+    return "iframe";
+  }
+  
+  /**
+   * Provide the default redirect goal
    *
    * @since  COmanage Registry v5.0.0
    * @return string  Type of redirect
diff --git a/app/src/Model/Table/TelephoneNumbersTable.php b/app/src/Model/Table/TelephoneNumbersTable.php
index 1be20a2f4..e1f6fe3ca 100644
--- a/app/src/Model/Table/TelephoneNumbersTable.php
+++ b/app/src/Model/Table/TelephoneNumbersTable.php
@@ -58,7 +58,17 @@ class TelephoneNumbersTable extends Table {
   ];
   
   /**
-   * Provide the default redirect
+   * Provide the default layout
+   *
+   * @since  COmanage Registry v5.0.0
+   * @return string  Type of redirect
+   */
+  public function getLayout(): string {
+    return "iframe";
+  }
+  
+  /**
+   * Provide the default redirect goal
    *
    * @since  COmanage Registry v5.0.0
    * @return string  Type of redirect
diff --git a/app/src/Model/Table/UrlsTable.php b/app/src/Model/Table/UrlsTable.php
index 1ce6b7030..af92b4d76 100644
--- a/app/src/Model/Table/UrlsTable.php
+++ b/app/src/Model/Table/UrlsTable.php
@@ -54,7 +54,17 @@ class UrlsTable extends Table {
   ];
   
   /**
-   * Provide the default redirect
+   * Provide the default layout
+   *
+   * @since  COmanage Registry v5.0.0
+   * @return string  Type of redirect
+   */
+  public function getLayout(): string {
+    return "iframe";
+  }
+  
+  /**
+   * Provide the default redirect goal
    *
    * @since  COmanage Registry v5.0.0
    * @return string  Type of redirect
diff --git a/app/templates/element/personCanvas.php b/app/templates/element/personCanvas.php
index 7d7a95783..44eebdbfd 100644
--- a/app/templates/element/personCanvas.php
+++ b/app/templates/element/personCanvas.php
@@ -56,8 +56,7 @@
         'controller' => $a['controller'],
         'action' => $a['action'],
         '?' => [
-          'person_id' => $curId,
-          'iframe' => 'true'
+          'person_id' => $curId
         ]
       ]
     );
diff --git a/app/webroot/js/comanage/components/mvea/mvea-item.js b/app/webroot/js/comanage/components/mvea/mvea-item.js
index f4169c82c..611a5aa04 100644
--- a/app/webroot/js/comanage/components/mvea/mvea-item.js
+++ b/app/webroot/js/comanage/components/mvea/mvea-item.js
@@ -36,7 +36,7 @@ export default {
   },
   computed: {
     mveaLink: function() {
-      return this.core.webroot + this.core.mveaController + '/edit/' + this.mvea.id + '?iframe=true';
+      return this.core.webroot + this.core.mveaController + '/edit/' + this.mvea.id;
     }
   },
   methods: {
@@ -45,8 +45,10 @@ export default {
     },
     followRowLink() {
       //location.href = this.mveaLink;
-      var componentReference = 'mvea' + this.core.mveaType;
-      this.$parent.$parent.launchModal(this.core.mveaTitle,this.mveaLink,componentReference);
+      this.$nextTick(() => {
+        var componentReference = 'mvea' + this.core.mveaType;
+        this.$parent.$parent.launchModal(this.core.mveaTitle, this.mveaLink, componentReference);
+      });
     }
   },
   mounted() {
@@ -56,7 +58,7 @@ export default {
     <!-- Names -->
     <li class="field-data-container linked-row" v-if="this.core.mveaType == 'names'" @click="followRowLink">
       <div class="field-data force-wrap">
-        <a :href="mveaLink" class="row-link">
+        <a :href="mveaLink" class="row-link" @click.prevent>
           <!-- If there is a display name use it. Otherwise, check language and produce right-to-left 
             order or left-to-right order. This approach is similar to Model/Entity/Name.php::_getFullName(). 
             XXX We expect to get the full_name out of the API, so remove this logic when we have the full name. 
@@ -82,7 +84,7 @@ export default {
     <!-- Email Addresses -->
     <li class="field-data-container linked-row" v-if="this.core.mveaType == 'email_addresses'" @click="followRowLink">
       <div class="field-data force-wrap">
-        <a :href="mveaLink" class="row-link">{{ this.mvea.mail }}</a>                                              
+        <a :href="mveaLink" class="row-link" @click.prevent>{{ this.mvea.mail }}</a>                                              
       </div>
       <div class="field-data data-label">
         <span v-if="!(this.mvea.verified)" class="mr-1 badge bg-warning unverified">{{ this.txt.unverified }}</span>
@@ -92,7 +94,7 @@ export default {
     <!-- Identifiers -->
     <li class="field-data-container linked-row" v-if="this.core.mveaType == 'identifiers'" @click="followRowLink">
       <div class="field-data force-wrap">
-        <a :href="mveaLink" class="nospin">{{ this.mvea.identifier }}</a>                                              
+        <a :href="mveaLink" class="row-link" @click.prevent>{{ this.mvea.identifier }}</a>                                              
       </div>
       <div class="field-data data-label">
         <span v-if="this.mvea.login" class="mr-1 badge bg-outline-secondary login">{{ this.txt.login }}</span>
@@ -102,7 +104,7 @@ export default {
     <!-- Ad Hoc Attributes -->
     <li class="field-data-container linked-row" v-if="this.core.mveaType == 'ad_hoc_attributes'" @click="followRowLink">
       <div class="field-data force-wrap">
-        <a :href="mveaLink" class="row-link">{{ this.mvea.value != '' ? this.mvea.value : this.txt["global.value.none"] }}</a>
+        <a :href="mveaLink" class="row-link" @click.prevent>{{ this.mvea.value != '' ? this.mvea.value : this.txt["global.value.none"] }}</a>
       </div>
       <div v-if="this.mvea.tag != ''" class="field-data data-label">
         <span class="mr-1 badge bg-light ad-hoc">{{ this.mvea.tag }}</span>
@@ -112,7 +114,7 @@ export default {
     <li class="field-data-container linked-row" v-if="this.core.mveaType == 'addresses'" @click="followRowLink">
       <div class="field-data force-wrap">
         <address>
-          <a :href="mveaLink" class="row-link">{{ this.mvea.room }} {{ this.mvea.street }}</a>
+          <a :href="mveaLink" class="row-link" @click.prevent>{{ this.mvea.room }} {{ this.mvea.street }}</a>
           <span v-if="this.mvea.locality != '' || this.mvea.state != ''" class="addr-locality-state">
             <br>{{ this.mvea.locality }}{{ this.mvea.locality != '' && this.mvea.state != '' ? ', ' : ''}}{{ this.mvea.state }}
           </span>
@@ -128,7 +130,7 @@ export default {
     <!-- Telephone Numbers -->
     <li class="field-data-container linked-row" v-if="this.core.mveaType == 'telephone_numbers'" @click="followRowLink">
       <div class="field-data force-wrap">
-        <a :href="mveaLink" class="row-link">{{ this.mvea.country_code }} {{ this.mvea.area_code }} {{ this.mvea.number }}</a>                                              
+        <a :href="mveaLink" class="row-link" @click.prevent>{{ this.mvea.country_code }} {{ this.mvea.area_code }} {{ this.mvea.number }}</a>                                              
       </div>
       <div class="field-data data-label">
         <span class="mr-1 badge bg-light">{{ this.mvea.type.display_name }}</span>
@@ -137,7 +139,7 @@ export default {
     <!-- Urls -->
     <li class="field-data-container linked-row" v-if="this.core.mveaType == 'urls'" @click="followRowLink">
       <div class="field-data force-wrap">
-        <a :href="mveaLink" class="row-link">{{ this.mvea.description != '' ? this.mvea.description : this.mvea.url }}</a>   
+        <a :href="mveaLink" class="row-link" @click.prevent>{{ this.mvea.description != '' ? this.mvea.description : this.mvea.url }}</a>   
         <a :href="this.mvea.url" class="canvas-url-link" :title="this.txt['global.visit.link']"><span class="material-icons">north_east</span></a>
       </div>
       <div class="field-data data-label">
@@ -147,7 +149,7 @@ export default {
     <!-- Pronouns -->
     <li class="field-data-container linked-row" v-if="this.core.mveaType == 'pronouns'" @click="followRowLink">
       <div class="field-data force-wrap">
-        <a :href="mveaLink" class="row-link">{{ this.mvea.type_id }}</a>                                              
+        <a :href="mveaLink" class="row-link" @click.prevent>{{ this.mvea.type_id }}</a>                                              
       </div>
       <div class="field-data data-label">
         <span class="mr-1 badge bg-light">{{ this.mvea.type.display_name }}</span>

From 36acf397f57d422c460796495169f6029ec10938 Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Fri, 7 Apr 2023 11:05:26 -0400
Subject: [PATCH 05/18] Hide secondary subnavigation on Person Canvas (CFM-249)

---
 app/templates/element/subnavigation.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/templates/element/subnavigation.php b/app/templates/element/subnavigation.php
index 34b0bec98..d729bd380 100644
--- a/app/templates/element/subnavigation.php
+++ b/app/templates/element/subnavigation.php
@@ -314,7 +314,12 @@
       <?php endif; // group ?>
     </ul>
   </nav>
-    
+
+  <?php /* XXX Disable Person Canvas subnav by limiting the code below to Person Roles and 
+        External IDs temporarily. We expect to remove all of this once the full conversion to modal editing 
+        of MVEAs is complete. At that point, there will be no need for second-level subnavigation. */ ?>
+  <?php if($isPersonRole || $isExternalId): ?>
+  
   <?php if(!empty($subActive) && !($curController == 'PersonRoles' && $curAction == 'add')): ?>
   <!-- Second Level Subnavigation Links -->
     <?php
@@ -615,5 +620,7 @@
       </div>
     <?php endif; // external identity 2nd level subnav ?>
   <?php endif; // 2nd level subnav ?>
+  
+  <?php endif; // end $isPersonRole || $isExternalId -- the temporary limit for subnavigation ?>
 </div>
   
\ No newline at end of file

From 578e328c6ada74937a2232b717ecc9d1541a6a2b Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Fri, 7 Apr 2023 11:19:24 -0400
Subject: [PATCH 06/18] Trival cleanup of deprecated code and comments
 (CFM-249)

---
 app/templates/element/mveaModal.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/templates/element/mveaModal.php b/app/templates/element/mveaModal.php
index 8e5b32d29..5f73501f6 100644
--- a/app/templates/element/mveaModal.php
+++ b/app/templates/element/mveaModal.php
@@ -66,14 +66,14 @@
         this.modal.title = title;
         this.modal.url = url;
         this.componentRef = componentRef;
-        this.mveaModal.show();
+        this.mveaModal.show(); // this is a call to Bootstrap dialog set up in mounted()
       },
       refreshMveaComponent() {
         // Get a reference to the MVEA component we're updating
         const ref = window[this.componentRef];
         if (typeof (ref) === "undefined") {
           // The component doesn't exist, so reload the page to construct the new 
-          // MVEA component on the canvas (at least for now)
+          // MVEA component on the canvas
           location.reload();
         } else {
           // refresh the existing component via ajax
@@ -82,7 +82,6 @@
         // Clear the modal after a refresh
         this.modal.title = '';
         this.modal.url = '';
-        //this.componentRef = null;
       }
     },
     mounted() {
@@ -91,7 +90,6 @@
       var thisComponent = this;
       // When the modal is hidden, refresh the relevant component
       this.modalElement.addEventListener('hide.bs.modal', function (e) {
-        //e.stopPropagation();
         thisComponent.refreshMveaComponent();
       })
     }

From 6edffcc2402034e37cd903d2ada7db0c6ff49ca7 Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Fri, 7 Apr 2023 11:31:13 -0400
Subject: [PATCH 07/18] Ensure Groups subnavigation doesn't complain of missing
 variables (CFM-249)

---
 app/templates/element/subnavigation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/element/subnavigation.php b/app/templates/element/subnavigation.php
index d729bd380..0be103d66 100644
--- a/app/templates/element/subnavigation.php
+++ b/app/templates/element/subnavigation.php
@@ -318,7 +318,7 @@
   <?php /* XXX Disable Person Canvas subnav by limiting the code below to Person Roles and 
         External IDs temporarily. We expect to remove all of this once the full conversion to modal editing 
         of MVEAs is complete. At that point, there will be no need for second-level subnavigation. */ ?>
-  <?php if($isPersonRole || $isExternalId): ?>
+  <?php if(!empty($subActive) && ($isPersonRole || $isExternalId)): ?>
   
   <?php if(!empty($subActive) && !($curController == 'PersonRoles' && $curAction == 'add')): ?>
   <!-- Second Level Subnavigation Links -->

From 81aab8c1fa38282c098bb3913ada537c461f2bd4 Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Wed, 12 Apr 2023 13:13:37 -0400
Subject: [PATCH 08/18] Move MVEA canvas attributes into fields-nav.inc. Rename
 canvas from "person" to "mvea" for more generic treatment across views.
 (CFM-249)

---
 app/templates/People/fields-nav.inc           | 20 ++++++++++++++-----
 app/templates/Standard/add-edit-view.php      | 14 ++++++++-----
 app/templates/element/javascript.php          |  2 +-
 .../{personCanvas.php => mveaCanvas.php}      | 19 +++++-------------
 app/webroot/css/co-base.css                   |  2 +-
 5 files changed, 31 insertions(+), 26 deletions(-)
 rename app/templates/element/{personCanvas.php => mveaCanvas.php} (90%)

diff --git a/app/templates/People/fields-nav.inc b/app/templates/People/fields-nav.inc
index 5ee314e2f..186ac1dac 100644
--- a/app/templates/People/fields-nav.inc
+++ b/app/templates/People/fields-nav.inc
@@ -25,9 +25,20 @@
  * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
  */
 
-// XXX: if CFM-218 (Make fields.inc configuration only) is accepted, move the contents of this file into fields.inc
-
-// Output for $topLinks from this specific configuration is presented in the Person canvas "Actions" menu.   
+// List the MVEAs that may be shown on the mveaCanvas
+// When this array exists, the mveaCanvas.php element will render  
+$mveas = [
+  'names',
+  'email_addresses',
+  'identifiers',
+  'ad_hoc_attributes',
+  'addresses',
+  'telephone_numbers',
+  'urls',
+  'pronouns'
+];
+  
+// Output for $topLinks from this specific configuration is presented in the mveaCanvas.php "Actions" menu.   
 $topLinks = [
   [
     'icon' => 'history',
@@ -44,8 +55,7 @@ $topLinks = [
 ];
   
 // $addMenuLinks is also given slightly different treatment from the typical $topLinks found in most views: 
-// it is a page-global menu used for adding MVEAs to the person canvas and is given special treatment in
-// element/personCanvas.php.
+// it is a page-global menu used for adding MVEAs and is given special treatment in element/mveaCanvas.php.
 $addMenuLinks = [
   [
     'controller' => 'names',
diff --git a/app/templates/Standard/add-edit-view.php b/app/templates/Standard/add-edit-view.php
index b1c2e2c3e..dd506e873 100644
--- a/app/templates/Standard/add-edit-view.php
+++ b/app/templates/Standard/add-edit-view.php
@@ -80,11 +80,15 @@
 }
 ?>
 
-<?php /** Special case the Person "canvas" **/ ?>
-<?php if($modelsName == 'People' &&  $vv_action == 'edit'): ?>
+<?php /**  MVEA Canvas output **/ ?>
+<?php if(!empty($mveas)): ?>
   <?php
-    // The person canvas has $addMenuLinks defined in templates/People/fields-nav.inc config. 
-    print $this->element('personCanvas', ['vv_add_menu_links' => $addMenuLinks]); 
+    // Pass along the $mveas and any $addMenuLinks defined in templates/.../fields-nav.inc config. 
+    print $this->element('mveaCanvas', 
+      [
+        'vv_mveas' => $mveas,
+        'vv_add_menu_links' => !empty($addMenuLinks) ? $addMenuLinks : ''
+      ]); 
   ?>
 <?php else: /** Normal output **/ ?>
   <div class="pageTitleContainer">
@@ -175,7 +179,7 @@
       }
     ?>
   </div>
-<?php endif; /** end Person "canvas" vs. normal output **/?>
+<?php endif; /** end MVEA Canvas vs. normal output **/?>
 
 <?php if(empty($subnav)): ?>
   <?php /* Flash Messages are placed below the main title when there's no subnavigation. */ ?>
diff --git a/app/templates/element/javascript.php b/app/templates/element/javascript.php
index 45c5ef147..0933962e4 100644
--- a/app/templates/element/javascript.php
+++ b/app/templates/element/javascript.php
@@ -207,7 +207,7 @@
     
     // Person canvas "Add" links
     // Launch the MVEA modal window, load the Add url, and refresh the appropriate component when done.
-    $('#person-actions-add-menu-container ul a').click(function(e) {
+    $('#mvea-add-menu-container ul a').click(function(e) {
       e.preventDefault();
       e.stopPropagation();
       var title = $(this).find('.action-link-text').text();
diff --git a/app/templates/element/personCanvas.php b/app/templates/element/mveaCanvas.php
similarity index 90%
rename from app/templates/element/personCanvas.php
rename to app/templates/element/mveaCanvas.php
index 44eebdbfd..5f90cd622 100644
--- a/app/templates/element/personCanvas.php
+++ b/app/templates/element/mveaCanvas.php
@@ -1,6 +1,6 @@
 <?php
   /**
-   * COmanage Registry Person Canvas Element
+   * COmanage Registry MVEA Canvas Element
    *
    * Portions licensed to the University Corporation for Advanced Internet
    * Development, Inc. ("UCAID") under one or more contributor license agreements.
@@ -40,10 +40,10 @@
   // Build the Add menu
   $action_args = array();
   $action_args['vv_attr_id'] =  $curId;
-  $action_args['vv_actions_type'] = 'person-actions-add-menu';
+  $action_args['vv_actions_type'] = 'mvea-add-menu';
   $action_args['vv_actions_title'] = __d('operation','add');
   $action_args['vv_actions_icon'] = 'add_circle';
-  $action_args['vv_actions_class'] = 'person-actions-add-menu';
+  $action_args['vv_actions_class'] = 'mvea-add-menu';
   $actionOrderDefault = $this->Menu->getMenuOrder('Default');
   $personAddMenuActions = $vv_add_menu_links;
   foreach(($personAddMenuActions ?? []) as $a) {
@@ -73,7 +73,7 @@
     ];
   }
 ?>
-<div id="person-actions-add-menu-container" class="field-actions">
+<div id="mvea-add-menu-container" class="field-actions">
   <?= $this->element('menuAction', $action_args) ?>
 </div>
 
@@ -81,16 +81,7 @@
 <?php
   // Construct the canvas using JavaScript components.
   // Person Attributes to display.
-  $attributes = [
-    'names',
-    'email_addresses',
-    'identifiers',
-    'ad_hoc_attributes',
-    'addresses',
-    'telephone_numbers',
-    'urls',
-    'pronouns'
-  ];
+  $attributes = $vv_mveas;
   
   // Count the number of widgets that will be displayed 
   $widgetCount = 0;
diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css
index bd958f4d8..6a7bcd64d 100644
--- a/app/webroot/css/co-base.css
+++ b/app/webroot/css/co-base.css
@@ -1022,7 +1022,7 @@ table.index-table .form-check {
 #person-actions .action-menu-toggle {
   white-space: nowrap;
 }
-#person-actions-add-menu-container {
+#mvea-add-menu-container {
   float: right;
   margin: 1em 0 0;
 }

From dfac6c1c2e24d979754bf160aa0e21a263be38e3 Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Wed, 26 Apr 2023 16:16:32 -0400
Subject: [PATCH 09/18] Move MVEA Canvas below standard edit form. Make the
 canvas available to External Identities. (CFM-249)

---
 app/resources/locales/en_US/information.po    |   3 +
 app/resources/locales/en_US/menu.po           |   3 -
 .../Model/Table/ExternalIdentitiesTable.php   |   7 +-
 app/src/Model/Table/PeopleTable.php           |   3 +-
 .../ExternalIdentities/fields-nav.inc         |  70 ++++++++++++
 app/templates/People/fields-nav.inc           |   3 +
 app/templates/Standard/add-edit-view.php      |  23 ++--
 app/templates/element/mveaCanvas.php          | 103 +++++++++---------
 app/webroot/css/co-base.css                   |  21 +++-
 app/webroot/css/co-responsive.css             |   2 +-
 10 files changed, 159 insertions(+), 79 deletions(-)

diff --git a/app/resources/locales/en_US/information.po b/app/resources/locales/en_US/information.po
index 4cd7ed3a2..768e9d7dd 100644
--- a/app/resources/locales/en_US/information.po
+++ b/app/resources/locales/en_US/information.po
@@ -51,6 +51,9 @@ msgstr "Active, Cannot Be Disabled"
 msgid "plugin.inactive"
 msgstr "Inactive"
 
+msgid "global.attributes"
+msgstr "Attributes"
+
 msgid "global.records.none"
 msgstr "There are no records to display."
 
diff --git a/app/resources/locales/en_US/menu.po b/app/resources/locales/en_US/menu.po
index a875c0671..9fb8208b0 100644
--- a/app/resources/locales/en_US/menu.po
+++ b/app/resources/locales/en_US/menu.po
@@ -24,9 +24,6 @@
 
 # Menu Messages
 
-msgid "co.Attributes"
-msgstr "Attributes"
-
 msgid "co.configuration"
 msgstr "Configuration"
 
diff --git a/app/src/Model/Table/ExternalIdentitiesTable.php b/app/src/Model/Table/ExternalIdentitiesTable.php
index 1694fd076..986300d14 100644
--- a/app/src/Model/Table/ExternalIdentitiesTable.php
+++ b/app/src/Model/Table/ExternalIdentitiesTable.php
@@ -110,14 +110,15 @@ public function initialize(array $config): void {
 // XXX does some of this stuff really belong in the controller?
     $this->setEditContains([
       'PrimaryName',
-/*      'Addresses',
+      'Addresses',
       'AdHocAttributes',
       'EmailAddresses',
       'Identifiers',
       'Names',
-      'PersonRoles',
+      //'ExternalIdentityRoles',
+      'Pronouns',
       'TelephoneNumbers',
-      'Urls'*/
+      'Urls'
     ]);
     $this->setIndexContains(['PrimaryName']);
 
diff --git a/app/src/Model/Table/PeopleTable.php b/app/src/Model/Table/PeopleTable.php
index fd131ee95..55c448acd 100644
--- a/app/src/Model/Table/PeopleTable.php
+++ b/app/src/Model/Table/PeopleTable.php
@@ -129,7 +129,8 @@ public function initialize(array $config): void {
       'EmailAddresses',
       'Identifiers',
       'Names',
-      'PersonRoles',
+      //'PersonRoles',
+      'Pronouns',
       'TelephoneNumbers',
       'Urls'
     ]);
diff --git a/app/templates/ExternalIdentities/fields-nav.inc b/app/templates/ExternalIdentities/fields-nav.inc
index 6ffd1566c..745e3b332 100644
--- a/app/templates/ExternalIdentities/fields-nav.inc
+++ b/app/templates/ExternalIdentities/fields-nav.inc
@@ -25,6 +25,22 @@
  * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
  */
 
+// List the MVEAs that may be shown on the mveaCanvas
+// When this array exists, the mveaCanvas.php element will render  
+$mveas = [
+  'names',
+  'email_addresses',
+  'identifiers',
+  'ad_hoc_attributes',
+  'addresses',
+  'telephone_numbers',
+  'urls',
+  'pronouns'
+];
+
+// Name the MVEAs Entity Type
+$mveasEntityType = "external_identity";
+
 // XXX: if CFM-218 (Make fields.inc configuration only) is accepted, move the contents of this file into fields.inc
 $topLinks = [
   [
@@ -42,6 +58,60 @@ $topLinks = [
   ]
 ];
 
+// $addMenuLinks is also given slightly different treatment from the typical $topLinks found in most views: 
+// it is a page-global menu used for adding MVEAs and is given special treatment in element/mveaCanvas.php.
+$addMenuLinks = [
+  [
+    'controller' => 'names',
+    'action' => 'add',
+    'icon' => 'account_box',
+    'iconClass' => 'material-icons-outlined'
+  ],
+  [
+    'controller' => 'email_addresses',
+    'action' => 'add',
+    'icon' => 'email',
+    'iconClass' => 'material-icons-outlined'
+  ],
+  [
+    'controller' => 'identifiers',
+    'action' => 'add',
+    'icon' => 'fingerprint'
+  ],
+  [
+    'controller' => 'ad_hoc_attributes',
+    'action' => 'add',
+    'icon' => 'check_box',
+    'iconClass' => 'material-icons-outlined'
+  ],
+  [
+    'controller' => 'addresses',
+    'action' => 'add',
+    'icon' => 'contact_mail',
+    'iconClass' => 'material-icons-outlined'
+  ],
+  [
+    'controller' => 'history_records',
+    'action' => 'add',
+    'icon' => 'history'
+  ],
+  [
+    'controller' => 'pronouns',
+    'action' => 'add',
+    'icon' => 'transgender'
+  ],
+  [
+    'controller' => 'telephone_numbers',
+    'action' => 'add',
+    'icon' => 'phone'
+  ],
+  [
+    'controller' => 'urls',
+    'action' => 'add',
+    'icon' => 'link'
+  ]
+];
+
 $subnav = [
   'name' => 'person',
   'active' => 'external_identities',
diff --git a/app/templates/People/fields-nav.inc b/app/templates/People/fields-nav.inc
index 186ac1dac..ec60b9eb8 100644
--- a/app/templates/People/fields-nav.inc
+++ b/app/templates/People/fields-nav.inc
@@ -37,6 +37,9 @@ $mveas = [
   'urls',
   'pronouns'
 ];
+
+// Name the MVEAs Entity Type
+$mveasEntityType = "person";  
   
 // Output for $topLinks from this specific configuration is presented in the mveaCanvas.php "Actions" menu.   
 $topLinks = [
diff --git a/app/templates/Standard/add-edit-view.php b/app/templates/Standard/add-edit-view.php
index dd506e873..2ad23b5c7 100644
--- a/app/templates/Standard/add-edit-view.php
+++ b/app/templates/Standard/add-edit-view.php
@@ -80,17 +80,7 @@
 }
 ?>
 
-<?php /**  MVEA Canvas output **/ ?>
-<?php if(!empty($mveas)): ?>
-  <?php
-    // Pass along the $mveas and any $addMenuLinks defined in templates/.../fields-nav.inc config. 
-    print $this->element('mveaCanvas', 
-      [
-        'vv_mveas' => $mveas,
-        'vv_add_menu_links' => !empty($addMenuLinks) ? $addMenuLinks : ''
-      ]); 
-  ?>
-<?php else: /** Normal output **/ ?>
+<?php if(empty($mveas)): /** Normal output **/ ?>
   <div class="pageTitleContainer">
     <div class="pageTitle">
       <?php if(empty($subnav)): ?>
@@ -247,4 +237,15 @@
 
 print $this->Field->endControlSet();
 
+/** MVEA Canvas output **/
+if($vv_action != 'add' && !empty($mveas)) {
+  // Pass along the $mveas and any $addMenuLinks defined in templates/.../fields-nav.inc config. 
+  print $this->element('mveaCanvas',
+    [
+      'vv_mveas' => $mveas,
+      'vv_add_menu_links' => !empty($addMenuLinks) ? $addMenuLinks : '',
+      'vv_entity_type' => $mveasEntityType
+    ]);
+}  
+
 // XXX insert changelog metadata (+nav? or maybe we should have a dedicate index view that shows all records in revision order?)
diff --git a/app/templates/element/mveaCanvas.php b/app/templates/element/mveaCanvas.php
index 5f90cd622..ea76f0b0f 100644
--- a/app/templates/element/mveaCanvas.php
+++ b/app/templates/element/mveaCanvas.php
@@ -26,61 +26,62 @@
    */
   
   // Get the object ID
-  if (!empty($vv_obj)) {
-    // This will work for most top-level edit views
-    // XXX we might produce the $vv_primary_link for edit views so the approach below could be deprecated
-    $curId = $vv_obj->id;
-    if(!empty($vv_person_id)) {
-      $curId = $vv_person_id;
-    } elseif(!empty($vv_primary_link_id)) {
-      $curId = $vv_primary_link_id;
-    }
+  $objId = null;
+  if(!empty($vv_obj)) {
+    $objId = $vv_obj->id;
   }
   
   // Build the Add menu
-  $action_args = array();
-  $action_args['vv_attr_id'] =  $curId;
-  $action_args['vv_actions_type'] = 'mvea-add-menu';
-  $action_args['vv_actions_title'] = __d('operation','add');
-  $action_args['vv_actions_icon'] = 'add_circle';
-  $action_args['vv_actions_class'] = 'mvea-add-menu';
-  $actionOrderDefault = $this->Menu->getMenuOrder('Default');
-  $personAddMenuActions = $vv_add_menu_links;
-  foreach(($personAddMenuActions ?? []) as $a) {
-    $actionOrder = !empty($a['order']) ? $a['order'] : $actionOrderDefault++;
-    $actionIcon = !empty($a['icon']) ? $a['icon'] : $this->Menu->getMenuIcon('Default');
-    $actionIconClass = !empty($a['iconClass']) ? $a['iconClass'] : '';
-    $actionClass = !empty($a['class']) ? $a['class'] . ' nospin' : 'nospin';
-    $actionUrl = $this->Url->build(
-      [
-        'controller' => $a['controller'],
-        'action' => $a['action'],
-        '?' => [
-          'person_id' => $curId
+  if(!empty($vv_add_menu_links)) {
+    $action_args = array();
+    $action_args['vv_attr_id'] = $objId;
+    $action_args['vv_actions_type'] = 'mvea-add-menu';
+    $action_args['vv_actions_title'] = __d('operation', 'add');
+    $action_args['vv_actions_icon'] = 'add_circle';
+    $action_args['vv_actions_class'] = 'mvea-add-menu';
+    $actionOrderDefault = $this->Menu->getMenuOrder('Default');
+    $addMenuActions = $vv_add_menu_links;
+    foreach (($addMenuActions ?? []) as $a) {
+      $actionOrder = !empty($a['order']) ? $a['order'] : $actionOrderDefault++;
+      $actionIcon = !empty($a['icon']) ? $a['icon'] : $this->Menu->getMenuIcon('Default');
+      $actionIconClass = !empty($a['iconClass']) ? $a['iconClass'] : '';
+      $actionClass = !empty($a['class']) ? $a['class'] . ' nospin' : 'nospin';
+      $actionUrl = $this->Url->build(
+        [
+          'controller' => $a['controller'],
+          'action' => $a['action'],
+          '?' => [
+            $vv_entity_type . '_id' => $objId
+          ]
         ]
-      ]
-    );
-    $actionLabel = __d('controller', Cake\Utility\Inflector::camelize($a['controller']), [1]);
-    $actionDataAttrs = [['data-cm-mveatype',$a['controller']]];
-    $action_args['vv_actions'][] = [
-      'order' => $actionOrder,
-      'icon' => $actionIcon,
-      'iconClass' => $actionIconClass,
-      'url' => $actionUrl,
-      'class' => $actionClass,
-      'label' => $actionLabel,
-      'dataAttrs' => $actionDataAttrs
-    ];
+      );
+      $actionLabel = __d('controller', Cake\Utility\Inflector::camelize($a['controller']), [1]);
+      $actionDataAttrs = [['data-cm-mveatype', $a['controller']]];
+      $action_args['vv_actions'][] = [
+        'order' => $actionOrder,
+        'icon' => $actionIcon,
+        'iconClass' => $actionIconClass,
+        'url' => $actionUrl,
+        'class' => $actionClass,
+        'label' => $actionLabel,
+        'dataAttrs' => $actionDataAttrs
+      ];
+    }
   }
 ?>
-<div id="mvea-add-menu-container" class="field-actions">
-  <?= $this->element('menuAction', $action_args) ?>
+<div id="mvea-canvas-title-container">
+  <h2><?= __d('information','global.attributes') ?></h2>
+  <?php if(!empty($vv_add_menu_links)): ?>
+    <div id="mvea-add-menu-container" class="field-actions">
+      <?= $this->element('menuAction', $action_args) ?>
+    </div>
+  <?php endif; ?>
 </div>
 
 
 <?php
   // Construct the canvas using JavaScript components.
-  // Person Attributes to display.
+  // Attributes to display.
   $attributes = $vv_mveas;
   
   // Count the number of widgets that will be displayed 
@@ -90,25 +91,19 @@
       $widgetCount++;
     }
   }
-  
-  $objId = null;
-  if(!empty($vv_obj)) {
-    $objId = $vv_obj->id;
-  }
 ?>
-<div id="person-canvas" class="co-cards">
-  <!-- Person Attributes -->
-  <div id="person-canvas-attributes-js" class="row row-cols-1 g-4 <?= ($widgetCount > 1) ? 'row-cols-md-2' : ''?>">
+<div id="mvea-canvas" class="co-cards">
+  <div id="mvea-canvas-attributes-js" class="row row-cols-1 g-4 <?= ($widgetCount > 1) ? 'row-cols-md-2' : ''?>">
     <?php
       foreach($attributes as $attr) {
         if(!empty(($vv_obj[$attr]))) {
           print $this->element(
             'mveaJs',
             [
-              'htmlId' => 'person-canvas-' . $attr . '-js',
+              'htmlId' => 'mvea-canvas-' . $attr . '-js',
               'parentId' => $objId,
               'mveaType' => $attr,
-              'entityType' => 'person'
+              'entityType' => $vv_entity_type
             ]
           );
         }
diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css
index 6a7bcd64d..13234169e 100644
--- a/app/webroot/css/co-base.css
+++ b/app/webroot/css/co-base.css
@@ -625,6 +625,9 @@ ul.form-list li.alert-banner .co-alert {
 .supertitle .person-status-badge {
   margin: 0;
 }
+#subnavigation + form {
+  margin-top: 1.5em;
+}
 #subnavigation nav {
   padding: 0.5em 0;
 }
@@ -1026,21 +1029,27 @@ table.index-table .form-check {
   float: right;
   margin: 1em 0 0;
 }
-#person-canvas {
+#mvea-canvas {
   clear: both;
 }
-#person-canvas-attributes,
-#person-canvas-attributes-js {
+#mvea-canvas-title-container {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin: 3em 0 -1.5em;
+}
+#mvea-canvas-attributes,
+#mvea-canvas-attributes-js {
   margin-top: 0;
   margin-bottom: 2em;
 }
-#person-canvas-attributes-js .badge {
+#mvea-canvas-attributes-js .badge {
   margin-right: 0.5em;
 }
-#person-canvas-attributes-js .canvas-url-link {
+#mvea-canvas-attributes-js .canvas-url-link {
   margin-left: 1em;
 }
-#person-canvas-roles {
+#mvea-canvas-roles {
   margin-bottom: 2em;
 }
 h2.card-title {
diff --git a/app/webroot/css/co-responsive.css b/app/webroot/css/co-responsive.css
index b957c7f89..279d22b47 100644
--- a/app/webroot/css/co-responsive.css
+++ b/app/webroot/css/co-responsive.css
@@ -105,7 +105,7 @@
     grid-template-columns: 1fr 1fr;
     align-items: center;
   }
-  #person-canvas-roles .field-data-container {
+  #mvea-canvas-roles .field-data-container {
     grid-template-columns: 1fr 1fr 2fr auto;
   }
   /* PAGINATION */

From ee97f54cd15591c20167f4c1fa9ffb4cb367fac8 Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Thu, 27 Apr 2023 12:07:39 -0400
Subject: [PATCH 10/18] Clean up External Id subnavigation (CFM-249)

---
 app/templates/element/subnavigation.php | 110 ++++--------------------
 1 file changed, 19 insertions(+), 91 deletions(-)

diff --git a/app/templates/element/subnavigation.php b/app/templates/element/subnavigation.php
index 0be103d66..40cfd82f8 100644
--- a/app/templates/element/subnavigation.php
+++ b/app/templates/element/subnavigation.php
@@ -396,14 +396,14 @@
               );
             ?>
           </li>
-          <?php if(!$isPersonRole): ?>
+          <?php if($isExternalId): ?>
             <li class="list-inline-item">
               <?php
-                // Names
-                $linkClass = ($subActive == 'names') ? 'nav-link active' : 'nav-link';
+                // External Identity Roles
+                $linkClass = ($subActive == 'external_identity_roles' ||  $isExternalIdRole) ? 'nav-link active' : 'nav-link';
                 print $this->Html->link(
-                  __d('controller', 'Names', [99]),
-                  [ 'controller' => 'names',
+                  __d('controller', 'ExternalIdentityRoles', [99]),
+                  [ 'controller' => 'external_identity_roles',
                     'action' => 'index',
                     '?' => $linkFilter
                   ],
@@ -411,27 +411,15 @@
                 );
               ?>
             </li>
+          <?php endif; ?>
+          <?php if($isPersonRole): ?>
             <li class="list-inline-item">
               <?php
-                // Email Addresses
-                $linkClass = ($subActive == 'email_addresses') ? 'nav-link active' : 'nav-link';
-                print $this->Html->link(
-                  __d('controller', 'EmailAddresses', [99]),
-                  [ 'controller' => 'email_addresses',
-                    'action' => 'index',
-                    '?' => $linkFilter
-                  ],
-                  ['class' => $linkClass]
-                );
-              ?>  
-            </li>
-            <li class="list-inline-item">
-              <?php
-                // Identifiers
-                $linkClass = ($subActive == 'identifiers') ? 'nav-link active' : 'nav-link';
+                // Ad-Hoc Attributes
+                $linkClass = ($subActive == 'ad_hoc_attributes' && !($isExternalIdRole)) ? 'nav-link active' : 'nav-link';
                 print $this->Html->link(
-                  __d('controller', 'Identifiers', [99]),
-                  [ 'controller' => 'identifiers',
+                  __d('controller', 'AdHocAttributes', [99]),
+                  [ 'controller' => 'ad_hoc_attributes',
                     'action' => 'index',
                     '?' => $linkFilter
                   ],
@@ -439,73 +427,13 @@
                 );
               ?>
             </li>
-            <?php if($isExternalId): ?>
-              <li class="list-inline-item">
-                <?php
-                  // External Identity Roles
-                  $linkClass = ($subActive == 'external_identity_roles' ||  $isExternalIdRole) ? 'nav-link active' : 'nav-link';
-                  print $this->Html->link(
-                    __d('controller', 'ExternalIdentityRoles', [99]),
-                    [ 'controller' => 'external_identity_roles',
-                      'action' => 'index',
-                      '?' => $linkFilter
-                    ],
-                    ['class' => $linkClass]
-                  );
-                ?>
-              </li>
-            <?php endif; ?>
-          <?php endif; ?>
-          <li class="list-inline-item">
-            <?php
-              // Ad-Hoc Attributes
-              $linkClass = ($subActive == 'ad_hoc_attributes' && !($isExternalIdRole)) ? 'nav-link active' : 'nav-link';
-              print $this->Html->link(
-                __d('controller', 'AdHocAttributes', [99]),
-                [ 'controller' => 'ad_hoc_attributes',
-                  'action' => 'index',
-                  '?' => $linkFilter
-                ],
-                ['class' => $linkClass]
-              );
-            ?>
-          </li>
-          <li class="list-inline-item">
-            <?php
-              // Addresses
-              $linkClass = ($subActive == 'addresses' && !($isExternalIdRole)) ? 'nav-link active' : 'nav-link';
-              print $this->Html->link(
-                __d('controller', 'Addresses', [99]),
-                [ 'controller' => 'addresses',
-                  'action' => 'index',
-                  '?' => $linkFilter
-                ],
-                ['class' => $linkClass]
-              );
-            ?>
-          </li>
-          <li class="list-inline-item">
-            <?php
-              // Telephone Numbers
-              $linkClass = ($subActive == 'telephone_numbers' && !($isExternalIdRole)) ? 'nav-link active' : 'nav-link';
-              print $this->Html->link(
-                __d('controller', 'TelephoneNumbers', [99]),
-                [ 'controller' => 'telephone_numbers',
-                  'action' => 'index',
-                  '?' => $linkFilter
-                ],
-                ['class' => $linkClass]
-              );
-            ?>
-          </li>
-          <?php if(!$isPersonRole): ?>
             <li class="list-inline-item">
               <?php
-                // URLs
-                $linkClass = ($subActive == 'urls') ? 'nav-link active' : 'nav-link';
+                // Addresses
+                $linkClass = ($subActive == 'addresses' && !($isExternalIdRole)) ? 'nav-link active' : 'nav-link';
                 print $this->Html->link(
-                  __d('controller', 'Urls', [99]),
-                  [ 'controller' => 'urls',
+                  __d('controller', 'Addresses', [99]),
+                  [ 'controller' => 'addresses',
                     'action' => 'index',
                     '?' => $linkFilter
                   ],
@@ -515,11 +443,11 @@
             </li>
             <li class="list-inline-item">
               <?php
-                // Pronouns
-                $linkClass = ($subActive == 'pronouns') ? 'nav-link active' : 'nav-link';
+                // Telephone Numbers
+                $linkClass = ($subActive == 'telephone_numbers' && !($isExternalIdRole)) ? 'nav-link active' : 'nav-link';
                 print $this->Html->link(
-                  __d('controller', 'Pronouns', [99]),
-                  [ 'controller' => 'pronouns',
+                  __d('controller', 'TelephoneNumbers', [99]),
+                  [ 'controller' => 'telephone_numbers',
                     'action' => 'index',
                     '?' => $linkFilter
                   ],

From 93c0d2f63412b0f9ba4886a2da2e10d0cb7d741e Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Thu, 27 Apr 2023 12:28:34 -0400
Subject: [PATCH 11/18] Add MVEA Canvas to Person Roles (CFM-249)

---
 app/templates/PersonRoles/fields-nav.inc | 33 +++++++++++
 app/templates/element/subnavigation.php  | 74 +++++-------------------
 2 files changed, 48 insertions(+), 59 deletions(-)

diff --git a/app/templates/PersonRoles/fields-nav.inc b/app/templates/PersonRoles/fields-nav.inc
index e306f822c..454647d2d 100644
--- a/app/templates/PersonRoles/fields-nav.inc
+++ b/app/templates/PersonRoles/fields-nav.inc
@@ -25,9 +25,42 @@
  * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
  */
 
+// List the MVEAs that may be shown on the mveaCanvas
+// When this array exists, the mveaCanvas.php element will render  
+$mveas = [
+  'ad_hoc_attributes',
+  'addresses',
+  'telephone_numbers'
+];
+
+// Name the MVEAs Entity Type
+$mveasEntityType = "person_role";
+
 // XXX: if CFM-218 (Make fields.inc configuration only) is accepted, move the contents of this file into fields.inc
 $topLinks = [];
 
+// $addMenuLinks is also given slightly different treatment from the typical $topLinks found in most views: 
+// it is a page-global menu used for adding MVEAs and is given special treatment in element/mveaCanvas.php.
+$addMenuLinks = [
+  [
+    'controller' => 'ad_hoc_attributes',
+    'action' => 'add',
+    'icon' => 'check_box',
+    'iconClass' => 'material-icons-outlined'
+  ],
+  [
+    'controller' => 'addresses',
+    'action' => 'add',
+    'icon' => 'contact_mail',
+    'iconClass' => 'material-icons-outlined'
+  ],
+  [
+    'controller' => 'telephone_numbers',
+    'action' => 'add',
+    'icon' => 'phone'
+  ]
+];
+
 $subnav = [
   'name' => 'person',
   'active' => 'person_roles',
diff --git a/app/templates/element/subnavigation.php b/app/templates/element/subnavigation.php
index 40cfd82f8..3acbad556 100644
--- a/app/templates/element/subnavigation.php
+++ b/app/templates/element/subnavigation.php
@@ -364,6 +364,7 @@
         print '</h2>'; 
       }
     ?>
+    <?php if($isExternalId): ?>
     <nav id="cm-<?= $name ?>-subnav-links" class="cm-subnav-links">
       <ul class="list-inline">
         <?php if($name == 'person'): ?>
@@ -396,65 +397,20 @@
               );
             ?>
           </li>
-          <?php if($isExternalId): ?>
-            <li class="list-inline-item">
-              <?php
-                // External Identity Roles
-                $linkClass = ($subActive == 'external_identity_roles' ||  $isExternalIdRole) ? 'nav-link active' : 'nav-link';
-                print $this->Html->link(
-                  __d('controller', 'ExternalIdentityRoles', [99]),
-                  [ 'controller' => 'external_identity_roles',
-                    'action' => 'index',
-                    '?' => $linkFilter
-                  ],
-                  ['class' => $linkClass]
-                );
-              ?>
-            </li>
-          <?php endif; ?>
-          <?php if($isPersonRole): ?>
-            <li class="list-inline-item">
-              <?php
-                // Ad-Hoc Attributes
-                $linkClass = ($subActive == 'ad_hoc_attributes' && !($isExternalIdRole)) ? 'nav-link active' : 'nav-link';
-                print $this->Html->link(
-                  __d('controller', 'AdHocAttributes', [99]),
-                  [ 'controller' => 'ad_hoc_attributes',
-                    'action' => 'index',
-                    '?' => $linkFilter
-                  ],
-                  ['class' => $linkClass]
-                );
-              ?>
-            </li>
-            <li class="list-inline-item">
-              <?php
-                // Addresses
-                $linkClass = ($subActive == 'addresses' && !($isExternalIdRole)) ? 'nav-link active' : 'nav-link';
-                print $this->Html->link(
-                  __d('controller', 'Addresses', [99]),
-                  [ 'controller' => 'addresses',
-                    'action' => 'index',
-                    '?' => $linkFilter
-                  ],
-                  ['class' => $linkClass]
-                );
-              ?>
-            </li>
-            <li class="list-inline-item">
-              <?php
-                // Telephone Numbers
-                $linkClass = ($subActive == 'telephone_numbers' && !($isExternalIdRole)) ? 'nav-link active' : 'nav-link';
-                print $this->Html->link(
-                  __d('controller', 'TelephoneNumbers', [99]),
-                  [ 'controller' => 'telephone_numbers',
-                    'action' => 'index',
-                    '?' => $linkFilter
-                  ],
-                  ['class' => $linkClass]
-                );
-              ?>
-            </li>
+          <li class="list-inline-item">
+            <?php
+              // External Identity Roles
+              $linkClass = ($subActive == 'external_identity_roles' ||  $isExternalIdRole) ? 'nav-link active' : 'nav-link';
+              print $this->Html->link(
+                __d('controller', 'ExternalIdentityRoles', [99]),
+                [ 'controller' => 'external_identity_roles',
+                  'action' => 'index',
+                  '?' => $linkFilter
+                ],
+                ['class' => $linkClass]
+              );
+            ?>
+          </li>
           <?php endif; ?>
         <?php endif; // person subnav ?>
       </ul>

From a753417e5d644e41e5e7274e7fa6cf1d5e8709f9 Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Thu, 27 Apr 2023 12:40:05 -0400
Subject: [PATCH 12/18] Stylistic cleanup (CFM-249)

---
 app/webroot/css/co-base.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css
index 13234169e..cc8555468 100644
--- a/app/webroot/css/co-base.css
+++ b/app/webroot/css/co-base.css
@@ -625,12 +625,12 @@ ul.form-list li.alert-banner .co-alert {
 .supertitle .person-status-badge {
   margin: 0;
 }
-#subnavigation + form {
-  margin-top: 1.5em;
-}
 #subnavigation nav {
   padding: 0.5em 0;
 }
+#cm-person-subnav-tabs {
+  margin-bottom: 1.5em;
+}
 .cm-subnav-tabs .nav-link {
   text-transform: uppercase;
   padding: 1em 1.5em;

From e3de546738ab3473fc921dcbf96090ebab706091 Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Thu, 27 Apr 2023 14:29:15 -0400
Subject: [PATCH 13/18] First pass for cleanup and simplification of
 subnavigation and titles (CFM-249)

---
 app/templates/Standard/add-edit-view.php | 157 +++++++++++------------
 app/templates/Standard/index.php         |  10 +-
 app/templates/element/subnavigation.php  |  60 ++-------
 app/webroot/css/co-base.css              |   7 +-
 app/webroot/css/co-responsive.css        |   2 +-
 5 files changed, 90 insertions(+), 146 deletions(-)

diff --git a/app/templates/Standard/add-edit-view.php b/app/templates/Standard/add-edit-view.php
index 2ad23b5c7..a98dee8a5 100644
--- a/app/templates/Standard/add-edit-view.php
+++ b/app/templates/Standard/add-edit-view.php
@@ -80,96 +80,83 @@
 }
 ?>
 
-<?php if(empty($mveas)): /** Normal output **/ ?>
-  <div class="pageTitleContainer">
-    <div class="pageTitle">
-      <?php if(empty($subnav)): ?>
-        <h1><?= $vv_title; ?></h1>
-      <?php else: ?>
-        <?php if(
-          // Subnavigation contains an h2 for these entities, so we need an h3
-          $vv_primary_link == 'person_role_id'
-          || $vv_primary_link == 'external_identity_id'
-          || $vv_primary_link == 'external_identity_role_id'
-          || $this->request->getParam('controller') == 'PersonRoles'
-          || $this->request->getParam('controller') == 'ExternalIdentities'
-          || $this->request->getParam('controller') == 'ExternalIdentityRoles'): ?>
-          <h3><?= $vv_title; ?></h3>
-        <?php else: ?>
-          <h2><?= $vv_title; ?></h2>
-        <?php endif; ?>
-      <?php endif; ?>
-    </div>
-    <?php
-      // Action list for top menu dropdown / button listing
-      $action_args = array();
-      $action_args['vv_attr_id'] =  $vv_obj->id;
-      
-      foreach(($topLinks ?? []) as $t) {
-        $perm = false;
-
-        if(!empty($t['link']['controller'])) {
-          // We're linking into a related model
-
-          $linkModel = \Cake\Utility\Inflector::camelize($t['link']['controller']);
-
-          if(isset($vv_permissions[$linkModel][ $t['link']['action'] ])) {
-            $perm = $vv_permissions[$linkModel][ $t['link']['action'] ];
-          }
-
-          // Inject a link to the current object ID
-          $t['link']['?'][\App\Lib\Util\StringUtilities::entityToForeignKey($vv_obj)] = $vv_obj->id;
-        } else {
-          $perm = $vv_permissions[ $t['link']['action'] ];
-
-          // We need to inject $linkFilter, but not overwrite any existing query params
-          if(!empty($t['link']['?'])) {
-            $t['link']['?'] = array_merge($t['link']['?'], $linkFilter);
-          } else {
-            $t['link']['?'] = $linkFilter;
-          }
+<div class="pageTitleContainer">
+  <div class="pageTitle">
+    <?php if(empty($subnav)): ?>
+      <h1><?= $vv_title; ?></h1>
+    <?php else: ?>
+      <h2><?= $vv_title; ?></h2>
+    <?php endif; ?>
+  </div>
+  <?php
+    // Action list for top menu dropdown / button listing
+    $action_args = array();
+    $action_args['vv_attr_id'] =  $vv_obj->id;
+    
+    foreach(($topLinks ?? []) as $t) {
+      $perm = false;
+
+      if(!empty($t['link']['controller'])) {
+        // We're linking into a related model
+
+        $linkModel = \Cake\Utility\Inflector::camelize($t['link']['controller']);
+
+        if(isset($vv_permissions[$linkModel][ $t['link']['action'] ])) {
+          $perm = $vv_permissions[$linkModel][ $t['link']['action'] ];
         }
 
-        if($perm) {
-          $action_args['vv_actions'][] = [
-            'order' => $this->Menu->getMenuOrder($t['order']),
-            'icon' => $this->Menu->getMenuIcon($t['icon']),
-            'url' => $this->Url->build($t['link']),
-            'label' => $t['label'],
-          ];
+        // Inject a link to the current object ID
+        $t['link']['?'][\App\Lib\Util\StringUtilities::entityToForeignKey($vv_obj)] = $vv_obj->id;
+      } else {
+        $perm = $vv_permissions[ $t['link']['action'] ];
+
+        // We need to inject $linkFilter, but not overwrite any existing query params
+        if(!empty($t['link']['?'])) {
+          $t['link']['?'] = array_merge($t['link']['?'], $linkFilter);
+        } else {
+          $t['link']['?'] = $linkFilter;
         }
       }
-    
-      // Delete
-      if($vv_action != 'add' && !empty($vv_obj->id) && $vv_permissions['delete']) {
-        $actionPostBtnArray = ['action' => 'delete', $vv_obj->id];
-        $actionUrl = $this->Url->build(['action' => 'delete', $vv_obj->id]);
-        $action_args['vv_actions'][] = array(
-          'order' => $this->Menu->getMenuOrder('Delete'),
-          'icon' =>  $this->Menu->getMenuIcon('Delete'),
-          'url' => 'javascript:void(0);',
-          'label' => __d('operation', 'delete'),
-          'class' => 'deletebutton nospin',
-          'onclick' => array(
-            'dg_bd_txt' => __d('operation', 'delete.confirm', [$vv_obj->id]),
-            'dg_post_btn_array' => $actionPostBtnArray,
-            'dg_url' => $actionUrl,
-            'dg_conf_btn' => __d('operation', 'remove'),
-            'dg_cancel_btn' => __d('operation', 'cancel'),
-            'dg_title' => __d('operation', 'remove'),
-            'dg_bd_txt_repl_str' => ''
-          )
-        );
-      }
-    
-      if(!empty($action_args['vv_actions'])) {
-        print '<div class="field-actions top-links">';
-        print $this->element('menuAction', $action_args);
-        print '</div>';
+
+      if($perm) {
+        $action_args['vv_actions'][] = [
+          'order' => $this->Menu->getMenuOrder($t['order']),
+          'icon' => $this->Menu->getMenuIcon($t['icon']),
+          'url' => $this->Url->build($t['link']),
+          'label' => $t['label'],
+        ];
       }
-    ?>
-  </div>
-<?php endif; /** end MVEA Canvas vs. normal output **/?>
+    }
+  
+    // Delete
+    if($vv_action != 'add' && !empty($vv_obj->id) && $vv_permissions['delete']) {
+      $actionPostBtnArray = ['action' => 'delete', $vv_obj->id];
+      $actionUrl = $this->Url->build(['action' => 'delete', $vv_obj->id]);
+      $action_args['vv_actions'][] = array(
+        'order' => $this->Menu->getMenuOrder('Delete'),
+        'icon' =>  $this->Menu->getMenuIcon('Delete'),
+        'url' => 'javascript:void(0);',
+        'label' => __d('operation', 'delete'),
+        'class' => 'deletebutton nospin',
+        'onclick' => array(
+          'dg_bd_txt' => __d('operation', 'delete.confirm', [$vv_obj->id]),
+          'dg_post_btn_array' => $actionPostBtnArray,
+          'dg_url' => $actionUrl,
+          'dg_conf_btn' => __d('operation', 'remove'),
+          'dg_cancel_btn' => __d('operation', 'cancel'),
+          'dg_title' => __d('operation', 'remove'),
+          'dg_bd_txt_repl_str' => ''
+        )
+      );
+    }
+  
+    if(!empty($action_args['vv_actions'])) {
+      print '<div class="field-actions top-links">';
+      print $this->element('menuAction', $action_args);
+      print '</div>';
+    }
+  ?>
+</div>
 
 <?php if(empty($subnav)): ?>
   <?php /* Flash Messages are placed below the main title when there's no subnavigation. */ ?>
diff --git a/app/templates/Standard/index.php b/app/templates/Standard/index.php
index 7b7071c0d..f22db1363 100644
--- a/app/templates/Standard/index.php
+++ b/app/templates/Standard/index.php
@@ -83,15 +83,7 @@
     <?php if(empty($subnav)): ?>
       <h1><?= $vv_title; ?></h1>
     <?php else: ?>
-      <?php if(
-        // Subnavigation contains an h2 for these entities, so we need an h3
-        $vv_primary_link == 'person_role_id'
-        || $vv_primary_link == 'external_identity_id'
-        || $vv_primary_link == 'external_identity_role_id'): ?>
-        <h3><?= $vv_title; ?></h3>
-      <?php else: ?>
-        <h2><?= $vv_title; ?></h2>
-      <?php endif; ?>
+      <h2><?= $vv_title; ?></h2>
     <?php endif; ?>
   </div>
 
diff --git a/app/templates/element/subnavigation.php b/app/templates/element/subnavigation.php
index 3acbad556..8cde20f71 100644
--- a/app/templates/element/subnavigation.php
+++ b/app/templates/element/subnavigation.php
@@ -315,54 +315,18 @@
     </ul>
   </nav>
 
-  <?php /* XXX Disable Person Canvas subnav by limiting the code below to Person Roles and 
-        External IDs temporarily. We expect to remove all of this once the full conversion to modal editing 
-        of MVEAs is complete. At that point, there will be no need for second-level subnavigation. */ ?>
-  <?php if(!empty($subActive) && ($isPersonRole || $isExternalId)): ?>
-  
-  <?php if(!empty($subActive) && !($curController == 'PersonRoles' && $curAction == 'add')): ?>
-  <!-- Second Level Subnavigation Links -->
+  <?php if(!empty($subActive) && $isExternalId): ?>
+    <!-- Second Level Subnavigation Links -->
     <?php
       $parentId = $curId;
       $curId = $this->request->getQuery($vv_primary_link);
-      if($isPersonRole || $isExternalId) {
-        if($isExternalId && !empty($vv_ei_id)) {
-          $curId = $vv_ei_id;
-        }
-        // We display the role or external identity name above the subnav to show the hierarchy.
-        // We also use this structure to set the second-level $linkFilter
-        print '<h2>';
-        if(!empty($vv_ei_name)) {
-          // We have an external identity name
-          print $vv_ei_name->full_name;
-          $linkFilter = ['external_identity_id' => $curId];
-        } elseif(!empty($vv_person_role)) {
-          // We have a person role
-          print $vv_person_role;
-          $linkFilter = ['person_role_id' => $curId];
-        } elseif(!empty($vv_obj)) {
-          // We are editing/viewing an object
-          if(!empty($vv_obj->title)) {
-            print $vv_obj->title;
-          } elseif (!empty($vv_subtitle)) {
-            print $vv_subtitle;
-          } else {
-            print print __d('information','global.title.none');
-          }
-          // Set up $linkFilter for edit/view on Roles and External Identities
-          $curId = $vv_obj->id;
-          if($curController == 'PersonRoles') {
-            $linkFilter = ['person_role_id' => $curId];
-          }
-          if($curController == 'ExternalIdentities') {
-            $linkFilter = ['external_identity_id' => $curId];
-          }
-        } else {
-          // We shouldn't get here, but have a deafult in case.
-          print __d('information','global.title.none');
-        }
-        print '</h2>'; 
-      }
+      if(!empty($vv_ei_id)) {
+        $curId = $vv_ei_id;
+        $linkFilter = ['external_identity_id' => $curId];
+      } elseif(!empty($vv_obj)) {
+        $curId = $vv_obj->id;
+        $linkFilter = ['external_identity_id' => $curId];
+      } 
     ?>
     <?php if($isExternalId): ?>
     <nav id="cm-<?= $name ?>-subnav-links" class="cm-subnav-links">
@@ -502,9 +466,7 @@
           </ul>  
         </nav>
       </div>
-    <?php endif; // external identity 2nd level subnav ?>
-  <?php endif; // 2nd level subnav ?>
-  
-  <?php endif; // end $isPersonRole || $isExternalId -- the temporary limit for subnavigation ?>
+    <?php endif; // end $isExternalIdRole ?>
+  <?php endif; // end  $isExternalId ?>
 </div>
   
\ No newline at end of file
diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css
index cc8555468..ab88eef49 100644
--- a/app/webroot/css/co-base.css
+++ b/app/webroot/css/co-base.css
@@ -50,7 +50,7 @@ h1.loginMsg {
 }
 h2 {
   font-size: 2em;
-  line-height: 2.5em;
+  line-height: 2em;
   margin: 0;
 }
 h3 {
@@ -631,6 +631,9 @@ ul.form-list li.alert-banner .co-alert {
 #cm-person-subnav-tabs {
   margin-bottom: 1.5em;
 }
+#cm-person-subnav-links {
+  margin-top: -2em;
+}
 .cm-subnav-tabs .nav-link {
   text-transform: uppercase;
   padding: 1em 1.5em;
@@ -1036,7 +1039,7 @@ table.index-table .form-check {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  margin: 3em 0 -1.5em;
+  margin: 3em 0 -0.5em;
 }
 #mvea-canvas-attributes,
 #mvea-canvas-attributes-js {
diff --git a/app/webroot/css/co-responsive.css b/app/webroot/css/co-responsive.css
index 279d22b47..14cfa1c5a 100644
--- a/app/webroot/css/co-responsive.css
+++ b/app/webroot/css/co-responsive.css
@@ -52,7 +52,7 @@
   }
   h2 {
     font-size: 2em;
-    line-height: 2em;
+    line-height: 1.2em;
   }
   #logout {
     display: block;

From fe907a0a206ff4e26cd824e5fbc4b8dd1789f532 Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Thu, 27 Apr 2023 15:56:07 -0400
Subject: [PATCH 14/18] Fix conflicting modal dialog ID (CFM-249)

---
 app/webroot/js/comanage/components/mvea/mvea-modal.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/webroot/js/comanage/components/mvea/mvea-modal.js b/app/webroot/js/comanage/components/mvea/mvea-modal.js
index 014d52357..0977d3ae2 100644
--- a/app/webroot/js/comanage/components/mvea/mvea-modal.js
+++ b/app/webroot/js/comanage/components/mvea/mvea-modal.js
@@ -39,7 +39,7 @@ export default {
             <button type="button" className="btn-close nospin" data-bs-dismiss="modal"
                     :aria-label="txt.close"></button>
           </div>
-          <div id="dialog-text" className="modal-body">
+          <div id="mvea-modal-text" className="modal-body">
             <iframe :src="this.modal.url"/>
           </div>
         </div>

From 5dabf5cc130d8475e98407c444f4b994be83734f Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Thu, 27 Apr 2023 16:43:04 -0400
Subject: [PATCH 15/18] Turn off global person canvas Actions menu (CFM-249)

---
 app/templates/element/subnavigation.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/templates/element/subnavigation.php b/app/templates/element/subnavigation.php
index 8cde20f71..29663eac3 100644
--- a/app/templates/element/subnavigation.php
+++ b/app/templates/element/subnavigation.php
@@ -95,6 +95,7 @@
       <?php endif; ?>
     </div>
     
+    <?php /* XXX Turn off the global actions menu but leave it here for now. We may restore it for a different purpose later.
     <?php if($name == 'person'): ?>
       <!-- Specialty person dropdown menus - global actions -->
       <nav id="person-actions">
@@ -145,6 +146,7 @@
         </div>
       </nav>
     <?php endif; // person-actions ?>
+      */ ?>
   </div>
 
   <?php /* Flash Messages are placed below supertitle when subnavigation exists. */ ?>

From 0438848e8e37894141d74d3ec226195fbcbe09d4 Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Thu, 27 Apr 2023 16:53:28 -0400
Subject: [PATCH 16/18] Remove rowActions no longer needed for the Person pages
 (CFM-249)

---
 app/templates/People/columns.inc | 40 --------------------------------
 1 file changed, 40 deletions(-)

diff --git a/app/templates/People/columns.inc b/app/templates/People/columns.inc
index e64a5f37b..c0c5b27e2 100644
--- a/app/templates/People/columns.inc
+++ b/app/templates/People/columns.inc
@@ -46,24 +46,6 @@ $topLinks = [];
 
 // $rowActions appear as row-level menu items in the index view gear icon
 $rowActions = [
-  [
-    'controller' => 'names',
-    'action' => 'index',
-    'icon' => 'account_box',
-    'iconClass' => 'material-icons-outlined'
-  ],
-  [
-    'controller' => 'email_addresses',
-    'action' => 'index',
-    'icon' => 'email',
-    'iconClass' => 'material-icons-outlined'
-  ],
-  [
-    'controller' => 'identifiers',
-    'action' => 'index',
-    'icon' => 'fingerprint',
-    'class' => 'bottom-border'
-  ],
   [
     'controller' => 'person_roles',
     'action' => 'index',
@@ -75,32 +57,10 @@ $rowActions = [
     'icon' => 'system_update_alt',
     'class' => 'bottom-border'
   ],
-  [
-    'controller' => 'ad_hoc_attributes',
-    'action' => 'index',
-    'icon' => 'check_box',
-    'iconClass' => 'material-icons-outlined'
-  ],
-  [
-    'controller' => 'addresses',
-    'action' => 'index',
-    'icon' => 'contact_mail',
-    'iconClass' => 'material-icons-outlined'
-  ],
   [
     'controller' => 'history_records',
     'action' => 'index',
     'icon' => 'history'
-  ],
-  [
-    'controller' => 'telephone_numbers',
-    'action' => 'index',
-    'icon' => 'phone'
-  ],
-  [
-    'controller' => 'urls',
-    'action' => 'index',
-    'icon' => 'link'
   ]
 ];
 

From 993c1b2752ba9fcabf5f3c6dca7e2dda4802d94e Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Sun, 30 Apr 2023 16:42:57 -0400
Subject: [PATCH 17/18] Enable ESC from within iframe to hide the MVEA modal
 window (CFM-249)

---
 app/templates/element/mveaModal.php |  4 ++++
 app/templates/layout/iframe.php     | 14 ++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/app/templates/element/mveaModal.php b/app/templates/element/mveaModal.php
index 5f73501f6..8db5747a9 100644
--- a/app/templates/element/mveaModal.php
+++ b/app/templates/element/mveaModal.php
@@ -82,6 +82,10 @@
         // Clear the modal after a refresh
         this.modal.title = '';
         this.modal.url = '';
+      },
+      hide() {
+        // Can be called from inner iframe with window.parent.cmMveaModal.hide()
+        this.mveaModal.hide();
       }
     },
     mounted() {
diff --git a/app/templates/layout/iframe.php b/app/templates/layout/iframe.php
index 7c138d69d..13aae2d7b 100644
--- a/app/templates/layout/iframe.php
+++ b/app/templates/layout/iframe.php
@@ -132,6 +132,20 @@
 
     <!-- COmanage JavaScript onload scripts -->
     <?php print $this->element('javascript'); ?>
+  
+    <!-- COmanage iframe-specific JavaScript -->
+    <script>
+      $(document).keyup(function(e) {
+        if (e.key === "Escape") {
+          // If we're in a modal, dismiss it when the escape key is pressed
+          if(window.parent === top 
+            && typeof window.parent.cmMveaModal !== 'undefined'
+            && typeof window.parent.cmMveaModal.hide === 'function') {
+            window.parent.cmMveaModal.hide();
+          }
+        }
+      });
+    </script>
 
   </body>
 </html>

From ea36e63c8a60e4ed86357ba39732c62935e94a85 Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Mon, 1 May 2023 09:51:35 -0400
Subject: [PATCH 18/18] Provide a default title for the MVEA modal window
 (CFM-249)

---
 app/resources/locales/en_US/information.po | 3 +++
 app/templates/element/mveaModal.php        | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/resources/locales/en_US/information.po b/app/resources/locales/en_US/information.po
index 768e9d7dd..f129fe850 100644
--- a/app/resources/locales/en_US/information.po
+++ b/app/resources/locales/en_US/information.po
@@ -51,6 +51,9 @@ msgstr "Active, Cannot Be Disabled"
 msgid "plugin.inactive"
 msgstr "Inactive"
 
+msgid "global.attribute.modal"
+msgstr "Attribute Modal"
+
 msgid "global.attributes"
 msgstr "Attributes"
 
diff --git a/app/templates/element/mveaModal.php b/app/templates/element/mveaModal.php
index 8db5747a9..d9f2f2740 100644
--- a/app/templates/element/mveaModal.php
+++ b/app/templates/element/mveaModal.php
@@ -52,7 +52,7 @@
         },
         isLoading: true,
         modal: {
-          title: '',
+          title: '<?= __d('information','global.attribute.modal') ?>',
           url: ''
         },
         txt: JSON.parse('<?= json_encode($vueHelper->locales()) ?>')