Nimble test automation framework

src/components/com_tjucm/administrator/access.xml

@@ -14,11 +14,13 @@
 		<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.type.createitem" title="COM_TJUCM_PERMISSION_TYPE_ITEM_CREATE" description="COM_TJUCM_PERMISSION_TYPE_ITEM_CREATE_DESC" />
+		<action name="core.type.importitem" title="COM_TJUCM_PERMISSION_TYPE_ITEM_IMPORT" description="COM_TJUCM_PERMISSION_TYPE_ITEM_IMPORT_DESC" />
 		<action name="core.type.viewitem" title="COM_TJUCM_PERMISSION_TYPE_ITEM_VIEW" description="COM_TJUCM_PERMISSION_TYPE_ITEM_VIEW_DESC" />
 		<action name="core.type.edititem" title="COM_TJUCM_PERMISSION_TYPE_ITEM_EDIT" description="COM_TJUCM_PERMISSION_TYPE_ITEM_EDIT_DESC" />
 		<action name="core.type.edititemstate" title="COM_TJUCM_PERMISSION_TYPE_ITEM_EDITSTATE" description="COM_TJUCM_PERMISSION_TYPE_ITEM_EDITSTATE_DESC" />
 		<action name="core.type.editownitem" title="COM_TJUCM_PERMISSION_TYPE_ITEM_EDITOWN" description="COM_TJUCM_PERMISSION_TYPE_ITEM_EDITOWN_DESC" />
 		<action name="core.type.deleteitem" title="COM_TJUCM_PERMISSION_TYPE_ITEM_DELETE" description="COM_TJUCM_PERMISSION_TYPE_ITEM_DELETE_DESC" />
 		<action name="core.type.deleteownitem" title="COM_TJUCM_PERMISSION_TYPE_ITEM_DELETEOWN" description="COM_TJUCM_PERMISSION_TYPE_ITEM_DELETEOWN_DESC" />
+		<action name="core.type.copyitem" title="COM_TJUCM_PERMISSION_TYPE_ITEM_COPYITEM" description="COM_TJUCM_PERMISSION_TYPE_ITEM_COPYITEM_DESC" />
 	</section>
 </access>

src/components/com_tjucm/administrator/config.xml

@@ -3,4 +3,10 @@
     <fieldset name="permissions" description="JCONFIG_PERMISSIONS_DESC" label="JCONFIG_PERMISSIONS_LABEL">
         <field name="rules" type="rules" component="com_tjucm" class="inputbox" filter="rules" validate="rules" label="JCONFIG_PERMISSIONS_LABEL" section="component" />
     </fieldset>
-</config>
+    <fieldset name="component" label="COM_TJUCM_COPY_ITEM_SETTING_LABEL">
+		<field name="tjqueue_copy_items" class="btn-group" type="radio" default="0" label="COM_TJUCM_USE_TJQUEUE_WHILE_COPY_ITEM" description="COM_TJUCM_USE_TJQUEUE_WHILE_COPY_ITEM_DESC">
+			<option value="0">COM_TJUCM_NO</option>
+			<option value="1">COM_TJUCM_YES</option>
+		</field>
+	</fieldset>
+</config>

src/components/com_tjucm/administrator/controllers/types.php

@@ -320,7 +320,7 @@ public function import()
 
 								foreach ($options as &$option)
 								{
-									$fieldOptions['fieldoption'.$optionCount] = array("name" => $option->options, "value" => $option->value);
+									$fieldOptions['fieldoption' . $optionCount] = array("name" => $option->options, "value" => $option->value);
 									$optionCount++;
 								}
 							}

src/components/com_tjucm/administrator/houseKeeping/1.2.3/updateClientName.php

@@ -124,7 +124,8 @@ public function migrate()
 									}
 									else
 									{
-										$tjfieldsFieldTable->name = str_replace('.', '_', $updatedUniqueIdentifier) . '_' . strtolower(preg_replace("/[^a-zA-Z0-9]/", "", $field->label));
+										$tjfieldsFieldTable->name = str_replace('.', '_', $updatedUniqueIdentifier)
+										. '_' . strtolower(preg_replace("/[^a-zA-Z0-9]/", "", $field->label));
 									}
 
 									$tjfieldsFieldTable->store();

src/components/com_tjucm/administrator/houseKeeping/1.2.4/updateAlias.php

