Added empty state

Modified MMDrawer to animate on height changes
Updated the value map model to update the config during a load
Modified MMListMultiSelect to expand when the search is tapped
Added spinner when loading more items

Author: gabriel-bolbotina

app/filter/uniquevaluesfiltermodel.cpp

@@ -95,6 +95,9 @@ void UniqueValuesFilterModel::populate()
 
   QgsVectorLayer *layerClone = layer->clone();
 
+  mIsLoading = true;
+  emit isLoadingChanged();
+
   mResultWatcher.setFuture( QtConcurrent::run( &UniqueValuesFilterModel::loadUniqueValues, this, layerClone, fieldIndex ) );
 }
 
@@ -128,8 +131,16 @@ void UniqueValuesFilterModel::onLoadingFinished()
   mItems.clear();
   mItems = mResultWatcher.result();
 
-  // TODO: do we need boolean to indicate if the model is loading?
   // TODO: measure how long it takes to move results from future result to mItems ~ there might be a way to avoid the copy
 
   endResetModel();
+  emit countChanged();
+
+  mIsLoading = false;
+  emit isLoadingChanged();
+}
+
+bool UniqueValuesFilterModel::isLoading() const
+{
+  return mIsLoading;
 }

app/filter/uniquevaluesfiltermodel.h

@@ -24,6 +24,8 @@ class UniqueValuesFilterModel : public QAbstractListModel
 
     Q_PROPERTY( QString layerId READ layerId WRITE setLayerId NOTIFY layerIdChanged )
     Q_PROPERTY( QString fieldName READ fieldName WRITE setFieldName NOTIFY fieldNameChanged )
+    Q_PROPERTY( bool isLoading READ isLoading NOTIFY isLoadingChanged )
+    Q_PROPERTY( int count READ rowCount NOTIFY countChanged )
 
   public:
     explicit UniqueValuesFilterModel( QObject *parent = nullptr );
@@ -38,11 +40,15 @@ class UniqueValuesFilterModel : public QAbstractListModel
     QString fieldName() const;
     void setFieldName( const QString &fieldName );
 
+    bool isLoading() const;
+
     Q_INVOKABLE void populate();
 
   signals:
     void layerIdChanged();
     void fieldNameChanged();
+    void isLoadingChanged();
+    void countChanged();
 
   public slots:
     void onLoadingFinished();
@@ -55,6 +61,7 @@ class UniqueValuesFilterModel : public QAbstractListModel
 
     QVariantList mItems;
     QFutureWatcher<QVariantList> mResultWatcher;
+    bool mIsLoading = false;
 };
 
 #endif // UNIQUEVALUESFILTERMODEL_H

app/filter/valuemapfiltermodel.cpp

@@ -9,9 +9,12 @@
 
 #include "valuemapfiltermodel.h"
 
+#include <QtConcurrentRun>
+
 ValueMapFilterModel::ValueMapFilterModel( QObject *parent )
   : QAbstractListModel( parent )
 {
+  connect( &mResultWatcher, &QFutureWatcher<QList<Item>>::finished, this, &ValueMapFilterModel::onLoadingFinished );
 }
 
 int ValueMapFilterModel::rowCount( const QModelIndex &parent ) const
@@ -51,6 +54,11 @@ QVariantMap ValueMapFilterModel::config() const
   return mConfig;
 }
 
+bool ValueMapFilterModel::isLoading() const
+{
+  return mIsLoading;
+}
+
 void ValueMapFilterModel::setConfig( const QVariantMap &config )
 {
   if ( mConfig == config )
@@ -59,17 +67,29 @@ void ValueMapFilterModel::setConfig( const QVariantMap &config )
   mConfig = config;
   emit configChanged();
 
-  populate();
+  if ( mResultWatcher.isRunning() )
+  {
+    mHasPendingLoad = true;
+    return;
+  }
+
+  startLoad();
 }
 
-void ValueMapFilterModel::populate()
+void ValueMapFilterModel::startLoad()
 {
-  beginResetModel();
+  mIsLoading = true;
+  emit isLoadingChanged();
 
-  mItems.clear();
+  mResultWatcher.setFuture( QtConcurrent::run( &ValueMapFilterModel::loadItems, mConfig ) );
+}
+
+QList<ValueMapFilterModel::Item> ValueMapFilterModel::loadItems( const QVariantMap &config )
+{
+  const QVariantList mapList = config.value( QStringLiteral( "map" ) ).toList();
 
-  const QVariantList mapList = mConfig.value( QStringLiteral( "map" ) ).toList();
-  mItems.reserve( mapList.size() );
+  QList<Item> items;
+  items.reserve( mapList.size() );
 
   for ( const QVariant &entry : mapList )
   {
@@ -83,8 +103,29 @@ void ValueMapFilterModel::populate()
     item.description = entryMap.constBegin().key();
     item.key = entryMap.constBegin().value().toString();
 
-    mItems.append( item );
+    items.append( item );
   }
 
+  return items;
+}
+
+void ValueMapFilterModel::onLoadingFinished()
+{
+  beginResetModel();
+
+  mItems = mResultWatcher.result();
+
   endResetModel();
+  emit countChanged();
+
+  if ( mHasPendingLoad )
+  {
+    mHasPendingLoad = false;
+    startLoad();
+  }
+  else
+  {
+    mIsLoading = false;
+    emit isLoadingChanged();
+  }
 }

