From 9fa8423186c9e9c0273319a34780f8c24ed07a0d Mon Sep 17 00:00:00 2001 From: Arlen Johnson Date: Mon, 15 Jan 2024 13:35:46 -0500 Subject: [PATCH 1/2] Turn off bulk edit switch on Pipelines page (CFM-363) --- app/resources/locales/en_US/menu.po | 2 +- app/templates/Pipelines/columns.inc | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/resources/locales/en_US/menu.po b/app/resources/locales/en_US/menu.po index 9ce6d37f0..17a4593af 100644 --- a/app/resources/locales/en_US/menu.po +++ b/app/resources/locales/en_US/menu.po @@ -82,7 +82,7 @@ msgid "co.connections.external_identity_sources.desc" msgstr "Define external \"systems of record\" from which to receive Person data through a Pipeline" msgid "co.connections.pipelines.desc" -msgstr "Connect external data to Person Records" +msgstr "Connect external data to Person records" msgid "co.connections.provisioning_targets.desc" msgstr "Create access to applications and services" diff --git a/app/templates/Pipelines/columns.inc b/app/templates/Pipelines/columns.inc index b8234409a..ca5bda3e6 100644 --- a/app/templates/Pipelines/columns.inc +++ b/app/templates/Pipelines/columns.inc @@ -37,7 +37,9 @@ $indexColumns = [ ] ]; +/* // TODO: develop $bulkActions. For now, use a placeholder. $bulkActions = [ 'delete' => true -]; \ No newline at end of file +]; +*/ \ No newline at end of file From 564a9c8ccb085cc2aa99fd6b5fd7b0735d32b2ec Mon Sep 17 00:00:00 2001 From: Arlen Johnson Date: Tue, 16 Jan 2024 14:45:38 -0500 Subject: [PATCH 2/2] Provide subnavigation between EISes and their plugins (and plugins generally) (CFM-363) --- .../templates/ApiSources/fields-nav.inc | 31 +++++++++++++ .../templates/FileSources/fields-nav.inc | 31 +++++++++++++ .../templates/SqlProvisioners/fields-nav.inc | 31 +++++++++++++ .../ExternalIdentitySources/fields-nav.inc | 44 ++++++++++++++++++ .../ProvisioningTargets/fields-nav.inc | 31 +++++++++++++ app/templates/element/subnavigation.php | 45 ++++++++++++++++++- 6 files changed, 211 insertions(+), 2 deletions(-) create mode 100644 app/availableplugins/ApiConnector/templates/ApiSources/fields-nav.inc create mode 100644 app/availableplugins/FileConnector/templates/FileSources/fields-nav.inc create mode 100644 app/availableplugins/SqlConnector/templates/SqlProvisioners/fields-nav.inc create mode 100644 app/templates/ExternalIdentitySources/fields-nav.inc create mode 100644 app/templates/ProvisioningTargets/fields-nav.inc diff --git a/app/availableplugins/ApiConnector/templates/ApiSources/fields-nav.inc b/app/availableplugins/ApiConnector/templates/ApiSources/fields-nav.inc new file mode 100644 index 000000000..b4d5a2809 --- /dev/null +++ b/app/availableplugins/ApiConnector/templates/ApiSources/fields-nav.inc @@ -0,0 +1,31 @@ + 'plugin', + 'active' => 'plugin' + ]; \ No newline at end of file diff --git a/app/availableplugins/FileConnector/templates/FileSources/fields-nav.inc b/app/availableplugins/FileConnector/templates/FileSources/fields-nav.inc new file mode 100644 index 000000000..4228ce579 --- /dev/null +++ b/app/availableplugins/FileConnector/templates/FileSources/fields-nav.inc @@ -0,0 +1,31 @@ + 'plugin', + 'active' => 'plugin' + ]; \ No newline at end of file diff --git a/app/availableplugins/SqlConnector/templates/SqlProvisioners/fields-nav.inc b/app/availableplugins/SqlConnector/templates/SqlProvisioners/fields-nav.inc new file mode 100644 index 000000000..3e1722b8a --- /dev/null +++ b/app/availableplugins/SqlConnector/templates/SqlProvisioners/fields-nav.inc @@ -0,0 +1,31 @@ + 'plugin', + 'active' => 'plugin' + ]; \ No newline at end of file diff --git a/app/templates/ExternalIdentitySources/fields-nav.inc b/app/templates/ExternalIdentitySources/fields-nav.inc new file mode 100644 index 000000000..9c6109179 --- /dev/null +++ b/app/templates/ExternalIdentitySources/fields-nav.inc @@ -0,0 +1,44 @@ + 'search', + 'order' => 'Default', + 'label' => __d('operation', 'ExternalIdentitySources.search'), + 'link' => [ + 'action' => 'search', + $vv_obj->id + ], + 'class' => '' + ] +]; + +$subnav = [ + 'name' => 'plugin', + 'active' => 'properties' +]; \ No newline at end of file diff --git a/app/templates/ProvisioningTargets/fields-nav.inc b/app/templates/ProvisioningTargets/fields-nav.inc new file mode 100644 index 000000000..25c275b46 --- /dev/null +++ b/app/templates/ProvisioningTargets/fields-nav.inc @@ -0,0 +1,31 @@ + 'plugin', + 'active' => 'properties' + ]; \ No newline at end of file diff --git a/app/templates/element/subnavigation.php b/app/templates/element/subnavigation.php index 37dd3f52e..7f68593ab 100644 --- a/app/templates/element/subnavigation.php +++ b/app/templates/element/subnavigation.php @@ -35,6 +35,7 @@ $curId = NULL; $curController = $this->request->getParam('controller'); $curAction = $this->request->getParam('action'); +$navController = $curController; if(!empty($vv_primary_link) && !empty($this->request->getQuery($vv_primary_link))) { // This will work for most top-level index views @@ -48,12 +49,17 @@ } elseif (!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 + // XXX $vv_primary_link_obj is the equivalent for plugins however $curId = $vv_obj->id; if(!empty($vv_person_id)) { $curId = $vv_person_id; + } elseif($active == 'plugin' && !empty($vv_primary_link_obj) && !empty($vv_primary_link_model)) { + $curId = $vv_primary_link_obj->id; + $navController = $vv_primary_link_model; } elseif(!empty($vv_primary_link_id)) { $curId = $vv_primary_link_id; } + // For top-level nav while in edit pages. if ($name == 'person') { $linkFilter = ['person_id' => $curId]; @@ -73,7 +79,9 @@ } $supertitle = __d('information','global.title.none'); -if(!empty($vv_person_name)) { +if($active == 'plugin' && !empty($vv_bc_parent_obj)) { + $supertitle = $vv_bc_parent_obj->$vv_bc_parent_displayfield; +} elseif(!empty($vv_person_name)) { $supertitle = $vv_person_name->full_name; } elseif(!empty($vv_supertitle)) { $supertitle = $vv_supertitle; @@ -301,6 +309,40 @@ ?> + + + + + + + + @@ -361,4 +403,3 @@ - \ No newline at end of file