Move timestamps to ISO strings in lists (#1401)

Author: joanagmaia

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

@@ -98,8 +98,8 @@
                   query: filterQueryService().setQuery({
                     ...allMembers.filter,
                     joinedDate: {
-                      value: periodStartDate,
-                      operator: 'gt',
+                      value: periodRange,
+                      operator: 'between',
                     },
                   }),
                 }"
@@ -186,8 +186,8 @@
                   query: filterQueryService().setQuery({
                     ...allMembers.filter,
                     lastActivityDate: {
-                      value: periodStartDate,
-                      operator: 'gt',
+                      value: periodRange,
+                      operator: 'between',
                     },
                   }),
                 }"
@@ -252,11 +252,16 @@ export default {
       'members',
       'period',
     ]),
-    periodStartDate() {
-      return moment()
-        .utc()
-        .subtract(this.period.value, 'day')
-        .format('YYYY-MM-DD');
+    periodRange() {
+      return [
+        moment()
+          .utc()
+          .subtract(this.period.value - 1, 'day')
+          .format('YYYY-MM-DD'),
+        moment()
+          .utc()
+          .format('YYYY-MM-DD'),
+      ];
     },
   },
   methods: {

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

@@ -72,7 +72,7 @@
               No new organizations during this period
             </app-dashboard-empty-state>
             <div
-              v-if="organizations.length >= 5"
+              v-if="recentOrganizations.length >= 5"
               class="pt-3"
             >
               <router-link
@@ -81,8 +81,8 @@
                   query: filterQueryService().setQuery({
                     ...allOrganizations.filter,
                     joinedDate: {
-                      value: periodStartDate,
-                      operator: 'gt',
+                      value: periodRange,
+                      operator: 'between',
                     },
                   }),
                 }"
@@ -161,8 +161,8 @@
                   query: filterQueryService().setQuery({
                     ...allOrganizations.filter,
                     lastActivityDate: {
-                      value: periodStartDate,
-                      operator: 'gt',
+                      value: periodRange,
+                      operator: 'between',
                     },
                   }),
                 }"
@@ -224,10 +224,16 @@ export default {
       'organizations',
       'period',
     ]),
-    periodStartDate() {
-      return moment()
-        .subtract(this.period.value, 'day')
-        .format('YYYY-MM-DD');
+    periodRange() {
+      return [
+        moment()
+          .utc()
+          .subtract(this.period.value - 1, 'day')
+          .format('YYYY-MM-DD'),
+        moment()
+          .utc()
+          .format('YYYY-MM-DD'),
+      ];
     },
   },
   methods: {

frontend/src/shared/modules/filters/config/apiFilterRenderer/date.filter.renderer.ts

@@ -12,12 +12,18 @@ export const dateApiFilterRenderer = (property: string, { value, operator }: Dat
     filterOperator = FilterDateOperator.BETWEEN;
   }
 
-  let filter = {
-    [property]: {
-      [filterOperator]: value,
-    },
-  };
-  if ([FilterDateOperator.EQ, FilterDateOperator.NE].includes(operator)) {
+  let filter;
+
+  if ([FilterDateOperator.BETWEEN, FilterDateOperator.NOT_BETWEEN].includes(operator)) {
+    filter = {
+      [property]: {
+        [filterOperator]: [
+          moment.utc(value[0]).startOf('day').toISOString(),
+          moment.utc(value[1]).endOf('day').toISOString(),
+        ],
+      },
+    };
+  } else if ([FilterDateOperator.EQ, FilterDateOperator.NE].includes(operator)) {
     filter = {
       [property]: {
         between: [
@@ -26,6 +32,18 @@ export const dateApiFilterRenderer = (property: string, { value, operator }: Dat
         ],
       },
     };
+  } else {
+    let parsedValue = moment.utc(value).startOf('day').toISOString();
+
+    if ([FilterDateOperator.GT].includes(operator)) {
+      parsedValue = moment.utc(value).endOf('day').toISOString();
+    }
+
+    filter = {
+      [property]: {
+        [filterOperator]: parsedValue,
+      },
+    };
   }
 
   return [