fix(all) : autocomplete first item fixed. Exclude and include empty . All fields bt contenttypes

src/CustomQueriesExtension.php

@@ -73,10 +73,11 @@ class CustomQueriesExtension extends SimpleExtension
     public function getQueriesResults($input)
     {
         if($input == '') {
-           return '';
+            return '';
         }
 
         $json = json_decode($input, true);
+
         if(!$json || empty($json)) {
             return '';
         }
@@ -85,7 +86,11 @@ class CustomQueriesExtension extends SimpleExtension
         $storage = $this->getContainer()['storage'];
 
         foreach ($json as $contentType => $fields) {
-            $query = $this->_buildQuery($contentType, $fields);
+            $query = false;
+            if ($contentType != 'all'){
+                $query = $this->_buildQuery($json, $contentType, $fields);
+
+            }
 
             if(!empty($query))
             {
@@ -97,24 +102,24 @@ class CustomQueriesExtension extends SimpleExtension
                 $contents = $storage->getContent($contentType, ['id' => implode(' || ', $ids), 'paging' => true, 'limit' => 99999]);
                 if(is_array($contents)) {
                     $records = array_merge($records, $contents);
+
                 } else {
                     $records = array_merge($records, [$contents]);
                 }
-
-
             }
+
         }
 
         return $this->getContainer()['twig']->render("custom_queries.twig", ['records' => $records]);
     }
-    
-       /**
+
+    /**
      * @return false|mixed
      */
     public function queriesArrayResults($input)
     {
         if($input == '') {
-           return '';
+            return '';
         }
 
         $json = json_decode($input, true);
@@ -149,13 +154,13 @@ class CustomQueriesExtension extends SimpleExtension
         return ['records' => $records];
     }
 
-   /**
+    /**
      * @return false|mixed
      */
     public function countResults($input)
     {
         if($input == '') {
-           return '';
+            return '';
         }
 
         $json = json_decode($input, true);
@@ -189,32 +194,38 @@ class CustomQueriesExtension extends SimpleExtension
 
         return count($records);
     }
-    
+
     /**
+     * @param array $json
+     * @param $contentType
      * @param array $fields
      * @return string
      */
-    protected function _buildQuery($contentType, array $fields = []) {
+    protected function _buildQuery(array $json, $contentType, array $fields = []) {
         if(!$contentType) {
             return '';
         }
 
         $storage = $this->getContainer()['storage'];
+
         $tableName = $storage->getContenttypeTablename($contentType);
+
         if(!$tableName) {
             return '';
         }
-
         $query = 'SELECT id FROM '.$tableName;
 
-        $where = $this->_buildWhere($fields);
-        if($where) {
-            $query .= $where;
+        if(!isset($json['all']) || !\in_array($contentType, $json['all'])) {
+            $where = $this->_buildWhere($fields);
+            if($where) {
+                $query .= $where;
+            }
         }
+
         return $query;
     }
 
-     /**
+    /**
      * @param array $fields
      * @return bool
      */
@@ -257,7 +268,7 @@ class CustomQueriesExtension extends SimpleExtension
                 }
             }
         }
-        
+
         return $where;
     }
 

web/css/app.css

@@ -15,13 +15,15 @@
     margin-right: 1em;
 }
 
+/* Autocomplete css */
 .chooseField {
     height: 26px !important;
+    width: 20em !important;
+    text-align: center !important;
 }
 
-.select span{
-    width: 20em;
-    text-align: center;
+.select2-container {
+    text-align: left;
 }
 
 .addContentTypeContainer {