Consistent timestamps throughout the app

frontend/src/modules/activity/config/filters/date/options.ts

@@ -1,28 +1,29 @@
 import { SelectFilterOptionGroup } from '@/shared/modules/filters/types/filterTypes/SelectFilterConfig';
 import moment from 'moment';
 
+// Days period is -1 to include today's data
 const options: SelectFilterOptionGroup[] = [
   {
     options: [
       {
         label: 'Last 24 hours',
-        value: moment().subtract(24, 'hour').format('YYYY-MM-DD'),
+        value: moment().utc().subtract(24, 'hour').format('YYYY-MM-DD'),
       },
       {
         label: 'Last 7 days',
-        value: moment().subtract(7, 'day').format('YYYY-MM-DD'),
+        value: moment().utc().subtract(6, 'day').format('YYYY-MM-DD'),
       },
       {
         label: 'Last 14 days',
-        value: moment().subtract(14, 'day').format('YYYY-MM-DD'),
+        value: moment().utc().subtract(13, 'day').format('YYYY-MM-DD'),
       },
       {
         label: 'Last 30 days',
-        value: moment().subtract(30, 'day').format('YYYY-MM-DD'),
+        value: moment().utc().subtract(29, 'day').format('YYYY-MM-DD'),
       },
       {
         label: 'Last 90 days',
-        value: moment().subtract(90, 'day').format('YYYY-MM-DD'),
+        value: moment().utc().subtract(89, 'day').format('YYYY-MM-DD'),
       },
     ],
   },

frontend/src/modules/conversation/config/filters/dateStarted/options.ts

@@ -1,28 +1,29 @@
 import { SelectFilterOptionGroup } from '@/shared/modules/filters/types/filterTypes/SelectFilterConfig';
 import moment from 'moment';
 
+// Days period is -1 to include today's data
 const options: SelectFilterOptionGroup[] = [
   {
     options: [
       {
         label: 'Last 24 hours',
-        value: moment().subtract(24, 'hour').format('YYYY-MM-DD'),
+        value: moment().utc().subtract(24, 'hour').format('YYYY-MM-DD'),
       },
       {
         label: 'Last 7 days',
-        value: moment().subtract(7, 'day').format('YYYY-MM-DD'),
+        value: moment().utc().subtract(6, 'day').format('YYYY-MM-DD'),
       },
       {
         label: 'Last 14 days',
-        value: moment().subtract(14, 'day').format('YYYY-MM-DD'),
+        value: moment().utc().subtract(13, 'day').format('YYYY-MM-DD'),
       },
       {
         label: 'Last 30 days',
-        value: moment().subtract(30, 'day').format('YYYY-MM-DD'),
+        value: moment().utc().subtract(29, 'day').format('YYYY-MM-DD'),
       },
       {
         label: 'Last 90 days',
-        value: moment().subtract(90, 'day').format('YYYY-MM-DD'),
+        value: moment().utc().subtract(89, 'day').format('YYYY-MM-DD'),
       },
     ],
   },

frontend/src/modules/dashboard/components/conversations/dashboard-conversation-list.vue

@@ -37,6 +37,7 @@
         :to="{
           name: 'activity',
           hash: '#conversation',
+          query: filterQueryService().setQuery(allConversationsFilter),
         }"
         class="text-red font-medium text-center text-xs leading-5"
       >
@@ -57,6 +58,8 @@ import { mapGetters } from 'vuex';
 import AppDashboardEmptyState from '@/modules/dashboard/components/dashboard-empty-state.vue';
 import AppDashboardConversationItem from '@/modules/dashboard/components/conversations/dashboard-conversation-item.vue';
 import AppConversationDrawer from '@/modules/conversation/components/conversation-drawer.vue';
+import { filterQueryService } from '@/shared/modules/filters/services/filter-query.service';
+import moment from 'moment';
 
 export default {
   name: 'AppDashboardConversationList',
@@ -68,13 +71,29 @@ export default {
   data() {
     return {
       conversationId: null,
+      filterQueryService,
     };
   },
   computed: {
     ...mapGetters('dashboard', [
       'trendingConversations',
       'conversations',
     ]),
+    allConversationsFilter() {
+      return {
+        search: '',
+        relation: 'and',
+        order: {
+          prop: 'activityCount',
+          order: 'descending',
+        },
+        lastActivityDate: {
+          operator: 'gt',
+          value: moment().utc().subtract(6, 'day').format('YYYY-MM-DD'),
+          include: true,
+        },
+      };
+    },
   },
   methods: {
     refreshConversations() {

frontend/src/modules/dashboard/components/dashboard-activities.vue

@@ -5,7 +5,11 @@
       title="Activities"
       :total-loading="activities.loading"
       :total="activities.total"
-      :route="{ name: 'activity', hash: '#activity' }"
+      :route="{
+        name: 'activity',
+        hash: '#activity',
+        query: filterQueryService().setQuery(allActivitiesFilter),
+      }"
       button-title="All activities"
       report-name="Activities report"
     />
@@ -87,6 +91,7 @@ import AppDashboardConversationList from '@/modules/dashboard/components/convers
 import AppDashboardActivityList from '@/modules/dashboard/components/activity/dashboard-activity-list.vue';
 import AppDashboardActivitySentiment from '@/modules/dashboard/components/activity/dashboard-activity-sentiment.vue';
 import AppDashboardCount from '@/modules/dashboard/components/dashboard-count.vue';
+import { filterQueryService } from '@/shared/modules/filters/services/filter-query.service';
 
 export default {
   name: 'AppDashboardActivities',
@@ -104,6 +109,7 @@ export default {
       tab: 'trending',
       activitiesChart,
       activitiesCount,
+      filterQueryService,
     };
   },
   computed: {
@@ -118,6 +124,16 @@ export default {
         },
       ];
     },
+    allActivitiesFilter() {
+      return {
+        search: '',
+        relation: 'and',
+        order: {
+          prop: 'timestamp',
+          order: 'descending',
+        },
+      };
+    },
   },
 };
 </script>

frontend/src/modules/dashboard/components/dashboard-count.vue

@@ -96,9 +96,7 @@ export default {
           .utc()
           .startOf('day')
           .subtract(
-            this.period.granularity === 'day'
-              ? this.period.value - 1
-              : this.period.value,
+            this.period.value - 1,
             this.period.granularity,
           )
           .toISOString(),
@@ -111,27 +109,21 @@ export default {
           .utc()
           .startOf('day')
           .subtract(
-            this.period.granularity === 'day'
-              ? this.period.value - 1
-              : this.period.value,
+            this.period.value - 1,
             this.period.granularity,
           )
           .subtract(1, 'ms')
           .startOf('day')
           .subtract(
-            this.period.granularity === 'day'
-              ? this.period.value - 1
-              : this.period.value,
+            this.period.value - 1,
             this.period.granularity,
           )
           .toISOString(),
         moment()
           .utc()
           .startOf('day')
           .subtract(
-            this.period.granularity === 'day'
-              ? this.period.value - 1
-              : this.period.value,
+            this.period.value - 1,
             this.period.granularity,
           )
           .subtract(1, 'ms')

frontend/src/modules/dashboard/components/dashboard-members.vue

@@ -5,7 +5,10 @@
       title="Members"
       :total-loading="members.loadingRecent"
       :total="members.total"
-      :route="{ name: 'member' }"
+      :route="{
+        name: 'member',
+        query: filterQueryService().setQuery(allMembers.filter),
+      }"
       button-title="All members"
       report-name="Members report"
     />
@@ -93,7 +96,7 @@
                 :to="{
                   name: 'member',
                   query: filterQueryService().setQuery({
-                    ...newAndActive.filter,
+                    ...allMembers.filter,
                     joinedDate: {
                       value: periodStartDate,
                       operator: 'gt',
@@ -251,6 +254,7 @@ export default {
     ]),
     periodStartDate() {
       return moment()
+        .utc()
         .subtract(this.period.value, 'day')
         .format('YYYY-MM-DD');
     },

frontend/src/modules/dashboard/components/dashboard-organizations.vue

@@ -5,7 +5,10 @@
       title="Organizations"
       :total-loading="organizations.loadingRecent"
       :total="organizations.total"
-      :route="{ name: 'organization' }"
+      :route="{
+        name: 'organization',
+        query: filterQueryService().setQuery(allOrganizations.filter),
+      }"
       button-title="All organizations"
       report-name="Organizations report"
     />
@@ -76,7 +79,7 @@
                 :to="{
                   name: 'organization',
                   query: filterQueryService().setQuery({
-                    ...newAndActive.filter,
+                    ...allOrganizations.filter,
                     joinedDate: {
                       value: periodStartDate,
                       operator: 'gt',

frontend/src/modules/dashboard/dashboard.cube.js

@@ -28,9 +28,7 @@ export function dateRange(period) {
   const end = moment().utc().endOf('day');
   const start = moment()
     .subtract(
-      period.granularity === 'day'
-        ? period.value - 1
-        : period.value,
+      period.value - 1,
       period.granularity,
     )
     .utc()

frontend/src/modules/dashboard/store/actions.js

@@ -39,17 +39,17 @@ export default {
   async getTrendingConversations({ commit, state }) {
     state.conversations.loading = true;
     const { platform, period } = state.filters;
+
     return ConversationService.query({
       filter: {
         and: [
           {
             lastActive: {
               gte: moment()
+                .utc()
                 .startOf('day')
                 .subtract(
-                  period.granularity === 'day'
-                    ? period.value - 1
-                    : period.value,
+                  period.value - 1,
                   period.granularity,
                 )
                 .toISOString(),
@@ -104,18 +104,18 @@ export default {
   async getRecentActivities({ commit, state }) {
     state.activities.loading = true;
     const { platform, period } = state.filters;
+
     return ActivityService.query({
       filter: {
         ...DEFAULT_ACTIVITY_FILTERS,
         and: [
           {
             timestamp: {
               gte: moment()
+                .utc()
                 .startOf('day')
                 .subtract(
-                  period.granularity === 'day'
-                    ? period.value - 1
-                    : period.value,
+                  period.value - 1,
                   period.granularity,
                 )
                 .toISOString(),
@@ -191,9 +191,10 @@ export default {
       activityIsContribution: null,
       activityTimestampFrom: moment()
         .utc()
-        .subtract(period.value, period.granularity)
+        .subtract(period.value - 1, period.granularity)
+        .startOf('day')
         .toISOString(),
-      activityTimestampTo: moment().utc(),
+      activityTimestampTo: moment().utc().endOf('day'),
       orderBy: 'activityCount_DESC',
       offset: 0,
       limit: 5,
@@ -211,18 +212,18 @@ export default {
   async getRecentMembers({ commit, state }) {
     state.members.loadingRecent = true;
     const { platform, period } = state.filters;
+
     return MemberService.listMembers({
       filter: {
         and: [
           ...DEFAULT_MEMBER_FILTERS,
           {
             joinedAt: {
               gte: moment()
+                .utc()
                 .startOf('day')
                 .subtract(
-                  period.granularity === 'day'
-                    ? period.value - 1
-                    : period.value,
+                  period.value - 1,
                   period.granularity,
                 )
                 .toISOString(),
@@ -304,11 +305,10 @@ export default {
           {
             lastActive: {
               gte: moment()
+                .utc()
                 .startOf('day')
                 .subtract(
-                  period.granularity === 'day'
-                    ? period.value - 1
-                    : period.value,
+                  period.value - 1,
                   period.granularity,
                 )
                 .toISOString(),
@@ -349,11 +349,10 @@ export default {
           {
             joinedAt: {
               gte: moment()
+                .utc()
                 .startOf('day')
                 .subtract(
-                  period.granularity === 'day'
-                    ? period.value - 1
-                    : period.value,
+                  period.value - 1,
                   period.granularity,
                 )
                 .toISOString(),

frontend/src/modules/widget/components/activity/widget-activities-kpi.vue

@@ -89,7 +89,10 @@ const widgets = computed(() => [
   {
     title: `${ACTIVITIES_KPI_WIDGET.name} today`,
     query: query(
-      ONE_DAY_PERIOD_FILTER,
+      {
+        ...ONE_DAY_PERIOD_FILTER,
+        value: 2,
+      },
       DAILY_GRANULARITY_FILTER,
     ),
     period: 'day',

frontend/src/modules/widget/components/activity/widget-total-activities.vue

@@ -50,6 +50,7 @@
                 :chart-options="widgetChartOptions"
                 :granularity="granularity"
                 :is-grid-min-max="true"
+                :pivot-modifier="(pivot) => pivot.splice(0, 1)"
                 :show-min-as-value="true"
               />
             </div>