FR#4012: Change the namespace of the BpmFlowableEndpoint spring endpo…

…int (#4028) * FR#4012: Change prefix for BPM endpoint * FR#4012: Remove slash at the end of the prefix
eclipse · Jun 13, 2024 · 6351a88 · 6351a88
1 parent b03185a
commit 6351a88
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 21 deletions.
diff --git a/.../core-base/src/main/java/org/eclipse/dirigible/components/base/endpoint/BaseEndpoint.java b/.../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/...n/java/org/eclipse/dirigible/components/base/http/access/HttpSecurityURIConfigurator.java b/...n/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/...va/org/eclipse/dirigible/components/engine/bpm/flowable/endpoint/BpmFlowableEndpoint.java b/...va/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/.../main/resources/META-INF/dirigible/ide-bpm-workspace/js/bpm-historic-process-instances.js b/.../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/...-workspace/src/main/resources/META-INF/dirigible/ide-bpm-workspace/js/bpm-image-viewer.js b/...-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/...rkspace/src/main/resources/META-INF/dirigible/ide-bpm-workspace/js/bpm-process-context.js b/...rkspace/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/...ace/src/main/resources/META-INF/dirigible/ide-bpm-workspace/js/bpm-process-definitions.js b/...ace/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/...space/src/main/resources/META-INF/dirigible/ide-bpm-workspace/js/bpm-process-instances.js b/...space/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/...-workspace/src/main/resources/META-INF/dirigible/ide-bpm-workspace/js/bpm-process-jobs.js b/...-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/...-ui-bpm-workspace/src/main/resources/META-INF/dirigible/ide-bpm-workspace/js/bpm-tasks.js b/...-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
@@ -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
 };
diff --git a/...sources-inbox/src/main/resources/META-INF/dirigible/inbox/ui/launchpad/Home/controller.js b/...sources-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',