Feature/enable dbsimm support

Component/SchemaFilter.php

@@ -68,15 +68,15 @@ public function prepareConfigs($schemaConfigs)
             $haveDs = false;
             foreach (array('dataStore', 'featureType') as $dsKey) {
                 if (\array_key_exists($dsKey, $schemaConfig)) {
-                    $schemaConfig[$dsKey] = $storeConfigs[$schemaName];
+                    $schemaConfig[$dsKey] = $storeConfigs[$schemaConfig[$dsKey]];
                     $haveDs = true;
                 }
             }
             if (!$haveDs) {
                 throw new ConfigurationErrorException("No dataStore / featureType in schema {$schemaName}");
             }
             if (!empty($schemaConfig['formItems'])) {
-                $schemaConfig['formItems'] = $this->formItemFilter->prepareItems($schemaConfig['formItems']);
+                $schemaConfig['formItems'] = $this->prepareFormItems($schemaConfig);
             } else {
                 @trigger_error("WARNING: no formItems in schema {$schemaName}. Object detail view will not work", E_USER_DEPRECATED);
                 $schemaConfig['formItems'] = array();
@@ -86,6 +86,11 @@ public function prepareConfigs($schemaConfigs)
         return $schemaConfigs;
     }
 
+
+    protected function  prepareFormItems($schemaConfig) {
+        return $this->formItemFilter->prepareItems($schemaConfig['formItems']);
+    }
+
     /**
      * @param Element $element
      * @param string $schemaName
@@ -143,7 +148,8 @@ public function getDataStoreConfig(Element $element, $schemaName)
         $elementConfig = $element->getConfiguration();
         $schemaConfigs = $elementConfig['schemes'];
         $storeConfigs = DataStoreUtil::configsFromSchemaConfigs($this->registry, $schemaConfigs);
-        return $storeConfigs[$schemaName];
+        $schemaConfig = $schemaConfigs[$schemaName];
+        return $storeConfigs[$schemaConfig["featureType"]];
     }
 
     /**

Resources/public/FormRenderer.js

@@ -41,7 +41,16 @@
         }
     }
 
-    Mapbender.DataManager.FormRenderer = function FormRenderer() {
+    Mapbender.DataManager.FormRenderer = function FormRenderer(owner,schemes) {
+        var schemaNames = Object.keys(schemes);
+        for (var s = 0; s < schemaNames.length; ++s) {
+            var schemaName = schemaNames[s];
+            var schema = schemes[schemaName];
+            var fileConfigs = owner._getDataStoreFromSchema(schema).files || [];
+            var schemaBaseUrl = [owner.elementUrl, schemaName, '/'].join('');
+            this.prepareItems(schema.formItems || [], schemaBaseUrl, fileConfigs);
+        }
+
     };
 
     Object.assign(Mapbender.DataManager.FormRenderer.prototype, {

Resources/public/dataManager.element.js

@@ -59,20 +59,13 @@
             this.selector = $(this._renderSchemaSelector(this.element));
             this.formRenderer_ = this._createFormRenderer();
             this.dialogFactory_ = Mapbender.DataManager.DialogFactory;
-            var schemaNames = Object.keys(this.options.schemes);
-            for (var s = 0; s < schemaNames.length; ++s) {
-                var schemaName = schemaNames[s];
-                var schema = this.options.schemes[schemaName];
-                var fileConfigs = this._getDataStoreFromSchema(schema).files || [];
-                var schemaBaseUrl = [this.elementUrl, schemaName, '/'].join('');
-                this.formRenderer_.prepareItems(schema.formItems || [], schemaBaseUrl, fileConfigs);
-            }
             this.tableRenderer = this._createTableRenderer();
             this._initializeEvents();
             this._afterCreate();
         },
+
         _createFormRenderer: function() {
-            return new Mapbender.DataManager.FormRenderer();
+            return new Mapbender.DataManager.FormRenderer(this, this.options.schemes);
         },
         _createTableRenderer: function() {
             return new Mapbender.DataManager.TableRenderer(this);
@@ -105,15 +98,21 @@
             this.hasOnlyOneScheme = (nSchemes === 1);
             $container.append(selector);
 
+            let visibleSchemes = this._filterVisibleSchemes();
+
             // build select options
-            _.each(this.options.schemes, function(schemaConfig) {
+            _.each(visibleSchemes, function(schemaConfig) {
                 var option = $("<option/>");
                 option.val(schemaConfig.schemaName).text(schemaConfig.label);
                 option.data('schema', schemaConfig);
                 selector.append(option);
             });
             return selector;
         },
+
+        _filterVisibleSchemes: function() {
+            return this.options.schemes;
+        },
         /**
          * Unraveled from _create for child class actions after initialization, but
          * before triggering ready event and loading the first set of data.

composer.json

@@ -12,7 +12,7 @@
         "doctrine/dbal": "^2.11 || ^3",
         "doctrine/persistence": "^1.3.0 || ^2",
         "blueimp/jquery-file-upload": "9.*",
-        "mapbender/data-source": "~0.1.24 || ^0.2",
+        "mapbender/data-source": "dev-feature/enableDBSIMMSupport",
         "mapbender/mapbender": "^3.2.6"
     },
     "autoload": {