Add option to exclude groups from database reports

share/translations/keepassxc_en.ts

@@ -3806,6 +3806,10 @@ Supported extensions are: %1.</source>
         <source>Search toggle for this and sub groups</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Exclude from database reports</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditWidgetIcons</name>
@@ -9499,6 +9503,47 @@ This option is deprecated, use --set-key-file instead.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ReportsWidgetBase</name>
+    <message>
+        <source>Please wait, report is being calculated…</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Entry…</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>Expire Entry(s)…</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete Entry(s)…</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>Exclude Entry(s) from reports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exclude Group(s) from reports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The Group for &quot;%1&quot; is excluded. Would you like to include all Entries from there as well?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Include Group?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ReportsWidgetBrowserStatistics</name>
     <message>
@@ -9533,10 +9578,6 @@ This option is deprecated, use --set-key-file instead.</source>
         <source>This entry is being excluded from reports</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Please wait, browser statistics is being calculated…</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>No entries with a URL, or none has browser extension settings saved.</source>
         <translation type="unfinished"></translation>
@@ -9553,28 +9594,6 @@ This option is deprecated, use --set-key-file instead.</source>
         <source>URLs</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Edit Entry…</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <source>Delete Entry(s)…</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>Exclude from reports</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <source>Expire Entry(s)…</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
     <message>
         <source>Only show entries that have a URL</source>
         <translation type="unfinished"></translation>
@@ -9598,6 +9617,14 @@ This option is deprecated, use --set-key-file instead.</source>
             <numerusform></numerusform>
         </translation>
     </message>
+    <message>
+        <source> (Group Excluded)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The group for this entry is being excluded from reports</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ReportsWidgetHealthcheck</name>
@@ -9633,10 +9660,6 @@ This option is deprecated, use --set-key-file instead.</source>
         <source>This entry is being excluded from reports</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Please wait, health data is being calculated…</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Congratulations, everything is healthy!</source>
         <translation type="unfinished"></translation>
@@ -9658,29 +9681,15 @@ This option is deprecated, use --set-key-file instead.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit Entry…</source>
+        <source>Show entries that have been excluded from reports</source>
         <translation type="unfinished"></translation>
     </message>
-    <message numerus="yes">
-        <source>Delete Entry(s)…</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
     <message>
-        <source>Exclude from reports</source>
+        <source> (Group Excluded)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message numerus="yes">
-        <source>Expire Entry(s)…</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
     <message>
-        <source>Show entries that have been excluded from reports</source>
+        <source>The group for this entry is being excluded from reports</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -9767,27 +9776,13 @@ This option is deprecated, use --set-key-file instead.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit Entry…</source>
+        <source> (Group Excluded)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message numerus="yes">
-        <source>Delete Entry(s)…</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
     <message>
-        <source>Exclude from reports</source>
+        <source>The group for this entry is being excluded from reports</source>
         <translation type="unfinished"></translation>
     </message>
-    <message numerus="yes">
-        <source>Expire Entry(s)…</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
 </context>
 <context>
     <name>ReportsWidgetPasskeys</name>
@@ -9850,10 +9845,6 @@ This option is deprecated, use --set-key-file instead.</source>
         <source>The passkey file will be vulnerable to theft and unauthorized use, if left unsecured. Are you sure you want to continue?</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Please wait, list of entries with passkeys is being updated…</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>No entries with passkeys.</source>
         <translation type="unfinished"></translation>
@@ -9988,6 +9979,14 @@ This option is deprecated, use --set-key-file instead.</source>
             <numerusform></numerusform>
         </translation>
     </message>
+    <message>
+        <source>Groups excluded from reports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Excluding entire groups from reports isn&apos;t necessarily a problem but please exercise caution when excluding entire groups.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SSHAgent</name>

src/CMakeLists.txt

