Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Commit

Permalink
Merge pull request #15 from Microsoft/jeyou/info-objects
Browse files Browse the repository at this point in the history 
Refactoring into Info objects
  • Loading branch information
Jeff Young committed Apr 20, 2016
2 parents 61c7c73 + 29d949c commit 772ea8c
Show file tree
Hide file tree
Showing 14 changed files with 367 additions and 230 deletions.
10 changes: 5 additions & 5 deletions src/clients/buildclient.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ export class BuildClient extends BaseClient {
let svc: BuildService = new BuildService(this._serverContext);

Logger.LogInfo("Getting current build from badge...");
svc.GetBuildBadge(this._serverContext.TeamProject, WellKnownRepositoryTypes.TfsGit, this._serverContext.RepositoryId, context.CurrentRef).then((buildBadge) => {
svc.GetBuildBadge(this._serverContext.RepoInfo.TeamProject, WellKnownRepositoryTypes.TfsGit, this._serverContext.RepoInfo.RepositoryId, context.CurrentRef).then((buildBadge) => {
if (buildBadge.buildId !== undefined) {
Logger.LogInfo("Found build id " + buildBadge.buildId.toString() + ". Getting build details...");
svc.GetBuildById(buildBadge.buildId).then((build) => {
this._buildSummaryUrl = BuildService.GetBuildSummaryUrl(this._serverContext.TeamProjectUrl, build.id.toString());
this._buildSummaryUrl = BuildService.GetBuildSummaryUrl(this._serverContext.RepoInfo.TeamProjectUrl, build.id.toString());
Logger.LogInfo("Build summary info: " + build.id.toString() + " " + BuildStatus[build.status] +
" " + BuildResult[build.result] + " " + this._buildSummaryUrl);

Expand All @@ -56,8 +56,8 @@ export class BuildClient extends BaseClient {
this.handleError(reason, polling, "Failed to get build details by id");
});
} else {
Logger.LogInfo("No builds were found for team " + this._serverContext.TeamProject.toString() + ", repo type git, " +
"repo id " + this._serverContext.RepositoryId.toString() + ", + branch " + (context.CurrentBranch === null ? "UNKNOWN" : context.CurrentBranch.toString()));
Logger.LogInfo("No builds were found for team " + this._serverContext.RepoInfo.TeamProject.toString() + ", repo type git, " +
"repo id " + this._serverContext.RepoInfo.RepositoryId.toString() + ", + branch " + (context.CurrentBranch === null ? "UNKNOWN" : context.CurrentBranch.toString()));
if (this._statusBarItem !== undefined) {
this._statusBarItem.command = CommandNames.OpenBuildSummaryPage;
this._statusBarItem.text = `$(icon octicon-package) ` + `$(icon octicon-dash)`;
Expand All @@ -74,7 +74,7 @@ export class BuildClient extends BaseClient {
let url: string = this._buildSummaryUrl;
if (url === undefined) {
Logger.LogInfo("No build summary available, using build definitions url.");
url = BuildService.GetBuildDefinitionsUrl(this._serverContext.TeamProjectUrl);
url = BuildService.GetBuildDefinitionsUrl(this._serverContext.RepoInfo.TeamProjectUrl);
}
Logger.LogInfo("OpenBuildSummaryPage: " + url);
Utils.OpenUrl(url);
Expand Down
10 changes: 5 additions & 5 deletions src/clients/gitclient.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ export class GitClient extends BaseClient {
self.ReportEvent(TelemetryEvents.ViewPullRequest);
let discUrl: string = undefined;
if (request.id !== undefined) {
discUrl = GitVcService.GetPullRequestDiscussionUrl(self._serverContext.RepositoryUrl, request.id);
discUrl = GitVcService.GetPullRequestDiscussionUrl(self._serverContext.RepoInfo.RepositoryUrl, request.id);
} else {
discUrl = GitVcService.GetPullRequestsUrl(self._serverContext.RepositoryUrl);
discUrl = GitVcService.GetPullRequestsUrl(self._serverContext.RepoInfo.RepositoryUrl);
}
Logger.LogInfo("Pull Request Url: " + discUrl);
Utils.OpenUrl(discUrl);
Expand Down Expand Up @@ -128,7 +128,7 @@ export class GitClient extends BaseClient {
public OpenPullRequestsPage(): void {
this.ReportEvent(TelemetryEvents.OpenPullRequestsPage);

let url: string = GitVcService.GetPullRequestsUrl(this._serverContext.RepositoryUrl);
let url: string = GitVcService.GetPullRequestsUrl(this._serverContext.RepoInfo.RepositoryUrl);
Logger.LogInfo("OpenPullRequestsPage: " + url);
Utils.OpenUrl(url);
}
Expand All @@ -153,7 +153,7 @@ export class GitClient extends BaseClient {

Logger.LogInfo("Getting pull requests that I requested...");
let svc: GitVcService = new GitVcService(this._serverContext);
svc.GetPullRequests(this._serverContext.RepositoryId, this._serverContext.UserId, undefined, PullRequestStatus.Active).then((myPullRequests) => {
svc.GetPullRequests(this._serverContext.RepoInfo.RepositoryId, this._serverContext.UserInfo.Id, undefined, PullRequestStatus.Active).then((myPullRequests) => {
let icon: string = "octicon-search";
let label: string = `$(icon ${icon}) `;
requestItems.push({ label: label + Strings.BrowseYourPullRequests, description: undefined, id: undefined });
Expand All @@ -167,7 +167,7 @@ export class GitClient extends BaseClient {

Logger.LogInfo("Getting pull requests for which I'm a reviewer...");
//Go get the active pull requests that I'm a reviewer for
svc.GetPullRequests(this._serverContext.RepositoryId, undefined, this._serverContext.UserId, PullRequestStatus.Active).then((myReviewPullRequests) => {
svc.GetPullRequests(this._serverContext.RepoInfo.RepositoryId, undefined, this._serverContext.UserInfo.Id, PullRequestStatus.Active).then((myReviewPullRequests) => {
myReviewPullRequests.forEach(pr => {
let score: PullRequestScore = GitVcService.GetPullRequestScore(pr);
if (requestIds.indexOf(pr.pullRequestId) < 0) {
Expand Down
34 changes: 17 additions & 17 deletions src/clients/witclient.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export class WitClient extends BaseClient {
public CreateNewItem(itemType: string, taskTitle: string): void {
this.logTelemetryForWorkItem(itemType);
Logger.LogInfo("Work item type is " + itemType);
let newItemUrl: string = WorkItemTrackingService.GetNewWorkItemUrl(this._serverContext.TeamProjectUrl, itemType, taskTitle, this.getUserName(this._serverContext));
let newItemUrl: string = WorkItemTrackingService.GetNewWorkItemUrl(this._serverContext.RepoInfo.TeamProjectUrl, itemType, taskTitle, this.getUserName(this._serverContext));
Logger.LogInfo("New Work Item Url: " + newItemUrl);
Utils.OpenUrl(newItemUrl);
}
Expand All @@ -47,7 +47,7 @@ export class WitClient extends BaseClient {
self.ReportEvent(TelemetryEvents.OpenNewWorkItem);

Logger.LogInfo("Selected work item type is " + selectedType.label);
let newItemUrl: string = WorkItemTrackingService.GetNewWorkItemUrl(self._serverContext.TeamProjectUrl, selectedType.label, taskTitle, self.getUserName(self._serverContext));
let newItemUrl: string = WorkItemTrackingService.GetNewWorkItemUrl(self._serverContext.RepoInfo.TeamProjectUrl, selectedType.label, taskTitle, self.getUserName(self._serverContext));
Logger.LogInfo("New Work Item Url: " + newItemUrl);
Utils.OpenUrl(newItemUrl);
}
Expand All @@ -72,16 +72,16 @@ export class WitClient extends BaseClient {
Logger.LogInfo("Selected query is " + query.label);
Logger.LogInfo("Getting work items for query...");

window.showQuickPick(self.getMyWorkItems(self._serverContext.TeamProject, query.wiql), { matchOnDescription: true, placeHolder: Strings.ChooseWorkItem }).then(
window.showQuickPick(self.getMyWorkItems(self._serverContext.RepoInfo.TeamProject, query.wiql), { matchOnDescription: true, placeHolder: Strings.ChooseWorkItem }).then(
function (workItem) {
if (workItem) {
let url: string = undefined;
if (workItem.id === undefined) {
self.ReportEvent(TelemetryEvents.OpenAdditionalQueryResults);
url = WorkItemTrackingService.GetMyQueryResultsUrl(self._serverContext.TeamProjectUrl, query.label);
url = WorkItemTrackingService.GetMyQueryResultsUrl(self._serverContext.RepoInfo.TeamProjectUrl, query.label);
} else {
self.ReportEvent(TelemetryEvents.ViewWorkItem);
url = WorkItemTrackingService.GetEditWorkItemUrl(self._serverContext.TeamProjectUrl, workItem.id);
url = WorkItemTrackingService.GetEditWorkItemUrl(self._serverContext.RepoInfo.TeamProjectUrl, workItem.id);
}
Logger.LogInfo("Work Item Url: " + url);
Utils.OpenUrl(url);
Expand All @@ -105,16 +105,16 @@ export class WitClient extends BaseClient {
this.ReportEvent(TelemetryEvents.ViewMyWorkItems);

Logger.LogInfo("Getting work items...");
window.showQuickPick(self.getMyWorkItems(this._serverContext.TeamProject, WitQueries.MyWorkItems), { matchOnDescription: true, placeHolder: Strings.ChooseWorkItem }).then(
window.showQuickPick(self.getMyWorkItems(this._serverContext.RepoInfo.TeamProject, WitQueries.MyWorkItems), { matchOnDescription: true, placeHolder: Strings.ChooseWorkItem }).then(
function (workItem) {
if (workItem) {
let url: string = undefined;
if (workItem.id === undefined) {
self.ReportEvent(TelemetryEvents.OpenAdditionalQueryResults);
url = WorkItemTrackingService.GetWorkItemsBaseUrl(self._serverContext.TeamProjectUrl);
url = WorkItemTrackingService.GetWorkItemsBaseUrl(self._serverContext.RepoInfo.TeamProjectUrl);
} else {
self.ReportEvent(TelemetryEvents.ViewWorkItem);
url = WorkItemTrackingService.GetEditWorkItemUrl(self._serverContext.TeamProjectUrl, workItem.id);
url = WorkItemTrackingService.GetEditWorkItemUrl(self._serverContext.RepoInfo.TeamProjectUrl, workItem.id);
}
Logger.LogInfo("Work Item Url: " + url);
Utils.OpenUrl(url);
Expand All @@ -134,8 +134,8 @@ export class WitClient extends BaseClient {

let svc: WorkItemTrackingService = new WorkItemTrackingService(this._serverContext);
Logger.LogInfo("Getting my work item queries...");
Logger.LogInfo("TP: " + this._serverContext.TeamProject);
svc.GetWorkItemHierarchyItems(this._serverContext.TeamProject).then((hierarchyItems) => {
Logger.LogInfo("TP: " + this._serverContext.RepoInfo.TeamProject);
svc.GetWorkItemHierarchyItems(this._serverContext.RepoInfo.TeamProject).then((hierarchyItems) => {
Logger.LogInfo("Retrieved " + hierarchyItems.length + " hierarchyItems");
hierarchyItems.forEach(folder => {
if (folder && folder.name === WitQueries.MyQueriesFolder && folder.hasChildren === true) {
Expand Down Expand Up @@ -167,7 +167,7 @@ export class WitClient extends BaseClient {

let svc: WorkItemTrackingService = new WorkItemTrackingService(this._serverContext);
Logger.LogInfo("Getting my work items...");
Logger.LogInfo("TP: " + this._serverContext.TeamProject);
Logger.LogInfo("TP: " + this._serverContext.RepoInfo.TeamProject);
svc.GetWorkItems(teamProject, wiql).then((simpleWorkItems) => {
Logger.LogInfo("Retrieved " + simpleWorkItems.length + " work items");

Expand All @@ -192,12 +192,12 @@ export class WitClient extends BaseClient {

private getUserName(context: TeamServerContext): string {
let userName: string = undefined;
Logger.LogDebug("UserCustomDisplayName: " + context.UserCustomDisplayName);
Logger.LogDebug("UserProviderDisplayName: " + context.UserProviderDisplayName);
if (context.UserCustomDisplayName !== undefined) {
userName = context.UserCustomDisplayName;
Logger.LogDebug("UserCustomDisplayName: " + context.UserInfo.CustomDisplayName);
Logger.LogDebug("UserProviderDisplayName: " + context.UserInfo.ProviderDisplayName);
if (context.UserInfo.CustomDisplayName !== undefined) {
userName = context.UserInfo.CustomDisplayName;
} else {
userName = context.UserProviderDisplayName;
userName = context.UserInfo.ProviderDisplayName;
}
Logger.LogDebug("User is " + userName);
return userName;
Expand All @@ -209,7 +209,7 @@ export class WitClient extends BaseClient {
promiseToReturn = deferred.promise;

let svc: WorkItemTrackingService = new WorkItemTrackingService(this._serverContext);
svc.GetWorkItemTypes(this._serverContext.TeamProject).then((types) => {
svc.GetWorkItemTypes(this._serverContext.RepoInfo.TeamProject).then((types) => {
let workItemTypes: Array<BaseQuickPickItem> = [];
types.forEach(type => {
workItemTypes.push({ label: type.name, description: type.description, id: undefined });
Expand Down
Loading

0 comments on commit 772ea8c

Please sign in to comment.