Add mode filtering and display dynamic status

Author: sorentwo

lib/oban/web/components/icons.ex

@@ -6,23 +6,6 @@ defmodule Oban.Web.Components.Icons do
   attr :rest, :global,
     default: %{
       "aria-hidden": "true",
-      class: "w-4 h-4",
-      fill: "currentColor",
-      viewBox: "0 0 16 16"
-    }
-
-  slot :inner_block, required: true
-
-  defp svg_mini(assigns) do
-    ~H"""
-    <svg {@rest}>
-      {render_slot(@inner_block)}
-    </svg>
-    """
-  end
-
-  attr :rest, :global,
-    default: %{
       "stroke-width": "1.5",
       class: "w-6 h-6",
       fill: "none",

lib/oban/web/live/queues/table_component.ex

@@ -108,26 +108,42 @@ defmodule Oban.Web.Queues.TableComponent do
             {started_at(@queue)}
           </span>
 
-          <div class="w-20 pr-3 flex justify-end items-center space-x-1">
+          <div class="w-20 pr-3 flex justify-center items-center space-x-1">
+            <Icons.globe
+              :if={Queue.global_limit?(@queue)}
+              class="w-5 h-5"
+              data-title="Global limit"
+              id={"#{@queue.name}-has-global-limit"}
+              phx-hook="Tippy"
+              rel="has-global-limit"
+            />
+            <Icons.arrow_trending_down
+              :if={Queue.rate_limit?(@queue)}
+              class="w-5 h-5"
+              data-title="Rate limit"
+              id={"#{@queue.name}-has-rate-limit"}
+              phx-hook="Tippy"
+              rel="has-rate-limit"
+            />
             <Icons.pause_circle
               :if={Queue.all_paused?(@queue)}
-              class="w-4 h-4"
+              class="w-5 h-5"
               data-title="All paused"
               id={"#{@queue.name}-is-paused"}
               phx-hook="Tippy"
               rel="is-paused"
             />
             <Icons.play_pause_circle
               :if={Queue.any_paused?(@queue) and not Queue.all_paused?(@queue)}
-              class="w-4 h-4"
+              class="w-5 h-5"
               data-title="Some paused"
               id={"#{@queue.name}-is-some-paused"}
               phx-hook="Tippy"
               rel="has-some-paused"
             />
             <Icons.power
               :if={Queue.terminating?(@queue)}
-              class="w-4 h-4"
+              class="w-5 h-5"
               data-title="Terminating"
               id={"#{@queue.name}-is-terminating"}
               phx-hook="Tippy"

lib/oban/web/pages/crons_page.ex

@@ -5,7 +5,7 @@ defmodule Oban.Web.CronsPage do
 
   alias Oban.Web.{Cron, CronQuery, Page, SearchComponent, SortComponent}
 
-  @known_params ~w(sort_by sort_dir workers states)
+  @known_params ~w(modes sort_by sort_dir states workers)
 
   @impl Phoenix.LiveComponent
   def render(assigns) do
@@ -127,9 +127,16 @@ defmodule Oban.Web.CronsPage do
           </span>
 
           <div class="w-20 pr-3 flex justify-end items-center space-x-1">
+            <Icons.sparkles
+              :if={@cron.dynamic?}
+              id={"cron-dynamic-icon-#{@cron.name}"}
+              class="w-5 h-5"
+              phx-hook="Tippy"
+              data-title="Dynamic cron"
+            />
+
             <span
               id={"cron-state-icon-#{@cron.name}"}
-              class="py-1.5 px-2 text-xs"
               phx-hook="Tippy"
               data-title={state_title(@cron)}
             >
@@ -143,6 +150,7 @@ defmodule Oban.Web.CronsPage do
   end
 
   attr :state, :string, required: true
+  attr :rest, :global
 
   defp state_icon(assigns) do
     ~H"""

lib/oban/web/queries/cron_query.ex

@@ -11,6 +11,7 @@ defmodule Oban.Web.CronQuery do
 
   @suggest_qualifier [
     {"workers:", "cron worker name", "workers:MyApp.Worker"},
+    {"modes:", "cron mode (static/dynamic)", "modes:static"},
     {"states:", "last execution state", "states:completed"}
   ]
 
@@ -25,11 +26,16 @@ defmodule Oban.Web.CronQuery do
     {"unknown", "no previous jobs available", "unknown"}
   ]
 
+  @suggest_mode [
+    {"static", "regular cron job", "static"},
+    {"dynamic", "dynamic cron job", "dynamic"}
+  ]
+
   @known_qualifiers MapSet.new(@suggest_qualifier, fn {qualifier, _, _} -> qualifier end)
 
   # Searching
 
-  def filterable, do: ~w(workers states)a
+  def filterable, do: ~w(workers states modes)a
 
   def parse(terms) when is_binary(terms) do
     Search.parse(terms, &parse_term/1)
@@ -47,6 +53,7 @@ defmodule Oban.Web.CronQuery do
       last ->
         case String.split(last, ":", parts: 2) do
           ["workers", frag] -> suggest_workers(frag, conf)
+          ["modes", frag] -> suggest_static(frag, @suggest_mode)
           ["states", frag] -> suggest_static(frag, @suggest_state)
           [frag] -> suggest_static(frag, @suggest_qualifier)
           _ -> []
@@ -98,6 +105,10 @@ defmodule Oban.Web.CronQuery do
     {:states, parsed}
   end
 
+  defp parse_term("modes:" <> modes) do
+    {:modes, String.split(modes, ",")}
+  end
+
   defp parse_term(_term), do: {:none, ""}
 
   # Querying
@@ -146,8 +157,8 @@ defmodule Oban.Web.CronQuery do
       opts: opts,
       dynamic?: dynamic?,
       next_at: next_at(expr),
-      last_at: last_at(history, worker),
-      last_state: get_in(history, [worker, :state])
+      last_at: last_at(history, name),
+      last_state: get_in(history, [name, :state])
     ]
 
     struct!(Cron, fields)
@@ -158,13 +169,13 @@ defmodule Oban.Web.CronQuery do
 
     query =
       from(
-        f in fragment("jsonb_array_elements(?)", ^names),
+        f in fragment("jsonb_array_elements_text(?)", ^names),
         as: :list,
         inner_lateral_join:
           j in subquery(
             Job
             |> select(~w(state attempted_at cancelled_at completed_at discarded_at scheduled_at)a)
-            |> where([j], j.meta["cron_name"] == parent_as(:list).value)
+            |> where([j], fragment("? @> jsonb_build_object('cron_name', ?)", j.meta, parent_as(:list).value))
             |> order_by(desc: :id)
             |> limit(1)
           ),
@@ -235,4 +246,8 @@ defmodule Oban.Web.CronQuery do
 
   defp filter(cron, {:workers, workers}), do: cron.worker in workers
   defp filter(cron, {:states, states}), do: cron.last_state in states
+
+  defp filter(cron, {:modes, modes}) do
+    if(cron.dynamic?, do: "dynamic", else: "static") in modes
+  end
 end

lib/oban/web/queries/queue_query.ex

@@ -7,7 +7,7 @@ defmodule Oban.Web.QueueQuery do
   @suggest_qualifier [
     {"nodes:", "host name", "nodes:machine@somehost"},
     {"modes:", "a concurrency mode such as global", "global"},
-    {"stats:", "a status such as paused, global, etc.", "paused"}
+    {"stats:", "a status such as paused or terminating", "paused"}
   ]
 
   @suggest_mode [