@@ -3,6 +3,7 @@
 namespace ProcessMaker\Http\Controllers\Api;
 
 use DOMXPath;
+use Illuminate\Support\Arr;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\Routing\ResponseFactory;
 use Illuminate\Http\Request;
@@ -36,6 +37,38 @@ public function index(Request $request)
 
         $signals = SignalManager::getAllSignals(false, $query->get()->all());
 
+        $collections = [];
+
+        if(hasPackage('package-collections')) {
+            $collection = \ProcessMaker\Plugins\Collections\Models\Collection::get();
+            
+            foreach ($collection as $item) {
+                if (!$item->signal_create) {
+                    $collections[] = 'collection_' . $item->id . '_create';
+                }
+                if (!$item->signal_update) {
+                    $collections[] = 'collection_' . $item->id . '_update';
+                }
+                if (!$item->signal_delete) {
+                    $collections[] = 'collection_' . $item->id . '_delete';
+                }
+            };
+        }
+
+        //verify active signals
+        $signals = $signals->transform(function($item) use($collections) {
+            if (!in_array($item['id'], $collections)) {
+                $item['type'] = 'signal';
+                if (preg_match('/\bcollection_[0-9]_(create|update|delete)\b/', $item['id'])) {
+                    $item['type'] = 'collection';
+                }
+                return $item;
+            }
+        });
+
+        //remove items nulls
+        $signals = $signals->filter();
+
         $filter = $request->input('filter', '');
         if ($filter) {
             $signals = $signals->filter(function ($signal, $key) use($filter) {
 
@@ -24,9 +24,19 @@ public function index(Request $request)
     {
         $collections = [];
 
-        if(hasPackage('package-collections')) {
-            $collections = \ProcessMaker\Plugins\Collections\Models\Collection::pluck('id')->toArray();
-        }
+        /*if(hasPackage('package-collections')) {
+            \ProcessMaker\Plugins\Collections\Models\Collection::get()->map(function ($item) {
+                if ($item->signal_create)  { 
+                    $collections[] = 'collection_' . $item->id . '_create';
+                }
+                if ($item->signal_update)  { 
+                    $collections[] = 'collection_' . $item->id . '_update';
+                }
+                if ($item->signal_delete)  { 
+                    $collections[] = 'collection_' . $item->id . '_delete';
+                }
+            });
+        }*/
 
         return view('processes.signals.index', compact('collections'));
     }
 
@@ -110,6 +110,7 @@ export default {
                 .replace('_delete', '');
     },
     isCollection(data) {
+      return data.type === 'collection';
       const myRegex = new RegExp('\\bcollection_[0-9]_(create|update|delete)\\b', 'g');
       return (!!data.id.match(myRegex)) && this.collections.includes(parseInt(this.getIdCollection(data)));
     },