fix merge conflict

fix merge conflict 5

fix tag label

fix CR notes

fix filtes conbined

resources/assets/js/api/Api.js

@@ -69,6 +69,7 @@ const services = {
     PROCESSES: "/home/processes",
     USERS: "/home/users",
     TASKS: "/home/tasks",
+    CATEGORIES: "/home/categories",
     DEBUG_STATUS: "/home/process-debug-status?processUid={prj_uid}"
 };
 

resources/assets/js/api/Filters.js

@@ -82,6 +82,18 @@ export let filters = {
             keys: {},
         });
     },
+    /**
+     * Service to get the categories list
+     */
+    categories(query) {
+        return Api.get({
+            service: "CATEGORIES",
+            params: {
+                name: query,
+            },
+            keys: {},
+        });
+    },
     /**
      * Service to get the users list
      */