fix from rebase

public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataPane.tsx

@@ -92,7 +92,7 @@ export class PanelDataPane extends SceneObjectBase<PanelDataPaneState> {
 
   public setQueryLibraryMode = (mode: QueryLibraryMode & { index: number | null }) => {
     this.setState({ queryLibraryMode: mode });
-  }
+  };
 
   public getUrlState() {
     return { tab: this.state.tab };
@@ -112,7 +112,6 @@ export class PanelDataPane extends SceneObjectBase<PanelDataPaneState> {
   }
 }
 
-
 function PanelDataPaneRendered({ model }: SceneComponentProps<PanelDataPane>) {
   const { tabs, selectedQueryTransform, panelRef, transformPickerIndex, queryLibraryMode } = model.useState();
   const styles = useStyles2(getStyles);
@@ -139,11 +138,14 @@ function PanelDataPaneRendered({ model }: SceneComponentProps<PanelDataPane>) {
 
   // Auto-select first item if nothing is selected
   const selectedId = useMemo(() => {
+    if (transformPickerIndex != null) {
+      return null;
+    }
     if (selectedQueryTransform === null && allItems.length > 0) {
       return allItems[0].id;
     }
     return selectedQueryTransform;
-  }, [selectedQueryTransform, allItems]);
+  }, [transformPickerIndex, selectedQueryTransform, allItems]);
 
   const selectedItem = useMemo(() => allItems.find((item) => item.id === selectedId), [allItems, selectedId]);
 
@@ -198,10 +200,13 @@ function PanelDataPaneRendered({ model }: SceneComponentProps<PanelDataPane>) {
   );
 
   // Handler for saving a query to the query library (stub)
-  const handleQueryLibrarySave = useCallback((_name: string, _description: string) => {
+  const handleQueryLibrarySave = useCallback(
-    // Stub: In real implementation, this would save to the query library
+    (_name: string, _description: string) => {
-    model.setQueryLibraryMode({ active: false, mode: 'browse', index: null });
+      // Stub: In real implementation, this would save to the query library
-  }, [model]);
+      model.setQueryLibraryMode({ active: false, mode: 'browse', index: null });
+    },
+    [model]
+  );
 
   // Handler to close the query library view
   const handleQueryLibraryClose = useCallback(() => {
@@ -210,13 +215,10 @@ function PanelDataPaneRendered({ model }: SceneComponentProps<PanelDataPane>) {
 
   // Handler to open query library in a specific mode
   const handleOpenQueryLibrary = useCallback(
-    (mode: QueryLibraryMode["mode"], index?: number) => {
+    (mode: QueryLibraryMode['mode'], index?: number) => {
       let currentQuery: SceneDataQuery | undefined;
 
-      if (
+      if (mode === 'save' && (selectedItem?.type === 'query' || selectedItem?.type === 'expression')) {
-        mode === 'save' &&
-        (selectedItem?.type === 'query' || selectedItem?.type === 'expression')
-      ) {
         currentQuery = selectedItem.data;
       }
 
@@ -321,7 +323,7 @@ function PanelDataPaneRendered({ model }: SceneComponentProps<PanelDataPane>) {
           onQueryLibrarySave={handleQueryLibrarySave}
           onQueryLibraryClose={handleQueryLibraryClose}
           onOpenQueryLibrary={handleOpenQueryLibrary}
-          />
+        />
       </div>
     </div>
   );

public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataSidebar.tsx

@@ -76,11 +76,14 @@ export function PanelDataSidebarRendered({ model }: SceneComponentProps<PanelDat
 
   // Auto-select first item if nothing is selected
   const selectedId = useMemo(() => {
+    if (transformPickerIndex != null) {
+      return null;
+    }
     if (selectedQueryTransform === null && allItems.length > 0) {
       return allItems[0].id;
     }
     return selectedQueryTransform;
-  }, [selectedQueryTransform, allItems]);
+  }, [transformPickerIndex, selectedQueryTransform, allItems]);
   const selectedItem = useMemo(() => allItems.find((item) => item.id === selectedId), [allItems, selectedId]);
 
   const updateQuerySelectionOnStateChange = useCallback(
@@ -176,13 +179,10 @@ export function PanelDataSidebarRendered({ model }: SceneComponentProps<PanelDat
   );
 
   const handleOpenQueryLibrary = useCallback(
-    (mode: QueryLibraryMode["mode"], index?: number) => {
+    (mode: QueryLibraryMode['mode'], index?: number) => {
       let currentQuery: SceneDataQuery | undefined;
 
-      if (
+      if (mode === 'save' && (selectedItem?.type === 'query' || selectedItem?.type === 'expression')) {
-        mode === 'save' &&
-        (selectedItem?.type === 'query' || selectedItem?.type === 'expression')
-      ) {
         currentQuery = selectedItem.data;
       }
 
@@ -305,7 +305,8 @@ export function PanelDataSidebarRendered({ model }: SceneComponentProps<PanelDat
         selectedId={selectedId}
         onCollapseSidebar={() => model.onCollapseSidebar(true)}
         onSelect={(id) => {
-          model.onChangeSelected(id)
+          model.onChangeSelected(id);
+          model.onTransformPicker(null);
         }}
         onAddQuery={handleAddQuery}
         onAddFromSavedQueries={(index) => handleOpenQueryLibrary('browse', index)}
@@ -346,7 +347,10 @@ export function PanelDataSidebarRendered({ model }: SceneComponentProps<PanelDat
         transformItems={transformItems}
         selectedId={selectedId}
         onCollapseSidebar={() => model.onCollapseSidebar(true)}
-        onSelect={(newSelectedId) => model.onChangeSelected(newSelectedId)}
+        onSelect={(newSelectedId) => {
+          model.onChangeSelected(newSelectedId);
+          model.onTransformPicker(null);
+        }}
         onAddQuery={handleAddQuery}
         onAddFromSavedQueries={(index) => handleOpenQueryLibrary('browse', index)}
         onAddTransform={(index) => {

public/app/features/dashboard-scene/panel-edit/PanelDataPane/QueryTransformList.tsx

@@ -527,6 +527,7 @@ export const QueryTransformList = memo(
                             onAddTransform={onAddTransform}
                             onAddExpression={onAddExpression}
                             allowedTypes={['transform']}
+                            index={0}
                             text={t('dashboard-scene.query-transform-list.add', 'Add')}
                           />
                         ))}