#VFB-226 - Enhance query validation and improve query handling in frontend components

walrus51 · walrus51 · commit b9f9a60f4b38 · 2026-01-13T09:07:29.000-08:00
diff --git a/applications/virtual-fly-brain/backend/virtual_fly_brain/services/queries.py b/applications/virtual-fly-brain/backend/virtual_fly_brain/services/queries.py
@@ -4,6 +4,10 @@
 def run_query(id, query_type):
     # TODO: this will have to be extended to handle a list of ids as params
     try:
+        # Validate query_type - it must be provided and not None or 'undefined'
+        if query_type is None or query_type == 'undefined' or query_type == '':
+            raise ValueError("query_type parameter is required and must be a valid query type. Use get_term_info endpoint to retrieve available queries.")
+        
         # Create a unique cache key for the query
         cache_key = f"query_{id}_{query_type}"
         cached_data = queries_cache.get(cache_key)
@@ -35,10 +39,7 @@ def run_query(id, query_type):
             
             return data_queries
         else:
-            # For queries list, we can also cache this
-            result = dict({'queries': queries, 'name': data['Name']})
-            queries_cache.set(cache_key, result)
-            return result
+            raise ValueError(f"Query type '{query_type}' not found for instance '{id}'")
             
     except Exception as e:
         return str(e)
diff --git a/applications/virtual-fly-brain/frontend/src/network/query.js b/applications/virtual-fly-brain/frontend/src/network/query.js
@@ -21,7 +21,11 @@ export const get_queries = async (queryId) => {
     return response.json()
   })
   .then((data) => {
-    return data;
+    // Extract only the queries array and name to minimize response
+    return {
+      queries: data.query?.Queries || data.Queries || [],
+      name: data.Name || data.query?.Name
+    };
   });
   return response;
 }
diff --git a/applications/virtual-fly-brain/frontend/src/reducers/actions/queries.js b/applications/virtual-fly-brain/frontend/src/reducers/actions/queries.js
@@ -1,5 +1,5 @@
 import store from '../../store';
