Skip to content

Commit 4616811

Browse files
lcawllcawl
authored
Merge branch 'main' into changelog-highlights
2 parents ebc0419 + fb4b257 commit 4616811

71 files changed

Lines changed: 1557 additions & 1077 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Directory.Packages.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<ItemGroup>
6262
<PackageVersion Include="Argu" Version="6.2.5" />
6363
<PackageVersion Include="Bullseye" Version="6.1.0" />
64-
<PackageVersion Include="Proc.Fs" Version="0.9.1" />
64+
<PackageVersion Include="Proc.Fs" Version="0.13.0" />
6565
<PackageVersion Include="Fake.Tools.Git" Version="6.1.4" />
6666
<PackageVersion Include="Fake.IO.Zip" Version="6.1.4" />
6767
<PackageVersion Include="FSharp.Core" Version="10.0.102" />
@@ -80,7 +80,7 @@
8080
<PackageVersion Include="ModelContextProtocol.AspNetCore" Version="0.2.0-preview.1" />
8181
<PackageVersion Include="NetEscapades.EnumGenerators" Version="1.0.0-beta12" PrivateAssets="all" ExcludeAssets="runtime" />
8282
<PackageVersion Include="Riok.Mapperly" Version="4.2.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
83-
<PackageVersion Include="Proc" Version="0.9.1" />
83+
<PackageVersion Include="Proc" Version="0.13.0" />
8484
<PackageVersion Include="RazorSlices" Version="0.9.4" />
8585
<PackageVersion Include="Samboy063.Tomlet" Version="6.0.0" />
8686
<PackageVersion Include="Sep" Version="0.11.0" />

‎config/codex.example.yml‎

Lines changed: 6 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -22,76 +22,15 @@ title: "Elastic's Internal Dev Docs"
2222
documentation_sets:
2323
# APM Managed Intake Service documentation
2424
- name: docs-eng-team
25-
branch: main
26-
repo_name: apm-intake
27-
display_name: "APM Managed Intake Service"
28-
icon: apm
29-
30-
# CI Developer Guide
31-
- name: docs-eng-team
32-
branch: main
33-
repo_name: ci-guide
34-
display_name: "CI Developer Guide"
35-
icon: ci
36-
37-
# Content Architecture documentation
38-
- name: docs-eng-team
39-
branch: main
40-
repo_name: content-arch
41-
display_name: "Content Architecture"
42-
icon: architecture
43-
44-
# Observability group (multiple members)
45-
- name: docs-eng-team
46-
branch: feature/test
4725
category: docs
48-
repo_name: docs-eng-team
4926
display_name: "Docs Engineering"
50-
icon: documentation
51-
52-
- name: docs-eng-team
53-
branch: main
54-
category: observability
55-
repo_name: uptime-docs
56-
display_name: "Uptime Monitoring"
57-
icon: observability
58-
59-
- name: docs-eng-team
60-
branch: main
61-
category: observability
62-
repo_name: apm-agent-docs
63-
display_name: "APM Agent"
64-
icon: apm
65-
66-
# Migration Guide in tooling category
67-
- name: docs-eng-team
68-
branch: main
69-
category: tooling
70-
repo_name: migration-guide
71-
display_name: "AsciiDoc-to-MDX Migration"
72-
icon: migration
27+
icon: wordWrap
7328

74-
# Artifactory documentation in tooling category
75-
- name: docs-eng-team
76-
branch: main
77-
category: tooling
78-
repo_name: artifactory
79-
display_name: "Artifactory"
80-
icon: artifactory
81-
82-
# QA Team documentation
83-
- name: docs-eng-team
84-
branch: main
85-
repo_name: qa-team
86-
display_name: "QA Team Handbook"
87-
icon: testing
88-
89-
# Consulting documentation
90-
- name: docs-eng-team
91-
branch: main
92-
repo_name: consulting
93-
display_name: "Consulting Team"
94-
icon: consulting
29+
# CI Developer Guide
30+
- name: docs-content-internal
31+
category: docs
32+
display_name: "Docs Content Internal"
33+
icon: ci
9534

