Release of v4.0.2-alpha1

Fix site view form missing classes in J4+. Fix permissions tab in items in J4+. Fix site display controller checkEditId function in J4+. Add class methods to the HtmlView classes in J4+. Fix broken toolbar call in HtmlView in J4+.

CHANGELOG.md

@@ -1,3 +1,11 @@
+# v4.0.2-alpha1
+
+- Fix site view form missing classes in J4+
+- Fix permissions tab in items in J4+
+- Fix site display controller checkEditId function in J4+
+- Add class methods to the HtmlView classes in J4+
+- Fix broken toolbar call in HtmlView in J4+
+
 # v4.0.1
 
 - Fix auto build from SQL in Joomla 4.

ComponentbuilderInstallerScript.php

@@ -3267,7 +3267,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 			echo '<div style="background-color: #fff;" class="alert alert-info"><a target="_blank" href="https://dev.vdm.io" title="Component Builder">
 				<img src="components/com_componentbuilder/assets/images/vdm-component.jpg"/>
 				</a>
-				<h3>Upgrade to Version 4.0.1 Was Successful! Let us know if anything is not working as expected.</h3></div>';
+				<h3>Upgrade to Version 4.0.2-alpha1 Was Successful! Let us know if anything is not working as expected.</h3></div>';
 
 			// Add/Update component in the action logs extensions table.
 			$this->setActionLogsExtensions();

README.md