@@ -0,0 +1,109 @@
+<?php
+/**
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <[email protected]>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
+ */
+
+// No direct access
+defined('_JEXEC') or die('Restricted access');
+
+/**
+ * Migration file for TJ-UCM
+ *
+ * @since  1.2.4
+ */
+class TjHouseKeepingUpdateAlias extends TjModelHouseKeeping
+{
+	public $title = "Update Types Alias";
+
+	public $description = 'Update UCM Types alias';
+
+	/**
+	 * Subform migration script
+	 *
+	 * @return  void
+	 *
+	 * @since   1.2.4
+	 */
+	public function migrate()
+	{
+		JTable::addIncludePath(JPATH_ROOT . '/administrator/components/com_tjucm/tables');
+		JTable::addIncludePath(JPATH_ROOT . '/administrator/components/com_menus/tables');
+		JLoader::import('components.com_tjfields.helpers.tjfields', JPATH_ADMINISTRATOR);
+
+		// TJ-Fields helper object
+		$tjfieldsHelper = new TjfieldsHelper;
+
+		$result = array();
+
+		try
+		{
+			// Get all the UCM types
+			$db = JFactory::getDbo();
+			$query = $db->getQuery(true);
+			$query->select('*');
+			$query->from($db->qn('#__tj_ucm_types'));
+			$db->setQuery($query);
+			$ucmTypes = $db->loadObjectlist();
+
+			if (!empty($ucmTypes))
+			{
+				foreach ($ucmTypes as $ucmType)
+				{
+					$ucmTypeTable = JTable::getInstance('Type', 'TjucmTable', array('dbo', $db));
+					$ucmTypeTable->load($ucmType->id);
+
+					// Remove white spaces in alias of UCM types
+					$updatedAlias = JFilterOutput::stringURLSafe($ucmTypeTable->alias);
+					$ucmTypeTable->alias = $updatedAlias;
+					$ucmTypeTable->store();
+				}
+			}
+
+			// Get all the menus of UCM types
+			$query = $db->getQuery(true);
+			$query->select('*');
+			$query->from($db->quoteName('#__menu'));
+			$query->where(
+			$db->quoteName('link') . "=" . $db->quote('index.php?option=com_tjucm&view=itemform') .
+			"||" . $db->quoteName('link') . "=" . $db->quote('index.php?option=com_tjucm&view=items')
+			);
+			$db->setQuery($query);
+			$menuItems = $db->loadObjectlist();
+
+			if (!empty($menuItems))
+			{
+				foreach ($menuItems as $menuItem)
+				{
+					$menuItemTable = JTable::getInstance('Menu', 'MenusTable', array('dbo', $db));
+					$menuItemTable->load($menuItem->id);
+					$oldparams = json_decode($menuItemTable->params);
+
+					// Remove white spaces in alias of menus
+					if (isset($oldparams->ucm_type))
+					{
+						$oldparams->ucm_type  = JFilterOutput::stringURLSafe($oldparams->ucm_type);
+					}
+
+					$menuItemTable->params = json_encode($oldparams);
+					$menuItemTable->store();
+				}
+			}
+
+			$result['status']   = true;
+			$result['message']  = "Migration successful";
+		}
+		catch (Exception $e)
+		{
+			$result['err_code'] = '';
+			$result['status']   = false;
+			$result['message']  = $e->getMessage();
+		}
+
+		return $result;
+	}
+}

src/components/com_tjucm/administrator/models/forms/filter_types.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+    <fields name="filter">
+        <field name="search"
+               type="text"
+               hint="COM_TJUCM_SEARCH_FILTER_SUBMIT"
+               label="COM_USERS_FILTER_SEARCH_DESC"
+               class="js-stools-search-string" />
+
+        <field name="state"
+               type="status"
+               label="COM_TJUCM_FILTER_STATE"
+               description="COM_TJUCM_FILTER_STATE_DESC"
+               onchange="this.form.submit();"
+        >
+            <option value="">JOPTION_SELECT_PUBLISHED</option>
+        </field>
+    </fields>
+    </form>

src/components/com_tjucm/administrator/models/forms/type.xml

@@ -5,7 +5,7 @@
 		<field name="ordering" />
 		<field name="title" type="text" maxlength="255" filter="raw" required="true" label="COM_TJUCM_FORM_LBL_TYPE_TITLE" description="COM_TJUCM_FORM_DESC_TYPE_TITLE" hint="COM_TJUCM_FORM_LBL_TYPE_TITLE" />
 		<field name="alias" type="text" class="inputbox" generator="title" label="COM_TJUCM_FORM_LBL_TYPE_ALIAS" description="COM_TJUCM_FORM_DESC_TYPE_ALIAS" hint="COM_TJUCM_FORM_LBL_TYPE_ALIAS" />
