Install composer/converations/people as separate views and load them

dynamically.

24 files changed, 254 insertions, 233 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7933a9e6..48120389 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,5 +36,6 @@ add_subdirectory(framework)
 add_subdirectory(components)
 add_subdirectory(icons)
 add_subdirectory(applications)
+add_subdirectory(views)
 add_subdirectory(accounts)
 add_subdirectory(tests)
diff --git a/components/kube/qml/Kube.qml b/components/kube/qml/Kube.qml
index 9a31ba58..be3f7e34 100644
--- a/components/kube/qml/Kube.qml
+++ b/components/kube/qml/Kube.qml
@@ -86,35 +86,6 @@ Controls2.ApplicationWindow {
         }
     }
 
-    Kube.Listener {
-        filter: Kube.Messages.reply
-        onMessageReceived: {
-            kubeViews.openComposerWithMail(message.mail, false)
-        }
-    }
-
-    Kube.Listener {
-        filter: Kube.Messages.edit
-        onMessageReceived: {
-            kubeViews.openComposerWithMail(message.mail, true)
-        }
-    }
-
-    Kube.Listener {
-        filter: Kube.Messages.compose
-        onMessageReceived: kubeViews.openComposer(true, message.recipients)
-    }
-
-    Kube.Listener {
-        filter: Kube.Messages.requestLogin
-        onMessageReceived: kubeViews.setLoginView(message.accountId)
-    }
-
-    Kube.Listener {
-        filter: Kube.Messages.requestAccountsConfiguration
-        onMessageReceived: kubeViews.setAccountsView()
-    }
-
     //BEGIN Shortcuts
     Shortcut {
         sequence: StandardKey.Quit
@@ -174,48 +145,20 @@ Controls2.ApplicationWindow {
 
                 spacing: Kube.Units.largeSpacing - Kube.Units.smallSpacing
 
-                Kube.IconButton {
-                    id: composerButton
-                    iconName: Kube.Icons.edit_inverted
-                    onClicked: kubeViews.openComposer(false, [])
-                    activeFocusOnTab: true
-                    checkable: true
-                    Controls2.ButtonGroup.group: viewButtonGroup
-                    tooltip: qsTr("composer")
-                }
-
-                Kube.IconButton {
-                    id: mailButton
-                    iconName: Kube.Icons.mail_inverted
-                    onClicked: kubeViews.setMailView()
-                    activeFocusOnTab: true
-                    checkable: true
-                    checked: true
-                    Controls2.ButtonGroup.group: viewButtonGroup
-                    tooltip: qsTr("mails")
-                }
-
-                Kube.IconButton {
-                    id: peopleButton
-                    iconName: Kube.Icons.user_inverted
-                    onClicked: kubeViews.setPeopleView()
-                    activeFocusOnTab: true
-                    checkable: true
-                    Controls2.ButtonGroup.group: viewButtonGroup
-                    tooltip: qsTr("people")
-                }
                 Repeater {
-                    model: Kube.ExtensionModel {}
+                    model: Kube.ExtensionModel {
+                        id: extensionModel
+                        sortOrder: ["composer", "conversation", "people"]
+                    }
                     Kube.IconButton {
+                        id: button
                         iconName: model.icon
-                        onClicked: {
-                            var component = Qt.createComponent(model.source)
-                            kubeViews.pushView(component, {})
-                        }
+                        onClicked: kubeViews.showView(model.name)
                         activeFocusOnTab: true
                         checkable: true
                         Controls2.ButtonGroup.group: viewButtonGroup
                         tooltip: model.tooltip
+                        checked: kubeViews.currentViewName == model.name
                     }
                 }
             }
@@ -240,10 +183,11 @@ Controls2.ApplicationWindow {
                 Kube.IconButton {
                     id: logButton
                     iconName: Kube.Icons.info_inverted
-                    onClicked: kubeViews.setLogView()
+                    onClicked: kubeViews.showView("log")
                     activeFocusOnTab: true
                     checkable: true
-                    alert: logView.pendingError
+                    alert: kubeViews.getView("log").pendingError
+                    checked: kubeViews.currentViewName == "log"
                     Controls2.ButtonGroup.group: viewButtonGroup
                     tooltip: qsTr("logview")
                 }
@@ -251,141 +195,95 @@ Controls2.ApplicationWindow {
                 Kube.IconButton {
                     id: accountsButton
                     iconName: Kube.Icons.menu_inverted
-                    onClicked: kubeViews.setAccountsView()
+                    onClicked: kubeViews.showView("accounts")
                     activeFocusOnTab: true
                     checkable: true
+                    checked: kubeViews.currentViewName == "accounts"
                     Controls2.ButtonGroup.group: viewButtonGroup
                     tooltip: qsTr("settings")
                 }
             }
         }
-        Controls2.StackView {
+        ViewManager {
             id: kubeViews
-
             anchors {
                 top: mainContent.top
                 bottom: mainContent.bottom
             }
             Layout.fillWidth: true
 
-            Kube.Listener {
-                filter: Kube.Messages.componentDone
-                onMessageReceived: {
-                    //Return to the mailview if we try to pop everything off
-                    if (kubeViews.depth == 1) {
-                        kubeViews.setMailView()
-                    } else {
-                        kubeViews.pop(Controls2.StackView.Immediate)
-                    }
-                }
-            }
-
-            onCurrentItemChanged: {
-                if (currentItem) {
-                    currentItem.forceActiveFocus()
-                }
-            }
+            extensionModel: extensionModel
 
             Component.onCompleted: {
-                //Setup the initial item stack
-                if (!currentItem) {
-                    setMailView()
-                    if (startupCheck.noAccount) {
-                        setAccountsView()
-                    }
+                dontFocus = true
+                showView("conversation")
+                if (startupCheck.noAccount) {
+                    showView("accounts")
                 }
+                dontFocus = false
             }
 
-            ///Replace the current view (we can't go back to the old view, and we destroy the old view)
-            function replaceView(view) {
-                if (currentItem != view) {
-                    kubeViews.replace(null, view, {}, Controls2.StackView.Immediate)
-                }
-            }
-
-            ///Push a new view on the stack (the old view remains, and we can go back once done)
-            function pushView(view, properties) {
-                kubeViews.push(view, properties, Controls2.StackView.Immediate)
-            }
-
-            //TODO replacing here while a composer is open is destructive
-            function setPeopleView() {
-                replaceView(peopleView)
+            Kube.Listener {
+                filter: Kube.Messages.reply
+                onMessageReceived: kubeViews.replaceView("composer", {message: message.mail, loadAsDraft: false})
             }
 
-            function setMailView() {
-                replaceView(mailView)
+            Kube.Listener {
+                filter: Kube.Messages.edit
+                onMessageReceived: kubeViews.replaceView("composer", {message: message.mail, loadAsDraft: true})
             }
 
-            function setAccountsView() {
-                pushView(accountsView, {})
+            Kube.Listener {
+                filter: Kube.Messages.compose
+                onMessageReceived: kubeViews.replaceView("composer", {newMessage: true, recipients: message.recipients})
             }
 
-            function setLogView() {
-                replaceView(logView)
+            Kube.Listener {
+                filter: Kube.Messages.requestAccountsConfiguration
+                onMessageReceived: kubeViews.showView("accounts")
             }
 
-            function setLoginView(account) {
-                if (currentItem != loginView) {
-                    pushView(loginView, {accountId: account})
+            Kube.Listener {
+                filter: Kube.Messages.componentDone
+                onMessageReceived: {
+                    kubeViews.closeView()
                 }
             }
 
-            function openComposer(newMessage, recipients) {
-                pushView(composerView, {newMessage: newMessage, recipients: recipients})
-            }
-
-            function openComposerWithMail(mail, openAsDraft) {
-                pushView(composerView, {message: mail, loadAsDraft: openAsDraft})
-            }
-
-
-            //These items are not visible until pushed onto the stack, so we keep them in resources instead of items
-            resources: [
-                //Not components so we maintain state
-                MailView {
-                    id: mailView
-                    anchors.fill: parent
-                    Controls2.StackView.onActivated: mailButton.checked = true
-                    Controls2.StackView.onDeactivated: mailButton.checked = false
-                },
-                PeopleView {
-                    id: peopleView
-                    anchors.fill: parent
-                    Controls2.StackView.onActivated: peopleButton.checked = true
-                    Controls2.StackView.onDeactivated: peopleButton.checked = false
-                },
-                //Not a component because otherwise we can't log stuff
-                LogView {
-                    id: logView
-                    anchors.fill: parent
-                    Controls2.StackView.onActivated: logButton.checked = true
-                    Controls2.StackView.onDeactivated: logButton.checked = false
-                }
-            ]
-            //A component so it's always destroyed when we're done
-            Component {
-                id: composerView
-                ComposerView {
-                    anchors.fill: parent
-                    Controls2.StackView.onActivated: composerButton.checked = true
-                    Controls2.StackView.onDeactivated: composerButton.checked = false
-                }
-            }
-            Component {
-                id: accountsView
-                AccountsView {
-                    anchors.fill: parent
-                    Controls2.StackView.onActivated: accountsButton.checked = true
-                    Controls2.StackView.onDeactivated: accountsButton.checked = false
+            Kube.Listener {
+                filter: Kube.Messages.requestLogin
+                onMessageReceived: {
+                    loginView.createObject(kubeViews, {accountId: message.accountId})
                 }
             }
+
             Component {
                 id: loginView
-                LoginView {
-                    anchors.fill: parent
+                Kube.Popup {
+                    id: popup
+                    property alias accountId: login.accountId
+                    visible: true
+                    parent: Controls2.ApplicationWindow.overlay
+                    height: app.height
+                    width: app.width - app.sidebarWidth
+                    x: app.sidebarWidth
+                    y: 0
+                    modal: true
+                    closePolicy: Controls2.Popup.NoAutoClose
+                    Kube.LoginAccount {
+                        id: login
+                        anchors {
+                            fill: parent
+                            bottomMargin: Kube.Units.largeSpacing
+                        }
+                        onDone: {
+                            popup.close()
+                            kubeViews.currentItem.forceActiveFocus()
+                        }
+                    }
                 }
             }
+
         }
     }
     //END Main content
diff --git a/components/kube/qml/LoginView.qml b/components/kube/qml/LoginView.qml
deleted file mode 100644
index dbbed11c..00000000
--- a/components/kube/qml/LoginView.qml
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  Copyright (C) 2017 Michael Bohlender, <michael.bohlender@kdemail.net>
- *  Copyright (C) 2017 Christian Mollekopf, <mollekopf@kolabsys.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.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-import QtQuick 2.4
-import QtQuick.Layouts 1.1
-import QtQuick.Controls 2.0
-import org.kube.framework 1.0 as Kube
-
-FocusScope {
-    id: root
-    property alias accountId: login.accountId
-    onActiveFocusChanged: {
-        if (activeFocus) {
-            popup.forceActiveFocus()
-        }
-    }
-
-    Kube.Popup {
-        id: popup
-        visible: true
-        parent: ApplicationWindow.overlay
-        height: app.height
-        width: app.width - app.sidebarWidth
-        x: app.sidebarWidth
-        y: 0
-        modal: true
-        closePolicy: Popup.NoAutoClose
-        Kube.LoginAccount {
-            id: login
-            anchors {
-                fill: parent
-                bottomMargin: Kube.Units.largeSpacing
-            }
-        }
-    }
-}
diff --git a/components/kube/qml/ViewManager.qml b/components/kube/qml/ViewManager.qml
new file mode 100644
index 00000000..6874107a
--- /dev/null
+++ b/components/kube/qml/ViewManager.qml
@@ -0,0 +1,84 @@
+/*
+ *  Copyright (C) 2018 Christian Mollekopf, <mollekopf@kolabsys.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.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+
+import QtQuick 2.7
+import QtQuick.Controls 2.0
+/*
+* TODO
+* * Only replace composer if necessary (on reply, edit draft, ...)
+* * Shutdown procedure to save draft before destruction
+* * Separate logging from view and and make accessible to log (initialize()) call?
+*/
+StackView {
+    id: root
+    property string currentViewName: currentItem ? currentItem.objectName : ""
+    property variant extensionModel: null
+    property bool dontFocus: false
+
+    property var viewDict: new Object
+    function getView(name, replaceView) {
+        if (!replaceView && name in viewDict) {
+            var item = viewDict[name]
+            if (item) {
+                return item
+            }
+        }
+        var v = Qt.createComponent(extensionModel.findSource(name, "View.qml"))
+        v = v.createObject(root)
+        viewDict[name] = v
+        return v;
+    }
+
+    onCurrentItemChanged: {
+        if (currentItem && !dontFocus) {
+            currentItem.forceActiveFocus()
+        }
+    }
+
+    function showOrReplaceView(name, properties, replace) {
+        if (currentItem && currentItem.objectName == name) {
+            return
+        }
+        if (root.depth > 0) {
+            root.pop(StackView.Immediate)
+        }
+        var view = getView(name, replace)
+        var item = push(view, properties, StackView.Immediate)
+        item.parent = root
+        item.anchors.fill = root
+        item.objectName = name
+    }
+
+    function showView(name, properties) {
+        showOrReplaceView(name, properties, false)
+    }
+
+    function replaceView(name, properties) {
+        showOrReplaceView(name, properties, true)
+    }
+
+    function closeView() {
+        //The initial view remains
+        if (kubeViews.depth > 1) {
+            var item = kubeViews.pop(StackView.Immediate)
+            viewDict[item.objectName] = null
+            item.destroy()
+        }
+    }
+}
diff --git a/framework/qml/LoginAccount.qml b/framework/qml/LoginAccount.qml
index f02050ae..261746d5 100644
--- a/framework/qml/LoginAccount.qml
+++ b/framework/qml/LoginAccount.qml
@@ -26,10 +26,12 @@ Item {
     property string accountId
     property bool canRemove: true
 
+    signal done()
+
     function login() {
         loader.item.login()
         Kube.Fabric.postMessage(Kube.Messages.synchronize, {"accountId": loader.item.accountIdentifier});
-        Kube.Fabric.postMessage(Kube.Messages.componentDone, {})
+        root.done()
     }
 
     Kube.AccountFactory {
diff --git a/framework/src/extensionmodel.cpp b/framework/src/extensionmodel.cpp
index f64a0e17..e3fab7d8 100644
--- a/framework/src/extensionmodel.cpp
+++ b/framework/src/extensionmodel.cpp
@@ -22,12 +22,17 @@
 #include <QDir>
 #include <QDebug>
 #include <QTimer>
+#include <QJsonDocument>
+#include <QJsonObject>
 
 using namespace Kube;
 
 ExtensionModel::ExtensionModel(QObject *parent)
     : QSortFilterProxyModel(parent)
 {
+    setDynamicSortFilter(true);
+    sort(0, Qt::DescendingOrder);
+    setFilterCaseSensitivity(Qt::CaseInsensitive);
     QTimer::singleShot(0, this, &ExtensionModel::load);
 }
 
@@ -36,8 +41,7 @@ QHash<int, QByteArray> ExtensionModel::roleNames() const
     return {
         {Name, "name"},
         {Tooltip, "tooltip"},
-        {Icon, "icon"},
-        {Source, "source"}
+        {Icon, "icon"}
     };
 }
 
@@ -48,21 +52,55 @@ void ExtensionModel::load()
     auto engine = qmlEngine(this);
     Q_ASSERT(engine);
     for (const auto &path : engine->importPathList()) {
-        QDir dir{path + "/org/kube/viewextensions"};
+        QDir dir{path + "/org/kube/views"};
         for (const auto &pluginName : dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot)) {
-            auto viewPath = dir.path() + pluginName + "/View.qml";
-            qWarning() << "Plugin path: " << dir.path() + pluginName + "/View.qml";
+            const auto pluginPath = dir.path() + "/" + pluginName;
+            mPaths.insert(pluginName, pluginPath);
             auto item = new QStandardItem;
-            item->setData(viewPath, Source);
             item->setData(pluginName, Name);
             item->setData(pluginName, Tooltip);
-            item->setData("document-decrypt", Icon);
+            item->setData("kdocumentinfo-inverted", Icon);
+
+            if (QFileInfo::exists(pluginPath + "/metadata.json")) {
+                QFile file{pluginPath + "/metadata.json"};
+                file.open(QIODevice::ReadOnly);
+                auto json = QJsonDocument::fromJson(file.readAll());
+                auto map = json.object().toVariantMap();
+                item->setData(map.value("icon").toString(), Icon);
+                item->setData(map.value("tooltip").toString(), Tooltip);
+                if (map.value("hidden", false).toBool()) {
+                    delete item;
+                    continue;
+                }
+            }
+
             model->appendRow(item);
         }
     }
     setSourceModel(model);
 }
 
+QString ExtensionModel::findSource(const QString &extensionName, const QString &sourceName)
+{
+    if (mPaths.isEmpty()) {
+        load();
+    }
+    return mPaths.value(extensionName) + "/" + sourceName;
+}
+
+void ExtensionModel::setSortOrder(const QVariantList &order)
+{
+    mSortOrder.clear();
+    for (const auto &e : order) {
+        mSortOrder << e.toString();
+    }
+}
+
+QVariantList ExtensionModel::sortOrder() const
+{
+    return {};
+}
+
 QVariant ExtensionModel::data(const QModelIndex &idx, int role) const
 {
     return QSortFilterProxyModel::data(idx, role);
@@ -70,5 +108,14 @@ QVariant ExtensionModel::data(const QModelIndex &idx, int role) const
 
 bool ExtensionModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
 {
-    return QSortFilterProxyModel::lessThan(left, right);
+    auto leftIndex = mSortOrder.indexOf(left.data(Name).toString());
+    auto rightIndex = mSortOrder.indexOf(right.data(Name).toString());
+    if (leftIndex >= 0 && rightIndex >= 0) {
+        //Higher index is less than
+        return leftIndex > rightIndex;
+    }
+    if (leftIndex < 0 && rightIndex < 0) {
+        return QSortFilterProxyModel::lessThan(left, right);
+    }
+    return leftIndex < rightIndex;
 }
diff --git a/framework/src/extensionmodel.h b/framework/src/extensionmodel.h
index 6e984005..8e5580f7 100644
--- a/framework/src/extensionmodel.h
+++ b/framework/src/extensionmodel.h
@@ -27,6 +27,8 @@ namespace Kube {
 class ExtensionModel : public QSortFilterProxyModel
 {
     Q_OBJECT
+
+    Q_PROPERTY(QVariantList sortOrder WRITE setSortOrder READ sortOrder CONSTANT)
 public:
 
     ExtensionModel(QObject *parent = Q_NULLPTR);
@@ -39,14 +41,22 @@ public:
     enum Roles {
         Name  = Qt::UserRole + 1,
         Tooltip,
-        Icon,
-        Source
+        Icon
     };
 
     QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;
 
+    void setSortOrder(const QVariantList &order);
+    QVariantList sortOrder() const;
+
+    Q_INVOKABLE QString findSource(const QString &extensionName, const QString &sourceName);
+
 private slots:
     void load();
+
+private:
+    QStringList mSortOrder;
+    QHash<QString, QString> mPaths;
 };
 
 }
diff --git a/views/CMakeLists.txt b/views/CMakeLists.txt
new file mode 100644
index 00000000..4004e310
--- /dev/null
+++ b/views/CMakeLists.txt
@@ -0,0 +1,11 @@
+macro(install_view name)
+    install(DIRECTORY ${name}/qml/ DESTINATION ${QML_INSTALL_DIR}/org/kube/views/${name})
+    install(FILES ${name}/metadata.json DESTINATION ${QML_INSTALL_DIR}/org/kube/views/${name})
+    add_test(NAME viewtest-${name} COMMAND kubetestrunner WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${name}/tests)
+endmacro()
+
+install_view(composer)
+install_view(conversation)
+install_view(people)
+install_view(log)
+install_view(accounts)
diff --git a/views/accounts/metadata.json b/views/accounts/metadata.json
new file mode 100644
index 00000000..55091f97
--- /dev/null
+++ b/views/accounts/metadata.json
@@ -0,0 +1,4 @@
+{
+    "tooltip": "Account configuration.",
+    "hidden": true
+}
diff --git a/components/kube/qml/AccountsView.qml b/views/accounts/qml/View.qml
index 9b774907..9b774907 100644
--- a/components/kube/qml/AccountsView.qml
+++ b/views/accounts/qml/View.qml
diff --git a/components/kube/tests/tst_accountsview.qml b/views/accounts/tests/tst_accountsview.qml
index 428bb4cc..096ca9eb 100644
--- a/components/kube/tests/tst_accountsview.qml
+++ b/views/accounts/tests/tst_accountsview.qml
@@ -27,7 +27,7 @@ TestCase {
     height: 400
     name: "AccountsView"
 
-    AccountsView {
+    View {
         id: accountsView
     }
 
diff --git a/views/composer/metadata.json b/views/composer/metadata.json
new file mode 100644
index 00000000..c4654fba
--- /dev/null
+++ b/views/composer/metadata.json
@@ -0,0 +1,4 @@
+{
+    "icon": "document-edit-inverted",
+    "tooltip": "Compose new messages."
+}
diff --git a/components/kube/qml/AddresseeListEditor.qml b/views/composer/qml/AddresseeListEditor.qml
index 8f9862e7..8f9862e7 100644
--- a/components/kube/qml/AddresseeListEditor.qml
+++ b/views/composer/qml/AddresseeListEditor.qml
diff --git a/components/kube/qml/ComposerView.qml b/views/composer/qml/View.qml
index 1eb88bb4..1eb88bb4 100644
--- a/components/kube/qml/ComposerView.qml
+++ b/views/composer/qml/View.qml
diff --git a/components/kube/tests/tst_composerview.qml b/views/composer/tests/tst_composerview.qml
index 67db6ef6..eac391c1 100644
--- a/components/kube/tests/tst_composerview.qml
+++ b/views/composer/tests/tst_composerview.qml
@@ -32,7 +32,7 @@ TestCase {
 
     Component {
         id:composerComponent
-        ComposerView {
+        View {
             focus: true
         }
     }
diff --git a/views/conversation/metadata.json b/views/conversation/metadata.json
new file mode 100644
index 00000000..870ff2aa
--- /dev/null
+++ b/views/conversation/metadata.json
@@ -0,0 +1,4 @@
+{
+    "icon": "mail-message-inverted",
+    "tooltip": "Follow conversations."
+}
diff --git a/components/kube/qml/MailView.qml b/views/conversation/qml/View.qml
index 8b2b0caf..8b2b0caf 100644
--- a/components/kube/qml/MailView.qml
+++ b/views/conversation/qml/View.qml
diff --git a/components/kube/tests/tst_mailview.qml b/views/conversation/tests/tst_conversationview.qml
index f31d574d..467c049a 100644
--- a/components/kube/tests/tst_mailview.qml
+++ b/views/conversation/tests/tst_conversationview.qml
@@ -27,7 +27,7 @@ TestCase {
     height: 400
     name: "MailView"
 
-    MailView {
+    View {
         id: mailView
     }
 
diff --git a/views/log/metadata.json b/views/log/metadata.json
new file mode 100644
index 00000000..1bcba1fb
--- /dev/null
+++ b/views/log/metadata.json
@@ -0,0 +1,4 @@
+{
+    "tooltip": "Log messages.",
+    "hidden": true
+}
diff --git a/components/kube/qml/LogView.qml b/views/log/qml/View.qml
index 4ae1a67c..4ae1a67c 100644
--- a/components/kube/qml/LogView.qml
+++ b/views/log/qml/View.qml
diff --git a/components/kube/tests/tst_logview.qml b/views/log/tests/tst_logview.qml
index d3326db1..a78d71cb 100644
--- a/components/kube/tests/tst_logview.qml
+++ b/views/log/tests/tst_logview.qml
@@ -30,7 +30,7 @@ TestCase {
     height: 400
     name: "LogView"
 
-    LogView {
+    View {
         id: logView
     }
 
diff --git a/views/people/metadata.json b/views/people/metadata.json
new file mode 100644
index 00000000..44296a7e
--- /dev/null
+++ b/views/people/metadata.json
@@ -0,0 +1,4 @@
+{
+    "icon": "im-user-inverted",
+    "tooltip": "Your contacts."
+}
diff --git a/components/kube/qml/PeopleView.qml b/views/people/qml/View.qml
index 3f1b9261..3f1b9261 100644
--- a/components/kube/qml/PeopleView.qml
+++ b/views/people/qml/View.qml
diff --git a/components/kube/tests/tst_peopleview.qml b/views/people/tests/tst_peopleview.qml
index e224b527..263247ad 100644
--- a/components/kube/tests/tst_peopleview.qml
+++ b/views/people/tests/tst_peopleview.qml
@@ -27,7 +27,7 @@ TestCase {
     height: 400
     name: "PeopleView"
 
-    PeopleView {
+    View {
         id: peopleView
     }