From da7e582cf9cdeb1da738e32dcd744d62f0103803 Mon Sep 17 00:00:00 2001
From: "Phyks (Lucas Verney)" <phyks@phyks.me>
Date: Thu, 26 Jul 2018 13:55:08 +0200
Subject: [PATCH] Add a way to resend unsent reports, fix for #14.

---
 src/App.vue                           | 48 +++++++++++++++++++++++++++
 src/components/ReportDialog/index.vue | 38 +++++++--------------
 src/components/ReportErrorModal.vue   | 42 +++++++++++++++++++++++
 src/constants.js                      |  4 +++
 src/i18n/en.json                      |  1 +
 src/store/actions.js                  |  5 +++
 src/store/mutations-types.js          |  1 +
 src/store/mutations.js                |  6 ++++
 8 files changed, 119 insertions(+), 26 deletions(-)
 create mode 100644 src/components/ReportErrorModal.vue

diff --git a/src/App.vue b/src/App.vue
index e261ff9..0faf9e2 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -7,6 +7,23 @@
                 <v-toolbar-title v-text="title" class="ma-0"></v-toolbar-title>
             </router-link>
             <v-spacer></v-spacer>
+            <v-btn
+                v-if="unsentReportsLength > 0"
+                icon
+                role="button"
+                :aria-label="$t('buttons.uploadUnsents')"
+                :loading="isSendingReports"
+                :disabled="isSendingReports"
+                class="mr-3"
+                color="orange"
+                dark
+                @click="sendUnsentReports"
+                >
+                <v-badge color="orange" left>
+                    <span slot="badge">{{ unsentReportsLength }}</span>
+                    <v-icon>cloud_upload</v-icon>
+                </v-badge>
+            </v-btn>
             <v-menu offset-y class="menu" v-if="$route.name === 'Onboarding' || $route.name === 'Map' || $route.name === 'SharedMap'">
                 <v-btn slot="activator" icon role="button" :aria-label="$t('buttons.menu')">
                     <v-icon>more_vert</v-icon>
@@ -31,6 +48,7 @@
             </div>
         </v-toolbar>
         <v-content>
+            <ReportErrorModal v-model="hasReportError"></ReportErrorModal>
             <ShareMapViewModal v-model="isShareMapViewModalShown"></ShareMapViewModal>
             <router-view></router-view>
         </v-content>
@@ -38,10 +56,14 @@
 </template>
 
 <script>