-		<field name="state" default="1" type="list" label="JSTATUS" description="JFIELD_PUBLISHED_DESC" class="inputbox" size="1">
+		<field name="state" default="1" type="list" filter="integer" label="JSTATUS" description="JFIELD_PUBLISHED_DESC" class="inputbox" size="1">
 			<option value="1">JPUBLISHED</option>
 			<option value="0">JUNPUBLISHED</option>
 			<option value="2">JARCHIVED</option>
@@ -21,23 +21,28 @@
 		<field name="modified_date" type="timecreated" label="COM_TJUCM_FORM_LBL_TYPE_MODIFIED_DATE" description="COM_TJUCM_FORM_DESC_TYPE_MODIFIED_DATE" hidden="true" hint="COM_TJUCM_FORM_LBL_TYPE_MODIFIED_DATE" />
 		<field name="version_note" type="text" label="JGLOBAL_FIELD_VERSION_NOTE_LABEL" description="JGLOBAL_FIELD_VERSION_NOTE_DESC" class="inputbox" size="45" labelclass="control-label" />
 		<fields name="params" label="COM_TJUCM_FORM_LBL_TYPE_PARAMS" description="COM_TJUCM_FORM_DESC_TYPE_PARAMS" hint="COM_TJUCM_FORM_LBL_TYPE_PARAMS">
-			<field name="is_subform" type="radio" class="btn-group" default="0" label="COM_TJUCM_FORM_LBL_TYPE_IS_SUBFORM" description="COM_TJUCM_FORM_DESC_TYPE_IS_SUBFORM" hint="COM_TJUCM_FORM_LBL_TYPE_IS_SUBFORM">
+			<field name="is_subform" type="radio" class="btn-group" filter="integer" default="0" label="COM_TJUCM_FORM_LBL_TYPE_IS_SUBFORM" description="COM_TJUCM_FORM_DESC_TYPE_IS_SUBFORM" hint="COM_TJUCM_FORM_LBL_TYPE_IS_SUBFORM">
 				<option value="0">JNO</option>
 				<option value="1">JYES</option>
 			</field>
-			<field name="allowed_count" type="number" label="COM_TJUCM_FORM_LBL_TYPE_ALLOWED_COUNT" description="COM_TJUCM_FORM_DESC_TYPE_ALLOWED_COUNT" hint="COM_TJUCM_FORM_LBL_TYPE_ALLOWED_COUNT" showon="is_subform:0" />
-			<field name="allow_auto_save" type="radio" class="btn-group" default="1" label="COM_TJUCM_FORM_LBL_TYPE_ALLOW_AUTO_SAVE" description="COM_TJUCM_FORM_DESC_TYPE_ALLOW_AUTO_SAVE" hint="COM_TJUCM_FORM_LBL_TYPE_ALLOW_AUTO_SAVE" showon="is_subform:0">
+			<field name="allowed_count" type="number" default="0" filter="integer" label="COM_TJUCM_FORM_LBL_TYPE_ALLOWED_COUNT" description="COM_TJUCM_FORM_DESC_TYPE_ALLOWED_COUNT" hint="COM_TJUCM_FORM_LBL_TYPE_ALLOWED_COUNT" showon="is_subform:0" />
+			<field name="allow_auto_save" type="radio" filter="integer" class="btn-group" default="1" label="COM_TJUCM_FORM_LBL_TYPE_ALLOW_AUTO_SAVE" description="COM_TJUCM_FORM_DESC_TYPE_ALLOW_AUTO_SAVE" hint="COM_TJUCM_FORM_LBL_TYPE_ALLOW_AUTO_SAVE" showon="is_subform:0">
 				<option value="0">JNO</option>
 				<option value="1">JYES</option>
 			</field>
-			<field name="allow_draft_save" type="radio" class="btn-group" default="1" label="COM_TJUCM_FORM_LBL_TYPE_ALLOW_DRAFT_SAVE" description="COM_TJUCM_FORM_DESC_TYPE_ALLOW_DRAFT_SAVE" hint="COM_TJUCM_FORM_LBL_TYPE_ALLOW_DRAFT_SAVE" showon="allow_auto_save:0[AND]is_subform:0">
+			<field name="allow_draft_save" type="radio" filter="integer" class="btn-group" default="1" label="COM_TJUCM_FORM_LBL_TYPE_ALLOW_DRAFT_SAVE" description="COM_TJUCM_FORM_DESC_TYPE_ALLOW_DRAFT_SAVE" hint="COM_TJUCM_FORM_LBL_TYPE_ALLOW_DRAFT_SAVE" showon="allow_auto_save:0[AND]is_subform:0">
 				<option value="0">JNO</option>
 				<option value="1">JYES</option>
 			</field>
