Skip to content
Merged
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
15 changes: 9 additions & 6 deletions front/lib/front_web/controllers/dashboard_controller.ex
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ defmodule FrontWeb.DashboardController do
end
end

defp params(conn, page_token, direction, filters, project_ids) do
defp params(conn, page_token, direction, filters, project_ids, org_id) do
user_id = conn.assigns.user_id
direction = map_workflow_direction(direction)

Expand All @@ -90,7 +90,8 @@ defmodule FrontWeb.DashboardController do
page_token: page_token,
direction: direction,
created_after: time,
project_ids: project_ids
project_ids: project_ids,
organization_id: org_id
]
|> inject_requester(filters.requester, user_id)
end
Expand Down Expand Up @@ -118,7 +119,7 @@ defmodule FrontWeb.DashboardController do
{:ok, project_ids} = Front.RBAC.Members.list_accessible_projects(org_id, user_id)

filters = %{requester: requester}
params = params(conn, page_token, direction, filters, project_ids)
params = params(conn, page_token, direction, filters, project_ids, org_id)

{workflows, next_page_token, previous_page_token} = list_workflows(params)

Expand All @@ -140,7 +141,8 @@ defmodule FrontWeb.DashboardController do
params: [
page_token: page_token,
direction: direction,
requester: requester
requester: requester,
organization_id: org_id
]
}

Expand Down Expand Up @@ -525,7 +527,7 @@ defmodule FrontWeb.DashboardController do
Front.RBAC.Members.list_accessible_projects(org_id, user_id)
end)

params = params(conn, page_token, direction, filters, project_ids)
params = params(conn, page_token, direction, filters, project_ids, org_id)

{workflows, next_page_token, previous_page_token} =
Watchman.benchmark("home_page.list_workflows", fn ->
Expand All @@ -550,7 +552,8 @@ defmodule FrontWeb.DashboardController do
params: [
page_token: page_token,
direction: direction,
requester: filters.requester
requester: filters.requester,
organization_id: org_id
]
}

Expand Down