From 54b502e7a513f1e4f3e3d3a6e4c896ad314cba8f Mon Sep 17 00:00:00 2001 From: Benn Oshrin Date: Mon, 26 Feb 2024 19:56:09 -0500 Subject: [PATCH 01/26] Initial implementation of Enrollment Flow infrastructure and Attribute Collector (CFM-31) --- app/config/schema/schema.json | 85 ++++++++++++++++++++ app/templates/EnrollmentFlows/fields-nav.inc | 49 +++++++++++ 2 files changed, 134 insertions(+) create mode 100644 app/templates/EnrollmentFlows/fields-nav.inc diff --git a/app/config/schema/schema.json b/app/config/schema/schema.json index f01e0e9dc..1e96101ca 100644 --- a/app/config/schema/schema.json +++ b/app/config/schema/schema.json @@ -544,6 +544,91 @@ } }, + "enrollment_flows": { + "columns": { + "id": {}, + "co_id": {}, + "name": {}, + "status": {}, + "sor_label": {}, + "authz_type": { "type": "string", "size": 2 }, + "authz_cou_id": { "type": "integer", "foreignkey": { "table": "cous", "column": "id" }}, + "authz_group_id": { "type": "integer", "foreignkey": { "table": "groups", "column": "id" }}, + "collect_enrollee_email": { "type": "boolean" }, + "redirect_on_finalize": { "type": "string", "size": 256 } + }, + "indexes": { + "enrollment_flows_i1": { "columns": [ "co_id" ]}, + "enrollment_flows_i2": { "needed": false, "columns": [ "authz_cou_id" ]}, + "enrollment_flows_i3": { "needed": false, "columns": [ "authz_group_id" ]} + } + }, + + "enrollment_flow_steps": { + "columns": { + "id": {}, + "enrollment_flow_id": { "type": "integer", "foreignkey": { "table": "enrollment_flows", "column": "id" }}, + "description": {}, + "status": {}, + "plugin": {}, + "ordr": {}, + "actor_type": { "type": "string", "size": 2 } + }, + "indexes": { + "enrollment_flow_steps_i1": { "columns": [ "enrollment_flow_id" ]} + } + }, + + "petitions": { + "columns": { + "id": {}, + "enrollment_flow_id": { "type": "integer", "foreignkey": { "table": "enrollment_flows", "column": "id" }}, + "status": {}, + "cou_id": {}, + "enrollee_email": { "type": "string", "size": 256 }, + "enrollee_identifier": { "type": "string", "size": 256 }, + "enrollee_person_id": { "type": "integer", "foreignkey": { "table": "people", "column": "id" }}, + "petitioner_identifier": { "type": "string", "size": 256 }, + "petitioner_person_id": { "type": "integer", "foreignkey": { "table": "people", "column": "id" }}, + "token": { "type": "string", "size": 256 } + }, + "indexes": { + "petitions_i1": { "columns": [ "enrollment_flow_id" ]}, + "petitions_i2": { "columns": [ "cou_id" ]}, + "petitions_i3": { "columns": [ "enrollee_person_id" ]}, + "petitions_i4": { "columns": [ "petitioner_person_id" ]} + } + }, + + "petition_step_results": { + "columns": { + "id": {}, + "petition_id": {}, + "enrollment_flow_step_id": {}, + "comment": {} + }, + "indexes": { + "petition_step_results_i1": { "columns": [ "petition_id" ] }, + "petition_step_results_i2": { "needed": false, "columns": [ "enrollment_flow_step_id" ] } + } + }, + + "petition_history_records": { + "columns": { + "id": {}, + "petition_id": {}, + "enrollment_flow_step_id": {}, + "action": {}, + "comment": {}, + "actor_person_id": { "type": "integer", "foreignkey": { "table": "people", "column": "id" } } + }, + "indexes": { + "petition_history_records_i1": { "columns": [ "petition_id" ] }, + "petition_history_records_i2": { "columns": [ "actor_person_id" ] }, + "petition_history_records_i3": { "needed": false, "columns": [ "enrollment_flow_step_id" ] } + } + }, + "message_templates": { "columns": { "id": {}, diff --git a/app/templates/EnrollmentFlows/fields-nav.inc b/app/templates/EnrollmentFlows/fields-nav.inc new file mode 100644 index 000000000..0784d543c --- /dev/null +++ b/app/templates/EnrollmentFlows/fields-nav.inc @@ -0,0 +1,49 @@ + 'format_list_numbered', + 'order' => 'Default', + 'label' => __d('controller', 'EnrollmentFlowSteps', [99]), + 'link' => [ + 'controller' => 'enrollment_flow_steps', + 'action' => 'index', + 'enrollment_flow_id' => $vv_obj->id + ], + 'class' => '' +]; + +$topLinks[] = [ + 'icon' => 'start', + 'order' => 'Default', + 'label' => __d('operation', 'EnrollmentFlows.start'), + 'link' => [ + 'action' => 'start', + $vv_obj->id + ], + 'class' => '' +]; From ddf9eb745b2e0e094d4e862e830ecc2c9c2f61c8 Mon Sep 17 00:00:00 2001 From: Arlen Johnson Date: Thu, 7 Mar 2024 14:08:40 -0500 Subject: [PATCH 02/26] Add top-level subnavigation to Enrollment Flow and Enrollment Flow Steps (CFM-31) (#166) --- app/templates/EnrollmentFlows/fields-nav.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/templates/EnrollmentFlows/fields-nav.inc b/app/templates/EnrollmentFlows/fields-nav.inc index 0784d543c..614ac726f 100644 --- a/app/templates/EnrollmentFlows/fields-nav.inc +++ b/app/templates/EnrollmentFlows/fields-nav.inc @@ -47,3 +47,8 @@ $topLinks[] = [ ], 'class' => '' ]; + +$subnav = [ + 'name' => 'enrollment_flow', + 'active' => 'properties' +]; \ No newline at end of file From 253d8769aff0e8d6540439be5601d4bad237cd4f Mon Sep 17 00:00:00 2001 From: Arlen Johnson Date: Wed, 13 Mar 2024 09:48:14 -0400 Subject: [PATCH 03/26] Add titles to Petition steps and buttons to the steps index (CFM-31) (#173) --- app/templates/Standard/dispatch.php | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/app/templates/Standard/dispatch.php b/app/templates/Standard/dispatch.php index be78db43f..d6ebac506 100644 --- a/app/templates/Standard/dispatch.php +++ b/app/templates/Standard/dispatch.php @@ -78,6 +78,33 @@ $this->set('vv_fields_inc', 'dispatch.inc'); $this->set('vv_submit_button_label', __d('operation', 'continue')); +?> + +
+
+

+
+
+ + +
+ Flash->render() ?> + + + + Alert->alert($b, 'warning') ?> + + + + + + Alert->alert($b, 'warning') ?> + + +
+ +Form->create(); From d1f5e6575a37f770d8ae6460ef1f37dd7d423584 Mon Sep 17 00:00:00 2001 From: Arlen Johnson Date: Wed, 13 Mar 2024 13:14:25 -0400 Subject: [PATCH 04/26] Simplify end-user Petition views (CFM-31) (#175) --- .../EnrollmentFlowSteps/fields-nav.inc | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 app/templates/EnrollmentFlowSteps/fields-nav.inc diff --git a/app/templates/EnrollmentFlowSteps/fields-nav.inc b/app/templates/EnrollmentFlowSteps/fields-nav.inc new file mode 100644 index 000000000..7eebea083 --- /dev/null +++ b/app/templates/EnrollmentFlowSteps/fields-nav.inc @@ -0,0 +1,31 @@ + 'enrollment_flow', + 'active' => 'steps' +]; \ No newline at end of file From d8f009f7549eb3e4b9406a59b4fe83433a87b21d Mon Sep 17 00:00:00 2001 From: Arlen Johnson Date: Wed, 14 Aug 2024 13:12:15 -0400 Subject: [PATCH 05/26] Post-rebase vs. develop corrections (CFM-31) --- app/templates/Standard/index.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/templates/Standard/index.php b/app/templates/Standard/index.php index 1d07fe396..b6e157ddd 100644 --- a/app/templates/Standard/index.php +++ b/app/templates/Standard/index.php @@ -407,7 +407,8 @@ } // Output the row actions if present - if($isFirstLink && !empty($rowActions)) { + if($isFirstLink && !empty($action_args['vv_actions'])) { + // todo check if needed print '
'; print '
'; print $this->element('menuAction', $action_args); From 7d15da5f9fcfa282521d21785f294c6b752541cc Mon Sep 17 00:00:00 2001 From: Arlen Johnson Date: Tue, 24 Sep 2024 09:16:45 -0400 Subject: [PATCH 06/26] Correct test for $rowActions post-rebase. (CFM-31) --- app/templates/Standard/index.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/templates/Standard/index.php b/app/templates/Standard/index.php index b6e157ddd..1d07fe396 100644 --- a/app/templates/Standard/index.php +++ b/app/templates/Standard/index.php @@ -407,8 +407,7 @@ } // Output the row actions if present - if($isFirstLink && !empty($action_args['vv_actions'])) { - // todo check if needed + if($isFirstLink && !empty($rowActions)) { print '
'; print '
'; print $this->element('menuAction', $action_args); From 530887efa73e7370627a9a5256a19e9b23e229b1 Mon Sep 17 00:00:00 2001 From: Ioannis Igoumenos Date: Thu, 26 Sep 2024 22:18:54 +0300 Subject: [PATCH 07/26] feature-cfm31-subnavigation (#217) * Group to tabs element * enrollment flows tabs * Person to tabs * Missing tabs code * Improve Status badge. * Typos * Core code should not depend on Plugins for subnavigation * simplify code * Move subnavigation import to a php partial * Remove obsolete files.Add support for custom actions * Active navigation tab form deep associated model * fix active navigation tab first level * Fixed deep associations * Fix tab counter for all use cases * Fix active tabs everywhere. * fix depth calculation --- .../Model/Table/AttributeCollectorsTable.php | 25 ++++++++++-- app/src/Lib/Traits/TabTrait.php | 35 ++++++++++++++++- .../EnrollmentFlowSteps/fields-nav.inc | 31 --------------- app/templates/Petitions/fields-nav.inc | 39 +++++++++++++++++++ 4 files changed, 94 insertions(+), 36 deletions(-) delete mode 100644 app/templates/EnrollmentFlowSteps/fields-nav.inc diff --git a/app/plugins/CoreEnroller/src/Model/Table/AttributeCollectorsTable.php b/app/plugins/CoreEnroller/src/Model/Table/AttributeCollectorsTable.php index 2c7701b4c..23bd6e444 100644 --- a/app/plugins/CoreEnroller/src/Model/Table/AttributeCollectorsTable.php +++ b/app/plugins/CoreEnroller/src/Model/Table/AttributeCollectorsTable.php @@ -80,15 +80,32 @@ public function initialize(array $config): void { $this->setTabsConfig( [ // Ordered list of Tabs - 'tabs' => ['EnrollmentFlowSteps', 'CoreEnroller.AttributeCollectors', 'CoreEnroller.EnrollmentAttributes'], + 'tabs' => ['EnrollmentFlows', 'EnrollmentFlowSteps', 'Petitions'], // What actions will inlcude the subnavigation header 'action' => [ // If a model renders in a subnavigation mode in edit/view mode, it cannot // render in index mode for the same use case/context // XXX edit should go first. - 'EnrollmentFlowSteps' => ['edit', 'view'], - 'CoreEnroller.AttributeCollectors' => ['edit'], - 'CoreEnroller.EnrollmentAttributes' => ['index'], + 'EnrollmentFlows' => ['edit', 'view'], + 'EnrollmentFlowSteps' => ['index'], + 'Petitions' => ['index'], + ], + // What model will have a counter-badge after the tab title + 'counter' => ['EnrollmentFlowSteps', 'Petitions'], + 'nested' => [ + // Ordered list of Tabs + 'tabs' => ['EnrollmentFlowSteps', 'CoreEnroller.AttributeCollectors', 'CoreEnroller.EnrollmentAttributes'], + // What actions will include the subnavigation header + 'action' => [ + // If a model renders in a subnavigation mode in edit/view mode, it cannot + // render in index mode for the same use case/context + // XXX edit should go first. + 'EnrollmentFlowSteps' => ['edit', 'view'], + 'CoreEnroller.AttributeCollectors' => ['edit'], + 'CoreEnroller.EnrollmentAttributes' => ['index'] + ], + // What model will have a counter-badge after the tab title + 'counter' => ['CoreEnroller.EnrollmentAttributes'], ] ] ); diff --git a/app/src/Lib/Traits/TabTrait.php b/app/src/Lib/Traits/TabTrait.php index 66f029f25..311bf3cef 100644 --- a/app/src/Lib/Traits/TabTrait.php +++ b/app/src/Lib/Traits/TabTrait.php @@ -1,6 +1,10 @@ >>>>>>> 9a427e22 (feature-cfm31-subnavigation (#217)):app/templates/element/subnavigation/inlineList.php * * Portions licensed to the University Corporation for Advanced Internet * Development, Inc. ("UCAID") under one or more contributor license agreements. @@ -25,8 +29,10 @@ * @license Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) */ + declare(strict_types = 1); +<<<<<<<< HEAD:app/src/Lib/Traits/TabTrait.php namespace App\Lib\Traits; trait TabTrait @@ -68,4 +74,31 @@ public function setTabsConfig(array $tabsConfig): void $this->tabsConfig = $tabsConfig; } -} \ No newline at end of file +} +======== +$curAction = $this->request->getParam('action'); +$curController = $this->request->getParam('controller'); +$isNested = true; + +extract($vv_sub_nav_attributes, EXTR_PREFIX_ALL, 'vv_subnavigation'); + +$curId = $this->request->getQuery($vv_primary_link) + ?? $vv_obj->id + ?? end($vv_bc_title_links[0]['target']); +?> + + +
  • + element('subnavigation/tabTitle', compact('tab', 'curId', 'isNested')); + // Construct Target URL + $url = $this->Tab->constructLinkUrl($tab, $curId, $isNested); + // Calculate Tab Style Class(es) + $linkClass = $this->Tab->getLinkClass($tab, $isNested); + // Import element in the DOM + print $this->Html->link($title, $url, ['class' => $linkClass, 'escape' => false]); + ?> +
    • + +>>>>>>>> 9a427e22 (feature-cfm31-subnavigation (#217)):app/templates/element/subnavigation/inlineList.php diff --git a/app/templates/EnrollmentFlowSteps/fields-nav.inc b/app/templates/EnrollmentFlowSteps/fields-nav.inc deleted file mode 100644 index 7eebea083..000000000 --- a/app/templates/EnrollmentFlowSteps/fields-nav.inc +++ /dev/null @@ -1,31 +0,0 @@ - 'enrollment_flow', - 'active' => 'steps' -]; \ No newline at end of file diff --git a/app/templates/Petitions/fields-nav.inc b/app/templates/Petitions/fields-nav.inc index 1609fca83..2e475199b 100644 --- a/app/templates/Petitions/fields-nav.inc +++ b/app/templates/Petitions/fields-nav.inc @@ -1,6 +1,10 @@ >>>>>>> 9a427e22 (feature-cfm31-subnavigation (#217)):app/src/Lib/Traits/TabTrait.php * * Portions licensed to the University Corporation for Advanced Internet * Development, Inc. ("UCAID") under one or more contributor license agreements. @@ -25,6 +29,7 @@ * @license Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) */ +<<<<<<<< HEAD:app/templates/Petitions/fields-nav.inc $topLinks = [ [ 'icon' => 'resume', @@ -36,3 +41,37 @@ $topLinks = [ ] ] ]; +======== +declare(strict_types = 1); + +namespace App\Lib\Traits; + +trait TabTrait +{ + /** + * Tabs configuration + * + * @var array + */ + private array $tabsConfig = []; + + /** + * @return array + */ + public function getTabsConfig(): array + { + return $this->tabsConfig; + } + + /** + * @param array $tabsConfig + * + * @return void + */ + public function setTabsConfig(array $tabsConfig): void + { + $this->tabsConfig = $tabsConfig; + } + +} +>>>>>>>> 9a427e22 (feature-cfm31-subnavigation (#217)):app/src/Lib/Traits/TabTrait.php From 65f3e68b2c146b611dbf5593503f4e1a368197c9 Mon Sep 17 00:00:00 2001 From: Arlen Johnson Date: Fri, 27 Sep 2024 16:13:30 -0400 Subject: [PATCH 08/26] Ensure a title exists on Petition start, dispatch, and resume (CFM-31) (#222) --- .../src/Controller/AttributeCollectorsController.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/plugins/CoreEnroller/src/Controller/AttributeCollectorsController.php b/app/plugins/CoreEnroller/src/Controller/AttributeCollectorsController.php index 27faa2749..0cb0f9928 100644 --- a/app/plugins/CoreEnroller/src/Controller/AttributeCollectorsController.php +++ b/app/plugins/CoreEnroller/src/Controller/AttributeCollectorsController.php @@ -118,6 +118,12 @@ public function dispatch(string $id) { ->find() ->where(['petition_id' => $petition->id]) ->all()); + + // Get the title + // XXX Replace $petition->enrollment_flow_id with the Enrollment Flow "Name" (for now) + // XXX We should have a "Title" for end-users that is different from the Enrollment Flow "Name" + // for start and dispatch. + $this->set('vv_title', $petition->enrollment_flow_id); $this->render('/Standard/dispatch'); } From d626f2186ec91ac91bd6453499dc50adb78a4b72 Mon Sep 17 00:00:00 2001 From: Arlen Johnson Date: Fri, 27 Sep 2024 16:34:24 -0400 Subject: [PATCH 09/26] Remove unnecessary top-link from Enrollment Flow properties (CFM-31) (#223) --- app/templates/EnrollmentFlows/fields-nav.inc | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/app/templates/EnrollmentFlows/fields-nav.inc b/app/templates/EnrollmentFlows/fields-nav.inc index 614ac726f..2beb1446c 100644 --- a/app/templates/EnrollmentFlows/fields-nav.inc +++ b/app/templates/EnrollmentFlows/fields-nav.inc @@ -25,18 +25,6 @@ * @license Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) */ -$topLinks[] = [ - 'icon' => 'format_list_numbered', - 'order' => 'Default', - 'label' => __d('controller', 'EnrollmentFlowSteps', [99]), - 'link' => [ - 'controller' => 'enrollment_flow_steps', - 'action' => 'index', - 'enrollment_flow_id' => $vv_obj->id - ], - 'class' => '' -]; - $topLinks[] = [ 'icon' => 'start', 'order' => 'Default', From 5563c850458271123a8334290cf95ddaf5594d80 Mon Sep 17 00:00:00 2001 From: Ioannis Igoumenos Date: Sat, 28 Sep 2024 14:21:28 +0300 Subject: [PATCH 10/26] fix deep nested navigation tab id calculation --- app/templates/element/subnavigation/tabList.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/templates/element/subnavigation/tabList.php b/app/templates/element/subnavigation/tabList.php index 5edb06e1f..706ae966d 100644 --- a/app/templates/element/subnavigation/tabList.php +++ b/app/templates/element/subnavigation/tabList.php @@ -51,6 +51,7 @@
  • Tab->getCurrentId($tab, $isNested); // Calculate Tab Title $title = $this->element('subnavigation/tabTitle', compact('tab', 'curId', 'isNested')); // Construct Target URL From 8ea1beaf4d30292555f018bcd751a0cd2e2d6e3e Mon Sep 17 00:00:00 2001 From: Arlen Johnson Date: Mon, 30 Sep 2024 12:04:14 -0400 Subject: [PATCH 11/26] Set petition titles (Enrollment Flow name, Flow Step description) in dispatch view (CFM-31) (#227) --- .../src/Controller/AttributeCollectorsController.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/plugins/CoreEnroller/src/Controller/AttributeCollectorsController.php b/app/plugins/CoreEnroller/src/Controller/AttributeCollectorsController.php index 0cb0f9928..27faa2749 100644 --- a/app/plugins/CoreEnroller/src/Controller/AttributeCollectorsController.php +++ b/app/plugins/CoreEnroller/src/Controller/AttributeCollectorsController.php @@ -118,12 +118,6 @@ public function dispatch(string $id) { ->find() ->where(['petition_id' => $petition->id]) ->all()); - - // Get the title - // XXX Replace $petition->enrollment_flow_id with the Enrollment Flow "Name" (for now) - // XXX We should have a "Title" for end-users that is different from the Enrollment Flow "Name" - // for start and dispatch. - $this->set('vv_title', $petition->enrollment_flow_id); $this->render('/Standard/dispatch'); } From 22e3bc3d764cf18c2efc5b3ab4c378ca684dc990 Mon Sep 17 00:00:00 2001 From: Arlen Johnson Date: Wed, 2 Oct 2024 09:11:35 -0400 Subject: [PATCH 12/26] Cleanup to subnavigation and titling (CFM-31) (#229) * Cleanup to subnavigation and titling (CFM-31) * Trivial cleanup (CFM-31) * More trivial cleanup (CFM-31) * Even more trivial cleanup (CFM-31) --- app/src/Model/Table/EnrollmentFlowStepsTable.php | 2 +- app/src/Model/Table/PersonRolesTable.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/Model/Table/EnrollmentFlowStepsTable.php b/app/src/Model/Table/EnrollmentFlowStepsTable.php index 99f359388..7896561ab 100644 --- a/app/src/Model/Table/EnrollmentFlowStepsTable.php +++ b/app/src/Model/Table/EnrollmentFlowStepsTable.php @@ -48,7 +48,7 @@ class EnrollmentFlowStepsTable extends Table { use \App\Lib\Traits\TabTrait; use \App\Lib\Traits\TableMetaTrait; use \App\Lib\Traits\ValidationTrait; - + /** * Perform Cake Model initialization. * diff --git a/app/src/Model/Table/PersonRolesTable.php b/app/src/Model/Table/PersonRolesTable.php index 324b81f0f..5f6a932de 100644 --- a/app/src/Model/Table/PersonRolesTable.php +++ b/app/src/Model/Table/PersonRolesTable.php @@ -175,7 +175,7 @@ public function initialize(array $config): void { // render in index mode for the same use case/context // XXX edit should go first. 'People' => ['edit', 'view'], - 'PersonRoles' => ['edit', 'view', 'index'], + 'PersonRoles' => ['edit','view','index'], 'ExternalIdentities' => ['index'], ], // What model will have a counter-badge after the tab title From 89f15c0c2f097cf11f3f11b84c5676d56f9a7e57 Mon Sep 17 00:00:00 2001 From: benno Date: Thu, 3 Oct 2024 12:35:58 -0400 Subject: [PATCH 13/26] Initial implementation of BasicAttributeCollector (CFM-415) (#231) Co-authored-by: Benn Oshrin --- .../Entity/BasicPetitionAttributeSet.php | 49 +++++++ .../Table/BasicPetitionAttributeSetsTable.php | 125 ++++++++++++++++++ 2 files changed, 174 insertions(+) create mode 100644 app/plugins/CoreEnroller/src/Model/Entity/BasicPetitionAttributeSet.php create mode 100644 app/plugins/CoreEnroller/src/Model/Table/BasicPetitionAttributeSetsTable.php diff --git a/app/plugins/CoreEnroller/src/Model/Entity/BasicPetitionAttributeSet.php b/app/plugins/CoreEnroller/src/Model/Entity/BasicPetitionAttributeSet.php new file mode 100644 index 000000000..b810bd47d --- /dev/null +++ b/app/plugins/CoreEnroller/src/Model/Entity/BasicPetitionAttributeSet.php @@ -0,0 +1,49 @@ + + */ + protected $_accessible = [ + '*' => true, + 'id' => false, + 'slug' => false, + ]; +} diff --git a/app/plugins/CoreEnroller/src/Model/Table/BasicPetitionAttributeSetsTable.php b/app/plugins/CoreEnroller/src/Model/Table/BasicPetitionAttributeSetsTable.php new file mode 100644 index 000000000..d0f7bb5bb --- /dev/null +++ b/app/plugins/CoreEnroller/src/Model/Table/BasicPetitionAttributeSetsTable.php @@ -0,0 +1,125 @@ +addBehavior('Changelog'); + $this->addBehavior('Log'); + $this->addBehavior('Timestamp'); + + $this->setTableType(\App\Lib\Enum\TableTypeEnum::Artifact); + + // Define associations + $this->belongsTo('CoreEnroller.BasicAttributeCollectors'); + $this->belongsTo('Petition'); + + $this->setDisplayField('mail'); + + $this->setPrimaryLink('petition_id'); + $this->setRequiresCO(true); + + $this->setPermissions([ + // Actions that operate over an entity (ie: require an $id) + 'entity' => [ + 'delete' => false, + 'edit' => false, + 'view' => ['platformAdmin', 'coAdmin'] + ], + // Actions that operate over a table (ie: do not require an $id) + 'table' => [ + 'add' => false, + 'index' => ['platformAdmin', 'coAdmin'] + ] + ]); + } + + /** + * Set validation rules. + * + * @since COmanage Registry v5.1.0 + * @param Validator $validator Validator + * @return Validator Validator + */ + + public function validationDefault(Validator $validator): Validator { + $schema = $this->getSchema(); + + $validator->add('petition_id', [ + 'content' => ['rule' => 'isInteger'] + ]); + $validator->notEmptyString('petition_id'); + + $validator->add('basic_attribute_collector_id', [ + 'content' => ['rule' => 'isInteger'] + ]); + $validator->notEmptyString('basic_attribute_collector_id'); + + // For now we allow any attribute to be empty and rely on upsert and the UI to + // enforce requirements. + foreach(['honorific', 'given', 'middle', 'family', 'suffix'] as $f) { + $validator->add($f, [ + 'size' => ['rule' => ['validateMaxLength', ['column' => $schema->getColumn($f)]], + 'provider' => 'table'], + 'filter' => ['rule' => ['validateInput'], + 'provider' => 'table'] + ]); + $validator->allowEmptyString($f); + } + + $this->registerStringValidation($validator, $schema, 'mail', false); + $validator->add('mail', [ + 'content' => ['rule' => ['email'], + 'message' => __d('error', 'input.invalid.email')] + ]); + + return $validator; + } +} From dc8285c7c4930860294e652d686cf85fee53396c Mon Sep 17 00:00:00 2001 From: Ioannis Igoumenos Date: Thu, 3 Oct 2024 23:52:03 +0300 Subject: [PATCH 14/26] Subnavigation fixes (#230) --- .../CoreEnroller/src/Model/Table/AttributeCollectorsTable.php | 1 - app/src/Model/Table/EnrollmentFlowStepsTable.php | 1 - app/src/Model/Table/PersonRolesTable.php | 2 +- app/templates/element/subnavigation/inlineList.php | 1 + 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/plugins/CoreEnroller/src/Model/Table/AttributeCollectorsTable.php b/app/plugins/CoreEnroller/src/Model/Table/AttributeCollectorsTable.php index 23bd6e444..2c1699ddf 100644 --- a/app/plugins/CoreEnroller/src/Model/Table/AttributeCollectorsTable.php +++ b/app/plugins/CoreEnroller/src/Model/Table/AttributeCollectorsTable.php @@ -40,7 +40,6 @@ class AttributeCollectorsTable extends Table { use \App\Lib\Traits\AutoViewVarsTrait; use \App\Lib\Traits\CoLinkTrait; - use \App\Lib\Traits\LayoutTrait; use \App\Lib\Traits\PermissionsTrait; use \App\Lib\Traits\PrimaryLinkTrait; use \App\Lib\Traits\TabTrait; diff --git a/app/src/Model/Table/EnrollmentFlowStepsTable.php b/app/src/Model/Table/EnrollmentFlowStepsTable.php index 7896561ab..f84e47447 100644 --- a/app/src/Model/Table/EnrollmentFlowStepsTable.php +++ b/app/src/Model/Table/EnrollmentFlowStepsTable.php @@ -41,7 +41,6 @@ class EnrollmentFlowStepsTable extends Table { use \App\Lib\Traits\AutoViewVarsTrait; use \App\Lib\Traits\ChangelogBehaviorTrait; use \App\Lib\Traits\CoLinkTrait; - use \App\Lib\Traits\LayoutTrait; use \App\Lib\Traits\PermissionsTrait; use \App\Lib\Traits\PluggableModelTrait; use \App\Lib\Traits\PrimaryLinkTrait; diff --git a/app/src/Model/Table/PersonRolesTable.php b/app/src/Model/Table/PersonRolesTable.php index 5f6a932de..324b81f0f 100644 --- a/app/src/Model/Table/PersonRolesTable.php +++ b/app/src/Model/Table/PersonRolesTable.php @@ -175,7 +175,7 @@ public function initialize(array $config): void { // render in index mode for the same use case/context // XXX edit should go first. 'People' => ['edit', 'view'], - 'PersonRoles' => ['edit','view','index'], + 'PersonRoles' => ['edit', 'view', 'index'], 'ExternalIdentities' => ['index'], ], // What model will have a counter-badge after the tab title diff --git a/app/templates/element/subnavigation/inlineList.php b/app/templates/element/subnavigation/inlineList.php index 6fb1ef488..da92ccac2 100644 --- a/app/templates/element/subnavigation/inlineList.php +++ b/app/templates/element/subnavigation/inlineList.php @@ -51,6 +51,7 @@ ?>
  • Tab->getCurrentId($tab, $isNested); // Construct Element Title $title = $this->element('subnavigation/tabTitle', compact('tab', 'curId', 'isNested')); // Construct Target URL From 7c078aae8061d7c3a864eb54e9dd0620d84f07c8 Mon Sep 17 00:00:00 2001 From: Ioannis Igoumenos Date: Mon, 14 Oct 2024 18:26:15 +0300 Subject: [PATCH 15/26] Fix tab rendering for EnrollmentFlow plugins (#235) * Fix tab rendering for EnrollmentFlow plugins * Improve getLayout trait * fix enrollment attributes add/edit view title --- .../Model/Table/AttributeCollectorsTable.php | 27 +++++-------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/app/plugins/CoreEnroller/src/Model/Table/AttributeCollectorsTable.php b/app/plugins/CoreEnroller/src/Model/Table/AttributeCollectorsTable.php index 2c1699ddf..e7f74a3e0 100644 --- a/app/plugins/CoreEnroller/src/Model/Table/AttributeCollectorsTable.php +++ b/app/plugins/CoreEnroller/src/Model/Table/AttributeCollectorsTable.php @@ -40,6 +40,7 @@ class AttributeCollectorsTable extends Table { use \App\Lib\Traits\AutoViewVarsTrait; use \App\Lib\Traits\CoLinkTrait; + use \App\Lib\Traits\LayoutTrait; use \App\Lib\Traits\PermissionsTrait; use \App\Lib\Traits\PrimaryLinkTrait; use \App\Lib\Traits\TabTrait; @@ -79,33 +80,17 @@ public function initialize(array $config): void { $this->setTabsConfig( [ // Ordered list of Tabs - 'tabs' => ['EnrollmentFlows', 'EnrollmentFlowSteps', 'Petitions'], + 'tabs' => ['EnrollmentFlowSteps', 'CoreEnroller.AttributeCollectors', 'CoreEnroller.EnrollmentAttributes'], // What actions will inlcude the subnavigation header 'action' => [ // If a model renders in a subnavigation mode in edit/view mode, it cannot // render in index mode for the same use case/context // XXX edit should go first. - 'EnrollmentFlows' => ['edit', 'view'], - 'EnrollmentFlowSteps' => ['index'], - 'Petitions' => ['index'], + 'EnrollmentFlowSteps' => ['edit', 'view'], + 'CoreEnroller.AttributeCollectors' => ['edit'], + 'CoreEnroller.EnrollmentAttributes' => ['index'], ], - // What model will have a counter-badge after the tab title - 'counter' => ['EnrollmentFlowSteps', 'Petitions'], - 'nested' => [ - // Ordered list of Tabs - 'tabs' => ['EnrollmentFlowSteps', 'CoreEnroller.AttributeCollectors', 'CoreEnroller.EnrollmentAttributes'], - // What actions will include the subnavigation header - 'action' => [ - // If a model renders in a subnavigation mode in edit/view mode, it cannot - // render in index mode for the same use case/context - // XXX edit should go first. - 'EnrollmentFlowSteps' => ['edit', 'view'], - 'CoreEnroller.AttributeCollectors' => ['edit'], - 'CoreEnroller.EnrollmentAttributes' => ['index'] - ], - // What model will have a counter-badge after the tab title - 'counter' => ['CoreEnroller.EnrollmentAttributes'], - ] + 'skipTab' => ['CoreEnroller.AttributeCollectors'] ] ); From e46e9e4278d8368adb4d2ca6b8be564370333293 Mon Sep 17 00:00:00 2001 From: Ioannis Igoumenos Date: Tue, 15 Oct 2024 11:28:06 +0300 Subject: [PATCH 16/26] Fix use case:Plugin.Hierarchy deep nested when no hasMany association. --- app/templates/element/subnavigation/inlineList.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/templates/element/subnavigation/inlineList.php b/app/templates/element/subnavigation/inlineList.php index da92ccac2..6fb1ef488 100644 --- a/app/templates/element/subnavigation/inlineList.php +++ b/app/templates/element/subnavigation/inlineList.php @@ -51,7 +51,6 @@ ?>
  • Tab->getCurrentId($tab, $isNested); // Construct Element Title $title = $this->element('subnavigation/tabTitle', compact('tab', 'curId', 'isNested')); // Construct Target URL From 8cac2d905bc2d7e629e9a99efaf362c005a5c0d4 Mon Sep 17 00:00:00 2001 From: Ioannis Igoumenos Date: Wed, 16 Oct 2024 17:00:18 +0300 Subject: [PATCH 17/26] Check for hasMany associations before rendering a tab --- .../CoreEnroller/src/Model/Table/AttributeCollectorsTable.php | 3 +-- app/src/Model/Table/EnrollmentFlowStepsTable.php | 3 ++- app/templates/element/subnavigation/tabList.php | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/plugins/CoreEnroller/src/Model/Table/AttributeCollectorsTable.php b/app/plugins/CoreEnroller/src/Model/Table/AttributeCollectorsTable.php index e7f74a3e0..2c7701b4c 100644 --- a/app/plugins/CoreEnroller/src/Model/Table/AttributeCollectorsTable.php +++ b/app/plugins/CoreEnroller/src/Model/Table/AttributeCollectorsTable.php @@ -89,8 +89,7 @@ public function initialize(array $config): void { 'EnrollmentFlowSteps' => ['edit', 'view'], 'CoreEnroller.AttributeCollectors' => ['edit'], 'CoreEnroller.EnrollmentAttributes' => ['index'], - ], - 'skipTab' => ['CoreEnroller.AttributeCollectors'] + ] ] ); diff --git a/app/src/Model/Table/EnrollmentFlowStepsTable.php b/app/src/Model/Table/EnrollmentFlowStepsTable.php index f84e47447..99f359388 100644 --- a/app/src/Model/Table/EnrollmentFlowStepsTable.php +++ b/app/src/Model/Table/EnrollmentFlowStepsTable.php @@ -41,13 +41,14 @@ class EnrollmentFlowStepsTable extends Table { use \App\Lib\Traits\AutoViewVarsTrait; use \App\Lib\Traits\ChangelogBehaviorTrait; use \App\Lib\Traits\CoLinkTrait; + use \App\Lib\Traits\LayoutTrait; use \App\Lib\Traits\PermissionsTrait; use \App\Lib\Traits\PluggableModelTrait; use \App\Lib\Traits\PrimaryLinkTrait; use \App\Lib\Traits\TabTrait; use \App\Lib\Traits\TableMetaTrait; use \App\Lib\Traits\ValidationTrait; - + /** * Perform Cake Model initialization. * diff --git a/app/templates/element/subnavigation/tabList.php b/app/templates/element/subnavigation/tabList.php index 706ae966d..5edb06e1f 100644 --- a/app/templates/element/subnavigation/tabList.php +++ b/app/templates/element/subnavigation/tabList.php @@ -51,7 +51,6 @@
  • Tab->getCurrentId($tab, $isNested); // Calculate Tab Title $title = $this->element('subnavigation/tabTitle', compact('tab', 'curId', 'isNested')); // Construct Target URL From aa3b03b9015e7aa61802f50d3854a8a4a022ca56 Mon Sep 17 00:00:00 2001 From: Benn Oshrin Date: Thu, 31 Oct 2024 19:36:00 -0400 Subject: [PATCH 18/26] Initial commit of Mostly Static Pages (CFM-62), InvitationAccepter (CFM-334) and UpsertTrait (CFM-423) --- .../Entity/BasicPetitionAttributeSet.php | 49 ------- .../Table/BasicPetitionAttributeSetsTable.php | 125 ------------------ .../Model/Table/InvitationAcceptersTable.php | 9 ++ 3 files changed, 9 insertions(+), 174 deletions(-) delete mode 100644 app/plugins/CoreEnroller/src/Model/Entity/BasicPetitionAttributeSet.php delete mode 100644 app/plugins/CoreEnroller/src/Model/Table/BasicPetitionAttributeSetsTable.php diff --git a/app/plugins/CoreEnroller/src/Model/Entity/BasicPetitionAttributeSet.php b/app/plugins/CoreEnroller/src/Model/Entity/BasicPetitionAttributeSet.php deleted file mode 100644 index b810bd47d..000000000 --- a/app/plugins/CoreEnroller/src/Model/Entity/BasicPetitionAttributeSet.php +++ /dev/null @@ -1,49 +0,0 @@ - - */ - protected $_accessible = [ - '*' => true, - 'id' => false, - 'slug' => false, - ]; -} diff --git a/app/plugins/CoreEnroller/src/Model/Table/BasicPetitionAttributeSetsTable.php b/app/plugins/CoreEnroller/src/Model/Table/BasicPetitionAttributeSetsTable.php deleted file mode 100644 index d0f7bb5bb..000000000 --- a/app/plugins/CoreEnroller/src/Model/Table/BasicPetitionAttributeSetsTable.php +++ /dev/null @@ -1,125 +0,0 @@ -addBehavior('Changelog'); - $this->addBehavior('Log'); - $this->addBehavior('Timestamp'); - - $this->setTableType(\App\Lib\Enum\TableTypeEnum::Artifact); - - // Define associations - $this->belongsTo('CoreEnroller.BasicAttributeCollectors'); - $this->belongsTo('Petition'); - - $this->setDisplayField('mail'); - - $this->setPrimaryLink('petition_id'); - $this->setRequiresCO(true); - - $this->setPermissions([ - // Actions that operate over an entity (ie: require an $id) - 'entity' => [ - 'delete' => false, - 'edit' => false, - 'view' => ['platformAdmin', 'coAdmin'] - ], - // Actions that operate over a table (ie: do not require an $id) - 'table' => [ - 'add' => false, - 'index' => ['platformAdmin', 'coAdmin'] - ] - ]); - } - - /** - * Set validation rules. - * - * @since COmanage Registry v5.1.0 - * @param Validator $validator Validator - * @return Validator Validator - */ - - public function validationDefault(Validator $validator): Validator { - $schema = $this->getSchema(); - - $validator->add('petition_id', [ - 'content' => ['rule' => 'isInteger'] - ]); - $validator->notEmptyString('petition_id'); - - $validator->add('basic_attribute_collector_id', [ - 'content' => ['rule' => 'isInteger'] - ]); - $validator->notEmptyString('basic_attribute_collector_id'); - - // For now we allow any attribute to be empty and rely on upsert and the UI to - // enforce requirements. - foreach(['honorific', 'given', 'middle', 'family', 'suffix'] as $f) { - $validator->add($f, [ - 'size' => ['rule' => ['validateMaxLength', ['column' => $schema->getColumn($f)]], - 'provider' => 'table'], - 'filter' => ['rule' => ['validateInput'], - 'provider' => 'table'] - ]); - $validator->allowEmptyString($f); - } - - $this->registerStringValidation($validator, $schema, 'mail', false); - $validator->add('mail', [ - 'content' => ['rule' => ['email'], - 'message' => __d('error', 'input.invalid.email')] - ]); - - return $validator; - } -} diff --git a/app/plugins/CoreEnroller/src/Model/Table/InvitationAcceptersTable.php b/app/plugins/CoreEnroller/src/Model/Table/InvitationAcceptersTable.php index f3f19eeb3..2fbdfe5fa 100644 --- a/app/plugins/CoreEnroller/src/Model/Table/InvitationAcceptersTable.php +++ b/app/plugins/CoreEnroller/src/Model/Table/InvitationAcceptersTable.php @@ -162,6 +162,15 @@ public function prepare( $petition->status = PetitionStatusEnum::PendingAcceptance; $Petitions->saveOrFail($petition); + + // Record history + $Petitions->PetitionHistoryRecords->record( + petitionId: $petition->id, + enrollmentFlowStepId: $step->id, + action: PetitionActionEnum::InvitationViewed, + comment: __d('result', 'Petitions.viewed.inv') + // actorPersonId + ); } return true; From d90ba02fe363f1fd7e136bee12ee0d076829a06e Mon Sep 17 00:00:00 2001 From: Arlen Johnson Date: Fri, 8 Nov 2024 12:58:24 -0500 Subject: [PATCH 19/26] First pass at cleaning up Petition view (CFM-31) (#246) * First pass at cleaning up Petition view (CFM-31) * Remove status read-only field (CFM-31) * Add fields to Petition Information (CFM-31) * Reformat Petition Information view (CFM-31) * Add Petition History Records output to petition view (CFM-31) * Further refinement to the layout of the Petition view (CFM-31) * Add Resume top-link to Petition view (CFM-31) --- app/templates/EnrollmentFlows/fields-nav.inc | 2 +- app/webroot/css/co-responsive.css | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/templates/EnrollmentFlows/fields-nav.inc b/app/templates/EnrollmentFlows/fields-nav.inc index 2beb1446c..7e551480d 100644 --- a/app/templates/EnrollmentFlows/fields-nav.inc +++ b/app/templates/EnrollmentFlows/fields-nav.inc @@ -26,7 +26,7 @@ */ $topLinks[] = [ - 'icon' => 'start', + 'icon' => 'play_arrow', 'order' => 'Default', 'label' => __d('operation', 'EnrollmentFlows.start'), 'link' => [ diff --git a/app/webroot/css/co-responsive.css b/app/webroot/css/co-responsive.css index 541c37f9b..3e10373fd 100644 --- a/app/webroot/css/co-responsive.css +++ b/app/webroot/css/co-responsive.css @@ -532,6 +532,11 @@ flex-direction: row; gap: 3em; } + /* PETITIONS */ + ul.form-list li.petition-enrollee-items .field-info { + flex-direction: row; + gap: 3em; + } /* FOOTER */ #co-footer { position: static; From cfe18b14e3d73819b0bd1bfbf4dc24163dbbf79c Mon Sep 17 00:00:00 2001 From: Ioannis Igoumenos Date: Wed, 13 Nov 2024 22:15:25 +0200 Subject: [PATCH 20/26] Add support for attribute collection fieldsets (#244) * Add support for attribute collection fieldsets * Attribute Collection view FieldGroups * fix fieldst hover css * Refactored required and permitted calculations.Moved attribute collections parts to elements. * Add FieldHelper support for textarea. Refactored fieldset-group. * fix enumerations and locales * improvements * Remove duplicate element * Improve classes in element * cleanup --- .../src/Model/Table/BasicAttributeCollectorsTable.php | 1 + app/resources/locales/en_US/enumeration.po | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/plugins/CoreEnroller/src/Model/Table/BasicAttributeCollectorsTable.php b/app/plugins/CoreEnroller/src/Model/Table/BasicAttributeCollectorsTable.php index cd0ac0766..bf30f8c14 100644 --- a/app/plugins/CoreEnroller/src/Model/Table/BasicAttributeCollectorsTable.php +++ b/app/plugins/CoreEnroller/src/Model/Table/BasicAttributeCollectorsTable.php @@ -48,6 +48,7 @@ class BasicAttributeCollectorsTable extends Table { use \App\Lib\Traits\PrimaryLinkTrait; use \App\Lib\Traits\TableMetaTrait; use \App\Lib\Traits\ValidationTrait; + use \App\Lib\Traits\LayoutTrait; /** * Perform Cake Model initialization. diff --git a/app/resources/locales/en_US/enumeration.po b/app/resources/locales/en_US/enumeration.po index 691a14338..95d1df691 100644 --- a/app/resources/locales/en_US/enumeration.po +++ b/app/resources/locales/en_US/enumeration.po @@ -556,8 +556,14 @@ msgstr "Street" msgid "RequiredAddressFieldsEnum.street,locality,state,postal_code" msgstr "Street, City, State, Postal Code" -msgid "RequiredAddressFieldsEnum.street,locality,state,postal_code,country" -msgstr "Street, City, State, Postal Code, Country" +msgid "GroupedAddressFieldsEnum.street,room" +msgstr "Street, Room" + +msgid "GroupedAddressFieldsEnum.city,locality" +msgstr "City, Locality" + +msgid "GroupedAddressFieldsEnum.state,postal_code,country" +msgstr "State, Postal Code, Country" msgid "RequiredNameFieldsEnum.given" msgstr "Given" From e856f0b1a3281dbb7edb1f77a5a58f9cb6119df1 Mon Sep 17 00:00:00 2001 From: Ioannis Igoumenos Date: Fri, 15 Nov 2024 20:33:44 +0200 Subject: [PATCH 21/26] method parameters must not come before the required ones as of php 8.1 --- .../Model/Table/PetitionHistoryRecordsTable.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/Model/Table/PetitionHistoryRecordsTable.php b/app/src/Model/Table/PetitionHistoryRecordsTable.php index 64791c497..c6809289d 100644 --- a/app/src/Model/Table/PetitionHistoryRecordsTable.php +++ b/app/src/Model/Table/PetitionHistoryRecordsTable.php @@ -132,22 +132,22 @@ public function generateDisplayField(\App\Model\Entity\JobHistoryRecord $entity) return __d('controller', 'PetitionHistoryRecords', [1]); } - + /** * Record a Petition History Record. * * @since COmanage Registry v5.0.0 - * @param int $petitionId Petition ID - * @param string $enrollmentFlowStepId Enrollment Flow Step ID, or null for start or finalize - * @param string $action PetitionActionEnum - * @param string $comment Comment - * @param int $actorPersonId Actor Person ID + * @param int $petitionId Petition ID + * @param int|null $enrollmentFlowStepId Enrollment Flow Step ID, or null for start or finalize + * @param string $action PetitionActionEnum + * @param string $comment Comment + * @param int|null $actorPersonId Actor Person ID * @return int Petition History Record ID */ public function record( int $petitionId, - ?int $enrollmentFlowStepId=null, + ?int $enrollmentFlowStepId, string $action, string $comment, ?int $actorPersonId=null From 5734a91d75eac8fa58c4dd6150d34c6d979a19a5 Mon Sep 17 00:00:00 2001 From: Arlen Johnson Date: Thu, 21 Nov 2024 11:22:00 -0500 Subject: [PATCH 22/26] Add special "Start" button to Enrollment Flow views (CFM-428) (#251) * Add special "Start" and "Copy" (flow url) buttons to Enrollment Flow configuration views (CFM-428) * Improve "Cannot copy" message for javascript clipboard (CFM-428) * Make upper buttons more generic (CFM-428) * Shorten test block for applying upper buttons (CFM-428) * De-emphasize "Copy URL" and move it to the left of "Start" (CFM-428) * Remove "Copy URL" button (CFM-428) * Trivial clean up to comment (CFM-428) --- app/templates/EnrollmentFlows/fields-nav.inc | 42 -------------------- 1 file changed, 42 deletions(-) delete mode 100644 app/templates/EnrollmentFlows/fields-nav.inc diff --git a/app/templates/EnrollmentFlows/fields-nav.inc b/app/templates/EnrollmentFlows/fields-nav.inc deleted file mode 100644 index 7e551480d..000000000 --- a/app/templates/EnrollmentFlows/fields-nav.inc +++ /dev/null @@ -1,42 +0,0 @@ - 'play_arrow', - 'order' => 'Default', - 'label' => __d('operation', 'EnrollmentFlows.start'), - 'link' => [ - 'action' => 'start', - $vv_obj->id - ], - 'class' => '' -]; - -$subnav = [ - 'name' => 'enrollment_flow', - 'active' => 'properties' -]; \ No newline at end of file From bfaebabc27c116667ab97e6f566cccdaef592491 Mon Sep 17 00:00:00 2001 From: Benn Oshrin Date: Thu, 28 Nov 2024 06:31:14 -0500 Subject: [PATCH 23/26] Initial commit of Email Verifier Enroller Plugin (CFM-333) --- .../Model/Table/BasicAttributeCollectorsTable.php | 1 - .../src/Model/Table/InvitationAcceptersTable.php | 9 --------- app/resources/locales/en_US/enumeration.po | 13 +++++-------- .../Model/Table/PetitionHistoryRecordsTable.php | 14 +++++++------- 4 files changed, 12 insertions(+), 25 deletions(-) diff --git a/app/plugins/CoreEnroller/src/Model/Table/BasicAttributeCollectorsTable.php b/app/plugins/CoreEnroller/src/Model/Table/BasicAttributeCollectorsTable.php index bf30f8c14..cd0ac0766 100644 --- a/app/plugins/CoreEnroller/src/Model/Table/BasicAttributeCollectorsTable.php +++ b/app/plugins/CoreEnroller/src/Model/Table/BasicAttributeCollectorsTable.php @@ -48,7 +48,6 @@ class BasicAttributeCollectorsTable extends Table { use \App\Lib\Traits\PrimaryLinkTrait; use \App\Lib\Traits\TableMetaTrait; use \App\Lib\Traits\ValidationTrait; - use \App\Lib\Traits\LayoutTrait; /** * Perform Cake Model initialization. diff --git a/app/plugins/CoreEnroller/src/Model/Table/InvitationAcceptersTable.php b/app/plugins/CoreEnroller/src/Model/Table/InvitationAcceptersTable.php index 2fbdfe5fa..f3f19eeb3 100644 --- a/app/plugins/CoreEnroller/src/Model/Table/InvitationAcceptersTable.php +++ b/app/plugins/CoreEnroller/src/Model/Table/InvitationAcceptersTable.php @@ -162,15 +162,6 @@ public function prepare( $petition->status = PetitionStatusEnum::PendingAcceptance; $Petitions->saveOrFail($petition); - - // Record history - $Petitions->PetitionHistoryRecords->record( - petitionId: $petition->id, - enrollmentFlowStepId: $step->id, - action: PetitionActionEnum::InvitationViewed, - comment: __d('result', 'Petitions.viewed.inv') - // actorPersonId - ); } return true; diff --git a/app/resources/locales/en_US/enumeration.po b/app/resources/locales/en_US/enumeration.po index 95d1df691..e7c39583f 100644 --- a/app/resources/locales/en_US/enumeration.po +++ b/app/resources/locales/en_US/enumeration.po @@ -465,6 +465,9 @@ msgstr "Status Updated" msgid "PetitionStatusEnum.A" msgstr "Active" +msgid "PetitionStatusEnum.EV" +msgstr "Email Verified" + msgid "PetitionStatusEnum.Y" msgstr "Approved" @@ -556,14 +559,8 @@ msgstr "Street" msgid "RequiredAddressFieldsEnum.street,locality,state,postal_code" msgstr "Street, City, State, Postal Code" -msgid "GroupedAddressFieldsEnum.street,room" -msgstr "Street, Room" - -msgid "GroupedAddressFieldsEnum.city,locality" -msgstr "City, Locality" - -msgid "GroupedAddressFieldsEnum.state,postal_code,country" -msgstr "State, Postal Code, Country" +msgid "RequiredAddressFieldsEnum.street,locality,state,postal_code,country" +msgstr "Street, City, State, Postal Code, Country" msgid "RequiredNameFieldsEnum.given" msgstr "Given" diff --git a/app/src/Model/Table/PetitionHistoryRecordsTable.php b/app/src/Model/Table/PetitionHistoryRecordsTable.php index c6809289d..64791c497 100644 --- a/app/src/Model/Table/PetitionHistoryRecordsTable.php +++ b/app/src/Model/Table/PetitionHistoryRecordsTable.php @@ -132,22 +132,22 @@ public function generateDisplayField(\App\Model\Entity\JobHistoryRecord $entity) return __d('controller', 'PetitionHistoryRecords', [1]); } - + /** * Record a Petition History Record. * * @since COmanage Registry v5.0.0 - * @param int $petitionId Petition ID - * @param int|null $enrollmentFlowStepId Enrollment Flow Step ID, or null for start or finalize - * @param string $action PetitionActionEnum - * @param string $comment Comment - * @param int|null $actorPersonId Actor Person ID + * @param int $petitionId Petition ID + * @param string $enrollmentFlowStepId Enrollment Flow Step ID, or null for start or finalize + * @param string $action PetitionActionEnum + * @param string $comment Comment + * @param int $actorPersonId Actor Person ID * @return int Petition History Record ID */ public function record( int $petitionId, - ?int $enrollmentFlowStepId, + ?int $enrollmentFlowStepId=null, string $action, string $comment, ?int $actorPersonId=null From 0edf63a077ca6e1a0c10ac0f9eb9fe6e670a64dc Mon Sep 17 00:00:00 2001 From: Benn Oshrin Date: Thu, 28 Nov 2024 07:01:58 -0500 Subject: [PATCH 24/26] Additional commit for CFM-333 --- app/resources/locales/en_US/enumeration.po | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/resources/locales/en_US/enumeration.po b/app/resources/locales/en_US/enumeration.po index e7c39583f..691a14338 100644 --- a/app/resources/locales/en_US/enumeration.po +++ b/app/resources/locales/en_US/enumeration.po @@ -465,9 +465,6 @@ msgstr "Status Updated" msgid "PetitionStatusEnum.A" msgstr "Active" -msgid "PetitionStatusEnum.EV" -msgstr "Email Verified" - msgid "PetitionStatusEnum.Y" msgstr "Approved" From ebd4c3c2d5cfdaa34487264073c7ed77cf6248f0 Mon Sep 17 00:00:00 2001 From: Arlen Johnson Date: Wed, 4 Dec 2024 13:38:22 -0500 Subject: [PATCH 25/26] Provide subnavigation and iframe layout for EmailVerifiers and InvitationAccepters (CFM-428) --- .../Controller/EmailVerifiersController.php | 21 +++++++++++++++++++ .../InvitationAcceptersController.php | 21 +++++++++++++++++++ .../Model/Table/AttributeCollectorsTable.php | 2 +- .../src/Model/Table/EmailVerifiersTable.php | 20 +++++++++++++++++- .../Model/Table/InvitationAcceptersTable.php | 18 ++++++++++++++++ 5 files changed, 80 insertions(+), 2 deletions(-) diff --git a/app/plugins/CoreEnroller/src/Controller/EmailVerifiersController.php b/app/plugins/CoreEnroller/src/Controller/EmailVerifiersController.php index 16e320f06..c79f21e43 100644 --- a/app/plugins/CoreEnroller/src/Controller/EmailVerifiersController.php +++ b/app/plugins/CoreEnroller/src/Controller/EmailVerifiersController.php @@ -41,6 +41,27 @@ class EmailVerifiersController extends StandardEnrollerController { 'EmailVerifiers.id' => 'asc' ] ]; + + /** + * Callback run prior to the request render. + * + * @param EventInterface $event Cake Event + * + * @return Response|void + * @since COmanage Registry v5.0.0 + */ + + public function beforeRender(\Cake\Event\EventInterface $event) { + $link = $this->getPrimaryLink(true); + + if(!empty($link->value)) { + $this->set('vv_bc_parent_obj', $this->EmailVerifiers->EnrollmentFlowSteps->get($link->value)); + $this->set('vv_bc_parent_displayfield', $this->EmailVerifiers->EnrollmentFlowSteps->getDisplayField()); + $this->set('vv_bc_parent_primarykey', $this->EmailVerifiers->EnrollmentFlowSteps->getPrimaryKey()); + } + + return parent::beforeRender($event); + } /** * Dispatch an Enrollment Flow Step. diff --git a/app/plugins/CoreEnroller/src/Controller/InvitationAcceptersController.php b/app/plugins/CoreEnroller/src/Controller/InvitationAcceptersController.php index 3b377d355..d6b91802b 100644 --- a/app/plugins/CoreEnroller/src/Controller/InvitationAcceptersController.php +++ b/app/plugins/CoreEnroller/src/Controller/InvitationAcceptersController.php @@ -39,6 +39,27 @@ class InvitationAcceptersController extends StandardEnrollerController { 'InvitationAccepters.id' => 'asc' ] ]; + + /** + * Callback run prior to the request render. + * + * @param EventInterface $event Cake Event + * + * @return Response|void + * @since COmanage Registry v5.0.0 + */ + + public function beforeRender(\Cake\Event\EventInterface $event) { + $link = $this->getPrimaryLink(true); + + if(!empty($link->value)) { + $this->set('vv_bc_parent_obj', $this->InvitationAccepters->EnrollmentFlowSteps->get($link->value)); + $this->set('vv_bc_parent_displayfield', $this->InvitationAccepters->EnrollmentFlowSteps->getDisplayField()); + $this->set('vv_bc_parent_primarykey', $this->InvitationAccepters->EnrollmentFlowSteps->getPrimaryKey()); + } + + return parent::beforeRender($event); + } /** * Dispatch an Enrollment Flow Step. diff --git a/app/plugins/CoreEnroller/src/Model/Table/AttributeCollectorsTable.php b/app/plugins/CoreEnroller/src/Model/Table/AttributeCollectorsTable.php index 2c7701b4c..18e3c22e9 100644 --- a/app/plugins/CoreEnroller/src/Model/Table/AttributeCollectorsTable.php +++ b/app/plugins/CoreEnroller/src/Model/Table/AttributeCollectorsTable.php @@ -81,7 +81,7 @@ public function initialize(array $config): void { [ // Ordered list of Tabs 'tabs' => ['EnrollmentFlowSteps', 'CoreEnroller.AttributeCollectors', 'CoreEnroller.EnrollmentAttributes'], - // What actions will inlcude the subnavigation header + // What actions will include the subnavigation header 'action' => [ // If a model renders in a subnavigation mode in edit/view mode, it cannot // render in index mode for the same use case/context diff --git a/app/plugins/CoreEnroller/src/Model/Table/EmailVerifiersTable.php b/app/plugins/CoreEnroller/src/Model/Table/EmailVerifiersTable.php index d870fb696..4a409cd82 100644 --- a/app/plugins/CoreEnroller/src/Model/Table/EmailVerifiersTable.php +++ b/app/plugins/CoreEnroller/src/Model/Table/EmailVerifiersTable.php @@ -46,10 +46,12 @@ class EmailVerifiersTable extends Table { use \App\Lib\Traits\AutoViewVarsTrait; use \App\Lib\Traits\CoLinkTrait; - use \App\Lib\Traits\LabeledLogTrait; + use \App\Lib\Traits\LabeledLogTrait; + use \App\Lib\Traits\LayoutTrait; use \App\Lib\Traits\PermissionsTrait; use \App\Lib\Traits\PrimaryLinkTrait; use \App\Lib\Traits\TableMetaTrait; + use \App\Lib\Traits\TabTrait; use \App\Lib\Traits\ValidationTrait; /** @@ -83,6 +85,22 @@ public function initialize(array $config): void { $this->setPrimaryLink('enrollment_flow_step_id'); $this->setRequiresCO(true); $this->setAllowLookupPrimaryLink(['dispatch', 'display']); + + // All the tabs share the same configuration in the ModelTable file + $this->setTabsConfig( + [ + // Ordered list of Tabs + 'tabs' => ['EnrollmentFlowSteps', 'CoreEnroller.EmailVerifiers'], + // What actions will include the subnavigation header + 'action' => [ + // If a model renders in a subnavigation mode in edit/view mode, it cannot + // render in index mode for the same use case/context + // XXX edit should go first. + 'EnrollmentFlowSteps' => ['edit', 'view'], + 'CoreEnroller.EmailVerifiers' => ['edit'] + ] + ] + ); $this->setAutoViewVars([ 'modes' => [ diff --git a/app/plugins/CoreEnroller/src/Model/Table/InvitationAcceptersTable.php b/app/plugins/CoreEnroller/src/Model/Table/InvitationAcceptersTable.php index f3f19eeb3..19093ca6d 100644 --- a/app/plugins/CoreEnroller/src/Model/Table/InvitationAcceptersTable.php +++ b/app/plugins/CoreEnroller/src/Model/Table/InvitationAcceptersTable.php @@ -41,9 +41,11 @@ class InvitationAcceptersTable extends Table { use \App\Lib\Traits\CoLinkTrait; + use \App\Lib\Traits\LayoutTrait; use \App\Lib\Traits\PermissionsTrait; use \App\Lib\Traits\PrimaryLinkTrait; use \App\Lib\Traits\TableMetaTrait; + use \App\Lib\Traits\TabTrait; use \App\Lib\Traits\ValidationTrait; /** @@ -75,6 +77,22 @@ public function initialize(array $config): void { $this->setPrimaryLink('enrollment_flow_step_id'); $this->setRequiresCO(true); $this->setAllowLookupPrimaryLink(['dispatch', 'display']); + + // All the tabs share the same configuration in the ModelTable file + $this->setTabsConfig( + [ + // Ordered list of Tabs + 'tabs' => ['EnrollmentFlowSteps', 'CoreEnroller.InvitationAccepters'], + // What actions will include the subnavigation header + 'action' => [ + // If a model renders in a subnavigation mode in edit/view mode, it cannot + // render in index mode for the same use case/context + // XXX edit should go first. + 'EnrollmentFlowSteps' => ['edit', 'view'], + 'CoreEnroller.InvitationAccepters' => ['edit'] + ] + ] + ); $this->setPermissions([ // Actions that operate over an entity (ie: require an $id) From ac3c156dac084102200fb9401639cc94e3ec31b2 Mon Sep 17 00:00:00 2001 From: Arlen Johnson Date: Wed, 4 Dec 2024 13:58:00 -0500 Subject: [PATCH 26/26] Provide subnavigation and iframe layout for IdentifierCollectors (CFM-428) --- .../IdentifierCollectorsController.php | 21 +++++++++++++++++++ .../Model/Table/IdentifierCollectorsTable.php | 20 +++++++++++++++++- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/app/plugins/CoreEnroller/src/Controller/IdentifierCollectorsController.php b/app/plugins/CoreEnroller/src/Controller/IdentifierCollectorsController.php index 2b33b59c0..9b0fe090e 100644 --- a/app/plugins/CoreEnroller/src/Controller/IdentifierCollectorsController.php +++ b/app/plugins/CoreEnroller/src/Controller/IdentifierCollectorsController.php @@ -38,6 +38,27 @@ class IdentifierCollectorsController extends StandardEnrollerController { 'IdentifierCollectors.id' => 'asc' ] ]; + + /** + * Callback run prior to the request render. + * + * @param EventInterface $event Cake Event + * + * @return Response|void + * @since COmanage Registry v5.0.0 + */ + + public function beforeRender(\Cake\Event\EventInterface $event) { + $link = $this->getPrimaryLink(true); + + if(!empty($link->value)) { + $this->set('vv_bc_parent_obj', $this->IdentifierCollectors->EnrollmentFlowSteps->get($link->value)); + $this->set('vv_bc_parent_displayfield', $this->IdentifierCollectors->EnrollmentFlowSteps->getDisplayField()); + $this->set('vv_bc_parent_primarykey', $this->IdentifierCollectors->EnrollmentFlowSteps->getPrimaryKey()); + } + + return parent::beforeRender($event); + } /** * Dispatch an Enrollment Flow Step. diff --git a/app/plugins/CoreEnroller/src/Model/Table/IdentifierCollectorsTable.php b/app/plugins/CoreEnroller/src/Model/Table/IdentifierCollectorsTable.php index 895aeabff..6a6d285bb 100644 --- a/app/plugins/CoreEnroller/src/Model/Table/IdentifierCollectorsTable.php +++ b/app/plugins/CoreEnroller/src/Model/Table/IdentifierCollectorsTable.php @@ -40,9 +40,11 @@ class IdentifierCollectorsTable extends Table { use \App\Lib\Traits\AutoViewVarsTrait; use \App\Lib\Traits\CoLinkTrait; + use \App\Lib\Traits\LayoutTrait; use \App\Lib\Traits\PermissionsTrait; use \App\Lib\Traits\PrimaryLinkTrait; use \App\Lib\Traits\TableMetaTrait; + use \App\Lib\Traits\TabTrait; use \App\Lib\Traits\ValidationTrait; /** @@ -75,7 +77,23 @@ public function initialize(array $config): void { $this->setPrimaryLink('enrollment_flow_step_id'); $this->setRequiresCO(true); $this->setAllowLookupPrimaryLink(['dispatch', 'display']); - + + // All the tabs share the same configuration in the ModelTable file + $this->setTabsConfig( + [ + // Ordered list of Tabs + 'tabs' => ['EnrollmentFlowSteps', 'CoreEnroller.IdentifierCollectors'], + // What actions will include the subnavigation header + 'action' => [ + // If a model renders in a subnavigation mode in edit/view mode, it cannot + // render in index mode for the same use case/context + // XXX edit should go first. + 'EnrollmentFlowSteps' => ['edit', 'view'], + 'CoreEnroller.IdentifierCollectors' => ['edit'] + ] + ] + ); + $this->setAutoViewVars([ 'types' => [ 'type' => 'type',