Fixed mintproject/mint-ui-lit#328

hvarg · Mar 23, 2020 · 6ec07b8 · 6ec07b8
1 parent ed43529
commit 6ec07b8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/screens/models/configure/new-setup.ts b/src/screens/models/configure/new-setup.ts
@@ -875,6 +875,13 @@ export class ModelsNewSetup extends connect(store)(PageViewElement) {
                         this._setup = { ...db.configurations[this._selectedConfig] } as ModelConfigurationSetup; 
                         this._setup.author = [];
                         this._setup.hasRegion = [];
+                        if (this._region && this._region.model_catalog_uri) {
+                            if (db.regions && db.regions[this._region.model_catalog_uri]) {
+                                this._setup.hasRegion.push( db.regions[this._region.model_catalog_uri] );
+                            } else {
+                                this._setup.hasRegion.push( {id: this._region.model_catalog_uri, label: [this._region.name]} );
+                            }
+                        }
 
                         // Fetching not loaded parameters 
                         (this._setup.hasParameter || []).forEach((p:Parameter) => {

diff --git a/src/screens/models/configure/region.ts b/src/screens/models/configure/region.ts
@@ -16,6 +16,7 @@ import { showNotification, showDialog, hideDialog } from 'util/ui_functions';
 import { RegionCategory } from "screens/regions/reducers";
 
 import { regionsGet, regionPost, regionDelete } from 'model-catalog/actions';
+import { isSubregion } from 'model-catalog/util';
 
 import { renderExternalLink } from './util';
 
@@ -187,10 +188,7 @@ export class ModelsConfigureRegion extends connect(store)(PageViewElement) {
 
     _renderSelectTab () {
         let subregions : Region[] = Object.values(this._regions || {}).filter((region:Region) => 
-            region.partOf &&
-            region.partOf.length > 0 &&
-            region.partOf.some((obj:Region) => obj.id === this._region.model_catalog_uri) &&
-            region.label.join().toLowerCase().includes(this._filter.toLowerCase())
+            isSubregion(this._region.model_catalog_uri, region)
         );
 
         return html`