Submenus first commit: add submenus to People and Groups (CFM-192)

app/resources/locales/en_US/menu.po

@@ -24,6 +24,9 @@
 
 # Menu Messages
 
+msgid "co.Attributes"
+msgstr "Attributes"
+
 msgid "co.configuration"
 msgstr "Config"
 

app/src/Controller/MVEAController.php

@@ -81,7 +81,9 @@ public function beforeRender(\Cake\Event\EventInterface $event) {
             $this->set('vv_ei_id', $externalIdentity->id);
 
             // What's the primary name of the Person?
-            $this->set('vv_person_name', $Names->primaryName($externalIdentity->person_id));
+            $personName = $Names->primaryName($externalIdentity->person_id);
+            $this->set('vv_person_name', $personName);
+            $this->set('vv_supertitle', $personName->full_name);
             $this->set('vv_person_id', $externalIdentity->person_id);
             break;
           case 'person_role_id':
@@ -92,11 +94,15 @@ public function beforeRender(\Cake\Event\EventInterface $event) {
             $this->set('vv_person_role_id', $link->value);
 
             // Also set a name
-            $this->set('vv_person_name', $Names->primaryName($roleEntity->person_id));
+            $personName = $Names->primaryName($roleEntity->person_id);
+            $this->set('vv_person_name', $personName);
+            $this->set('vv_supertitle', $personName->full_name);
             $this->set('vv_person_id', $roleEntity->person_id);
             break;
           case 'person_id':
-            $this->set('vv_person_name', $Names->primaryName((int)$link->value));
+            $personName = $Names->primaryName((int)$link->value);
+            $this->set('vv_person_name', $personName);
+            $this->set('vv_supertitle', $personName->full_name);
             $this->set('vv_person_id', $link->value);
             break;
           default;

app/src/Controller/StandardController.php

@@ -97,6 +97,12 @@ public function add() {
 
     // Default title is add new object
     $this->set('vv_title', __d('operation', 'add.a', __d('controller', $modelsName, [1])));
+
+    // Supertitle is normally the display name of the parent object when subnavigation exists.
+    // Set this here as the fallback default. This value is overriden in MVEAController to hold the
+    // name of the parent object, not the model name of the current object.
+    // TODO: set this to a better value for other kinds of child objects (e.g. Group member)
+    $this->set('vv_supertitle', __d('controller', $modelsName, [1]));
 
     // Let the view render
     $this->render('/Standard/add-edit-view');
@@ -322,6 +328,7 @@ public function edit(string $id) {
       // We don't use a trait for this since each table will implement different logic
 
       $this->set('vv_title', __d('operation', 'edit.ai', $table->generateDisplayField($obj)));
+      $this->set('vv_supertitle', $table->generateDisplayField($obj));
     } else {
       // Default view title is edit object display field
       $field = $table->getDisplayField();

app/templates/AdHocAttributes/columns.inc

@@ -37,4 +37,10 @@ $indexColumns = [
 $bulkActions = [
   // TODO: develop bulk actions. For now, use a placeholder. 
   'delete' => true
+];
+
+$subnav = [
+  'name' => 'person',
+  'active' => 'attributes',
+  'subActive' => 'ad_hoc_attributes'
 ];

app/templates/AdHocAttributes/fields-nav.inc

@@ -0,0 +1,35 @@
+<?php
+/**
+ * COmanage Registry Ad Hoc Attributes Edit Navigation
+ *
+ * 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)
+ */
+
+// XXX: if CFM-218 (Make fields.inc configuration only) is accepted, move the contents of this file into fields.inc
+$topLinks = [];
+
+$subnav = [
+  'name' => 'person',
+  'active' => 'attributes',
+  'subActive' => 'ad_hoc_attributes'
+];

app/templates/Addresses/columns.inc

@@ -42,3 +42,9 @@ $bulkActions = [
   // TODO: develop bulk actions. For now, use a placeholder. 
   'delete' => true
 ];
+
+$subnav = [
+  'name' => 'person',
+  'active' => 'attributes',
+  'subActive' => 'addresses'
+];

app/templates/Addresses/fields-nav.inc

@@ -0,0 +1,35 @@
+<?php
+/**
+ * COmanage Registry Addresses Edit Navigation
+ *
+ * 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)
+ */
+
+// XXX: if CFM-218 (Make fields.inc configuration only) is accepted, move the contents of this file into fields.inc
+$topLinks = [];
+
+$subnav = [
+  'name' => 'person',
+  'active' => 'attributes',
+  'subActive' => 'addresses'
+];

app/templates/EmailAddresses/columns.inc

@@ -37,4 +37,10 @@ $indexColumns = [
 $bulkActions = [
   // TODO: develop bulk actions. For now, use a placeholder. 
   'delete' => true
+];
+
+$subnav = [
+  'name' => 'person',
+  'active' => 'attributes',
+  'subActive' => 'email_addresses'
 ];

app/templates/EmailAddresses/fields-nav.inc

@@ -0,0 +1,35 @@
+<?php
+/**
+ * COmanage Registry Email Address Edit Navigation
+ *
+ * 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)
+ */
+
+// XXX: if CFM-218 (Make fields.inc configuration only) is accepted, move the contents of this file into fields.inc
+$topLinks = [];
+
+$subnav = [
+  'name' => 'person',
+  'active' => 'attributes',
+  'subActive' => 'email_addresses'
+];

app/templates/ExternalIdentities/columns.inc

@@ -40,4 +40,9 @@ $indexColumns = [
 $bulkActions = [
   // TODO: develop bulk actions. For now, use a placeholder. 
   'delete' => true
+];
+
+$subnav = [
+  'name' => 'person',
+  'active' => 'external_identities'
 ];

app/templates/GroupMembers/columns.inc

@@ -60,4 +60,9 @@ $indexColumns = [
 $bulkActions = [
   // TODO: develop bulk actions. For now, use a placeholder. 
   'delete' => true
+];
+
+$subnav = [
+  'name' => 'group',
+  'active' => 'members'
 ];

app/templates/Groups/fields-nav.inc → app/templates/GroupMembers/fields-nav.inc

@@ -1,6 +1,6 @@
 <?php
 /**
- * COmanage Registry Groups Edit Navigation
+ * COmanage Registry Group Members Edit Navigation
  *
  * Portions licensed to the University Corporation for Advanced Internet
  * Development, Inc. ("UCAID") under one or more contributor license agreements.
@@ -25,14 +25,10 @@
  * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
  */
 
-$topLinks = [
-  [
-    'icon' => 'sync',
-    'order' => 'Default',
-    'label' => __d('operation', 'reconcile'),
-    'link' => [
-      'action' => 'reconcile'
-    ],
-    'class' => ''
-  ]
+// XXX: if CFM-218 (Make fields.inc configuration only) is accepted, move the contents of this file into fields.inc
+$topLinks = [];
+
+$subnav = [
+  'name' => 'group',
+  'active' => 'members'
 ];

app/templates/GroupNestings/columns.inc

@@ -37,4 +37,9 @@ $indexColumns = [
 $bulkActions = [
   // TODO: develop bulk actions. For now, use a placeholder. 
   'delete' => true
+];
+
+$subnav = [
+  'name' => 'group',
+  'active' => 'nestings'
 ];

app/templates/GroupNestings/fields-nav.inc

@@ -0,0 +1,34 @@
+<?php
+/**
+ * COmanage Registry Group Nestings Edit Navigation
+ *
+ * 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)
+ */
+
+// XXX: if CFM-218 (Make fields.inc configuration only) is accepted, move the contents of this file into fields.inc
+$topLinks = [];
+
+$subnav = [
+  'name' => 'group',
+  'active' => 'nestings'
+];

app/templates/GroupOwners/columns.inc

@@ -39,4 +39,9 @@ $indexColumns = [
 $bulkActions = [
   // TODO: develop bulk actions. For now, use a placeholder. 
   'delete' => true
+];
+
+$subnav = [
+  'name' => 'group',
+  'active' => 'owners'
 ];

app/templates/Identifiers/columns.inc

@@ -34,11 +34,6 @@ $indexColumns = [
   ]
 ];
 
-$bulkActions = [
-  // TODO: develop bulk actions. For now, use a placeholder. 
-  'delete' => true
-];
-
 $indexActions = [
   [
     'controller' => 'authentication_events',
@@ -52,4 +47,15 @@ $indexActions = [
       ];
     }
   ]
+];
+
+$bulkActions = [
+  // TODO: develop bulk actions. For now, use a placeholder. 
+  'delete' => true
+];
+
+$subnav = [
+  'name' => 'person',
+  'active' => 'attributes',
+  'subActive' => 'identifiers'
 ];

app/templates/Identifiers/fields-nav.inc

@@ -0,0 +1,35 @@
+<?php
+/**
+ * COmanage Registry Names Edit Navigation
+ *
+ * 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)
+ */
+
+// XXX: if CFM-218 (Make fields.inc configuration only) is accepted, move the contents of this file into fields.inc
+$topLinks = [];
+
+$subnav = [
+  'name' => 'person',
+  'active' => 'attributes',
+  'subActive' => 'identifiers'
+];

app/templates/Names/columns.inc

@@ -54,4 +54,10 @@ $rowActions = [
 // TODO: develop bulk actions. For now, use a placeholder. 
 $bulkActions = [
   'delete' => true
+];
+
+$subnav = [
+  'name' => 'person',
+  'active' => 'attributes',
+  'subActive' => 'names'
 ];