added workflowgraphbtn field

Author: Dileepadari

administrator/components/com_content/forms/article.xml

@@ -260,6 +260,14 @@
 			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/tmpl/article/edit.php

@@ -182,7 +182,3 @@
         <?php echo $this->form->renderControlFields(); ?>
     </div>
 </form>
-<?php echo LayoutHelper::render('joomla.workflow.graphmodal', [
-    'workflow_id' => isset($this->item->workflow_id) ? $this->item->workflow_id : null,
-]);
-?>

components/com_content/forms/article.xml

@@ -211,6 +211,15 @@
 			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/tmpl/form/edit.php

@@ -105,7 +105,7 @@
                     <div class="w-100">
                         <?php echo $this->form->renderField('transition'); ?>
                     </div>
-                <?php echo LayoutHelper::render('joomla.workflow.workflowgraphbtn'); ?>
+                <?php echo $this->form->renderField('workflowgraphbtn'); ?>
                 </div>
                 <?php echo $this->form->renderField('state'); ?>
                 <?php echo $this->form->renderField('catid'); ?>
@@ -182,7 +182,3 @@
         </div>
     </form>
 </div>
-<?php echo LayoutHelper::render('joomla.workflow.graphmodal', [
-    'workflow_id' => isset($this->item->workflow_id) ? $this->item->workflow_id : null,
-]);
-?>

layouts/joomla/edit/article_options.php

@@ -14,7 +14,6 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Layout\LayoutHelper;
 
 $app       = Factory::getApplication();
 $wa        = Factory::getDocument()->getWebAssetManager();
@@ -71,10 +70,13 @@
 
           // Special handling for transition field
             if ($f === 'transition') {
-                $html[] = '<div style="display:flex;align-items:center;gap:8px;"><div class="w-100">';
+                $html[] = '<div class="d-flex align-items-center gap-3">';
+                $html[] = '<div class="flex-grow-1">';
                 $html[] = $form->renderField($f);
                 $html[] = '</div>';
-                $html[] = LayoutHelper::render('joomla.workflow.workflowgraphbtn');
+                $html[] = '<div class="flex-shrink-0 w-15">';
+                $html[] = $form->renderField('workflowgraphbtn');
+                $html[] = '</div>';
                 $html[] = '</div>';
             } else {
                 $html[] = $form->renderField($f);

layouts/joomla/workflow/graphmodal.php renamed to layouts/joomla/form/field/workflow/graphbtn.php

@@ -9,17 +9,41 @@
  */
 
 defined('_JEXEC') or die;
-use Joomla\CMS\Factory;
 
-$app = Factory::getApplication();
-$wa = $app->getDocument()->getWebAssetManager();
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
 
+$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);
 
-$workflowId = $displayData['workflow_id'];
+$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) {
+    return;
+}
+$popupId = 'workflow-graph-modal-content';
+$popupOptions = json_encode([
+    'src'             => '#' . $popupId,
+    'height'          => 'fit-content',
+    'textHeader'      => Text::_('COM_WORKFLOW_GRAPH'),
+    'preferredParent' => 'body',
+    'modal'           => true,
+]);
+
 ?>
+<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>
 <template id="workflow-graph-modal-content">
 
 <div class="p-3">

layouts/joomla/workflow/workflowgraphbtn.php

@@ -356,6 +356,11 @@ 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);