Merged in upstream changes.

alan-wu · May 22, 2024 · eeba37c · eeba37c
2 parents 77ddcf7 + a83d7d3
commit eeba37c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/src/components.d.ts b/src/components.d.ts
@@ -10,6 +10,7 @@ declare module 'vue' {
     AnnotationTool: typeof import('./components/AnnotationTool.vue')['default']
     ConnectionDialog: typeof import('./components/ConnectionDialog.vue')['default']
     DynamicLegends: typeof import('./components/legends/DynamicLegends.vue')['default']
+    ElAutocomplete: typeof import('element-plus/es')['ElAutocomplete']
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCard: typeof import('element-plus/es')['ElCard']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
@@ -34,6 +35,7 @@ declare module 'vue' {
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElSelect: typeof import('element-plus/es')['ElSelect']
+    ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTree: typeof import('element-plus/es')['ElTree']
     ExternalResourceCard: typeof import('./components/ExternalResourceCard.vue')['default']
     FlatmapVuer: typeof import('./components/FlatmapVuer.vue')['default']

diff --git a/src/components/FlatmapVuer.vue b/src/components/FlatmapVuer.vue
@@ -410,6 +410,7 @@ Please use `const` to assign meaningful names to them...
                 :selections="alertOptions"
                 @changed="alertSelected"
                 @checkboxMouseEnter="alertMouseEnterEmitted"
+                @selections-data-changed="onSelectionsDataChanged"
                 ref="alertSelection"
                 key="alertSelection"
               />
@@ -439,19 +440,6 @@ Please use `const` to assign meaningful names to them...
                   key="layersSelection"
                 />
               -->
-              <selections-group
-                v-if="!isFC && taxonConnectivity && taxonConnectivity.length > 0"
-                title="Observed in"
-                labelKey="label"
-                identifierKey="taxon"
-                :selections="taxonConnectivity"
-                @changed="taxonsSelected"
-                @checkboxMouseEnter="checkboxMouseEnterEmitted"
-                @selections-data-changed="onSelectionsDataChanged"
-                @checkAll="checkAllTaxons"
-                ref="taxonSelection"
-                key="taxonSelection"
-              />
               <selections-group
                 v-if="pathways && pathways.length > 0"
                 title="Pathways"
@@ -467,12 +455,13 @@ Please use `const` to assign meaningful names to them...
               />
               <selections-group
                 v-if="!isFC && taxonConnectivity && taxonConnectivity.length > 0"
-                title="Observed in"
+                title="Studied in"
                 labelKey="label"
                 identifierKey="taxon"
                 :selections="taxonConnectivity"
                 @changed="taxonsSelected"
                 @checkboxMouseEnter="taxonMouseEnterEmitted"
+                @selections-data-changed="onSelectionsDataChanged"
                 @checkAll="checkAllTaxons"
                 ref="taxonSelection"
                 key="taxonSelection"
@@ -484,6 +473,7 @@ Please use `const` to assign meaningful names to them...
                 identifierKey="key"
                 :selections="centreLines"
                 @changed="centreLinesSelected"
+                @selections-data-changed="onSelectionsDataChanged"
                 ref="centrelinesSelection"
                 key="centrelinesSelection"
               />
@@ -1574,7 +1564,7 @@ export default {
     },
     /**
      * @vuese
-     * Function to show or hide connectivity features observed in particular species
+     * Function to show or hide connectivity features studied in particular species
      * by providing ``{taxonId, true/false}`` in ``payload.key, payload.value``.
      * @arg payload
      */
@@ -1601,7 +1591,7 @@ export default {
     },
     /**
      * @vuese
-     * Function to show or hide connectivity features observed in particular species
+     * Function to show or hide connectivity features studied in particular species
      * by providing ``payload`` with ``payload.keys`` array and ``payload.value`` flag.
      * @arg payload
      */