From dcfa5c5897bfe95927cb7ff26602f55eac78b1c4 Mon Sep 17 00:00:00 2001
From: "Phyks (Lucas Verney)" <phyks@phyks.me>
Date: Thu, 8 Nov 2018 23:36:10 +0100
Subject: [PATCH] Remove useless i18n strings and restore the fetching info
 alert

---
 src/App.vue                           |  2 +-
 src/components/Alert.vue              | 33 +++++++++++++++++----------
 src/components/ReportDialog/index.vue |  2 +-
 src/i18n/en.json                      |  4 +---
 src/views/Map.vue                     | 12 ++++++++--
 5 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 2002378..5021930 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -57,7 +57,7 @@
             </div>
         </v-toolbar>
         <v-content>
-            <Alert :error="$t('reportDialog.unableToSendDescription')" :onDismiss="dismissError" v-if="hasReportError"></Alert>
+            <Alert type="error" :text="$t('reportDialog.unableToSend')" :onDismiss="dismissError" v-if="hasReportError"></Alert>
             <ShareMapViewModal v-model="isShareMapViewModalShown"></ShareMapViewModal>
             <ReportIssueModal v-model="isReportIssueModalShown"></ReportIssueModal>
             <SearchModal v-model="isSearchModalShown"></SearchModal>
diff --git a/src/components/Alert.vue b/src/components/Alert.vue
index 553501c..f09f5b4 100644
--- a/src/components/Alert.vue
+++ b/src/components/Alert.vue
@@ -1,8 +1,9 @@
 <template>
     <div class="alert-wrapper">
-        <v-alert class="alert" type="error" v-model="showAlert" :dismissible="true" transition="slide-y-transition">
-            {{ error }}
+        <v-alert class="alert" :type="type" v-model="showAlert" :dismissible="true" transition="slide-y-transition">
+            {{ text }}
             <v-progress-linear
+                v-if="autoDismiss"
                 class="progress"
                 v-model="progressValue"
                 background-opacity="0"
@@ -31,18 +32,26 @@ export default {
             }
         },
     },
-    mounted() {
-        this.interval = setInterval(() => {
-            this.progressValue -= 4;
-            if (this.progressValue < 0) {
-                this.showAlert = false;
-                this.clearTimer();
-            }
-        }, 100);
+    updated() {
+        this.clearTimer();
+        if (this.autoDismiss) {
+            this.interval = setInterval(() => {
+                this.progressValue -= 4;
+                if (this.progressValue < 0) {
+                    this.showAlert = false;
+                    this.clearTimer();
+                }
+            }, 100);
+        }
     },
     props: {
-        error: String,
+        autoDismiss: {
+            type: Boolean,
+            default: true,
+        },
+        text: String,
         onDismiss: Function,
+        type: String,
     },
     watch: {
         showAlert(newAlert) {
@@ -58,7 +67,7 @@ export default {
 .alert-wrapper {
     position: absolute;
     top: 0;
-    z-index: 9999;
+    z-index: 1001;
     width: 100%;
 }
 
diff --git a/src/components/ReportDialog/index.vue b/src/components/ReportDialog/index.vue
index 51f5dd7..bb3433a 100644
--- a/src/components/ReportDialog/index.vue
+++ b/src/components/ReportDialog/index.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <Alert :error="$t('reportDialog.unableToSendDescription')" :onDismiss="dismissError" v-if="hasError"></Alert>
+        <Alert type="error" :text="$t('reportDialog.unableToSend')" :onDismiss="dismissError" v-if="hasError"></Alert>
         <v-bottom-sheet v-model="isActive" id="reportCardSheet">
             <v-card>
                 <v-container fluid>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 4140f55..ed1c749 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -60,7 +60,6 @@
         "discard": "Discard",
         "ok": "OK",
         "or": "or",
-        "retry": "Retry",
         "spaceBeforeDoublePunctuations": "&#8203;"
     },
     "notification": {
@@ -89,8 +88,7 @@
         "Reported": "Reported {fromNow}."
     },
     "reportDialog": {
-        "unableToSendDescription": "There was a network issue preventing from sending the latest report.",
-        "unableToSendTitle": "Unable to send latest report"
+        "unableToSend": "There was a network issue preventing from sending the latest report."
     },
     "reportIssueModal": {
         "description": "Description",
diff --git a/src/views/Map.vue b/src/views/Map.vue
index e053464..822d0d2 100644
--- a/src/views/Map.vue
+++ b/src/views/Map.vue
@@ -2,7 +2,9 @@
     <v-container fluid fill-height class="no-padding">
         <v-layout row wrap fill-height>
             <ReportCard></ReportCard>
-            <Alert :error="error" v-if="error" :onDismiss="clearError"></Alert>
+            <Alert type="error" :text="error" v-if="error" :onDismiss="clearError"></Alert>
+            <Alert :autoDismiss="false" type="info" :text="$t('geolocation.fetching')" v-if="hasPromptedGeolocation && !hasGeolocationTracking && !hasGeolocationError"></Alert>
+            <!-- TODO: Show an alert when fetching geolocation -->
             <v-flex xs12 fill-height v-if="mapCenter">
                 <Map
                     :accuracy="currentLocation.hdop"
@@ -170,6 +172,8 @@ export default {
     },
     data() {
         return {
+            hasGeolocationError: false,
+            hasPromptedGeolocation: false,
             isReportDialogVisible: false,
             noSleep: null,
             notification: null,
@@ -226,13 +230,17 @@ export default {
 
                 watchID = navigator.geolocation.watchPosition(
                     setPosition,
-                    handlePositionError,
+                    (error) => {
+                        this.hasGeolocationError = true;
+                        handlePositionError(error);
+                    },
                     {
                         enableHighAccuracy: true,
                         maximumAge: 30000,
                     },
                 );
             }
+            this.hasPromptedGeolocation = true;
             this.$store.dispatch('setLocationWatcherId', { id: watchID });
         },
         onMapCenterManualUpdate(center) {