+import { DELAY_BETWEEN_API_BATCH_REQUESTS } from '@/constants';
+
+import ReportErrorModal from '@/components/ReportErrorModal.vue';
 import ShareMapViewModal from '@/components/ShareMapViewModal.vue';
 
 export default {
     components: {
+        ReportErrorModal,
         ShareMapViewModal,
     },
     computed: {
@@ -51,9 +73,14 @@ export default {
         isShareMapViewMenuEntryVisible() {
             return this.$store.state.map.center.every(item => item !== null);
         },
+        unsentReportsLength() {
+            return this.$store.state.unsentReports.length;
+        },
     },
     data() {
         return {
+            hasReportError: false,
+            isSendingReports: false,
             isShareMapViewModalShown: false,
             title: "Cycl'Assist",
         };
@@ -68,6 +95,27 @@ export default {
         goToSettings() {
             this.$router.push({ name: 'Settings' });
         },
+        sendUnsentReports() {
+            if (!this.unsentReportsLength) {
+                this.isSendingReports = false;
+                return;
+            }
+            this.isSendingReports = true;
+
+            const index = this.unsentReportsLength - 1;
+            const report = this.$store.state.unsentReports[index];
+            this.$store.dispatch('saveReport', report)
+                .then(() => {
+                    this.$store.dispatch('removeUnsentReport', { index });
+                    this.hasReportError = false;
+                    setTimeout(this.sendUnsentReports, DELAY_BETWEEN_API_BATCH_REQUESTS);
+                })
+                .catch((exc) => {
+                    console.error(exc);
+                    this.hasReportError = true;
+                    this.isSendingReports = false;
+                });
+        },
     },
 };
 </script>
diff --git a/src/components/ReportDialog/index.vue b/src/components/ReportDialog/index.vue
index fd74c22..e48e676 100644
--- a/src/components/ReportDialog/index.vue
+++ b/src/components/ReportDialog/index.vue
@@ -1,33 +1,19 @@
 <template>
     <div>
-        <Modal v-model="hasError">
-            <v-card>
-                <v-card-title class="subheading">{{ $t('reportDialog.unableToSendTitle') }}</v-card-title>
-
-                <v-card-text>{{ $t('reportDialog.unableToSendDescription') }} </v-card-text>
-
-                <v-card-actions>
-                    <v-spacer></v-spacer>
-
-                    <v-btn
-                        color="red darken-1"
-                        @click="hasError = false"
-                        dark
-                        large
-                        role="button"
-                        >
-                        {{ $t('misc.discard') }}
-                    </v-btn>
-
-                    <v-spacer></v-spacer>
-                </v-card-actions>
-            </v-card>
-        </Modal>
+        <ReportErrorModal v-model="hasError"></ReportErrorModal>
         <v-bottom-sheet v-model="isActive">
             <v-card>
                 <v-container fluid>
                     <v-layout row wrap>
-                        <ReportTile v-for="type in REPORT_TYPES_ORDER" :type="type" :imageSrc="REPORT_TYPES[type].image" :label="$t(REPORT_TYPES[type].label)" :save="saveReport" :key="type"></ReportTile>
+                        <ReportTile
+                            v-for="type in REPORT_TYPES_ORDER"
+                            :type="type"
+                            :imageSrc="REPORT_TYPES[type].image"
+                            :label="$t(REPORT_TYPES[type].label)"
+                            :save="saveReport"
+                            :key="type"
+                            >
+                        </ReportTile>
                     </v-layout>
                 </v-container>
             </v-card>
@@ -38,7 +24,7 @@
 <script>
 import { REPORT_TYPES, REPORT_TYPES_ORDER } from '@/constants';
 
-import Modal from '@/components/Modal.vue';
+import ReportErrorModal from '@/components/ReportErrorModal.vue';
 import ReportTile from './ReportTile.vue';
 
 export default {
@@ -46,7 +32,7 @@ export default {
         window.removeEventListener('keydown', this.hideReportDialogOnEsc);
     },
     components: {
-        Modal,
+        ReportErrorModal,
         ReportTile,
     },
     computed: {
diff --git a/src/components/ReportErrorModal.vue b/src/components/ReportErrorModal.vue
new file mode 100644
index 0000000..fb368b2
--- /dev/null
+++ b/src/components/ReportErrorModal.vue
@@ -0,0 +1,42 @@
+<template>
+    <Modal v-model="hasError">
+        <v-card>
+            <v-card-title class="subheading">{{ $t('reportDialog.unableToSendTitle') }}</v-card-title>
+
+            <v-card-text>{{ $t('reportDialog.unableToSendDescription') }} </v-card-text>
+
+            <v-card-actions>
+                <v-spacer></v-spacer>
+
+                <v-btn @click="hasError = false" large role="button">
+                    {{ $t('misc.ok') }}
+                </v-btn>
+
+                <v-spacer></v-spacer>
+            </v-card-actions>
+        </v-card>
+    </Modal>
+</template>
+
+<script>
+import Modal from '@/components/Modal.vue';
+
+export default {
+    components: {
+        Modal,
+    },
+    computed: {
+        hasError: {
+            get() {
+                return this.value;
+            },
+            set(val) {
+                this.$emit('input', val);
+            },
+        },
+    },
+    props: {
+        value: Boolean,
+    },
+};
+</script>
diff --git a/src/constants.js b/src/constants.js
index 43b2b22..158ddbc 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -139,3 +139,7 @@ export const TILE_SERVERS = {
 export const DEFAULT_TILE_SERVER = 'cartodb-voyager';
 
 export const GEOCODING_API_ENDPOINT = 'https://api-adresse.data.gouv.fr/search/';
+
+// Delay in milliseconds between two consecutive calls to the backend API when
+// doing batch requests
+export const DELAY_BETWEEN_API_BATCH_REQUESTS = 1000;
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 7bf28fd..e7df162 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -14,6 +14,7 @@
         "menu": "Menu",
         "recenterMap": "Recenter map",
         "reportProblem": "Report problem",
+        "uploadUnsents": "Upload unsent reports",
         "upvote": "Upvote"
     },
     "geolocation": {
diff --git a/src/store/actions.js b/src/store/actions.js
index fe445dc..1a2693a 100644
--- a/src/store/actions.js
+++ b/src/store/actions.js
@@ -10,6 +10,7 @@ import {
     IS_LOADING,
     PUSH_REPORT,
     PUSH_UNSENT_REPORT,
+    REMOVE_UNSENT_REPORT,
     SET_CURRENT_MAP_CENTER,
     SET_CURRENT_MAP_ZOOM,
     SET_CURRENT_POSITION,
@@ -48,6 +49,10 @@ export function saveUnsentReport({ commit }, { report }) {
     commit(PUSH_UNSENT_REPORT, { report });
 }
 
+export function removeUnsentReport({ commit }, { index }) {
+    commit(REMOVE_UNSENT_REPORT, { index });
+}
+
 export function hideReportDetails({ commit }) {
     return commit(SHOW_REPORT_DETAILS, { id: null, userAsked: null });
 }
diff --git a/src/store/mutations-types.js b/src/store/mutations-types.js
index e2e5378..069893d 100644
--- a/src/store/mutations-types.js
+++ b/src/store/mutations-types.js
@@ -3,6 +3,7 @@ export const IS_DONE_LOADING = 'IS_DONE_LOADING';
 export const IS_LOADING = 'IS_LOADING';
 export const PUSH_REPORT = 'PUSH_REPORT';
 export const PUSH_UNSENT_REPORT = 'PUSH_UNSENT_REPORT';
+export const REMOVE_UNSENT_REPORT = 'REMOVE_UNSENT_REPORT';
 export const SET_CURRENT_MAP_CENTER = 'SET_CURRENT_MAP_CENTER';
 export const SET_CURRENT_MAP_ZOOM = 'SET_CURRENT_MAP_ZOOM';
 export const SET_CURRENT_POSITION = 'SET_CURRENT_POSITION';
diff --git a/src/store/mutations.js b/src/store/mutations.js
index 123b42f..628bb43 100644
--- a/src/store/mutations.js
+++ b/src/store/mutations.js
@@ -110,6 +110,12 @@ export const mutations = {
             localStorage.setItem('unsentReports', JSON.stringify(state.unsentReports));
         }
     },
+    [types.REMOVE_UNSENT_REPORT](state, { index }) {
+        state.unsentReports.splice(index, 1);
+        if (storageAvailable('localStorage')) {
+            localStorage.setItem('unsentReports', JSON.stringify(state.unsentReports));
+        }
+    },
     [types.SET_CURRENT_MAP_CENTER](state, { center }) {
         Vue.set(state.map, 'center', center);
     },