8000 Simplifying Issues and Pull Requests Widgets customization by guimafelipe · Pull Request #424 · microsoft/devhomegithubextension · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on Jun 5, 2025. It is now read-only.

Simplifying Issues and Pull Requests Widgets customization #424

Merged
guimafelipe merged 5 commits into from
Aug 14, 2024
Merged

Simplifying Issues and Pull Requests Widgets customization #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
12c93a0
Removing check url and adding first version of dropdown
Aug 5, 2024
62e9699
Fixing save bug and adding loop to get repos from RepositoryProvider
Aug 6, 2024
efa26e0
Adding changes on issues template
Aug 7, 2024
5c7da5f
Removing known repos code
Aug 7, 2024
046212f
Cleaning up code
Aug 7, 2024
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
110 changes: 44 additions & 66 deletions src/GitHubExtension/Widgets/GitHubRepositoryWidget.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using System.Text.Json.Nodes;
using GitHubExtension.Client;
using GitHubExtension.DataManager;
using GitHubExtension.Helpers;
using GitHubExtension.Widgets.Enums;
using Microsoft.Windows.Widgets.Providers;

Expand All @@ -15,6 +14,8 @@ public abstract class GitHubRepositoryWidget : GitHubWidget
{
protected string RepositoryUrl { get; set; } = string.Empty;

private string? _message;

public GitHubRepositoryWidget()
: base()
{
Expand Down Expand Up @@ -66,14 +67,14 @@ public override void OnActionInvoked(WidgetActionInvokedArgs actionInvokedArgs)

switch (verb)
{
case WidgetAction.CheckUrl:
HandleCheckUrl(actionInvokedArgs);
break;

case WidgetAction.Save:
UpdateTitle(JsonNode.Parse(actionInvokedArgs.Data));
base.OnActionInvoked(actionInvokedArgs);
CorrectUrl();
if (HandleCheckUrl(actionInvokedArgs))
{
UpdateTitle(JsonNode.Parse(actionInvokedArgs.Data));
base.OnActionInvoked(actionInvokedArgs);
CorrectUrl();
}

break;

default:
Expand Down Expand Up @@ -144,7 +145,14 @@ private void UpdateTitle(JsonNode? dataObj)
GetTitleFromDataObject(dataObj);
if (string.IsNullOrEmpty(WidgetTitle))
{
WidgetTitle = GetRepositoryFromUrl(RepositoryUrl).FullName;
try
{
WidgetTitle = GetRepositoryFromUrl(RepositoryUrl).FullName;
}
catch
{
WidgetTitle = string.Empty;
}
}
}

Expand Down Expand Up @@ -207,7 +215,7 @@ public override void OnCustomizationRequested(WidgetCustomizationRequestedArgs c
base.OnCustomizationRequested(customizationRequestedArgs);
}

private void HandleCheckUrl(WidgetActionInvokedArgs args)
private bool HandleCheckUrl(WidgetActionInvokedArgs args)
{
// Set loading page while we fetch data from GitHub.
Page = WidgetPageState.Loading;
Expand All @@ -223,7 +231,19 @@ private void HandleCheckUrl(WidgetActionInvokedArgs args)
RepositoryUrl = dataObject["url"]?.GetValue<string>() ?? string.Empty;
UpdateTitle(dataObject);

ConfigurationData = data;
var isGoodToSave = true;

try
{
GetRepositoryFromUrl(RepositoryUrl);
ConfigurationData = data;
_message = null;
}
catch (Exception ex)
{
_message = ex.Message;
isGoodToSave = false;
}

var updateRequestOptions = new WidgetUpdateRequestOptions(Id)
{
Expand All @@ -233,71 +253,29 @@ private void HandleCheckUrl(WidgetActionInvokedArgs args)
};

WidgetManager.GetDefault().UpdateWidget(updateRequestOptions);

// Already shown error message while updating above,
// can reset it to null here.
_message = null;
return isGoodToSave;
}

UpdateWidget();

return false;
}

public string GetConfiguration(string dataUrl)
{
var configurationData = new JsonObject
{
{ "submitIcon", IconLoader.GetIconAsBase64("arrow.png") },
{ "widgetTitle", WidgetTitle },
{ "url", dataUrl },
{ "savedRepositoryUrl", SavedConfigurationData },
{ "errorMessage", _message },
};

if (dataUrl == string.Empty)
{
configurationData.Add("hasConfiguration", false);
var repositoryData = new JsonObject
{
{ "url", string.Empty },
};

configurationData.Add("configuration", repositoryData);
configurationData.Add("savedRepositoryUrl", SavedConfigurationData);
configurationData.Add("saveEnabled", false);

return configurationData.ToString();
}
else
{
try
{
var repository = GetRepositoryFromUrl(dataUrl);
var repositoryData = new JsonObject
{
{ "name", repository.FullName },
{ "label", repository.Name },
{ "owner", repository.Owner.Login },
{ "milestone", string.Empty },
{ "project", repository.Description },
{ "url", RepositoryUrl },
{ "query", GetUnescapedIssueQuery() },
};

configurationData.Add("hasConfiguration", true);
configurationData.Add("configuration", repositoryData);
configurationData.Add("savedRepositoryUrl", SavedConfigurationData);
configurationData.Add("saveEnabled", true);
}
catch (Exception ex)
{
Log.Error(ex, $"Failed getting configuration information for input url: {dataUrl}");
configurationData.Add("hasConfiguration", false);

var repositoryData = new JsonObject
{
{ "url", RepositoryUrl },
};

configurationData.Add("errorMessage", ex.Message);
configurationData.Add("configuration", repositoryData);
configurationData.Add("saveEnabled", false);

return configurationData.ToString();
}

return configurationData.ToJsonString();
}
return configurationData.ToJsonString();
}

public override string GetData(WidgetPageState page)
Expand Down
11 changes: 2 additions & 9 deletions src/GitHubExtension/Widgets/Templates/GitHubIssuesConfigurationTemplate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,10 @@
"type": "Input.Text",
"id": "url",
"label": "%Widget_Template_Label/Url%",
"inlineAction": {
"type": "Action.Execute",
"tooltip": "%Widget_Template_Tooltip/Submit%",
"verb": "CheckUrl",
"iconUrl": "data:image/png;base64,${submitIcon}"
},
"spacing": "Medium",
"style": "Url",
"placeholder": "%Widget_Template_Input/UrlPlaceholder%",
"value": "${$root.configuration.url}"
"value": "${url}"
},
{
"type": "Input.Text",
Expand Down Expand Up @@ -115,8 +109,7 @@
"type": "Action.Execute",
"title": "%Widget_Template_Button/Save%",
"verb": "Save",
"tooltip": "%Widget_Template_Tooltip/Save%",
"isEnabled": "${$root.saveEnabled}"
"tooltip": "%Widget_Template_Tooltip/Save%"
},
{
"type": "Action.Execute",
Expand Down
11 changes: 2 additions & 9 deletions src/GitHubExtension/Widgets/Templates/GitHubPullsConfigurationTemplate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,10 @@
"type": "Input.Text",
"id": "url",
"label": "%Widget_Template_Label/Url%",
"inlineAction": {
"type": "Action.Execute",
"tooltip": "%Widget_Template_Tooltip/Submit%",
"verb": "CheckUrl",
"iconUrl": "data:image/png;base64,${submitIcon}"
},
"spacing": "Medium",
"style": "Url",
"placeholder": "%Widget_Template_Input/UrlPlaceholder%",
"value": "${$root.configuration.url}"
"value": "${url}"
},
{
"type": "Input.Text",
Expand Down Expand Up @@ -100,8 +94,7 @@
"type": "Action.Execute",
"title": "%Widget_Template_Button/Save%",
"verb": "Save",
"tooltip": "%Widget_Template_Tooltip/Save%",
"isEnabled": "${saveEnabled}"
"tooltip": "%Widget_Template_Tooltip/Save%"
},
{
"type": "Action.Execute",
Expand Down
0