From 63880cec610fc7ef00b3787baf5c17a658a8b6a0 Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Tue, 24 Sep 2024 19:49:05 +0200
Subject: [PATCH 01/21] refactor skin Card

---
 .../Pages/ManageWiki/Cards/Skin.vue           | 50 +++++++++++++------
 1 file changed, 35 insertions(+), 15 deletions(-)

diff --git a/src/components/Pages/ManageWiki/Cards/Skin.vue b/src/components/Pages/ManageWiki/Cards/Skin.vue
index e6264ff0..2dc76a58 100644
--- a/src/components/Pages/ManageWiki/Cards/Skin.vue
+++ b/src/components/Pages/ManageWiki/Cards/Skin.vue
@@ -6,12 +6,10 @@
         :items="items"
         label="Skin"
         placeholder="Pick a Skin"
-        hint="The default skin is Vector."
+        hint="The default skin is Vector legacy (2010)."
         persistent-hint
         prepend-icon="mdi-web"
         v-model="skin"
-        :disabled="inFlight"
-        :error-messages="error"
       ></v-select>
     </v-card-text>
     <v-card-actions>
@@ -22,6 +20,18 @@
         <span>It may take up to 10 seconds for changes to be reflected on your wiki</span>
       </v-tooltip>
     </v-card-actions>
+    <v-snackbar :color="message.status" elevation="24" v-model="message.show">
+      {{ message.text }}
+      <template v-slot:action>
+        <v-btn
+          text
+          variant="text"
+          @click="message.show = false"
+        >
+          Close
+        </v-btn>
+      </template>
+    </v-snackbar>
   </v-card>
 </template>
 
@@ -33,35 +43,45 @@ export default {
   ],
   data () {
     return {
-      items: [
-        'Vector',
-        'Modern',
-        'Timeless'
-      ],
+      skins: {
+        'Vector legacy (2010)':'vector',
+        'Vector (2022)':'vector-2022',
+        'MinervaNeue':'minerva',
+        'Modern':'modern',
+        'Timeless':'timeless'
+      },
       skin: '',
-      inFlight: false,
-      error: ''
+      message: false
+    }
+  },
+  computed: {
+    items() {
+      return Object.entries(this.skins).map(([key, value]) => key);
     }
   },
   created () {
     const skin = this.$store.state.wikis.currentWikiSettings.wgDefaultSkin
-    this.skin = skin.charAt(0).toUpperCase() + skin.slice(1)
+    this.skin = Object.entries(this.skins).find(
+      ([key, value]) => value === skin
+    )?.[0]; // use first result from 'find' if it exists
   },
   methods: {
     doSetSkin () {
       const wiki = this.wikiId
-      // API needs the skin ID which is lower case..
-      const value = this.skin.toLowerCase()
+      const value = this.skins[this.skin]
 
       this.$store
         .dispatch('updateSkin', { wiki, value })
         .then(() => {
-          alert('Update success!')
+          this.showMessage('success', 'Your default skin has been updated.')
         })
         .catch(err => {
           console.log(err.response)
-          alert('Something went wrong.')
+          this.showMessage('error', `Something went wrong while saving your default skin. Please try again.`)
         })
+    },
+    showMessage (status, message) {
+      this.message = { status: status, text: message, show: true }
     }
   }
 }

From 47fac0e7a6e311bf03c605c281d89b50a47c36de Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Tue, 24 Sep 2024 20:11:32 +0200
Subject: [PATCH 02/21] formatting

---
 src/components/Pages/ManageWiki/Cards/Skin.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/Pages/ManageWiki/Cards/Skin.vue b/src/components/Pages/ManageWiki/Cards/Skin.vue
