Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

XrefGen tool updates #445

Merged
merged 1 commit into from
Jan 14, 2025
Merged

XrefGen tool updates #445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions BlazorWebAssemblyXrefGenerator/App.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
<Router AppAssembly="@typeof(App).Assembly">
<Router AppAssembly="@typeof(App).Assembly">
<Found Context="routeData">
<RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
<RouteView RouteData="@routeData" />
<FocusOnNavigate RouteData="@routeData" Selector="h1" />
</Found>
<NotFound>
<PageTitle>Not found</PageTitle>
<LayoutView Layout="@typeof(MainLayout)">
<p role="alert">Sorry, there's nothing at this address.</p>
</LayoutView>
<div class="page">
<main>
<article class="content px-4">
<p role="alert">Sorry, there's nothing at this address.</p>
</article>
</main>
</div>
</NotFound>
</Router>
12 changes: 0 additions & 12 deletions BlazorWebAssemblyXrefGenerator/Layout/MainLayout.razor
View file
Open in desktop

This file was deleted.

77 changes: 0 additions & 77 deletions BlazorWebAssemblyXrefGenerator/Layout/MainLayout.razor.css
View file
Open in desktop

This file was deleted.

131 changes: 77 additions & 54 deletions BlazorWebAssemblyXrefGenerator/Pages/Home.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,58 +3,77 @@
@using System.Text.RegularExpressions
@inject IHttpClientFactory ClientFactory

<EditForm Model="Model" OnSubmit="GetSearchResults" FormName="SearchForm">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Search</h3>
</div>
<div class="panel-body">
<div class="form-group">
<p>Provide a namespace, class, member, or <code>/dotnet/api/...</code> relative link.</p>
<InputText id="searchText" @bind-Value="Model!.SearchText" aria-label="Search Text" onfocus="this.value=''" />
</div>
<div class="form-group">
<button type="submit" class="btn btn-primary">Search</button>
<button type="button" class="btn btn-secondary" onclick="document.getElementById('searchText').value=''">Clear</button>
</div>
</div>
</div>
</EditForm>

@if (SearchResultItems?.Results?.Count() > 0)
{
<ol style="margin-top:20px">
@foreach (var result in SearchResultItems.Results.Select((x, i) => new { Data = x, Index = i }))
{
<li style="margin-bottom:5px">
<div style="font-size:1.4em;color:green;font-weight:bold">@result.Data.DisplayName</div>
<div><b>Item Type:</b> @result.Data.ItemType</div>
<div style="width:90%"><b>Description:</b> @result.Data.Description</div>
<div><input id="m@(result.Index)0" value="<xref:@result.Data.Link>"></div>
<div><input id="m@(result.Index)1" value="<xref:@result.Data.Link?displayProperty=fullName>"></div>
<div><input id="m@(result.Index)2" value="<xref:@result.Data.Link?displayProperty=nameWithType>"></div>
<div><input id="m@(result.Index)3" value="[LINK_TEXT](xref:@result.Data.Link)"></div>
<div><input id="m@(result.Index)4" value="xref:@result.Data.Link"></div>
<div>
<button type="button" class="btn btn-primary" onclick=@($"copyToClipboard('m{result.Index}0')")>Copy</button>
<button type="button" class="btn btn-secondary" onclick=@($"copyToClipboard('m{result.Index}1')")>Copy (Full Name)</button>
<button type="button" class="btn btn-secondary" onclick=@($"copyToClipboard('m{result.Index}2')")>Copy (Name with Type)</button>
<button type="button" class="btn btn-secondary" onclick=@($"copyToClipboard('m{result.Index}3')")>Copy (Custom Link Text)</button>
<button type="button" class="btn btn-secondary" onclick=@($"copyToClipboard('m{result.Index}4')")>Copy (Member Only)</button>
<div class="page">
<main>
<article class="content px-4">
<EditForm Model="Model" OnSubmit="GetSearchResults" FormName="SearchForm">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Search</h3>
<span style="float:right">
<InputSelect @bind-Value="dotNetVersion">
<option>aspnetcore-9.0</option>
<option>aspnetcore-8.0</option>
<option>aspnetcore-7.0</option>
<option>aspnetcore-6.0</option>
<option>aspnetcore-5.0</option>
<option>aspnetcore-3.1</option>
</InputSelect>
</span>
</div>
<div class="panel-body">
<div class="form-group">
<p>Provide a namespace, class, member, or <code>/dotnet/api/...</code> relative link.</p>
<InputText id="searchText" @bind-Value="Model!.SearchText" aria-label="Search Text" onfocus="this.value=''" />
</div>
<div class="form-group">
<button type="submit" class="btn btn-primary">Search</button>
<button type="button" class="btn btn-secondary" onclick="document.getElementById('searchText').value=''">Clear</button>
</div>
</div>
</div>
</li>
}
</ol>
}
</EditForm>

