fix: broken org pages

Author: zcesur

lib/algora/bounties/schemas/claim.ex

@@ -58,14 +58,18 @@ defmodule Algora.Bounties.Claim do
 
   def rewarded(query \\ Claim) do
     from c in query,
-      where: c.state == :approved and not is_nil(c.charged_at)
+      join: t in assoc(c, :transactions),
+      where: c.status == :approved,
+      where: t.type == :credit,
+      where: t.status == :succeeded
   end
 
   def filter_by_org_id(query, nil), do: query
 
   def filter_by_org_id(query, org_id) do
     from c in query,
-      join: b in assoc(c, :bounty),
+      join: t in assoc(c, :target),
+      join: b in assoc(t, :bounties),
       join: u in assoc(b, :owner),
       where: u.id == ^org_id
   end

lib/algora_web/components/ui/stat_card.ex

@@ -44,7 +44,9 @@ defmodule AlgoraWeb.Components.UI.StatCard do
             {render_slot(@inner_block)}
           <% end %>
         </div>
-        <p :if={@subtext} class="text-xs text-muted-foreground">{@subtext}</p>
+        <p :if={@subtext} class="text-xs text-muted-foreground">
+          {if @subtext == "", do: {:safe, "&nbsp;"}, else: @subtext}
+        </p>
       </div>
     </div>
     """

lib/algora_web/live/org/analytics_live.ex

@@ -3,6 +3,7 @@ defmodule AlgoraWeb.Org.AnalyticsLive do
   use AlgoraWeb, :live_view
 
   alias Algora.Bounties
+  alias Algora.Bounties.Bounty
 
   def mount(_params, _session, socket) do
     org_id = socket.assigns.current_org.id
@@ -82,7 +83,7 @@ defmodule AlgoraWeb.Org.AnalyticsLive do
               <.link
                 class="group relative flex flex-col items-start gap-x-4 gap-y-2 py-4 sm:flex-row sm:items-center"
                 rel="noopener"
-                href={"https://github.com/#{bounty.ticket.owner}/#{bounty.ticket.repo}/issues/#{bounty.ticket.number}"}
+                href={Bounty.url(bounty)}
               >
                 <div class="min-w-0 flex-auto">
                   <div class="flex items-center gap-x-3">

lib/algora_web/live/org/dashboard_public_live.ex

@@ -40,8 +40,8 @@ defmodule AlgoraWeb.Org.DashboardPublicLive do
     ]
   end
 
-  defp social_link(user, :github), do: if(login = user[:provider_login], do: "https://github.com/#{login}")
-  defp social_link(user, platform), do: user[:"#{platform}_url"]
+  defp social_link(user, :github), do: if(login = user.provider_login, do: "https://github.com/#{login}")
+  defp social_link(user, platform), do: Map.get(user, :"#{platform}_url")
 
   def render(assigns) do
     ~H"""

lib/algora_web/live/org/nav.ex

@@ -41,7 +41,6 @@ defmodule AlgoraWeb.Org.Nav do
         {AlgoraWeb.Org.BountiesLive, _} -> :bounties
         {AlgoraWeb.Org.ProjectsLive, _} -> :projects
         {AlgoraWeb.Project.ViewLive, _} -> :projects
-        {AlgoraWeb.Org.JobsLive, _} -> :jobs
         {AlgoraWeb.Org.SettingsLive, _} -> :settings
         {AlgoraWeb.Org.MembersLive, _} -> :members
         {_, _} -> nil
@@ -67,7 +66,6 @@ defmodule AlgoraWeb.Org.Nav do
             icon: "tabler-diamond",
             label: "Bounties"
           },
-          %{href: "/org/#{org_handle}/jobs", tab: :jobs, icon: "tabler-briefcase", label: "Jobs"},
           %{
             href: "/org/#{org_handle}/team",
             tab: :team,