9635
# Configuration options reference:
9736
#

‎src/Elastic.ApiExplorer/ApiViewModel.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ public ApiLayoutViewModel CreateGlobalLayoutModel() =>
8282
GitBranch = BuildContext.Git.Branch != "unavailable" ? BuildContext.Git.Branch : null,
8383
GitCommitShort = BuildContext.Git.Ref is { Length: >= 7 } r && r != "unavailable" ? r[..7] : null,
8484
GitRepository = BuildContext.Git.RepositoryName != "unavailable" ? BuildContext.Git.RepositoryName : null,
85-
GitHubDocsUrl = GetGitHubDocsUrl()
85+
GitHubDocsUrl = GetGitHubDocsUrl(),
86+
GitHubRef = BuildContext.Git.GitHubRef
8687
};
8788
}

‎src/Elastic.ApiExplorer/_Layout.cshtml‎

Lines changed: 34 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,38 @@
33
@functions {
44
public GlobalLayoutViewModel LayoutModel => Model;
55
}
6-
<div class="max-w-(--max-layout-width) w-full h-full grid
7-
grid-cols-1
8-
md:grid-cols-[var(--max-sidebar-width)_1fr]
9-
">
10-
@await RenderPartialAsync(_PagesNav.Create<GlobalLayoutViewModel>(Model))
11-
<div class="lg:grid lg:grid-cols-[1fr_var(--max-sidebar-width)]">
12-
<div class="justify-center px-6 lg:px-0">
13-
<main id="content-container" class="w-full flex flex-col relative pb-30 overflow-x-hidden">
14-
<div class="w-full absolute top-0 left-0 right-0 htmx-indicator" id="htmx-indicator" role="status">
15-
<div class="h-[2px] w-full overflow-hidden">
16-
<div class="progress w-full h-full bg-pink-70 left-right"></div>
17-
</div>
18-
<div class="sr-only">Loading</div>
19-
</div>
20-
<article id="markdown-content" class="content-container markdown-content md:px-4">
21-
<input type="checkbox" class="hidden" id="pages-nav-hamburger">
22-
@await RenderBodyAsync()
23-
</article>
24-
</main>
25-
</div>
26-
@await RenderPartialAsync(_ApiToc.Create(Model.TocItems.ToArray()))
27-
</div>
6+
@if (Model.BuildType == BuildType.Assembler)
7+
{
8+
@(await RenderPartialAsync(_AssemblerHeader.Create<GlobalLayoutViewModel>(Model)))
9+
}
10+
else
11+
{
12+
@(await RenderPartialAsync(_IsolatedHeader.Create<GlobalLayoutViewModel>(Model)))
13+
}
14+
<div id="main-container" class="flex flex-col items-center border-t-1 border-grey-20">
15+
<div class="max-w-(--max-layout-width) w-full h-full grid
16+
grid-cols-1
17+
md:grid-cols-[var(--max-sidebar-width)_1fr]
18+
">
19+
@await RenderPartialAsync(_PagesNav.Create<GlobalLayoutViewModel>(Model))
20+
<div class="lg:grid lg:grid-cols-[1fr_var(--max-sidebar-width)]">
21+
<div class="justify-center px-6 lg:px-0">
22+
<main id="content-container" class="w-full flex flex-col relative pb-12 overflow-x-hidden">
23+
<article id="markdown-content" class="content-container markdown-content md:px-4">
24+
<input type="checkbox" class="hidden" id="pages-nav-hamburger">
25+
@await RenderBodyAsync()
26+
</article>
27+
</main>
2828
</div>
29+
@await RenderPartialAsync(_ApiToc.Create(Model.TocItems.ToArray()))
30+
</div>
31+
</div>
32+
</div>
33+
@if (Model.BuildType == BuildType.Assembler)
34+
{
35+
@(await RenderPartialAsync(_AssemblerFooter.Create<GlobalLayoutViewModel>(Model)))
36+
}
37+
else
38+
{
39+
@(await RenderPartialAsync(_IsolatedFooter.Create<GlobalLayoutViewModel>(Model)))
40+
}

