Skip to content

Commit a5123a1

Browse files
committed
Take the repository name in InferVersion
1 parent e3e928b commit a5123a1

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

src/Elastic.Documentation.Configuration/Versions/VersionInference.cs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,21 @@ namespace Elastic.Documentation.Configuration.Versions;
99

1010
public interface IVersionInferrerService
1111
{
12-
VersioningSystem InferVersion(IReadOnlyCollection<LegacyPageMapping>? legacyPages);
12+
VersioningSystem InferVersion(string repositoryName, IReadOnlyCollection<LegacyPageMapping>? legacyPages);
1313
}
1414

15-
public class ProductVersionInferrerService(ProductsConfiguration productsConfiguration, VersionsConfiguration versionsConfiguration, string repositoryName) : IVersionInferrerService
15+
public class ProductVersionInferrerService(ProductsConfiguration productsConfiguration, VersionsConfiguration versionsConfiguration) : IVersionInferrerService
1616
{
1717
private ProductsConfiguration ProductsConfiguration { get; } = productsConfiguration;
1818
private VersionsConfiguration VersionsConfiguration { get; } = versionsConfiguration;
19-
private string RepositoryName { get; } = repositoryName;
20-
public VersioningSystem InferVersion(IReadOnlyCollection<LegacyPageMapping>? legacyPages)
19+
public VersioningSystem InferVersion(string repositoryName, IReadOnlyCollection<LegacyPageMapping>? legacyPages)
2120
{
2221
var versioning = legacyPages is not null && legacyPages.Count > 0
2322
? legacyPages.ElementAt(0).Product.VersioningSystem! // If the page has a legacy page mapping, use the versioning system of the legacy page
24-
: ProductsConfiguration.Products.TryGetValue(RepositoryName, out var belonging)
23+
: ProductsConfiguration.Products.TryGetValue(repositoryName, out var belonging)
2524
? belonging.VersioningSystem! //If the page's docset has a name with a direct product match, use the versioning system of the product
2625
: ProductsConfiguration.Products.Values.SingleOrDefault(p =>
27-
p.Repository is not null && p.Repository.Equals(RepositoryName, StringComparison.OrdinalIgnoreCase)) is { } repositoryMatch
26+
p.Repository is not null && p.Repository.Equals(repositoryName, StringComparison.OrdinalIgnoreCase)) is { } repositoryMatch
2827
? repositoryMatch.VersioningSystem! // Verify if the page belongs to a repository linked to a product, and if so, use the versioning system of the product
2928
: VersionsConfiguration.VersioningSystems[VersioningSystemId.Stack]; // Fallback to the stack versioning system
3029

@@ -34,7 +33,7 @@ public VersioningSystem InferVersion(IReadOnlyCollection<LegacyPageMapping>? leg
3433

3534
public class NoopVersionInferrer : IVersionInferrerService
3635
{
37-
public VersioningSystem InferVersion(IReadOnlyCollection<LegacyPageMapping>? legacyPages) => new()
36+
public VersioningSystem InferVersion(string repositoryName, IReadOnlyCollection<LegacyPageMapping>? legacyPages) => new()
3837
{
3938
Id = VersioningSystemId.Stack,
4039
Base = new SemVersion(0, 0, 0),

src/Elastic.Markdown/DocumentationGenerator.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,9 @@ public DocumentationGenerator(
7272
DocumentationSet = docSet;
7373
Context = docSet.Context;
7474
CrossLinkResolver = docSet.CrossLinkResolver;
75+
var productVersionInferrer = new ProductVersionInferrerService(DocumentationSet.Context.ProductsConfiguration, DocumentationSet.Context.VersionsConfiguration);
7576
HtmlWriter = new HtmlWriter(DocumentationSet, _writeFileSystem, new DescriptionGenerator(), navigationHtmlWriter, legacyUrlMapper,
76-
positionalNavigation, new ProductVersionInferrerService(DocumentationSet.Context.ProductsConfiguration, DocumentationSet.Context.VersionsConfiguration, DocumentationSet.Context.Git.RepositoryName));
77+
positionalNavigation, productVersionInferrer);
7778
_documentationFileExporter =
7879
docSet.Context.AvailableExporters.Contains(Exporter.Html)
7980
? docSet.EnabledExtensions.FirstOrDefault(e => e.FileExporter != null)?.FileExporter

src/Elastic.Markdown/HtmlWriter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ private async Task<RenderResult> RenderLayout(MarkdownFile markdown, MarkdownDoc
105105
fullNavigationRenderResult
106106
);
107107

108-
var pageVersioning = VersionInferrerService.InferVersion(legacyPages);
108+
var pageVersioning = VersionInferrerService.InferVersion(DocumentationSet.Context.Git.RepositoryName, legacyPages);
109109

110110
var currentBaseVersion = $"{pageVersioning.Base.Major}.{pageVersioning.Base.Minor}+";
111111

0 commit comments

Comments
 (0)