Skip to content

Commit 197a44f

Browse files
tkleinketkleinke
committed
Allow selecting custom Masterportal configurations in user settings; available configuration files can be configured in base configuration
1 parent a8a99b4 commit 197a44f

7 files changed

Lines changed: 119 additions & 8 deletions

File tree

‎Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ build: clean buildinfojson
1818

1919
cd src/webfrontend && npm run bundle
2020
cp src/webfrontend/contentLoaderBundle.js build/$(PLUGIN_NAME)/webfrontend/$(PLUGIN_NAME).js
21-
cat src/webfrontend/js/main.js >> build/$(PLUGIN_NAME)/webfrontend/${PLUGIN_NAME}.js
21+
cat src/webfrontend/js/customDataType/main.js >> build/$(PLUGIN_NAME)/webfrontend/${PLUGIN_NAME}.js
22+
cat src/webfrontend/js/userPlugin/userPlugin.js >> build/$(PLUGIN_NAME)/webfrontend/${PLUGIN_NAME}.js
2223
rm src/webfrontend/contentLoaderBundle.js
2324

2425
cp src/server/${SERVER_FILE} build/${PLUGIN_NAME}/server/${SERVER_FILE}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ custom.data.type.nfis.geometry.placeholder.empty,Keine Geometrien vorhanden,No g
2424
custom.data.type.nfis.geometry.config.parameter.schema.multi_select.value.label,Mehrfachauswahl,Multi selection
2525
custom.data.type.nfis.geometry.config.parameter.schema.multi_select.value.checkbox,Erlauben,Allow
2626
custom.data.type.nfis.geometry.config.parameter.mask.value.value.label,Nicht ausfüllen,Do not fill in
27+
userPlugin.nfisGeometry.masterportalConfiguration.label,Konfiguration,Configuration
28+
userPlugin.nfisGeometry.masterportalConfiguration.default,Standard,Default
2729
server.config.name.system.nfisGeoservices,Geometrieverknüpfung per WFS-T und Masterportal,Geometry link via WFS-T and Masterportal
2830
server.config.parameter.system.nfisGeoservices.masterportal_url.label,Masterportal-URL,Masterportal URL
2931
server.config.parameter.system.nfisGeoservices.geoserver_read_username.label,Geoserver-Account (nur Leserechte): Username,Geoserver account (read only): User name
@@ -53,4 +55,8 @@ server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields
5355
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)
5456
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
5557
server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.pool_names.label,Poolbezeichnungen für Datenübertragung,Pool names for data transfer
58+
server.config.parameter.system.nfisGeoservices.masterportal_configurations.label,Masterportal-Konfigurationen,Masterportal configurations
59+
server.config.parameter.system.nfisGeoservices.masterportal_configurations.id.label,Identifier,Identifier
60+
server.config.parameter.system.nfisGeoservices.masterportal_configurations.name.label,Bezeichnung,Name
61+
server.config.parameter.system.nfisGeoservices.masterportal_configurations.file_name.label,Name der Konfigurationsdatei,Name of configuration file
5662
base.error.realm.multipleGeometryLinking,Mehrfachverknüpfung von Geometrien nicht erlaubt,Multiple linking of geometries not permitted

‎manifest.master.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,19 @@ base_config:
123123
position: 13
124124
position: 1
125125
position: 5
126+
masterportal_configurations:
127+
type: table
128+
fields:
129+
- name: id
130+
type: text
131+
position: 0
132+
- name: name
133+
type: text
134+
position: 1
135+
- name: file_name
136+
type: text
137+
position: 2
138+
position: 6
126139

127140
callbacks:
128141
db_pre_save:

src/webfrontend/js/contentLoader.js renamed to src/webfrontend/js/customDataType/contentLoader.js

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -560,19 +560,18 @@ function configureCursor(map) {
560560
}
561561

562562
function getViewGeometriesUrl(settings, wfsData, extent) {
563-
const masterportalUrl = getBaseConfiguration().masterportal_url;
563+
const url = getMasterportalUrl();
564564
const layerIds = getMasterportalLayerIds(settings.fieldConfiguration, wfsData);
565-
if (!masterportalUrl || !layerIds.length) return '';
565+
if (!url || !layerIds.length) return '';
566566

567-
return masterportalUrl + '?zoomToExtent=' + extent.join(',') + '&layerids=' + layerIds.join(',');
567+
return url + 'zoomToExtent=' + extent.join(',') + '&layerids=' + layerIds.join(',');
568568
}
569569