@@ -194,6 +194,7 @@ set(gui_SOURCES
         gui/remote/RemoteProcess.cpp
         gui/remote/RemoteSettings.cpp
         gui/reports/ReportsWidget.cpp
+        gui/reports/ReportsWidgetBase.cpp
         gui/reports/ReportsDialog.cpp
         gui/reports/ReportsWidgetHealthcheck.cpp
         gui/reports/ReportsPageHealthcheck.cpp

src/core/DatabaseStats.cpp

@@ -76,6 +76,10 @@ void DatabaseStats::gatherStats(const QList<Group*>& groups)
 
         ++groupCount;
 
+        if (group->excludeFromReports()) {
+            ++excludedGroups;
+        }
+
         for (const auto* entry : group->entries()) {
             // Don't count anything in the recycle bin
             if (entry->isRecycled()) {
@@ -107,7 +111,7 @@ void DatabaseStats::gatherStats(const QList<Group*>& groups)
                     ++weakPasswords;
                 }
 
-                if (entry->excludeFromReports()) {
+                if (entry->excludeFromReports() || group->excludeFromReports()) {
                     ++excludedEntries;
                 }
 

src/core/DatabaseStats.h

@@ -30,6 +30,7 @@ class DatabaseStats
     int entryCount = 0; // Number of entries (across all groups)
     int expiredEntries = 0; // Number of expired entries
     int excludedEntries = 0; // Number of known bad entries
+    int excludedGroups = 0; // Number of excluded groups from reports
     int weakPasswords = 0; // Number of weak or poor passwords
     int shortPasswords = 0; // Number of passwords 8 characters or less in size
     int uniquePasswords = 0; // Number of unique passwords

src/core/Group.cpp

@@ -1281,6 +1281,33 @@ void Group::setPreviousParentGroup(const Group* group)
     setPreviousParentGroupUuid(group ? group->uuid() : QUuid());
 }
 
+void Group::setExcludeFromReports(bool excluded)
+{
+    customData()->set(CustomData::ExcludeFromReportsLegacy, excluded ? TRUE_STR : FALSE_STR);
+
+    // Clear out the exclusion flag on entries when we set it on the
+    // group because it'll make it easier to individually set it for an
+    // entry later on
+    if (excluded) {
+        for (auto& entry : m_entries) {
+            entry->setExcludeFromReports(false);
+        }
+    }
+}
+
+void Group::markAllEntriesExcludedFromReports()
+{
+    for (auto& entry : m_entries) {
+        entry->setExcludeFromReports(true);
+    }
+}
+
+bool Group::excludeFromReports() const
+{
+    return customData()->contains(CustomData::ExcludeFromReportsLegacy)
+           && customData()->value(CustomData::ExcludeFromReportsLegacy) == TRUE_STR;
+}
+
 bool Group::GroupData::operator==(const Group::GroupData& other) const
 {
     return equals(other, CompareItemDefault);

src/core/Group.h

@@ -107,6 +107,7 @@ class Group : public ModifiableObject
     QString resolveCustomDataString(const QString& key, bool checkParent = true) const;
     const Group* previousParentGroup() const;
     QUuid previousParentGroupUuid() const;
+    bool excludeFromReports() const;
 
     bool equals(const Group* other, CompareItemOptions options) const;
 
@@ -140,6 +141,8 @@ class Group : public ModifiableObject
     void setMergeMode(MergeMode newMode);
     void setPreviousParentGroup(const Group* group);
     void setPreviousParentGroupUuid(const QUuid& uuid);
+    void setExcludeFromReports(bool exclude);
+    void markAllEntriesExcludedFromReports();
 
     bool canUpdateTimeinfo() const;
     void setUpdateTimeinfo(bool value);

src/gui/group/EditGroupWidget.cpp

@@ -126,6 +126,7 @@ void EditGroupWidget::setupModifiedTracking()
     connect(m_mainUi->autoTypeSequenceInherit, SIGNAL(toggled(bool)), SLOT(setModified()));
     connect(m_mainUi->autoTypeSequenceCustomRadio, SIGNAL(toggled(bool)), SLOT(setModified()));
     connect(m_mainUi->autoTypeSequenceCustomEdit, SIGNAL(textChanged(QString)), SLOT(setModified()));
+    connect(m_mainUi->excludeReportsCheckBox, SIGNAL(stateChanged(int)), SLOT(setModified()));
 
     // Icon tab
     connect(m_editGroupWidgetIcons, SIGNAL(widgetUpdated()), SLOT(setModified()));
@@ -171,6 +172,7 @@ void EditGroupWidget::loadGroup(Group* group, bool create, const QSharedPointer<
         m_mainUi->autoTypeSequenceCustomRadio->setChecked(true);
     }
     m_mainUi->autoTypeSequenceCustomEdit->setText(group->effectiveAutoTypeSequence());
+    m_mainUi->excludeReportsCheckBox->setChecked(m_group->excludeFromReports());
 
     if (config()->get(Config::GUI_MonospaceNotes).toBool()) {
         m_mainUi->editNotes->setFont(Font::fixedFont());
@@ -265,6 +267,7 @@ void EditGroupWidget::apply()
 
     m_temporaryGroup->setSearchingEnabled(triStateFromIndex(m_mainUi->searchComboBox->currentIndex()));
     m_temporaryGroup->setAutoTypeEnabled(triStateFromIndex(m_mainUi->autotypeComboBox->currentIndex()));
+    m_temporaryGroup->setExcludeFromReports(m_mainUi->excludeReportsCheckBox->isChecked());
 
     if (m_mainUi->autoTypeSequenceInherit->isChecked()) {
         m_temporaryGroup->setDefaultAutoTypeSequence(QString());