Fix error for unconfigured sources in Geometry Block

client/web/compose/src/components/PageBlocks/GeometryBase.vue

@@ -149,7 +149,7 @@ export default {
         zoomMax,
       }
 
-      Promise.all(this.options.feeds.map((feed, idx) => {
+      Promise.all(this.options.feeds.filter(f => f.isValid()).map((feed, idx) => {
         return this.findModuleByID({ namespace: this.namespace, moduleID: feed.options.moduleID })
           .then(module => {
             // Interpolate prefilter variables

client/web/compose/src/components/PageBlocks/GeometryConfigurator/FeedSource/configs/Record.vue

@@ -28,16 +28,21 @@
           horizontal
           :label-cols="3"
           breakpoint="md"
-          :label="$t('geometry.recordFeed.colorLabel')"
+          :label="$t('geometry.recordFeed.geometryFieldLabel')"
         >
-          <b-input-group>
-            <b-form-input
-              v-model="feed.options.color"
-              style="max-width: 50px;"
-              type="color"
-              debounce="300"
-            />
-          </b-input-group>
+          <b-form-select
+            v-model="feed.geometryField"
+            :options="geometryFields | optionizeFields"
+          >
+            <template slot="first">
+              <option
+                disabled
+                value=""
+              >
+                {{ $t('geometry.recordFeed.geometryFieldPlaceholder') }}
+              </option>
+            </template>
+          </b-form-select>
         </b-form-group>
 
         <b-form-group
@@ -61,6 +66,35 @@
           </b-form-select>
         </b-form-group>
 
+        <b-form-group
+          horizontal
+          :label-cols="3"
+          breakpoint="md"
+          :label="$t('calendar.recordFeed.prefilterLabel')"
+        >
+          <b-form-textarea
+            v-model="feed.options.prefilter"
+            :value="true"
+            :placeholder="$t('calendar.recordFeed.prefilterPlaceholder')"
+          />
+        </b-form-group>
+
+        <b-form-group
+          horizontal
+          :label-cols="3"
+          breakpoint="md"
+          :label="$t('geometry.recordFeed.colorLabel')"
+        >
+          <b-input-group>
+            <b-form-input
+              v-model="feed.options.color"
+              style="max-width: 50px;"
+              type="color"
+              debounce="300"
+            />
+          </b-input-group>
+        </b-form-group>
+
         <b-form-group
           horizontal
           :label-cols="3"
@@ -88,42 +122,6 @@
             size="lg"
           />
         </b-form-group>
-
-        <b-form-group
-          horizontal
-          :label-cols="3"
-          breakpoint="md"
-          :label="$t('geometry.recordFeed.geometryFieldLabel')"
-        >
-          <b-form-select
-            v-model="feed.geometryField"
-            :options="geometryFields | optionizeFields"
-          >
-            <template slot="first">
-              <option
-                disabled
-                value=""
-              >
-                {{ $t('geometry.recordFeed.geometryFieldPlaceholder') }}
-              </option>
-            </template>
-          </b-form-select>
-        </b-form-group>
-
-        <br>
-
-        <b-form-group
-          horizontal
-          :label-cols="3"
-          breakpoint="md"
-          :label="$t('calendar.recordFeed.prefilterLabel')"
-        >
-          <b-form-textarea
-            v-model="feed.options.prefilter"
-            :value="true"
-            :placeholder="$t('calendar.recordFeed.prefilterPlaceholder')"
-          />
-        </b-form-group>
       </template>
     </template>
   </div>

lib/js/src/compose/types/page-block/geometry/feed.ts

@@ -7,7 +7,6 @@ interface FeedOptions {
   moduleID: string;
   resource: string;
   titleField: string;
-  geometryField: string;
   displayMarker: boolean;
   displayPolygon: boolean;
 }
@@ -20,7 +19,6 @@ const defOptions = {
   prefilter: '',
   resource: 'compose:record',
   titleField: '',
-  geometryField: '',
   displayMarker: false,
   displayPolygon: true,
 }
@@ -53,4 +51,8 @@ export default class Feed {
       }
     }
   }
+
+  isValid (): boolean {
+    return this.options.moduleID !== NoID && !!this.geometryField
+  }
 }

locale/en/corteza-webapp-compose/block.yaml

@@ -659,13 +659,13 @@ geometry:
   lock: Lock
   mapHelpText: Move and scroll the map to the position that will be used as a default. You can also lock the position or zoom to prevent users from moving too far.
   recordFeed:
-    moduleLabel: Select module
+    moduleLabel: Module*
     modulePlaceholder: (No module)
     noMultiFields: Multi-value fields are currently not supported
     optionLabel: Records
     prefilterLabel: Prefilter sources
     colorLabel: Marker color
-    geometryFieldLabel: Geometry field
+    geometryFieldLabel: Geometry field*
     titleLabel: Title
     titlePlaceholder: Title
     geometryFieldPlaceholder: Geometry field