-			<field name="publish_items" type="radio" class="btn-group" default="1" label="COM_TJUCM_FORM_LBL_TYPE_PUBLISH_ITEMS_BY_DEFAULT" description="COM_TJUCM_FORM_DESC_TYPE_PUBLISH_ITEMS_BY_DEFAULT" hint="COM_TJUCM_FORM_LBL_TYPE_PUBLISH_ITEMS_BY_DEFAULT">
+			<field name="publish_items" type="radio" filter="integer" class="btn-group" default="1" label="COM_TJUCM_FORM_LBL_TYPE_PUBLISH_ITEMS_BY_DEFAULT" description="COM_TJUCM_FORM_DESC_TYPE_PUBLISH_ITEMS_BY_DEFAULT" hint="COM_TJUCM_FORM_LBL_TYPE_PUBLISH_ITEMS_BY_DEFAULT">
 				<option value="0">JNO</option>
 				<option value="1">JYES</option>
 			</field>
+			<field name="bitrate_on" type="radio" filter="integer" class="btn-group" default="0" label="COM_TJUCM_FORM_LBL_TYPE_ALLOW_BITRATE_ON" description="COM_TJUCM_FORM_DESC_LBL_TYPE_ALLOW_BITRATE_ON" hint="COM_TJUCM_FORM_LBL_TYPE_ALLOW_BITRATE_ON" showon="allow_auto_save:1[AND]is_subform:0">
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+			<field name="bitrate_seconds" type="number" label="COM_TJUCM_FORM_LBL_TYPE_BITRATE_SECONDS" description="COM_TJUCM_FORM_DESC_LBL_TYPE_BITRATE_SECONDS" hint="COM_TJUCM_FORM_LBL_TYPE_BITRATE_SECONDS" showon="bitrate_on:1"/>
 			<field name="layout" type="componentlayout" label="COM_TJUCM_FORM_LBL_TYPE_LAYOUT" description="COM_TJUCM_FORM_DESC_TYPE_LAYOUT" useglobal="true" extension="com_tjucm" view="itemform" />
 			<field name="details_layout" type="componentlayout" label="COM_TJUCM_DETAILS_LBL_TYPE_LAYOUT" description="COM_TJUCM_DETAILS_DESC_TYPE_LAYOUT" useglobal="true" extension="com_tjucm" view="item" />
 			<field name="list_layout" type="componentlayout" label="COM_TJUCM_LIST_LBL_TYPE_LAYOUT" description="COM_TJUCM_LIST_DESC_TYPE_LAYOUT" useglobal="true" extension="com_tjucm" view="items" />

src/components/com_tjucm/administrator/models/item.php

@@ -45,19 +45,6 @@ class TjucmModelItem extends JModelAdmin
 	// Use imported Trait in model
 	use TjfieldsFilterField;
 
-	/**
-	 * Constructor.
-	 *
-	 * @param   array  $config  An optional associative array of configuration settings.
-	 *
-	 * @see        JController
-	 * @since      1.6
-	 */
-	public function __construct($config = array())
-	{
-		parent::__construct($config);
-	}
-
 	/**
 	 * Get an array of data items
 	 *

src/components/com_tjucm/administrator/models/type.php

@@ -13,6 +13,8 @@
 
 jimport('joomla.application.component.modeladmin');
 
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+
 /**
  * Tjucm model.
  *
@@ -48,6 +50,9 @@ class TjucmModelType extends JModelAdmin
 	 */
 	public function __construct($config = array())
 	{
+		$config['event_after_delete'] = 'tjUcmOnAfterTypeDelete';
+		$config['event_change_state'] = 'tjUcmOnAfterTypeChangeState';
+
 		parent::__construct($config);
 	}
 
@@ -305,7 +310,8 @@ public function save($data)
 		}
 
 		// Remove white spaces from alias if any
