Merge Release 1.0.0 into master

.coderabbit.yaml

@@ -0,0 +1,74 @@
+language: "en"
+
+early_access: false
+
+reviews:
+  request_changes_workflow: true
+  high_level_summary: true
+  poem: false
+  review_status: true
+  collapse_walkthrough: false
+  path_filters:
+    # Exclude XML files for manifest and configuration
+    - "!**/*.xml"
+    # Exclude language files (translations)
+    - "!**/language/**/*.ini"
+    # Exclude asset files that don’t need review
+    - "!**/*.svg"
+    - "!**/*.png"
+    - "!**/*.jpg"
+    - "!**/*.jpeg"
+    - "!**/*.gif"
+    - "!**/*.ico"
+    # Exclude compiled and minified files
+    - "!**/*.min.js"
+    - "!**/*.min.css"
+    # Exclude SCSS files if they are intermediate and do not need review
+    - "!**/templates/**/*.scss"
+    # Exclude libraries and vendor code (third-party dependencies)
+    - "!**/node_modules/**"
+    - "!**/vendor/**"
+    # Exclude build files
+    - "!**/build/**"
+    # Exclude configuration files that are environment-specific
+    - "!**/configuration.php"
+  path_instructions:
+      # JavaScript files: front-end interactivity and functionality
+    - path: "**/*.js"
+      instructions: |
+        "Review JavaScript code to ensure:
+        - Adherence to Google JavaScript style guide.
+        - Efficient DOM manipulation suitable for Joomla’s frontend.
+        - Use of Joomla’s core JavaScript libraries where applicable (e.g., jQuery compatibility).
+        - Best practices for asynchronous requests if AJAX is used."
+    - path: "**/*.php"
+      instructions: |
+        "Review the PHP code for Joomla coding standards compliance, ensuring:
+        - Code follows Joomla's coding standards, validated using PHPCS with the Joomla standard.
+        - Adherence to Joomla’s MVC structure for extensions.
+        - Proper use of Joomla’s built-in functions (e.g., Input, Factory).
+        - SQL queries use Joomla’s database API to prevent SQL injection.
+        - Code is well-documented, with clear function and class descriptions."
+    - path: "**/*.ts"
+      instructions: |
+        "Review the JavaScript code for conformity with the Google JavaScript style guide, highlighting any deviations. Ensure that:
+        - The code adheres to best practices associated with nodejs.
+        - The code adheres to best practices associated with nestjs framework.
+        - The code adheres to best practices recommended for performance.
+        - The code adheres to similar naming conventions for controllers, models, services, methods, variables."
+  auto_review:
+    enabled: true
+    ignore_title_keywords:
+      - "WIP"
+      - "DO NOT MERGE"
+    drafts: false
+    base_branches:
+    - "master"
+    - "dev"
+    - "j4x"
+    - "feat/*"
+    - "feat-*"
+    - "release-*"
+
+chat:
+  auto_reply: true

src/components/com_cluster/administrator/access.xml

@@ -8,5 +8,6 @@
 		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC" />
 		<action name="core.edit.state" title="JACTION_EDITSTATE" description="JACTION_EDITSTATE_COMPONENT_DESC" />
 		<action name="core.edit.own" title="JACTION_EDITOWN" description="JACTION_EDITOWN_COMPONENT_DESC" />
+		<action name="core.manageall" title="JACTION_MANAGE_ALL_CLUSTER" description="JACTION_MANAGE_ALL_CLUSTER_DESC" />
 	</section>
 </access>

src/components/com_cluster/administrator/helpers/cluster.php

