If the field value is {@code null}, this method returns an empty list.
+ *If the value cannot be converted to case IDs, this method returns an empty list.
+ * + * @param caseRef field whose value contains case IDs, may be of types + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#CASE_REF}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#MULTICHOICE}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#MULTICHOICE_MAP}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#ENUMERATION_MAP}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#STRING_COLLECTION}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#TEXT}, + * @return list of matching cases, or an empty list when the field value is {@code null} + * @see ActionDelegate#findCases(DataField) + * @see ActionDelegate#findCases(List) + * @see ActionDelegate#findCases(Closure) + * @see ActionDelegate#findCases(Closure, Pageable) + */ + ListIf the field value is {@code null}, this method returns an empty list.
+ *If the value cannot be converted to case IDs, this method returns an empty list.
+ * + * @param caseRef field whose value contains case IDs, may be of types + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#CASE_REF}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#MULTICHOICE}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#MULTICHOICE_MAP}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#ENUMERATION_MAP}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#STRING_COLLECTION}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#TEXT}, + * @return list of matching cases, or an empty list when the field value is {@code null} + * @see ActionDelegate#findCases(Field) + * @see ActionDelegate#findCases(List) + * @see ActionDelegate#findCases(Closure) + * @see ActionDelegate#findCases(Closure, Pageable) + */ + ListIf the field value is {@code null}, this method returns {@code null}.
+ *If the value cannot be converted to case IDs, this method returns {@code null}.
+ * + * @param caseRef field whose value contains case IDs, may be of types + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#CASE_REF}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#MULTICHOICE}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#MULTICHOICE_MAP}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#ENUMERATION_MAP}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#STRING_COLLECTION}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#TEXT}, + * @return referenced case, or {@code null} when the field value is invalid + * @see ActionDelegate#findCase(DataField) + * @see ActionDelegate#findCase(String) + * @see ActionDelegate#findCase(Closure) + */ + Case findCase(Field caseRef) { + if(caseRef.value == null) { + log.debug("[findCase(Field]: Value of field with id [${caseRef.importId}] is null, returning null.") + return null + } + try { + ListIf the field value is {@code null}, this method returns {@code null}.
+ *If the value cannot be converted to case IDs, this method returns {@code null}.
+ * + * @param caseRef field whose value contains case IDs, may be of types + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#CASE_REF}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#MULTICHOICE}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#MULTICHOICE_MAP}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#ENUMERATION_MAP}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#STRING_COLLECTION}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#TEXT}, + * @return referenced case, or {@code null} when the dataField value is invalid + * @see ActionDelegate#findCase(Field) + * @see ActionDelegate#findCase(String) + * @see ActionDelegate#findCase(Closure) + */ + Case findCase(DataField caseRef) { + if(caseRef.value == null) { + log.debug("[findCase(DataField)]: Value of field is null, returning null.") + return null + } + try { + ListIf the field value is {@code null}, this method returns an empty list.
+ *If the value cannot be converted to task IDs, this method returns an empty list.
+ * + * @param taskRef field whose value contains task IDs + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#TASK_REF}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#MULTICHOICE}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#MULTICHOICE_MAP}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#ENUMERATION_MAP}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#STRING_COLLECTION}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#TEXT}, + * @return list of matching tasks, or an empty list when the field value is {@code null} + * @see ActionDelegate#findTasks(DataField) + * @see ActionDelegate#findTasks(ListIf the field value is {@code null}, this method returns an empty list.
+ *If the value cannot be converted to task IDs, this method returns an empty list.
+ * + * @param taskRef field whose value contains task IDs + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#TASK_REF}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#MULTICHOICE}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#MULTICHOICE_MAP}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#ENUMERATION_MAP}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#STRING_COLLECTION}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#TEXT}, + * @return list of matching tasks, or an empty list when the field value is {@code null} + * @see ActionDelegate#findTasks(Field) + * @see ActionDelegate#findTasks(ListIf the field value is {@code null}, this method returns {@code null}.
+ *If the field contains no value or the value cannot be converted to a task ID, this method returns + * {@code null}.
+ * + * @param taskRef field whose value contains a task ID + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#TASK_REF}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#MULTICHOICE}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#MULTICHOICE_MAP}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#ENUMERATION_MAP}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#STRING_COLLECTION}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#TEXT}, + * @return referenced task, or {@code null} when the field value is invalid + * @see ActionDelegate#findTask(DataField) + * @see ActionDelegate#findTask(String) + * @see ActionDelegate#findTask(Closure) + */ + Task findTask(Field taskRef) { + if(taskRef.value == null) { + log.debug("[findTask(Field)]: Value of field with id [${taskRef.importId}] is null, returning null") + return null + } + try { + ListIf the field value is {@code null}, this method returns {@code null}.
+ *If the field contains no value or the value cannot be converted to a task ID, this method returns + * {@code null}.
+ * + * @param taskRef field whose value contains a task ID + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#TASK_REF}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#MULTICHOICE}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#MULTICHOICE_MAP}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#ENUMERATION_MAP}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#STRING_COLLECTION}, + * {@link com.netgrif.application.engine.petrinet.domain.dataset.FieldType#TEXT}, + * @return referenced task, or {@code null} when the field value is invalid + * @see ActionDelegate#findTask(Field) + * @see ActionDelegate#findTask(String) + * @see ActionDelegate#findTask(Closure) + */ + Task findTask(DataField taskRef) { + if(taskRef.value == null) { + log.debug("[findTask(DataField)]: Value of field is null, returning null") + return null + } + try { + ListchangeFilter filter query { "processIdentifier:"my_process_id" }
- * changeFilter filter visibility { "private" }
- * changeFilter filter allowedNets { ["my_process_id1","my_process_id2"] }
- * changeFilter filter filterMetadata { [
- "searchCategories" : [],
- "predicateMetadata" : [],
- "filterType" : "Case",
- "defaultSearchCategories": true,
- "inheritAllowedNets" : false
- ] }
- * changeFilter filter title { new I18nString("New title") }
- * changeFilter filter title { "New title" }
- * changeFilter filter icon { "filter_alt" }
- * changeFilter filter uri { "/my_node1/my_node2" }
- * changeMenuItem item allowedRoles { ["role_1":"my_process_id"] }
* changeMenuItem item bannedRoles { ["role_1":"my_process_id"] }
- * changeMenuItem item caseDefaultHeaders { ["meta-title","meta-visualId"] }
- * changeMenuItem item taskDefaultHeaders { ["meta-title","meta-caseId"] }
- * changeMenuItem item filter { filterCase }
* changeMenuItem item uri { "/my_node1/my_node2" }
* changeMenuItem item title { new I18nString("New title") }
* changeMenuItem item title { "New title" }
* changeMenuItem item menuIcon { "filter_alt" }
* changeMenuItem item tabIcon { "filter_none" }
* "/my_node" to
* "/my_node/my_node2"
*
- * @param item Instance of preference_item to be moved
+ * @param item Instance of menu_item to be moved
* @param destUri destination path where the item will be moved. F.e. "/my_new_node"
* */
void moveMenuItem(Case item, String destUri) {
- if (isCyclicNodePath(item, destUri)) {
- throw new IllegalArgumentException("Cyclic path not supported. Destination path: ${destUri}")
- }
-
- Listnull is returned
- */
- Case getFilterFromMenuItem(Case item) {
- String filterId = (item.dataSet[MenuItemConstants.PREFERENCE_ITEM_FIELD_FILTER_CASE.attributeId].value as List)[0] as String
- return filterId ? workflowService.findOne(filterId) : null
+ Case createDashboardManagement(DashboardManagementBody body) {
+ return dashboardManagementService.createDashboardManagement(body)
+ }
+
+ Case createDashboardItem(DashboardItemBody body) {
+ return dashboardItemService.getOrCreate(body)
+ }
+
+ Case findDashboardManagement(String identifier) {
+ return dashboardManagementService.findDashboardManagement(identifier)
+ }
+
+ Case findDashboardItem(String identifier) {
+ return dashboardItemService.findById(identifier)
+ }
+
+ Case updateDashboardManagement(Case managementCase, DashboardManagementBody body) {
+ return dashboardManagementService.updateDashboardManagement(managementCase, body)
+ }
+
+ Case updateDashboardItem(Case itemCase, DashboardItemBody body) {
+ return dashboardItemService.update(itemCase, body)
}
/**
* search elastic with string query for first occurrence
- * @param query
- * @return
+ * @param query string with search conditions
+ * @return one case which match search condition or null
*/
Case findCaseElastic(String query) {
def result = findCasesElastic(query, PageRequest.of(0, 1))
return result ? result[0] : null
}
+ /**
+ * search elastic with string query for cases and default page size of 100 cases
+ * @param query string with search conditions
+ * @param pageSize optional parameter which decides number of returned elements
+ * @return list of cases (default max 100) which match condition
+ */
+ List+ * The query must start with the resource keyword {@code case} (singular). + *
+ * Example: + *
+ * searchCase("case: processIdentifier eq 'query_test' and data.number_0.value == 3")
+ * searchCase("case: id eq '5f9b1c2d3e4f5a6b7c8d9e0f'")
+ *
+ *
+ * @param query query language string starting with {@code case:}
+ * @return matching {@link Case} or {@code null} if none is found
+ */
+ Case searchCase(String query) {
+ return caseSearchService.searchOne(query)
+ }
+
+ /**
+ * Searches for all {@link Case} instances matching the given query and returns a paged result.
+ * + * The query must start with the resource keyword {@code cases} (plural) and may contain + * paging and sorting clauses. + *
+ * Example: + *
+ * pagedSearchCases("cases: processIdentifier eq 'query_test' page 1 size 5 sort by title desc")
+ * pagedSearchCases("cases: author eq 'user@mail.com' and creationDate gt 2020-03-03")
+ *
+ *
+ * @param query query language string starting with {@code cases:}
+ * @return {@link Page} of matching cases
+ */
+ Page+ * The query must start with the resource keyword {@code cases} (plural). This is a convenience + * method returning only the content of {@link #pagedSearchCases(String)}. + *
+ * Example: + *
+ * searchCases("cases: processIdentifier eq 'query_test' and data.boolean_0.value == true")
+ * searchCases("cases: title contains 'Test' sort by creationDate desc")
+ *
+ *
+ * @param query query language string starting with {@code cases:}
+ * @return list of matching cases
+ */
+ List+ * The query must start with the resource keyword {@code cases} (plural). + *
+ * Example: + *
+ * countCases("cases: processIdentifier eq 'query_test'")
+ * countCases("cases: data.boolean_0.value == true and data.text_0.value != '4'")
+ *
+ *
+ * @param query query language string starting with {@code cases:}
+ * @return number of matching cases
+ */
+ long countCases(String query) {
+ return caseSearchService.count(query)
+ }
+
+ /**
+ * Checks whether at least one {@link Case} matching the given query exists.
+ * + * The query must start with the resource keyword {@code cases} (plural). + *
+ * Example: + *
+ * existsCase("cases: processIdentifier eq 'query_test'")
+ * existsCase("cases: id in ('5f9b1c2d3e4f5a6b7c8d9e0f', '5f9b1c2d3e4f5a6b7c8d9e10')")
+ *
+ *
+ * @param query query language string starting with {@code cases:}
+ * @return {@code true} if a matching case exists, {@code false} otherwise
+ */
+ boolean existsCase(String query) {
+ return caseSearchService.exists(query)
+ }
+
+ /**
+ * Searches for a single {@link Task} matching the given query.
+ * + * The query must start with the resource keyword {@code task} (singular). + *
+ * Example: + *
+ * searchTask("task: transitionId eq 't1' and caseId eq '5f9b1c2d3e4f5a6b7c8d9e0f'")
+ * searchTask("task: id eq '5f9b1c2d3e4f5a6b7c8d9e0f'")
+ *
+ *
+ * @param query query language string starting with {@code task:}
+ * @return matching {@link Task} or {@code null} if none is found
+ */
+ Task searchTask(String query) {
+ return taskSearchService.searchOne(query)
+ }
+
+ /**
+ * Searches for all {@link Task} instances matching the given query and returns a paged result.
+ * + * The query must start with the resource keyword {@code tasks} (plural) and may contain + * paging and sorting clauses. + *
+ * Example: + *
+ * pagedSearchTasks("tasks: title eq 'test' page 0 size 10 sort by lastFinish desc")
+ * pagedSearchTasks("tasks: userId eq 'user1' and state eq enabled")
+ *
+ *
+ * @param query query language string starting with {@code tasks:}
+ * @return {@link Page} of matching tasks
+ */
+ Page+ * The query must start with the resource keyword {@code tasks} (plural). This is a convenience + * method returning only the content of {@link #pagedSearchTasks(String)}. + *
+ * Example: + *
+ * searchTasks("tasks: processId eq 'my_process' and userId in ('user1', 'user2')")
+ * searchTasks("tasks: title contains 'Approve' sort by title asc")
+ *
+ *
+ * @param query query language string starting with {@code tasks:}
+ * @return list of matching tasks
+ */
+ List+ * The query must start with the resource keyword {@code tasks} (plural). + *
+ * Example: + *
+ * countTasks("tasks: caseId eq '5f9b1c2d3e4f5a6b7c8d9e0f'")
+ * countTasks("tasks: transitionId eq 't1' and userId eq 'user1'")
+ *
+ *
+ * @param query query language string starting with {@code tasks:}
+ * @return number of matching tasks
+ */
+ long countTasks(String query) {
+ return taskSearchService.count(query)
+ }
+
+ /**
+ * Checks whether at least one {@link Task} matching the given query exists.
+ * + * The query must start with the resource keyword {@code tasks} (plural). + *
+ * Example: + *
+ * existsTask("tasks: caseId eq '5f9b1c2d3e4f5a6b7c8d9e0f'")
+ * existsTask("tasks: transitionId eq 't1' and userId not eq 'user1'")
+ *
+ *
+ * @param query query language string starting with {@code tasks:}
+ * @return {@code true} if a matching task exists, {@code false} otherwise
+ */
+ boolean existsTask(String query) {
+ return taskSearchService.exists(query)
+ }
+
+ /**
+ * Searches for a single {@link PetriNet} (process) matching the given query.
+ * + * The query must start with the resource keyword {@code process} (singular). + *
+ * Example: + *
+ * searchProcess("process: identifier == 'query_test'")
+ * searchProcess("process: identifier eq 'my_process' and version eq 1.0.0")
+ *
+ *
+ * @param query query language string starting with {@code process:}
+ * @return matching {@link PetriNet} or {@code null} if none is found
+ */
+ PetriNet searchProcess(String query) {
+ return processSearchService.searchOne(query)
+ }
+
+ /**
+ * Searches for all {@link PetriNet} (process) instances matching the given query and returns a paged result.
+ * + * The query must start with the resource keyword {@code processes} (plural) and may contain + * paging and sorting clauses. + *
+ * Example: + *
+ * pagedSearchProcesses("processes: identifier eq 'my_process' page 0 size 10 sort by version desc")
+ * pagedSearchProcesses("processes: version in (1.0.0 : 2.0.0)")
+ *
+ *
+ * @param query query language string starting with {@code processes:}
+ * @return {@link Page} of matching processes
+ */
+ Page+ * The query must start with the resource keyword {@code processes} (plural). This is a convenience + * method returning only the content of {@link #pagedSearchProcesses(String)}. + *
+ * Example: + *
+ * searchProcesses("processes: title contains 'Test' sort by identifier asc")
+ * searchProcesses("processes: identifier in ('process_a', 'process_b')")
+ *
+ *
+ * @param query query language string starting with {@code processes:}
+ * @return list of matching processes
+ */
+ List+ * The query must start with the resource keyword {@code processes} (plural). + *
+ * Example: + *
+ * countProcesses("processes: identifier eq 'my_process'")
+ * countProcesses("processes: version gte 1.0.0")
+ *
+ *
+ * @param query query language string starting with {@code processes:}
+ * @return number of matching processes
+ */
+ long countProcesses(String query) {
+ return processSearchService.count(query)
+ }
+
+ /**
+ * Checks whether at least one {@link PetriNet} (process) matching the given query exists.
+ * + * The query must start with the resource keyword {@code processes} (plural). + *
+ * Example: + *
+ * existsProcess("processes: identifier eq 'my_process'")
+ * existsProcess("processes: version eq 1.0.0")
+ *
+ *
+ * @param query query language string starting with {@code processes:}
+ * @return {@code true} if a matching process exists, {@code false} otherwise
+ */
+ boolean existsProcess(String query) {
+ return processSearchService.exists(query)
+ }
+
+ /**
+ * Searches for a single {@link IUser} matching the given query.
+ * + * The query must start with the resource keyword {@code user} (singular). + *
+ * Example: + *
+ * searchUser("user: email eq 'user@mail.com'")
+ * searchUser("user: name eq 'John' and surname eq 'Doe'")
+ *
+ *
+ * @param query query language string starting with {@code user:}
+ * @return matching {@link IUser} or {@code null} if none is found
+ */
+ IUser searchUser(String query) {
+ return userSearchService.searchOne(query)
+ }
+
+ /**
+ * Searches for all {@link IUser} instances matching the given query and returns a paged result.
+ * + * The query must start with the resource keyword {@code users} (plural) and may contain + * paging and sorting clauses. + *
+ * Example: + *
+ * pagedSearchUsers("users: name eq 'John' page 0 size 25 sort by surname asc")
+ * pagedSearchUsers("users: email contains '@company.com'")
+ *
+ *
+ * @param query query language string starting with {@code users:}
+ * @return {@link Page} of matching users
+ */
+ Page+ * The query must start with the resource keyword {@code users} (plural). This is a convenience + * method returning only the content of {@link #pagedSearchUsers(String)}. + *
+ * Example: + *
+ * searchUsers("users: surname eq 'Doe' sort by name asc")
+ * searchUsers("users: email in ('a@mail.com', 'b@mail.com')")
+ *
+ *
+ * @param query query language string starting with {@code users:}
+ * @return list of matching users
+ */
+ List+ * The query must start with the resource keyword {@code users} (plural). + *
+ * Example: + *
+ * countUsers("users: email contains '@company.com'")
+ * countUsers("users: name eq 'John'")
+ *
+ *
+ * @param query query language string starting with {@code users:}
+ * @return number of matching users
+ */
+ long countUsers(String query) {
+ return userSearchService.count(query)
+ }
+
+ /**
+ * Checks whether at least one {@link IUser} matching the given query exists.
+ * + * The query must start with the resource keyword {@code users} (plural). + *
+ * Example: + *
+ * existsUser("users: email eq 'user@mail.com'")
+ * existsUser("users: name eq 'John' and surname eq 'Doe'")
+ *
+ *
+ * @param query query language string starting with {@code users:}
+ * @return {@code true} if a matching user exists, {@code false} otherwise
+ */
+ boolean existsUser(String query) {
+ return userSearchService.exists(query)
+ }
+
+ /**
+ * Generic search that resolves the resource type from the query itself and executes the search.
+ * + * The query must start with one of the resource keywords: {@code process}/{@code processes}, + * {@code case}/{@code cases}, {@code task}/{@code tasks} or {@code user}/{@code users}. + * When the singular form is used, a single matching instance is returned. When the plural form + * is used, the content (a {@link List}) of the resulting {@link Page} is returned. + *
+ * Example: + *
+ * search("case: processIdentifier eq 'query_test' and data.number_0.value == 3")
+ * search("cases: processIdentifier eq 'query_test' page 1 size 5 sort by title desc")
+ * search("process: identifier == 'query_test'")
+ *
+ *
+ * @param query query language string starting with a resource keyword
+ * @return a single resource instance (singular form), a {@link List} of instances (plural form),
+ * or {@code null} if nothing matches
+ */
+ Object search(String query) {
+ Object result = searchService.search(query)
+ if (result instanceof Page) {
+ return result.content
+ }
+ return result
+ }
+
+ /**
+ * Generic count that resolves the resource type from the query itself and counts matching instances.
+ * + * The query must start with one of the resource keywords: {@code processes}, {@code cases}, + * {@code tasks} or {@code users} (plural form). + *
+ * Example: + *
+ * count("cases: processIdentifier eq 'query_test' and data.boolean_0.value == true")
+ * count("users: email contains '@company.com'")
+ *
+ *
+ * @param query query language string starting with a resource keyword
+ * @return number of matching instances
+ */
+ long count(String query) {
+ return searchService.count(query)
+ }
+
+ /**
+ * Generic existence check that resolves the resource type from the query itself.
+ * + * The query must start with one of the resource keywords: {@code processes}, {@code cases}, + * {@code tasks} or {@code users} (plural form). + *
+ * Example: + *
+ * exists("cases: processIdentifier eq 'query_test'")
+ * exists("tasks: transitionId eq 't1' and userId eq 'user1'")
+ *
+ *
+ * @param query query language string starting with a resource keyword
+ * @return {@code true} if a matching instance exists, {@code false} otherwise
+ */
+ boolean exists(String query) {
+ return searchService.exists(query)
+ }
}
\ No newline at end of file
diff --git a/src/main/groovy/com/netgrif/application/engine/startup/DashboardManagementRunner.groovy b/src/main/groovy/com/netgrif/application/engine/startup/DashboardManagementRunner.groovy
new file mode 100644
index 00000000000..a95e79215ce
--- /dev/null
+++ b/src/main/groovy/com/netgrif/application/engine/startup/DashboardManagementRunner.groovy
@@ -0,0 +1,27 @@
+package com.netgrif.application.engine.startup
+
+import groovy.util.logging.Slf4j
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
+import org.springframework.stereotype.Component
+
+@Slf4j
+@Component
+@ConditionalOnProperty(value = "nae.dashboard-management.enabled", matchIfMissing = true)
+class DashboardManagementRunner extends AbstractOrderedCommandLineRunner {
+
+ @Autowired
+ private ImportHelper helper
+
+ public static final String DASHBOARD_MANAGEMENT_NET_IDENTIFIER = "dashboard_management"
+ private static final String DASHBOARD_MANAGEMENT_FILE_NAME = "engine-processes/dashboard_management.xml"
+
+ public static final String DASHBOARD_ITEM_NET_IDENTIFIER = "dashboard_item"
+ private static final String DASHBOARD_ITEM_FILE_NAME = "engine-processes/dashboard_item.xml"
+
+ @Override
+ void run(String... args) throws Exception {
+ helper.importProcess("Petri net for filters", DASHBOARD_MANAGEMENT_NET_IDENTIFIER, DASHBOARD_MANAGEMENT_FILE_NAME)
+ helper.importProcess("Petri net for filter preferences", DASHBOARD_ITEM_NET_IDENTIFIER, DASHBOARD_ITEM_FILE_NAME)
+ }
+}
diff --git a/src/main/groovy/com/netgrif/application/engine/startup/DashboardRunner.groovy b/src/main/groovy/com/netgrif/application/engine/startup/DashboardRunner.groovy
index 4c3690da982..aeafd8a270b 100644
--- a/src/main/groovy/com/netgrif/application/engine/startup/DashboardRunner.groovy
+++ b/src/main/groovy/com/netgrif/application/engine/startup/DashboardRunner.groovy
@@ -1,8 +1,5 @@
package com.netgrif.application.engine.startup
-import com.netgrif.application.engine.petrinet.domain.PetriNet
-import com.netgrif.application.engine.petrinet.domain.VersionType
-import com.netgrif.application.engine.petrinet.service.interfaces.IPetriNetService
import groovy.util.logging.Slf4j
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
@@ -13,15 +10,9 @@ import org.springframework.stereotype.Component
@ConditionalOnProperty(value = "nae.dashboard.enabled", matchIfMissing = false)
class DashboardRunner extends AbstractOrderedCommandLineRunner {
- @Autowired
- private IPetriNetService petriNetService
-
@Autowired
private ImportHelper helper
- @Autowired
- private SystemUserRunner systemCreator
-
public static final String DASHBOARD_NET_IDENTIFIER = "dashboard"
private static final String DASHBOARD_FILE_NAME = "engine-processes/dashboard.xml"
@@ -30,32 +21,7 @@ class DashboardRunner extends AbstractOrderedCommandLineRunner {
@Override
void run(String... args) throws Exception {
- createDashboardNet()
- createDashboardTileNet()
- }
-
- Optional