app/filter/valuemapfiltermodel.h

@@ -11,18 +11,21 @@
 #define VALUEMAPFILTERMODEL_H
 
 #include <QAbstractListModel>
+#include <QFutureWatcher>
 #include <QtQml/qqmlregistration.h>
 
 /**
  * Populates a list model from a QGIS ValueMap editor widget config.
- * Exposes TextRole (display label) and ValueRole (stored key) for each entry.
+ * Exposes DisplayRole (display label) and KeyRole (stored key) for each entry.
  */
 class ValueMapFilterModel : public QAbstractListModel
 {
     Q_OBJECT
     QML_ELEMENT
 
     Q_PROPERTY( QVariantMap config READ config WRITE setConfig NOTIFY configChanged )
+    Q_PROPERTY( bool isLoading READ isLoading NOTIFY isLoadingChanged )
+    Q_PROPERTY( int count READ rowCount NOTIFY countChanged )
 
   public:
     enum Roles
@@ -34,6 +37,8 @@ class ValueMapFilterModel : public QAbstractListModel
     explicit ValueMapFilterModel( QObject *parent = nullptr );
     ~ValueMapFilterModel() override = default;
 
+    bool isLoading() const;
+
     int rowCount( const QModelIndex &parent = QModelIndex() ) const override;
     QVariant data( const QModelIndex &index, int role = Qt::DisplayRole ) const override;
     QHash<int, QByteArray> roleNames() const override;
@@ -43,19 +48,28 @@ class ValueMapFilterModel : public QAbstractListModel
 
   signals:
     void configChanged();
+    void isLoadingChanged();
+    void countChanged();
 
-  private:
-    void populate();
+  private slots:
+    void onLoadingFinished();
 
+  private:
     struct Item
     {
       QString description;
       QString key;
     };
 
+    static QList<Item> loadItems( const QVariantMap &config );
+    void startLoad();
+
     QVariantMap mConfig;
 
     QList<Item> mItems;
+    QFutureWatcher<QList<Item>> mResultWatcher;
+    bool mIsLoading = false;
+    bool mHasPendingLoad = false;
 };
 
 #endif // VALUEMAPFILTERMODEL_H

app/layerfeaturesmodel.h

@@ -73,6 +73,7 @@ class LayerFeaturesModel : public FeaturesModel
     int featuresLimit() const;
     QgsVectorLayer *layer() const;
     QString searchExpression() const;
+    bool fetchingResults() const { return mFetchingResults; }
 
     void setSearchExpression( const QString &searchExpression );
     void setLayer( QgsVectorLayer *newLayer );

app/qml/components/MMDrawer.qml

@@ -43,19 +43,21 @@ Drawer {
     layer.effect: MMShadow {}
 
     Rectangle {
-      color: __style.polarColor
       width: parent.width
       height: parent.height / 2
       y: parent.height / 2
+
+      color: __style.polarColor
     }
   }
 
   contentItem: Column {
     id: mainColumn
 
     anchors.fill: parent
+
     spacing: 0
-    focus : true
+    focus: true
 
     Keys.onReleased: function( event ) {
       if ( event.key === Qt.Key_Back || event.key === Qt.Key_Escape ) {
@@ -74,9 +76,7 @@ Drawer {
 
       width: parent.width
 
-      onCloseClicked: {
-        root.close()
-      }
+      onCloseClicked: root.close()
     }
 
     Item {
@@ -98,7 +98,6 @@ Drawer {
           let leftSideOverflow = ( parent.width - minSidesPadding - __style.maxPageWidth ) / 2
           return leftSideOverflow + minLeftPadding
         }
-
         return minLeftPadding
       }
 
@@ -107,7 +106,6 @@ Drawer {
           let rightSideOverflow = ( parent.width - minSidesPadding - __style.maxPageWidth ) / 2
           return rightSideOverflow + minRightPadding
         }
-
         return minRightPadding
       }
 
@@ -123,7 +121,12 @@ Drawer {
       id: bottomSpacer
 
       width: parent.width
-      height: root.drawerBottomMargin > 0 ? __style.safeAreaBottom + root.drawerBottomMargin :0
+      height: root.drawerBottomMargin > 0 ? __style.safeAreaBottom + root.drawerBottomMargin : 0
     }
   }
+
+  // add behaviour on height
+  Behavior on implicitHeight {
+    PropertyAnimation { duration: 200; easing.type: Easing.InOutQuad }
+  }
 }