-		$data['alias'] = str_replace(" ", "_", trim($data['alias']));
+		// $data['alias'] = str_replace(" ", "_", trim($data['alias']));
+		$data['alias'] = JFilterOutput::stringURLSafe($data['alias']);
 
 		if (!empty($data['id']))
 		{
@@ -362,6 +368,13 @@ public function save($data)
 
 		if (parent::save($data))
 		{
+			$id = (int) $this->getState($this->getName() . '.id');
+			$data['typeId'] = $id;
+			$dispatcher = JDispatcher::getInstance();
+			JPluginHelper::importPlugin('actionlog', 'tjucm');
+			$isNew = ($data['id'] != 0) ? false : true;
+			$dispatcher->trigger('tjUcmOnAfterTypeSave', array($data, $isNew));
+
 			return true;
 		}
 
@@ -531,4 +544,68 @@ public function delete(&$pks)
 
 		return true;
 	}
+
+	/**
+	 * Method to validation before copy items
+	 *
+	 * @param   object  $sourceClient  Source client.
+	 * @param   object  $targetClient  Tareget client.
+	 * 
+	 * @return  Boolean
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function getCompatibleUcmTypes($sourceClient, $targetClient)
+	{
+		$validUcmType = array();
+
+		if (!$sourceClient && !$targetClient)
+		{
+			return false;
+		}
+
+		// Get the source ucm type and target ucm type fields list
+		BaseDatabaseModel::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjfields/models');
+		$tjFieldsFieldsModel = BaseDatabaseModel::getInstance('Fields', 'TjfieldsModel', array('ignore_request' => true));
+
+		// Get source UCM Type fields
+		$tjFieldsFieldsModel->setState('filter.client', $sourceClient);
+		$sourceFields = $tjFieldsFieldsModel->getItems();
+
+		// Get destination UCM Type fields
+		$tjFieldsFieldsModel = BaseDatabaseModel::getInstance('Fields', 'TjfieldsModel', array('ignore_request' => true));
+		$tjFieldsFieldsModel->setState('filter.client', $targetClient);
+		$targetFields = $tjFieldsFieldsModel->getItems();
+
+		$count = 0;
+
+		if (count($sourceFields) == count($targetFields))
+		{
+			foreach ($sourceFields as $sourceField)
+			{
+				$prefix = str_replace(".", "_", $sourceClient);
+				$sourceFieldName = explode($prefix . "_", $sourceField->name);
+
+				foreach ($targetFields as $targetField)
+				{
+					$prefix = str_replace(".", "_", $targetClient);
+					$targetFieldName = explode($prefix . "_", $targetField->name);
+
+					// Check source and destination field name and field types are equal
+					if ($sourceFieldName == $targetFieldName && $sourceField->type == $targetField->type)
+					{
+							$count ++;
+							continue;
+					}
+				}
+			}
+		}
+
+		if (count($sourceFields) == $count)
+		{
+			return true;
+		}
+
+		return false;
+	}
 }

src/components/com_tjucm/administrator/views/item/view.html.php

@@ -96,7 +96,7 @@ protected function addToolbar()
 
 		$canDo = TjucmHelper::getActions();
 
-		JToolBarHelper::title(JText::_('COM_TJUCM_TITLE_ITEM'), 'item.png');
+		JToolBarHelper::title(JText::_('COM_TJUCM_TITLE_ITEM'), 'icon-pencil');
 
 		// If not checked out, can save the item.
 		if (!$checkedOut && ($canDo->get('core.edit') || ($canDo->get('core.create'))))

src/components/com_tjucm/administrator/views/items/view.html.php

@@ -78,7 +78,7 @@ protected function addToolbar()
 		$state = $this->get('State');
 		$canDo = TjucmHelper::getActions();
 
-		JToolBarHelper::title(JText::_('COM_TJUCM_TITLE_ITEMS'), 'items.png');
+		JToolBarHelper::title(JText::_('COM_TJUCM_TITLE_ITEMS'), 'list');
 
 		// Check if the form exists before showing the add/edit buttons
 		$formPath = JPATH_COMPONENT_ADMINISTRATOR . '/views/item';

src/components/com_tjucm/administrator/views/type/view.html.php

@@ -76,7 +76,11 @@ protected function addToolbar()
 
 		$canDo = TjucmHelper::getActions();
 
-		JToolBarHelper::title(JText::_('COM_TJUCM_TITLE_TYPE'), 'type.png');
+		$component_title = JText::_('COM_TJUCM_COMPONENT');
+		JToolbarHelper::title(
+		$component_title . ": " . JText::_('COM_TJUCM_PAGE_' . ($checkedOut ? 'VIEW_TYPE' : ($isNew ? 'ADD_TYPE' : 'EDIT_TYPE'))),
+			'pencil-2 article-add'
+		);
 
 		// If not checked out, can save the item.
 		if (!$checkedOut && ($canDo->get('core.edit') || ($canDo->get('core.create'))))