Merge pull request #54 from SoftwareAG/develop

Develop
Cumulocity-IoT · Oct 21, 2023 · 79b1a83 · 79b1a83
2 parents 22b20c3 + 261358e
commit 79b1a83
Show file tree

Hide file tree

Showing 22 changed files with 7 additions and 5 deletions.
diff --git a/mqtt-mapping-service/pom.xml b/mqtt-mapping-service/pom.xml
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>com.jayway.jsonpath</groupId>
             <artifactId>json-path</artifactId>
-            <version>2.6.0</version>
+            <version>2.7.0</version>
         </dependency>
 
         <dependency>

diff --git a/mqtt-mapping-service/src/main/java/mqtt/mapping/rest/MQTTMappingRestController.java b/mqtt-mapping-service/src/main/java/mqtt/mapping/rest/MQTTMappingRestController.java
@@ -389,7 +389,7 @@ public ResponseEntity<Extension> deleteProcessorExtension(@PathVariable String e
     }
 
     private boolean userHasMQTTMappingAdminRole() {
-        return !userRolesEnabled || (userRolesEnabled && roleService.getUserRoles().contains(mqttMappingCreateRole));
+        return !userRolesEnabled || (userRolesEnabled && roleService.getUserRoles().contains(mqttMappingAdminRole));
     }
 
     private boolean userHasMQTTMappingCreateRole() {

diff --git a/mqtt-mapping-ui/mqtt-mapping/package.json b/mqtt-mapping-ui/mqtt-mapping/package.json
@@ -8,7 +8,7 @@
   },
   "scripts": {
     "start": "c8ycli server",
-    "start:admin": "npm start -- --shell administration-1017 ",
+    "start:admin": "npm start -- --shell administration",
     "build": "c8ycli build",
     "deploy": "c8ycli deploy",
     "postinstall": "ngcc"

diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,9 @@
   ~ @authors Christof Strack, Stefan Witschel
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.softwareag.c8y.mqtt</groupId>
@@ -68,7 +70,7 @@
                 <artifactId>jackson-datatype-joda</artifactId>
                 <version>2.12.7</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>com.jayway.jsonpath</groupId>
                 <artifactId>json-path</artifactId>

diff --git a/resources/image/Generic_MQTT_AddMapping.png b/resources/image/Generic_MQTT_AddMapping.png
diff --git a/resources/image/Generic_MQTT_EnableSnooping.png b/resources/image/Generic_MQTT_EnableSnooping.png
diff --git a/resources/image/Generic_MQTT_MappingTable.png b/resources/image/Generic_MQTT_MappingTable.png
diff --git a/resources/image/Generic_MQTT_MappingTable_annotated.png b/resources/image/Generic_MQTT_MappingTable_annotated.png
diff --git a/resources/image/Generic_MQTT_MappingTemplate.png b/resources/image/Generic_MQTT_MappingTemplate.png
diff --git a/resources/image/Generic_MQTT_MappingTemplate_Outbound_subscription.png b/resources/image/Generic_MQTT_MappingTemplate_Outbound_subscription.png
diff --git a/resources/image/Generic_MQTT_MappingTemplate_ProtobufMessage.png b/resources/image/Generic_MQTT_MappingTemplate_ProtobufMessage.png
diff --git a/resources/image/Generic_MQTT_MappingTemplate_ProtobufMessage_annnotated.png b/resources/image/Generic_MQTT_MappingTemplate_ProtobufMessage_annnotated.png
diff --git a/resources/image/Generic_MQTT_MappingTemplate_SchemaValidation_annnotated.png b/resources/image/Generic_MQTT_MappingTemplate_SchemaValidation_annnotated.png
diff --git a/resources/image/Generic_MQTT_MappingTemplate_Snooping_annnotated.png b/resources/image/Generic_MQTT_MappingTemplate_Snooping_annnotated.png
diff --git a/resources/image/Generic_MQTT_MappingTemplate_annnotated.png b/resources/image/Generic_MQTT_MappingTemplate_annnotated.png
diff --git a/resources/image/Generic_MQTT_SendTestMessageToCumulocity.png b/resources/image/Generic_MQTT_SendTestMessageToCumulocity.png
diff --git a/resources/image/Generic_MQTT_TestTransformation.png b/resources/image/Generic_MQTT_TestTransformation.png
diff --git a/resources/image/Generic_MQTT_TopicDefinition.png b/resources/image/Generic_MQTT_TopicDefinition.png
diff --git a/resources/image/Generic_MQTT_TopicDefinition_Outbound.png b/resources/image/Generic_MQTT_TopicDefinition_Outbound.png
diff --git a/resources/image/Generic_MQTT_TopicDefinition_ReadOnly.png b/resources/image/Generic_MQTT_TopicDefinition_ReadOnly.png
diff --git a/resources/image/Generic_MQTT_UI_AdminRole_Tabs.png b/resources/image/Generic_MQTT_UI_AdminRole_Tabs.png
diff --git a/resources/image/Generic_MQTT_UI_CreateRole_Tabs.png b/resources/image/Generic_MQTT_UI_CreateRole_Tabs.png