Merge branch '6.0/ticket-update-validation'

bestpractical · Jan 13, 2025 · 30beec1 · 30beec1
2 parents d13d0e0 + 8b913d4
commit 30beec1
Show file tree

Hide file tree

Showing 24 changed files with 447 additions and 226 deletions.
diff --git a/lib/RT/Interface/Web.pm b/lib/RT/Interface/Web.pm
@@ -6479,6 +6479,38 @@ sub GetDefaultDashboard {
     return $dashboard;
 }
 
+=head2 GetInvalidFields Object => $Object
+
+Returns a list of fields that are marked as invalid by server.
+
+=cut
+
+sub GetInvalidFields {
+    my %args = @_;
+    my @fields;
+    foreach my $note ( keys %{$m->notes} ) {
+        if ( $note =~ /^InvalidField\-(\d+)(?:-(.+))?/ ) {
+            my $cf_id    = $1;
+            my $grouping = $2;
+            my $cf = RT::CustomField->new($session{'CurrentUser'});
+            my ($ok, $msg) = $cf->Load($cf_id);
+            if ( $cf->Id ) {
+                push @fields,
+                    GetCustomFieldInputName(
+                        CustomField => $cf,
+                        Grouping    => $grouping,
+                        # Do not pass misleading ticket object in case it's a txn cf.
+                        $cf->ObjectTypeFromLookupType eq ref $args{Object} ? ( Object => $args{Object} ) : (),
+                    );
+            }
+            else {
+                RT->Logger->error("Unable to load custom field $cf_id: $msg") unless $ok;
+            }
+        }
+    }
+    return @fields;
+}
+
 package RT::Interface::Web;
 RT::Base->_ImportOverlays();
 

diff --git a/share/html/Asset/Create.html b/share/html/Asset/Create.html
@@ -155,6 +155,17 @@
         }
     } else {
         push @results, @cf_errors;
+
+        if ( !$cf_ok && RT::Interface::Web::RequestENV('HTTP_HX_BOOSTED') ) {
+            $r->headers_out->{'HX-Trigger'} = JSON(
+                {
+                    actionsChanged   => { messages => \@results, isWarning => 1 },
+                    validationFailed => [ GetInvalidFields( Object => RT::Asset->new( $session{CurrentUser} ) ) ],
+                },
+                ascii => 1,
+            );
+            Abort( loc("Validation error"), Code => HTTP::Status::HTTP_UNPROCESSABLE_CONTENT );
+        }
     }
 }
 

diff --git a/share/html/Elements/EditCustomField b/share/html/Elements/EditCustomField
@@ -63,13 +63,15 @@ $m->comp(
     CustomField => $CustomField,
     Name => $Name,
     $CustomField->BasedOn && $Name ? ( BasedOnName => GetCustomFieldInputName(Object => $Object, CustomField => $CustomField->BasedOnObj, Grouping => $Grouping) ) : (),
+    DescribedBy => $CFHintId,
+    AddClass => $AddClass,
   );
 
