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

Axivion: Start handling total row counts

Browse Source 
Include them only for the first fetch of an issue kind to
avoid costly additional access.

Change-Id: Icebbea5635b1f1d266238f99c43426dc22fb19b9
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Christian Stenger
2024-01-25 11:16:42 +01:00
parent eec7339af3
commit 7c246f025c
3 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -225,6 +225,7 @@ private:
QComboBox *m_versionStart = nullptr; QComboBox *m_versionStart = nullptr;
QComboBox *m_versionEnd = nullptr; QComboBox *m_versionEnd = nullptr;
QLineEdit *m_pathGlobFilter = nullptr; // FancyLineEdit instead? QLineEdit *m_pathGlobFilter = nullptr; // FancyLineEdit instead?
QLabel *m_totalRows = nullptr;
Utils::BaseTreeView *m_issuesView = nullptr; Utils::BaseTreeView *m_issuesView = nullptr;
Utils::TreeModel<> *m_issuesModel = nullptr; Utils::TreeModel<> *m_issuesModel = nullptr;
}; };
@@ -274,6 +275,11 @@ IssuesWidget::IssuesWidget(QWidget *parent)
m_issuesModel = new Utils::TreeModel; m_issuesModel = new Utils::TreeModel;
m_issuesView->setModel(m_issuesModel); m_issuesView->setModel(m_issuesModel);
layout->addWidget(m_issuesView); layout->addWidget(m_issuesView);
m_totalRows = new QLabel(Tr::tr("Total rows:"), this);
QHBoxLayout *bottom = new QHBoxLayout;
layout->addLayout(bottom);
bottom->addStretch(1);
bottom->addWidget(m_totalRows);
layout->addStretch(1); layout->addStretch(1);
setWidget(widget); setWidget(widget);
setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
@@ -346,6 +352,9 @@ void IssuesWidget::setTableDto(const Dto::TableInfoDto &dto)
if (!column.showByDefault) if (!column.showByDefault)
hiddenColumns << column.key; hiddenColumns << column.key;
} }
m_addedFilter->setText("0");
m_removedFilter->setText("0");
m_totalRows->setText(Tr::tr("Total rows:"));
issuesModel->setHeader(columnHeaders); issuesModel->setHeader(columnHeaders);
@@ -360,6 +369,7 @@ void IssuesWidget::setTableDto(const Dto::TableInfoDto &dto)
// first time lookup... should we cache and maybe represent old data? // first time lookup... should we cache and maybe represent old data?
IssueListSearch search; IssueListSearch search;
search.kind = m_currentPrefix; search.kind = m_currentPrefix;
search.computeTotalRowCount = true;
m_issuesView->showProgressIndicator(); m_issuesView->showProgressIndicator();
fetchIssues(search); fetchIssues(search);
} }
@@ -424,13 +434,17 @@ static Utils::Links linksForIssue(const std::map<QString, Dto::Any> &issueRow,
void IssuesWidget::addIssues(const Dto::IssueTableDto &dto) void IssuesWidget::addIssues(const Dto::IssueTableDto &dto)
{ {
QTC_ASSERT(m_currentTableInfo.has_value(), return); QTC_ASSERT(m_currentTableInfo.has_value(), return);
// handle added/removed/total ? if (dto.totalRowCount.has_value())
m_totalRows->setText(Tr::tr("Total rows:") + ' ' + QString::number(dto.totalRowCount.value()));
if (dto.totalAddedCount.has_value())
m_addedFilter->setText(QString::number(dto.totalAddedCount.value()));
if (dto.totalRemovedCount.has_value())
m_removedFilter->setText(QString::number(dto.totalRemovedCount.value()));
ProjectExplorer::Project *project = ProjectExplorer::ProjectManager::startupProject(); ProjectExplorer::Project *project = ProjectExplorer::ProjectManager::startupProject();
Utils::FilePath baseDir = project ? project->projectDirectory() : Utils::FilePath{}; Utils::FilePath baseDir = project ? project->projectDirectory() : Utils::FilePath{};
const std::vector<Dto::ColumnInfoDto> tableColumns = m_currentTableInfo->columns; const std::vector<Dto::ColumnInfoDto> tableColumns = m_currentTableInfo->columns;
// const std::vector<Dto::ColumnInfoDto> columns = dto.columns.value();
const std::vector<std::map<QString, Dto::Any>> rows = dto.rows; const std::vector<std::map<QString, Dto::Any>> rows = dto.rows;
for (auto row : rows) { for (auto row : rows) {
QStringList data; QStringList data;

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

@@ -74,6 +74,8 @@ QString IssueListSearch::toQuery() const
QString result; QString result;
result.append(QString("?kind=%1&offset=%2&limit=%3").arg(kind).arg(offset).arg(limit)); result.append(QString("?kind=%1&offset=%2&limit=%3").arg(kind).arg(offset).arg(limit));
// TODO other params // TODO other params
if (computeTotalRowCount)
result.append("&computeTotalRowCount=true");
return result; return result;
} }

1
src/plugins/axivion/axivionplugin.h
View File

@@ -33,6 +33,7 @@ struct IssueListSearch
QString pathglob; QString pathglob;
int offset = 0; int offset = 0;
int limit = 30; int limit = 30;
bool computeTotalRowCount = false;
QString toQuery() const; QString toQuery() const;
}; };