Don't sort FeaturesModels by default

MerginMaps · Oct 8, 2024 · fed0c81 · fed0c81 · inputapp-bot · Oct 8, 2024
1 parent 2de2e33
commit fed0c81
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/app/featuresmodel.cpp b/app/featuresmodel.cpp
@@ -251,7 +251,7 @@ void FeaturesModel::setupFeatureRequest( QgsFeatureRequest &request )
     request.setFilterExpression( buildSearchExpression() );
   }
 
-  if ( mLayer && !mLayer->attributeTableConfig().sortExpression().isEmpty() )
+  if ( mUseAttributeTableSortOrder && mLayer && !mLayer->attributeTableConfig().sortExpression().isEmpty() )
   {
     // get a context with global, project and layer scopes
     // QGIS docs are not very clear, but this context is also used for evaluation of the request's 'order by' expressions too

diff --git a/app/featuresmodel.h b/app/featuresmodel.h
@@ -52,6 +52,9 @@ class FeaturesModel : public QAbstractListModel
     // Name of the property is intentionally `count` so that it matches ListModel's count property
     Q_PROPERTY( int count READ count NOTIFY countChanged )
 
+    // Returns if the model should be sorted according to the layer's attribute table configuration sort order
+    Q_PROPERTY( bool useAttributeTableSortOrder MEMBER mUseAttributeTableSortOrder )
+
   public:
 
     enum ModelRoles
@@ -160,6 +163,9 @@ class FeaturesModel : public QAbstractListModel
     QAtomicInt mNextSearchId = 0;
     QFutureWatcher<QgsFeatureList> mSearchResultWatcher;
     bool mFetchingResults = false;
+    bool mUseAttributeTableSortOrder = false;
+
+    friend class TestModels;
 };
 
 #endif // FEATURESMODEL_H
diff --git a/app/qml/layers/MMFeaturesListPage.qml b/app/qml/layers/MMFeaturesListPage.qml
@@ -58,6 +58,7 @@ MMComponents.MMPage {
       model: MM.FeaturesModel {
         id: featuresModel
 
+        useAttributeTableSortOrder: true
         layer: root.selectedLayer
       }
 

diff --git a/app/test/testmodels.cpp b/app/test/testmodels.cpp
@@ -69,6 +69,7 @@ void TestModels::testFeaturesModelSorted()
   QVERIFY( layer && layer->isValid() );
 
   // enable sorting
+  model.mUseAttributeTableSortOrder = true;
   QgsAttributeTableConfig conf = layer->attributeTableConfig();
   conf.setSortExpression( QStringLiteral( "Name" ) );
   layer->setAttributeTableConfig( conf );
@@ -105,8 +106,7 @@ void TestModels::testFeaturesModelSorted()
 
   // disable sorting and filtering
   // should get all items with default ordering
-  conf.setSortExpression( QString() );
-  layer->setAttributeTableConfig( conf );
+  model.mUseAttributeTableSortOrder = false;
 
   model.setSearchExpression( QString() );