add the new UI

reem-atalah · reem-atalah · commit a1ecef75eb22 · 2025-08-08T17:04:13.000+03:00
diff --git a/docs/USER_GUIDE.md b/docs/USER_GUIDE.md
@@ -42,7 +42,7 @@ The component will automatically create the required database tables upon instal
 3. Update the CMS details:
    - **Name**: Descriptive name for the CMS
    - **URL**: Base URL of the source CMS
-   - **Credentials**: API keys or authentication details
+   - **Credentials**: API keys or authentication details. Refer to [Auth Guidance](AUTHENTICATION_GUIDE.md).
 
 ### 2. Obtaining CMS Credentials
 
diff --git a/src/administrator/components/com_ccm/ccm.xml b/src/administrator/components/com_ccm/ccm.xml
@@ -43,6 +43,10 @@
 			<language tag="en-GB">language/en-GB/com_ccm.ini</language>
 			<language tag="en-GB">language/en-GB/com_ccm.sys.ini</language>
 		</languages>
-        <menu link="option=com_ccm" img="class:default">COM_CCM_MENU_BACKEND</menu>
+        <menu link="option=com_ccm&amp;view=cmss" img="class:default">COM_CCM_MENU_BACKEND</menu>
+        <submenu>
+            <menu link="option=com_ccm&amp;view=cmss" img="class:default">COM_CCM_SUBMENU_CMS</menu>
+            <menu link="option=com_ccm&amp;view=migration" img="class:default">COM_CCM_SUBMENU_MIGRATION</menu>
+        </submenu>
     </administration>
 </extension>
diff --git a/src/administrator/components/com_ccm/language/en-GB/com_ccm.ini b/src/administrator/components/com_ccm/language/en-GB/com_ccm.ini
@@ -1,5 +1,5 @@
 COM_CCM_DESCRIPTION="CONTENT MIGRATION COMPONENT"
-COM_CCM_MENU_BACKEND="CCM BACKEND"
+COM_CCM_MENU_BACKEND="CMSs"
 COM_CCM_CONFIGURATION="CCM Migration Configuration"
 COM_CCM_OPTIONS="Options"
 COM_CCM_CONFIG_CMS_NAME_DESCRIPTION="The name of the CMS to migrate from."
@@ -18,9 +18,12 @@ COM_CCM_CONFIG_CCM_MAPPED_FIELDS_LABEL="CCM Mapped Fields"
 COM_CCM_CONFIG_CCM_UNMAPPED_FIELDS_LABEL="CCM Unmapped Fields"
 COM_CCM_CONFIG_MIGRATION_LABEL="Select CMS you want to migrate with"
 COM_CCM_CMS_NAME_LIST="CMS Names List"
+COM_CCM_CMS_NAME_ADD="Add new CMS"
+COM_CCM_SUBMENU_CMS="CMS Management"
+COM_CCM_SUBMENU_MIGRATION="Migration"
+COM_CCM_TITLE_CMS="Content Management Systems"
+COM_CCM_TITLE_MIGRATION="Content Migration"
 APPLY_MIGRATION_BTN="Apply Migration"
 MIGRATION_SOURCE_CMS="Source CMS"
 MIGRATION_TARGET_CMS="Target CMS"
-MIGRATION_SOURCE_CMS_OBJECT_TYPE="Choose the object type you need to migrate from the source CMS"
-MIGRATION_TARGET_CMS_OBJECT_TYPE="Choose the object type you need to migrate to the target CMS"
 COM_CCM_MIGRATION_FIELDSET_LABEL="Migration Settings"
diff --git a/src/administrator/components/com_ccm/language/en-GB/com_ccm.sys.ini b/src/administrator/components/com_ccm/language/en-GB/com_ccm.sys.ini
@@ -1,5 +1,5 @@
 COM_CCM_DESCRIPTION="CONTENT MIGRATION COMPONENT"
