From fd0392c1904647227886d06f29b1658adfda4fe9 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Thu, 26 Dec 2019 20:35:40 +0300
Subject: [PATCH] Fix processing rate_limit settings

---
 .../inputComponents/RateLimitInput.vue        | 75 ++++++++++++-------
 1 file changed, 49 insertions(+), 26 deletions(-)

diff --git a/src/views/settings/components/inputComponents/RateLimitInput.vue b/src/views/settings/components/inputComponents/RateLimitInput.vue
index 5a648462..3946b25d 100644
--- a/src/views/settings/components/inputComponents/RateLimitInput.vue
+++ b/src/views/settings/components/inputComponents/RateLimitInput.vue
@@ -1,24 +1,48 @@
 <template>
   <div>
     <div v-if="!rateLimitAuthUsers">
-      <el-input :value="rateLimitAllUsers[0]" placeholder="scale" class="scale-input" @input="parseRateLimiter($event, setting.key, 'scale', 'oneLimit', rateLimitAllUsers)"/> :
-      <el-input :value="rateLimitAllUsers[1]" placeholder="limit" class="limit-input" @input="parseRateLimiter($event, setting.key, 'limit', 'oneLimit', rateLimitAllUsers)"/>
+      <el-input
+        :value="rateLimitAllUsers[0]"
+        placeholder="scale"
+        class="scale-input"
+        @input="parseRateLimiter($event, setting.key, 'scale', 'oneLimit', rateLimitAllUsers)"/> :
+      <el-input
+        :value="rateLimitAllUsers[1]"
+        placeholder="limit"
+        class="limit-input"
+        @input="parseRateLimiter($event, setting.key, 'limit', 'oneLimit', rateLimitAllUsers)"/>
       <div class="limit-button-container">
-        <el-button icon="el-icon-plus" circle @click="toggleLimits([{ '': '' }, { '': '' }], setting.key)"/>
+        <el-button icon="el-icon-plus" circle @click="toggleLimits([['', ''], ['', '']], setting.key)"/>
         <p class="expl limit-expl">Set different limits for unauthenticated and authenticated users</p>
       </div>
     </div>
     <div v-if="rateLimitAuthUsers">
-      <el-form-item label="Authenticated users:">
-        <el-input :value="rateLimitAuthUsers[0]" placeholder="scale" class="scale-input" @input="parseRateLimiter($event, setting.key, 'scale', 'authUserslimit', [rateLimitUnauthUsers, rateLimitAuthUsers])"/> :
-        <el-input :value="rateLimitAuthUsers[1]" placeholder="limit" class="limit-input" @input="parseRateLimiter($event, setting.key, 'limit', 'authUserslimit', [rateLimitUnauthUsers, rateLimitAuthUsers])"/>
-      </el-form-item>
       <el-form-item label="Unauthenticated users:">
-        <el-input :value="rateLimitUnauthUsers[0]" placeholder="scale" class="scale-input" @input="parseRateLimiter($event, setting.key, 'scale', 'unauthUsersLimit', [rateLimitUnauthUsers, rateLimitAuthUsers])"/> :
-        <el-input :value="rateLimitUnauthUsers[1]" placeholder="limit" class="limit-input" @input="parseRateLimiter($event, setting.key, 'limit', 'unauthUsersLimit', [rateLimitUnauthUsers, rateLimitAuthUsers])"/>
+        <el-input
+          :value="rateLimitUnauthUsers[0]"
+          placeholder="scale"
+          class="scale-input"
+          @input="parseRateLimiter($event, setting.key, 'scale', 'unauthUsersLimit', [rateLimitUnauthUsers, rateLimitAuthUsers])"/> :
+        <el-input
+          :value="rateLimitUnauthUsers[1]"
+          placeholder="limit"
+          class="limit-input"
+          @input="parseRateLimiter($event, setting.key, 'limit', 'unauthUsersLimit', [rateLimitUnauthUsers, rateLimitAuthUsers])"/>
+      </el-form-item>
+      <el-form-item label="Authenticated users:">
+        <el-input
+          :value="rateLimitAuthUsers[0]"
+          placeholder="scale"
+          class="scale-input"
+          @input="parseRateLimiter($event, setting.key, 'scale', 'authUserslimit', [rateLimitUnauthUsers, rateLimitAuthUsers])"/> :
+        <el-input
+          :value="rateLimitAuthUsers[1]"
+          placeholder="limit"
+          class="limit-input"
+          @input="parseRateLimiter($event, setting.key, 'limit', 'authUserslimit', [rateLimitUnauthUsers, rateLimitAuthUsers])"/>
       </el-form-item>
       <div class="limit-button-container">