@@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will save you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (4.0.1) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (4.0.2-alpha1) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -144,13 +144,13 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Component Builder](https://git.vdm.dev/joomla/Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 20th July, 2024
-+ *Version*: 4.0.1
++ *Last Build*: 26th July, 2024
++ *Version*: 4.0.2-alpha1
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **780706**
++ *Line count*: **790585**
 + *Field count*: **2104**
-+ *File count*: **5462**
++ *File count*: **5483**
 + *Folder count*: **540**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](https://www.joomlacomponentbuilder.com).

admin/README.txt

@@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will save you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (4.0.1) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (4.0.2-alpha1) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -144,13 +144,13 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Component Builder](https://git.vdm.dev/joomla/Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 20th July, 2024
-+ *Version*: 4.0.1
++ *Last Build*: 26th July, 2024
++ *Version*: 4.0.2-alpha1
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **780706**
++ *Line count*: **790585**
 + *Field count*: **2104**
-+ *File count*: **5462**
++ *File count*: **5483**
 + *Folder count*: **540**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](https://www.joomlacomponentbuilder.com).

admin/compiler/joomla_4/ADMIN_VIEWS_HTML.php

@@ -27,6 +27,62 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Administrator
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    Joomla___effdaf6d_2275_425d_9f52_d4952e564d34___Power
+	 * @since  3.10.11
+	 */
+	public Joomla___effdaf6d_2275_425d_9f52_d4952e564d34___Power $user;
+
 	/**
 	 * ###Views### view display method
 	 *
@@ -43,7 +99,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();###ADMIN_DIPLAY_METHOD###
+		$this->user ??= $this->getCurrentUser();###ADMIN_DIPLAY_METHOD###
 		$this->saveOrder = $this->listOrder == 'a.ordering';
 		// set the return here value
 		$this->return_here = urlencode(base64_encode((string) Uri::getInstance()));

admin/compiler/joomla_4/ADMIN_VIEW_HTML.php

@@ -27,6 +27,86 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Administrator
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * ###View### view display method
 	 *
@@ -41,7 +121,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_###component###');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/compiler/joomla_4/CUSTOM_ADMIN_VIEWS_HTML.php

@@ -27,6 +27,38 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Administrator
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    Joomla___effdaf6d_2275_425d_9f52_d4952e564d34___Power
+	 * @since  3.10.11
+	 */
+	public Joomla___effdaf6d_2275_425d_9f52_d4952e564d34___Power $user;
+
 	/**
 	 * Display the view
 	 *
@@ -42,11 +74,11 @@ class HtmlView extends BaseHtmlView
 		// get the application
 		$this->app ??= Factory::getApplication();
 		// get the user object
-		$this->user ??= $this->app->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// get global action permissions
 		$this->canDo = ###Component###Helper::getActions('###sview###');
-		$this->styles = $this->get('Styles');
-		$this->scripts = $this->get('Scripts');###CUSTOM_ADMIN_DIPLAY_METHOD###
+		$this->styles = $this->get('Styles') ?? [];
+		$this->scripts = $this->get('Scripts') ?? [];###CUSTOM_ADMIN_DIPLAY_METHOD###
 
 		// Set the html view document stuff
 		$this->_prepareDocument();

admin/compiler/joomla_4/SITE_ADMIN_VIEW_HTML.php

@@ -27,6 +27,86 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Site\View\###
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral view item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * ###View### view display method
 	 *
@@ -41,11 +121,11 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_###component###');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->state = $this->get('State');
-		$this->styles = $this->get('Styles');
-		$this->scripts = $this->get('Scripts');
+		$this->styles = $this->get('Styles') ?? [];
+		$this->scripts = $this->get('Scripts') ?? [];
 		// get action permissions
 		$this->canDo = ###Component###Helper::getActions('###view###', $this->item);
 		// get input
@@ -97,6 +177,9 @@ class HtmlView extends BaseHtmlView
 	protected function addToolbar(): void
 	{
 		###ADDTOOLBAR###
+
+		// now initiate the toolbar
+		$this->toolbar ??= Toolbar::getInstance();
 	}
 
 	/**

admin/compiler/joomla_4/SITE_DISPLAY_CONTROLLER.php

@@ -15,9 +15,13 @@ defined('_JCB_TEMPLATE') or die;
 ###BOM###
 namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Site\Controller;
 
+use Joomla\Input\Input;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\MVC\Controller\BaseController;
+use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\Router\Route;
+use Joomla\CMS\User\User;
 use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Language\Text;
 
@@ -31,13 +35,50 @@ use Joomla\CMS\Language\Text;
  */
 class DisplayController extends BaseController
 {
+	/**
+	 * The allowed edit views.
+	 *
+	 * @var array
+	 * @since  4.0.0
+	 */
+	protected array $allowed_edit_views = [###SITE_ALLOW_EDIT_VIEWS_ARRAY###
+	];
+
+	/**
+	 * The application identity object.
+	 *
+	 * @var User
+	 * @since  4.0.0
+	 */
+	protected $identity;
+
+	/**
+	 * @param   array                     $config       An optional associative array of configuration settings.
+	 *                                                  Recognized key values include 'name', 'default_task', 'model_path', and
+	 *                                                  'view_path' (this list is not meant to be comprehensive).
+	 * @param   MVCFactoryInterface|null  $factory      The factory.
+	 * @param   CMSApplication|null       $app          The Application for the dispatcher
+	 * @param   Input|null                $input        The Input object for the request
+	 *
+	 * @throws \Exception
+	 * @since   3.0.1
+	 */
+	public function __construct($config = [], MVCFactoryInterface $factory = null, $app = null, $input = null)
+	{
+		$app ??= Factory::getApplication();
+		$this->identity ??= $app->getIdentity();
+
+		parent::__construct($config, $factory, $app, $input);
+	}
+
 	/**
 	 * Method to display a view.
 	 *
 	 * @param   boolean        $cachable   If true, the view output will be cached.
-	 * @param   boolean  $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link InputFilter::clean()}.
+	 * @param   boolean|array  $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link InputFilter::clean()}.
 	 *
 	 * @return  DisplayController  This object to support chaining.
+	 * @throws \Exception
      * @since   1.5
 	 */
 	function display($cachable = false, $urlparams = false)
@@ -51,14 +92,13 @@ class DisplayController extends BaseController
 		$cachable      = true;
 
 		// ensure that the view is not cashable if edit view or if user is logged in
-		$user = $this->app->getIdentity();
-		if ($user->get('id') || $this->input->getMethod() === 'POST' || $isEdit)
+		if ($this->identity->get('id') || $this->input->getMethod() === 'POST' || $isEdit)
 		{
 			$cachable = false;
 		}
 
 		// Check for edit form.
-		if ($isEdit && !$this->checkEditId('com_###component###.edit.'.$view, $id))
+		if ($isEdit && !$this->checkEditId($view, $id))
 		{
 			// check if item was opened from other than its own list view
 			$ref    = $this->input->getCmd('ref', 0);
@@ -115,18 +155,133 @@ class DisplayController extends BaseController
 		return $this;
 	}
 
-	protected function checkEditView($view)
+	/**
+	 * Method to check whether an ID is in the edit list.
+	 *
+	 * @param   string   $context  The view name.
+	 * @param   integer  $id       The ID of the record to add to the edit list.
+	 *
+	 * @return  boolean  True if the ID is in the edit list.
+	 *
+	 * @throws \Exception
+	 * @since   3.0
+	 */
+	protected function checkEditId($context, $id)
+	{
+		if (parent::checkEditId("com_###component###.edit.{$context}", $id))
+		{
+			return true;
+		}
+
+		// check user edit access
+		if ($this->canEditId($context, $id))
+		{
+			$this->holdEditId("com_###component###.edit.{$context}", $id);
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Method to check whether an ID is allowed to be edited by the active user.
+	 *
+	 * @param   string   $view    The view name.
+	 * @param   integer  $id      The ID of the record to add to the edit list.
+	 *
+	 * @return  boolean  True if the ID is in the edit list.
+	 *
+	 * @since   5.0.2
+	 */
+	protected function canEditId($view, $id): bool
+	{
+		// check that this view is even allowed
+		$allowed = $this->getAllowedEditView($view);
+		if ($allowed === null)
+		{
+			return false;
+		}
+
+		// check if this item has custom function set for canEditId
+		if (isset($allowed['function'])
+			&& method_exists($this, $allowed['function'])
+			&& $this->{$allowed['function']}(['id' => $id], 'id'))
+		{
+			return true;
+		}
+
+		// check if this item can be accessed (and has access)
+		$access = true;
+		if (isset($allowed['access']))
+		{
+			$access = ($this->identity->authorise($allowed['access'], "com_###component###.{$view}." . (int) $id)
+				&& $this->identity->authorise($allowed['access'], 'com_###component###'));
+		}
+
+		// check if this item can be edited
+		$edit = false;
+		if ($access && isset($allowed['edit']))
+		{
+			$edit = ($this->identity->authorise($allowed['edit'], "com_###component###.{$view}." . (int) $id)
+				&& $this->identity->authorise($allowed['edit'], 'com_###component###'));
+		}
+
+		// check if this item can be edited by owner
+		if ($access && !$edit && isset($allowed['edit.own']))
+		{
+			$edit = ($this->identity->authorise($allowed['edit.own'], "com_###component###.{$view}." . (int) $id)
+				&& $this->identity->authorise($allowed['edit.own'], 'com_###component###'));
+		}
+
+		return $edit;
+	}
+
+	/**
+	 * Checks if the provided view is an edit view.
+	 *
+	 * This method verifies whether the given view name is recognized as an edit view.
+	 * It uses the StringHelper::check() method to validate the input and then checks
+	 * against a predefined list of edit views.
+	 *
+	 * @param  string|null  $view  The name of the view to check.
+	 * 
+	 * @return  bool   True if the view is an edit view, false otherwise.
+	 * @since   4.0.0
+	 */
+	protected function checkEditView(?string $view): bool
 	{
 		if (Super___1f28cb53_60d9_4db1_b517_3c7dc6b429ef___Power::check($view))
 		{
-			$views = [###SITE_EDIT_VIEW_ARRAY###
-				];
-			// check if this is a edit view
-			if (in_array($view,$views))
+			// check if this is an edit view
+			if (isset($this->allowed_edit_views[$view]))
 			{
 				return true;
 			}
 		}
+
 		return false;
 	}
+
+	/**
+	 * Get the allowed edit view permission map
+	 *
+	 * @param  string|null  $view  The name of the view to check.
+	 * 
+	 * @return  array|null   The permissions map
+	 * @since   5.0.2
+	 */
+	protected function getAllowedEditView(?string $view): ?array
+	{
+		if (Super___1f28cb53_60d9_4db1_b517_3c7dc6b429ef___Power::check($view))
+		{
+			// check if this is an edit view
+			if (isset($this->allowed_edit_views[$view]))
+			{
+				return $this->allowed_edit_views[$view];
+			}
+		}
+
+		return null;
+	}###SITE_ALLOW_EDIT_VIEWS_FUNCTIONS###
 }

admin/compiler/joomla_4/SITE_VIEWS_HTML.php

@@ -27,6 +27,54 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Site\View\###
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    Joomla___effdaf6d_2275_425d_9f52_d4952e564d34___Power
+	 * @since  3.10.11
+	 */
+	public Joomla___effdaf6d_2275_425d_9f52_d4952e564d34___Power $user;
+
 	/**
 	 * Display the view
 	 *
@@ -82,6 +130,7 @@ class HtmlView extends BaseHtmlView
 		{
 			ToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url);
 		}
+
 		// now initiate the toolbar
 		$this->toolbar = Toolbar::getInstance();
 	}###SITE_GET_MODULE###

admin/compiler/joomla_4/SITE_VIEW_CONTROLLER.php

@@ -25,7 +25,7 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Site\Controll
  *
  * @since  1.6
  */
-class ###SView###Controller extends FormController
+class ###SView###Controller extends Joomla___907ccae5_57a9_44b9_a8aa_5b905d1cd70f___Power
 {
 	/**
 	 * The prefix to use with controller messages.
@@ -107,14 +107,14 @@ class ###SView###Controller extends FormController
 	 * Function that allows child controller access to model data
 	 * after the data has been saved.
 	 *
-	 * @param   BaseDatabaseModel  $model      The data model object.
+	 * @param   Joomla___6dce7a1b_cfc3_4c2a_837d_be9cbc902446___Power  $model      The data model object.
 	 * @param   array              $validData  The validated data.
 	 *
 	 * @return  void
 	 *
 	 * @since   12.2
 	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
+	protected function postSaveHook(Joomla___6dce7a1b_cfc3_4c2a_837d_be9cbc902446___Power $model, $validData = [])
 	{
 	}
 }

admin/compiler/joomla_4/SITE_VIEW_HTML.php

@@ -27,6 +27,38 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Site\View\###
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  3.10.11
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  3.10.11
+	 */
+	protected array $scripts;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    Joomla___effdaf6d_2275_425d_9f52_d4952e564d34___Power
+	 * @since  3.10.11
+	 */
+	public Joomla___effdaf6d_2275_425d_9f52_d4952e564d34___Power $user;
+
 	/**
 	 * Display the view
 	 *
@@ -41,10 +73,10 @@ class HtmlView extends BaseHtmlView
 		$this->app ??= Factory::getApplication();
 		$this->params = $this->app->getParams();
 		$this->menu = $this->app->getMenu()->getActive();
-		$this->styles = $this->get('Styles');
-		$this->scripts = $this->get('Scripts');
+		$this->styles = $this->get('Styles') ?? [];
+		$this->scripts = $this->get('Scripts') ?? [];
 		// get the user object
-		$this->user ??= $this->app->getIdentity();###SITE_DIPLAY_METHOD###
+		$this->user ??= $this->getCurrentUser();###SITE_DIPLAY_METHOD###
 	}###SITE_EXTRA_DIPLAY_METHODS###
 
 	/**
@@ -82,8 +114,9 @@ class HtmlView extends BaseHtmlView
 		{
 			ToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url);
 		}
+
 		// now initiate the toolbar
-		$this->toolbar = Toolbar::getInstance();
+		$this->toolbar ??= Toolbar::getInstance();
 	}###SITE_GET_MODULE###
 
 	/**

admin/forms/component_updates.xml

@@ -250,7 +250,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_UPDATES_UPDATE_TARGET_VERSION_LABEL"
 					size="10"
 					maxlength="50"
-					default="3.*"
+					default="5\.[012]"
 					description="COM_COMPONENTBUILDER_COMPONENT_UPDATES_UPDATE_TARGET_VERSION_DESCRIPTION"
 					class="text_area"
 					filter="string"

admin/language/en-GB/en-GB.com_componentbuilder.ini

@@ -3320,7 +3320,7 @@ COM_COMPONENTBUILDER_COMPONENT_UPDATES_UPDATE_STATE_DESCRIPTION="Set the release
 COM_COMPONENTBUILDER_COMPONENT_UPDATES_UPDATE_STATE_HINT="stable"
 COM_COMPONENTBUILDER_COMPONENT_UPDATES_UPDATE_STATE_LABEL="Release State"
 COM_COMPONENTBUILDER_COMPONENT_UPDATES_UPDATE_TARGET_VERSION_DESCRIPTION="Set the release target version"
-COM_COMPONENTBUILDER_COMPONENT_UPDATES_UPDATE_TARGET_VERSION_HINT="3.*"
+COM_COMPONENTBUILDER_COMPONENT_UPDATES_UPDATE_TARGET_VERSION_HINT="5\.[012]"
 COM_COMPONENTBUILDER_COMPONENT_UPDATES_UPDATE_TARGET_VERSION_LABEL="Update Server Release Target Version"
 COM_COMPONENTBUILDER_COMPONENT_UPDATES_URL_DESCRIPTION="Enter Download Link"
 COM_COMPONENTBUILDER_COMPONENT_UPDATES_URL_HINT="http://www.example.com/file.zip"

admin/sql/updates/mysql/4.0.1.sql

@@ -0,0 +1 @@
+

admin/src/View/Admin_custom_tabs/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Admin_custom_tabs view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Admin_fields/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Admin_fields view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Admin_fields_conditions/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Admin_fields_conditions view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Admin_fields_relations/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Admin_fields_relations view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Admin_view/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Admin_view view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Admin_views/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Admin_views view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Admins_custom_tabs/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Admins_custom_tabs view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Admins_fields/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Admins_fields view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Admins_fields_conditions/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Admins_fields_conditions view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Admins_fields_relations/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Admins_fields_relations view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Class_extendings/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Class_extendings view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Class_extends/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Class_extends view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Class_method/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Class_method view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Class_methods/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Class_methods view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Class_properties/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Class_properties view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Class_property/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Class_property view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Compiler/HtmlView.php

@@ -27,6 +27,7 @@ use Joomla\CMS\Layout\LayoutHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\FormHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -38,6 +39,38 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Display the view
 	 *
@@ -53,11 +86,11 @@ class HtmlView extends BaseHtmlView
 		// get the application
 		$this->app ??= Factory::getApplication();
 		// get the user object
-		$this->user ??= $this->app->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// get global action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('compiler');
-		$this->styles = $this->get('Styles');
-		$this->scripts = $this->get('Scripts');
+		$this->styles = $this->get('Styles') ?? [];
+		$this->scripts = $this->get('Scripts') ?? [];
 		// Initialise variables.
 		$this->items = $this->get('Items');
 		// get the success message if set

admin/src/View/Component_admin_views/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Component_admin_views view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Component_config/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Component_config view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Component_custom_admin_menus/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Component_custom_admin_menus view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Component_custom_admin_views/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Component_custom_admin_views view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Component_dashboard/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Component_dashboard view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Component_files_folders/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Component_files_folders view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Component_modules/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Component_modules view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Component_mysql_tweaks/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Component_mysql_tweaks view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Component_placeholders/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Component_placeholders view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Component_plugins/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Component_plugins view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Component_router/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Component_router view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Component_site_views/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Component_site_views view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Component_updates/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Component_updates view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Components_admin_views/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Components_admin_views view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Components_config/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Components_config view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Components_custom_admin_menus/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Components_custom_admin_menus view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Components_custom_admin_views/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Components_custom_admin_views view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Components_dashboard/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Components_dashboard view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Components_files_folders/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Components_files_folders view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Components_modules/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Components_modules view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Components_mysql_tweaks/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Components_mysql_tweaks view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Components_placeholders/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Components_placeholders view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Components_plugins/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Components_plugins view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Components_routers/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Components_routers view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Components_site_views/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Components_site_views view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Components_updates/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Components_updates view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Custom_admin_view/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Custom_admin_view view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Custom_admin_views/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Custom_admin_views view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Custom_code/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Custom_code view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Custom_codes/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Custom_codes view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Dynamic_get/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Dynamic_get view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Dynamic_gets/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Dynamic_gets view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Field/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Field view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Fields/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Fields view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Fieldtype/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Fieldtype view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Fieldtypes/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Fieldtypes view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Get_snippets/HtmlView.php

@@ -24,6 +24,7 @@ use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use Joomla\CMS\Filesystem\File;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 use Joomla\CMS\Session\Session;
 
 // No direct access to this file
@@ -36,6 +37,38 @@ use Joomla\CMS\Session\Session;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Display the view
 	 *
@@ -51,11 +84,11 @@ class HtmlView extends BaseHtmlView
 		// get the application
 		$this->app ??= Factory::getApplication();
 		// get the user object
-		$this->user ??= $this->app->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// get global action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('get_snippets');
-		$this->styles = $this->get('Styles');
-		$this->scripts = $this->get('Scripts');
+		$this->styles = $this->get('Styles') ?? [];
+		$this->scripts = $this->get('Scripts') ?? [];
 		// Initialise variables.
 		$this->items = $this->get('Items');
 

admin/src/View/Help_document/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Help_document view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Help_documents/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Help_documents view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Joomla_component/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Joomla_component view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Joomla_components/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Joomla_components view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Joomla_module/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Joomla_module view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Joomla_module_files_folders_urls/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Joomla_module_files_folders_urls view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Joomla_module_updates/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Joomla_module_updates view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Joomla_modules/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Joomla_modules view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Joomla_modules_files_folders_urls/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Joomla_modules_files_folders_urls view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Joomla_modules_updates/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Joomla_modules_updates view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Joomla_plugin/HtmlView.php

@@ -37,6 +37,86 @@ use VDM\Joomla\Utilities\ArrayHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Joomla_plugin view display method
 	 *
@@ -51,7 +131,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Joomla_plugin_files_folders_urls/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Joomla_plugin_files_folders_urls view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Joomla_plugin_group/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Joomla_plugin_group view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Joomla_plugin_groups/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Joomla_plugin_groups view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Joomla_plugin_updates/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Joomla_plugin_updates view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Joomla_plugins/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Joomla_plugins view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Joomla_plugins_files_folders_urls/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Joomla_plugins_files_folders_urls view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Joomla_plugins_updates/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Joomla_plugins_updates view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Joomla_power/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Joomla_power view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Joomla_powers/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Joomla_powers view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Language/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Language view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Language_translation/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Language_translation view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Language_translations/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Language_translations view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Languages/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Languages view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Layout/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Layout view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/src/View/Layouts/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Layouts view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Libraries/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Libraries view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Libraries_config/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Libraries_config view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Libraries_files_folders_urls/HtmlView.php

@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    User
+	 * @since  3.10.11
+	 */
+	public User $user;
+
 	/**
 	 * Libraries_files_folders_urls view display method
 	 *
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// Load the filter form from xml.
 		$this->filterForm = $this->get('FilterForm');
 		// Load the active filters.

admin/src/View/Library/HtmlView.php

@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * Library view display method
 	 *
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_componentbuilder');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');