-COM_CCM_MENU_BACKEND="CCM BACKEND"
+COM_CCM_MENU_BACKEND="CMSs"
 COM_CCM_CONFIGURATION="CCM Migration Configuration"
 COM_CCM_OPTIONS="Options"
 COM_CCM_CONFIG_CMS_NAME_DESCRIPTION="The name of the CMS to migrate from."
@@ -17,9 +17,12 @@ COM_CCM_CONFIG_CCM_MAPPED_FIELDS_LABEL="CCM Mapped Fields"
 COM_CCM_CONFIG_CCM_UNMAPPED_FIELDS_LABEL="CCM Unmapped Fields"
 COM_CCM_CONFIG_MIGRATION_LABEL="Select CMS you want to migrate with"
 COM_CCM_CMS_NAME_LIST="CMS Names List"
+COM_CCM_CMS_NAME_ADD="Add new CMS"
+COM_CCM_SUBMENU_CMS="CMS Management"
+COM_CCM_SUBMENU_MIGRATION="Migration"
+COM_CCM_TITLE_CMS="Content Management Systems"
+COM_CCM_TITLE_MIGRATION="Content Migration"
 APPLY_MIGRATION_BTN="Apply Migration"
 MIGRATION_SOURCE_CMS="Source CMS"
 MIGRATION_TARGET_CMS="Target CMS"
-MIGRATION_SOURCE_CMS_OBJECT_TYPE="Choose the object type you need to migrate from the source CMS"
-MIGRATION_TARGET_CMS_OBJECT_TYPE="Choose the object type you need to migrate to the target CMS"
 COM_CCM_MIGRATION_FIELDSET_LABEL="Migration Settings"
diff --git a/src/administrator/components/com_ccm/src/Controller/DisplayController.php b/src/administrator/components/com_ccm/src/Controller/DisplayController.php
@@ -12,4 +12,22 @@ class DisplayController extends BaseController
      * @since  __DEV__
      */
     protected $default_view = 'Cmss';
+
+    /**
+     * Method to display a view.
+     *
+     * @param   boolean  $cachable   If true, the view output will be cached
+     * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link \JFilterInput::clean()}.
+     *
+     * @return  static  This object to support chaining.
+     *
+     * @since   __DEV__
+     */
+    public function display($cachable = false, $urlparams = [])
+    {
+        $view = $this->input->get('view', $this->default_view);
+        $this->input->set('view', $view);
+
+        return parent::display($cachable, $urlparams);
+    }
 }
diff --git a/src/administrator/components/com_ccm/src/Extension/CCMComponent.php b/src/administrator/components/com_ccm/src/Extension/CCMComponent.php
@@ -6,6 +6,8 @@
 
 use Joomla\CMS\Extension\BootableExtensionInterface;
 use Joomla\CMS\Extension\MVCComponent;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
 use Psr\Container\ContainerInterface;
 
 // starting point for the component
@@ -14,4 +16,16 @@ class CCMComponent extends MVCComponent implements BootableExtensionInterface
     public function boot(ContainerInterface $container) {
         // Initialize your component here
     }
+
+    /**
+     * Returns valid contexts
+     *
+     * @return  array
+     *
+     * @since   __DEV__
+     */
+    public function getContexts(): array
+    {
+        return ['com_ccm.cms', 'com_ccm.migration'];
+    }
 }
diff --git a/src/administrator/components/com_ccm/src/Model/MigrationModel.php b/src/administrator/components/com_ccm/src/Model/MigrationModel.php
@@ -27,7 +27,7 @@ class MigrationModel extends FormModel
     public function __construct($config = [], $http = null)
     {
         parent::__construct($config);
-        $this->migrationMapFile = dirname(__DIR__, 1) . '/Schema/migrationIdMap.json';
+        $this->migrationMapFile = dirname(__DIR__, 1) . '/Schema/migrationMap.json';
 
         if ($http && !($http instanceof Http)) {
             $http = null;
diff --git a/src/administrator/components/com_ccm/src/Schema/joomla-ccm.json b/src/administrator/components/com_ccm/src/Schema/joomla-ccm.json
@@ -216,6 +216,18 @@
         },
         "parent_id": {
           "default": 1
+        },
+        "published": {
+          "ccm": "status",
+          "map": {
+            "publish": 1,
+            "draft": 0,
+            "pending": 0,
+            "future": 0,
+            "private": 0,
+            "trash": -2
+          },
+          "default": 1
         }
       }
     },
