LinkedSet: Rename classes / files to match conventions

2026-04-23 10:38:45 +02:00 · 2023-04-05 18:52:19 +02:00
parent aafd05afd1
commit 7ad3b07e89
20 changed files with 55 additions and 55 deletions
--- a/application/cmdbabstract.class.inc.php
+++ b/application/cmdbabstract.class.inc.php
@@ -38,9 +38,9 @@ use Combodo\iTop\Application\UI\Base\Layout\Object\ObjectFactory;
 use Combodo\iTop\Application\UI\Base\Layout\TabContainer\Tab\AjaxTab;
 use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock;
 use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
-use Combodo\iTop\Application\UI\Links\Direct\BlockDirectLinksViewTable;
-use Combodo\iTop\Application\UI\Links\Indirect\BlockIndirectLinksViewTable;
-use Combodo\iTop\Application\UI\Links\Set\LinksSetUIBlockFactory;
+use Combodo\iTop\Application\UI\Links\Direct\BlockDirectLinkSetViewTable;
+use Combodo\iTop\Application\UI\Links\Indirect\BlockIndirectLinkSetViewTable;
+use Combodo\iTop\Application\UI\Links\Set\LinkSetUIBlockFactory;
 use Combodo\iTop\Renderer\BlockRenderer;
 use Combodo\iTop\Renderer\Console\ConsoleBlockRenderer;
 use Combodo\iTop\Renderer\Console\ConsoleFormRenderer;
