Skip to content

Feature: Auto-Populate Files and Windows Version when submitting feedback #12639

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.

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

Merged
merged 1 commit into from
Jun 19, 2023
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
20 changes: 5 additions & 15 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,28 +38,18 @@ body:
id: files_version
attributes:
label: Files Version
description: Which version of Files are you using? The version number can be found by going to Files' Settings > About
placeholder: "e.g. Version: 2.0.34.0"
description: Which version of Files are you using? To copy your Files version, access it from Settings -> About -> Copy -> Files version
placeholder: "e.g. 2.0.34.0"
validations:
required: true

# Windows Version
- type: dropdown
- type: input
id: windows_version
attributes:
label: Windows Version
description: Which version of Windows are you using?
multiple: true
options:
- 'Windows 11 Insider: 25xxx series'
- 'Windows 11 Insider: 23xxx series'
- 'Windows 11 (22H2): 22621'
- 'Windows 11 (21H2): 22000'
- 'Windows 10 (22H2): 19045'
- 'Windows 10 (21H2): 19044'
- 'Windows 10 (21H1): 19043'
- 'Windows 10 (20H2): 19042'
- 'Windows 10 (2004): 19041'
description: Which version of Windows are you using? To copy your Windows version, access it from Settings -> About -> Copy -> Windows version
placeholder: "e.g. 10.0.22621.1848"
validations:
required: true

Expand Down
22 changes: 6 additions & 16 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,31 +33,21 @@ body:

# Files Version
- type: input
id: files-version
id: files_version
attributes:
label: Files Version
description: Which version of Files are you currently using?
placeholder: 'Version: 2.0.36.0'
description: Which version of Files are you using? To copy your Files version, access it from Settings -> About -> Copy -> Files version
placeholder: 'e.g. 2.0.36.0'
validations:
required: true

# Windows Version
- type: dropdown
- type: input
id: windows_version
attributes:
label: Windows Version
description: Which version of Windows are you using?
multiple: true
options:
- 'Windows 11 Insider: 25xxx series'
- 'Windows 11 Insider: 23xxx series'
- 'Windows 11 (22H2): 22621'
- 'Windows 11 (21H2): 22000'
- 'Windows 10 (22H2): 19045'
- 'Windows 10 (21H2): 19044'
- 'Windows 10 (21H1): 19043'
- 'Windows 10 (20H2): 19042'
- 'Windows 10 (2004): 19041'
description: Which version of Windows are you using? To copy your Windows version, access it from Settings -> About -> Copy -> Windows version
placeholder: "e.g. 10.0.22621.1848"
validations:
required: true

Expand Down
4 changes: 2 additions & 2 deletions src/Files.App/Constants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,8 @@ public static class GitHub
{
public const string GitHubRepoUrl = @"https://github.com/files-community/Files";
public const string DocumentationUrl = @"https://files.community/docs";
public const string FeatureRequestUrl = @"https://github.com/files-community/Files/issues/new?assignees=&labels=feature+request&template=feature_request.yml";
public const string BugReportUrl = @"https://github.com/files-community/Files/issues/new?assignees=&labels=bug&template=bug_report.yml";
public const string FeatureRequestUrl = @"https://github.com/files-community/Files/issues/new?labels=feature+request&template=feature_request.yml";
public const string BugReportUrl = @"https://github.com/files-community/Files/issues/new?labels=bug&template=bug_report.yml";
public const string PrivacyPolicyUrl = @"https://github.com/files-community/Files/blob/main/Privacy.md";
public const string SupportUsUrl = @"https://github.com/sponsors/yaira2";
}
Expand Down
26 changes: 22 additions & 4 deletions src/Files.App/ViewModels/Settings/AboutViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@ public Task DoOpenDocumentation()

public Task DoSubmitFeatureRequest()
{
return Launcher.LaunchUriAsync(new Uri(Constants.GitHub.FeatureRequestUrl)).AsTask();
return Launcher.LaunchUriAsync(new Uri($"{Constants.GitHub.FeatureRequestUrl}&{GetVersionsQueryString()}")).AsTask();
}

public Task DoSubmitBugReport()
{
return Launcher.LaunchUriAsync(new Uri(Constants.GitHub.BugReportUrl)).AsTask();
return Launcher.LaunchUriAsync(new Uri($"{Constants.GitHub.BugReportUrl}&{GetVersionsQueryString()}")).AsTask();
}

public Task DoOpenGitHubRepo()
Expand All @@ -88,7 +88,7 @@ public void CopyAppVersion()
{
DataPackage dataPackage = new DataPackage();
dataPackage.RequestedOperation = DataPackageOperation.Copy;
dataPackage.SetText(string.Format($"{AppVersion.Major}.{AppVersion.Minor}.{AppVersion.Build}.{AppVersion.Revision}"));
dataPackage.SetText(GetAppVersion());
Clipboard.SetContent(dataPackage);
});
}
Expand All @@ -99,7 +99,7 @@ public void CopyWindowsVersion()
{
DataPackage dataPackage = new DataPackage();
dataPackage.RequestedOperation = DataPackageOperation.Copy;
dataPackage.SetText(SystemInformation.Instance.OperatingSystemVersion.ToString());
dataPackage.SetText(GetWindowsVersion());
Clipboard.SetContent(dataPackage);
});
}
Expand All @@ -115,6 +115,24 @@ public async Task LoadThirdPartyNotices()
ThirdPartyNotices = await FileIO.ReadTextAsync(file);
}

public string GetAppVersion()
{
return string.Format($"{AppVersion.Major}.{AppVersion.Minor}.{AppVersion.Build}.{AppVersion.Revision}");
}

public string GetWindowsVersion()
{
return SystemInformation.Instance.OperatingSystemVersion.ToString();
}

public string GetVersionsQueryString()
{
var query = System.Web.HttpUtility.ParseQueryString(string.Empty);
query["files_version"] = GetAppVersion();
query["windows_version"] = GetWindowsVersion();
return query.ToString() ?? string.Empty;
}

public string Version
{
get
Expand Down