Bug fix #181 and #182

lib/schema/utils.ex

@@ -203,6 +203,12 @@ defmodule Schema.Utils do
   end
 
   @spec filter_attributes_by_profiles_set(Enum.t(), string_set_t()) :: Enum.t()
+  defp filter_attributes_by_profiles_set(attributes, profiles) when is_map(attributes) do
+    Map.filter(attributes, fn {_k, a} ->
+      a[:profiles] == nil || Enum.any?(a[:profiles], fn ap -> MapSet.member?(profiles, ap) end)
+    end)
+  end
+
   defp filter_attributes_by_profiles_set(attributes, profiles) do
     Enum.filter(attributes, fn {_k, a} ->
       a[:profiles] == nil || Enum.any?(a[:profiles], fn ap -> MapSet.member?(profiles, ap) end)

lib/schema_web/views/page_view.ex

@@ -833,18 +833,10 @@ defmodule SchemaWeb.PageView do
     source = obj[:source]
     references = obj[:references]
 
-    source_html =
-      if source != nil do
-        # source can have embedded markup
-        ["<dt>Source<dd class=\"ml-3\">", source]
-      else
-        ""
-      end
-
-    refs_html = inline_references(references)
+    refs_html = inline_references(references, source)
 
-    if source_html != "" or refs_html != "" do
-      [html, prefix_html, "<dd>", source_html, refs_html, "</dd>"]
+    if refs_html != "" do
+      [html, prefix_html, refs_html]
     else
       html
     end
@@ -1718,17 +1710,28 @@ defmodule SchemaWeb.PageView do
 
   def object_references_section(_), do: ""
 
-  @spec inline_references(list()) :: any()
-  def inline_references(references) when is_list(references) and length(references) > 0 do
+  @spec inline_references(list(), String.t() | nil) :: any()
+  def inline_references(references, source \\ nil)
+
+  def inline_references(references, source)
+      when is_list(references) and length(references) > 0 do
+    source_html =
+      if source != nil do
+        [" <span class=\"references-source\">(as <code>", source, "</code>)</span>"]
+      else
+        ""
+      end
+
     [
       "<div class=\"references-inline\">",
       "<span class=\"references-label\">Refs:</span>",
       Enum.intersperse(Enum.map(references, &reference_tag/1), " "),
+      source_html,
       "</div>"
     ]
   end
 
-  def inline_references(_), do: ""
+  def inline_references(_, _), do: ""
 
   @spec show_deprecated_css_classes(map(), String.t()) :: String.t()
   def show_deprecated_css_classes(item, initial) do

mix.exs

@@ -10,7 +10,7 @@
 defmodule Schema.MixProject do
   use Mix.Project
 
-  @version "4.1.0"
+  @version "4.2.0"
 
   def project do
     build = System.get_env("GITHUB_RUN_NUMBER") || "SNAPSHOT"

priv/static/css/components.css

@@ -680,6 +680,12 @@ button:hover,
   margin-right: var(--spacing-xs);
 }
 
+.references-inline .references-source {
+  font-size: 0.75rem;
+  color: var(--text-muted);
+  margin-left: var(--spacing-xs);
+}
+
 .reference-tag {
   display: inline-flex;
   align-items: center;