Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout

src/_components/modals/AdvancedSettings.vue

@@ -350,5 +350,7 @@ export default {
       }
     },
   },
+
+  watch: {},
 };
 </script>

src/_services/network.service.js

@@ -94,16 +94,16 @@ function getNetworkBackups(userId, networkId, messages, errors) {
             .then(util.handleCrudResponse(messages, errors));
 }
 
-function getLogFlag(messages, errors) {
-    return fetch(`${config.apiUrl}/me/nodes/logs/status`, util.getWithAuth())
+function getLogFlag(networkId, messages, errors) {
+    return fetch(`${config.apiUrl}/me/networks/${networkId}/logs/status`, util.getWithAuth())
             .then(util.handleCrudResponse(messages, errors));
 }
-function disableLog(messages, errors) {
-    return fetch(`${config.apiUrl}/me/nodes/logs/stop`, util.postWithAuth())
+function disableLog(networkId, messages, errors) {
+    return fetch(`${config.apiUrl}/me/networks/${networkId}/logs/stop`, util.postWithAuth())
             .then(util.handlePlaintextResponse(messages, errors));
 }
-function enableLog(disableInDays, messages, errors) {
+function enableLog(disableInDays, networkId, messages, errors) {
     const ttlDaysParam = disableInDays ? '?ttlDays=' + disableInDays : '';
-    return fetch(`${config.apiUrl}/me/nodes/logs/start` + ttlDaysParam, util.postWithAuth())
+    return fetch(`${config.apiUrl}/me/networks/${networkId}/logs/start` + ttlDaysParam, util.postWithAuth())
             .then(util.handlePlaintextResponse(messages, errors));
 }

src/_store/networks.module.js

@@ -155,22 +155,23 @@ const actions = {
                             error => commit('retrieveNetworkKeysFailure', error));
     },
 
-    getLogFlag({ commit }, { messages, errors }) {
+    getLogFlag({ commit }, { networkId, messages, errors }) {
         commit('getLogFlagRequest');
-        networkService.getLogFlag(messages, errors)
+        networkService.getLogFlag(networkId, messages, errors)
                       .then(logFlag => commit('getLogFlagSuccess', logFlag),
                             error => commit('getLogFlagFailure', error));
     },
-    disableLog({ commit }, { messages, errors }) {
+    disableLog({ commit }, { networkId, messages, errors }) {
         commit('disableLogRequest');
-        networkService.disableLog(messages, errors)
+        networkService.disableLog(networkId, messages, errors)
                       .then((ok) => commit('disableLogSuccess'), (error) => commit('disableLogFailure', error));
     },
-    enableLog({ commit, dispatch }, { disableInDays, messages, errors }) {
+    enableLog({ commit, dispatch }, { disableInDays, networkId, messages, errors }) {
         commit('enableLogRequest');
-        networkService.enableLog(disableInDays, messages, errors)
+        networkService.enableLog(disableInDays, networkId, messages, errors)
                       .then((ok) => commit('enableLogSuccess'), (error) => commit('enableLogFailure', error))
-                      .then((r) => dispatch('getLogFlag', { messages: messages, errors: errors }));
+                      .then((r) => dispatch('getLogFlag',
+                                            { networkId: networkId, messages: messages, errors: errors }));
     },
 
     resetRestoreKey({ commit }) { commit('resetRestoreKey'); }

src/account/NetworkPage.vue

@@ -130,12 +130,14 @@
         </div>
 
         <hr/>
-        <div v-if="loading && loading.managingLogFlag"><img :src="loadingImgSrc" /></div>
-        <div else>
-            <div v-if="logFlag && logFlag.flag">
-                {{ messages.node_logs_enabled }} {{ messages.node_logs_until }}
-                {{ messages.date_format_app_data_epoch_time.parseDateMessage(logFlag.expireAt, messages) }}
-                <div v-if="this.isSelfNet">
+
+        <div v-if="this.isSelfNet">
+            <div v-if="loading && loading.managingLogFlag"><img :src="loadingImgSrc" /></div>
+            <div else>
+                <div v-if="logFlag && logFlag.flag">
+                    {{ messages.node_logs_enabled }} {{ messages.node_logs_until }}
+                    {{ messages.date_format_app_data_epoch_time.parseDateMessage(logFlag.expireAt, messages) }}
+
                     <button @click="disableLogs()" class="btn btn-primary"
                             :disabled="loading && loading.managingLogFlag">
                         {{ messages.button_node_logs_disable }}
@@ -143,7 +145,7 @@
                     <br/><br/>
                     <label for="logsExpirationDays">{{ messages.node_logs_disable_after }}</label>
                     <select v-model="logsExpirationDays" name="logsExpirationDays" class="form-control"
-                              style="display: unset; width: unset;">
+                                style="display: unset; width: unset;">
                         <option v-for="day in this.logsExpirationDaysMax" :value="day">{{ day }}</option>
                     </select> {{ messages.node_logs_days }}
                     <button @click="enableLogs(logsExpirationDays)" class="btn btn-primary"
@@ -151,10 +153,8 @@
                         {{ messages.button_node_logs_set_disable_after }}
                     </button>
                 </div>
-            </div>
-            <div v-else>
-                {{ messages.node_logs_disabled }}
-                <div v-if="this.isSelfNet">
+                <div v-else>
+                    {{ messages.node_logs_disabled }}
                     <button @click="enableLogs()" class="btn btn-primary"
                             :disabled="loading && loading.managingLogFlag">
                         {{ messages.button_node_logs_enable }}
@@ -301,7 +301,7 @@
                 });
 
                 if (this.logFlag === null || this.refresher === null) {
-                    this.getLogFlag({ userId: userId, messages: this.messages, errors: this.errors });
+                    this.getLogFlag({ networkId: this.networkId, messages: this.messages, errors: this.errors });
                 }
                 if (this.backups === null || this.refresher === null) {
                     // note about the second part of the condition above: if refreshes is turned on, then fetch backups
@@ -391,11 +391,12 @@
             },
             disableLogs () {
                 this.errors.clear();
-                this.disableLog({messages: this.messages, errors: this.errors});
+                this.disableLog({ networkId: this.networkId, messages: this.messages, errors: this.errors });
             },
             enableLogs (expirationDays) {
                 this.errors.clear();
-                this.enableLog({disableInDays: expirationDays, messages: this.messages, errors: this.errors});
+                this.enableLog({ disableInDays: expirationDays, networkId: this.networkId,
+                                 messages: this.messages, errors: this.errors });
             },
             doUpgrade () {
                 this.upgrade();