* Open newly created query

trueromanus · Dec 4, 2023 · 27d549a · 27d549a
1 parent 78dfb26
commit 27d549a
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 4 deletions.
diff --git a/org.emptyflow.ArdorQuery.appdata.xml b/org.emptyflow.ArdorQuery.appdata.xml
@@ -25,7 +25,11 @@
 	</screenshots>
 
 	<releases>
-		<release version="0.0.11" date="2023-11-20"/>
+		<release version="0.0.12" date="2023-11-20">
+			<description>
+			      <p>This stable release fixes bugs.</p>
+			</description>
+		</release>
 	</releases>
 
 	<content_rating type="oars-1.0" />

diff --git a/src/ListModels/requestscommandpalettelistmodel.cpp b/src/ListModels/requestscommandpalettelistmodel.cpp
@@ -94,6 +94,12 @@ void RequestsCommandPaletteListModel::selectNext()
     refresh();
 }
 
+void RequestsCommandPaletteListModel::forceSelectItem(QUuid id)
+{
+    m_selected = m_history.indexOf(id);
+    selectItem();
+}
+
 void RequestsCommandPaletteListModel::refresh(bool needRecreateHistory)
 {
     beginResetModel();

diff --git a/src/ListModels/requestscommandpalettelistmodel.h b/src/ListModels/requestscommandpalettelistmodel.h
@@ -48,6 +48,7 @@ class RequestsCommandPaletteListModel : public QAbstractListModel
 
     void selectItem();
     void selectNext();
+    void forceSelectItem(QUuid id);
     void refresh(bool needRecreateHistory = false);
     void recreateHistory();
 

diff --git a/src/ViewModels/backendviewmodel.cpp b/src/ViewModels/backendviewmodel.cpp
@@ -42,7 +42,7 @@ void BackendViewModel::setFocusedHelpTextField(bool focusedHelpTextField) noexce
     emit focusedHelpTextFieldChanged();
 }
 
-void BackendViewModel::addNewRequest()
+void BackendViewModel::addNewRequest(bool forceSelectedAddedItem)
 {
     auto model = new HttpRequestModel(this);
 
@@ -51,6 +51,11 @@ void BackendViewModel::addNewRequest()
     request->setSelectedItem(0); // select first empty field for new request
 
     m_requests->addItem(model);
+
+    if (forceSelectedAddedItem) {
+        m_requestsCommandPaletter->refresh(true); // recreate history
+        m_requestsCommandPaletter->forceSelectItem(model->requestId()); // force selection of added element
+    }
 }
 
 bool BackendViewModel::shortcutHandler(const QString &shortcut) noexcept
@@ -111,7 +116,7 @@ bool BackendViewModel::shortcutHandler(const QString &shortcut) noexcept
     } else if (command == m_toggleTabsCommand) {
         m_tabs->toggleTabs();
     } else if (command == m_addQueryCommand) {
-        addNewRequest();
+        addNewRequest(true);
     } else if (command == m_deleteSelectedQueryCommand) {
         deleteCurrentRequest();
     } else if (command == m_selectLastFieldCommand) {

diff --git a/src/ViewModels/backendviewmodel.h b/src/ViewModels/backendviewmodel.h
@@ -116,7 +116,7 @@ class BackendViewModel : public QObject
     bool focusedHelpTextField() const noexcept { return m_focusedHelpTextField; }
     void setFocusedHelpTextField(bool focusedHelpTextField) noexcept;
 
-    Q_INVOKABLE void addNewRequest();
+    Q_INVOKABLE void addNewRequest(bool forceSelectedAddedItem = false);
     Q_INVOKABLE bool shortcutHandler(const QString& shortcut) noexcept;
     Q_INVOKABLE void refreshFindedIndex() noexcept;
     Q_INVOKABLE void openedFile(const QString& filePath) noexcept;