Fix removal of multiple selected connections from browser

python/PyQt6/core/auto_generated/browser/qgsdataitem.sip.in

@@ -300,6 +300,7 @@ Sets the capabilities for the data item.
     static int findItem( QVector<QgsDataItem *> items, QgsDataItem *item );
 
 
+
     Qgis::BrowserItemType type() const;
 
     QgsDataItem *parent() const;

python/PyQt6/gui/auto_generated/qgsdataitemguiproviderutils.sip.in

@@ -0,0 +1,35 @@
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/gui/qgsdataitemguiproviderutils.h                                *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/
+
+
+
+
+class QgsDataItemGuiProviderUtils
+{
+%Docstring(signature="appended")
+
+Utility functions for :py:class:`QgsDataItemGuiProviders`.
+
+.. versionadded:: 3.38
+%End
+
+%TypeHeaderCode
+#include "qgsdataitemguiproviderutils.h"
+%End
+  public:
+
+
+};
+
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/gui/qgsdataitemguiproviderutils.h                                *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/

python/PyQt6/gui/gui_auto.sip

@@ -44,6 +44,7 @@
 %Include auto_generated/qgsdatabasetablecombobox.sip
 %Include auto_generated/qgsdataitemguiprovider.sip
 %Include auto_generated/qgsdataitemguiproviderregistry.sip
+%Include auto_generated/qgsdataitemguiproviderutils.sip
 %Include auto_generated/qgsdatasourceselectdialog.sip
 %Include auto_generated/qgsdbrelationshipwidget.sip
 %Include auto_generated/qgsdecoratedscrollbar.sip

python/core/auto_generated/browser/qgsdataitem.sip.in

@@ -300,6 +300,7 @@ Sets the capabilities for the data item.
     static int findItem( QVector<QgsDataItem *> items, QgsDataItem *item );
 
 
+
     Qgis::BrowserItemType type() const;
 
     QgsDataItem *parent() const;

python/gui/auto_generated/qgsdataitemguiproviderutils.sip.in

@@ -0,0 +1,35 @@
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/gui/qgsdataitemguiproviderutils.h                                *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/
+
+
+
+
+class QgsDataItemGuiProviderUtils
+{
+%Docstring(signature="appended")
+
+Utility functions for :py:class:`QgsDataItemGuiProviders`.
+
+.. versionadded:: 3.38
+%End
+
+%TypeHeaderCode
+#include "qgsdataitemguiproviderutils.h"
+%End
+  public:
+
+
+};
+
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/gui/qgsdataitemguiproviderutils.h                                *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/

python/gui/gui_auto.sip

@@ -44,6 +44,7 @@
 %Include auto_generated/qgsdatabasetablecombobox.sip
 %Include auto_generated/qgsdataitemguiprovider.sip
 %Include auto_generated/qgsdataitemguiproviderregistry.sip
+%Include auto_generated/qgsdataitemguiproviderutils.sip
 %Include auto_generated/qgsdatasourceselectdialog.sip
 %Include auto_generated/qgsdbrelationshipwidget.sip
 %Include auto_generated/qgsdecoratedscrollbar.sip

src/core/browser/qgsdataitem.h

@@ -313,6 +313,27 @@ class CORE_EXPORT QgsDataItem : public QObject
     // Find child index in vector of items using '==' operator
     static int findItem( QVector<QgsDataItem *> items, QgsDataItem *item );
 
+#ifndef SIP_RUN
+
+    /**
+     * Returns a filtered list of data \a items which match the template type.
+     *
+     * \since QGIS 3.38
+     */
+    template<class T>
+    static QList< T * > filteredItems( const QList< QgsDataItem * > &items )
+    {
+      QList< T * > result;
+      result.reserve( items.size() );
+      for ( QgsDataItem *item : items )
+      {
+        if ( T *matchedItem = qobject_cast< T * >( item ) )
+          result << matchedItem;
+      }
+      return result;
+    }
+#endif
+
     // members
 
     Qgis::BrowserItemType type() const { return mType; }

src/gui/CMakeLists.txt

