#638 #1041: Adding View User functionality instead of Edit User

Studio3T · Feb 6, 2019 · 68bfc67 · 68bfc67
1 parent 82f090f
commit 68bfc67
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 33 deletions.
diff --git a/src/robomongo/gui/widgets/explorer/ExplorerUserTreeItem.cpp b/src/robomongo/gui/widgets/explorer/ExplorerUserTreeItem.cpp
@@ -4,9 +4,11 @@
 #include <QMenu>
 
 #include "robomongo/gui/dialogs/CreateUserDialog.h"
-#include "robomongo/gui/utils/DialogUtils.h"
 #include "robomongo/gui/GuiRegistry.h"
+#include "robomongo/gui/utils/DialogUtils.h"
 
+#include "robomongo/core/AppRegistry.h"
+#include "robomongo/core/domain/App.h"
 #include "robomongo/core/domain/MongoDatabase.h"
 #include "robomongo/core/domain/MongoServer.h"
 #include "robomongo/core/settings/ConnectionSettings.h"
@@ -23,7 +25,7 @@ namespace
     std::string buildToolTip(const Robomongo::MongoUser &user)
     {
         char buff[2048] = {0};
-        sprintf(buff, tooltipTemplate, user.name().c_str(), user.id().toString().c_str());
+        sprintf(buff, tooltipTemplate, user.name().c_str(), user.id().c_str());
         return buff;
     }
 }
@@ -36,10 +38,10 @@ namespace Robomongo
         QAction *dropUser = new QAction("Drop User", this);
         VERIFY(connect(dropUser, SIGNAL(triggered()), SLOT(ui_dropUser())));
 
-        QAction *editUser = new QAction("Edit User", this);
-        VERIFY(connect(editUser, SIGNAL(triggered()), SLOT(ui_editUser())));
+        QAction *viewUser = new QAction("View User", this);
+        VERIFY(connect(viewUser, SIGNAL(triggered()), SLOT(ui_viewUser())));
 
-        BaseClass::_contextMenu->addAction(editUser);
+        BaseClass::_contextMenu->addAction(viewUser);
         BaseClass::_contextMenu->addAction(dropUser);
 
         setText(0, QtUtils::toQString(_user.name()));
@@ -56,31 +58,13 @@ namespace Robomongo
                                                  QtUtils::toQString(_user.name()));
 
         if (answer == QMessageBox::Yes)
-            _database->dropUser(_user.id(), _user.name());
+            _database->dropUser(_user.name());
     }
 
-    void ExplorerUserTreeItem::ui_editUser()
+    void ExplorerUserTreeItem::ui_viewUser()
     {
-        std::unique_ptr<CreateUserDialog> dlg = nullptr;
-
-        float const version = _user.version();
-        if (version < MongoUser::minimumSupportedVersion) {
-            dlg.reset(new CreateUserDialog(
-                QtUtils::toQString(_database->server()->connectionRecord()->getFullAddress()), 
-                QtUtils::toQString(_database->name()), _user, treeWidget()));
-        }
-        else {
-           dlg.reset(new CreateUserDialog(_database->server()->getDatabasesNames(), 
-               QtUtils::toQString(_database->server()->connectionRecord()->getFullAddress()), 
-               QtUtils::toQString(_database->name()), _user, treeWidget()));
-        }
-
-        dlg->setWindowTitle("Edit User");
-        dlg->setUserPasswordLabelText("New Password:");
-
-        if (dlg->exec() == QDialog::Accepted) {
-            MongoUser user = dlg->user();
-            _database->createUser(user, true);
-        }
+        auto const& app = Robomongo::AppRegistry::instance().app();
+        app->openShell(_database, QString::fromStdString("db.getUser(\"" + _user.name() + "\")"), true,
+                        Robomongo::QtUtils::toQString(_database->name()), Robomongo::CursorPosition());
     }
 }
diff --git a/src/robomongo/gui/widgets/explorer/ExplorerUserTreeItem.h b/src/robomongo/gui/widgets/explorer/ExplorerUserTreeItem.h
@@ -14,9 +14,9 @@ namespace Robomongo
         typedef ExplorerTreeItem BaseClass;
         ExplorerUserTreeItem(QTreeWidgetItem *parent, MongoDatabase *const database, const MongoUser &user);
 
-    private Q_SLOTS:
+    public Q_SLOTS:
         void ui_dropUser();
-        void ui_editUser();
+        void ui_viewUser();
 
     private:
         const MongoUser _user;

diff --git a/src/robomongo/gui/widgets/explorer/ExplorerWidget.cpp b/src/robomongo/gui/widgets/explorer/ExplorerWidget.cpp
@@ -16,6 +16,7 @@
 #include "robomongo/gui/widgets/explorer/ExplorerDatabaseCategoryTreeItem.h"
 #include "robomongo/gui/widgets/explorer/ExplorerReplicaSetTreeItem.h"
 #include "robomongo/gui/widgets/explorer/ExplorerReplicaSetFolderItem.h"
+#include "robomongo/gui/widgets/explorer/ExplorerUserTreeItem.h"
 
 namespace Robomongo
 {
@@ -146,13 +147,17 @@ namespace Robomongo
     }
 
     void ExplorerWidget::ui_itemDoubleClicked(QTreeWidgetItem *item, int column)
-    {
-        auto collectionItem = dynamic_cast<ExplorerCollectionTreeItem *>(item);
-        if (collectionItem) {
+    {        
+        if (auto collectionItem = dynamic_cast<ExplorerCollectionTreeItem *>(item)) {
             AppRegistry::instance().app()->openShell(collectionItem->collection());
             return;
         }
 
+        if (auto userItem = dynamic_cast<ExplorerUserTreeItem *>(item)) {
+            userItem->ui_viewUser();
+            return;
+        }
+
         auto replicaMemberItem = dynamic_cast<ExplorerReplicaSetTreeItem*>(item);
         if (replicaMemberItem && replicaMemberItem->isUp()) {
             AppRegistry::instance().app()->openShell(replicaMemberItem->server(),