Skip to content
GitLab
Commit 839d175b authored by dockx thibault's avatar dockx thibault
Browse files

Merge branch '6341-lifecycle-removal-of-lifecycle-within-core' into 'dev' 

Resolve "[LifeCycle] - Removal of lifeCycle within CORE"

See merge request fusiondirectory/fd!1085
parents 1da6558e 51f9e36e
dev 6342-update-the-locales-for-1-5 6344-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen 6365-core-locking-mechanism-is-not-changing-the-mail-ressource-it-does-lock-the-mail-account 6365-core-when-lock-mechanism-is-trigger-the-user-should-not-be-editable-if-not-unlock 6378-orcid-test-method-is-wrong-and-break-orcid-saving core-php8 master fusiondirectory-1.5
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 283 deletions
+0 -283
contrib/openldap/core-fd.schema
+ 0
− 65
View file @ 839d175b
......@@ -148,64 +148,6 @@ attributetype ( 1.3.6.1.4.1.38414.62.1.10 NAME 'fdMailTemplateSubject'
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.40)
##### Tasks Life Cycle Attributes #####
attributetype ( 1.3.6.1.4.1.38414.62.1.65 NAME 'fdTasksLifeCycleMembers'
DESC 'Fusion Directory - List of members or groups in task life cycle'
EQUALITY caseExactMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
attributetype ( 1.3.6.1.4.1.38414.62.1.66 NAME 'fdTasksLifeCycleListOfDN'
DESC 'Fusion Directory - Emails derived from DN'
EQUALITY caseExactMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
## Previous / existing states ##
attributetype ( 1.3.6.1.4.1.38414.62.1.58 NAME 'fdTasksLifeCyclePreResource'
DESC 'Fusion Directory - Tasks for life cycle - previous supann resource'
EQUALITY caseExactMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.38414.62.1.59 NAME 'fdTasksLifeCyclePreState'
DESC 'Fusion Directory - Tasks for life cycle - previous supann state'
EQUALITY caseExactMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.38414.62.1.60 NAME 'fdTasksLifeCyclePreSubState'
DESC 'Fusion Directory - Tasks for life cycle - previous supann sub state'
EQUALITY caseExactMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
SINGLE-VALUE )
## Posteriors / new desired states ##
attributetype ( 1.3.6.1.4.1.38414.62.1.61 NAME 'fdTasksLifeCyclePostResource'
DESC 'Fusion Directory - Tasks for life cycle - new resource'
EQUALITY caseExactMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.38414.62.1.62 NAME 'fdTasksLifeCyclePostState'
DESC 'Fusion Directory - Tasks for life cycle - new state'
EQUALITY caseExactMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.38414.62.1.63 NAME 'fdTasksLifeCyclePostSubState'
DESC 'Fusion Directory - Tasks for life cycle - new sub state'
EQUALITY caseExactMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.38414.62.1.64 NAME 'fdTasksLifeCyclePostEndDate'
DESC 'Fusion Directory - Tasks for life cycle - days to be added to end date'
EQUALITY caseExactMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
SINGLE-VALUE )
##### Tasks Attributes #####
attributetype ( 1.3.6.1.4.1.38414.62.1.11 NAME 'fdTasksMailObject'
......@@ -563,13 +505,6 @@ objectclass (1.3.6.1.4.1.38414.62.2.7 NAME 'fdTasksMail'
MUST ( fdTasksMailObject $ fdTasksEmailSender )
MAY ( fdTasksMailUsers $ fdTasksEmailsFromDN $ fdTasksMailType $ fdTasksEmailBCC ) )
objectclass (1.3.6.1.4.1.38414.62.2.11 NAME 'fdTasksLifeCycle'
DESC 'FusionDirectory - Tasks objects Life Cycle'
SUP top AUXILIARY
MUST ( fdTasksLifeCyclePreResource $ fdTasksLifeCyclePreState $ fdTasksLifeCyclePostResource $ fdTasksLifeCyclePostState)
MAY ( fdTasksLifeCyclePreSubState $ fdTasksLifeCyclePostEndDate $ fdTasksLifeCyclePostSubState $ fdTasksLifeCycleMembers
$ fdTasksLifeCycleListOfDN ) )
objectclass (1.3.6.1.4.1.38414.62.2.8 NAME 'fdTasksGranular'
DESC 'FusionDirectory - Tasks granular objects'
MUST ( fdTasksGranularMaster $ cn $ fdTasksGranularType $ fdTasksGranularSchedule $ fdTasksGranularStatus )
......
plugins/configuration/tasks/class_tasksLifeCycle.inc deleted 100644 → 0
+ 0
− 218
View file @ 1da6558e
<?php
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org)
Copyright (C) 2024 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
class tasksLifeCycle extends simplePlugin
{
protected $displayHeader = TRUE;
/**
* @var array|array[]
*/
private $subStates;
static function plInfo (): array
{
return [
'plShortName' => _('Tasks Life Cycle'),
'plDescription' => _('Tasks Life Cycle Object'),
'plIcon' => 'geticon.php?context=applications&icon=tasks&size=16',
'plPriority' => 42,
'plObjectClass' => ['fdTasksLifeCycle'],
'plFilter' => '(objectClass=fdTasksLifeCycle)',
'plObjectType' => ['tasks'],
'plConflicts' => ['tasksMail'],
'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo()),
'plForeignKeys' => [],
];
}
static function getAttributesInfo (): array
{
return [
'section1' => [
'class' => ['fullwidth', 'information'],
'name' => _('We recommend the task redundancy to be set to daily, and the case New Members Only to be unpicked'),
'attrs' => [
// This hiddenAttribute is only present to show the information label on the section.
new HiddenAttribute(
'fdShowInformation', FALSE,
),
// Following attributes will contain all the DNs required to be verified by Orchestrator.
new HiddenArrayAttribute('fdTasksLifeCycleListOfDN', FALSE, ''),
]
],
'section3' => [
'name' => _('Post resources details'),
'attrs' => [
new SelectAttribute(
_('Resource'), _('Supann resources'),
'fdTasksLifeCyclePostResource', TRUE
),
new SelectAttribute(
_('State'), _('Resource state'),
'fdTasksLifeCyclePostState', TRUE
),
new SelectAttribute(
_('Sub state'), _('Resource sub state'),
'fdTasksLifeCyclePostSubState', FALSE
),
new IntAttribute(
_('Extra days to add'), _('Extra days to be added after today'),
'fdTasksLifeCyclePostEndDate', FALSE, '0', FALSE, '0'
),
]
],
// Attributes are grouped by section
'section2' => [
'name' => _('Pre / existing resources details'),
'attrs' => [
new SelectAttribute(
_('Resource'), _('Supann resources'),
'fdTasksLifeCyclePreResource', TRUE
),
new SelectAttribute(
_('State'), _('Resource state'),
'fdTasksLifeCyclePreState', TRUE
),
new SelectAttribute(
_('Sub state'), _('Resource sub state'),
'fdTasksLifeCyclePreSubState', FALSE
),
]
],
'UserGroupSelection' => [
'name' => _('Recipients Users and/or Groups'),
'class' => ['fullwidth'],
'attrs' => [
new UsersGroupsRolesAttribute(
_('Members'), _('Users or groups to assign to this task.'),
'fdTasksLifeCycleMembers', TRUE
),
],
],
];
}
/**
* @throws NonExistingLdapNodeException
*/
function __construct ($dn = NULL, $object = NULL, $parent = NULL, $mainTab = FALSE)
{
parent::__construct($dn, $object, $parent, $mainTab);
$this->attributesAccess['fdShowInformation']->setInLdap(FALSE);
if (class_available('supannAccountStatus')) {
$this->setSupannStates();
} else {
$warning = new FusionDirectoryWarning(htmlescape(_('The plugin Supann does not seem to be installed !')));
$warning->display();
}
}
/**
* Set attributes values with defined supann states from configuration
*/
protected function setSupannStates (): void
{
global $config;
// Define the mandatory ones and get the remaining from configuration.
$resources = ['COMPTE' => _('Account'), 'MAIL' => _('Mail')];
foreach ($config->get_cfg_value('SupannRessourceLabels', []) as $line) {
list($resource, $label) = explode(':', $line, 2);
$resources[$resource] = $label;
}
$this->attributesAccess['fdTasksLifeCyclePreResource']->setChoices(array_keys($resources), array_values($resources));
$this->attributesAccess['fdTasksLifeCyclePostResource']->setChoices(array_keys($resources), array_values($resources));
// @phpstan-ignore-next-line - Class verification is performed prior but class is only available in plugin not CORE.
$this->subStates = supannAccountStatus::getConfiguredSubstates(); //Keys are states and Values are subStates
$this->attributesAccess['fdTasksLifeCyclePreState']->setChoices(array_keys($this->subStates));
$this->attributesAccess['fdTasksLifeCyclePostState']->setChoices(array_keys($this->subStates));
// Allows the sub states to be listed when state is modified.
$this->attributesAccess['fdTasksLifeCyclePreState']->setSubmitForm('updateFieldsChoices');
$this->attributesAccess['fdTasksLifeCyclePostState']->setSubmitForm('updateFieldsChoices');
// This initial fill the list choices based on registered states.
$this->updateFieldsChoices();
}
/* Update list of subStates which depends on the state selected */
function updateFieldsChoices ()
{
// Update pre sub states
$preSubStatesList = $this->subStates[$this->attributesAccess['fdTasksLifeCyclePreState']->getValue()] ?? [];
$this->attributesAccess['fdTasksLifeCyclePreSubState']->setChoices(array_keys($preSubStatesList), array_values($preSubStatesList));
// Update post sub states
$postSubStatesList = $this->subStates[$this->attributesAccess['fdTasksLifeCyclePostState']->getValue()] ?? [];
$this->attributesAccess['fdTasksLifeCyclePostSubState']->setChoices(array_keys($postSubStatesList), array_values($postSubStatesList));
}
/**
* Retrieve all the DNs from groups or members
*/
public function getListOfDN (): void
{
// Get the members or groups selected
$membersAndGroups = $this->attributesAccess['fdTasksLifeCycleMembers']->getValue();
// Call static function from tasks object, always return an array.
$this->attributesAccess['fdTasksLifeCycleListOfDN']->setValue(array_values(tasks::extractMembersFromGroups($membersAndGroups)));
}
/**
* Generate slave tasks, careful that main task cannot be changed cause subtasks are not updated.
* It would be dangerous to edit subs tasks if some are under processed already.
*/
public function generateSlaveTasks ()
{
$listOfDN = $this->attributesAccess['fdTasksLifeCycleListOfDN']->getValue();
// The attribute required to be search in createSlaveTasks
$attributeType = 'fdTasksGranularDN';
// Call the method from parent tasks object (first tab) to create sub-tasks.
$this->parent->getBaseObject()->createSlaveTasks($listOfDN, $attributeType, NULL, 'Life Cycle');
}
public function update (): bool
{
parent::update();
// Take the list of DN based on the groups or members list selected and filled the related attributes
$this->getListOfDN();
return TRUE;
}
function save (): array
{
// Verify if this tasks has to be executed upon saving.
$execTasks = $this->parent->getBaseObject()->fdSubTasksActivation ?? NULL;
if ($execTasks) {
$this->generateSlaveTasks();
}
return parent::save();
}
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment