Determine Masterportal configuration file name based on user groups; remove user plugin

Author: tkleinke

Makefile

@@ -20,7 +20,6 @@ build: clean buildinfojson
 	cd src/webfrontend && npm run bundle
 	cp src/webfrontend/contentLoaderBundle.js build/$(PLUGIN_NAME)/webfrontend/$(PLUGIN_NAME).js
 	cat src/webfrontend/js/customDataType/main.js >> build/$(PLUGIN_NAME)/webfrontend/${PLUGIN_NAME}.js
-	cat src/webfrontend/js/userPlugin/userPlugin.js >> build/$(PLUGIN_NAME)/webfrontend/${PLUGIN_NAME}.js
 	rm src/webfrontend/contentLoaderBundle.js
 
 	cp src/server/${SERVER_FILE} build/${PLUGIN_NAME}/server/${SERVER_FILE}

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

@@ -26,8 +26,6 @@ custom.data.type.nfis.geometry.placeholder.empty,Keine Geometrien vorhanden,No g
 custom.data.type.nfis.geometry.config.parameter.schema.multi_select.value.label,Mehrfachauswahl,Multi selection
 custom.data.type.nfis.geometry.config.parameter.schema.multi_select.value.checkbox,Erlauben,Allow
 custom.data.type.nfis.geometry.config.parameter.mask.value.value.label,Nicht ausfüllen,Do not fill in
-userPlugin.nfisGeometry.masterportalConfiguration.label,Konfiguration,Configuration
-userPlugin.nfisGeometry.masterportalConfiguration.default,Standard,Default
 server.config.name.system.nfisGeoservices,Geometrieverknüpfung per WFS-T und Masterportal,Geometry link via WFS-T and Masterportal
 server.config.parameter.system.nfisGeoservices.masterportal_url.label,Masterportal-URL,Masterportal URL
 server.config.parameter.system.nfisGeoservices.masterportal_version.label,Masterportal-Version,Masterportal version
@@ -83,8 +81,7 @@ server.config.parameter.system.nfisGeoservices.linked_objects.label,Verknüpfte
 server.config.parameter.system.nfisGeoservices.linked_objects.object_type.label,Objekttyp,Object type
 server.config.parameter.system.nfisGeoservices.linked_objects.link_field_name.label,Name des Verknüpfungsfeldes (inkl. Pfad),Link field name (including path)
 server.config.parameter.system.nfisGeoservices.masterportal_configurations.label,Masterportal-Konfigurationen,Masterportal configurations
-server.config.parameter.system.nfisGeoservices.masterportal_configurations.id.label,Identifier,Identifier
-server.config.parameter.system.nfisGeoservices.masterportal_configurations.name.label,Bezeichnung,Name
+server.config.parameter.system.nfisGeoservices.masterportal_configurations.group_id.label,Benutzergruppen-ID,User group ID
 server.config.parameter.system.nfisGeoservices.masterportal_configurations.file_name.label,Name der Konfigurationsdatei,Name of configuration file
 server.config.option.system.nfisGeoservices.masterportal_version.2,2,2
 server.config.option.system.nfisGeoservices.masterportal_version.3,3,3

manifest.master.yml

@@ -189,15 +189,12 @@ base_config:
       masterportal_configurations:
         type: table
         fields:
-          - name: id
-            type: text
+          - name: group_id
+            type: int
             position: 0
-          - name: name
-            type: text
-            position: 1
           - name: file_name
             type: text
-            position: 2
+            position: 1
         position: 17
 
 callbacks:

src/webfrontend/js/customDataType/contentLoader.js

@@ -651,11 +651,9 @@ function getMasterportalUrl() {
 }
 
 function getConfigurationFileName() {
-    const configurationId = getUserConfiguration().masterportal_configuration;
-    if (!configurationId?.length) return undefined;
-    
-    const configuration = getBaseConfiguration().masterportal_configurations?.find(entry => entry.id === configurationId);
-    return configuration?.file_name;
+    return getBaseConfiguration().masterportal_configurations?.find(entry => {
+        return !entry.group_id || getUserGroupIds().includes(entry.group_id);
+    })?.file_name;
 }
 
 function getGeometryIdFieldName() {
@@ -675,10 +673,6 @@ function getFieldConfiguration(objectType, fieldPath) {
         ?.geometry_fields.find(fieldConfiguraton => fieldConfiguraton.field_path === fieldPath);
 }
 
-function getUserConfiguration() {
-    return ez5.session.user.opts.user.user.custom_data;
-}
-
 function getUserGroupIds() {
     return ez5.session.user.data.__group_ids;
 }