-import { get_query_results } from "../../network/query"
+import { get_query_results, get_queries } from "../../network/query"
 import { getQueriesTypes } from './types/getQueriesTypes';
 
 const getQueriesSuccess = (query, short_form, type) => ({
@@ -42,14 +42,40 @@ export const getQueriesFailure = ( error, id) => ({
 export const getQueries = async (short_form, type) => {
 
   store.dispatch(_getQueriesStarted())
+  
+  const state = store.getState();
+  const allLoadedInstances = state.instances.allLoadedInstances;
+  
   let response;
   try {
-    response = await get_query_results(short_form, type);
+    // When type is provided - EXECUTE the specific query
+    if (type) {
+      response = await get_query_results(short_form, type);
+      store.dispatch(getQueriesSuccess(response, short_form, type))
+    } 
+    // When type is NOT provided - LOAD available queries list
+    else {
+      // Check if instance already loaded (CACHE CHECK)
+      const existingInstance = allLoadedInstances?.find(
+        i => i.metadata?.Id === short_form
+      );
+      
+      if (existingInstance?.metadata?.Queries) {
+        // Use cached instance data - no network call needed!
+        response = {
+          queries: existingInstance.metadata.Queries,
+          name: existingInstance.metadata.Name
+        };
+      } else {
+        // Instance not loaded, fetch queries from backend using get_queries
+        response = await get_queries(short_form);
+      }
+      
+      store.dispatch(getQueriesSuccess(response, short_form, undefined))
+    }
   } catch (error) {
     store.dispatch(getQueriesFailure(error.message, short_form))
   }
-
-  store.dispatch(getQueriesSuccess(response, short_form, type))
 }
 
 export const deleteQuery = async (instance) => {
diff --git a/applications/virtual-fly-brain/frontend/src/shared/header/index.jsx b/applications/virtual-fly-brain/frontend/src/shared/header/index.jsx
@@ -20,7 +20,7 @@ import { getLayoutManagerInstance } from "@metacell/geppetto-meta-client/common/
 
 const { primaryBg, headerBoxShadow } = vars;
 
-const Header = ({setBottomNav}) => {
+const Header = ({ setBottomNav }) => {
   const classes = {
     root: {
       background: primaryBg,
@@ -38,6 +38,7 @@ const Header = ({setBottomNav}) => {
   const recentSearches = useSelector(state => state.globalInfo.recentSearches)
   const queries = useSelector(state => state.queries.queries)
   const allLoadedInstances = useSelector(state => state.instances.allLoadedInstances)
+  const focusedInstance = useSelector(state => state.instances.focusedInstance)
   const widgets = useSelector(state => state.widgets);
   const firstIdLoaded = useSelector(state => state.globalInfo.firstIDLoaded);
   let autoSaveLayout = useSelector(state => state.globalInfo.autoSaveLayout);
@@ -55,8 +56,20 @@ const Header = ({setBottomNav}) => {
   }
 
   const handleQueryStatsClick = () => {
-    // TODO: what to do here?
-    console.log('QueryStats Clicked!')
+    // Open queries for the focused instance
+    if (focusedInstance?.metadata?.Id) {
+      // Ensure queries are loaded if not already
+      const queriesForInstance = queries?.find(
+        q => q.short_form === focusedInstance.metadata.Id
+      );
+
+      if (!queriesForInstance) {
+        getQueries(focusedInstance.metadata.Id);
+      }
+
+      // Open the query component panel
+      setBottomNav(2);
+    }
   }
 
   const handleMenuClick = () => {
@@ -67,7 +80,7 @@ const Header = ({setBottomNav}) => {
    * Handler function triggered when a Menu item is clicked.
    */
   const menuHandler = (action, _component) => {
-    switch (action.handlerAction){
+    switch (action.handlerAction) {
       case ACTIONS.SHOW_WIDGET: {
         const newWidget = { ...widgets[action.parameters[0]] }
         const layoutManager = getLayoutManagerInstance();
@@ -100,7 +113,7 @@ const Header = ({setBottomNav}) => {
       case ACTIONS.SHOW_COMPONENT:
         setBottomNav(action.parameters[0])
         break;
-      case ACTIONS.SHOW_TERM_INFO:{
+      case ACTIONS.SHOW_TERM_INFO: {
         dispatch(setTermInfoOpened(true))
         break;
       }
@@ -109,38 +122,38 @@ const Header = ({setBottomNav}) => {
           window.open(item, '_blank');
         })
         break;
-      case ACTIONS.SELECT_INSTANCE:{
-        let matchInstance = allLoadedInstances?.find( q => q.metadata?.Id === action.parameters[0] );
-        if (matchInstance ) {
+      case ACTIONS.SELECT_INSTANCE: {
+        let matchInstance = allLoadedInstances?.find(q => q.metadata?.Id === action.parameters[0]);
+        if (matchInstance) {
           focusInstance(action.parameters[0])
           selectInstance(action.parameters[0])
         } else {
           getInstanceByID(action.parameters[0], true, true, true)
         }
         break;
       }
-      case ACTIONS.RUN_QUERY:{
+      case ACTIONS.RUN_QUERY: {
         let updatedQueries = [...queries];
-        let matchQuery = updatedQueries?.find( q => q.short_form === action.parameters[0] );
-        updatedQueries?.forEach( query => {
-          if( query.queries ){
-            Object.keys(query.queries)?.forEach( q => query.queries[q].active = false );
+        let matchQuery = updatedQueries?.find(q => q.short_form === action.parameters[0]);
+        updatedQueries?.forEach(query => {
+          if (query.queries) {
+            Object.keys(query.queries)?.forEach(q => query.queries[q].active = false);
           }
         });
-        if ( matchQuery?.queries?.[action?.parameters[1]] ) {
+        if (matchQuery?.queries?.[action?.parameters[1]]) {
           matchQuery.queries[action.parameters[1]].active = true;
           updateQueries(updatedQueries);
           setBottomNav(2)
         } else {
-          getQueries(action.parameters[0],action.parameters[1])
+          getQueries(action.parameters[0], action.parameters[1])
           setBottomNav(2)
         }
         break;
       }
-      case ACTIONS.HISTORY_MENU_INJECTOR:{
+      case ACTIONS.HISTORY_MENU_INJECTOR: {
         var historyList = [];
         // Add instances to history menu
-        recentSearches?.reverse()?.forEach( i => {
+        recentSearches?.reverse()?.forEach(i => {
           historyList.push(
             {
               label: i?.label,
@@ -154,12 +167,12 @@ const Header = ({setBottomNav}) => {
         })
         return historyList;
       }
-      case ACTIONS.LOAD_LAYOUT:{
+      case ACTIONS.LOAD_LAYOUT: {
         if (!firstIdLoaded) {
           dispatch(triggerInstanceFailure('No instance loaded, wait please ...'));
           break;
         }
-        switch (action.parameters[0]){
+        switch (action.parameters[0]) {
           case 'layout1':
             dispatch(loadCustomLayout(layout1));
             break;
@@ -263,7 +276,7 @@ const Header = ({setBottomNav}) => {
         </Box>
 
         <Box
-          sx={ {
+          sx={{
             '& span': {
               display: {
                 xs: 'block',
@@ -295,13 +308,15 @@ const Header = ({setBottomNav}) => {
       </Box>
 
       <MediaQuery minWidth={1200}>
-        {/* <Button
-          onClick={() => setBottomNav((prev) => prev === 2 ? null : 2)}
-          variant="outlined"
-        >
-          <QueryStats size={16} />
-          Queries for V_ilpn (FlyEM-HB:2064165421)
-        </Button> */}
+        {focusedInstance?.metadata?.Id && (focusedInstance?.metadata?.Queries?.length > 0 || queries?.find(q => q.short_form === focusedInstance.metadata.Id)) && (
+          <Button
+            onClick={() => setBottomNav((prev) => prev === 2 ? null : 2)}
+            variant="outlined"
+          >
+            <QueryStats size={16} />
+            Queries for {focusedInstance.metadata?.Name || ''} ({focusedInstance.metadata?.Id || ''})
+          </Button>
+        )}
       </MediaQuery>
     </Box>
   )