diff --git a/src/administrator/components/com_ccm/src/Schema/migrationMap.json b/src/administrator/components/com_ccm/src/Schema/migrationMap.json
diff --git a/src/administrator/components/com_ccm/src/View/Cmss/HtmlView.php b/src/administrator/components/com_ccm/src/View/Cmss/HtmlView.php
@@ -36,10 +36,18 @@ protected function addToolbar()
     {
         $canDo = ContentHelper::getActions('com_ccm');
         $toolbar = $this->getDocument()->getToolbar();
-        ToolbarHelper::title(Text::_('COM_CCM_CMS_NAME_LIST'), 'ccm');
+        ToolbarHelper::title(Text::_('COM_CCM_TITLE_CMS'), 'generic');
 
         if ($canDo->get('core.create')) {
             $toolbar->addNew('cms.add');
         }
+
+        if ($canDo->get('core.edit')) {
+            $toolbar->edit('cms.edit');
+        }
+
+        if ($canDo->get('core.delete')) {
+            $toolbar->delete('cmss.delete');
+        }
     }
 }
diff --git a/src/administrator/components/com_ccm/src/View/Migration/HtmlView.php b/src/administrator/components/com_ccm/src/View/Migration/HtmlView.php
@@ -4,10 +4,15 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Toolbar\ToolbarHelper;
+use Joomla\CMS\Language\Text;
 use Reem\Component\CCM\Administrator\Migration\Migration;
 
 class HtmlView extends BaseHtmlView
 {
+    public $item;
+    public $form;
+    public $state;
 
     public function display($tpl = null): void
     {
@@ -18,9 +23,19 @@ public function display($tpl = null): void
         $this->form  = $model->getForm();
         $this->state = $model->getState();
 
+        $this->addToolbar();
+
         // after each step say echo "Mapping is done" --> then echo "Migration is done"
         //this can be added in js in frontend in mdeia folder
         //from webassets 
         parent::display($tpl);
     }
+
+    protected function addToolbar()
+    {
+        ToolbarHelper::title(Text::_('COM_CCM_TITLE_MIGRATION'), 'refresh');
+        
+        // Don't add apply button here - we'll use the form button instead
+        ToolbarHelper::cancel('migration.cancel');
+    }
 }
diff --git a/src/administrator/components/com_ccm/tmpl/cmss/default.php b/src/administrator/components/com_ccm/tmpl/cmss/default.php
@@ -2,33 +2,65 @@
 use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\HTML\HTMLHelper;
+
+defined('_JEXEC') or die;
+
+HTMLHelper::_('behavior.multiselect');
+HTMLHelper::_('formbehavior.chosen', '#filter_search', null, array('placeholder_text_single' => Text::_('JOPTION_SELECT_PUBLISHED')));
 ?>
+
 <form action="<?php echo Route::_('index.php?option=com_ccm&view=cmss'); ?>" method="post" name="adminForm" id="adminForm">
 
     <div class="row">
         <div class="col-md-12">
-        <?php echo LayoutHelper::render('joomla.searchtools.default', ['view' => $this]); ?>
+            <?php echo LayoutHelper::render('joomla.searchtools.default', ['view' => $this]); ?>
         </div>
     </div>
 
-    <?php if (!empty($this->items)) : ?>
-        <table class="table table-striped">
+    <?php if (empty($this->items)) : ?>
+        <div class="alert alert-info">
+            <span class="icon-info-circle" aria-hidden="true"></span><span class="visually-hidden"><?php echo Text::_('INFO'); ?></span>
+            <?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+        </div>
+    <?php else : ?>
+        <table class="table table-striped" id="cmsList">
             <thead>
                 <tr>
