Merge branch 'main' into checkly

.github/workflows/auto-resolve-keep.yml

@@ -61,7 +61,7 @@ jobs:
           url: "https://api.keephq.dev/incidents/${{ steps.set_ids.outputs.final_incident_id }}/enrich"
           method: "POST"
           customHeaders: '{"X-API-KEY": "${{ secrets.KEEP_API_KEY }}", "Content-Type": "application/json"}'
-          data: '{"enrichments":{"incident_title":"${{ github.event.pull_request.title || ''Manual resolution'' }}","incident_url":"${{ github.event.pull_request.html_url || github.server_url }}//${{ github.repository }}/actions/runs/${{ github.run_id }}", "incident_id": "${{ github.run_id }}", "incident_provider": "github"}}'
+          data: '{"enrichments":{"incident_title":"${{ github.event.pull_request.title || ''Manual resolution'' }}","incident_url":"${{ github.event.pull_request.html_url || format(''{0}/{1}/actions/runs/{2}'', github.server_url, github.repository, github.run_id) }}", "incident_id": "${{ github.run_id }}", "incident_provider": "github"}}'
 
       - name: Auto resolve Keep alert
         if: |
@@ -72,4 +72,4 @@ jobs:
           url: "https://api.keephq.dev/alerts/enrich?dispose_on_new_alert=true"
           method: "POST"
           customHeaders: '{"Content-Type": "application/json", "X-API-KEY": "${{ secrets.KEEP_API_KEY }}"}'
-          data: '{"enrichments":{"status":"${{ inputs.status || ''resolved'' }}","dismissed":false,"dismissUntil":"","note":"${{ github.event.pull_request.title || ''Manual resolution'' }}","ticket_url":"${{ github.event.pull_request.html_url || github.server_url }}//${{ github.repository }}/actions/runs/${{ github.run_id }}"},"fingerprint":"${{ steps.set_ids.outputs.final_alert_fingerprint }}"}'
+          data: '{"enrichments":{"status":"${{ inputs.status || ''resolved'' }}","dismissed":false,"dismissUntil":"","note":"${{ github.event.pull_request.title || ''Manual resolution'' }}","ticket_url":"${{ github.event.pull_request.html_url || format(''{0}/{1}/actions/runs/{2}'', github.server_url, github.repository, github.run_id) }}"},"fingerprint":"${{ steps.set_ids.outputs.final_alert_fingerprint }}"}'

keep-ui/app/(keep)/incidents/[id]/chat/incident-chat.tsx

@@ -568,8 +568,7 @@ export function IncidentChat({
     return (
       <EmptyStateCard
         title="Chat not available"
-        description="No alerts found for this incident. Go to the alerts feed and assign alerts to interact with the incident."
-        buttonText="Assign alerts to this incident"
+        description="Incident assitant will become available as alerts are assigned to this incident."
         onClick={() => router.push("/alerts/feed")}
       />
     );

keep-ui/app/(keep)/incidents/[id]/incident-layout-client.tsx

@@ -44,7 +44,7 @@ export function IncidentLayoutClient({
               />
             </div>
           }
-          initialLeftWidth={60}
+          initialLeftWidth={65}
         />
       ) : (
         <div className="flex-1 min-w-0">{children}</div>

keep-ui/app/(keep)/incidents/[id]/timeline/incident-timeline.tsx

@@ -283,9 +283,9 @@ export default function IncidentTimeline({
 
   // TODO: Load data on server side
   // Loading state is true if the data is not loaded and there is no error for smoother loading state on initial load
-  const alertsLoading = _alertsLoading || (!alerts && !alertsError);
-  const auditEventsLoading =
-    _auditEventsLoading || (!auditEvents && !auditEventsError);
+  // const alertsLoading = _alertsLoading || (!alerts && !alertsError);
+  // const auditEventsLoading =
+  //   _auditEventsLoading || (!auditEvents && !auditEventsError);
 
   const [selectedEvent, setSelectedEvent] = useState<AuditEvent | null>(null);
 
@@ -358,7 +358,7 @@ export default function IncidentTimeline({
     return {};
   }, [auditEvents, alerts]);
 
-  if (auditEventsLoading || alertsLoading) {
+  if (_auditEventsLoading || _alertsLoading) {
     return (
       <Card>
         <Loading />

keep-ui/components/ui/EmptyStateCard.tsx

@@ -10,7 +10,7 @@ export function EmptyStateCard({
 }: {
   title: string;
   description: string;
-  buttonText: string;
+  buttonText?: string;
   onClick: (e: React.MouseEvent) => void;
   className?: string;
 }) {
@@ -29,9 +29,11 @@ export function EmptyStateCard({
         <p className="text-tremor-default text-tremor-content dark:text-dark-tremor-content">
           {description}
         </p>
-        <Button className="mt-4" color="orange" onClick={onClick}>
-          {buttonText}
-        </Button>
+        {buttonText && (
+          <Button className="mt-4" color="orange" onClick={onClick}>
+            {buttonText}
+          </Button>
+        )}
       </div>
     </Card>
   );

keep-ui/components/ui/ResizableColumns.tsx

@@ -62,7 +62,7 @@ const ResizableColumns = ({
         onMouseDown={startDragging}
       />
 
-      <div className="flex-1 bg-white p-4 overflow-auto">{rightChild}</div>
+      <div className="flex-1 p-4 overflow-auto">{rightChild}</div>
     </div>
   );
 };