From 610349f24b9f5977efc444e653a9fc2ddaeda97c Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Tue, 18 Feb 2020 22:20:11 +0300
Subject: [PATCH 1/4] Add button for rebooting the instance in desktop, tablet
 and mobile interface

---
 src/lang/en.js                      |  3 ++-
 src/store/modules/settings.js       | 10 ++++----
 src/views/settings/index.vue        | 37 ++++++++++++++++++++++-------
 src/views/settings/styles/main.scss | 33 ++++++++++++++++++-------
 4 files changed, 61 insertions(+), 22 deletions(-)

diff --git a/src/lang/en.js b/src/lang/en.js
index 3fa42e8c..df122612 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -363,7 +363,8 @@ export default {
     assets: 'Assets',
     emoji: 'Emoji',
     markup: 'Markup settings',
-    corsPlug: 'CORS plug config'
+    corsPlug: 'CORS plug config',
+    instanceReboot: 'Instance Reboot'
   },
   invites: {
     inviteTokens: 'Invite tokens',
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index 0ecbc9a2..84c4a9dd 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -6,11 +6,13 @@ const settings = {
   state: {
     activeTab: 'instance',
     configDisabled: true,
-    description: [],
-    settings: {},
-    updatedSettings: {},
     db: {},
-    loading: true
+    description: [],
+    loading: true,
+    needReboot: true,
+    settings: {},
+    updatedSettings: {}
+
   },
   mutations: {
     CLEAR_UPDATED_SETTINGS: (state) => {
diff --git a/src/views/settings/index.vue b/src/views/settings/index.vue
index bc2099ad..cca7959f 100644
--- a/src/views/settings/index.vue
+++ b/src/views/settings/index.vue
@@ -3,17 +3,25 @@
     <div v-if="isDesktop">
       <div class="settings-header-container">
         <h1 class="settings-header">{{ $t('settings.settings') }}</h1>
-        <el-link
-          :underline="false"
-          href="https://docs-develop.pleroma.social/backend/administration/CLI_tasks/config/"
-          target="_blank">
-          <el-button class="settings-docs-button">
+        <div>
+          <el-button v-if="needReboot" class="settings-reboot-button">
             <span>
-              <i class="el-icon-document"/>
-              {{ $t('settings.seeDocs') }}
+              <i class="el-icon-refresh"/>
+              {{ $t('settings.instanceReboot') }}
             </span>
           </el-button>
-        </el-link>
+          <el-link
+            :underline="false"
+            href="https://docs-develop.pleroma.social/backend/administration/CLI_tasks/config/"
+            target="_blank">
+            <el-button class="settings-docs-button">
+              <span>
+                <i class="el-icon-document"/>
+                {{ $t('settings.seeDocs') }}
+              </span>
+            </el-button>
+          </el-link>
+        </div>
       </div>
       <el-tabs v-model="activeTab" tab-position="left">
         <el-tab-pane :label="$t('settings.activityPub')" :disabled="configDisabled" name="activityPub" lazy>
@@ -79,8 +87,16 @@
       </el-tabs>
     </div>
     <div v-if="isMobile || isTablet">
-      <h1 class="settings-header">{{ $t('settings.settings') }}</h1>
       <div class="settings-header-container">
+        <h1 class="settings-header">{{ $t('settings.settings') }}</h1>
+        <el-button v-if="needReboot" class="settings-reboot-button">
+          <span>
+            <i class="el-icon-refresh"/>
+            {{ $t('settings.instanceReboot') }}
+          </span>
+        </el-button>
+      </div>
+      <div class="nav-container">
         <el-select v-model="activeTab" class="settings-menu" placeholder="Select">
           <el-option
             v-for="item in options"
@@ -219,6 +235,9 @@ export default {
     },
     isTablet() {
       return this.$store.state.app.device === 'tablet'
+    },
+    needReboot() {
+      return this.$store.state.settings.needReboot
     }
   },
   mounted: function() {
diff --git a/src/views/settings/styles/main.scss b/src/views/settings/styles/main.scss
index e807deea..bc6cfff1 100644
--- a/src/views/settings/styles/main.scss
+++ b/src/views/settings/styles/main.scss
@@ -247,6 +247,8 @@
     margin-bottom: 10px;
   }
   .settings-container {
+    max-width: 1824px;
+    margin: auto;
     .el-tabs {
       margin-top: 20px
     }
@@ -269,6 +271,11 @@
     align-items: center;
     margin: 22px 30px 15px 15px;
   }
+  .settings-reboot-button {
+    width: 145px;
+    text-align: left;
+    padding: 10px;
+  }
   .single-input {
     margin-right: 10px
   }
@@ -318,10 +325,6 @@
   }
 
   @media only screen and (min-width: 1824px) {
-    .settings-container {
-      max-width: 1824px;
-      margin: auto;
-    }
     .submit-button-container {
       max-width: 1637px;
       margin-left: auto;
@@ -425,11 +428,20 @@
       justify-content: space-between;
     }
     .settings-header {
-      margin: 7px 10px 15px 15px;
+      width: fit-content;
+      display: inline-block;
+      margin: 0;
     }
     .settings-header-container {
       margin: 15px;
     }
+    .nav-container {
+      display: flex;
+      height: 36px;
+      justify-content: space-between;
+      align-items: center;
+      margin: 15px;
+    }
     .settings-menu {
       width: 163px;
     }
@@ -508,6 +520,7 @@
     }
   }
   @media only screen and (max-width:801px) and (min-width: 481px) {
+
     .delete-setting-button {
       margin: 4px 0 0 10px;
       height: 28px;
@@ -538,14 +551,18 @@
       display: flex;
       justify-content: space-between;
     }
+    .nav-container {
+      display: flex;
+      height: 36px;
+      justify-content: space-between;
+      align-items: center;
+      margin: 15px 30px 15px 15px;
+    }
     .rate-limit-label-container {
       width: 250px;
     }
     .settings-delete-button {
       float: right;
     }
-    .settings-header {
-      margin: 5px 0 0 15px;
-    }
   }
 }

