From 43a11ddce8501d19f331ead7fb01d2c0538fcd36 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Thu, 18 Jan 2024 09:26:18 -0500
Subject: [PATCH] Move annotation of field validation failures to CSS

---
 netbox/project-static/dist/netbox.css         | Bin 546330 -> 546301 bytes
 .../styles/overrides/_slim-select.scss        |  18 ++++++++----------
 .../styles/transitional/_forms.scss           |   9 +++++++++
 netbox/utilities/forms/mixins.py              |  13 -------------
 4 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css
index 2cf01fdfa5a34f3c82f4fd1a07c6f1be70e35a98..5fc874a091b256936aca5e453fa95671c8a3d8b3 100644
GIT binary patch
delta 197
zcmbQWM)B`z#fBEf7N!>F7M2#)7Pc1lEgUbbrZ?Dfh-^P#&B4pft(TElteaX?lwVXl
z-9d>%ghvNi#L<C6c)Ff7hZs{q(e#JYS>?CCbK}^~6o$~GkeOFdT7s-ep*S@sH5pZ?
zB(<U>u_!gMIw`*>CAG-Pu%JSrI6o&dML{{m%-GV{vR1DkF&$)s@bm;%4!+3_vxK(a
J_T;eV0RWP>MJxaS

delta 173
zcmeynT5;AI#fBEf7N!>F7M2#)7Pc1lEgUbbxb-rNbu;tI5_2+BraLHch)n-u#leXp
zs%Qrk^>E`571S#(*3C`K%me8`)4_=lgQ@3ZGfGP`HZhsL(3V4XJJ48OZl;2w=?|x~
i%5Sf8<Jiu`T#%R!;tEd}P-N$sX2T)2{eUNjEe`-`_&0$7

diff --git a/netbox/project-static/styles/overrides/_slim-select.scss b/netbox/project-static/styles/overrides/_slim-select.scss
index 419f765cd..e9f079d44 100644
--- a/netbox/project-static/styles/overrides/_slim-select.scss
+++ b/netbox/project-static/styles/overrides/_slim-select.scss
@@ -37,16 +37,6 @@ $spacing-s: $input-padding-x;
 .ss-main {
   color: $form-select-color;
 
-  &.is-invalid .ss-single-selected,
-  &.is-invalid .ss-multi-selected {
-    border-color: $form-feedback-icon-invalid-color;
-  }
-
-  &.is-valid .ss-single-selected,
-  &.is-valid .ss-multi-selected {
-    border-color: $form-feedback-icon-valid-color;
-  }
-
   .ss-single-selected,
   .ss-multi-selected {
     padding: $form-select-padding-y $input-padding-x $form-select-padding-y $form-select-padding-x;
@@ -195,3 +185,11 @@ $spacing-s: $input-padding-x;
 		}
 	}
 }
+
+// Apply red border for fields inside a row with .has-errors
+.has-errors {
+  .ss-single-selected,
+  .ss-multi-selected {
+    border-color: $red;
+  }
+}
diff --git a/netbox/project-static/styles/transitional/_forms.scss b/netbox/project-static/styles/transitional/_forms.scss
index e53bde667..a489d87de 100644
--- a/netbox/project-static/styles/transitional/_forms.scss
+++ b/netbox/project-static/styles/transitional/_forms.scss
@@ -16,3 +16,12 @@ form.object-edit {
     content: '\f06C4';
   }
 }
+
+// Set red border on form fields inside a row with .has-errors
+.has-errors {
+  input,
+  select,
+  textarea {
+    border: 1px solid $red;
+  }
+}
diff --git a/netbox/utilities/forms/mixins.py b/netbox/utilities/forms/mixins.py
index e2b720b62..a2987f451 100644
--- a/netbox/utilities/forms/mixins.py
+++ b/netbox/utilities/forms/mixins.py
@@ -51,19 +51,6 @@ class BootstrapMixin:
             # if 'placeholder' not in field.widget.attrs and field.label is not None:
             #     field.widget.attrs['placeholder'] = field.label
 
-    def is_valid(self):
-        is_valid = super().is_valid()
-
-        # Apply is-invalid CSS class to fields with errors
-        if not is_valid:
-            for field_name in self.errors:
-                # Ignore e.g. __all__
-                if field := self.fields.get(field_name):
-                    css = field.widget.attrs.get('class', '')
-                    field.widget.attrs['class'] = f'{css} is-invalid'
-
-        return is_valid
-
 
 class CheckLastUpdatedMixin(forms.Form):
     """