Merge pull request #967 from ercole-io/fix-bugs

Fix cloud advisors settings position

Author: rcmaiolini

src/components/settings/ThunderService.vue

@@ -50,82 +50,82 @@
     </div>
 
     <hr class="my-3" />
-    <p class="is-size-6 has-text-weight-semibold">Oci Data Retrieve Job</p>
+    <p class="is-size-6 has-text-weight-semibold">Cloud Advisors</p>
 
     <div class="columns is-multiline">
-      <div class="column is-one-quarter">
+      <div class="column is-2">
         <div class="field">
           <label
-            v-html="highlight(ThunderServiceLabels[4])"
+            v-html="highlight(APIServiceLabels[21])"
             class="label is-small"
           />
-          <CustomInput v-model="ThunderService.OciDataRetrieveJob.Crontab" />
+          <CustomRadio
+            v-model="APIService.EnableOciMenu"
+            :options="trueOrFalseOptions"
+          />
         </div>
       </div>
-      <div class="column is-one-quarter">
+
+      <div class="column is-2">
         <div class="field">
           <label
-            v-html="highlight(ThunderServiceLabels[5])"
+            v-html="highlight(APIServiceLabels[22])"
             class="label is-small"
           />
-          <CustomInput
-            v-model="ThunderService.OciDataRetrieveJob.DaysThreshold"
-            inputType="number"
+          <CustomRadio
+            v-model="APIService.EnableAwsMenu"
+            :options="trueOrFalseOptions"
           />
         </div>
       </div>
-      <div class="column is-one-quarter">
+
+      <div class="column is-2">
         <div class="field">
           <label
-            v-html="highlight(ThunderServiceLabels[6])"
+            v-html="highlight(APIServiceLabels[23])"
             class="label is-small"
           />
           <CustomRadio
-            v-model="ThunderService.OciDataRetrieveJob.RunAtStartup"
+            v-model="APIService.EnableGcpMenu"
             :options="trueOrFalseOptions"
           />
         </div>
       </div>
     </div>
 
     <hr class="my-3" />
-    <p class="is-size-6 has-text-weight-semibold">Cloud Advisors</p>
+    <p class="is-size-6 has-text-weight-semibold">Oci Data Retrieve Job</p>
 
     <div class="columns is-multiline">
-      <div class="column is-2">
+      <div class="column is-one-quarter">
         <div class="field">
           <label
-            v-html="highlight(APIServiceLabels[21])"
+            v-html="highlight(ThunderServiceLabels[4])"
             class="label is-small"
           />
-          <CustomRadio
-            v-model="APIService.EnableOciMenu"
-            :options="trueOrFalseOptions"
-          />
+          <CustomInput v-model="ThunderService.OciDataRetrieveJob.Crontab" />
         </div>
       </div>
-
-      <div class="column is-2">
+      <div class="column is-one-quarter">
         <div class="field">
           <label
-            v-html="highlight(APIServiceLabels[22])"
+            v-html="highlight(ThunderServiceLabels[5])"
             class="label is-small"
           />
-          <CustomRadio
-            v-model="APIService.EnableAwsMenu"
-            :options="trueOrFalseOptions"
+          <CustomInput
+            v-model="ThunderService.OciDataRetrieveJob.DaysThreshold"
+            inputType="number"
           />
         </div>
       </div>
-
-      <div class="column is-2">
+      <div class="column is-one-quarter">
         <div class="field">
           <label
-            v-html="highlight(APIServiceLabels[23])"
+            v-html="highlight(ThunderServiceLabels[6])"
             class="label is-small"
           />
           <CustomRadio
-            v-model="APIService.EnableGcpMenu"
+            v-model="ThunderService.OciDataRetrieveJob.RunAtStartup"
             :options="trueOrFalseOptions"
           />
         </div>