From 7f2d61bc1570068f66828c00fc4c186292ee5a9a Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Tue, 18 Feb 2020 23:08:07 +0300
Subject: [PATCH 2/4] Restart application on button click

---
 src/api/settings.js           |  9 +++++++++
 src/store/modules/settings.js | 15 ++++++++++++---
 src/views/settings/index.vue  |  9 +++++++--
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/api/settings.js b/src/api/settings.js
index 9d1c2890..82aa36e7 100644
--- a/src/api/settings.js
+++ b/src/api/settings.js
@@ -40,4 +40,13 @@ export async function removeSettings(configs, authHost, token) {
   })
 }
 
+export async function restartApp(authHost, token) {
+  return await request({
+    baseURL: baseName(authHost),
+    url: `/api/pleroma/admin/restart`,
+    method: 'get',
+    headers: authHeaders(token)
+  })
+}
+
 const authHeaders = (token) => token ? { 'Authorization': `Bearer ${getToken()}` } : {}
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index 84c4a9dd..ab7a3b36 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -1,4 +1,4 @@
-import { fetchDescription, fetchSettings, removeSettings, updateSettings } from '@/api/settings'
+import { fetchDescription, fetchSettings, removeSettings, restartApp, updateSettings } from '@/api/settings'
 import { checkPartialUpdate, parseNonTuples, parseTuples, valueHasTuples, wrapUpdatedSettings } from './normalizers'
 import _ from 'lodash'
 