-if (my $msg = $m->notes('InvalidField-' . $CustomField->Id)) {
+if ( $error_msg ) {
 </%perl>
-        <span class="cfinvalidfield my-1 d-inline-block"><% $msg %></span>
+        <span id="<% $CFHintId %>" class="form-text invalid-feedback cfinvalidfield d-inline-block"><% $error_msg %></span>
 %  } elsif ($ShowHints and $CustomField->FriendlyPattern) {
-        <span class="cfhints my-1 d-inline-block">
+        <span id="<% $CFHintId %>" class="form-text cfhints d-inline-block">
           <% $CustomField->FriendlyPattern %>
         </span>
 %  }
@@ -106,6 +108,13 @@ if ( !$NamePrefix ) {
     $Name = GetCustomFieldInputName(Object => $Object, CustomField => $CustomField, Grouping => $Grouping );
 }
 
+my $CFHintId;
+my $cf_name_prefix = GetCustomFieldInputNamePrefix(Object => $Object, CustomField => $CustomField, Grouping => $Grouping );
+
+if ($ShowHints and $CustomField->FriendlyPattern) {
+    $CFHintId = $cf_name_prefix . 'Hint';
+}
+
 # Always fill $Default with submited values if it's empty
 if ( ( !defined $Default || !length $Default ) && $DefaultsFromTopArguments ) {
     my %TOP = %$DECODED_ARGS;
@@ -116,8 +125,7 @@ if ( ( !defined $Default || !length $Default ) && $DefaultsFromTopArguments ) {
             // $TOP{ $NamePrefix . $CustomField->Id . '-Value' };
     }
     else {
-        my $prefix = GetCustomFieldInputNamePrefix(Object => $Object, CustomField => $CustomField, Grouping => $Grouping );
-        $Default //= $TOP{ $prefix . 'Values' } // $TOP{ $prefix . 'Value' };
+        $Default //= $TOP{ $cf_name_prefix . 'Values' } // $TOP{ $cf_name_prefix . 'Value' };
     }
 }
 
@@ -164,6 +172,12 @@ if ( RT->Config->Get('ExternalInfoPriority') && $Object && $Object->isa('RT::Use
     }
 }
 
+my ($error_msg, $AddClass);
+if ( $m->notes('InvalidField-' . $CustomField->Id . ($Grouping ? "-$Grouping" : '') ) ) {
+    $error_msg = $m->notes( 'InvalidField-' . $CustomField->Id . ($Grouping ? "-$Grouping" : '') );
+    $AddClass = 'is-invalid';
+}
+
 my $EditComponent = "EditCustomField$Type";
 $m->callback( %ARGS, CallbackName => 'EditComponentName', Name => \$EditComponent, CustomField => $CustomField, Object => $Object, Rows => \$Rows, Cols => \$Cols);
 $EditComponent = "EditCustomField$Type" unless $m->comp_exists($EditComponent);

diff --git a/share/html/Elements/EditCustomFieldAutocomplete b/share/html/Elements/EditCustomFieldAutocomplete
@@ -53,7 +53,10 @@ cols="<% $Cols %>" \
 % if ( defined $Rows ) {
 rows="<% $Rows %>" \
 % }
-name="<% $name %>" id="<% $name %>" class="CF-<%$CustomField->id%>-Edit form-control"><% $Default || '' %></textarea>
+% if ( defined $DescribedBy ) {
+aria-describedby="<% $DescribedBy %>" \
+% }
+name="<% $name %>" id="<% $name %>" class="CF-<%$CustomField->id%>-Edit form-control <% $AddClass // '' %>"><% $Default || '' %></textarea>
 
 <script type="text/javascript">
 var id = <% "$name" |n,j%>;
@@ -78,7 +81,11 @@ jQuery('#'+id).autocomplete( {
 }
 );
 % } else {
-<input type="text" id="<% $name %>" name="<% $name %>" class="CF-<%$CustomField->id%>-Edit form-control" value="<% $Default || '' %>"/>
+<input type="text" id="<% $name %>" name="<% $name %>" \
+% if ( defined $DescribedBy ) {
+aria-describedby="<% $DescribedBy %>" \
+% }
+class="CF-<%$CustomField->id%>-Edit form-control <% $AddClass // '' %>" value="<% $Default || '' %>"/>
 <script type="text/javascript">
 var id = <% $name |n,j%>;
 id = id.replace(/:/g,'\\:');
@@ -114,4 +121,6 @@ $Values      => undef
 $Multiple    => undef
 $Rows        => undef
 $Cols        => undef
+$DescribedBy => undef
+$AddClass => undef
 </%ARGS>
diff --git a/share/html/Elements/EditCustomFieldBinary b/share/html/Elements/EditCustomFieldBinary
@@ -48,7 +48,11 @@
 % while ( $Values and my $value = $Values->Next ) {
 %# XXX - let user download the file(s) here?
 <div class="form-check">
-  <input type="checkbox" id="<% $delete_name . $value->id %>" name="<%$delete_name%>" class="form-check-input CF-<%$CustomField->id%>-Edit" value="<% $value->Id %>">
+  <input type="checkbox" id="<% $delete_name . $value->id %>" name="<%$delete_name%>" \
+% if ( defined $DescribedBy ) {
+aria-describedby="<% $DescribedBy %>" \
+% }
+class="form-check-input CF-<%$CustomField->id%>-Edit <% $AddClass // '' %>" value="<% $value->Id %>">
   <label class="form-check-label" for="<% $delete_name . $value->id %>">
 % if (my $url = RT->System->ExternalStorageURLFor($value)) {
 <a hx-boost="false" href="<%$url%>">
@@ -83,4 +87,6 @@ $Name   => undef
 $Default => undef
 $Values => undef
 $MaxValues => undef
+$DescribedBy => undef
+$AddClass => undef
 </%ARGS>
diff --git a/share/html/Elements/EditCustomFieldCombobox b/share/html/Elements/EditCustomFieldCombobox
@@ -47,7 +47,11 @@
 %# END BPS TAGGED BLOCK }}}
 % while ($Values and my $value = $Values->Next and $Multiple) {
 <div class="form-check">
-  <input type="checkbox" name="<% $delete_name %>" id="<% $delete_name %>-<% $value->Id %>" value="<% $value->Id %>" class="CF-<%$CustomField->id%>-Edit checkbox form-check-input" />
+  <input type="checkbox" name="<% $delete_name %>" id="<% $delete_name %>-<% $value->Id %>" \
+% if ( defined $DescribedBy ) {
+aria-describedby="<% $DescribedBy %>" \
+% }
+value="<% $value->Id %>" class="CF-<%$CustomField->id%>-Edit checkbox form-check-input <% $AddClass // '' %>" />
   <label class="form-check-label" for="<% $delete_name %>-<% $value->Id %>"><% $value->Content %></label>
 </div>
 % }
@@ -76,4 +80,6 @@ $Multiple => 0
 $Rows => undef
 $MaxValues => undef
 $Name => undef
+$DescribedBy => undef
+$AddClass => undef
 </%ARGS>
diff --git a/share/html/Elements/EditCustomFieldDate b/share/html/Elements/EditCustomFieldDate
@@ -48,7 +48,7 @@
 % my $name = $Name || $NamePrefix.$CustomField->Id.'-Values';
 <div class="row">
   <div class="col-auto">
-    <& /Elements/SelectDate, Name => $name, Default => $Default, current => 0, ShowTime => 0 &>
+    <& /Elements/SelectDate, Name => $name, Default => $Default, current => 0, ShowTime => 0, DescribedBy => $DescribedBy, AddClass => $AddClass &>
   </div>
 </div>
 <%ARGS>
@@ -59,4 +59,6 @@ $Default => undef
 $Values => undef
 $MaxValues => 1
 $Name => undef
+$DescribedBy => undef
+$AddClass => undef
 </%ARGS>
diff --git a/share/html/Elements/EditCustomFieldDateTime b/share/html/Elements/EditCustomFieldDateTime
@@ -48,7 +48,7 @@
 % my $name = $Name || $NamePrefix.$CustomField->Id.'-Values';
 <div class="row">
     <div class="col-auto">
-        <& /Elements/SelectDate, Name => $name, Default => $Default, current => 0 &>
+        <& /Elements/SelectDate, Name => $name, Default => $Default, current => 0, DescribedBy => $DescribedBy, AddClass => $AddClass &>
     </div>
 </div>
 
@@ -61,4 +61,6 @@ $Values => undef
 $MaxValues => 1
 $Name => undef
 $Format => 'unknown'
+$DescribedBy => undef
+$AddClass => undef
 </%ARGS>
diff --git a/share/html/Elements/EditCustomFieldFreeform b/share/html/Elements/EditCustomFieldFreeform
@@ -54,13 +54,19 @@ cols="<% $Cols %>" \
 % if ( defined $Rows ) {
 rows="<% $Rows %>" \
 % }
-name="<%$name%>" id="<%$name%>" wrap="off" class="CF-<%$CustomField->id%>-Edit form-control"><% defined($Default) ? $Default : '' %></textarea>
+% if ( defined $DescribedBy ) {
+aria-describedby="<% $DescribedBy %>" \
+% }
+name="<%$name%>" id="<%$name%>" wrap="off" class="CF-<%$CustomField->id%>-Edit form-control <% $AddClass // '' %>"><% defined($Default) ? $Default : '' %></textarea>
 % } else {
 <input type="text" name="<%$name%>" id="<%$name%>" \
 % if ( defined $Cols ) {
 size="<% $Cols %>" \
 % }
-class="CF-<%$CustomField->id%>-Edit form-control" value="<% defined($Default) ? $Default : ''%>" />
+% if ( defined $DescribedBy ) {
+aria-describedby="<% $DescribedBy %>" \
+% }
+class="CF-<%$CustomField->id%>-Edit form-control <% $AddClass // '' %>" value="<% defined($Default) ? $Default : ''%>" />
 % }
 <%INIT>
 if ( $Multiple and $Values ) {
@@ -80,4 +86,6 @@ $Values => undef
 $Multiple => undef
 $Cols
 $Rows
+$DescribedBy => undef
+$AddClass => undef
 </%ARGS>
diff --git a/share/html/Elements/EditCustomFieldHTML b/share/html/Elements/EditCustomFieldHTML
@@ -54,7 +54,10 @@ cols="<% $Cols %>" \
 % if ( defined $Rows ) {
 rows="<% $Rows %>" \
 % }
-name="<%$name%>" class="CF-<%$CustomField->id%>-Edit form-control richtext"><% $value->Content %></textarea><br />
+% if ( defined $DescribedBy ) {
+aria-describedby="<% $DescribedBy %>" \
+% }
+name="<%$name%>" class="CF-<%$CustomField->id%>-Edit form-control richtext <% $AddClass // '' %>"><% $value->Content %></textarea><br />
 % }
 % if (!$MaxValues or !$Values or $Values->Count < $MaxValues) {
 <textarea \
@@ -64,7 +67,10 @@ cols="<% $Cols %>" \
 % if ( defined $Rows ) {
 rows="<% $Rows %>" \
 % }
-name="<%$name%>" class="CF-<%$CustomField->id%>-Edit form-control richtext"><% $Default %></textarea>
+% if ( defined $DescribedBy ) {
+aria-describedby="<% $DescribedBy %>" \
+% }
+name="<%$name%>" class="CF-<%$CustomField->id%>-Edit form-control richtext <% $AddClass // '' %>"><% $Default %></textarea>
 % }
 <%INIT>
 # XXX - MultiValue textarea is for now outlawed.
@@ -81,4 +87,6 @@ $Values => undef
 $MaxValues => undef
 $Cols
 $Rows
+$DescribedBy => undef
+$AddClass => undef
 </%ARGS>
diff --git a/share/html/Elements/EditCustomFieldSelect b/share/html/Elements/EditCustomFieldSelect
@@ -122,7 +122,7 @@
 <select
   name="<%$name%>" id="<%$name%>"
 
-    class="CF-Edit CF-<%$CustomField->id%>-Edit form-select selectpicker"
+    class="CF-Edit CF-<%$CustomField->id%>-Edit form-select selectpicker <% $AddClass // '' %>"
 %   if ( $use_live_search ) {
     data-live-search="true"
 %   }
@@ -133,6 +133,9 @@
 % if ( $size > 1 ) {
   size="<% $Rows %>"
 % }
+% if ( defined $DescribedBy ) {
+aria-describedby="<% $DescribedBy %>" \
+% }
 <% $Multiple && qq[multiple="multiple"] |n %> >
 % if ( $show_empty_option ) {
 <option value=""<% !$selected && qq[ selected="selected"] |n %>><&|/l&>(no value)</&></option>
@@ -202,6 +205,8 @@ $Rows => undef
 $HideCategory => 0
 $RenderType => undef
 $MaxValues => 1
+$DescribedBy => undef
+$AddClass => undef
 </%ARGS>
 
 <%METHOD options>

diff --git a/share/html/Elements/EditCustomFieldText b/share/html/Elements/EditCustomFieldText
@@ -53,7 +53,10 @@ cols="<% $Cols %>" \
 % if ( defined $Rows ) {
 rows="<% $Rows %>" \
 % }
-name="<%$name%>" class="CF-<%$CustomField->id%>-Edit form-control"><% $value->Content %></textarea><br />
+% if ( defined $DescribedBy ) {
+aria-describedby="<% $DescribedBy %>" \
+% }
+name="<%$name%>" class="CF-<%$CustomField->id%>-Edit form-control <% $AddClass // '' %>"><% $value->Content %></textarea><br />
 % }
 % if (!$MaxValues or !$Values or $Values->Count < $MaxValues) {
 <textarea \
@@ -63,7 +66,10 @@ cols="<% $Cols %>" \
 % if ( defined $Rows ) {
 rows="<% $Rows %>" \
 % }
-name="<%$name%>" class="CF-<%$CustomField->id%>-Edit form-control"><% defined($Default) ? $Default : '' %></textarea>
+% if ( defined $DescribedBy ) {
+aria-describedby="<% $DescribedBy %>" \
+% }
+name="<%$name%>" class="CF-<%$CustomField->id%>-Edit form-control <% $AddClass // '' %>"><% defined($Default) ? $Default : '' %></textarea>
 % }
 <%INIT>
 # XXX - MultiValue textarea is for now outlawed.
@@ -80,4 +86,6 @@ $Values => undef
 $MaxValues => undef
 $Cols
 $Rows
+$DescribedBy => undef
+$AddClass => undef
 </%ARGS>
diff --git a/share/html/Elements/EditCustomFieldWikitext b/share/html/Elements/EditCustomFieldWikitext
@@ -53,7 +53,10 @@ cols="<% $Cols %>" \
 % if ( defined $Rows ) {
 rows="<% $Rows %>" \
 % }
-name="<%$name%>" class="CF-<%$CustomField->id%>-Edit form-control"><% $value->Content %></textarea><br />
+% if ( defined $DescribedBy ) {
+aria-describedby="<% $DescribedBy %>" \
+% }
+name="<%$name%>" class="CF-<%$CustomField->id%>-Edit form-control <% $AddClass // '' %>"><% $value->Content %></textarea><br />
 % }
 % if (!$MaxValues or !$Values or $Values->Count < $MaxValues) {
 <textarea \
@@ -63,7 +66,10 @@ cols="<% $Cols %>" \
 % if ( defined $Rows ) {
 rows="<% $Rows %>" \
 % }
-name="<%$name%>" class="CF-<%$CustomField->id%>-Edit form-control"><% $Default %></textarea>
+% if ( defined $DescribedBy ) {
+aria-describedby="<% $DescribedBy %>" \
+% }
+name="<%$name%>" class="CF-<%$CustomField->id%>-Edit form-control <% $AddClass // '' %>"><% $Default %></textarea>
 % }
 <%INIT>
 # XXX - MultiValue textarea is for now outlawed.
@@ -80,4 +86,6 @@ $Values => undef
 $MaxValues => undef
 $Cols
 $Rows
+$DescribedBy => undef
+$AddClass => undef
 </%ARGS>
diff --git a/share/html/Elements/SelectDate b/share/html/Elements/SelectDate
@@ -46,11 +46,14 @@
 %#
 %# END BPS TAGGED BLOCK }}}
 % $m->callback( %ARGS, Name => $Name, CallbackName => 'BeforeDateInput', Object => $Object, ARGSRef => $ARGSRef, ShowTimeRef => \$ShowTime, );
-<input type="text" class="datepicker<% $ShowTime ? ' withtime' : '' %> form-control"
+<input type="text" class="datepicker<% $ShowTime ? ' withtime' : '' %> form-control <% $AddClass // '' %>" \
 % if ( $id ) {
- id="<% $id %>"
+id="<% $id %>" \
 % }
- name="<% $Name %>" value="<% $Default %>" autocomplete="off" placeholder="" />
+% if ( defined $DescribedBy ) {
+aria-describedby="<% $DescribedBy %>" \
+% }
+name="<% $Name %>" value="<% $Default %>" autocomplete="off" placeholder="" />
 % $m->callback( %ARGS, Name => $Name, CallbackName => 'AfterDateInput', Object => $Object, ARGSRef => $ARGSRef, );
 <%init>
 unless ((defined $Default) or ($current <= 0)) {
@@ -77,4 +80,6 @@ $Name        => undef
 $Object      => undef
 $ARGSRef     => undef
 $id          => undef
+$DescribedBy => undef
+$AddClass    => undef
 </%args>