Skip to content

Commit 6bc87ac

Browse files
authored
Fix applies_to rendering (#1461)
* Fix applies_to rendering * Only do it for 'Elastic Stack' for now * Adjust rendering style * fix test
1 parent 1de3c30 commit 6bc87ac

File tree

2 files changed

+21
-25
lines changed

2 files changed

+21
-25
lines changed

src/Elastic.Markdown/Myst/Components/ApplicableToComponent.cshtml

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -145,32 +145,26 @@
145145

146146
var lifecycleClass = applicability.GetLifeCycleName().ToLowerInvariant().Replace(" ", "-");
147147
<span class="applicable-info" data-tippy-content="@tooltip">
148-
@if (name == "Elastic Stack")
149-
{
150-
@badgeText
151-
}
152-
else
153-
{
154148
@name
155-
}
156149
<span class="applicable-meta applicable-meta-@lifecycleClass">
157150
@if (applicability.Lifecycle != ProductLifecycle.GenerallyAvailable && badgeText == name)
158151
{
159152
<span class="applicable-lifecycle applicable-lifecycle-@lifecycleClass">@applicability.GetLifeCycleName()</span>
160153
}
161154
@if (applicability.Version is not null and not AllVersions)
162155
{
163-
if (name == "Elastic Stack")
164-
{
165-
if (applicability.Version <= currentStackVersion)
156+
@if (name != "Elastic Stack" || applicability.Version <= currentStackVersion)
157+
{
158+
<span class="applicable-version applicable-version-@lifecycleClass">
159+
@applicability.Version
160+
</span>
161+
}
162+
else
166163
{
167-
<span class="applicable-version applicable-version-@lifecycleClass">@applicability.Version</span>
164+
<span class="applicable-lifecycle applicable-lifecycle-@lifecycleClass">
165+
@badgeText
166+
</span>
168167
}
169-
}
170-
else
171-
{
172-
<span class="applicable-version applicable-version-@lifecycleClass">@applicability.Version</span>
173-
}
174168
}
175169
</span>
176170
</span>

tests/authoring/Inline/AppliesToRole.fs

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,17 @@ This is an inline {applies_to}`stack: preview 9.1` element.
2929
let ``validate HTML: generates link and alt attr`` () =
3030
markdown |> convertsToHtml """
3131
<p>This is an inline
32-
<span class="applies-inline">
33-
<span class="applicable-info" data-tippy-content="We plan to add this functionality in a future update. Plans may change without notice.">
34-
Planned
35-
<span class="applicable-meta applicable-meta-technical-preview">
36-
</span>
37-
</span>
38-
</span>
39-
element.
40-
</p>
32+
<span class="applies-inline">
33+
<span class="applicable-info" data-tippy-content="We plan to add this functionality in a future update. Plans may change without notice.">
34+
Elastic Stack
35+
<span class="applicable-meta applicable-meta-technical-preview">
36+
<span class="applicable-lifecycle applicable-lifecycle-technical-preview">
37+
Planned
38+
</span>
39+
</span>
40+
</span>
41+
</span>
42+
element.</p>
4143
"""
4244

4345

0 commit comments

Comments
 (0)