diff --git a/components/core/core-base/src/main/java/org/eclipse/dirigible/components/base/endpoint/BaseEndpoint.java b/components/core/core-base/src/main/java/org/eclipse/dirigible/components/base/endpoint/BaseEndpoint.java index ae1f4314f7f..86286c7dc36 100644 --- a/components/core/core-base/src/main/java/org/eclipse/dirigible/components/base/endpoint/BaseEndpoint.java +++ b/components/core/core-base/src/main/java/org/eclipse/dirigible/components/base/endpoint/BaseEndpoint.java @@ -29,6 +29,9 @@ public abstract class BaseEndpoint { /** The Constant PREFIX_ENDPOINT_IDE. */ public static final String PREFIX_ENDPOINT_IDE = "services/ide/"; + /** The Constant PREFIX_ENDPOINT_BPM. */ + public static final String PREFIX_ENDPOINT_BPM = "services/bpm"; + /** The Constant PREFIX_ENDPOINT_PUBLIC. */ public static final String PREFIX_ENDPOINT_PUBLIC = "public/"; diff --git a/components/core/core-base/src/main/java/org/eclipse/dirigible/components/base/http/access/HttpSecurityURIConfigurator.java b/components/core/core-base/src/main/java/org/eclipse/dirigible/components/base/http/access/HttpSecurityURIConfigurator.java index a0f2fd4b6b1..902993bc7f8 100644 --- a/components/core/core-base/src/main/java/org/eclipse/dirigible/components/base/http/access/HttpSecurityURIConfigurator.java +++ b/components/core/core-base/src/main/java/org/eclipse/dirigible/components/base/http/access/HttpSecurityURIConfigurator.java @@ -51,6 +51,7 @@ public class HttpSecurityURIConfigurator { /** The Constant DEVELOPER_PATTERNS. */ private static final String[] DEVELOPER_PATTERNS = {// + "/services/bpm/**", // "/services/ide/**", // "/websockets/ide/**"}; diff --git a/components/engine/engine-bpm-flowable/src/main/java/org/eclipse/dirigible/components/engine/bpm/flowable/endpoint/BpmFlowableEndpoint.java b/components/engine/engine-bpm-flowable/src/main/java/org/eclipse/dirigible/components/engine/bpm/flowable/endpoint/BpmFlowableEndpoint.java index 31112bf394e..facd555cb88 100644 --- a/components/engine/engine-bpm-flowable/src/main/java/org/eclipse/dirigible/components/engine/bpm/flowable/endpoint/BpmFlowableEndpoint.java +++ b/components/engine/engine-bpm-flowable/src/main/java/org/eclipse/dirigible/components/engine/bpm/flowable/endpoint/BpmFlowableEndpoint.java @@ -60,7 +60,7 @@ */ @CrossOrigin @RestController -@RequestMapping(BaseEndpoint.PREFIX_ENDPOINT_IDE + "bpm") +@RequestMapping(BaseEndpoint.PREFIX_ENDPOINT_BPM) public class BpmFlowableEndpoint extends BaseEndpoint { /** diff --git a/components/ide/ide-ui-bpm-workspace/src/main/resources/META-INF/dirigible/ide-bpm-workspace/js/bpm-historic-process-instances.js b/components/ide/ide-ui-bpm-workspace/src/main/resources/META-INF/dirigible/ide-bpm-workspace/js/bpm-historic-process-instances.js index 89306263a04..9a65666f867 100644 --- a/components/ide/ide-ui-bpm-workspace/src/main/resources/META-INF/dirigible/ide-bpm-workspace/js/bpm-historic-process-instances.js +++ b/components/ide/ide-ui-bpm-workspace/src/main/resources/META-INF/dirigible/ide-bpm-workspace/js/bpm-historic-process-instances.js @@ -33,7 +33,7 @@ ideBpmHistoricProcessInstancesView.controller('IDEBpmHistoricProcessInstancesVie }; $scope.fetchData = function() { - $http.get('/services/ide/bpm/bpm-processes/historic-instances', { params: { 'businessKey': $scope.model.searchText, 'definitionKey': $scope.selectedProcessDefinitionKey, 'limit': 100 } }) + $http.get('/services/bpm/bpm-processes/historic-instances', { params: { 'businessKey': $scope.model.searchText, 'definitionKey': $scope.selectedProcessDefinitionKey, 'limit': 100 } }) .then((response) => { $scope.instances = response.data; }); @@ -52,7 +52,7 @@ ideBpmHistoricProcessInstancesView.controller('IDEBpmHistoricProcessInstancesVie } $scope.applyFilter = function () { - $http.get('/services/ide/bpm/bpm-processes/historic-instances', { params: { 'businessKey': $scope.model.searchText, 'definitionKey': $scope.selectedProcessDefinitionKey, 'limit': 100 } }) + $http.get('/services/bpm/bpm-processes/historic-instances', { params: { 'businessKey': $scope.model.searchText, 'definitionKey': $scope.selectedProcessDefinitionKey, 'limit': 100 } }) .then((response) => { $scope.instances = response.data; }); diff --git a/components/ide/ide-ui-bpm-workspace/src/main/resources/META-INF/dirigible/ide-bpm-workspace/js/bpm-image-viewer.js b/components/ide/ide-ui-bpm-workspace/src/main/resources/META-INF/dirigible/ide-bpm-workspace/js/bpm-image-viewer.js index 8881dfc363e..116668866a0 100644 --- a/components/ide/ide-ui-bpm-workspace/src/main/resources/META-INF/dirigible/ide-bpm-workspace/js/bpm-image-viewer.js +++ b/components/ide/ide-ui-bpm-workspace/src/main/resources/META-INF/dirigible/ide-bpm-workspace/js/bpm-image-viewer.js @@ -24,12 +24,12 @@ bpmImageView.controller('BpmImageViewController', ['$scope', 'messageHub', funct }; $scope.loadDefinitionImageLink = function (definition) { - $scope.imageLink = `/services/ide/bpm/bpm-processes/diagram/definition/${definition}`; + $scope.imageLink = `/services/bpm/bpm-processes/diagram/definition/${definition}`; $scope.state.isBusy = false; }; $scope.loadInstanceImageLink = function (instance) { - $scope.imageLink = `/services/ide/bpm/bpm-processes/diagram/instance/${instance}`; + $scope.imageLink = `/services/bpm/bpm-processes/diagram/instance/${instance}`; $scope.state.isBusy = false; }; diff --git a/components/ide/ide-ui-bpm-workspace/src/main/resources/META-INF/dirigible/ide-bpm-workspace/js/bpm-process-context.js b/components/ide/ide-ui-bpm-workspace/src/main/resources/META-INF/dirigible/ide-bpm-workspace/js/bpm-process-context.js index f516d208efe..7ae12590759 100644 --- a/components/ide/ide-ui-bpm-workspace/src/main/resources/META-INF/dirigible/ide-bpm-workspace/js/bpm-process-context.js +++ b/components/ide/ide-ui-bpm-workspace/src/main/resources/META-INF/dirigible/ide-bpm-workspace/js/bpm-process-context.js @@ -21,7 +21,7 @@ ideBpmProcessContextView.controller('IDEBpmProcessContextViewController', ['$sco $scope.currentProcessInstanceId = null; $scope.selectedVariable = null; $scope.disableModificationButtons = false; - $scope.servicePath = '/services/ide/bpm/bpm-processes/instance/' + $scope.servicePath = '/services/bpm/bpm-processes/instance/' $scope.selectionChanged = function (variable) { $scope.variablesList.forEach(variable => variable.selected = false); @@ -42,7 +42,7 @@ ideBpmProcessContextView.controller('IDEBpmProcessContextViewController', ['$sco } $scope.upsertProcessVariable = function(processInstanceId, varName, varValue, dialogId) { - const apiUrl = '/services/ide/bpm/bpm-processes/instance/' + processInstanceId + '/variables'; + const apiUrl = '/services/bpm/bpm-processes/instance/' + processInstanceId + '/variables'; const requestBody = { 'name': varName, 'value': varValue }; $http({ @@ -155,7 +155,7 @@ ideBpmProcessContextView.controller('IDEBpmProcessContextViewController', ['$sco $scope.$apply(function () { $scope.currentProcessInstanceId = processInstanceId; $scope.disableModificationButtons = false - $scope.servicePath = '/services/ide/bpm/bpm-processes/instance/' + $scope.servicePath = '/services/bpm/bpm-processes/instance/' }); $scope.fetchData(processInstanceId); }); @@ -165,7 +165,7 @@ ideBpmProcessContextView.controller('IDEBpmProcessContextViewController', ['$sco $scope.$apply(function () { $scope.currentProcessInstanceId = processInstanceId; $scope.disableModificationButtons = true - $scope.servicePath = '/services/ide/bpm/bpm-processes/historic-instances/' + $scope.servicePath = '/services/bpm/bpm-processes/historic-instances/' }); $scope.fetchData(processInstanceId); }); diff --git a/components/ide/ide-ui-bpm-workspace/src/main/resources/META-INF/dirigible/ide-bpm-workspace/js/bpm-process-definitions.js b/components/ide/ide-ui-bpm-workspace/src/main/resources/META-INF/dirigible/ide-bpm-workspace/js/bpm-process-definitions.js index d85032ab9ea..21471dac2cf 100644 --- a/components/ide/ide-ui-bpm-workspace/src/main/resources/META-INF/dirigible/ide-bpm-workspace/js/bpm-process-definitions.js +++ b/components/ide/ide-ui-bpm-workspace/src/main/resources/META-INF/dirigible/ide-bpm-workspace/js/bpm-process-definitions.js @@ -40,7 +40,7 @@ ideBpmProcessDefinitionsView.controller('IDEBpmProcessDefinitionsViewController' return; } - $http.get('/services/ide/bpm/bpm-processes/definitions', { params: { 'condition': this.filterBy, 'limit': limit } }) + $http.get('/services/bpm/bpm-processes/definitions', { params: { 'condition': this.filterBy, 'limit': limit } }) .then((response) => { if (this.definitionsList.length < response.data.length) { //messageHub.showAlertInfo("User definitions", "A new user task has been added"); diff --git a/components/ide/ide-ui-bpm-workspace/src/main/resources/META-INF/dirigible/ide-bpm-workspace/js/bpm-process-instances.js b/components/ide/ide-ui-bpm-workspace/src/main/resources/META-INF/dirigible/ide-bpm-workspace/js/bpm-process-instances.js index 028506cbdac..163ff6211c4 100644 --- a/components/ide/ide-ui-bpm-workspace/src/main/resources/META-INF/dirigible/ide-bpm-workspace/js/bpm-process-instances.js +++ b/components/ide/ide-ui-bpm-workspace/src/main/resources/META-INF/dirigible/ide-bpm-workspace/js/bpm-process-instances.js @@ -42,7 +42,7 @@ ideBpmProcessInstancesView.controller('IDEBpmProcessInstancesViewController', [' return; } - $http.get('/services/ide/bpm/bpm-processes/instances', { params: { 'id': this.searchText, 'key': this.selectedProcessDefinitionKey, 'limit': 100 } }) + $http.get('/services/bpm/bpm-processes/instances', { params: { 'id': this.searchText, 'key': this.selectedProcessDefinitionKey, 'limit': 100 } }) .then((response) => { if (this.instancesList.length < response.data.length) { //messageHub.showAlertInfo("User instances", "A new user task has been added"); @@ -73,7 +73,7 @@ ideBpmProcessInstancesView.controller('IDEBpmProcessInstancesViewController', [' } this.executeAction = function(requestBody, actionName) { - const apiUrl = '/services/ide/bpm/bpm-processes/instance/' + this.selectedProcessInstanceId; + const apiUrl = '/services/bpm/bpm-processes/instance/' + this.selectedProcessInstanceId; $http({ method: 'POST', @@ -132,7 +132,7 @@ ideBpmProcessInstancesView.controller('IDEBpmProcessInstancesViewController', [' } this.applyFilter = function () { - $http.get('/services/ide/bpm/bpm-processes/instances', { params: { 'id': this.searchText, 'key': this.selectedProcessDefinitionKey, 'limit': 100 } }) + $http.get('/services/bpm/bpm-processes/instances', { params: { 'id': this.searchText, 'key': this.selectedProcessDefinitionKey, 'limit': 100 } }) .then((response) => { this.instancesList = response.data; }); diff --git a/components/ide/ide-ui-bpm-workspace/src/main/resources/META-INF/dirigible/ide-bpm-workspace/js/bpm-process-jobs.js b/components/ide/ide-ui-bpm-workspace/src/main/resources/META-INF/dirigible/ide-bpm-workspace/js/bpm-process-jobs.js index b1b32a634e3..b51a396e435 100644 --- a/components/ide/ide-ui-bpm-workspace/src/main/resources/META-INF/dirigible/ide-bpm-workspace/js/bpm-process-jobs.js +++ b/components/ide/ide-ui-bpm-workspace/src/main/resources/META-INF/dirigible/ide-bpm-workspace/js/bpm-process-jobs.js @@ -25,7 +25,7 @@ ideBpmProcessJobsView.controller('IDEBpmProcessJobsViewController', ['$scope', ' }; $scope.fetchData = function(processInstanceId) { - $http.get('/services/ide/bpm/bpm-processes/instance/' + processInstanceId + '/jobs', { params: { 'limit': 100 } }) + $http.get('/services/bpm/bpm-processes/instance/' + processInstanceId + '/jobs', { params: { 'limit': 100 } }) .then((response) => { $scope.jobsList = response.data; }); diff --git a/components/ide/ide-ui-bpm-workspace/src/main/resources/META-INF/dirigible/ide-bpm-workspace/js/bpm-tasks.js b/components/ide/ide-ui-bpm-workspace/src/main/resources/META-INF/dirigible/ide-bpm-workspace/js/bpm-tasks.js index 0184318028f..53df0e28b31 100644 --- a/components/ide/ide-ui-bpm-workspace/src/main/resources/META-INF/dirigible/ide-bpm-workspace/js/bpm-tasks.js +++ b/components/ide/ide-ui-bpm-workspace/src/main/resources/META-INF/dirigible/ide-bpm-workspace/js/bpm-tasks.js @@ -30,12 +30,12 @@ tasksView.controller('TasksController', ['$scope','$http', '$timeout', 'messageH }; $scope.fetchData = function(processInstanceId) { - $http.get('/services/ide/bpm/bpm-processes/instance/' + processInstanceId + '/tasks?type=groups', { params: { 'limit': 100 } }) + $http.get('/services/bpm/bpm-processes/instance/' + processInstanceId + '/tasks?type=groups', { params: { 'limit': 100 } }) .then((response) => { $scope.tasksList = response.data; }); - $http.get('/services/ide/bpm/bpm-processes/instance/' + processInstanceId + '/tasks?type=assignee', { params: { 'limit': 100 } }) + $http.get('/services/bpm/bpm-processes/instance/' + processInstanceId + '/tasks?type=assignee', { params: { 'limit': 100 } }) .then((response) => { $scope.tasksListAssignee = response.data; }); @@ -70,7 +70,7 @@ tasksView.controller('TasksController', ['$scope','$http', '$timeout', 'messageH } $scope.executeAction = function(taskId, requestBody, actionName, clearCallback) { - const apiUrl = '/services/ide/bpm/bpm-processes/tasks/' + taskId; + const apiUrl = '/services/bpm/bpm-processes/tasks/' + taskId; $http({ method: 'POST', diff --git a/components/ide/ide-ui-bpm/src/main/resources/META-INF/dirigible/ide-bpm/scripts/app-cfg.js b/components/ide/ide-ui-bpm/src/main/resources/META-INF/dirigible/ide-bpm/scripts/app-cfg.js index a54a228c2c3..e7df4551a8d 100644 --- a/components/ide/ide-ui-bpm/src/main/resources/META-INF/dirigible/ide-bpm/scripts/app-cfg.js +++ b/components/ide/ide-ui-bpm/src/main/resources/META-INF/dirigible/ide-bpm/scripts/app-cfg.js @@ -19,7 +19,7 @@ var FLOWABLE = FLOWABLE || {}; FLOWABLE.CONFIG = { 'onPremise': true, - 'contextRoot': '/services/ide/bpm', + 'contextRoot': '/services/bpm', 'webContextRoot': '/services/web/ide-bpm', 'datesLocalization': false }; \ No newline at end of file diff --git a/components/resources/resources-inbox/src/main/resources/META-INF/dirigible/inbox/ui/launchpad/Home/controller.js b/components/resources/resources-inbox/src/main/resources/META-INF/dirigible/inbox/ui/launchpad/Home/controller.js index 5cfce4ec99d..da68bd5284a 100644 --- a/components/resources/resources-inbox/src/main/resources/META-INF/dirigible/inbox/ui/launchpad/Home/controller.js +++ b/components/resources/resources-inbox/src/main/resources/META-INF/dirigible/inbox/ui/launchpad/Home/controller.js @@ -46,12 +46,12 @@ angular.module('page', ["ideUI", "ideView", "entityApi"]) }; $scope.fetchData = function() { - $http.get('/services/ide/bpm/bpm-processes/tasks?type=groups', { params: { 'limit': 100 } }) + $http.get('/services/bpm/bpm-processes/tasks?type=groups', { params: { 'limit': 100 } }) .then((response) => { $scope.tasksList = response.data; }); - $http.get('/services/ide/bpm/bpm-processes/tasks?type=assignee', { params: { 'limit': 100 } }) + $http.get('/services/bpm/bpm-processes/tasks?type=assignee', { params: { 'limit': 100 } }) .then((response) => { $scope.tasksListAssignee = response.data; }); @@ -78,7 +78,7 @@ angular.module('page', ["ideUI", "ideView", "entityApi"]) } $scope.executeAction = function(taskId, requestBody, actionName, clearCallback) { - const apiUrl = '/services/ide/bpm/bpm-processes/tasks/' + taskId; + const apiUrl = '/services/bpm/bpm-processes/tasks/' + taskId; $http({ method: 'POST',