Skip to content
This repository was archived by the owner on Jun 5, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/GitHubExtension/Widgets/GitHubIssuesWidget.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -152,7 +152,7 @@ public override void LoadContentData()

issuesData.Add("issues", issuesArray);
issuesData.Add("selected_repo", repository?.FullName ?? string.Empty);
issuesData.Add("widgetTitle", WidgetTitle);
issuesData.Add("widgetTitle", GetActualTitle());
issuesData.Add("is_loading_data", DataState == WidgetDataState.Unknown);
issuesData.Add("issues_icon_data", _issuesIconData);

Expand Down
2 changes: 1 addition & 1 deletion src/GitHubExtension/Widgets/GitHubPullsWidget.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,7 @@ public override void LoadContentData()

pullsData.Add("pulls", pullsArray);
pullsData.Add("selected_repo", repository?.FullName ?? string.Empty);
pullsData.Add("widgetTitle", WidgetTitle);
pullsData.Add("widgetTitle", GetActualTitle());
pullsData.Add("is_loading_data", DataState == WidgetDataState.Unknown);
pullsData.Add("pulls_icon_data", _pullsIconData);

Expand Down
2 changes: 1 addition & 1 deletion src/GitHubExtension/Widgets/GitHubReleasesWidget.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,7 +121,7 @@ public override void LoadContentData()

releasesData.Add("releases", releasesArray);
releasesData.Add("selected_repo", repository?.FullName ?? string.Empty);
releasesData.Add("widgetTitle", WidgetTitle);
releasesData.Add("widgetTitle", GetActualTitle());
releasesData.Add("is_loading_data", DataState == WidgetDataState.Unknown);
releasesData.Add("releases_icon_data", _releasesIconData);

Expand Down
16 changes: 5 additions & 11 deletions src/GitHubExtension/Widgets/GitHubRepositoryWidget.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -143,17 +143,11 @@ private void UpdateTitle(JsonNode? dataObj)
}

GetTitleFromDataObject(dataObj);
if (string.IsNullOrEmpty(WidgetTitle))
{
try
{
WidgetTitle = GetRepositoryFromUrl(RepositoryUrl).FullName;
}
catch
{
WidgetTitle = string.Empty;
}
}
}

protected string GetActualTitle()
{
return string.IsNullOrEmpty(WidgetTitle) ? GetRepositoryFromUrl(RepositoryUrl).FullName : WidgetTitle;
}

protected override void ResetWidgetInfoFromState()
Expand Down
16 changes: 11 additions & 5 deletions src/GitHubExtension/Widgets/GitHubUserWidget.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,11 +57,17 @@ public override void OnWidgetContextChanged(WidgetContextChangedArgs contextChan

protected void UpdateTitle(JsonNode dataObj)
{
GetTitleFromDataObject(dataObj);
if (string.IsNullOrEmpty(WidgetTitle))
if (dataObj == null)
{
WidgetTitle = UserName;
return;
}

GetTitleFromDataObject(dataObj);
}

protected string GetActualTitle()
{
return string.IsNullOrEmpty(WidgetTitle) ? UserName : WidgetTitle;
}

protected override void ResetWidgetInfoFromState()
Expand DownExpand Up@@ -249,7 +255,7 @@ public override void LoadContentData()
{ "openCount", 0 },
{ "items", new JsonArray() },
{ "userName", UserName },
{ "widgetTitle", WidgetTitle },
{ "widgetTitle", GetActualTitle() },
{ "titleIconUrl", GetTitleIconData() },
{ "is_loading_data", true },
};
Expand DownExpand Up@@ -302,7 +308,7 @@ public void LoadContentData(IEnumerable<Octokit.Issue> items)
issuesData.Add("items", issuesArray);
issuesData.Add("userName", UserName);
issuesData.Add("titleIconUrl", GetTitleIconData());
issuesData.Add("widgetTitle", WidgetTitle);
issuesData.Add("widgetTitle", GetActualTitle());

LastUpdated = DateTime.Now;
ContentData = issuesData.ToJsonString();
Expand Down