Added tab 'all'; Fixed bug with missing selection of current tab

Admin/ArticleJsConfig.php

@@ -32,41 +32,55 @@ class ArticleJsConfig implements JsConfigInterface
      */
     private $typeConfiguration;
 
+    /**
+     * @var bool
+     */
+    private $displayTabAll;
+
     /**
      * @param StructureManagerInterface $structureManager
-     * @param $typeConfiguration
+     * @param array $typeConfiguration
+     * @param bool $displayTabAll
      */
-    public function __construct(StructureManagerInterface $structureManager, $typeConfiguration)
-    {
+    public function __construct(
+        StructureManagerInterface $structureManager,
+        array $typeConfiguration,
+        $displayTabAll
+    ) {
         $this->structureManager = $structureManager;
         $this->typeConfiguration = $typeConfiguration;
+        $this->displayTabAll = $displayTabAll;
     }
 
     /**
      * {@inheritdoc}
      */
     public function getParameters()
     {
-        $types = [];
+        $config = [
+            'types' => [],
+            'displayTabAll' => $this->displayTabAll,
+        ];
+
         foreach ($this->structureManager->getStructures('article') as $structure) {
             $type = $this->getType($structure->getStructure());
-            if (!array_key_exists($type, $types)) {
-                $types[$type] = [
+            if (!array_key_exists($type, $config['types'])) {
+                $config['types'][$type] = [
                     'default' => $structure->getKey(),
                     'title' => $this->getTitle($type),
                 ];
             }
         }
 
-        return $types;
+        return $config;
     }
 
     /**
      * {@inheritdoc}
      */
     public function getName()
     {
-        return 'sulu_article.types';
+        return 'sulu_article';
     }
 
     /**

Controller/ArticleController.php

@@ -14,6 +14,7 @@
 use FOS\RestBundle\Routing\ClassResourceInterface;
 use JMS\Serializer\SerializationContext;
 use ONGR\ElasticsearchBundle\Service\Manager;
+use ONGR\ElasticsearchDSL\Query\MatchAllQuery;
 use ONGR\ElasticsearchDSL\Query\TermQuery;
 use ONGR\ElasticsearchDSL\Query\WildcardQuery;
 use ONGR\ElasticsearchDSL\Sort\FieldSort;
@@ -93,6 +94,10 @@ public function cgetAction(Request $request)
             $search->addQuery(new TermQuery('type', $type));
         }
 
+        if (null === $search->getQueries()) {
+            $search->addQuery(new MatchAllQuery());
+        }
+
         $count = $repository->count($search);
 
         if (null !== $restHelper->getSortColumn()) {

DependencyInjection/Configuration.php

@@ -47,6 +47,7 @@ public function getConfigTreeBuilder()
                         ->end()
                     ->end()
                 ->end()
+                ->scalarNode('display_tab_all')->defaultTrue()->end()
             ->end();
 
         return $treeBuilder;

DependencyInjection/SuluArticleExtension.php

@@ -95,9 +95,10 @@ public function load(array $configs, ContainerBuilder $container)
     {
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
-        $container->setParameter('sulu_articles.types', $config['types']);
-        $container->setParameter('sulu_articles.documents', $config['documents']);
-        $container->setParameter('sulu_articles.view_document.article.class', $config['documents']['article']['view']);
+        $container->setParameter('sulu_article.types', $config['types']);
+        $container->setParameter('sulu_article.documents', $config['documents']);
+        $container->setParameter('sulu_article.view_document.article.class', $config['documents']['article']['view']);
+        $container->setParameter('sulu_article.display_tab_all', $config['display_tab_all']);
 
         $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
         $loader->load('services.xml');

README.md

@@ -10,6 +10,19 @@ Install bundle over composer:
 composer require sulu/article-bundle
 ```
 
+Possible bundle configurations:
+
+```yml
+sulu_article:
+    documents:
+        article:
+            view: AppBundle\Document\ArticleViewDocument
+    types:
+        <TYPENAME>:
+            translation_key: '<TRANSLATION-KEY>'
+    display_tab_all: <BOOLEAN>
+```
+
 Configure the bundles:
 
 ```yml

Resources/config/services.xml

@@ -18,7 +18,8 @@
         </service>
         <service id="sulu_article.js_config" class="Sulu\Bundle\ArticleBundle\Admin\ArticleJsConfig">
             <argument type="service" id="sulu.content.structure_manager"/>
-            <argument>%sulu_articles.types%</argument>
+            <argument>%sulu_article.types%</argument>
+            <argument>%sulu_article.display_tab_all%</argument>
 
             <tag name="sulu.js_config"/>
             <tag name="sulu.context" context="admin"/>
@@ -27,7 +28,7 @@
         <!-- view -->
         <service id="sulu_article.view_document.factory"
                  class="Sulu\Bundle\ArticleBundle\Document\Index\DocumentFactory">
-            <argument type="string">%sulu_articles.documents%</argument>
+            <argument type="string">%sulu_article.documents%</argument>
         </service>
         <service id="sulu_article.elastic_search.article_indexer"
                  class="Sulu\Bundle\ArticleBundle\Document\Index\ArticleIndexer">
@@ -153,21 +154,21 @@
             <argument type="service" id="es.manager.live"/>
             <argument type="service" id="sulu_document_manager.document_manager"/>
             <argument type="service" id="sulu_article.content.data_provider.proxy_factory"/>
-            <argument type="string">%sulu_articles.view_document.article.class%</argument>
+            <argument type="string">%sulu_article.view_document.article.class%</argument>
 
             <tag name="sulu.smart_content.data_provider" alias="articles"/>
         </service>
         <service id="sulu_article.teaser.provider" class="Sulu\Bundle\ArticleBundle\Teaser\ArticleTeaserProvider">
             <argument type="service" id="es.manager.live"/>
-            <argument type="string">%sulu_articles.view_document.article.class%</argument>
+            <argument type="string">%sulu_article.view_document.article.class%</argument>
 
             <tag name="sulu.teaser.provider" alias="article"/>
         </service>
 
         <!-- serialization -->
         <service id="sulu_article.serializer.event_subscriber"
                  class="Sulu\Bundle\ArticleBundle\EventListener\ArticleViewDocumentSerializeSubscriber">
-            <argument>%sulu_articles.types%</argument>
+            <argument>%sulu_article.types%</argument>
 
             <tag name="jms_serializer.event_subscriber" />
             <tag name="sulu.context" context="admin"/>