feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Axivion: Take versions into account

Browse Source 
Change-Id: I7011549f8ce7d0017f156529792e91292183560f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Christian Stenger
2024-01-29 11:34:42 +01:00
parent 2bc0572553
commit 7e8aac5f3c
2 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/plugins/axivion/axivionoutputpane.cpp
View File

@@ -221,6 +221,7 @@ public:
void addIssues(const Dto::IssueTableDto &dto);
private:
void onSearchParameterChanged();
void updateTableView();
void fetchIssues(const IssueListSearch &search);
void fetchMoreIssues();
@@ -262,6 +263,8 @@ IssuesWidget::IssuesWidget(QWidget *parent)
top->addWidget(m_versionStart);
m_versionEnd = new QComboBox(this);
m_versionEnd->setMinimumContentsLength(25);
connect(m_versionStart, &QComboBox::activated, this, &IssuesWidget::onSearchParameterChanged);
connect(m_versionEnd, &QComboBox::activated, this, &IssuesWidget::onSearchParameterChanged);
top->addWidget(m_versionEnd);
top->addStretch(1);
m_filtersLayout = new QHBoxLayout;
@@ -347,8 +350,8 @@ void IssuesWidget::updateUi()
const std::vector<Dto::AnalysisVersionDto> &versions = info.versions;
for (const Dto::AnalysisVersionDto &version : versions) {
const QString label = version.label.value_or(version.name);
m_versionStart->insertItem(0, label);
m_versionEnd->insertItem(0, label);
m_versionStart->insertItem(0, label, version.date);
m_versionEnd->insertItem(0, label, version.date);
}
m_versionEnd->setCurrentText(versions.back().label.value_or(versions.back().name));
@@ -472,6 +475,27 @@ void IssuesWidget::addIssues(const Dto::IssueTableDto &dto)
}
}
void IssuesWidget::onSearchParameterChanged()
{
m_taskTreeRunner.cancel();
m_addedFilter->setText("0");
m_removedFilter->setText("0");
m_totalRows->setText(Tr::tr("Total rows:"));
m_issuesModel->rootItem()->removeChildren();
// new "first" time lookup
m_totalRowCount = 0;
m_lastRequestedOffset = 0;
IssueListSearch search;
search.kind = m_currentPrefix;
search.versionStart = m_versionStart->currentData().toString();
search.versionEnd = m_versionEnd->currentData().toString();
search.computeTotalRowCount = true;
fetchIssues(search);
}
void IssuesWidget::updateTableView()
{
QTC_ASSERT(!m_currentPrefix.isEmpty(), return);
@@ -489,6 +513,8 @@ void IssuesWidget::updateTableView()
IssueListSearch search;
search.kind = m_currentPrefix;
search.computeTotalRowCount = true;
search.versionStart = m_versionStart->currentData().toString();
search.versionEnd = m_versionEnd->currentData().toString();
fetchIssues(search);
};
m_taskTreeRunner.start(tableInfoRecipe(m_currentPrefix, tableHandler), setupHandler, doneHandler);
@@ -511,6 +537,8 @@ void IssuesWidget::fetchMoreIssues()
search.kind = m_currentPrefix;
m_lastRequestedOffset = m_issuesModel->rowCount();
search.offset = m_lastRequestedOffset;
search.versionStart = m_versionStart->currentData().toString();
search.versionEnd = m_versionEnd->currentData().toString();
fetchIssues(search);
}

8
src/plugins/axivion/axivionplugin.cpp
View File

@@ -74,6 +74,14 @@ QString IssueListSearch::toQuery() const
QString result;
result.append(QString("?kind=%1&offset=%2&limit=%3").arg(kind).arg(offset).arg(limit));
// TODO other params
if (!versionStart.isEmpty()) {
result.append(QString("&start=%1").arg(
QString::fromUtf8(QUrl::toPercentEncoding(versionStart))));
}
if (!versionEnd.isEmpty()) {
result.append(QString("&end=%1").arg(
QString::fromUtf8(QUrl::toPercentEncoding(versionEnd))));
}
if (computeTotalRowCount)
result.append("&computeTotalRowCount=true");
return result;