diff --git a/src/public/app/widgets/type_widgets/content_widget.js b/src/public/app/widgets/type_widgets/content_widget.js index f749d5cbd..65b683eea 100644 --- a/src/public/app/widgets/type_widgets/content_widget.js +++ b/src/public/app/widgets/type_widgets/content_widget.js @@ -28,7 +28,6 @@ import NetworkConnectionsOptions from "./options/other/network_connections.js"; import HtmlImportTagsOptions from "./options/other/html_import_tags.js"; import AdvancedSyncOptions from "./options/advanced/sync.js"; import DatabaseIntegrityCheckOptions from "./options/advanced/database_integrity_check.js"; -import ConsistencyChecksOptions from "./options/advanced/consistency_checks.js"; import VacuumDatabaseOptions from "./options/advanced/vacuum_database.js"; import DatabaseAnonymizationOptions from "./options/advanced/database_anonymization.js"; import BackendLogWidget from "./content/backend_log.js"; @@ -100,7 +99,6 @@ const CONTENT_WIDGETS = { ], _optionsAdvanced: [ DatabaseIntegrityCheckOptions, - ConsistencyChecksOptions, DatabaseAnonymizationOptions, AdvancedSyncOptions, VacuumDatabaseOptions diff --git a/src/public/app/widgets/type_widgets/options/advanced/consistency_checks.js b/src/public/app/widgets/type_widgets/options/advanced/consistency_checks.js deleted file mode 100644 index 1c4689c69..000000000 --- a/src/public/app/widgets/type_widgets/options/advanced/consistency_checks.js +++ /dev/null @@ -1,25 +0,0 @@ -import OptionsWidget from "../options_widget.js"; -import toastService from "../../../../services/toast.js"; -import server from "../../../../services/server.js"; -import { t } from "../../../../services/i18n.js"; - -const TPL = ` -
-

${t("consistency_checks.title")}

- - -
`; - -export default class ConsistencyChecksOptions extends OptionsWidget { - doRender() { - this.$widget = $(TPL); - this.$findAndFixConsistencyIssuesButton = this.$widget.find(".find-and-fix-consistency-issues-button"); - this.$findAndFixConsistencyIssuesButton.on('click', async () => { - toastService.showMessage(t("consistency_checks.finding_and_fixing_message")); - - await server.post('database/find-and-fix-consistency-issues'); - - toastService.showMessage(t("consistency_checks.issues_fixed_message")); - }); - } -} diff --git a/src/public/app/widgets/type_widgets/options/advanced/database_integrity_check.js b/src/public/app/widgets/type_widgets/options/advanced/database_integrity_check.js index cb906a17c..218ba8778 100644 --- a/src/public/app/widgets/type_widgets/options/advanced/database_integrity_check.js +++ b/src/public/app/widgets/type_widgets/options/advanced/database_integrity_check.js @@ -4,13 +4,17 @@ import server from "../../../../services/server.js"; import { t } from "../../../../services/i18n.js"; const TPL = ` -
-

${t("database_integrity_check.title")}

- -

${t("database_integrity_check.description")}

- - -
`; +
+
+

${t("database_integrity_check.title")}

+ +

${t("database_integrity_check.description")}

+ + + +
+
+`; export default class DatabaseIntegrityCheckOptions extends OptionsWidget { doRender() { @@ -28,5 +32,14 @@ export default class DatabaseIntegrityCheckOptions extends OptionsWidget { toastService.showMessage(t("database_integrity_check.integrity_check_failed", { results: JSON.stringify(results, null, 2) }), 15000); } }); + + this.$findAndFixConsistencyIssuesButton = this.$widget.find(".find-and-fix-consistency-issues-button"); + this.$findAndFixConsistencyIssuesButton.on('click', async () => { + toastService.showMessage(t("consistency_checks.finding_and_fixing_message")); + + await server.post('database/find-and-fix-consistency-issues'); + + toastService.showMessage(t("consistency_checks.issues_fixed_message")); + }); } }