Merge pull request #12 from downtownallday/reporting

Additional pre-configured date ranges

management/reporting/ui/charting.js

@@ -207,6 +207,15 @@ class DateRange {
         return DateRange.wtd().map(d => DateFormatter.ymd(d));
     }
 
+    static lastXdays(n) {
+        var s = new Date();
+        s.setTime(s.getTime() - (n * 24 * 60 * 60 * 1000));
+        return [ s, new Date() ];
+    }
+    static lastXdays_as_ymd(n) {
+        return DateRange.lastXdays(n).map(d => DateFormatter.ymd(d));
+    }
+    
     static rangeFromType(type) {
         if (type == 'wtd')
             return DateRange.wtd();
@@ -214,6 +223,10 @@ class DateRange {
             return DateRange.mtd();
         else if (type == 'ytd')
             return DateRange.ytd();
+        else if (type == 'last30days')
+            return DateRange.lastXdays(30);
+        else if (type == 'last7days')
+            return DateRange.lastXdays(7)
         return null;
     }
 };

management/reporting/ui/date-range-picker.js

@@ -12,7 +12,7 @@ Vue.component('date-range-picker', {
     data: function() {
         var range_type = null;
         var range = null;
-        var default_range_type = 'mtd';
+        var default_range_type = 'last30days';
         const recall_id_prefix = 'date-range-picker/';
 
         var v = null;
@@ -59,6 +59,8 @@ Vue.component('date-range-picker', {
             range: range,
             range_type: range_type,
             options: [
+                { value:'last7days', text:'Last 7 days' },
+                { value:'last30days', text:'Last 30 days' },
                 { value:'wtd', text:'Week-to-date' },
                 { value:'mtd', text:'Month-to-date' },
                 { value:'ytd', text:'Year-to-date' },
@@ -151,7 +153,11 @@ Vue.component('date-range-picker', {
         
         range_type_change: function(evt) {
             // ui select callback
-            if (this.range_type == 'wtd')
+            if (this.range_type == 'last7days')
+                this.range = DateRange.lastXdays_as_ymd(7);
+            else if (this.range_type == 'last30days')
+                this.range = DateRange.lastXdays_as_ymd(30);
+            else if (this.range_type == 'wtd')
                 this.range = DateRange.wtd_as_ymd();
             else if (this.range_type == 'mtd')
                 this.range = DateRange.mtd_as_ymd();

management/reporting/ui/page-reports-main.html

@@ -11,7 +11,7 @@
     </b-modal>
     
     <div class="d-flex align-items-end">
-      <date-range-picker ref="date_picker" :start_range="get_start_range($route, '-mtd')" recall_id="reports-main" @change="date_change($event)"></date-range-picker>
+      <date-range-picker ref="date_picker" :start_range="get_start_range($route, '-last30days')" recall_id="reports-main" @change="date_change($event)"></date-range-picker>
       <div class="ml-auto mr-1" title="Database stats" role="button" @click="$refs.stats.show()"><b-icon icon="server" scale="1.5" aria-label="Database stats" variant="primary"></b-icon><b-icon icon="info" scale="1.5"></b-icon></div>
     </div>
     

management/reporting/ui/panel-user-activity.html

@@ -61,8 +61,8 @@
         </template>
         <template #row-details="row">
           <b-card>
-            <div><strong>Sent to alias</strong>: {{ row.item.orig_to }}</div>
             <div><strong>Connection disposition</strong>: {{ disposition_formatter(row.item.disposition) }}</div>
+            <div v-if="row.item.orig_to"><strong>Sent to alias</strong>: {{ row.item.orig_to }}</div>
             <div v-if="row.item.dkim_reason"><strong>Dkim reason</strong>: {{row.item.dkim_reason}}</div>
             <div v-if="row.item.dmarc_reason"><strong>Dmarc reason</strong>: {{row.item.dmarc_reason}}</div>
             <div v-if="row.item.postgrey_reason"><strong>Postgrey reason</strong>: {{row.item.postgrey_reason}}</div>

tests/vagrant/funcs.rb

@@ -13,3 +13,5 @@ def use_preloaded_box(obj, name, preloaded_dir=".")
   end
 end
 
+# Grab the name of the default interface
+$default_network_interface = `ip route | awk '/^default/ {printf "%s", $5; exit 0}'`

tests/vagrant/vanilla/Vagrantfile

@@ -3,7 +3,7 @@ load '../funcs.rb'
 Vagrant.configure("2") do |config|
 
   config.vm.synced_folder "../../..", "/mailinabox", id: "mailinabox", automount: false
-  config.vm.network "public_network"
+  config.vm.network "public_network", bridge: "#$default_network_interface"
   use_preloaded_box config, "ubuntu/bionic64", ".."
 
   # vanilla install