-                    <th><?php echo Text::_('Name'); ?></th>
+                    <th width="1%" class="nowrap center">
+                        <?php echo HTMLHelper::_('grid.checkall'); ?>
+                    </th>
+                    <th class="nowrap">
+                        <?php echo HTMLHelper::_('searchtools.sort', 'COM_CCM_CMS_NAME', 'a.name', $this->listDirn, $this->listOrder); ?>
+                    </th>
+                    <th width="10%" class="nowrap center">
+                        <?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $this->listDirn, $this->listOrder); ?>
+                    </th>
                 </tr>
             </thead>
             <tbody>
-                <?php foreach ($this->items as $item) : ?>
-                    <tr>
-                        <td>
-                            <a href="<?php echo Route::_('index.php?option=com_ccm&view=cms&task=cms.edit&id=' . (int) $item->id); ?>">
-                                <?php echo htmlspecialchars($item->name, ENT_QUOTES, 'UTF-8'); ?>
+                <?php foreach ($this->items as $i => $item) : ?>
+                    <tr class="row<?php echo $i % 2; ?>">
+                        <td class="center">
+                            <?php echo HTMLHelper::_('grid.id', $i, $item->id); ?>
+                        </td>
+                        <td class="nowrap has-context">
+                            <a href="<?php echo Route::_('index.php?option=com_ccm&task=cms.edit&id=' . (int) $item->id); ?>">
+                                <?php echo $this->escape($item->name); ?>
                             </a>
                         </td>
+                        <td class="center">
+                            <?php echo (int) $item->id; ?>
+                        </td>
                     </tr>
                 <?php endforeach; ?>
             </tbody>
         </table>
+
+        <?php echo $this->pagination->getListFooter(); ?>
     <?php endif; ?>
+
+    <input type="hidden" name="task" value="" />
+    <input type="hidden" name="boxchecked" value="0" />
+    <?php echo HTMLHelper::_('form.token'); ?>
 </form>
diff --git a/src/administrator/components/com_ccm/tmpl/migration/default.php b/src/administrator/components/com_ccm/tmpl/migration/default.php
@@ -2,31 +2,42 @@
 defined('_JEXEC') or die;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
 HTMLHelper::_('behavior.formvalidator');
 HTMLHelper::_('behavior.keepalive');
 ?>
 <form action="<?php echo Route::_('index.php?option=com_ccm&task=migration.apply'); ?>" method="post" id="migration-form" name="adminForm" class="form-validate">
-    <div>
-        <div class="row">
-            <div class="col-md-9">
-                <div class="row">
-                    <legend><?php echo JText::_('COM_CCM_MIGRATION_FIELDSET_LABEL'); ?></legend>
-                    <div class="col-md-6">
-                    <?php
-                    echo $this->form->renderField('source_cms');
-                    echo $this->form->renderField('target_cms');
-                    ?>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="clearfix"></div>
-    <div class="btn-toolbar">
-        <div class="btn-group">
-            <button type="submit" class="btn btn-primary">
-                <?php echo JText::_('APPLY_MIGRATION_BTN'); ?>
-            </button>
+    
+    <div class="card">
+        <div class="card-header">
+            <h3 class="card-title"><?php echo Text::_('COM_CCM_MIGRATION_FIELDSET_LABEL'); ?></h3>
+        </div>
+        <div class="card-body">
+            <div class="row">
+                <div class="col-md-6">
+                    <fieldset class="options-form">
+                        <legend><?php echo Text::_('MIGRATION_SOURCE_CMS'); ?></legend>
+                        <?php echo $this->form->renderField('source_cms'); ?>
+                        <?php echo $this->form->renderField('source_cms_object_type'); ?>
+                    </fieldset>
+                </div>
+                <div class="col-md-6">
+                    <fieldset class="options-form">
+                        <legend><?php echo Text::_('MIGRATION_TARGET_CMS'); ?></legend>
+                        <?php echo $this->form->renderField('target_cms'); ?>
+                        <?php echo $this->form->renderField('target_cms_object_type'); ?>
+                    </fieldset>
+                </div>
+            </div>
+            
+            <div class="row mt-3">
+                <div class="col-md-12">
+                    <button type="submit" class="btn btn-primary btn-lg">
+                        <span class="icon-upload" aria-hidden="true"></span>
+                        <?php echo Text::_('APPLY_MIGRATION_BTN'); ?>
+                    </button>
+                </div>
+            </div>
         </div>
     </div>
     <?php echo HTMLHelper::_('form.token'); ?>
