Merge branch '6.0/optimize-incident-create' into 6.0-trunk

Author: sunnavy

html/Callbacks/RTIR/Ticket/Create.html/AfterShowWidgets

@@ -53,9 +53,10 @@
 <div id="ticket-create-investigation" data-name-prefix="Investigation">
   <&| /Widgets/TitleBox, title => RT::IR::TicketType( Lifecycle => 'investigations' ) &>
     <& /Elements/ShowWidgets,
-      Object  => $InvestigationsQueueObj,
-      Page    => 'Create',
-      ARGSRef => {
+      Object   => $InvestigationsQueueObj,
+      Page     => 'Create',
+      LazyLoad => 1,
+      ARGSRef  => {
           Queue          => $InvestigationsQueueObj->Id,
           SelectIncident => 0,
           AddAttachments => 0,

html/Ticket/Widgets/Create/AttachReports

@@ -62,3 +62,36 @@ if ( $ARGS{Incident} ) {
 <%ARGS>
 $QueueObj
 </%ARGS>
+
+<%METHOD PreCheck>
+<%args>
+$ARGSRef
+</%args>
+<%init>
+return 0 unless $ARGSRef && $ARGSRef->{Incident};
+
+my $id = ref $ARGSRef->{Incident} ? $ARGSRef->{Incident}[0] : $ARGSRef->{Incident};
+my $incident = RT::Ticket->new( $session{CurrentUser} );
+$incident->Load($id);
+return 0 unless $incident->Id;
+
+my @parents;
+if ( RT::IR->IsIncidentQueue( $incident->QueueObj ) ) {
+    push @parents, $incident->id;
+}
+else {
+    push @parents, map $_->id, @{ RT::IR->Incidents($incident)->ItemsArrayRef || [] };
+}
+return 0 unless @parents;
+
+my $siblings = RT::Tickets->new( $incident->CurrentUser );
+$siblings->FromSQL(
+    RT::IR->Query(
+        Lifecycle => RT::IR->lifecycle_report,
+        MemberOf  => \@parents,
+        Exclude   => [$incident],
+    )
+);
+return $siblings->Count ? 1 : 0;
+</%init>
+</%METHOD>

html/Ticket/Widgets/Display/CVEDetails

@@ -55,3 +55,13 @@
 <%ARGS>
 $TicketObj
 </%ARGS>
+
+<%METHOD PreCheck>
+<%args>
+$Object
+</%args>
+<%init>
+return 0 unless $Object && $Object->isa('RT::Ticket');
+return $Object->CustomFieldValues('CVE ID')->Count ? 1 : 0;
+</%init>
+</%METHOD>

html/Ticket/Widgets/Display/LinkedArticles

@@ -54,3 +54,15 @@
 <%ARGS>
 $TicketObj
 </%ARGS>
+
+<%METHOD PreCheck>
+<%args>
+$Object
+</%args>
+<%init>
+return 0 unless $Object && $Object->isa('RT::Ticket');
+my $articles = RT::Articles->new( $session{'CurrentUser'} );
+$articles->LimitReferredToBy( $Object->URI );
+return $articles->Count ? 1 : 0;
+</%init>
+</%METHOD>

t/020-incident-and-investigation.t

@@ -31,6 +31,36 @@ is ($agent->status, 200, "Attempting to create new incident and investigation li
 $agent->text_like(qr{You must enter a correspondent for the investigation},
 "RT did not allow an empty correspondent field");
 
+# Same scenario, but submitted as an htmx-boosted request (matching what
+# the browser sends when the body's hx-boost intercepts the form).
+$agent->display_ticket($ir);
+$agent->follow_link_ok({id => "create-incident"}, "Followed 'New (Incident)' link (htmx-boosted scenario)");
+$agent->form_number(3);
+$agent->field('Subject', 'Incident for htmx-boosted validation test');
+$agent->field('InvestigationSubject', 'Investigation for htmx-boosted validation test');
+$agent->field('InvestigationRequestors', '');
+
+$agent->add_header( 'HX-Request' => 'true' );
+$agent->add_header( 'HX-Boosted' => 'true' );
+
+# autocheck would fail the test on a non-2xx response; 422 is what we want here.
+my $orig_autocheck = $agent->autocheck;
+$agent->autocheck(0);
+
+$agent->click("InvestigationSubmitTicket");
+
+is( $agent->status, 422, 'htmx-boosted InvestigationSubmitTicket validation failure returns 422' );
+
+$agent->next_warning_like( qr/Validation error/, 'htmx-boosted validation failure logs expected "Validation error"' );
+
+my $hx_trigger = $agent->response->header('HX-Trigger');
+ok( $hx_trigger, 'HX-Trigger header is set on htmx-boosted validation failure' );
+like( $hx_trigger // '', qr/actionsChanged/,                      'HX-Trigger contains actionsChanged event' );
+like( $hx_trigger // '', qr/correspondent for the investigation/, 'HX-Trigger payload mentions the validation error' );
+
+$agent->autocheck($orig_autocheck);
+$agent->delete_header('HX-Request');
+$agent->delete_header('HX-Boosted');
 
 my ( $inc_id, $inv_id ) = $agent->create_incident_and_investigation(
     '',

t/playwright/incident_create.t

@@ -0,0 +1,32 @@
+use strict;
+use warnings;
+
+use RT::IR::Test tests => undef, playwright => 1;
+
+my ( $url, $p ) = RT::Test->started_ok;
+$p->login();
+
+$p->get_ok('/RTIR/Incident/Create.html?Lifecycle=incidents');
+$p->wait_for_htmx;
+
+my $incident_section      = $p->{page}->locator('#ticket-create-incident');
+my $investigation_section = $p->{page}->locator('#ticket-create-investigation');
+
+ok( $incident_section->isVisible,      'Incident section is rendered in the DOM' );
+ok( $investigation_section->count > 0, 'Investigation section is rendered in the DOM' );
+
+# Each widget is wrapped by HTMXLoadStart in a div with the
+# class="htmx-load-widget" and an hx-trigger attribute. The trigger
+# should be "...load" for the eager Incident half and "...revealed" for
+# the lazy Investigation half.
+my $incident_widget      = $incident_section->locator('.htmx-load-widget')->first;
+my $investigation_widget = $investigation_section->locator('.htmx-load-widget')->first;
+
+my $inc_trigger = $incident_widget->getAttribute('hx-trigger')      // '';
+my $inv_trigger = $investigation_widget->getAttribute('hx-trigger') // '';
+
+like( $inc_trigger, qr/\bload\b/,     "Incident widget triggers on load (hx-trigger='$inc_trigger')" );
+like( $inv_trigger, qr/\brevealed\b/, "Investigation widget triggers on reveal (hx-trigger='$inv_trigger')" );
+
+$p->logout;
+done_testing;