Skip to content

Commit 29c6caa

Browse files
committed
Merge branch 'thebadmonkeydev-add-deprecations-to-connection-fields'
2 parents 015e64f + 677e82d commit 29c6caa

File tree

4 files changed

+19
-21
lines changed

4 files changed

+19
-21
lines changed

lib/graphql-docs/layouts/includes/connections.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@
44
<span id="<%= slugify.(connection[:name]) %>" class="field-name connection-name anchored"><%= connection[:name] %> (<code><a href="<%= base_url %>/<%= connection[:type][:path] %>"><%= connection[:type][:info] %></a></code>)</span>
55

66
<div class="description-wrapper">
7+
<%= include.('deprecations.html', item: connection) %>
8+
79
<%= include.('notices.html', notices: connection[:notices]) %>
8-
<p><%= connection[:description] %></p>
10+
11+
<%= markdownify.(connection[:description]) %>
912

1013
<% unless connection[:arguments].empty? %>
1114
<%= include.('arguments.html', arguments: connection[:arguments]) %>
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<% if item[:is_deprecated] %>
2+
<div class="deprecation-notice <%= classes[:deprecation_notice] %>">
3+
<span class="deprecation-title">Deprecation notice</span>
4+
<%= markdownify.(item[:deprecation_reason]) %>
5+
</div>
6+
<% end %>

lib/graphql-docs/layouts/includes/fields.html

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,15 @@
44
<span id="<%= slugify.(field[:name]) %>" class="field-name anchored"><%= field[:name] %> (<code><a href="<%= base_url %>/<%= field[:type][:path] %>"><%= field[:type][:info] %></a></code>)</span>
55

66
<div class="description-wrapper">
7-
<% if field[:is_deprecated] %>
8-
<div class="deprecation-notice <%= classes[:deprecation_notice] %>">
9-
<span class="deprecation-title">Deprecation notice</span>
10-
<%= markdownify.(field[:deprecation_reason]) %>
11-
</div>
12-
<% end %>
7+
<%= include.('deprecations.html', item: field) %>
138

14-
<%= include.('notices.html', notices: field[:notices]) %>
9+
<%= include.('notices.html', notices: field[:notices]) %>
1510

16-
<%= markdownify.(field[:description]) %>
17-
18-
<% unless field[:arguments].empty? %>
19-
<%= include.('arguments.html', arguments: field[:arguments]) %>
20-
<% end %>
11+
<%= markdownify.(field[:description]) %>
2112

13+
<% unless field[:arguments].empty? %>
14+
<%= include.('arguments.html', arguments: field[:arguments]) %>
15+
<% end %>
2216
</div>
2317
</div>
2418

lib/graphql-docs/layouts/includes/values.html

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,11 @@ <h3 id="fields">Values</h3>
55
<h4 id="<%= slugify.(value[:name]) %>" class="name anchored"><%= value[:name] %></h4>
66

77
<div class="description-wrapper">
8-
<%= include.('notices.html', notices: value[:notices]) %>
8+
<%= include.('deprecations.html', item: value) %>
99

10-
<% if value[:is_deprecated] %>
11-
<div class="deprecation-notice <%= classes[:deprecation_notice] %>">
12-
<span class="deprecation-title">Deprecation notice</span>
13-
<%= markdownify.(value[:deprecation_reason]) %>
14-
</div>
15-
<% end %>
10+
<%= include.('notices.html', notices: value[:notices]) %>
1611

17-
<p><%= value[:description] %></p>
12+
<%= markdownify.(value[:description]) %>
1813
</div>
1914

2015
<% end %>

0 commit comments

Comments
 (0)