From 6a46132fd7301092b446065b116522b07dcac761 Mon Sep 17 00:00:00 2001
From: Axolotle <nchesnais@mailoo.org>
Date: Mon, 12 Oct 2020 17:36:47 +0200
Subject: [PATCH] modify imports of api module

---
 app/src/api/api.js                    | 5 +++++
 app/src/api/handlers.js               | 3 ++-
 app/src/components/ApiWaitOverlay.vue | 3 ++-
 app/src/store/data.js                 | 2 +-
 app/src/store/info.js                 | 3 ++-
 app/src/views/PostInstall.vue         | 2 +-
 app/src/views/app/AppActions.vue      | 3 ++-
 app/src/views/app/AppCatalog.vue      | 2 +-
 app/src/views/app/AppConfigPanel.vue  | 3 ++-
 app/src/views/app/AppInfo.vue         | 2 +-
 app/src/views/app/AppInstall.vue      | 3 ++-
 app/src/views/app/AppList.vue         | 2 +-
 app/src/views/backup/BackupCreate.vue | 2 +-
 app/src/views/backup/BackupInfo.vue   | 2 +-
 app/src/views/backup/BackupList.vue   | 2 +-
 app/src/views/diagnosis/Diagnosis.vue | 2 +-
 app/src/views/domain/DomainCert.vue   | 2 +-
 app/src/views/domain/DomainDns.vue    | 2 +-
 app/src/views/service/ServiceInfo.vue | 2 +-
 app/src/views/service/ServiceList.vue | 2 +-
 app/src/views/tool/ToolAdminpw.vue    | 2 +-
 app/src/views/tool/ToolFirewall.vue   | 2 +-
 app/src/views/tool/ToolLog.vue        | 3 ++-
 app/src/views/tool/ToolLogs.vue       | 4 ++--
 app/src/views/tool/ToolMigrations.vue | 2 +-
 app/src/views/tool/ToolPower.vue      | 2 +-
 app/src/views/update/SystemUpdate.vue | 4 ++--
 27 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/app/src/api/api.js b/app/src/api/api.js
index 429443a4..c9bf6932 100644
--- a/app/src/api/api.js
+++ b/app/src/api/api.js
@@ -7,6 +7,11 @@ import store from '@/store'
 import { handleResponse, handleError } from './handlers'
 import { objectToParams } from '@/helpers/commons'
 