@message
@if (SearchResultItems?.Results?.Count() > 0)
{
<ol style="margin-top:20px">
@foreach (var result in SearchResultItems.Results.Select((x, i) => new { Data = x, Index = i }))
{
<li style="margin-bottom:5px">
<div style="font-size:1.4em;color:green;font-weight:bold">@result.Data.DisplayName</div>
<div><b>Item Type:</b> @result.Data.ItemType</div>
<div style="width:90%"><b>Description:</b> @result.Data.Description</div>
<div><input id="m@(result.Index)0" value="<xref:@result.Data.Link>"></div>
<div><input id="m@(result.Index)1" value="<xref:@result.Data.Link?displayProperty=fullName>"></div>
<div><input id="m@(result.Index)2" value="<xref:@result.Data.Link?displayProperty=nameWithType>"></div>
<div><input id="m@(result.Index)3" value="[LINK_TEXT](xref:@result.Data.Link)"></div>
<div><input id="m@(result.Index)4" value="xref:@result.Data.Link"></div>
<div>
<button type="button" class="btn btn-primary" onclick=@($"copyToClipboard('m{result.Index}0')")>Copy</button>
<button type="button" class="btn btn-secondary" onclick=@($"copyToClipboard('m{result.Index}1')")>Copy (Full Name)</button>
<button type="button" class="btn btn-secondary" onclick=@($"copyToClipboard('m{result.Index}2')")>Copy (Name with Type)</button>
<button type="button" class="btn btn-secondary" onclick=@($"copyToClipboard('m{result.Index}3')")>Copy (Custom Link Text)</button>
<button type="button" class="btn btn-secondary" onclick=@($"copyToClipboard('m{result.Index}4')")>Copy (Member Only)</button>
</div>
</li>
}
</ol>
}

<div style="margin-top:20px">
@message
</div>
</article>
</main>
</div>

@code {
[SupplyParameterFromForm]
private FormModel? Model { get; set; }

private SearchResults? SearchResultItems { get; set; }
public string? message;
private string? dotNetVersion;

protected override void OnInitialized() => Model ??= new();

Expand All @@ -68,33 +87,37 @@
return;
}

SearchResultItems = await apiClient.GetFromJsonAsync<SearchResults>($"api/apibrowser/dotnet/search?api-version=0.2&search={Model.SearchText}");
try
{
SearchResultItems = await apiClient.GetFromJsonAsync<SearchResults>($"api/apibrowser/dotnet/search?api-version=0.2&search={Model.SearchText}");
}
catch (HttpRequestException ex)
{
if (ex.StatusCode == HttpStatusCode.BadRequest)
{
message = "Bad Request! No results returned.";
}

return;
}

if (SearchResultItems?.Results != null)
{
foreach (var result in SearchResultItems.Results)
{
var client = ClientFactory.CreateClient();

var urlEncodedRequestUrl = WebUtility.UrlEncode($"https://learn.microsoft.com/en-us{result.Url}?view=aspnetcore-9.0");
var urlEncodedRequestUrl = WebUtility.UrlEncode($"https://learn.microsoft.com/en-us{result.Url}?view={dotNetVersion}");
var request = new HttpRequestMessage(HttpMethod.Get, $"https://corsproxy.io/?{urlEncodedRequestUrl}");

var apiBrowserPage = await client.SendAsync(request);

var metaTag = new Regex("<meta name=\"ms.assetid\" content=\"(.+?)\" />");
var match = metaTag.Match(await apiBrowserPage.Content.ReadAsStringAsync()).Groups[1].Value;

result.Link = match.Replace("*", "%2A").Replace("`", "%60");
}
}
else
{
message = "Request failed.";
message = "No results returned.";
}

Model.SearchText = string.Empty;

//StateHasChanged();
}

public class FormModel
Expand Down
1 change: 0 additions & 1 deletion BlazorWebAssemblyXrefGenerator/_Imports.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@
@using Microsoft.AspNetCore.Components.WebAssembly.Http
@using Microsoft.JSInterop
@using BlazorWebAssemblyXrefGenerator
@using BlazorWebAssemblyXrefGenerator.Layout