2 files changed, 25 insertions, 4 deletions

diff --git a/framework/src/extensionmodel.cpp b/framework/src/extensionmodel.cpp
index e3fab7d8..5f42aa7a 100644
--- a/framework/src/extensionmodel.cpp
+++ b/framework/src/extensionmodel.cpp
@@ -47,12 +47,17 @@ QHash<int, QByteArray> ExtensionModel::roleNames() const
 
 void ExtensionModel::load()
 {
-    auto model = new QStandardItemModel(this);
-
+    if (auto m = sourceModel()) {
+        setSourceModel(nullptr);
+        delete m;
+    }
     auto engine = qmlEngine(this);
-    Q_ASSERT(engine);
+    if (!engine) {
+        return;
+    }
+    auto model = new QStandardItemModel(this);
     for (const auto &path : engine->importPathList()) {
-        QDir dir{path + "/org/kube/views"};
+        QDir dir{path + "/org/kube/" + mExtensionPoint};
         for (const auto &pluginName : dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot)) {
             const auto pluginPath = dir.path() + "/" + pluginName;
             mPaths.insert(pluginName, pluginPath);
@@ -101,6 +106,17 @@ QVariantList ExtensionModel::sortOrder() const
     return {};
 }
 
+void ExtensionModel::setExtensionPoint(const QString &extensionPoint)
+{
+    mExtensionPoint = extensionPoint;
+    QTimer::singleShot(0, this, &ExtensionModel::load);
+}
+
+QString ExtensionModel::extensionPoint() const
+{
+    return mExtensionPoint;
+}
+
 QVariant ExtensionModel::data(const QModelIndex &idx, int role) const
 {
     return QSortFilterProxyModel::data(idx, role);
diff --git a/framework/src/extensionmodel.h b/framework/src/extensionmodel.h
index 5360cc2f..07601e57 100644
--- a/framework/src/extensionmodel.h
+++ b/framework/src/extensionmodel.h
@@ -29,6 +29,7 @@ class ExtensionModel : public QSortFilterProxyModel
     Q_OBJECT
 
     Q_PROPERTY(QVariantList sortOrder WRITE setSortOrder READ sortOrder)
+    Q_PROPERTY(QString extensionPoint WRITE setExtensionPoint READ extensionPoint)
 public:
 
     ExtensionModel(QObject *parent = Q_NULLPTR);
@@ -49,6 +50,9 @@ public:
     void setSortOrder(const QVariantList &order);
     QVariantList sortOrder() const;
 
+    void setExtensionPoint(const QString &order);
+    QString extensionPoint() const;
+
     Q_INVOKABLE QString findSource(const QString &extensionName, const QString &sourceName);
 
 private slots:
@@ -57,6 +61,7 @@ private slots:
 private:
     QStringList mSortOrder;
     QHash<QString, QString> mPaths;
+    QString mExtensionPoint;
 };
 
 }