+/**
+ * A digested fetch response as an object, a string or an error.
+ * @typedef {(Object|string|Error)} DigestedResponse
+ */
+
 export default {
   options: {
     credentials: 'include',
diff --git a/app/src/api/handlers.js b/app/src/api/handlers.js
index b248e2a4..6f8bbec3 100644
--- a/app/src/api/handlers.js
+++ b/app/src/api/handlers.js
@@ -4,9 +4,10 @@ import store from '@/store'
  * Handler for API responses.
  *
  * @param {Response} response - A fetch `Response` object.
- * @return {DigestedResponse} Parsed response's json, response's text or an error.
+ * @return {(Object|String)} Parsed response's json or response's text.
  */
 async function handleResponse (response) {
+  store.dispatch('SERVER_RESPONDED')
   if (!response.ok) return handleError(response)
   // FIXME the api should always return json objects
   const responseText = await response.text()
diff --git a/app/src/components/ApiWaitOverlay.vue b/app/src/components/ApiWaitOverlay.vue
index a4eff136..2c1988c8 100644
--- a/app/src/components/ApiWaitOverlay.vue
+++ b/app/src/components/ApiWaitOverlay.vue
@@ -12,6 +12,7 @@
           <!-- <b-spinner /> -->
           <img class="pacman" src="@/assets/ajax-loader.gif">
         </div>
+
         <b-card-body class="pb-4">
           <b-card-title class="text-center m-0" v-t="'api_waiting'" />
 
@@ -27,7 +28,7 @@
         </b-card-body>
 
         <!-- MESSAGES -->
-        <b-list-group v-if="messages" flush>
+        <b-list-group v-if="messages" flush class="rounded-0">
           <b-list-group-item
             v-for="({ text, type }, i) in messages" :key="i"
             :variant="type"
diff --git a/app/src/store/data.js b/app/src/store/data.js
index 8506c42d..f215a5b6 100644
--- a/app/src/store/data.js
+++ b/app/src/store/data.js
@@ -1,5 +1,5 @@
 import Vue from 'vue'
-import api from '@/helpers/api'
+import api from '@/api'
 
 export default {
   state: () => ({
diff --git a/app/src/store/info.js b/app/src/store/info.js
index 346ddd1d..6e33cdd2 100644
--- a/app/src/store/info.js
+++ b/app/src/store/info.js
@@ -1,6 +1,7 @@
 import Vue from 'vue'
-import api, { timeout } from '@/helpers/api'
+import api from '@/api'
 import router from '@/router'
+import { timeout } from '@/helpers/commons'
 
 export default {
   state: {
diff --git a/app/src/views/PostInstall.vue b/app/src/views/PostInstall.vue
index 1913b007..ebf6038c 100644
--- a/app/src/views/PostInstall.vue
+++ b/app/src/views/PostInstall.vue
@@ -61,7 +61,7 @@
 </template>
 
 <script>
-import api from '@/helpers/api'
+import api from '@/api'
 import { DomainForm, PasswordForm } from '@/components/reusableForms'
 import LoginView from '@/views/Login'
 
diff --git a/app/src/views/app/AppActions.vue b/app/src/views/app/AppActions.vue
index 93c49964..d3232513 100644
--- a/app/src/views/app/AppActions.vue
+++ b/app/src/views/app/AppActions.vue
@@ -42,8 +42,9 @@
 </template>
 
 <script>
-import api, { objectToParams } from '@/helpers/api'
+import api from '@/api'
 import { formatI18nField, formatYunoHostArgument } from '@/helpers/yunohostArguments'
+import { objectToParams } from '@/helpers/commons'
 
 export default {
   name: 'AppActions',
diff --git a/app/src/views/app/AppCatalog.vue b/app/src/views/app/AppCatalog.vue
index bed10e7c..a646dfc2 100644
--- a/app/src/views/app/AppCatalog.vue
+++ b/app/src/views/app/AppCatalog.vue
@@ -166,7 +166,7 @@
 </template>
 
 <script>
-import api from '@/helpers/api'
+import api from '@/api'
 import InputHelper from '@/components/InputHelper'
 
 export default {
diff --git a/app/src/views/app/AppConfigPanel.vue b/app/src/views/app/AppConfigPanel.vue
index 85b8bb84..a8b8ab10 100644
--- a/app/src/views/app/AppConfigPanel.vue
+++ b/app/src/views/app/AppConfigPanel.vue
@@ -46,8 +46,9 @@
 
 <script>
 // FIXME needs test and rework
-import api, { objectToParams } from '@/helpers/api'
+import api from '@/api'
 import { formatI18nField, formatYunoHostArgument } from '@/helpers/yunohostArguments'
+import { objectToParams } from '@/helpers/commons'
 
 export default {
   name: 'AppConfigPanel',
diff --git a/app/src/views/app/AppInfo.vue b/app/src/views/app/AppInfo.vue
index adc9a6eb..b27e8ef1 100644
--- a/app/src/views/app/AppInfo.vue
+++ b/app/src/views/app/AppInfo.vue
@@ -152,7 +152,7 @@
 </template>
 
 <script>
-import api from '@/helpers/api'
+import api from '@/api'
 import { readableDate } from '@/filters/date'
 
 export default {
diff --git a/app/src/views/app/AppInstall.vue b/app/src/views/app/AppInstall.vue
index 99350bc1..db334713 100644
--- a/app/src/views/app/AppInstall.vue
+++ b/app/src/views/app/AppInstall.vue
@@ -64,8 +64,9 @@
 </template>
 
 <script>
-import api, { objectToParams } from '@/helpers/api'
+import api from '@/api'
 import { formatYunoHostArgument } from '@/helpers/yunohostArguments'
+import { objectToParams } from '@/helpers/commons'
 
 export default {
   name: 'AppInstall',
diff --git a/app/src/views/app/AppList.vue b/app/src/views/app/AppList.vue
index 15e2d84a..98005839 100644
--- a/app/src/views/app/AppList.vue
+++ b/app/src/views/app/AppList.vue
@@ -45,7 +45,7 @@
 </template>
 
 <script>
-import api from '@/helpers/api'
+import api from '@/api'
 
 export default {
   name: 'AppList',
diff --git a/app/src/views/backup/BackupCreate.vue b/app/src/views/backup/BackupCreate.vue
index 1dc90213..51789f5a 100644
--- a/app/src/views/backup/BackupCreate.vue
+++ b/app/src/views/backup/BackupCreate.vue
@@ -90,7 +90,7 @@
 </template>
 
 <script>
-import api from '@/helpers/api'
+import api from '@/api'
 
 export default {
   name: 'BackupCreate',
diff --git a/app/src/views/backup/BackupInfo.vue b/app/src/views/backup/BackupInfo.vue
index 12495e49..831a873b 100644
--- a/app/src/views/backup/BackupInfo.vue
+++ b/app/src/views/backup/BackupInfo.vue
@@ -141,7 +141,7 @@
 </template>
 
 <script>
-import api from '@/helpers/api'
+import api from '@/api'
 import { readableDate } from '@/filters/date'
 import { humanSize } from '@/filters/size'
 
diff --git a/app/src/views/backup/BackupList.vue b/app/src/views/backup/BackupList.vue
index 0fec91c3..6c5e849e 100644
--- a/app/src/views/backup/BackupList.vue
+++ b/app/src/views/backup/BackupList.vue
@@ -32,7 +32,7 @@
 </template>
 
 <script>
-import api from '@/helpers/api'
+import api from '@/api'
 import { distanceToNow, readableDate } from '@/filters/date'
 import { humanSize } from '@/filters/size'
 
diff --git a/app/src/views/diagnosis/Diagnosis.vue b/app/src/views/diagnosis/Diagnosis.vue
index e5a2c841..ea350ea0 100644
--- a/app/src/views/diagnosis/Diagnosis.vue
+++ b/app/src/views/diagnosis/Diagnosis.vue
@@ -107,7 +107,7 @@
 </template>
 
 <script>
-import api from '@/helpers/api'
+import api from '@/api'
 import { distanceToNow } from '@/filters/date'
 
 export default {
diff --git a/app/src/views/domain/DomainCert.vue b/app/src/views/domain/DomainCert.vue
index e8a22153..ec2cdc53 100644
--- a/app/src/views/domain/DomainCert.vue
+++ b/app/src/views/domain/DomainCert.vue
@@ -78,7 +78,7 @@
 </template>
 
 <script>
-import api from '@/helpers/api'
+import api from '@/api'
 
 export default {
   name: 'DomainCert',
diff --git a/app/src/views/domain/DomainDns.vue b/app/src/views/domain/DomainDns.vue
index e3dede92..e1f331a5 100644
--- a/app/src/views/domain/DomainDns.vue
+++ b/app/src/views/domain/DomainDns.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import api from '@/helpers/api'
+import api from '@/api'
 
 export default {
   name: 'DomainDns',
diff --git a/app/src/views/service/ServiceInfo.vue b/app/src/views/service/ServiceInfo.vue
index 1dfcb5a9..f5cbdd61 100644
--- a/app/src/views/service/ServiceInfo.vue
+++ b/app/src/views/service/ServiceInfo.vue
@@ -86,7 +86,7 @@
 </template>
 
 <script>
-import api from '@/helpers/api'
+import api from '@/api'
 import { distanceToNow } from '@/filters/date'
 
 export default {
diff --git a/app/src/views/service/ServiceList.vue b/app/src/views/service/ServiceList.vue
index a497b790..e50a06cf 100644
--- a/app/src/views/service/ServiceList.vue
+++ b/app/src/views/service/ServiceList.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script>
-import api from '@/helpers/api'
+import api from '@/api'
 import { distanceToNow } from '@/filters/date'
 
 export default {
diff --git a/app/src/views/tool/ToolAdminpw.vue b/app/src/views/tool/ToolAdminpw.vue
index 891597ea..a37a4b9b 100644
--- a/app/src/views/tool/ToolAdminpw.vue
+++ b/app/src/views/tool/ToolAdminpw.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import api from '@/helpers/api'
+import api from '@/api'
 import { PasswordForm } from '@/components/reusableForms'
 import InputHelper from '@/components/InputHelper'
 
diff --git a/app/src/views/tool/ToolFirewall.vue b/app/src/views/tool/ToolFirewall.vue
index cc63a04c..8156321f 100644
--- a/app/src/views/tool/ToolFirewall.vue
+++ b/app/src/views/tool/ToolFirewall.vue
@@ -133,7 +133,7 @@
 </template>
 
 <script>
-import api from '@/helpers/api'
+import api from '@/api'
 
 export default {
   name: 'ToolFirewall',
diff --git a/app/src/views/tool/ToolLog.vue b/app/src/views/tool/ToolLog.vue
index b59513ab..c5c1d7d8 100644
--- a/app/src/views/tool/ToolLog.vue
+++ b/app/src/views/tool/ToolLog.vue
@@ -58,7 +58,8 @@
 </template>
 
 <script>
-import api, { objectToParams } from '@/helpers/api'
+import api from '@/api'
+import { objectToParams } from '@/helpers/commons'
 import { readableDate } from '@/filters/date'
 
 export default {
diff --git a/app/src/views/tool/ToolLogs.vue b/app/src/views/tool/ToolLogs.vue
index eddb9b3f..d864013b 100644
--- a/app/src/views/tool/ToolLogs.vue
+++ b/app/src/views/tool/ToolLogs.vue
@@ -29,7 +29,7 @@
 </template>
 
 <script>
-import api from '@/helpers/api'
+import api from '@/api'
 import { distanceToNow, readableDate } from '@/filters/date'
 
 export default {
@@ -70,7 +70,7 @@ export default {
             operation[index].class = 'success'
           } else {
             operation[index].icon = 'close'
-            operation[index].class = 'success'
+            operation[index].class = 'danger'
           }
         })
         this.operations = operation
diff --git a/app/src/views/tool/ToolMigrations.vue b/app/src/views/tool/ToolMigrations.vue
index af84e3f1..2c5c3e6a 100644
--- a/app/src/views/tool/ToolMigrations.vue
+++ b/app/src/views/tool/ToolMigrations.vue
@@ -101,7 +101,7 @@
 </template>
 
 <script>
-import api from '@/helpers/api'
+import api from '@/api'
 
 // FIXME not tested with pending migrations (disclaimer and stuff)
 
diff --git a/app/src/views/tool/ToolPower.vue b/app/src/views/tool/ToolPower.vue
index 9f56e9fa..0c299470 100644
--- a/app/src/views/tool/ToolPower.vue
+++ b/app/src/views/tool/ToolPower.vue
@@ -51,7 +51,7 @@
 </template>
 
 <script>
-import api from '@/helpers/api'
+import api from '@/api'
 import LoginView from '@/views/Login'
 
 export default {
diff --git a/app/src/views/update/SystemUpdate.vue b/app/src/views/update/SystemUpdate.vue
index 407efd8f..619b8474 100644
--- a/app/src/views/update/SystemUpdate.vue
+++ b/app/src/views/update/SystemUpdate.vue
@@ -92,7 +92,7 @@
 </template>
 
 <script>
-import api from '@/helpers/api'
+import api from '@/api'
 
 export default {
   name: 'SystemUpdate',
@@ -135,9 +135,9 @@ export default {
   },
 
   created () {
-    this.fetchData()
     // FIXME Do not perform directly the update ?
     this.performUpdate()
+    this.fetchData()
   }
 }
 </script>