Merge pull request #684 from mapswipe/dev

Dev

Managers Dashboard
- Use a different GeoJSON validator #662
- Add a namespace for file name in storage #668
- Fix delete projects not working #657
Community Dashboard
- Fix the heatmap not moving when the user pans through world copies #655
- Fix time-series aggregation issue #669

Author: thenav56

README.md

@@ -66,6 +66,6 @@ This project is licensed under the Apache License 2.0 - see the [LICENSE](LICENS
 See also the list of [contributors](contributors.md) who participated in this project.
 
 
-## Acknowledgements
+## Acknowledgements 
 
 * Humanitarian organizations can't help people if they can't find them.

community-dashboard/app/Base/utils/temporal.ts

@@ -2,7 +2,7 @@ import { isDefined } from '@togglecorp/fujs';
 
 export function getDateSafe(value: Date | number | string) {
     if (typeof value === 'string') {
-        return new Date(`${value}T00:00`);
+        return new Date(`${value}T00:00:00.000`);
     }
 
     return new Date(value);
@@ -11,17 +11,26 @@ export function getDateSafe(value: Date | number | string) {
 export function resolveTime(date: Date | number | string, resolution: 'day' | 'month' | 'year'): Date {
     const newDate = getDateSafe(date);
 
-    if (resolution === 'day' || resolution === 'month' || resolution === 'year') {
+    if (resolution === 'day') {
         newDate.setHours(0);
         newDate.setMinutes(0);
         newDate.setSeconds(0);
         newDate.setMilliseconds(0);
     }
-    if (resolution === 'month' || resolution === 'year') {
+    if (resolution === 'month') {
         newDate.setDate(1);
+        newDate.setHours(0);
+        newDate.setMinutes(0);
+        newDate.setSeconds(0);
+        newDate.setMilliseconds(0);
     }
     if (resolution === 'year') {
         newDate.setMonth(0);
+        newDate.setDate(1);
+        newDate.setHours(0);
+        newDate.setMinutes(0);
+        newDate.setSeconds(0);
+        newDate.setMilliseconds(0);
     }
     return newDate;
 }

community-dashboard/app/components/ContributionHeatMap/index.tsx

@@ -120,6 +120,7 @@ function ContributionHeatMap(props: Props) {
                 className={styles.mapContainer}
                 maxZoom-={13}
                 minZoom={1}
+                worldCopyJump
             >
                 <HeatmapComponent
                     contributionGeojson={contributionGeojson}

community-dashboard/app/views/StatsBoard/index.tsx

@@ -271,14 +271,16 @@ function StatsBoard(props: Props) {
                 }))
                 .filter((contribution) => contribution.total > 0);
 
-            return mergeItems(
+            const mergedItems = mergeItems(
                 values,
                 (item) => String(item.date),
                 (foo, bar) => ({
                     date: foo.date,
                     total: foo.total + bar.total,
                 }),
             ).sort((a, b) => (a.date - b.date));
+
+            return mergedItems;
         },
         [contributionTimeStats, resolution],
     );

django/apps/aggregated/models.py

@@ -16,6 +16,7 @@ class Type(models.IntegerChoices):
     value = models.CharField(max_length=225, null=True)
 
 
+# NOTE: Django generated table_name is used in mapswipe_workers->delete_project.py
 class AggregatedUserStatData(Model):
     # Ref Fields
     project = models.ForeignKey(Project, on_delete=models.CASCADE, related_name="+")
@@ -35,6 +36,7 @@ class Meta:
         )
 
 
+# NOTE: Django generated table_name is used in mapswipe_workers->delete_project.py
 class AggregatedUserGroupStatData(Model):
     # Ref Fields
     project = models.ForeignKey(Project, on_delete=models.CASCADE, related_name="+")

django/mapswipe/settings.py

@@ -40,7 +40,7 @@
     SENTRY_SAMPLE_RATE=(float, 0.2),
     # Misc
     RELEASE=(str, "develop"),
-    MAPSWIPE_ENVIRONMENT=(str, "dev"),  # prod
+    MAPSWIPE_ENVIRONMENT=str,  # dev/prod
     APP_TYPE=str,
     # Testing
     PYTEST_XDIST_WORKER=(str, None),