-        <el-button icon="el-icon-minus" circle @click="toggleLimits({ '': '' }, setting.key)"/>
+        <el-button icon="el-icon-minus" circle @click="toggleLimits(['', ''], setting.key)"/>
         <p class="expl limit-expl">Set limit for all users</p>
       </div>
     </div>
@@ -54,39 +78,38 @@ export default {
     },
     rateLimitAuthUsers() {
       return this.data[this.setting.key] && Array.isArray(this.data[this.setting.key][0])
-        ? this.data[this.setting.key][0]
+        ? this.data[this.setting.key][1]
         : false
     },
     rateLimitUnauthUsers() {
       return this.data[this.setting.key] && Array.isArray(this.data[this.setting.key][1])
-        ? this.data[this.setting.key][1]
+        ? this.data[this.setting.key][0]
         : false
     }
   },
   methods: {
     parseRateLimiter(value, input, typeOfInput, typeOfLimit, currentValue) {
+      let valueToSend
       if (typeOfLimit === 'oneLimit') {
-        const valueToSend = typeOfInput === 'scale' ? { [value]: currentValue[1] } : { [currentValue[0]]: value }
-        this.updateSetting(valueToSend, this.settingGroup.group, this.settingGroup.key, input, this.setting.type)
-      } else if (typeOfLimit === 'authUserslimit') {
-        const valueToSend = typeOfInput === 'scale'
-          ? [{ [currentValue[0][0]]: currentValue[0][1] }, { [value]: currentValue[1][1] }]
-          : [{ [currentValue[0][0]]: currentValue[0][1] }, { [currentValue[1][0]]: value }]
-        this.updateSetting(valueToSend, this.settingGroup.group, this.settingGroup.key, input, this.setting.type)
+        valueToSend = typeOfInput === 'scale' ? [value, currentValue[1]] : [currentValue[0], value]
       } else if (typeOfLimit === 'unauthUsersLimit') {
-        const valueToSend = typeOfInput === 'scale'
-          ? [{ [value]: currentValue[0][1] }, { [currentValue[1][0]]: currentValue[1][1] }]
-          : [{ [currentValue[0][0]]: value }, { [currentValue[1][0]]: currentValue[1][1] }]
-        this.updateSetting(valueToSend, this.settingGroup.group, this.settingGroup.key, input, this.setting.type)
+        valueToSend = typeOfInput === 'scale'
+          ? [[value, currentValue[0][1]], [currentValue[1][0], currentValue[1][1]]]
+          : [[currentValue[0][0], value], [currentValue[1][0], currentValue[1][1]]]
+      } else if (typeOfLimit === 'authUserslimit') {
+        valueToSend = typeOfInput === 'scale'
+          ? [[currentValue[0][0], currentValue[0][1]], [value, currentValue[1][1]]]
+          : [[currentValue[0][0], currentValue[0][1]], [currentValue[1][0], value]]
       }
+      this.updateSetting(valueToSend, this.settingGroup.group, this.settingGroup.key, input, this.setting.type)
     },
     toggleLimits(value, input) {
       this.updateSetting(value, this.settingGroup.group, this.settingGroup.key, input)
     },
     updateSetting(value, group, key, input, type) {
-      const updatedSettings = Array.isArray(value)
-        ? value.map(element => { return { 'tuple': Object.entries(element)[0] } })
-        : { 'tuple': Object.entries(value)[0] }
+      const updatedSettings = Array.isArray(value[0])
+        ? value.map(element => { return { 'tuple': element } })
+        : { 'tuple': value }
       this.$store.dispatch('UpdateSettings', { group, key, input, value: updatedSettings, type })
       this.$store.dispatch('UpdateState', { group, key, input, value })
     }