Skip to content

Commit ac21c64

Browse files
committed
Simplified CSS hiding system for dashboard
1 parent f45e861 commit ac21c64

File tree

1 file changed

+20
-29
lines changed

1 file changed

+20
-29
lines changed

ui/components/dashboard.js

Lines changed: 20 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -164,12 +164,7 @@ export class Dashboard extends LitElement {
164164
this.dmarcReports = summary.dmarc.reports;
165165
this.tlsReports = summary.tls.reports;
166166
this.lastUpdate = summary.last_update;
167-
168167
this.classesToHide = [];
169-
if (this.dmarcReports === 0) this.classesToHide.push("dmarc");
170-
if (this.tlsReports === 0) this.classesToHide.push("tls");
171-
if (this.dmarcReports > 0) this.classesToHide.push("no_dmarc_reports");
172-
if (this.tlsReports > 0) this.classesToHide.push("no_tls_reports");
173168

174169
if (Object.values(summary.dmarc.orgs).every((v) => v === 0)) this.classesToHide.push("dmarc_orgs");
175170
if (Object.values(summary.dmarc.domains).every((v) => v === 0)) this.classesToHide.push("dmarc_domains");
@@ -319,7 +314,7 @@ export class Dashboard extends LitElement {
319314
render() {
320315
return html`
321316
<style>
322-
${(this.classesToHide ?? []).map(c => `.${c}`).join(",\n")} {
317+
${(this.classesToHide ?? []).map(c => "." + c).join(", ")} {
323318
display: none;
324319
}
325320
</style>
@@ -328,10 +323,10 @@ export class Dashboard extends LitElement {
328323
329324
<div class="module stats">
330325
<span>Mails: <b>${this.mails}</b></span>
331-
<span class="dmarc">XML Files: <b>${this.xmlFiles}</b></span>
332-
<span class="dmarc">DMARC Reports: <b>${this.dmarcReports}</b></span>
333-
<span class="tls">JSON Files: <b>${this.jsonFiles}</b></span>
334-
<span class="tls">SMTP TLS Reports: <b>${this.tlsReports}</b></span>
326+
<span>XML Files: <b>${this.xmlFiles}</b></span>
327+
<span>DMARC Reports: <b>${this.dmarcReports}</b></span>
328+
<span>JSON Files: <b>${this.jsonFiles}</b></span>
329+
<span>SMTP TLS Reports: <b>${this.tlsReports}</b></span>
335330
<span>Last Update: <b>${new Date(this.lastUpdate * 1000).toLocaleString()}</b></span>
336331
</div>
337332
@@ -362,75 +357,71 @@ export class Dashboard extends LitElement {
362357
</div>
363358
364359
<h2 class="dmarc_charts">DMARC Summary</h2>
365-
<p class="no_dmarc_reports">No DMARC reports found.</p>
366-
367-
<div class="grid dmarc">
368-
<div class="module dmarc dmarc_orgs">
360+
<div class="grid dmarc_charts">
361+
<div class="module dmarc_orgs">
369362
<h3>DMARC Organizations</h3>
370363
<canvas class="dmarc_orgs_chart"></canvas>
371364
</div>
372365
373-
<div class="module dmarc dmarc_domains">
366+
<div class="module dmarc_domains">
374367
<h3>DMARC Domains</h3>
375368
<canvas class="dmarc_domains_chart"></canvas>
376369
</div>
377370
378-
<div class="module dmarc spf_policy">
371+
<div class="module spf_policy">
379372
<h3>SPF Policy Results</h3>
380373
<canvas class="spf_policy_chart"></canvas>
381374
</div>
382375
383-
<div class="module dmarc dkim_policy">
376+
<div class="module dkim_policy">
384377
<h3>DKIM Policy Results</h3>
385378
<canvas class="dkim_policy_chart"></canvas>
386379
</div>
387380
388-
<div class="module dmarc spf_auth">
381+
<div class="module spf_auth">
389382
<h3>SPF Auth Results</h3>
390383
<canvas class="spf_auth_chart"></canvas>
391384
</div>
392385
393-
<div class="module dmarc dkim_auth">
386+
<div class="module dkim_auth">
394387
<h3>DKIM Auth Results</h3>
395388
<canvas class="dkim_auth_chart"></canvas>
396389
</div>
397390
</div>
398391
399392
<h2 class="tls_charts">SMTP TLS Report Summary</h2>
400-
<p class="no_tls_reports">No SMTP TLS reports found.</p>
401-
402-
<div class="grid tls">
403-
<div class="module tls tls_orgs">
393+
<div class="grid tls_charts">
394+
<div class="module tls_orgs">
404395
<h3>TLS Organizations</h3>
405396
<canvas class="tls_orgs_chart"></canvas>
406397
</div>
407398
408-
<div class="module tls tls_domains">
399+
<div class="module tls_domains">
409400
<h3>TLS Domains</h3>
410401
<canvas class="tls_domains_chart"></canvas>
411402
</div>
412403
413-
<div class="module tls tls_policy_types">
404+
<div class="module tls_policy_types">
414405
<h3>TLS Policy Types</h3>
415406
<canvas class="tls_policy_types_chart"></canvas>
416407
</div>
417408
418-
<div class="module tls sts_policy_results">
409+
<div class="module sts_policy_results">
419410
<h3>MTA-STS Policy Results</h3>
420411
<canvas class="sts_policy_results_chart"></canvas>
421412
</div>
422413
423-
<div class="module tls sts_failure_types">
414+
<div class="module sts_failure_types">
424415
<h3>MTA-STS Failure Types</h3>
425416
<canvas class="sts_failure_types_chart"></canvas>
426417
</div>
427418
428-
<div class="module tls tlsa_policy_results">
419+
<div class="module tlsa_policy_results">
429420
<h3>DANE TLSA Policy Results</h3>
430421
<canvas class="tlsa_policy_results_chart"></canvas>
431422
</div>
432423
433-
<div class="module tls tlsa_failure_types">
424+
<div class="module tlsa_failure_types">
434425
<h3>DANE TLSA Failure Types</h3>
435426
<canvas class="tlsa_failure_types_chart"></canvas>
436427
</div>

0 commit comments

Comments
 (0)