@abi-software/mapintegratedvuer 1.10.2-beta.0 → 1.10.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/mapintegratedvuer",
-  "version": "1.10.2-beta.0",
+  "version": "1.10.2",
   "license": "Apache-2.0",
   "scripts": {
     "serve": "vite --host --force",
@@ -52,9 +52,9 @@
     "*.js"
   ],
   "dependencies": {
-    "@abi-software/flatmapvuer": "^1.10.1-beta.1",
-    "@abi-software/map-side-bar": "^2.9.1-beta.1",
-    "@abi-software/map-utilities": "^1.6.1-beta.0",
+    "@abi-software/flatmapvuer": "^1.10.1",
+    "@abi-software/map-side-bar": "^2.9.1",
+    "@abi-software/map-utilities": "^1.6.0",
     "@abi-software/plotvuer": "1.0.4",
     "@abi-software/scaffoldvuer": "^1.10.0",
     "@abi-software/simulationvuer": "^2.0.12",

package/src/components/DialogToolbarContent.vue

@@ -14,7 +14,7 @@
           :teleported="false"
           trigger="hover"
           class="toolbar-dropdown"
-          popper-class="toolbar-dropdown-popper"
+          popper-class="toolbar-dropdown-dropdown"
           :hide-on-click="false"
           :disabled="!mapLoaded"
         >
@@ -29,10 +29,6 @@
             <el-icon-edit-pen />
           </el-icon>
           {{ globalSettings.viewingMode }}
-          <template v-if="globalSettings.viewingMode === 'Neuron Connection'">
-            &nbsp;
-            <small class="toolbar-dropdown-badge"><em>{{ globalSettings.connectionType }}</em></small>
-          </template>
           <el-icon class="el-icon--right">
             <el-icon-arrow-down />
           </el-icon>
@@ -95,34 +91,6 @@
                   </el-popover>
                 </div>
               </template> -->
-              <template v-if="key === 'Neuron Connection'">
-                <div class="setting-popover-block" v-if="'connectionType' in globalSettings">
-                  <el-radio-group
-                    v-model="globalSettings.connectionType"
-                    @change="updateGlobalSettings"
-                  >
-                    <el-radio-button value="Origin" size="small">Origin</el-radio-button>
-                    <el-radio-button value="Via" size="small">Via</el-radio-button>
-                    <el-radio-button value="Destination" size="small">Destination</el-radio-button>
-                    <el-radio-button value="All" size="small">All</el-radio-button>
-                  </el-radio-group>
-                  <div class="el-radio__description">
-                    <small v-if="globalSettings.connectionType === 'Origin'">
-                      Neuron populations beginning at a location.
-                    </small>
-                    <small v-else-if="globalSettings.connectionType === 'Via'">
-                      Neuron populations via a location.
-                    </small>
-                    <small v-else-if="globalSettings.connectionType === 'Destination'">
-                      Neuron populations terminating at a location.
-                    </small>
-                    <small v-else>
-                      Neuron populations associated with a location (or)
-                      Neuron populations that share at least one edge with another neuron population.
-                    </small>
-                  </div>
-                </div>
-              </template>
             </el-dropdown-item>
           </el-dropdown-menu>
         </template>
@@ -517,7 +485,7 @@ export default {
       permalinkRef: undefined,
       viewingModes: {
         'Exploration': 'Find relevant research and view detail of neural pathways by selecting a pathway to view its connections and data sources',
-        'Neuron Connection': 'Discover Neuron connections by selecting a feature and viewing its associated network connections',
+        'Neuron Connection': 'Discover Neuron connections by selecting a neuron and viewing its associated network connections',
         'Annotation': ['View feature annotations', 'Add, comment on and view feature annotations']
       },
       authorisedUser: false,
@@ -565,7 +533,6 @@ export default {
       }
       // viewing mode update
       if (updatedSettings.includes('viewingMode') ||
-        updatedSettings.includes('connectionType') ||
         updatedSettings.includes('flightPathDisplay') ||
         updatedSettings.includes('organsDisplay') ||
         updatedSettings.includes('outlinesDisplay') ||
@@ -789,7 +756,7 @@ export default {
   gap: 0.5rem;
 }
 
-:deep(.toolbar-dropdown-popper.el-popper) {
+:deep(.toolbar-dropdown-dropdown.el-popper) {
   border: 1px solid $app-primary-color;
   box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.06);
   background-color: #f3ecf6;
@@ -843,6 +810,14 @@ export default {
       font-weight: 500;
     }
 
+    > small {
+      height: auto;
+      line-height: 1.2;
+      font-weight: normal;
+      color: gray;
+      white-space: normal;
+    }
+
     &.is-selected,
     &:hover {
       background-color: #f1e4f6;
@@ -866,13 +841,6 @@ export default {
   }
 }
 
-.toolbar-dropdown-badge {
-  color: white;
-  background-color: $app-primary-color;
-  border-radius: 4px;
-  padding: 2px 4px;
-}
-
 :deep(.setting-popover.el-popper) {
   padding: 1px !important;
 }
@@ -916,21 +884,8 @@ export default {
   scale: 0.7;
 }
 
-.el-option__description,
-.el-radio__description small {
-  display: inline-block;
-  font-size: 12px;
-  white-space: normal;
-  line-height: 1.2;
-  height: auto;
-  font-weight: normal;
-  color: gray;
-}
-
 .el-radio__description {
-  margin-top: 0.25rem;
-  padding-left: 0.25rem;
-  font-style: italic;
+  font-size: 12px;
 }
 
 .bg-color-radio-group {

package/src/components/SplitDialog.vue

@@ -31,7 +31,6 @@ import EventBus from './EventBus';
 import { mapStores } from 'pinia';
 import { useSplitFlowStore } from '../stores/splitFlow';
 import { useConnectivitiesStore } from '../stores/connectivities';
-import { findPathsByDestinationItem, findPathsByOriginItem, findPathsByViaItem } from "@abi-software/map-utilities";
 
 export default {
   name: "SplitDialog",
@@ -211,7 +210,7 @@ export default {
       // mix connectivites of available maps
       if (uuids.length) {
         this.connectivitiesStore.updateActiveConnectivityKeys(uuids);
-
+        
         const uniqueConnectivities = this.connectivitiesStore.getUniqueConnectivitiesByKeys;
         EventBus.emit("connectivity-knowledge", {
           data: uniqueConnectivities
@@ -226,7 +225,7 @@ export default {
           });
           this.connectivitiesStore.updateActiveConnectivityKeys([sckanVersion]);
         } else {
-          console.warn(`There is no connectivity to show!`);
+          console.warn(`There has no connectivity to show!`);
         }
       }
     },
@@ -254,8 +253,7 @@ export default {
     },
     connectivityQueryFilter: async function (data) {
       const activeContents = this.getActiveContents();
-      const searchOrders = [], searchResults = [];
-      let searchHighlights = [];
+      const searchOrders = [], searchHighlights = [], searchResults = [];
       let processed = false;
 
       for (const activeContent of activeContents) {
@@ -283,7 +281,6 @@ export default {
 
             const filters = {};
             let queryIds = [], facetIds = [];
-            let hasConnectionTargets = false;
             if (data) {
               this.query = data.query;
               // get query search result ids and order
@@ -307,8 +304,7 @@ export default {
               data.filter.forEach((item) => {
                 const facetKey = item.facetPropPath.split('.').pop();;
                 const matchedFilter = uniqueFilters.find(filter => filter.key.includes(facetKey));
-                const isNeuronConnection = Boolean(item.facetPropPath.includes('flatmap.connectivity.source'));
-                if (matchedFilter && !isNeuronConnection) {
+                if (matchedFilter) {
                   matchedFilter.children.forEach((child) => {
                     if (child.label === item.facet && child.key) {
                       const childKey = child.key.split('.').pop();
@@ -320,20 +316,6 @@ export default {
                     }
                   });
                 }
-                if (isNeuronConnection && item.facet !== 'Show all') {
-                  const facet = item.facet;
-                  const feature = JSON.parse(facet);
-                  const mode = item.facetPropPath.split('.').pop();
-                  hasConnectionTargets = true;
-
-                  if (mode === 'origin') {
-                    results = findPathsByOriginItem(results, feature);
-                  } else if (mode === 'destination') {
-                    results = findPathsByDestinationItem(results, feature);
-                  } else if (mode === 'via') {
-                    results = findPathsByViaItem(results, feature);
-                  }
-                }
               });
               this.filter = Object.values(filters);
               // between facet search categories -> AND
@@ -348,7 +330,7 @@ export default {
             } else if (!this.query && this.filter.length) { // pure facet search
               target = facetIds;
             } else if (this.query && this.filter.length) { // combined query and facet search
-              // between query search and facet search -> AND
+              // between query search and facet search -> AND 
               target = queryIds.filter(id => facetIds.includes(id));
             }
             // This can be empty array due to the AND operation
@@ -357,14 +339,6 @@ export default {
               results = results.filter((item) => target.includes(item.id));
               processed = true;
             }
-            if (hasConnectionTargets) {
-              const connectionTargets = results.map((item) => item.id);
-              if (searchHighlights.length) {
-                searchHighlights = searchHighlights.filter((item) => connectionTargets.includes(item));
-              } else {
-                searchHighlights = connectionTargets;
-              }
-            }
             searchResults.push(...results);
           }
         }

package/src/components/SplitFlow.vue

@@ -50,7 +50,6 @@
           @connectivity-source-change="onConnectivitySourceChange"
           @filter-visibility="onFilterVisibility"
           @connectivity-item-close="onConnectivityItemClose"
-          @connectivity-explorer-reset="onConnectivityExplorerReset"
         />
         <SplitDialog
           :entries="entries"
@@ -138,7 +137,7 @@ export default {
       connectivityHighlight: [],
       connectivityKnowledge: [],
       connectivityExplorerClicked: [], // to support multi views
-      showVisibilityFilter: true,
+      showVisibilityFilter: false,
       filterVisibility: true,
       filterOptions: [],
       annotationHighlight: [],
@@ -192,37 +191,6 @@ export default {
     onConnectivityItemClose: function () {
       EventBus.emit('connectivity-item-close');
     },
-    onConnectivityExplorerReset: function () {
-      const activeFlatmaps = this.getActiveFlatmaps();
-      activeFlatmaps.forEach((activeFlatmap) => {
-        activeFlatmap.resetConnectivityfilters();
-      });
-    },
-    getActiveFlatmaps: function () {
-      const activeFlatmaps = [];
-      let splitdialog = this.$refs.splitdialog;
-
-      if (splitdialog) {
-        const activeContents = splitdialog.getActiveContents();
-
-        activeContents.forEach(content => {
-          if (content?.$refs['viewer']) {
-            const contentViewer = content.$refs['viewer'];
-            const flatmapRef = contentViewer.flatmapRef;
-            const multiflatmapRef = contentViewer.multiflatmapRef;
-            let flatmap = null;
-
-            if (flatmapRef) flatmap = flatmapRef;
-            if (multiflatmapRef) flatmap = multiflatmapRef.getCurrentFlatmap();
-
-            if (flatmap && flatmap.$el.checkVisibility()) {
-              activeFlatmaps.push(flatmap);
-            }
-          }
-        });
-      }
-      return activeFlatmaps;
-    },
     /**
      * Callback when an action is performed (open new dialogs).
      */
@@ -752,19 +720,6 @@ export default {
         this.$refs.sideBar.updateConnectivityError(payload.data);
       }
     });
-    EventBus.on('neuron-connection-click', payload => {
-      const activeFlatmaps = this.getActiveFlatmaps();
-      activeFlatmaps.forEach((activeFlatmap) => {
-        activeFlatmap.highlightConnectedPaths(payload);
-      });
-    });
-    EventBus.on('neuron-connection-feature-click', payload => {
-      if (this.$refs.sideBar) {
-        this.$refs.sideBar.openConnectivitySearch(payload, '');
-        this.$refs.sideBar.tabClicked({ id: 2, type: 'connectivityExplorer' });
-        this.$refs.sideBar.setDrawerOpen(true);
-      }
-    });
     EventBus.on("OpenNewMap", type => {
       this.openNewMap(type);
     });

package/src/components/viewers/Flatmap.vue

@@ -23,8 +23,6 @@
       @connectivity-info-open="onConnectivityInfoOpen"
       @connectivity-error="onConnectivityError"
       @connectivity-info-close="onConnectivityInfoClose"
-      @neuron-connection-click="onNeuronConnectionClick"
-      @neuron-connection-feature-click="onNeuronConnectionFeatureClick"
       :connectivityInfoSidebar="connectivityInfoSidebar"
       :pathControls="true"
       ref="flatmap"
@@ -39,6 +37,7 @@
       @open-map="openMap"
       @pathway-selection-changed="onPathwaySelectionChanged"
       @mapmanager-loaded="onMapmanagerLoaded"
+      :showPathwayFilter="false"
     />
 
     <HelpModeDialog
@@ -215,7 +214,6 @@ export default {
         flightPathDisplay,
         organsDisplay,
         outlinesDisplay,
-        connectionType,
       } = this.settingsStore.globalSettings;
 
       const currentFlatmap = this.$refs.flatmap;
@@ -225,7 +223,6 @@ export default {
       currentFlatmap.setColour(organsDisplay);
       currentFlatmap.setOutlines(outlinesDisplay);
       currentFlatmap.backgroundChangeCallback(backgroundDisplay);
-      currentFlatmap.setConnectionType(connectionType);
     },
     setVisibilityFilter: function (payload) {
       if (this?.alive) {

package/src/components/viewers/MultiFlatmap.vue

@@ -22,8 +22,6 @@
       @connectivity-info-open="onConnectivityInfoOpen"
       @connectivity-error="onConnectivityError"
       @connectivity-info-close="onConnectivityInfoClose"
-      @neuron-connection-click="onNeuronConnectionClick"
-      @neuron-connection-feature-click="onNeuronConnectionFeatureClick"
       :connectivityInfoSidebar="connectivityInfoSidebar"
       ref="multiflatmap"
       :displayMinimap="true"
@@ -393,7 +391,6 @@ export default {
         flightPathDisplay,
         organsDisplay,
         outlinesDisplay,
-        connectionType,
       } = this.settingsStore.globalSettings;
 
       if (this.flatmapReady) {
@@ -404,7 +401,6 @@ export default {
         currentFlatmap.setColour(organsDisplay);
         currentFlatmap.setOutlines(outlinesDisplay);
         currentFlatmap.backgroundChangeCallback(backgroundDisplay);
-        currentFlatmap.setConnectionType(connectionType);
       }
     },
     setVisibilityFilter: function (payload) {

package/src/components.d.ts

@@ -35,7 +35,6 @@ declare module 'vue' {
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPopover: typeof import('element-plus/es')['ElPopover']
     ElRadio: typeof import('element-plus/es')['ElRadio']
-    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElSelect: typeof import('element-plus/es')['ElSelect']

package/src/mixins/ContentMixin.js

@@ -551,13 +551,7 @@ export default {
     onSidebarAnnotationClose: function() {
       return;
     },
-    onNeuronConnectionClick: function (payload) {
-      EventBus.emit('neuron-connection-click', payload);
-    },
-    onNeuronConnectionFeatureClick: function (payload) {
-      EventBus.emit('neuron-connection-feature-click', payload);
-    },
-    showConnectivity: function(payload) {
+    showConnectivity: function() {
       return;
     },
     showConnectivitiesByReference: function() {

package/src/stores/settings.js

@@ -43,7 +43,6 @@ export const useSettingsStore = defineStore('settings', {
         organsDisplay: true,
         outlinesDisplay: true,
         backgroundDisplay: 'white',
-        connectionType: 'All', // 'Origin', 'Via', 'Destination', 'All
       },
     }
   },

package/vite.config.js

@@ -36,9 +36,6 @@ export default defineConfig(({ command, mode }) => {
     optimizeDeps: {
       exclude: ["vue-router"],
     },
-    preview: {
-      allowedHosts: ['mapintegratedvuer-mapcore-754fcb3bf891.herokuapp.com'],
-    }
   };
 
   if (command === "serve") {