‎src/Elastic.ApiExplorer/_ViewImports.cshtml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
@using Microsoft.AspNetCore.Http.HttpResults
77
@using Microsoft.OpenApi
88
@using RazorSlices
9+
@using Elastic.Documentation
910
@using Elastic.Documentation.Site
1011
@using Elastic.Documentation.Site.Layout
1112
@using Elastic.ApiExplorer

‎src/Elastic.Codex/Building/CodexBuildService.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ public async Task<CodexBuildResult> BuildAll(
106106
Branch = checkout.Reference.Branch,
107107
Remote = checkout.Reference.ResolvedOrigin,
108108
Ref = checkout.CommitHash,
109-
RepositoryName = checkout.Reference.Name
109+
RepositoryName = checkout.Reference.Name,
110+
GitHubRef = Environment.GetEnvironmentVariable("GITHUB_REF")
110111
};
111112

112113
// Create build context for this documentation set

‎src/Elastic.Codex/CodexViewModel.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ public GlobalLayoutViewModel CreateGlobalLayoutModel() =>
6262
GoogleTagManager = new GoogleTagManagerConfiguration(),
6363
Features = new FeatureFlags([]),
6464
StaticFileContentHashProvider = StaticFileContentHashProvider,
65-
BuildType = BuildContext.BuildType,
66-
RenderHamburgerIcon = false
65+
BuildType = BuildContext.BuildType
6766
};
6867
}

‎src/Elastic.Codex/Layout/_CodexFooter.cshtml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
@inherits RazorSlice<Elastic.Documentation.Site.GlobalLayoutViewModel>
2+
3+
<footer class="py-6 px-6 w-full mx-auto bg-ink-dark">
4+
<div class="max-w-6xl w-full mx-auto text-grey-20 text-[12px]">
5+
<a href="https://www.elastic.co/">
6+
<img class="block" loading="lazy" alt="Elastic logo" src="@Model.Static("logo-elastic-horizontal-white.svg")" width="120" height="41"/>
7+
</a>
8+
<p class="mt-3">
9+
© @(DateTime.Today.Year) Elasticsearch B.V. Codex preview.
10+
</p>
11+
</div>
12+
</footer>

‎src/Elastic.Codex/Layout/_CodexHeader.cshtml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
@inherits RazorSlice<Elastic.Documentation.Site.GlobalLayoutViewModel>
2+
<div class="sticky top-0 z-10">
3+
<elastic-docs-header title="@(Model.HeaderTitle ?? Model.DocSetName)"
4+
logo-href="@(Model.Link("/"))"></elastic-docs-header>
5+
</div>

‎src/Elastic.Codex/_Layout.cshtml‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,14 @@
33
@functions {
44
public GlobalLayoutViewModel LayoutModel => Model;
55
}
6-
<div class="w-full h-full flex justify-center">
7-
<main id="content-container" class="w-full max-w-6xl flex flex-col relative pb-30 px-6 lg:px-8">
8-
<div class="w-full absolute top-0 left-0 right-0 htmx-indicator" id="htmx-indicator" role="status">
9-
<div class="h-[2px] w-full overflow-hidden">
10-
<div class="progress w-full h-full bg-pink-70 left-right"></div>
11-
</div>
12-
<div class="sr-only">Loading</div>
13-
</div>
14-
<article id="markdown-content" class="content-container markdown-content">
15-
@await RenderBodyAsync()
16-
</article>
17-
</main>
6+
@(await RenderPartialAsync(_CodexHeader.Create(Model)))
7+
<div id="main-container" class="flex flex-col items-center border-t-1 border-grey-20">
8+
<div class="w-full h-full flex justify-center">
9+
<main id="content-container" class="w-full max-w-6xl flex flex-col relative pb-12 px-6 lg:px-8">
10+
<article id="markdown-content" class="content-container markdown-content">
11+
@await RenderBodyAsync()
12+
</article>
13+
</main>
14+
</div>
1815
</div>
16+
@await RenderPartialAsync(_CodexFooter.Create(Model))

0 commit comments

Comments
 (0)