@@ -10,6 +10,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
 
 /**
  * Cluster helper.
@@ -33,13 +34,13 @@ public static function addSubmenu($vName = '')
 		if ($layout != "default")
 		{
 			JHtmlSidebar::addEntry(
-				JText::_('COM_CLUSTERS_VIEW_CLUSTERS'),
+				Text::_('COM_CLUSTERS_VIEW_CLUSTERS'),
 				'index.php?option=com_cluster&view=clusters',
 				$vName == 'clusters'
 			);
 
 			JHtmlSidebar::addEntry(
-				JText::_('COM_CLUSTERS_VIEW_CLUSTER_USERS'),
+				Text::_('COM_CLUSTERS_VIEW_CLUSTER_USERS'),
 				'index.php?option=com_cluster&view=clusterusers',
 				$vName == 'clusterusers'
 			);

src/components/com_cluster/administrator/includes/cluster.php

@@ -54,7 +54,7 @@ public static function table($name)
 	 **/
 	public static function model($name, $config = array())
 	{
-		BaseDatabaseModel::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_cluster/models');
+		BaseDatabaseModel::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_cluster/models', 'ClusterModel');
 
 		// @TODO Add support for cache
 		return BaseDatabaseModel::getInstance($name, 'ClusterModel', $config);

src/components/com_cluster/administrator/languages/en-GB/en-GB.com_cluster.ini

@@ -92,3 +92,6 @@ COM_CLUSTER_PAGE_VIEW_USER = "Cluster user: View"
 COM_CLUSTER_USER_LIST_VIEW_NAME="User"
 COM_CLUSTER_USER_LIST_VIEW_CLUSTER="Cluster Name"
 COM_CLUSTER_USERLIST_VIEW_ID="ID"
+
+JACTION_MANAGE_ALL_CLUSTER="Manage All Clusters"
+JACTION_MANAGE_ALL_CLUSTER_DESC="Manage All Clusters"

src/components/com_cluster/administrator/languages/en-GB/en-GB.com_cluster.sys.ini

@@ -7,4 +7,5 @@ COM_CLUSTER_CLUSTER_VIEW_EDIT_DESC="Shows a form to create a New Cluster."
 COM_CLUSTER_CLUSTERS_VIEW_DEFAULT_TITLE="List all Clusters"
 COM_CLUSTER_CLUSTERS_VIEW_DEFAULT_DESC="Shows a list of all the Clusters."
 COM_CLUSTER_TITLE_ITEM_VIEW_CLUSTER="Single Cluster"
-COM_CLUSTER_TITLE_CLUSTER="Cluster"
+COM_CLUSTER_TITLE_CLUSTER="Cluster"
+COM_CLUSTERS_VIEW_CLUSTER_USERS="Cluster users"

src/components/com_cluster/administrator/libraries/cluster.php

@@ -11,6 +11,7 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Object\CMSObject;
+use Joomla\CMS\Language\Text;
 
 /**
  * Cluster class.  Handles all application interaction with a Cluster
@@ -192,15 +193,15 @@ public function bind(&$array)
 	{
 		if (empty($array))
 		{
-			$this->setError(JText::_('COM_CLUSTER_EMPTY_DATA'));
+			$this->setError(Text::_('COM_CLUSTER_EMPTY_DATA'));
 
 			return false;
 		}
 
 		// Bind the array
 		if (!$this->setProperties($array))
 		{
-			$this->setError(\JText::_('COM_CLUSTER_BINDING_ERROR'));
+			$this->setError(Text::_('COM_CLUSTER_BINDING_ERROR'));
 
 			return false;
 		}
@@ -231,4 +232,38 @@ public function isOwner($userId = null)
 
 		return false;
 	}
+
+	/**
+	 * Function isMember to check user associated with passed cluster_id
+	 *
+	 * @param   INT  $userId  User Id
+	 *
+	 * @return  boolean
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public function isMember($userId = null)
+	{
+		$userId = Factory::getuser($userId)->id;
+
+		if (empty($userId))
+		{
+			return false;
+		}
+
+		$ClusterModel = ClusterFactory::model('ClusterUsers', array('ignore_request' => true));
+		$ClusterModel->setState('filter.published', 1);
+		$ClusterModel->setState('filter.cluster_id', (int) $this->id);
+		$ClusterModel->setState('filter.user_id', $userId);
+
+		// Check user associated with passed cluster_id
+		$clusters = $ClusterModel->getItems();
+
+		if (!empty($clusters))
+		{
+			return true;
+		}
+
+		return false;
+	}
 }

src/components/com_cluster/administrator/models/clusters.php

@@ -58,7 +58,7 @@ protected function getListQuery()
 		$query = $db->getQuery(true);
 
 		// Create the base select statement.
-		$query->select(array('cl.*','users.name as uname'));
+		$query->select(array('cl.*','users.name as uname','cl.id as cluster_id'));
 		$query->from($db->quoteName('#__tj_clusters', 'cl'));
 		$query->join('LEFT', $db->quoteName('#__users', 'users') . ' ON (' . $db->quoteName('cl.created_by') . ' = ' . $db->quoteName('users.id') . ')');
 

src/components/com_cluster/administrator/models/clusteruser.php

@@ -12,6 +12,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\CMS\Table\Table;
+use Joomla\CMS\Component\ComponentHelper;
 
 /**
  * Item Model for an Cluster.
@@ -110,4 +111,78 @@ public function save($data)
 
 		return parent::save($data);
 	}
+
+	/**
+	 * Method to get the list of clusters to which user have access
+	 *
+	 * @param   INT  $userId  Users Id.
+	 *
+	 * @return  ARRAY  List of clusters.
+	 *
+	 * @since   1.0.0
+	 */
+	public function getUsersClusters($userId = null)
+	{
+		$user = empty($userId) ? Factory::getUser() : Factory::getUser($userId);
+
+		$clusters = array();
+
+		// Load cluster library file
+		JLoader::import("/components/com_cluster/includes/cluster", JPATH_ADMINISTRATOR);
+
+		// If user is not allowed to view all the clusters then return the clusters in which user is a part else return al cluster
+		if (!$user->authorise('core.manageall', 'com_cluster'))
+		{
+			$clusterUsersModel = ClusterFactory::model('ClusterUsers', array('ignore_request' => true));
+			$clusterUsersModel->setState('list.group_by_client_id', 1);
+			$clusterUsersModel->setState('filter.published', 1);
+			$clusterUsersModel->setState('list.ordering', 'cl.name');
+			$clusterUsersModel->setState('list.direction', 'ASC');
+			$clusterUsersModel->setState('filter.user_id', $user->id);
+
+			// Get all assigned cluster entries
+			$clusters = $clusterUsersModel->getItems();
+		}
+		else
+		{
+			$clusterModel = ClusterFactory::model('Clusters', array('ignore_request' => true));
+
+			// Get all cluster entries
+			$clusterModel->setState('filter.state', 1);
+			$clusterModel->setState('list.ordering', 'cl.name');
+			$clusterModel->setState('list.direction', 'ASC');
+			$clusters = $clusterModel->getItems();
+		}
+
+		// Get com_subusers component status
+		$subUserExist = ComponentHelper::getComponent('com_subusers', true)->enabled;
+
+		if ($subUserExist)
+		{
+			JLoader::import("/components/com_subusers/includes/rbacl", JPATH_ADMINISTRATOR);
+		}
+
+		$usersClusters = array();
+
+		if (!empty($clusters))
+		{
+			if ($subUserExist && (!$user->authorise('core.manageall', 'com_cluster')))
+			{
+				foreach ($clusters as $cluster)
+				{
+					// Check user has permission for mentioned cluster
+					if (RBACL::authorise($user->id, 'com_cluster', 'core.manage', $cluster->cluster_id))
+					{
+						$usersClusters[] = $cluster;
+					}
+				}
+			}
+			else
+			{
+				$usersClusters = $clusters;
+			}
+		}
+
+		return $usersClusters;
+	}
 }