@@ -551,6 +551,7 @@ set(QGIS_GUI_SRCS
   qgsdatabasetablecombobox.cpp
   qgsdataitemguiprovider.cpp
   qgsdataitemguiproviderregistry.cpp
+  qgsdataitemguiproviderutils.cpp
   qgsdatasourceselectdialog.cpp
   qgsdbqueryhistoryprovider.cpp
   qgsdbrelationshipwidget.cpp
@@ -822,6 +823,7 @@ set(QGIS_GUI_HDRS
   qgsdatabasetablecombobox.h
   qgsdataitemguiprovider.h
   qgsdataitemguiproviderregistry.h
+  qgsdataitemguiproviderutils.h
   qgsdatasourcemanagerdialog.h
   qgsdatasourceselectdialog.h
   qgsdbqueryhistoryprovider.h

src/gui/providers/ogr/qgsgeopackageitemguiprovider.cpp

@@ -107,8 +107,42 @@ void QgsGeoPackageItemGuiProvider::populateContextMenu( QgsDataItem *item, QMenu
 
     if ( QgsOgrDbConnection::connectionList( QStringLiteral( "GPKG" ) ).contains( collectionItem->name() ) )
     {
-      QAction *actionDeleteConnection = new QAction( tr( "Remove Connection" ), menu );
-      connect( actionDeleteConnection, &QAction::triggered, collectionItem, &QgsGeoPackageConnectionItem::deleteConnection );
+      QList< QgsGeoPackageCollectionItem * > connectionItems = QgsDataItem::filteredItems<QgsGeoPackageCollectionItem>( selectedItems );
+      connectionItems.erase( std::remove_if( connectionItems.begin(), connectionItems.end(), []( QgsGeoPackageCollectionItem * connectionItem )
+      {
+        return !QgsOgrDbConnection::connectionList( QStringLiteral( "GPKG" ) ).contains( connectionItem->name() );
+      } ), connectionItems.end() );
+
+      QAction *actionDeleteConnection = new QAction( connectionItems.size() > 1 ? tr( "Remove Connections…" ) : tr( "Remove Connection…" ), menu );
+      if ( connectionItems.size() > 1 )
+      {
+        connect( actionDeleteConnection, &QAction::triggered, this, [connectionItems]
+        {
+          QStringList connectionNames;
+          connectionNames.reserve( connectionItems.size() );
+          for ( QgsGeoPackageCollectionItem *item : connectionItems )
+          {
+            connectionNames << item->name();
+          }
+          QPointer< QgsDataItem > firstParent( connectionItems.at( 0 )->parent() );
+          if ( QMessageBox::question( nullptr,
+                                      QObject::tr( "Remove Connections" ),
+                                      QObject::tr( "Are you sure you want to remove all %1 selected connections?" ).arg( connectionItems.size() ),
+                                      QMessageBox::Yes | QMessageBox::No, QMessageBox::No ) != QMessageBox::Yes )
+            return;
+
+          for ( const QString &connectionName : std::as_const( connectionNames ) )
+          {
+            QgsOgrDbConnection::deleteConnection( connectionName );
+          }
+
+          firstParent->refreshConnections( QStringLiteral( "GPKG" ) );
+        } );
+      }
+      else
+      {
+        connect( actionDeleteConnection, &QAction::triggered, collectionItem, &QgsGeoPackageConnectionItem::deleteConnection );
+      }
       menu->addAction( actionDeleteConnection );
     }
     else

src/gui/providers/sensorthings/qgssensorthingsdataitemguiprovider.cpp

@@ -18,22 +18,30 @@
 #include "qgssensorthingsconnection.h"
 #include "qgssensorthingsconnectiondialog.h"
 #include "qgsmanageconnectionsdialog.h"
+#include "qgsdataitemguiproviderutils.h"
 
 #include <QMessageBox>
 #include <QFileDialog>
 
 ///@cond PRIVATE
 
-void QgsSensorThingsDataItemGuiProvider::populateContextMenu( QgsDataItem *item, QMenu *menu, const QList<QgsDataItem *> &, QgsDataItemGuiContext )
+void QgsSensorThingsDataItemGuiProvider::populateContextMenu( QgsDataItem *item, QMenu *menu, const QList<QgsDataItem *> &selection, QgsDataItemGuiContext context )
 {
   if ( QgsSensorThingsConnectionItem *connectionItem = qobject_cast< QgsSensorThingsConnectionItem * >( item ) )
   {
     QAction *actionEdit = new QAction( tr( "Edit Connection…" ), menu );
     connect( actionEdit, &QAction::triggered, this, [connectionItem] { editConnection( connectionItem ); } );
     menu->addAction( actionEdit );
 
-    QAction *actionDelete = new QAction( tr( "Remove Connection" ), menu );
-    connect( actionDelete, &QAction::triggered, this, [connectionItem] { deleteConnection( connectionItem ); } );
+    const QList< QgsSensorThingsConnectionItem * > stConnectionItems = QgsDataItem::filteredItems<QgsSensorThingsConnectionItem>( selection );
+    QAction *actionDelete = new QAction( stConnectionItems.size() > 1 ? tr( "Remove Connections…" ) : tr( "Remove Connection…" ), menu );
+    connect( actionDelete, &QAction::triggered, this, [stConnectionItems, context]
+    {
+      QgsDataItemGuiProviderUtils::deleteConnections( stConnectionItems, []( const QString & connectionName )
+      {
+        QgsSensorThingsProviderConnection( QString() ).remove( connectionName );
+      }, context );
+    } );
     menu->addAction( actionDelete );
   }
 
@@ -75,17 +83,6 @@ void QgsSensorThingsDataItemGuiProvider::editConnection( QgsDataItem *item )
   item->parent()->refreshConnections();
 }
 
-void QgsSensorThingsDataItemGuiProvider::deleteConnection( QgsDataItem *item )
-{
-  if ( QMessageBox::question( nullptr, tr( "Remove Connection" ), tr( "Are you sure you want to remove the connection “%1”?" ).arg( item->name() ),
-                              QMessageBox::Yes | QMessageBox::No, QMessageBox::No ) != QMessageBox::Yes )
-    return;
-
-  QgsSensorThingsProviderConnection( QString() ).remove( item->name() );
-
-  item->parent()->refreshConnections();
-}
-
 void QgsSensorThingsDataItemGuiProvider::newConnection( QgsDataItem *item )
 {
   QgsSensorThingsConnectionDialog dlg;

src/gui/providers/sensorthings/qgssensorthingsdataitemguiprovider.h

@@ -34,7 +34,6 @@ class QgsSensorThingsDataItemGuiProvider : public QObject, public QgsDataItemGui
 
   private:
     static void editConnection( QgsDataItem *item );
-    static void deleteConnection( QgsDataItem *item );
     static void newConnection( QgsDataItem *item );
     static void saveConnections();
     static void loadConnections( QgsDataItem *item );

src/gui/qgsdataitemguiproviderutils.cpp

@@ -0,0 +1,48 @@
+/***************************************************************************
+  qgsdataitemguiproviderutils.cpp
+  --------------------------------------
+  Date                 : June 2024
+  Copyright            : (C) 2024 by Nyall Dawson
+  Email                : nyall dot dawson at gmail dot com
+ ***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "qgsdataitemguiproviderutils.h"
+#include "qgsdataitem.h"
+#include "qgsdataitemguiprovider.h"
+
+#include <QPointer>
+#include <QMessageBox>
+
+void QgsDataItemGuiProviderUtils::deleteConnectionsPrivate( const QStringList &connectionNames, const std::function<void ( const QString & )> &deleteConnection, QPointer< QgsDataItem > firstParent )
+{
+  if ( connectionNames.size() > 1 )
+  {
+    if ( QMessageBox::question( nullptr,
+                                QObject::tr( "Remove Connections" ),
+                                QObject::tr( "Are you sure you want to remove all %1 selected connections?" ).arg( connectionNames.size() ),
+                                QMessageBox::Yes | QMessageBox::No, QMessageBox::No ) != QMessageBox::Yes )
+      return;
+  }
+  else
+  {
+    if ( QMessageBox::question( nullptr, QObject::tr( "Remove Connection" ),
+                                QObject::tr( "Are you sure you want to remove the connection to “%1”?" ).arg( connectionNames.at( 0 ) ),
+                                QMessageBox::Yes | QMessageBox::No, QMessageBox::No ) != QMessageBox::Yes )
+      return;
+  }
+
+  for ( const QString &connectionName : std::as_const( connectionNames ) )
+  {
+    deleteConnection( connectionName );
+  }
+
+  if ( firstParent )
+    firstParent->refreshConnections();
+}

src/gui/qgsdataitemguiproviderutils.h

@@ -0,0 +1,70 @@
+/***************************************************************************
+  qgsdataitemguiproviderutils.h
+  --------------------------------------
+  Date                 : June 2024
+  Copyright            : (C) 2024 by Nyall Dawson
+  Email                : nyall dot dawson at gmail dot com
+ ***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef QGSDATAITEMGUIPROVIDERUTILS_H
+#define QGSDATAITEMGUIPROVIDERUTILS_H
+
+#include "qgis_gui.h"
+#include "qgis_sip.h"
+#include "qgis.h"
+#include "qgsdataitem.h"
+#include "qgsdataitemguiprovider.h"
+#include <QPointer>
+#include <functional>
+
+class QgsDataItem;
+
+/**
+ * \class QgsDataItemGuiProviderUtils
+ * \ingroup gui
+ *
+ * \brief Utility functions for QgsDataItemGuiProviders.
+ *
+ * \since QGIS 3.38
+ */
+class GUI_EXPORT QgsDataItemGuiProviderUtils
+{
+  public:
+
+#ifndef SIP_RUN
+
+    /**
+     * Handles deletion of a list of connection \a items.
+     *
+     * \note Not available in Python bindings
+     */
+    template<class T>
+    static void deleteConnections( const QList< T * > &items, const std::function< void( const QString & ) > &deleteConnection, QgsDataItemGuiContext context )
+    {
+      ( void )context;
+      if ( items.empty() )
+        return;
+
+      QStringList connectionNames;
+      connectionNames.reserve( items.size() );
+      for ( T *item : items )
+      {
+        connectionNames << item->name();
+      }
+      QPointer< QgsDataItem > firstParent( items.at( 0 )->parent() );
+      deleteConnectionsPrivate( connectionNames, deleteConnection, firstParent );
+    }
+#endif
+
+  private:
+    static void deleteConnectionsPrivate( const QStringList &connectionNames, const std::function<void ( const QString & )> &deleteConnection, QPointer<QgsDataItem> firstParent );
+};
+
+#endif // QGSDATAITEMGUIPROVIDERUTILS_H