optimized implementation of workflow graph

Author: Dileepadari

administrator/components/com_content/forms/article.xml

@@ -259,15 +259,6 @@
 			section="article"
 			validate="rules"
 		/>
-
-		<field
-			name="workflowgraphbtn"
-			type="transition"
-			workflow_stage="0"
-			extension="com_content"
-			layout="joomla.form.field.workflow.graphbtn"
-		/>
-
 	</fieldset>
 
 	<fields name="attribs" label="COM_CONTENT_ATTRIBS_FIELDSET_LABEL">

administrator/components/com_content/src/Model/ArticleModel.php

@@ -404,11 +404,6 @@ public function getItem($pk = null)
             if (!empty($item->id)) {
                 $item->tags = new TagsHelper();
                 $item->tags->getTagIds($item->id, 'com_content.article');
-                $workflow_assoc = $this->workflow->getAssociation($item->id);
-
-                if (!empty($workflow_assoc->workflow_id)) {
-                    $item->workflow_id = $workflow_assoc->workflow_id;
-                }
 
                 $item->featured_up   = null;
                 $item->featured_down = null;
@@ -1049,6 +1044,8 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
 
         $this->workflowPreprocessForm($form, $data);
 
+        $form->setFieldAttribute('transition', 'layout', 'joomla.form.field.groupedlist-transition');
+
         parent::preprocessForm($form, $data, $group);
     }
 

administrator/components/com_content/tmpl/article/edit.php

@@ -75,7 +75,7 @@
                 </div>
             </div>
             <div class="col-lg-3">
-                <?php echo LayoutHelper::render('joomla.edit.article_options', $this); ?>
+                <?php echo LayoutHelper::render('joomla.edit.global', $this); ?>
             </div>
         </div>
 

components/com_content/forms/article.xml

@@ -211,15 +211,6 @@
 			validate="captcha"
 			namespace="article"
 		/>
-
-		<field
-			name="workflowgraphbtn"
-			type="transition"
-			workflow_stage="0"
-			extension="com_content"
-			layout="joomla.form.field.workflow.graphbtn"
-		/>
-
 	</fieldset>
 		<fields name="images">
 		<fieldset name="image-intro">

components/com_content/src/Model/FormModel.php

@@ -177,13 +177,6 @@ public function getItem($itemId = null)
             }
         }
 
-        if (!empty($value->id)) {
-            $workflow_assoc = $this->workflow->getAssociation($value->id);
-
-            if (!empty($workflow_assoc->workflow_id)) {
-                $value->workflow_id = $workflow_assoc->workflow_id;
-            }
-        }
         return $value;
     }
 

components/com_content/tmpl/form/edit.php

@@ -101,12 +101,7 @@
 
             <?php echo HTMLHelper::_('uitab.addTab', $this->tab_name, 'publishing', Text::_('COM_CONTENT_PUBLISHING')); ?>
 
-                <div style="display:flex;align-items:center;gap:8px;">
-                    <div class="w-100">
-                        <?php echo $this->form->renderField('transition'); ?>
-                    </div>
-                <?php echo $this->form->renderField('workflowgraphbtn'); ?>
-                </div>
+                <?php echo $this->form->renderField('transition'); ?>
                 <?php echo $this->form->renderField('state'); ?>
                 <?php echo $this->form->renderField('catid'); ?>
                 <?php echo $this->form->renderField('tags'); ?>

layouts/joomla/edit/article_options.php

@@ -12,18 +12,18 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\Layout\LayoutHelper;
 
+extract($displayData);
 $wa   = Factory::getApplication()->getDocument()->getWebAssetManager();
 $wa->getRegistry()->addExtensionRegistryFile('com_workflow');
 
 $wa->useScript('joomla.dialog-autocreate');
 $wa->useStyle('com_workflow.workflowgraphclient');
 
 $script     = $wa->getAsset('script', name: 'com_workflow.workflowgraphclient')->getUri(true);
-$field      = $displayData['field'] ?? null;
 $workflowId = $field ? $field->getAttribute('workflow_id') : null;
-$ishidden  = $field && $field->getAttribute('type') === 'hidden';
-if ($ishidden || !$workflowId) {
+if (!$workflowId) {
     return;
 }
 $popupId = 'workflow-graph-modal-content';
@@ -36,16 +36,23 @@
 ]);
 
 ?>
-<div class="align-center text-center btns" style="width: max-content;">
-    <button type="button" class="btn btn-primary px-3 py-2" data-joomla-dialog="<?php echo htmlspecialchars($popupOptions, ENT_QUOTES, 'UTF-8'); ?>">
-        <span class="fa fa-diagram-project" aria-hidden="true"></span>
-    </button>
-    <div role="tooltip" id="tip-graph">
-        <?php echo Text::_('COM_WORKFLOW_GRAPH'); ?>
+<div class="d-flex align-items-center gap-3">
+    <div class="flex-grow-1">
+        <?php echo LayoutHelper::render('joomla.form.field.groupedlist-fancy-select', $displayData); ?>
+    </div>
+    <div class="flex-shrink-0">
+        <div class="align-center text-center btns" style="width: max-content;">
+            <button type="button" class="btn btn-primary px-3 py-2" data-joomla-dialog="<?php echo htmlspecialchars($popupOptions, ENT_QUOTES, 'UTF-8'); ?>">
+                <span class="fa fa-diagram-project" aria-hidden="true"></span>
+            </button>
+            <div role="tooltip" id="tip-graph">
+                <?php echo Text::_('COM_WORKFLOW_GRAPH'); ?>
+            </div>
+        </div>
     </div>
 </div>
-<template id="workflow-graph-modal-content">
 
+<template id="workflow-graph-modal-content">
 <div class="p-3">
     <section
         class="d-flex flex-wrap align-items-center justify-content-between"

layouts/joomla/form/field/workflow/graphbtn.php renamed to layouts/joomla/form/field/groupedlist-transition.php

@@ -79,6 +79,17 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
             } else {
                 $this->workflowStage = $input->getInt('id');
             }
+
+            $db    = $this->getDatabase();
+            $workflowStage = (int) $this->workflowStage;
+
+
+            $query = $db->getQuery(true)
+                ->select($db->quoteName('workflow_id'))
+                ->from($db->quoteName('#__workflow_stages'))
+                ->where($db->quoteName('id') . ' = ' . (int) $workflowStage);
+
+            $this->form->setFieldAttribute('transition', 'workflow_id', $db->setQuery($query)->loadResult());
         }
 
         return $result;

libraries/src/Form/Field/TransitionField.php

@@ -356,11 +356,6 @@ protected function addTransitionField(Form $form, $data)
             if (!empty($assoc->stage_id)) {
                 $form->setFieldAttribute('transition', 'workflow_stage', (int) $assoc->stage_id);
             }
-
-            if (!empty($assoc->workflow_id)) {
-                $form->setFieldAttribute('workflowgraphbtn', 'workflow_id', (int) $assoc->workflow_id);
-                $form->setFieldAttribute('workflowgraphbtn', 'type', $this->workflowEnabled ? 'transition' : 'hidden');
-            }
         } else {
             $stage_id = $this->getStageForNewItem($form, $data);