Merge branch 'sila-ui' into sila

6 files changed, 23 insertions, 6 deletions

diff --git a/src/assets/styles/bmc/_sila/_tables.scss b/src/assets/styles/bmc/_sila/_tables.scss
index c9977905..bddb4d1d 100644
--- a/src/assets/styles/bmc/_sila/_tables.scss
+++ b/src/assets/styles/bmc/_sila/_tables.scss
@@ -165,6 +165,14 @@
     }
   }
 }
+// style for table contained in <b-card> components
+#page-network {
+  [class*='table-responsive-'] {
+      @include media-breakpoint-up(lg) {
+      width: calc(100vw - 390px);
+    }
+  }
+}
 
 // Table stacked style for small screen only
 @include media-breakpoint-down(xs) {
diff --git a/src/components/_sila/Mixins/VuelidateMixin.js b/src/components/_sila/Mixins/VuelidateMixin.js
index fec85251..343d24a7 100644
--- a/src/components/_sila/Mixins/VuelidateMixin.js
+++ b/src/components/_sila/Mixins/VuelidateMixin.js
@@ -4,6 +4,15 @@ const VuelidateMixin = {
       const { $dirty, $error } = model;
       return $dirty ? !$error : null;
     },
+    getIpValidationState(model) {
+      const { $dirty, $error, $model } = model;
+      return $dirty
+        ? !$error &&
+            /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/.test(
+              $model
+            )
+        : null;
+    },
   },
 };
 
diff --git a/src/views/_sila/Overview/Network/ModalDns.vue b/src/views/_sila/Overview/Network/ModalDns.vue
index 82edb1e8..641fe78d 100644
--- a/src/views/_sila/Overview/Network/ModalDns.vue
+++ b/src/views/_sila/Overview/Network/ModalDns.vue
@@ -16,7 +16,7 @@
               id="staticDns"
               v-model="form.staticDns"
               type="text"
-              :state="getValidationState($v.form.staticDns)"
+              :state="getIpValidationState($v.form.staticDns)"
               @input="$v.form.staticDns.$touch()"
             />
             <b-form-invalid-feedback role="alert">
diff --git a/src/views/_sila/Overview/Network/ModalIpv4.vue b/src/views/_sila/Overview/Network/ModalIpv4.vue
index 00742a11..51d06eff 100644
--- a/src/views/_sila/Overview/Network/ModalIpv4.vue
+++ b/src/views/_sila/Overview/Network/ModalIpv4.vue
@@ -16,7 +16,7 @@
               id="ipAddress"
               v-model="form.ipAddress"
               type="text"
-              :state="getValidationState($v.form.ipAddress)"
+              :state="getIpValidationState($v.form.ipAddress)"
               @input="$v.form.ipAddress.$touch()"
             />
             <b-form-invalid-feedback role="alert">
@@ -38,7 +38,7 @@
               id="gateway"
               v-model="form.gateway"
               type="text"
-              :state="getValidationState($v.form.gateway)"
+              :state="getIpValidationState($v.form.gateway)"
               @input="$v.form.gateway.$touch()"
             />
             <b-form-invalid-feedback role="alert">
@@ -62,7 +62,7 @@
               id="subnetMask"
               v-model="form.subnetMask"
               type="text"
-              :state="getValidationState($v.form.subnetMask)"
+              :state="getIpValidationState($v.form.subnetMask)"
               @input="$v.form.subnetMask.$touch()"
             />
             <b-form-invalid-feedback role="alert">
diff --git a/src/views/_sila/Overview/Network/Network.vue b/src/views/_sila/Overview/Network/Network.vue
index 2321b1bd..27e855cc 100644
--- a/src/views/_sila/Overview/Network/Network.vue
+++ b/src/views/_sila/Overview/Network/Network.vue
@@ -1,5 +1,5 @@
 <template>
-  <b-container fluid="xl">
+  <b-container id="page-network" fluid="xl">
     <page-title :description="$t('pageNetwork.pageDescription')" />
     <!-- Global settings for all interfaces -->
     <network-global-settings />
diff --git a/src/views/_sila/Overview/Network/TableDns.vue b/src/views/_sila/Overview/Network/TableDns.vue
index 3b3cc4b4..ee830ee4 100644
--- a/src/views/_sila/Overview/Network/TableDns.vue
+++ b/src/views/_sila/Overview/Network/TableDns.vue
@@ -1,7 +1,7 @@
 <template>
   <page-section :section-title="$t('pageNetwork.staticDns')">
     <b-row>
-      <b-col lg="6">
+      <b-col>
         <div class="text-right">
           <b-button variant="primary" @click="initDnsModal()">
             <icon-add />