@@ -756,11 +756,11 @@ HTML
 				$oPage->add($sHTMLValue);
 			} else {
 				if ($oAttDef->IsIndirect()) {
-					$oBlockLinkViewTable = new BlockIndirectLinksViewTable($oPage, $this, $sClass, $sAttCode, $oAttDef);
+					$oBlockLinkSetViewTable = new BlockIndirectLinkSetViewTable($oPage, $this, $sClass, $sAttCode, $oAttDef);
 				} else {
-					$oBlockLinkViewTable = new BlockDirectLinksViewTable($oPage, $this, $sClass, $sAttCode, $oAttDef);
+					$oBlockLinkSetViewTable = new BlockDirectLinkSetViewTable($oPage, $this, $sClass, $sAttCode, $oAttDef);
 				}
-				$oPage->AddUiBlock($oBlockLinkViewTable);
+				$oPage->AddUiBlock($oBlockLinkSetViewTable);
 			}
 			if (array_key_exists($sAttCode, $aRedundancySettings)) {
 				foreach ($aRedundancySettings[$sAttCode] as $oRedundancyAttDef) {
@@ -2354,9 +2354,9 @@ EOF
 				case 'LinkedSet':
 					if ($oAttDef->GetDisplayStyle() === LINKSET_DISPLAY_STYLE_PROPERTY) {
 						if (array_key_exists('bulk_context', $aArgs)) {
-							$oTagSetBlock = LinksSetUIBlockFactory::MakeForBulkLinkSet($iId, $oAttDef, $value, $sWizardHelperJsVarName, $aArgs['bulk_context']);
+							$oTagSetBlock = LinkSetUIBlockFactory::MakeForBulkLinkSet($iId, $oAttDef, $value, $sWizardHelperJsVarName, $aArgs['bulk_context']);
 						} else {
-							$oTagSetBlock = LinksSetUIBlockFactory::MakeForLinkSet($iId, $oAttDef, $value, $sWizardHelperJsVarName, $aArgs['this']);
+							$oTagSetBlock = LinkSetUIBlockFactory::MakeForLinkSet($iId, $oAttDef, $value, $sWizardHelperJsVarName, $aArgs['this']);
 						}
 						$oTagSetBlock->SetName("attr_{$sFieldPrefix}{$sAttCode}{$sNameSuffix}");
 						$aEventsList[] = 'validate';
--- a/application/ui.linksdirectwidget.class.inc.php
+++ b/application/ui.linksdirectwidget.class.inc.php
@@ -4,7 +4,7 @@
 * @license     http://opensource.org/licenses/AGPL-3.0
 */

-use Combodo\iTop\Application\UI\Links\Direct\BlockDirectLinksEditTable;
+use Combodo\iTop\Application\UI\Links\Direct\BlockDirectLinkSetEditTable;
 use Combodo\iTop\Renderer\Console\ConsoleBlockRenderer;

 /**
@@ -82,7 +82,7 @@ class UILinksWidgetDirect
 	 */
 	public function Display(WebPage $oPage, $oValue, $aArgs, $sFormPrefix, $oCurrentObj)
 	{
-		$oBlock = new BlockDirectLinksEditTable($this, $this->sInputid);
+		$oBlock = new BlockDirectLinkSetEditTable($this, $this->sInputid);
 		$oBlock->InitTable($oPage, $oValue, $sFormPrefix);

 		return ConsoleBlockRenderer::RenderBlockTemplateInPage($oPage, $oBlock);
--- a/application/ui.linkswidget.class.inc.php
+++ b/application/ui.linkswidget.class.inc.php
@@ -6,7 +6,7 @@

 use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\DataTable\StaticTable\FormTableRow\FormTableRow;
-use Combodo\iTop\Application\UI\Links\Indirect\BlockIndirectLinksEditTable;
+use Combodo\iTop\Application\UI\Links\Indirect\BlockIndirectLinkSetEditTable;
 use Combodo\iTop\Application\UI\Links\Indirect\BlockObjectPickerDialog;
 use Combodo\iTop\Renderer\Console\ConsoleBlockRenderer;

@@ -136,7 +136,7 @@ class UILinksWidget
 	 */
 	public function Display(WebPage $oPage, $oValue, $aArgs, $sFormPrefix, $oCurrentObj): string
 	{
-		$oBlock = new BlockIndirectLinksEditTable($this);
+		$oBlock = new BlockIndirectLinkSetEditTable($this);
 		$oBlock->InitTable($oPage, $oValue, $aArgs, $sFormPrefix, $oCurrentObj, $this->m_aTableConfig);

 		return ConsoleBlockRenderer::RenderBlockTemplateInPage($oPage, $oBlock);
@@ -243,7 +243,7 @@ class UILinksWidget
 		foreach ($aLinkedObjectIds as $iObjectId) {
 			$oLinkedObj = MetaModel::GetObject($this->m_sRemoteClass, $iObjectId, false);
 			if (is_object($oLinkedObj)) {
-				$oBlock = new BlockIndirectLinksEditTable($this);
+				$oBlock = new BlockIndirectLinkSetEditTable($this);
 				$aRow = $oBlock->GetFormRow($oP, $oLinkedObj, $iObjectId, array(), $oCurrentObj, $iAdditionId); // Not yet created link get negative Ids
 				$oRow = new FormTableRow("{$this->m_sAttCode}{$this->m_sNameSuffix}", $this->m_aTableConfig, $aRow, -$iAdditionId);
 				$oP->AddUiBlock($oRow);
@@ -271,7 +271,7 @@ class UILinksWidget
 		foreach ($aLinkedObjectIds as $iObjectId) {
 			$oLinkedObj = MetaModel::GetObject($this->m_sRemoteClass, $iObjectId, false);
 			if (is_object($oLinkedObj)) {
-				$oBlock = new BlockIndirectLinksEditTable($this);
+				$oBlock = new BlockIndirectLinkSetEditTable($this);
 				$aRow = $oBlock->GetFormRow($oP, $oLinkedObj, $iObjectId, array(), $oCurrentObj, $iAdditionId); // Not yet created link get negative Ids
 				$aData = [];
 				foreach ($aRow as $item) {
--- a/core/attributedef.class.inc.php
+++ b/core/attributedef.class.inc.php
@@ -5,7 +5,7 @@
 */

 use Combodo\iTop\Application\UI\Base\Component\FieldBadge\FieldBadgeUIBlockFactory;
-use Combodo\iTop\Application\UI\Links\Indirect\BlockLinksSetDisplayAsProperty;
+use Combodo\iTop\Application\UI\Links\Indirect\BlockLinkSetDisplayAsProperty;
 use Combodo\iTop\Form\Field\LabelField;
 use Combodo\iTop\Form\Field\TextAreaField;
 use Combodo\iTop\Form\Form;
@@ -1761,7 +1761,7 @@ class AttributeLinkedSet extends AttributeDefinition
 				return '';
 			}

-			$oLinkSetBlock = new BlockLinksSetDisplayAsProperty($this->GetCode(), $this, $sValue);
+			$oLinkSetBlock = new BlockLinkSetDisplayAsProperty($this->GetCode(), $this, $sValue);

 			return ConsoleBlockRenderer::RenderBlockTemplates($oLinkSetBlock);
 		}
--- a/core/metamodel.class.php
+++ b/core/metamodel.class.php
@@ -2081,7 +2081,7 @@ abstract class MetaModel
 	 * @return string[] attcodes to display, containing aliases
 	 * @throws \CoreException
 	 *
-	 * @since 3.0.0 N°2334 added code for n-n relations in {@see BlockIndirectLinksViewTable::GetAttCodesToDisplay}
+	 * @since 3.0.0 N°2334 added code for n-n relations in {@see BlockIndirectLinkSetViewTable::GetAttCodesToDisplay}
 	 * @since 3.1.0 N°3200 method creation so that it can be used elsewhere
 	 */
 	public static function GetAttributeLinkedSetIndirectDatatableAttCodesToDisplay(string $sObjectClass, string $sObjectLinkedSetIndirectAttCode, string $sRemoteClass, string $sLnkExternalKeyToRemoteClassAttCode):array
--- a/js/links/links-set-worker.js
+++ b/js/links/links-set-worker.js
--- a/js/links/links-set.js
+++ b/js/links/links-set.js
--- a/lib/composer/autoload_classmap.php
+++ b/lib/composer/autoload_classmap.php
@@ -351,11 +351,11 @@ return array(
    'Combodo\\iTop\\Application\\UI\\DisplayBlock\\BlockCsv\\BlockCsv' => $baseDir . '/sources/Application/UI/DisplayBlock/BlockCsv/BlockCsv.php',
    'Combodo\\iTop\\Application\\UI\\DisplayBlock\\BlockList\\BlockList' => $baseDir . '/sources/Application/UI/DisplayBlock/BlockList/BlockList.php',
    'Combodo\\iTop\\Application\\UI\\Helper\\UIHelper' => $baseDir . '/sources/Application/UI/Helper/UIHelper.php',
-    'Combodo\\iTop\\Application\\UI\\Links\\AbstractBlockLinksViewTable' => $baseDir . '/sources/Application/UI/Links/AbstractBlockLinksViewTable.php',
-    'Combodo\\iTop\\Application\\UI\\Links\\Direct\\BlockDirectLinksEditTable' => $baseDir . '/sources/Application/UI/Links/Direct/BlockDirectLinksEditTable.php',
-    'Combodo\\iTop\\Application\\UI\\Links\\Direct\\BlockDirectLinksViewTable' => $baseDir . '/sources/Application/UI/Links/Direct/BlockDirectLinksViewTable.php',
-    'Combodo\\iTop\\Application\\UI\\Links\\Indirect\\BlockIndirectLinksEditTable' => $baseDir . '/sources/Application/UI/Links/Indirect/BlockIndirectLinksEditTable.php',
-    'Combodo\\iTop\\Application\\UI\\Links\\Indirect\\BlockIndirectLinksViewTable' => $baseDir . '/sources/Application/UI/Links/Indirect/BlockIndirectLinksViewTable.php',
+    'Combodo\\iTop\\Application\\UI\\Links\\AbstractBlockLinkSetViewTable' => $baseDir . '/sources/Application/UI/Links/AbstractBlockLinkSetViewTable.php',
+    'Combodo\\iTop\\Application\\UI\\Links\\Direct\\BlockDirectLinkSetEditTable' => $baseDir . '/sources/Application/UI/Links/Direct/BlockDirectLinkSetEditTable.php',
+    'Combodo\\iTop\\Application\\UI\\Links\\Direct\\BlockDirectLinkSetViewTable' => $baseDir . '/sources/Application/UI/Links/Direct/BlockDirectLinkSetViewTable.php',
+    'Combodo\\iTop\\Application\\UI\\Links\\Indirect\\BlockIndirectLinkSetEditTable' => $baseDir . '/sources/Application/UI/Links/Indirect/BlockIndirectLinkSetEditTable.php',
+    'Combodo\\iTop\\Application\\UI\\Links\\Indirect\\BlockIndirectLinkSetViewTable' => $baseDir . '/sources/Application/UI/Links/Indirect/BlockIndirectLinkSetViewTable.php',
    'Combodo\\iTop\\Application\\UI\\Links\\Indirect\\BlockLinksSetDisplayAsProperty' => $baseDir . '/sources/Application/UI/Links/Set/BlockLinksSetDisplayAsProperty.php',
    'Combodo\\iTop\\Application\\UI\\Links\\Indirect\\BlockObjectPickerDialog' => $baseDir . '/sources/Application/UI/Links/Indirect/BlockObjectPickerDialog.php',
    'Combodo\\iTop\\Application\\UI\\Links\\Set\\LinksSetUIBlockFactory' => $baseDir . '/sources/Application/UI/Links/Set/LinksSetUIBlockFactory.php',
@@ -366,7 +366,7 @@ return array(
    'Combodo\\iTop\\Controller\\AjaxRenderController' => $baseDir . '/sources/Controller/AjaxRenderController.php',
    'Combodo\\iTop\\Controller\\Base\\Layout\\ActivityPanelController' => $baseDir . '/sources/Controller/Base/Layout/ActivityPanelController.php',
    'Combodo\\iTop\\Controller\\Base\\Layout\\ObjectController' => $baseDir . '/sources/Controller/Base/Layout/ObjectController.php',
-    'Combodo\\iTop\\Controller\\Links\\LinkSetController' => $baseDir . '/sources/Controller/Links/LinksetController.php',
+    'Combodo\\iTop\\Controller\\Links\\LinkSetController' => $baseDir . '/sources/Controller/Links/LinkSetController.php',
    'Combodo\\iTop\\Controller\\OAuth\\OAuthLandingController' => $baseDir . '/sources/Controller/OAuth/OAuthLandingController.php',
    'Combodo\\iTop\\Controller\\PreferencesController' => $baseDir . '/sources/Controller/PreferencesController.php',
    'Combodo\\iTop\\Controller\\iController' => $baseDir . '/sources/Controller/iController.php',
--- a/lib/composer/autoload_static.php
+++ b/lib/composer/autoload_static.php
@@ -716,11 +716,11 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
        'Combodo\\iTop\\Application\\UI\\DisplayBlock\\BlockCsv\\BlockCsv' => __DIR__ . '/../..' . '/sources/Application/UI/DisplayBlock/BlockCsv/BlockCsv.php',
        'Combodo\\iTop\\Application\\UI\\DisplayBlock\\BlockList\\BlockList' => __DIR__ . '/../..' . '/sources/Application/UI/DisplayBlock/BlockList/BlockList.php',
        'Combodo\\iTop\\Application\\UI\\Helper\\UIHelper' => __DIR__ . '/../..' . '/sources/Application/UI/Helper/UIHelper.php',
-        'Combodo\\iTop\\Application\\UI\\Links\\AbstractBlockLinksViewTable' => __DIR__ . '/../..' . '/sources/Application/UI/Links/AbstractBlockLinksViewTable.php',
-        'Combodo\\iTop\\Application\\UI\\Links\\Direct\\BlockDirectLinksEditTable' => __DIR__ . '/../..' . '/sources/Application/UI/Links/Direct/BlockDirectLinksEditTable.php',
-        'Combodo\\iTop\\Application\\UI\\Links\\Direct\\BlockDirectLinksViewTable' => __DIR__ . '/../..' . '/sources/Application/UI/Links/Direct/BlockDirectLinksViewTable.php',
-        'Combodo\\iTop\\Application\\UI\\Links\\Indirect\\BlockIndirectLinksEditTable' => __DIR__ . '/../..' . '/sources/Application/UI/Links/Indirect/BlockIndirectLinksEditTable.php',
-        'Combodo\\iTop\\Application\\UI\\Links\\Indirect\\BlockIndirectLinksViewTable' => __DIR__ . '/../..' . '/sources/Application/UI/Links/Indirect/BlockIndirectLinksViewTable.php',
+        'Combodo\\iTop\\Application\\UI\\Links\\AbstractBlockLinkSetViewTable' => __DIR__ . '/../..' . '/sources/Application/UI/Links/AbstractBlockLinkSetViewTable.php',
+        'Combodo\\iTop\\Application\\UI\\Links\\Direct\\BlockDirectLinkSetEditTable' => __DIR__ . '/../..' . '/sources/Application/UI/Links/Direct/BlockDirectLinkSetEditTable.php',
+        'Combodo\\iTop\\Application\\UI\\Links\\Direct\\BlockDirectLinkSetViewTable' => __DIR__ . '/../..' . '/sources/Application/UI/Links/Direct/BlockDirectLinkSetViewTable.php',
+        'Combodo\\iTop\\Application\\UI\\Links\\Indirect\\BlockIndirectLinkSetEditTable' => __DIR__ . '/../..' . '/sources/Application/UI/Links/Indirect/BlockIndirectLinkSetEditTable.php',
+        'Combodo\\iTop\\Application\\UI\\Links\\Indirect\\BlockIndirectLinkSetViewTable' => __DIR__ . '/../..' . '/sources/Application/UI/Links/Indirect/BlockIndirectLinkSetViewTable.php',
        'Combodo\\iTop\\Application\\UI\\Links\\Indirect\\BlockLinksSetDisplayAsProperty' => __DIR__ . '/../..' . '/sources/Application/UI/Links/Set/BlockLinksSetDisplayAsProperty.php',
        'Combodo\\iTop\\Application\\UI\\Links\\Indirect\\BlockObjectPickerDialog' => __DIR__ . '/../..' . '/sources/Application/UI/Links/Indirect/BlockObjectPickerDialog.php',
        'Combodo\\iTop\\Application\\UI\\Links\\Set\\LinksSetUIBlockFactory' => __DIR__ . '/../..' . '/sources/Application/UI/Links/Set/LinksSetUIBlockFactory.php',
@@ -731,7 +731,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
        'Combodo\\iTop\\Controller\\AjaxRenderController' => __DIR__ . '/../..' . '/sources/Controller/AjaxRenderController.php',
        'Combodo\\iTop\\Controller\\Base\\Layout\\ActivityPanelController' => __DIR__ . '/../..' . '/sources/Controller/Base/Layout/ActivityPanelController.php',
        'Combodo\\iTop\\Controller\\Base\\Layout\\ObjectController' => __DIR__ . '/../..' . '/sources/Controller/Base/Layout/ObjectController.php',
-        'Combodo\\iTop\\Controller\\Links\\LinkSetController' => __DIR__ . '/../..' . '/sources/Controller/Links/LinksetController.php',
+        'Combodo\\iTop\\Controller\\Links\\LinkSetController' => __DIR__ . '/../..' . '/sources/Controller/Links/LinkSetController.php',
        'Combodo\\iTop\\Controller\\OAuth\\OAuthLandingController' => __DIR__ . '/../..' . '/sources/Controller/OAuth/OAuthLandingController.php',
        'Combodo\\iTop\\Controller\\PreferencesController' => __DIR__ . '/../..' . '/sources/Controller/PreferencesController.php',
        'Combodo\\iTop\\Controller\\iController' => __DIR__ . '/../..' . '/sources/Controller/iController.php',
--- a/sources/Application/UI/Base/Component/Input/Set/Set.php
+++ b/sources/Application/UI/Base/Component/Input/Set/Set.php
@@ -37,7 +37,7 @@ class Set extends AbstractInput
 	public const DEFAULT_JS_ON_READY_TEMPLATE_REL_PATH = 'base/components/input/set/layout';

 	public const DEFAULT_JS_FILES_REL_PATH = [
-		'js/links/links-set-worker.js',
+		'js/links/linkset-worker.js',
 		'js/object/object-worker.js',
 		'js/selectize/plugin_combodo_add_button.js',
 		'js/selectize/plugin_combodo_auto_position.js',
--- a/sources/Application/UI/Links/AbstractBlockLinkSetViewTable.php
+++ b/sources/Application/UI/Links/AbstractBlockLinkSetViewTable.php
@@ -23,20 +23,20 @@ use Utils;
 use WebPage;

 /**
- * Class AbstractBlockLinksViewTable
+ * Class AbstractBlockLinkSetViewTable
 *
 * @internal
 * @since 3.1.0
 * @package Combodo\iTop\Application\UI\Links
 */
-abstract class AbstractBlockLinksViewTable extends UIContentBlock
+abstract class AbstractBlockLinkSetViewTable extends UIContentBlock
 {
 	// Overloaded constants
-	public const BLOCK_CODE                            = 'ibo-abstract-block-links-view-table';
+	public const BLOCK_CODE                            = 'ibo-abstract-block-linkset-view-table';
 	public const DEFAULT_JS_ON_READY_TEMPLATE_REL_PATH = 'application/links/layout';
 	public const DEFAULT_JS_FILES_REL_PATH             = [
 		'js/links/links_view_table_widget.js',
-		'js/links/links-set-worker.js',
+		'js/links/linkset-worker.js',
 		'js/object/object-worker.js',
 		'js/wizardhelper.js',
 	];
--- a/sources/Application/UI/Links/Direct/BlockDirectLinkSetEditTable.php
+++ b/sources/Application/UI/Links/Direct/BlockDirectLinkSetEditTable.php
@@ -31,17 +31,17 @@ use utils;
 use WebPage;

 /**
- * Class BlockDirectLinksEditTable
+ * Class BlockDirectLinkSetEditTable
 *
 * @internal
 * @since 3.1.0
 * @package Combodo\iTop\Application\UI\Links\Direct
 */
-class BlockDirectLinksEditTable extends UIContentBlock
+class BlockDirectLinkSetEditTable extends UIContentBlock
 {
 	// Overloaded constants
-	public const BLOCK_CODE                   = 'ibo-block-direct-links-edit-table';
-	public const DEFAULT_JS_TEMPLATE_REL_PATH = 'application/links/direct/block-direct-links-edit-table/layout';
+	public const BLOCK_CODE                   = 'ibo-block-direct-linkset-edit-table';
+	public const DEFAULT_JS_TEMPLATE_REL_PATH = 'application/links/direct/block-direct-linkset-edit-table/layout';
 	public const DEFAULT_JS_FILES_REL_PATH    = [
 		'js/links/links_direct_widget.js',
 	];
--- a/sources/Application/UI/Links/Direct/BlockDirectLinkSetViewTable.php
+++ b/sources/Application/UI/Links/Direct/BlockDirectLinkSetViewTable.php
@@ -6,20 +6,20 @@

 namespace Combodo\iTop\Application\UI\Links\Direct;

-use Combodo\iTop\Application\UI\Links\AbstractBlockLinksViewTable;
+use Combodo\iTop\Application\UI\Links\AbstractBlockLinkSetViewTable;
 use Combodo\iTop\Service\Links\LinkSetModel;
 use MetaModel;

 /**
- * Class BlockDirectLinksViewTable
+ * Class BlockDirectLinkSetViewTable
 *
 * @internal
 * @since 3.1.0
 * @package Combodo\iTop\Application\UI\Links\Direct
 */
-class BlockDirectLinksViewTable extends AbstractBlockLinksViewTable
+class BlockDirectLinkSetViewTable extends AbstractBlockLinkSetViewTable
 {
-	public const BLOCK_CODE                          = 'ibo-block-direct-links-view-table';
+	public const BLOCK_CODE                          = 'ibo-block-direct-linkset-view-table';
 	public const REQUIRES_ANCESTORS_DEFAULT_JS_FILES = true;

 	/** @inheritdoc */
--- a/sources/Application/UI/Links/Indirect/BlockIndirectLinkSetEditTable.php
+++ b/sources/Application/UI/Links/Indirect/BlockIndirectLinkSetEditTable.php
@@ -26,17 +26,17 @@ use utils;
 use WebPage;

 /**
- * Class BlockIndirectLinksEditTable
+ * Class BlockIndirectLinkSetEditTable
 *
 * @internal
 * @since 3.1.0
 * @package Combodo\iTop\Application\UI\Links\Indirect
 */
-class BlockIndirectLinksEditTable extends UIContentBlock
+class BlockIndirectLinkSetEditTable extends UIContentBlock
 {
 	// Overloaded constants
-	public const BLOCK_CODE                   = 'ibo-block-indirect-links-edit-table';
-	public const DEFAULT_JS_TEMPLATE_REL_PATH = 'application/links/indirect/block-indirect-links-edit-table/layout';
+	public const BLOCK_CODE                   = 'ibo-block-indirect-linkset-edit-table';
+	public const DEFAULT_JS_TEMPLATE_REL_PATH = 'application/links/indirect/block-indirect-linkset-edit-table/layout';
 	public const DEFAULT_JS_FILES_REL_PATH    = [
 		'js/links/links_widget.js',
 	];
--- a/sources/Application/UI/Links/Indirect/BlockIndirectLinkSetViewTable.php
+++ b/sources/Application/UI/Links/Indirect/BlockIndirectLinkSetViewTable.php
@@ -6,21 +6,21 @@

 namespace Combodo\iTop\Application\UI\Links\Indirect;

-use Combodo\iTop\Application\UI\Links\AbstractBlockLinksViewTable;
+use Combodo\iTop\Application\UI\Links\AbstractBlockLinkSetViewTable;
 use Combodo\iTop\Service\Links\LinkSetModel;
 use MetaModel;
 use PHPUnit\Exception;

 /**
- * Class BlockIndirectLinksViewTable
+ * Class BlockIndirectLinkSetViewTable
 *
 * @internal
 * @since 3.1.0
 * @package Combodo\iTop\Application\UI\Links\Indirect
 */
-class BlockIndirectLinksViewTable extends AbstractBlockLinksViewTable
+class BlockIndirectLinkSetViewTable extends AbstractBlockLinkSetViewTable
 {
-	public const BLOCK_CODE                          = 'ibo-block-indirect-links-view-table';
+	public const BLOCK_CODE                          = 'ibo-block-indirect-linkset-view-table';
 	public const REQUIRES_ANCESTORS_DEFAULT_JS_FILES = true;

 	/** @inheritdoc */
--- a/sources/Application/UI/Links/Set/BlockLinksSetDisplayAsProperty.php
+++ b/sources/Application/UI/Links/Set/BlockLinksSetDisplayAsProperty.php
@@ -19,13 +19,13 @@ use Twig\Environment;
 use utils;

 /**
- * Class BlockLinksSetDisplayAsProperty
+ * Class BlockLinkSetDisplayAsProperty
 *
 * @internal
 * @since 3.1.0
 * @package Combodo\iTop\Application\UI\Links\Indirect
 */
-class BlockLinksSetDisplayAsProperty extends UIContentBlock
+class BlockLinkSetDisplayAsProperty extends UIContentBlock
 {
 	public const BLOCK_CODE = 'ibo-block-links-set-as-property';

--- a/sources/Application/UI/Links/Set/LinksSetUIBlockFactory.php
+++ b/sources/Application/UI/Links/Set/LinksSetUIBlockFactory.php
@@ -30,14 +30,14 @@ use DBObject;
 use iDBObjectSetIterator;

 /**
- * Class LinksSetUIBlockFactory
+ * Class LinkSetUIBlockFactory
 *
 * @api
 *
 * @since 3.1.0
 * @package Combodo\iTop\Application\UI\Links\Set
 */
-class LinksSetUIBlockFactory extends SetUIBlockFactory
+class LinkSetUIBlockFactory extends SetUIBlockFactory
 {

 	/**
@@ -59,7 +59,7 @@ class LinksSetUIBlockFactory extends SetUIBlockFactory
 		// Set UI block for OQL
 		$oSetUIBlock = SetUIBlockFactory::MakeForOQL($sId, $sTargetClass, $oAttDef->GetValuesDef()->GetFilterExpression(), $sWizardHelperJsVarName);

-		$oSetUIBlock->AddJsFileRelPath('js/links/links-set.js');
+		$oSetUIBlock->AddJsFileRelPath('js/links/linkset.js');

 		// Add button behaviour
 		if (in_array($oAttDef->GetEditMode(), [LINKSET_EDITMODE_ADDREMOVE, LINKSET_EDITMODE_ADDONLY, LINKSET_EDITMODE_INPLACE, LINKSET_EDITMODE_ACTIONS])
--- a/sources/Controller/Links/LinkSetController.php
+++ b/sources/Controller/Links/LinkSetController.php
--- a/templates/application/links/direct/block-direct-linkset-edit-table/layout.js.twig
+++ b/templates/application/links/direct/block-direct-linkset-edit-table/layout.js.twig
--- a/templates/application/links/indirect/block-indirect-linkset-edit-table/layout.js.twig
+++ b/templates/application/links/indirect/block-indirect-linkset-edit-table/layout.js.twig