index 2dc76a58..d35b3f94 100644
--- a/src/components/Pages/ManageWiki/Cards/Skin.vue
+++ b/src/components/Pages/ManageWiki/Cards/Skin.vue
@@ -44,11 +44,11 @@ export default {
   data () {
     return {
       skins: {
-        'Vector legacy (2010)':'vector',
-        'Vector (2022)':'vector-2022',
-        'MinervaNeue':'minerva',
-        'Modern':'modern',
-        'Timeless':'timeless'
+        'Vector legacy (2010)': 'vector',
+        'Vector (2022)': 'vector-2022',
+        MinervaNeue: 'minerva',
+        Modern: 'modern',
+        Timeless: 'timeless'
       },
       skin: '',
       message: false
@@ -56,14 +56,14 @@ export default {
   },
   computed: {
     items() {
-      return Object.entries(this.skins).map(([key, value]) => key);
+      return Object.entries(this.skins).map(([key, value]) => key)
     }
   },
   created () {
     const skin = this.$store.state.wikis.currentWikiSettings.wgDefaultSkin
     this.skin = Object.entries(this.skins).find(
       ([key, value]) => value === skin
-    )?.[0]; // use first result from 'find' if it exists
+    )?.[0] // use first result from 'find' if it exists
   },
   methods: {
     doSetSkin () {
@@ -77,7 +77,7 @@ export default {
         })
         .catch(err => {
           console.log(err.response)
-          this.showMessage('error', `Something went wrong while saving your default skin. Please try again.`)
+          this.showMessage('error', 'Something went wrong while saving your default skin. Please try again.')
         })
     },
     showMessage (status, message) {

From 3e10a4248177cd73c3f4f9c3be48871f1b72fc6e Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Tue, 24 Sep 2024 20:12:57 +0200
Subject: [PATCH 03/21] formatting

---
 src/components/Pages/ManageWiki/Cards/Skin.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Pages/ManageWiki/Cards/Skin.vue b/src/components/Pages/ManageWiki/Cards/Skin.vue
index d35b3f94..1e8c6051 100644
--- a/src/components/Pages/ManageWiki/Cards/Skin.vue
+++ b/src/components/Pages/ManageWiki/Cards/Skin.vue
@@ -55,7 +55,7 @@ export default {
     }
   },
   computed: {
-    items() {
+    items () {
       return Object.entries(this.skins).map(([key, value]) => key)
     }
   },

From 5e124379917ba6dd7d10f12c5b4376a73696276f Mon Sep 17 00:00:00 2001
From: dena <91744937+deer-wmde@users.noreply.github.com>
Date: Wed, 25 Sep 2024 07:02:56 +0200
Subject: [PATCH 04/21] Update Skin.vue

---
 src/components/Pages/ManageWiki/Cards/Skin.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Pages/ManageWiki/Cards/Skin.vue b/src/components/Pages/ManageWiki/Cards/Skin.vue
index 1e8c6051..92791902 100644
--- a/src/components/Pages/ManageWiki/Cards/Skin.vue
+++ b/src/components/Pages/ManageWiki/Cards/Skin.vue
@@ -63,7 +63,7 @@ export default {
     const skin = this.$store.state.wikis.currentWikiSettings.wgDefaultSkin
     this.skin = Object.entries(this.skins).find(
       ([key, value]) => value === skin
-    )?.[0] // use first result from 'find' if it exists
+    )?.[0] // use key from 'find' result if it not undefined, see `skins` object above
   },
   methods: {
     doSetSkin () {

From 79bbd874cf3631d7663517d3c865b8e52ab9b47e Mon Sep 17 00:00:00 2001
From: dena <91744937+deer-wmde@users.noreply.github.com>
Date: Wed, 25 Sep 2024 07:04:27 +0200
Subject: [PATCH 05/21] Update Skin.vue

---
 src/components/Pages/ManageWiki/Cards/Skin.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Pages/ManageWiki/Cards/Skin.vue b/src/components/Pages/ManageWiki/Cards/Skin.vue
index 92791902..de1efc87 100644
--- a/src/components/Pages/ManageWiki/Cards/Skin.vue
+++ b/src/components/Pages/ManageWiki/Cards/Skin.vue
@@ -62,8 +62,8 @@ export default {
   created () {
     const skin = this.$store.state.wikis.currentWikiSettings.wgDefaultSkin
     this.skin = Object.entries(this.skins).find(
-      ([key, value]) => value === skin
-    )?.[0] // use key from 'find' result if it not undefined, see `skins` object above
+      ([skinName, skinId]) => skinName === skin
+    )?.[0]
   },
   methods: {
     doSetSkin () {

From 4710dadc375e00c6344ddc4c78538f9a3bc55c0c Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Wed, 25 Sep 2024 07:27:27 +0200
Subject: [PATCH 06/21] improve readability

---
 .../Pages/ManageWiki/Cards/Skin.vue           | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/components/Pages/ManageWiki/Cards/Skin.vue b/src/components/Pages/ManageWiki/Cards/Skin.vue
index de1efc87..6f2154ed 100644
--- a/src/components/Pages/ManageWiki/Cards/Skin.vue
+++ b/src/components/Pages/ManageWiki/Cards/Skin.vue
@@ -9,7 +9,7 @@
         hint="The default skin is Vector legacy (2010)."
         persistent-hint
         prepend-icon="mdi-web"
-        v-model="skin"
+        v-model="skinName"
       ></v-select>
     </v-card-text>
     <v-card-actions>
@@ -50,34 +50,34 @@ export default {
         Modern: 'modern',
         Timeless: 'timeless'
       },
-      skin: '',
+      skinName: '',
       message: false
     }
   },
   computed: {
     items () {
-      return Object.entries(this.skins).map(([key, value]) => key)
+      return Object.entries(this.skins).map(([skinName, skin]) => skinName)
     }
   },
   created () {
-    const skin = this.$store.state.wikis.currentWikiSettings.wgDefaultSkin
-    this.skin = Object.entries(this.skins).find(
-      ([skinName, skinId]) => skinName === skin
+    const defaultSkin = this.$store.state.wikis.currentWikiSettings.wgDefaultSkin
+    this.skinName = Object.entries(this.skins).find(
+      ([skinName, skin]) => defaultSkin === skin
     )?.[0]
   },
   methods: {
     doSetSkin () {
       const wiki = this.wikiId
-      const value = this.skins[this.skin]
+      const skin = this.skins[this.skinName]
 
       this.$store
-        .dispatch('updateSkin', { wiki, value })
+        .dispatch('updateSkin', { wiki, skin })
         .then(() => {
-          this.showMessage('success', 'Your default skin has been updated.')
+          this.showMessage('success', `Your default skin has been updated to ${this.skinName}.`)
         })
         .catch(err => {
           console.log(err.response)
-          this.showMessage('error', 'Something went wrong while saving your default skin. Please try again.')
+          this.showMessage('error', 'Something went wrong while updating your default skin. Please try again.')
         })
     },
     showMessage (status, message) {

From 88af7ec997f62c2c7b3afd7e9d1e3f70b7278179 Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Wed, 25 Sep 2024 08:05:49 +0200
Subject: [PATCH 07/21] more refactoring

---
 .../Pages/ManageWiki/Cards/Skin.vue           | 58 ++++++++++++-------
 1 file changed, 37 insertions(+), 21 deletions(-)

diff --git a/src/components/Pages/ManageWiki/Cards/Skin.vue b/src/components/Pages/ManageWiki/Cards/Skin.vue
index 6f2154ed..ffede1d6 100644
--- a/src/components/Pages/ManageWiki/Cards/Skin.vue
+++ b/src/components/Pages/ManageWiki/Cards/Skin.vue
@@ -3,13 +3,13 @@
     <v-card-title>Set Skin</v-card-title>
     <v-card-text>
       <v-select
-        :items="items"
+        :items="skins"
         label="Skin"
         placeholder="Pick a Skin"
         hint="The default skin is Vector legacy (2010)."
         persistent-hint
         prepend-icon="mdi-web"
-        v-model="skinName"
+        v-model="skinId"
       ></v-select>
     </v-card-text>
     <v-card-actions>
@@ -43,37 +43,53 @@ export default {
   ],
   data () {
     return {
-      skins: {
-        'Vector legacy (2010)': 'vector',
-        'Vector (2022)': 'vector-2022',
-        MinervaNeue: 'minerva',
-        Modern: 'modern',
-        Timeless: 'timeless'
-      },
-      skinName: '',
+      skins: [
+        {
+          value: 'vector',
+          text:  'Vector legacy (2010)'
+        },
+        {
+          value: 'vector-2022',
+          text:  'Vector (2022)'
+        },
+        {
+          value: 'minerva',
+          text:  'MinervaNeue'
+        },
+        {
+          value: 'modern',
+          text:  'Modern'
+        },
+        {
+          value: 'timeless',
+          text:  'Timeless'
+        },
+      ],
+      skinId: '',
       message: false
     }
   },
-  computed: {
-    items () {
-      return Object.entries(this.skins).map(([skinName, skin]) => skinName)
-    }
-  },
   created () {
     const defaultSkin = this.$store.state.wikis.currentWikiSettings.wgDefaultSkin
-    this.skinName = Object.entries(this.skins).find(
-      ([skinName, skin]) => defaultSkin === skin
-    )?.[0]
+    this.skinId = this.getSkinBySkinId(defaultSkin).value
   },
   methods: {
+    getSkinBySkinId (skinId) {
+      const skin = Object.entries(this.skins).find(
+        ([key, skinObject]) => skinObject.value === skinId
+      )?.[1]
+
+      return skin
+    },
     doSetSkin () {
       const wiki = this.wikiId
-      const skin = this.skins[this.skinName]
+      const skin = this.getSkinBySkinId(this.skinId)
+      const value = skin.value
 
       this.$store
-        .dispatch('updateSkin', { wiki, skin })
+        .dispatch('updateSkin', { wiki, value })
         .then(() => {
-          this.showMessage('success', `Your default skin has been updated to ${this.skinName}.`)
+          this.showMessage('success', `Your default skin has been updated to ${skin.text}.`)
         })
         .catch(err => {
           console.log(err.response)

From a6a9fda1da0340a614f96d9051ce90171164fd0e Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Wed, 25 Sep 2024 08:51:05 +0200
Subject: [PATCH 08/21] add Snackbar component

---
 .../Pages/ManageWiki/Features/Snackbar.vue    | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 src/components/Pages/ManageWiki/Features/Snackbar.vue

diff --git a/src/components/Pages/ManageWiki/Features/Snackbar.vue b/src/components/Pages/ManageWiki/Features/Snackbar.vue
new file mode 100644
index 00000000..6540a5cc
--- /dev/null
+++ b/src/components/Pages/ManageWiki/Features/Snackbar.vue
@@ -0,0 +1,43 @@
+<template>
+  <v-snackbar :color="status" elevation="24" v-model="visible">
+    {{ text }}
+    <template v-slot:action>
+      <v-btn
+        text
+        variant="text"
+        @click="hide"
+      >
+      Close
+      </v-btn>
+    </template>
+  </v-snackbar>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      visible: false,
+      text: 'Hello, this is a snackbar message!',
+      status: 'success'
+    };
+  },
+  methods: {
+    show (status, message) {
+      this.status = status
+      this.text = message
+      this.visible = true
+
+      console.log(message)
+      console.log(status)
+    },
+
+    hide () {
+      this.visible = false;
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

From 3077c2b577cef8069f686b73b8c5cd54492b7c19 Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Wed, 25 Sep 2024 08:53:38 +0200
Subject: [PATCH 09/21] rename component

---
 .../Pages/ManageWiki/Features/{Snackbar.vue => Message.vue}       | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/components/Pages/ManageWiki/Features/{Snackbar.vue => Message.vue} (100%)

diff --git a/src/components/Pages/ManageWiki/Features/Snackbar.vue b/src/components/Pages/ManageWiki/Features/Message.vue
similarity index 100%
rename from src/components/Pages/ManageWiki/Features/Snackbar.vue
rename to src/components/Pages/ManageWiki/Features/Message.vue

From 9e3d46b5ead99136fa4ea0a9243d8abc64bbcc52 Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Wed, 25 Sep 2024 08:54:15 +0200
Subject: [PATCH 10/21] use Message component

---
 .../Pages/ManageWiki/Cards/Skin.vue           | 44 +++++++------------
 1 file changed, 16 insertions(+), 28 deletions(-)

diff --git a/src/components/Pages/ManageWiki/Cards/Skin.vue b/src/components/Pages/ManageWiki/Cards/Skin.vue
index ffede1d6..ed14d54d 100644
--- a/src/components/Pages/ManageWiki/Cards/Skin.vue
+++ b/src/components/Pages/ManageWiki/Cards/Skin.vue
@@ -20,24 +20,18 @@
         <span>It may take up to 10 seconds for changes to be reflected on your wiki</span>
       </v-tooltip>
     </v-card-actions>
-    <v-snackbar :color="message.status" elevation="24" v-model="message.show">
-      {{ message.text }}
-      <template v-slot:action>
-        <v-btn
-          text
-          variant="text"
-          @click="message.show = false"
-        >
-          Close
-        </v-btn>
-      </template>
-    </v-snackbar>
+    <Message ref="message" />
   </v-card>
 </template>
 
 <script>
+import Message from '../Features/Message.vue';
+
 export default {
   name: 'Skin',
+  components: {
+    Message
+  },
   props: [
     'wikiId'
   ],
@@ -70,35 +64,29 @@ export default {
     }
   },
   created () {
-    const defaultSkin = this.$store.state.wikis.currentWikiSettings.wgDefaultSkin
-    this.skinId = this.getSkinBySkinId(defaultSkin).value
+    this.skinId = this.$store.state.wikis.currentWikiSettings.wgDefaultSkin
+  },
+  computed: {
+    skin() {
+      return this.skins.find(skin => skin.value === this.skinId)
+    }
   },
   methods: {
-    getSkinBySkinId (skinId) {
-      const skin = Object.entries(this.skins).find(
-        ([key, skinObject]) => skinObject.value === skinId
-      )?.[1]
-
-      return skin
-    },
     doSetSkin () {
       const wiki = this.wikiId
-      const skin = this.getSkinBySkinId(this.skinId)
-      const value = skin.value
+      const value = this.skin.value
 
       this.$store
         .dispatch('updateSkin', { wiki, value })
         .then(() => {
-          this.showMessage('success', `Your default skin has been updated to ${skin.text}.`)
+          this.$refs.message.show('success', `Your default skin has been updated to ${this.skin.text}.`)
         })
         .catch(err => {
           console.log(err.response)
-          this.showMessage('error', 'Something went wrong while updating your default skin. Please try again.')
+          this.$refs.message.show('error', 'Something went wrong while updating your default skin. Please try again.')
         })
     },
-    showMessage (status, message) {
-      this.message = { status: status, text: message, show: true }
-    }
+
   }
 }
 </script>

From 4b51592233d04760fb87e12a6b6c58b92f5294df Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Wed, 25 Sep 2024 08:54:24 +0200
Subject: [PATCH 11/21] use Message component in QuestyCaptcha

---
 .../Pages/ManageWiki/Cards/QuestyCaptcha.vue  | 33 +++++++------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/src/components/Pages/ManageWiki/Cards/QuestyCaptcha.vue b/src/components/Pages/ManageWiki/Cards/QuestyCaptcha.vue
index eacfe365..0beee9f1 100644
--- a/src/components/Pages/ManageWiki/Cards/QuestyCaptcha.vue
+++ b/src/components/Pages/ManageWiki/Cards/QuestyCaptcha.vue
@@ -81,24 +81,18 @@
         </v-expansion-panel-content>
       </v-expansion-panel>
     </v-expansion-panels>
-    <v-snackbar :color="message.status" elevation="24" v-model="message.show">
-      {{ message.text }}
-      <template v-slot:action>
-        <v-btn
-          text
-          variant="text"
-          @click="message.show = false"
-        >
-          Close
-        </v-btn>
-      </template>
-    </v-snackbar>
+    <Message ref="message" />
   </v-card>
 </template>
 
 <script>
+import Message from '../Features/Message.vue';
+
 export default {
   name: 'QuestyCaptcha',
+  components: {
+    Message
+  },
   props: [
     'wikiId'
   ],
@@ -144,9 +138,6 @@ export default {
         answers: []
       })
     },
-    showMessage (status, message) {
-      this.message = { status: status, text: message, show: true }
-    },
     formatQuestionsForApi (questions) {
       return JSON.stringify(questions.reduce((out, entry) => {
         out[entry.question] = entry.answers
@@ -165,10 +156,10 @@ export default {
         }
         await this.$store.dispatch('updateSetting', { wiki: this.wikiId, setting: 'wwUseQuestyCaptcha', value: enabled })
         await this.$store.dispatch('setEnabledQuestyCaptcha', enabled)
-        this.showMessage('success', `QuestyCaptcha has been successfully ${enabled ? 'enabled' : 'disabled'}.`)
+        this.$refs.message.show('success', `QuestyCaptcha has been successfully ${enabled ? 'enabled' : 'disabled'}.`)
       } catch (error) {
-        console.log(error.response)
-        this.showMessage('error', `Something went wrong while ${enabled ? 'enabling' : 'disabling'} QuestyCaptcha. Please try again.`)
+        console.error(error.response)
+        this.$refs.message('error', `Something went wrong while ${enabled ? 'enabling' : 'disabling'} QuestyCaptcha. Please try again.`)
         await this.$nextTick()
         this.isCaptchaActive = !enabled
       } finally {
@@ -203,12 +194,12 @@ export default {
           wiki: this.wikiId, setting: 'wwCaptchaQuestions', value: this.formatQuestionsForApi(this.questionsFromStore)
         })
         await this.$store.dispatch('setQuestyCaptchaQuestions', this.questionsFromStore)
-        this.showMessage('success', 'Your questions have been saved.')
+        this.$refs.message.show('success', 'Your questions have been saved.')
         this.hasNoQuestions = false
         this.panel = false
       } catch (error) {
-        console.log(error.response)
-        this.showMessage('error', 'Something went wrong with saving your questions. Please try again.')
+        console.error(error.response)
+        this.$refs.message.show('error', 'Something went wrong with saving your questions. Please try again.')
       } finally {
         this.waitForQuestionsUpdate = false
       }

From ee4795267a2036a65341355d0069b8d6710ad3e7 Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Wed, 25 Sep 2024 08:56:16 +0200
Subject: [PATCH 12/21] cleanup

---
 src/components/Pages/ManageWiki/Cards/Skin.vue       | 1 -
 src/components/Pages/ManageWiki/Features/Message.vue | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/src/components/Pages/ManageWiki/Cards/Skin.vue b/src/components/Pages/ManageWiki/Cards/Skin.vue
index ed14d54d..4f795e7a 100644
--- a/src/components/Pages/ManageWiki/Cards/Skin.vue
+++ b/src/components/Pages/ManageWiki/Cards/Skin.vue
@@ -86,7 +86,6 @@ export default {
           this.$refs.message.show('error', 'Something went wrong while updating your default skin. Please try again.')
         })
     },
-
   }
 }
 </script>
diff --git a/src/components/Pages/ManageWiki/Features/Message.vue b/src/components/Pages/ManageWiki/Features/Message.vue
index 6540a5cc..2fd1a6e0 100644
--- a/src/components/Pages/ManageWiki/Features/Message.vue
+++ b/src/components/Pages/ManageWiki/Features/Message.vue
@@ -27,9 +27,6 @@ export default {
       this.status = status
       this.text = message
       this.visible = true
-
-      console.log(message)
-      console.log(status)
     },
 
     hide () {

From 2f4b06d3e272d9a1d307ae3f2a96d2b7856cfa43 Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Wed, 25 Sep 2024 09:00:26 +0200
Subject: [PATCH 13/21] formatting

---
 .../Pages/ManageWiki/Cards/QuestyCaptcha.vue   |  2 +-
 src/components/Pages/ManageWiki/Cards/Skin.vue | 18 +++++++++---------
 .../Pages/ManageWiki/Features/Message.vue      |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/components/Pages/ManageWiki/Cards/QuestyCaptcha.vue b/src/components/Pages/ManageWiki/Cards/QuestyCaptcha.vue
index 0beee9f1..f0d3cac8 100644
--- a/src/components/Pages/ManageWiki/Cards/QuestyCaptcha.vue
+++ b/src/components/Pages/ManageWiki/Cards/QuestyCaptcha.vue
@@ -86,7 +86,7 @@
 </template>
 
 <script>
-import Message from '../Features/Message.vue';
+import Message from '../Features/Message.vue'
 
 export default {
   name: 'QuestyCaptcha',
diff --git a/src/components/Pages/ManageWiki/Cards/Skin.vue b/src/components/Pages/ManageWiki/Cards/Skin.vue
index 4f795e7a..fd9f00bf 100644
--- a/src/components/Pages/ManageWiki/Cards/Skin.vue
+++ b/src/components/Pages/ManageWiki/Cards/Skin.vue
@@ -25,7 +25,7 @@
 </template>
 
 <script>
-import Message from '../Features/Message.vue';
+import Message from '../Features/Message.vue'
 
 export default {
   name: 'Skin',
@@ -40,23 +40,23 @@ export default {
       skins: [
         {
           value: 'vector',
-          text:  'Vector legacy (2010)'
+          text: 'Vector legacy (2010)'
         },
         {
           value: 'vector-2022',
-          text:  'Vector (2022)'
+          text: 'Vector (2022)'
         },
         {
           value: 'minerva',
-          text:  'MinervaNeue'
+          text: 'MinervaNeue'
         },
         {
           value: 'modern',
-          text:  'Modern'
+          text: 'Modern'
         },
         {
           value: 'timeless',
-          text:  'Timeless'
+          text: 'Timeless'
         },
       ],
       skinId: '',
@@ -67,7 +67,7 @@ export default {
     this.skinId = this.$store.state.wikis.currentWikiSettings.wgDefaultSkin
   },
   computed: {
-    skin() {
+    skin () {
       return this.skins.find(skin => skin.value === this.skinId)
     }
   },
@@ -82,10 +82,10 @@ export default {
           this.$refs.message.show('success', `Your default skin has been updated to ${this.skin.text}.`)
         })
         .catch(err => {
-          console.log(err.response)
+          console.error(err.response)
           this.$refs.message.show('error', 'Something went wrong while updating your default skin. Please try again.')
         })
-    },
+    }
   }
 }
 </script>
diff --git a/src/components/Pages/ManageWiki/Features/Message.vue b/src/components/Pages/ManageWiki/Features/Message.vue
index 2fd1a6e0..7d6367a6 100644
--- a/src/components/Pages/ManageWiki/Features/Message.vue
+++ b/src/components/Pages/ManageWiki/Features/Message.vue
@@ -15,12 +15,12 @@
 
 <script>
 export default {
-  data() {
+  data () {
     return {
       visible: false,
       text: 'Hello, this is a snackbar message!',
       status: 'success'
-    };
+    }
   },
   methods: {
     show (status, message) {
@@ -30,7 +30,7 @@ export default {
     },
 
     hide () {
-      this.visible = false;
+      this.visible = false
     }
   }
 }

From 986354ae012979ca4514cc794386f0234a2730b4 Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Wed, 25 Sep 2024 09:02:18 +0200
Subject: [PATCH 14/21] cleanup

---
 src/backend/api.js                             |  4 ++--
 src/backend/mocks/default_handlers.js          |  4 ++--
 src/components/Pages/Contact.vue               | 10 +++++-----
 src/components/Pages/ManageWiki/Cards/Skin.vue |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/backend/api.js b/src/backend/api.js
index ea56f654..9b6445c7 100644
--- a/src/backend/api.js
+++ b/src/backend/api.js
@@ -80,8 +80,8 @@ export const wikiDetails = async payload => (await axios.post('/wiki/details', p
 export const wikiDiscovery = async ({ sort, direction, active, currentPage, resultsPerPage }) => {
   return (await axios.get('/wiki', {
     params: {
-      sort: sort,
-      direction: direction,
+      sort,
+      direction,
       is_active: active,
       page: currentPage,
       per_page: resultsPerPage
diff --git a/src/backend/mocks/default_handlers.js b/src/backend/mocks/default_handlers.js
index 37bab2ec..401f0070 100644
--- a/src/backend/mocks/default_handlers.js
+++ b/src/backend/mocks/default_handlers.js
@@ -8,7 +8,7 @@ let getEntityImportCalledTimes = 0
 function makeUser (email = 'test@local') {
   return {
     id: 1,
-    email: email,
+    email,
     verified: true,
     created_at: '2020-01-01',
     updated_at: '2020-01-01'
@@ -69,7 +69,7 @@ const wikiDiscovery = (referrer, params) => {
 
   let wikis = [...Array(75).keys()].map((id) => {
     const wiki = {
-      id: id,
+      id,
       domain: id + '-wikibase.wbaas.localhost',
       sitename: id + ' - ' + names[id % names.length],
       wiki_site_stats: null,
diff --git a/src/components/Pages/Contact.vue b/src/components/Pages/Contact.vue
index 5d7fa1a6..2bce5599 100644
--- a/src/components/Pages/Contact.vue
+++ b/src/components/Pages/Contact.vue
@@ -101,11 +101,11 @@ export default {
       this.$recaptcha('contact').then((recaptcha) => {
         this.$api.contact(
           {
-            name: name,
-            subject: subject,
-            contactDetails: contactDetails,
-            message: message,
-            recaptcha: recaptcha
+            name,
+            subject,
+            contactDetails,
+            message,
+            recaptcha
           })
           .then(success => this.createSuccessful())
           .catch(errors => {
diff --git a/src/components/Pages/ManageWiki/Cards/Skin.vue b/src/components/Pages/ManageWiki/Cards/Skin.vue
index fd9f00bf..0e31ffac 100644
--- a/src/components/Pages/ManageWiki/Cards/Skin.vue
+++ b/src/components/Pages/ManageWiki/Cards/Skin.vue
@@ -57,7 +57,7 @@ export default {
         {
           value: 'timeless',
           text: 'Timeless'
-        },
+        }
       ],
       skinId: '',
       message: false

From 7fb22c4fb9eba7d0426b771b48719b12bca8cbb5 Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Wed, 25 Sep 2024 09:03:18 +0200
Subject: [PATCH 15/21] add `fix` script

---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f75437a9..9620e10d 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,8 @@
     "build": "vue-cli-service build",
     "test:unit": "vue-cli-service test:unit",
     "test:e2e": "vue-cli-service test:e2e --baseUrl=http://ui:8081/",
-    "lint": "vue-cli-service lint"
+    "lint": "vue-cli-service lint",
+    "fix": "vue-cli-service lint --fix"
   },
   "dependencies": {
     "axios": "^1.7.5",

From 9479d625411342a7b8540c8980855ae6b40bc162 Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Wed, 25 Sep 2024 09:03:41 +0200
Subject: [PATCH 16/21] remove fix (out of scope)

---
 package.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 9620e10d..f75437a9 100644
--- a/package.json
+++ b/package.json
@@ -11,8 +11,7 @@
     "build": "vue-cli-service build",
     "test:unit": "vue-cli-service test:unit",
     "test:e2e": "vue-cli-service test:e2e --baseUrl=http://ui:8081/",
-    "lint": "vue-cli-service lint",
-    "fix": "vue-cli-service lint --fix"
+    "lint": "vue-cli-service lint"
   },
   "dependencies": {
     "axios": "^1.7.5",

From de526eaebcef3c00a468518d46f1616cbd2a218f Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Wed, 25 Sep 2024 09:09:36 +0200
Subject: [PATCH 17/21] Revert "cleanup"

This reverts commit 986354ae012979ca4514cc794386f0234a2730b4.
---
 src/backend/api.js                             |  4 ++--
 src/backend/mocks/default_handlers.js          |  4 ++--
 src/components/Pages/Contact.vue               | 10 +++++-----
 src/components/Pages/ManageWiki/Cards/Skin.vue |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/backend/api.js b/src/backend/api.js
index 9b6445c7..ea56f654 100644
--- a/src/backend/api.js
+++ b/src/backend/api.js
@@ -80,8 +80,8 @@ export const wikiDetails = async payload => (await axios.post('/wiki/details', p
 export const wikiDiscovery = async ({ sort, direction, active, currentPage, resultsPerPage }) => {
   return (await axios.get('/wiki', {
     params: {
-      sort,
-      direction,
+      sort: sort,
+      direction: direction,
       is_active: active,
       page: currentPage,
       per_page: resultsPerPage
diff --git a/src/backend/mocks/default_handlers.js b/src/backend/mocks/default_handlers.js
index 401f0070..37bab2ec 100644
--- a/src/backend/mocks/default_handlers.js
+++ b/src/backend/mocks/default_handlers.js
@@ -8,7 +8,7 @@ let getEntityImportCalledTimes = 0
 function makeUser (email = 'test@local') {
   return {
     id: 1,
-    email,
+    email: email,
     verified: true,
     created_at: '2020-01-01',
     updated_at: '2020-01-01'
@@ -69,7 +69,7 @@ const wikiDiscovery = (referrer, params) => {
 
   let wikis = [...Array(75).keys()].map((id) => {
     const wiki = {
-      id,
+      id: id,
       domain: id + '-wikibase.wbaas.localhost',
       sitename: id + ' - ' + names[id % names.length],
       wiki_site_stats: null,
diff --git a/src/components/Pages/Contact.vue b/src/components/Pages/Contact.vue
index 2bce5599..5d7fa1a6 100644
--- a/src/components/Pages/Contact.vue
+++ b/src/components/Pages/Contact.vue
@@ -101,11 +101,11 @@ export default {
       this.$recaptcha('contact').then((recaptcha) => {
         this.$api.contact(
           {
-            name,
-            subject,
-            contactDetails,
-            message,
-            recaptcha
+            name: name,
+            subject: subject,
+            contactDetails: contactDetails,
+            message: message,
+            recaptcha: recaptcha
           })
           .then(success => this.createSuccessful())
           .catch(errors => {
diff --git a/src/components/Pages/ManageWiki/Cards/Skin.vue b/src/components/Pages/ManageWiki/Cards/Skin.vue
index 0e31ffac..fd9f00bf 100644
--- a/src/components/Pages/ManageWiki/Cards/Skin.vue
+++ b/src/components/Pages/ManageWiki/Cards/Skin.vue
@@ -57,7 +57,7 @@ export default {
         {
           value: 'timeless',
           text: 'Timeless'
-        }
+        },
       ],
       skinId: '',
       message: false

From 2f96b13f68c95575733e048f4549b10e44909cca Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Wed, 25 Sep 2024 09:10:23 +0200
Subject: [PATCH 18/21] cleanup

---
 src/components/Pages/ManageWiki/Cards/Skin.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Pages/ManageWiki/Cards/Skin.vue b/src/components/Pages/ManageWiki/Cards/Skin.vue
index fd9f00bf..0e31ffac 100644
--- a/src/components/Pages/ManageWiki/Cards/Skin.vue
+++ b/src/components/Pages/ManageWiki/Cards/Skin.vue
@@ -57,7 +57,7 @@ export default {
         {
           value: 'timeless',
           text: 'Timeless'
-        },
+        }
       ],
       skinId: '',
       message: false

From d0a19fedc6d31646c1258d793ae2315af5f3827a Mon Sep 17 00:00:00 2001
From: dena <91744937+deer-wmde@users.noreply.github.com>
Date: Wed, 25 Sep 2024 10:36:22 +0200
Subject: [PATCH 19/21] remove newer skins

they still cause issues
---
 src/components/Pages/ManageWiki/Cards/Skin.vue | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/components/Pages/ManageWiki/Cards/Skin.vue b/src/components/Pages/ManageWiki/Cards/Skin.vue
index 0e31ffac..01a1e336 100644
--- a/src/components/Pages/ManageWiki/Cards/Skin.vue
+++ b/src/components/Pages/ManageWiki/Cards/Skin.vue
@@ -40,15 +40,7 @@ export default {
       skins: [
         {
           value: 'vector',
-          text: 'Vector legacy (2010)'
-        },
-        {
-          value: 'vector-2022',
-          text: 'Vector (2022)'
-        },
-        {
-          value: 'minerva',
-          text: 'MinervaNeue'
+          text: 'Vector'
         },
         {
           value: 'modern',

From 83a2216f231318b75b461761bd2516ff5fd540a8 Mon Sep 17 00:00:00 2001
From: dena <91744937+deer-wmde@users.noreply.github.com>
Date: Wed, 25 Sep 2024 10:37:11 +0200
Subject: [PATCH 20/21] Update Skin.vue

---
 src/components/Pages/ManageWiki/Cards/Skin.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Pages/ManageWiki/Cards/Skin.vue b/src/components/Pages/ManageWiki/Cards/Skin.vue
index 01a1e336..6d2d07db 100644
--- a/src/components/Pages/ManageWiki/Cards/Skin.vue
+++ b/src/components/Pages/ManageWiki/Cards/Skin.vue
@@ -6,7 +6,7 @@
         :items="skins"
         label="Skin"
         placeholder="Pick a Skin"
-        hint="The default skin is Vector legacy (2010)."
+        hint="The default skin is Vector."
         persistent-hint
         prepend-icon="mdi-web"
         v-model="skinId"

From 69e5b70c47f24c4fd50d2372590ccbcfe7afdb81 Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Wed, 25 Sep 2024 12:01:44 +0200
Subject: [PATCH 21/21] re-add prevuiously removed lines

---
 src/components/Pages/ManageWiki/Cards/Skin.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/Pages/ManageWiki/Cards/Skin.vue b/src/components/Pages/ManageWiki/Cards/Skin.vue
index 6d2d07db..beb45f5a 100644
--- a/src/components/Pages/ManageWiki/Cards/Skin.vue
+++ b/src/components/Pages/ManageWiki/Cards/Skin.vue
@@ -9,6 +9,8 @@
         hint="The default skin is Vector."
         persistent-hint
         prepend-icon="mdi-web"
+        :disabled="inFlight"
+        :error-messages="error"
         v-model="skinId"
       ></v-select>
     </v-card-text>