diff --git a/tests/System/integration/administrator/components/com_ccm/Cms.cy.js b/tests/System/integration/administrator/components/com_ccm/Cms.cy.js
@@ -1,6 +1,6 @@
 describe('CCM CMS Admin', () => {
   beforeEach(() => {
-    cy.db_createCms({ name: 'Test CMS' });
+    cy.db_createCms({ name: 'Test CMS', url:'https://example.com', authentication:'{"username":"admin","password":"admin"}' });
     cy.doAdministratorLogin();
     cy.visit('/administrator/index.php?option=com_ccm&view=cmss');
     cy.get('table').contains('Test CMS').click();
@@ -38,6 +38,7 @@ describe('CCM CMS Admin', () => {
   });
 
   it('can edit a CMS name, with empty url', () => {
+    cy.get('input[name="jform[url]"]').clear();
     cy.clickToolbarButton('Save');
     cy.checkForSystemMessage("The form cannot be submitted as it's missing required data.");
   });
diff --git a/tests/System/integration/administrator/components/com_ccm/Cmss.cy.js b/tests/System/integration/administrator/components/com_ccm/Cmss.cy.js
diff --git a/tests/System/integration/administrator/components/com_ccm/Migration.cy.js b/tests/System/integration/administrator/components/com_ccm/Migration.cy.js
diff --git a/tests/System/support/commands.js b/tests/System/support/commands.js
diff --git a/tests/Unit/Component/Ccm/Administrator/Model/MigrationModelTest.php b/tests/Unit/Component/Ccm/Administrator/Model/MigrationModelTest.php

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class MigrationModel extends FormModel`
`27`	`27`	`public function __construct($config = [], $http = null)`
`28`	`28`	`{`
`29`	`29`	`parent::__construct($config);`
`30`		`- $this->migrationMapFile = dirname(__DIR__, 1) . '/Schema/migrationIdMap.json';`
	`30`	`+ $this->migrationMapFile = dirname(__DIR__, 1) . '/Schema/migrationMap.json';`
`31`	`31`
`32`	`32`	`if ($http && !($http instanceof Http)) {`
`33`	`33`	`$http = null;`
Original file line number	Diff line number	Diff line change
`@@ -36,10 +36,18 @@ protected function addToolbar()`
`36`	`36`	`{`
`37`	`37`	`$canDo = ContentHelper::getActions('com_ccm');`
`38`	`38`	`$toolbar = $this->getDocument()->getToolbar();`
`39`		`- ToolbarHelper::title(Text::_('COM_CCM_CMS_NAME_LIST'), 'ccm');`
	`39`	`+ ToolbarHelper::title(Text::_('COM_CCM_TITLE_CMS'), 'generic');`
`40`	`40`
`41`	`41`	`if ($canDo->get('core.create')) {`
`42`	`42`	`$toolbar->addNew('cms.add');`
`43`	`43`	`}`
	`44`	`+`
	`45`	`+ if ($canDo->get('core.edit')) {`
	`46`	`+ $toolbar->edit('cms.edit');`
	`47`	`+ }`
	`48`	`+`
	`49`	`+ if ($canDo->get('core.delete')) {`
	`50`	`+ $toolbar->delete('cmss.delete');`
	`51`	`+ }`
`44`	`52`	`}`
`45`	`53`	`}`