Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add search #6

Merged
merged 1 commit into from
Nov 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/obanalyze/dashboard.ex
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ defmodule Obanalyze.Dashboard do

<.live_nav_bar id="oban_states" page={@page} nav_param="job_state" style={:bar} extra_params={["nav"]}>
<:item :for={nav_item <- @nav_items} name={nav_item.name} label={nav_item.label} method="navigate">
<.live_table id="oban_jobs" limit={per_page_limits()} dom_id={"oban-jobs-#{nav_item.name}"} page={@page} row_attrs={&row_attrs/1} row_fetcher={&row_fetcher(&1, &2, nav_item.name)} default_sort_by={@default_sort_by} title="" search={false}>
<.live_table id="oban_jobs" limit={per_page_limits()} dom_id={"oban-jobs-#{nav_item.name}"} page={@page} row_attrs={&row_attrs/1} row_fetcher={&row_fetcher(&1, &2, nav_item.name)} default_sort_by={@default_sort_by} title="" search={true}>
<:col field={:id} sortable={:desc} />
<:col :let={job} field={:worker} sortable={:desc}>
<p class="font-weight-bold"><%= job.worker %></p>
Expand Down
13 changes: 12 additions & 1 deletion lib/obanalyze/oban_jobs.ex
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,22 @@ defmodule Obanalyze.ObanJobs do
{jobs, total_jobs}
end

defp jobs_query(%{sort_by: sort_by, sort_dir: sort_dir, limit: limit}, job_state) do
defp jobs_query(%{sort_by: sort_by, sort_dir: sort_dir, limit: limit} = params, job_state) do
Oban.Job
|> limit(^limit)
|> where([job], job.state == ^job_state)
|> order_by({^sort_dir, ^sort_by})
|> filter(params[:search])
end

defp filter(query, nil), do: query

defp filter(query, term) do
like = "%#{term}%"

from oj in query,
where: like(oj.worker, ^like),
or_where: like(oj.args, ^like)
end

defp jobs_count_query(job_state) do
Expand Down
36 changes: 36 additions & 0 deletions test/obanalyze/dashboard_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,42 @@ defmodule Obanalyze.DashboardTest do
assert_patched(live, "/dashboard/obanalyze?")
end

test "search" do
_json_job =
job_fixture(%{foo: "json"},
state: "executing",
worker: "JsonWorker",
attempted_at: DateTime.utc_now()
)

_yaml_job =
job_fixture(%{foo: "yaml"},
state: "executing",
worker: "YamlWorker",
attempted_at: DateTime.utc_now()
)

{:ok, _live, rendered} = live(build_conn(), "/dashboard/obanalyze?search=JsonWorker")

assert rendered |> :binary.matches("<td class=\"oban-jobs-executing-worker\"") |> length() ==
1

{:ok, _live, rendered} = live(build_conn(), "/dashboard/obanalyze?search=YamlWorker")

assert rendered |> :binary.matches("<td class=\"oban-jobs-executing-worker\"") |> length() ==
1

{:ok, _live, rendered} = live(build_conn(), "/dashboard/obanalyze?search=foo")

assert rendered |> :binary.matches("<td class=\"oban-jobs-executing-worker\"") |> length() ==
2

{:ok, _live, rendered} = live(build_conn(), "/dashboard/obanalyze?search=nothing")

assert rendered |> :binary.matches("<td class=\"oban-jobs-executing-worker\"") |> length() ==
0
end

defp job_fixture(args, opts) do
opts = Keyword.put_new(opts, :worker, "FakeWorker")
{:ok, job} = Oban.Job.new(args, opts) |> Oban.insert()
Expand Down
Loading