From c3284250170440e4f9f3edc2a6e1181ef59cbfb4 Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Mon, 12 Feb 2024 11:22:21 -0500
Subject: [PATCH] First step in moving the cached EIS Record to the
 Person/External Identity subnavigation (CFM-363) (#155)

---
 .../ExtIdentitySourceRecords/fields-nav.inc   | 22 +++++++++----------
 app/templates/element/subnavigation.php       |  5 ++++-
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/templates/ExtIdentitySourceRecords/fields-nav.inc b/app/templates/ExtIdentitySourceRecords/fields-nav.inc
index 952251c10..8892e8b7f 100644
--- a/app/templates/ExtIdentitySourceRecords/fields-nav.inc
+++ b/app/templates/ExtIdentitySourceRecords/fields-nav.inc
@@ -50,15 +50,15 @@ if(!empty($vv_obj->external_identity_id)) {
       ]
     ]
   ];
-}
-
-$subnav = [
-  'name' => 'plugin',
-  'active' => 'search'
-];
-
-if(!empty($vv_obj->external_identity_source_id)) {
-  $subnav['tabsId'] = $vv_obj->external_identity_source_id;
-  $subnav['tabsController'] = 'external_identity_sources';
-  $subnav['tabsSupertitle'] = $vv_obj->external_identity_source->description;
+  
+  $subnav = [
+    'name' => 'person',
+    'active' => 'external_identities',
+    'subActive' => 'external_identity_roles',
+    'tabsId' => $vv_obj->person_id,
+    'tabsController' => 'people',
+    'subTabsId' => $vv_obj->external_identity_id,
+    'subTabsController' => 'external_identities',
+    'tabsSupertitle' =>  $vv_obj->external_identity->description
+  ];
 }
\ No newline at end of file
diff --git a/app/templates/element/subnavigation.php b/app/templates/element/subnavigation.php
index 0a6f50907..5aa1f15b1 100644
--- a/app/templates/element/subnavigation.php
+++ b/app/templates/element/subnavigation.php
@@ -194,6 +194,7 @@
           $isExternalId = (
             $vv_primary_link == 'external_identity_id'
             || $vv_primary_link == 'external_identity_role_id'
+            || $vv_primary_link == 'external_identity_source_id'
             || ($curController == 'ExternalIdentities' && ($curAction == 'edit' || $curAction == 'view'))
             || ($curController == 'ExternalIdentityRoles' && ($curAction == 'edit' || $curAction == 'view'))
           ) ? true : false;
@@ -382,7 +383,9 @@
     <?php
       $parentId = $curId;
       $curId = $this->request->getQuery($vv_primary_link);
-      if(!empty($vv_ei_id)) {
+      if(!empty($subTabsId)) {
+        $curId = $subTabsId;
+      } elseif(!empty($vv_ei_id)) {
         $curId = $vv_ei_id;
         $linkFilter = ['external_identity_id' => $curId];
       } elseif(!empty($vv_obj)) {