@@ -9,10 +9,9 @@ const settings = {
     db: {},
     description: [],
     loading: true,
-    needReboot: true,
+    needReboot: false,
     settings: {},
     updatedSettings: {}
-
   },
   mutations: {
     CLEAR_UPDATED_SETTINGS: (state) => {
@@ -52,6 +51,9 @@ const settings = {
       state.settings = newSettings
       state.db = newDbSettings
     },
+    TOGGLE_REBOOT: (state, needReboot) => {
+      state.needReboot = needReboot || false
+    },
     TOGGLE_TABS: (state, status) => {
       state.configDisabled = status
     },
@@ -76,6 +78,7 @@ const settings = {
         const description = await fetchDescription(getters.authHost, getters.token)
         commit('SET_DESCRIPTION', description.data)
         commit('SET_SETTINGS', response.data.configs)
+        commit('TOGGLE_REBOOT', response.data.need_reboot)
       } catch (_e) {
         commit('TOGGLE_TABS', true)
         commit('SET_ACTIVE_TAB', 'relays')
@@ -90,8 +93,13 @@ const settings = {
       const response = await fetchSettings(getters.authHost, getters.token)
       const { group, key, subkeys } = configs[0]
       commit('SET_SETTINGS', response.data.configs)
+      commit('TOGGLE_REBOOT', response.data.need_reboot)
       commit('REMOVE_SETTING_FROM_UPDATED', { group, key, subkeys: subkeys || [] })
     },
+    async RestartApplication({ commit, getters }) {
+      await restartApp(getters.authHost, getters.token)
+      commit('TOGGLE_REBOOT', false)
+    },
     SetActiveTab({ commit }, tab) {
       commit('SET_ACTIVE_TAB', tab)
     },
@@ -104,6 +112,7 @@ const settings = {
       await updateSettings(configs, getters.authHost, getters.token)
       const response = await fetchSettings(getters.authHost, getters.token)
       commit('SET_SETTINGS', response.data.configs)
+      commit('TOGGLE_REBOOT', response.data.need_reboot)
       commit('CLEAR_UPDATED_SETTINGS')
     },
     UpdateSettings({ commit }, { group, key, input, value, type }) {
diff --git a/src/views/settings/index.vue b/src/views/settings/index.vue
index cca7959f..2fe9645b 100644
--- a/src/views/settings/index.vue
+++ b/src/views/settings/index.vue
@@ -4,7 +4,7 @@
       <div class="settings-header-container">
         <h1 class="settings-header">{{ $t('settings.settings') }}</h1>
         <div>
-          <el-button v-if="needReboot" class="settings-reboot-button">
+          <el-button v-if="needReboot" class="settings-reboot-button" @click="restartApp">
             <span>
               <i class="el-icon-refresh"/>
               {{ $t('settings.instanceReboot') }}
@@ -89,7 +89,7 @@
     <div v-if="isMobile || isTablet">
       <div class="settings-header-container">
         <h1 class="settings-header">{{ $t('settings.settings') }}</h1>
-        <el-button v-if="needReboot" class="settings-reboot-button">
+        <el-button v-if="needReboot" class="settings-reboot-button" @click="restartApp">
           <span>
             <i class="el-icon-refresh"/>
             {{ $t('settings.instanceReboot') }}
@@ -242,6 +242,11 @@ export default {
   },
   mounted: function() {
     this.$store.dispatch('FetchSettings')
+  },
+  methods: {
+    restartApp() {
+      this.$store.dispatch('RestartApplication')
+    }
   }
 }
 </script>

From 020c4e13895c4122c5566d9edcbdb5091e6d648a Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Wed, 19 Feb 2020 02:29:34 +0300
Subject: [PATCH 3/4] Add tooltip and success message after instance was
 rebooted

---
 CHANGELOG.md                        |  1 +
 src/lang/en.js                      |  4 +++-
 src/views/settings/index.vue        | 26 ++++++++++++++++++--------
 src/views/settings/styles/main.scss |  1 +
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7ab238c..24db7aec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Report notes
 - Ability to moderate users on the statuses page
 - Ability to moderate user on the user's page
+- Ability to restart an application when settings that require instance reboot were changed
 - Mobile UI for Settings tab
 
 ### Fixed
diff --git a/src/lang/en.js b/src/lang/en.js
index df122612..3f9643ca 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -364,7 +364,9 @@ export default {
     emoji: 'Emoji',
     markup: 'Markup settings',
     corsPlug: 'CORS plug config',
-    instanceReboot: 'Instance Reboot'
+    instanceReboot: 'Instance Reboot',
+    restartApp: 'You must restart the instance to apply settings',
+    restartSuccess: 'Instance rebooted successfully!'
   },
   invites: {
     inviteTokens: 'Invite tokens',
diff --git a/src/views/settings/index.vue b/src/views/settings/index.vue
index 2fe9645b..3d0bbcdb 100644
--- a/src/views/settings/index.vue
+++ b/src/views/settings/index.vue
@@ -4,12 +4,14 @@
       <div class="settings-header-container">
         <h1 class="settings-header">{{ $t('settings.settings') }}</h1>
         <div>
-          <el-button v-if="needReboot" class="settings-reboot-button" @click="restartApp">
-            <span>
-              <i class="el-icon-refresh"/>
-              {{ $t('settings.instanceReboot') }}
-            </span>
-          </el-button>
+          <el-tooltip v-if="needReboot" :content="$t('settings.restartApp')" placement="bottom-end">
+            <el-button type="warning" class="settings-reboot-button" @click="restartApp">
+              <span>
+                <i class="el-icon-refresh"/>
+                {{ $t('settings.instanceReboot') }}
+              </span>
+            </el-button>
+          </el-tooltip>
           <el-link
             :underline="false"
             href="https://docs-develop.pleroma.social/backend/administration/CLI_tasks/config/"
@@ -244,8 +246,16 @@ export default {
     this.$store.dispatch('FetchSettings')
   },
   methods: {
-    restartApp() {
-      this.$store.dispatch('RestartApplication')
+    async restartApp() {
+      try {
+        await this.$store.dispatch('RestartApplication')
+      } catch (e) {
+        return
+      }
+      this.$message({
+        type: 'success',
+        message: i18n.t('settings.restartSuccess')
+      })
     }
   }
 }
diff --git a/src/views/settings/styles/main.scss b/src/views/settings/styles/main.scss
index bc6cfff1..a6658b55 100644
--- a/src/views/settings/styles/main.scss
+++ b/src/views/settings/styles/main.scss
@@ -275,6 +275,7 @@
     width: 145px;
     text-align: left;
     padding: 10px;
+    margin-right: 5px;
   }
   .single-input {
     margin-right: 10px

From c3b83498a4111dc44e7996334d97f0893ad4e2b8 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Wed, 19 Feb 2020 02:38:35 +0300
Subject: [PATCH 4/4] Move Tesla adaper to HTTP tab

---
 src/views/settings/components/Http.vue  | 10 ++++++++++
 src/views/settings/components/Other.vue | 10 ----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/views/settings/components/Http.vue b/src/views/settings/components/Http.vue
index a94000b2..a12a1efa 100644
--- a/src/views/settings/components/Http.vue
+++ b/src/views/settings/components/Http.vue
@@ -3,6 +3,10 @@
     <el-form ref="httpData" :model="httpData" :label-width="labelWidth">
       <setting :setting-group="http" :data="httpData"/>
     </el-form>
+    <el-form ref="teslaAdapter" :model="teslaAdapterData" :label-width="labelWidth">
+      <setting :setting-group="teslaAdapter" :data="teslaAdapterData"/>
+    </el-form>
+    <el-divider class="divider thick-line"/>
     <el-form ref="corsPlugData" :model="corsPlugData" :label-width="labelWidth">
       <el-form-item class="grouped-settings-header">
         <span class="label-font">{{ $t('settings.corsPlug') }}</span>
@@ -82,6 +86,12 @@ export default {
     loading() {
       return this.settings.loading
     },
+    teslaAdapter() {
+      return this.settings.description.find(setting => setting.group === ':tesla')
+    },
+    teslaAdapterData() {
+      return _.get(this.settings.settings, [':tesla']) || {}
+    },
     webCacheTtl() {
       return this.settings.description.find(setting => setting.key === ':web_cache_ttl')
     },
diff --git a/src/views/settings/components/Other.vue b/src/views/settings/components/Other.vue
index d748c2da..4a3b465f 100644
--- a/src/views/settings/components/Other.vue
+++ b/src/views/settings/components/Other.vue
@@ -1,9 +1,5 @@
 <template>
   <div v-if="!loading" class="form-container">
-    <el-form ref="teslaAdapter" :model="teslaAdapterData" :label-width="labelWidth">
-      <setting :setting-group="teslaAdapter" :data="teslaAdapterData"/>
-    </el-form>
-    <el-divider class="divider thick-line"/>
     <el-form ref="mimeTypes" :model="mimeTypesData" :label-width="labelWidth">
       <setting :setting-group="mimeTypes" :data="mimeTypesData"/>
     </el-form>
@@ -58,12 +54,6 @@ export default {
     },
     remoteIpData() {
       return _.get(this.settings.settings, [':pleroma', 'Pleroma.Plugs.RemoteIp']) || {}
-    },
-    teslaAdapter() {
-      return this.settings.description.find(setting => setting.group === ':tesla')
-    },
-    teslaAdapterData() {
-      return _.get(this.settings.settings, [':tesla']) || {}
     }
   },
   methods: {