Replace configuration option for specifying allowed pool names with option for specifying pool names to be used for data transfer

Author: tkleinke

README.md

@@ -51,7 +51,7 @@ make
            * *Name of field in fylr object*: The source field that contains the data to be transferred
            * *JavaScript function for reading the value from the fylr object*: Alternatively to specifying a field name, a custom JavaScript function body for reading the value from the fylr object can be entered. The object data can be accessed via the variable "object" (e. g. "return object._id;")
         * *WFS target field for pool name* The field of the WFS where the name of the pool that the fylr object belongs to should be stored
-        * *Allowed pool names for data transfer*: Data is only transferred if the fylr object belongs to a pool with one of the specified pool names
+        * *Pool names for data transfer*: This field can be used to define the level of the pool hierarchy that should be used for writing the pool name into the WFS target field. If the pool that the fylr object belongs to is a child of one of these pools, the pool (of the higher hierarchy level) specified here is used. Otherwise, the actual pool is used.
 
 ### Data model configuration
 

l10n/custom-data-type-nfis-geometry.csv

@@ -50,5 +50,5 @@ server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields
 server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.fields.fylr_field_name.label,Name des Feldes im fylr-Objekt (inkl. Pfad),Name of field in fylr object (including path)
 server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.fields.fylr_function.label,JavaScript-Funktion zum Auslesen des Wertes aus dem fylr-Objekt (Alternative zur Angabe des Feldnamens),JavaScript function for reading the value from the fylr object (Alternative to specifying the field name)
 server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.wfs_pool_field.label,WFS-Zielfeld für die Poolbezeichnung,WFS target field for pool name
-server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.allowed_pool_names.label,Erlaubte Poolbezeichnungen für Datenübertragung,Allowed pool names for data transfer
+server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.pool_names.label,Poolbezeichnungen für Datenübertragung,Pool names for data transfer
 base.error.realm.multipleGeometryLinking,Mehrfachverknüpfung von Geometrien nicht erlaubt,Multiple linking of geometries not permitted

manifest.master.yml

@@ -110,10 +110,10 @@ base_config:
               - name: wfs_pool_field
                 type: text
                 position: 12
-              - name: allowed_pool_names
+              - name: pool_names
                 type: table
                 fields:
-                  - name: allowed_pool_name
+                  - name: pool_name
                     type: text
                     position: 0
                 position: 13

src/server/sendDataToGeoserver.js

@@ -183,9 +183,8 @@ function getGeometryFieldPaths(configuration) {
 }
 
 async function editGeometries(object, fieldConfiguration, geometryIds, authorizationString) {
-    const poolName = getPoolName(object, fieldConfiguration);
-    if (isSendingDataToGeoserverActivated(fieldConfiguration, geometryIds, poolName)) {
-        const changeMap = getChangeMap(object, fieldConfiguration, poolName);
+    if (isSendingDataToGeoserverActivated(fieldConfiguration, geometryIds)) {
+        const changeMap = getChangeMap(object, fieldConfiguration);
         if (Object.keys(changeMap).length) {
             await performEditTransaction(geometryIds, changeMap, fieldConfiguration, authorizationString);
         }
@@ -203,34 +202,15 @@ function getDeletedGeometryIds(geometryIds, currentObject, fieldConfiguration) {
     return currentGeometryIds.filter(geometryId => !geometryIds.includes(geometryId));
 }
 
-function isSendingDataToGeoserverActivated(fieldConfiguration, geometryIds, poolName) {
+function isSendingDataToGeoserverActivated(fieldConfiguration, geometryIds) {
     return fieldConfiguration.send_data_to_geoserver?.ValueBool
         && fieldConfiguration.edit_wfs_url?.ValueText
-        && geometryIds?.length
-        && poolName !== undefined;
-}
-
-function getPoolName(object, fieldConfiguration) {
-    if (!object._pool) return undefined;
-
-    const allowedPoolNames = getAllowedPoolNames(fieldConfiguration);
-    for (let entry of object._pool._path) {
-        const poolName = entry.pool.name?.['de-DE'];
-        if (allowedPoolNames.includes(poolName)) return poolName;
-    }
-
-    return undefined;
-}
-
-function getAllowedPoolNames(fieldConfiguration) {
-    return fieldConfiguration.allowed_pool_names?.ValueTable?.map(entry => {
-        return entry.allowed_pool_name.ValueText;
-    }) ?? [];
+        && geometryIds?.length;
 }
 
-function getChangeMap(object, fieldConfiguration, poolName) {
+function getChangeMap(object, fieldConfiguration) {
     const changeMap = {};
-    addPoolFieldToChangeMap(fieldConfiguration, poolName, changeMap);
+    addPoolFieldToChangeMap(object, fieldConfiguration, changeMap);
 
     const fields = fieldConfiguration.fields?.ValueTable ?? [];
     return fields.reduce((result, field) => {
@@ -269,11 +249,30 @@ function getValueFromCustomFunction(object, functionDefinition) {
     return customFunction(object);
 }
 
-function addPoolFieldToChangeMap(fieldConfiguration, poolName, changeMap) {
+function addPoolFieldToChangeMap(object, fieldConfiguration, changeMap) {
     const targetFieldName = fieldConfiguration.wfs_pool_field.ValueText;
     if (!targetFieldName) return;
 
-    changeMap[targetFieldName] = poolName;
+    const poolName = getPoolName(object, fieldConfiguration);
+    if (poolName) changeMap[targetFieldName] = poolName;
+}
+
+function getPoolName(object, fieldConfiguration) {
+    if (!object._pool) return undefined;
+
+    const poolNames = getPoolNamesForDataTransfer(fieldConfiguration);
+    for (let entry of object._pool._path) {
+        const poolName = entry.pool.name?.['de-DE'];
+        if (poolNames.includes(poolName)) return poolName;
+    }
+
+    return object._pool.pool?.name?.['de-DE'];
+}
+
+function getPoolNamesForDataTransfer(fieldConfiguration) {
+    return fieldConfiguration.pool_names?.ValueTable?.map(entry => {
+        return entry.pool_name.ValueText;
+    }) ?? [];
 }
 
 function addToChangeMap(wfsFieldName, fieldValue, changeMap) {