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

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

Author: rcmaiolini

src/components/hosts/hostDetails/oracle/databases/DbDiskGroups.vue

@@ -9,9 +9,9 @@
         <v-th sortKey="diskGroupName">Disk Group Name</v-th>
         <v-th sortKey="totalSpace">Total Space (GB)</v-th>
         <v-th sortKey="usedSpace">Used Space (GB)</v-th>
-        <v-th sortKey="percentageUsedSpace">Used Percentage</v-th>
+        <v-th sortKey="percentageUsedSpace">Used Percentage (%)</v-th>
         <v-th sortKey="freeSpace">Free Space (GB)</v-th>
-        <v-th sortKey="percentageFreeSpace">Free Percentage</v-th>
+        <v-th sortKey="percentageFreeSpace">Free Percentage (%)</v-th>
       </template>
 
       <template slot="bodyData" slot-scope="rowData">

src/components/licenses/contracts/Microsoft/MsSqlServerForm.vue

@@ -6,20 +6,6 @@
     :applyText="msSqlServer.id ? 'Update Contract' : 'Add Contract'"
     cancelText="Cancel"
   >
-    <b-field label="Location" custom-class="is-small">
-      <b-select
-        size="is-small"
-        placeholder="Select"
-        v-model="msSqlServer.location"
-        expanded
-        data-cy="sqlserver-location"
-      >
-        <option v-for="(loc, index) in locationList" :key="index">
-          {{ loc }}
-        </option>
-      </b-select>
-    </b-field>
-
     <b-field
       label="Type *"
       custom-class="is-small"
@@ -273,6 +259,20 @@
       />
     </b-field>
 
+    <b-field label="Location" custom-class="is-small">
+      <b-select
+        size="is-small"
+        placeholder="Select"
+        v-model="msSqlServer.location"
+        expanded
+        data-cy="sqlserver-location"
+      >
+        <option v-for="(loc, index) in locationList" :key="index">
+          {{ loc }}
+        </option>
+      </b-select>
+    </b-field>
+
     <slot />
   </AdvancedFiltersBase>
 </template>

src/components/licenses/contracts/MySQL/MySqlContractsForm.vue

@@ -6,20 +6,6 @@
     :applyText="mysqlForm.id ? 'Update Contract' : 'Add Contract'"
     cancelText="Cancel"
   >
-    <b-field label="Location" custom-class="is-small">
-      <b-select
-        size="is-small"
-        placeholder="Select"
-        v-model="mysqlForm.location"
-        expanded
-        data-cy="mysql-location"
-      >
-        <option v-for="(loc, index) in locationList" :key="index">
-          {{ loc }}
-        </option>
-      </b-select>
-    </b-field>
-
     <b-field
       label="Type *"
       custom-class="is-small"
@@ -297,6 +283,20 @@
       </b-taginput>
     </b-field>
 
+    <b-field label="Location" custom-class="is-small">
+      <b-select
+        size="is-small"
+        placeholder="Select"
+        v-model="mysqlForm.location"
+        expanded
+        data-cy="mysql-location"
+      >
+        <option v-for="(loc, index) in locationList" :key="index">
+          {{ loc }}
+        </option>
+      </b-select>
+    </b-field>
+
     <slot />
   </AdvancedFiltersBase>
 </template>

src/components/licenses/contracts/Oracle/OracleContractsForm.vue

@@ -8,20 +8,6 @@
     "
     :cancelText="$t('common.forms.cancel')"
   >
-    <b-field label="Location" custom-class="is-small">
-      <b-select
-        size="is-small"
-        placeholder="Select"
-        v-model="oracleForm.location"
-        expanded
-        data-cy="oracle-location"
-      >
-        <option v-for="(loc, index) in locationList" :key="index">
-          {{ loc }}
-        </option>
-      </b-select>
-    </b-field>
-
     <b-field
       :label="`${$t('common.fields.agreeNumber')} *`"
       custom-class="is-small"
@@ -357,6 +343,20 @@
       </div>
     </b-field>
 
+    <b-field label="Location" custom-class="is-small">
+      <b-select
+        size="is-small"
+        placeholder="Select"
+        v-model="oracleForm.location"
+        expanded
+        data-cy="oracle-location"
+      >
+        <option v-for="(loc, index) in locationList" :key="index">
+          {{ loc }}
+        </option>
+      </b-select>
+    </b-field>
+
     <slot />
   </AdvancedFiltersBase>
 </template>