From 071495a3a0363a5367bd6f2e0393196b90d40d66 Mon Sep 17 00:00:00 2001 From: Roman Rizzi Date: Tue, 2 Jul 2024 10:07:50 -0300 Subject: [PATCH] Fix build and add styles to template --- .../admin-plugins/show/discourse-antivirus-stats.hbs | 8 ++++++-- .../admin-discourse-antivirus-plugin-route-map.js | 5 +---- assets/stylesheets/antivirus-stats.scss | 9 +++++++++ config/locales/client.en.yml | 1 + plugin.rb | 1 + spec/lib/discourse_antivirus/background_scan_spec.rb | 2 +- 6 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 assets/stylesheets/antivirus-stats.scss diff --git a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-antivirus-stats.hbs b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-antivirus-stats.hbs index 2cb26b7..683a526 100644 --- a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-antivirus-stats.hbs +++ b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-antivirus-stats.hbs @@ -3,7 +3,7 @@

{{i18n "antivirus.stats.title"}}

- +
@@ -22,7 +22,11 @@
{{i18n "antivirus.version"}}
- +
+

{{i18n "antivirus.stats.data"}}

+
+ +
diff --git a/assets/javascripts/discourse/admin-discourse-antivirus-plugin-route-map.js b/assets/javascripts/discourse/admin-discourse-antivirus-plugin-route-map.js index 9b057b1..062aedd 100644 --- a/assets/javascripts/discourse/admin-discourse-antivirus-plugin-route-map.js +++ b/assets/javascripts/discourse/admin-discourse-antivirus-plugin-route-map.js @@ -3,9 +3,6 @@ export default { path: "/plugins", map() { - this.route( - "discourse-antivirus-stats", - { path: "stats" } - ); + this.route("discourse-antivirus-stats", { path: "stats" }); }, }; diff --git a/assets/stylesheets/antivirus-stats.scss b/assets/stylesheets/antivirus-stats.scss new file mode 100644 index 0000000..88bd85f --- /dev/null +++ b/assets/stylesheets/antivirus-stats.scss @@ -0,0 +1,9 @@ +.antivirus-stats { + &__sub-header { + margin-top: 15px; + } + + &__header { + margin-bottom: 5px; + } +} \ No newline at end of file diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index a8ba79b..a7b0bcc 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -20,6 +20,7 @@ en: stats: title: Stats + data: Scan results total_scans: Scanned Files recently_scanned: Recently Scanned quarantined: Quarantined diff --git a/plugin.rb b/plugin.rb index 60b0284..5d03e91 100644 --- a/plugin.rb +++ b/plugin.rb @@ -11,6 +11,7 @@ enabled_site_setting :discourse_antivirus_enabled register_asset "stylesheets/reviewable-upload.scss" +register_asset "stylesheets/antivirus-stats.scss" module ::DiscourseAntivirus PLUGIN_NAME = "discourse-antivirus" diff --git a/spec/lib/discourse_antivirus/background_scan_spec.rb b/spec/lib/discourse_antivirus/background_scan_spec.rb index c989938..4cedec9 100644 --- a/spec/lib/discourse_antivirus/background_scan_spec.rb +++ b/spec/lib/discourse_antivirus/background_scan_spec.rb @@ -251,7 +251,7 @@ def create_scanned_upload(database_version: db_version, next_scan_at: nil) end def get_stats(stat) - build_scanner.stats.dig(:background_scan_stats, stat) + build_scanner.stats.dig(:stats, stat) end def create_scanned_upload(updated_at: 6.hours.ago, quarantined: false, scans: 0)
{{i18n "antivirus.stats.total_scans"}}