let moderation links point to filtered EAB views

Author: Guite

bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/symfony/controller/ControllerLayer.xtend

@@ -209,9 +209,6 @@ class ControllerLayer {
         if (hasDetailAction || hasDeleteAction) {
             imports.add('Symfony\\Component\\HttpKernel\\Exception\\NotFoundHttpException')
         }
-        if (hasDeleteAction) {
-            imports.add('Zikula\\FormExtensionBundle\\Form\\Type\\DeletionType')
-        }
         if (hasEditAction && app.needsInlineEditing) {
             imports.add('Zikula\\CoreBundle\\Response\\PlainResponse')
         }

bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/symfony/controller/EventSubscribers.xtend

@@ -3,7 +3,6 @@ package org.zikula.modulestudio.generator.cartridges.symfony.controller
 import de.guite.modulestudio.metamodel.Application
 import org.zikula.modulestudio.generator.application.IMostFileSystemAccess
 import org.zikula.modulestudio.generator.application.ImportList
-import org.zikula.modulestudio.generator.cartridges.symfony.controller.subscriber.FormTypeChoicesSubscriber
 import org.zikula.modulestudio.generator.cartridges.symfony.controller.subscriber.KernelSubscriber
 import org.zikula.modulestudio.generator.cartridges.symfony.controller.subscriber.LoggableSubscriber
 import org.zikula.modulestudio.generator.cartridges.symfony.controller.subscriber.MailerSubscriber
@@ -53,7 +52,6 @@ class EventSubscribers {
     }
 
     def private generateSubscriberClasses(Application it) {
-        subscriberFile('FormTypeChoices', formTypeChoicesFile)
         subscriberFile('Kernel', subscribersKernelFile)
         subscriberFile('Mailer', subscribersMailerFile)
         subscriberFile('Theme', subscribersThemeFile)
@@ -74,29 +72,6 @@ class EventSubscribers {
         fsa.generateFile(filePath, content)
     }
 
-    def private formTypeChoicesFile(Application it) '''
-        namespace «appNamespace»\EventSubscriber«IF isBase»\Base«ENDIF»;
-
-        «IF !isBase»
-            use «appNamespace»\EventSubscriber\Base\AbstractFormTypeChoicesSubscriber;
-        «ELSE»
-            use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-            use Zikula\FormExtensionBundle\Event\FormTypeChoiceEvent;
-        «ENDIF»
-
-        /**
-         * Event handler «IF isBase»base«ELSE»implementation«ENDIF» class for injecting custom dynamic form types.
-         */
-        «IF isBase»abstract «ENDIF»class «IF isBase»Abstract«ENDIF»FormTypeChoicesSubscriber«IF !isBase» extends AbstractFormTypeChoicesSubscriber«ELSE» implements EventSubscriberInterface«ENDIF»
-        {
-            «IF isBase»
-                «new FormTypeChoicesSubscriber().generate(it)»
-            «ELSE»
-                // feel free to enhance the parent methods
-            «ENDIF»
-        }
-    '''
-
     def private subscribersKernelFile(Application it) '''
         namespace «appNamespace»\EventSubscriber«IF isBase»\Base«ENDIF»;
 

bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/symfony/controller/config/ConfigureFields.xtend

@@ -94,7 +94,7 @@ class ConfigureFields implements ControllerMethodInterface {
         // TODO refactor following imports
         val importsUNUSED = newArrayList
         if (!formFields.filter[!mandatory && !nullable].empty) {
-            importsUNUSED.add('Zikula\\FormExtensionBundle\\Form\\DataTransformer\\NullToEmptyTransformer')
+            importsUNUSED.add('Zikula\\ThemeBundle\\Form\\DataTransformer\\NullToEmptyTransformer')
         }
         if (hasTranslatableFields) {
             importsUNUSED.add(application.appNamespace + '\\Form\\Type\\Field\\TranslationType')

bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/symfony/controller/menu/ExtensionMenu.xtend

@@ -38,6 +38,7 @@ class ExtensionMenu {
         }
         if (needsApproval) {
             imports.add(appNamespace + '\\Helper\\WorkflowHelper')
+            imports.add('EasyCorp\\Bundle\\EasyAdminBundle\\Form\\Type\\ComparisonType')
         }
         imports
     }
@@ -86,7 +87,7 @@ class ExtensionMenu {
                                         $routeParameters = [];
                                     }
                                 «ENDIF»
-                                yield '«entity.name.formatForCode»' => MenuItem::linktoRoute(t('My «entity.nameMultiple.formatForDisplay»'), 'fas fa-list-alt', '«appName.formatForDB»_' . mb_strtolower($objectType) . '_index', $routeParameters);
+                                yield 'My «entity.nameMultiple.formatForDisplay»' => MenuItem::linktoRoute(t('My «entity.nameMultiple.formatForDisplay»'), 'fas fa-list-alt', '«appName.formatForDB»_' . mb_strtolower($objectType) . '_index', $routeParameters);
                             }
                         }
 
@@ -118,8 +119,21 @@ class ExtensionMenu {
             if ($isAdmin) {
                 $moderationEntries = $this->workflowHelper->collectAmountOfModerationItems();
                 foreach ($moderationEntries as $entry) {
-                    yield $entry['objectType'] . $entry['state'] => MenuItem::linktoRoute($entry['title'], null, '«appName.formatForDB»_' . mb_strtolower($entry['objectType']) . '_index', ['workflowState' => $entry['state']])
-                        ->setBadge($entry['amount'], 'primary');
+                    $objectType = $entry['objectType'];
+                    if ($this->permissionHelper->hasComponentPermission($objectType/*, $permLevel*/)) {
+                        $entityClass = match ($objectType) {
+                            «FOR entity : getEntitiesForWorkflow(true)»
+                                '«entity.name.formatForCode»' => «entity.name.formatForCodeCapital»::class,
+                            «ENDFOR»
+                            default => throw new \RuntimeException('Invalid object type.')
+                        };
+                        yield $objectType . ucfirst($entry['state']) => 
+                            MenuItem::linkToCrud($entry['title'], 'fa fa-user-magnifying-class', $entityClass)
+                                ->setQueryParameter('filters[workflowState][comparison]', ComparisonType::EQ)
+                                ->setQueryParameter('filters[workflowState][value]', $entry['state'])
+                                ->setBadge($entry['amount'], 'primary')
+                        ;
+                    }
                 }
             }
         «ENDIF»