570570
function getEditGeometryUrl(settings, wfsData, extent) {
571-
const masterportalUrl = getBaseConfiguration().masterportal_url;
571+
let url = getMasterportalUrl();
572572
const layerIds = getMasterportalLayerIds(settings.fieldConfiguration, wfsData);
573-
if (!masterportalUrl || !layerIds.length) return '';
573+
if (!url || !layerIds.length) return '';
574574

575-
let url = masterportalUrl + '?';
576575
if (extent) url += 'zoomToExtent=' + extent.join(',') + '&';
577576
return url + 'isinitopen=wfst&layerids=' + layerIds.join(',');
578577
}
@@ -612,6 +611,25 @@ function getMasterportalVectorLayerIds(fieldConfiguration, wfsData, includeAll)
612611
}
613612
}
614613

614+
function getMasterportalUrl() {
615+
let masterportalUrl = getBaseConfiguration().masterportal_url;
616+
if (!masterportalUrl) return undefined;
617+
618+
const configurationFileName = getConfigurationFileName();
619+
return configurationFileName
620+
? masterportalUrl + '?configJson=' + configurationFileName + '&'
621+
: masterportalUrl + '?';
622+
}
623+
624+
function getConfigurationFileName() {
625+
626+
const configurationId = getUserConfiguration().masterportal_configuration;
627+
if (!configurationId?.length) return undefined;
628+
629+
const configuration = getBaseConfiguration().masterportal_configurations?.find(entry => entry.id === configurationId);
630+
return configuration?.file_name;
631+
}
632+
615633
function getWfsUrl(settings, geometryIds) {
616634
let baseUrl = settings.fieldConfiguration.display_wfs_url;
617635
const featureType = settings.fieldConfiguration.display_wfs_feature_type;
@@ -642,3 +660,7 @@ function getFieldConfiguration(objectType, fieldPath) {
642660
return getBaseConfiguration().wfs_configuration.find(objectConfiguration => objectConfiguration.object_type === objectType)
643661
?.geometry_fields.find(fieldConfiguraton => fieldConfiguraton.field_path === fieldPath);
644662
}
663+
664+
function getUserConfiguration() {
665+
return ez5.session.user.opts.user.user.custom_data;
666+
}

src/webfrontend/js/main.js renamed to src/webfrontend/js/customDataType/main.js

File renamed without changes.

‎src/webfrontend/js/userPlugin/userPlugin.js‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
var extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
2+
var hasProp = {}.hasOwnProperty;
3+
4+
var UserPluginNFISGeometry = (function(superClass) {
5+
extend(UserPluginNFISGeometry, superClass);
6+
7+
function UserPluginNFISGeometry() {
8+
return UserPluginNFISGeometry.__super__.constructor.apply(this, arguments);
9+
}
10+
11+
const Plugin = UserPluginNFISGeometry.prototype;
12+
13+
Plugin.getTabs = function(tabs) {
14+
const options = this.__getOptions();
15+
if (!options) return;
16+
17+
tabs.push({
18+
name: 'masterportal',
19+
text: 'Masterportal',
20+
content: () => {
21+
form = new CUI.Form({
22+
data: this._user.data.user,
23+
name: 'custom_data',
24+
fields: [{
25+
type: CUI.Select,
26+
name: 'masterportal_configuration',
27+
form: {
28+
label: $$('userPlugin.nfisGeometry.masterportalConfiguration.label')
29+
},
30+
options
31+
}]
32+
});
33+
return form.start();
34+
}
35+
});
36+
}
37+
38+
Plugin.getSaveData = function(saveData) {
39+
saveData.user.custom_data.masterportal_configuration = this._user.data.user.custom_data.masterportal_configuration;
40+
}
41+
42+
Plugin.isAllowed = function() {
43+
return true;
44+
}
45+
46+
Plugin.__getOptions = function() {
47+
const configurations = this.__getBaseConfiguration().masterportal_configurations;
48+
if (!configurations?.length) return undefined;
49+
50+
const options = [
51+
{ value: '', text: $$('userPlugin.nfisGeometry.masterportalConfiguration.default') }
52+
];
53+
54+
return options.concat(
55+
configurations.map(configuration => {
56+
return { value: configuration.id, text: configuration.name };
57+
})
58+
);
59+
}
60+
61+
Plugin.__getBaseConfiguration = function() {
62+
return ez5.session.getBaseConfig('plugin', 'custom-data-type-nfis-geometry')['nfisGeoservices'];
63+
}
64+
65+
return UserPluginNFISGeometry;
66+
})(ez5.UserPlugin);
67+
68+
69+
User.plugins.registerPlugin(UserPluginNFISGeometry);

‎src/webfrontend/rollup.config.mjs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import terser from '@rollup/plugin-terser';
44

55

66
export default {
7-
input: 'js/contentLoader.js',
7+
input: 'js/customDataType/contentLoader.js',
88
output: [
99
{ file: 'contentLoaderBundle.js', format: 'iife', name: 'ContentLoader' }
1010
],

0 commit comments

Comments
 (0)