Merge pull request #18 from Daverlo/issueType

Remove the option to select an issue type

Author: nickfyson

src/main/resources/admin.vm

@@ -26,12 +26,6 @@
         	<option value="none"></option>
 	    </select>
       </div>
-      <div class="field-group">
-        <label for="issueType">$i18n.getText("lgtm-servlet.admin.issueType.label")</label>
-        <select id="issueType">
-        	<option value="none"></option>
-	    </select>
-      </div>
       <div class="field-group">
         <label for="closedStatus">$i18n.getText("lgtm-servlet.admin.closedStatus.label")</label>
         <select id="closedStatus">

src/main/resources/js/lgtm-addon.js

@@ -6,14 +6,14 @@ var userFieldId = "#user";
 var secretFieldId = "#secret";
 
 var projectFieldId = "#project";
-var issueTypeFieldId = "#issueType";
 var closedStatusFieldId = "#closedStatus";
 var reopenedStatusFieldId = "#reopenedStatus";
 var priorityFieldId = "#priority";
 
 var webhookUrlFieldId = "#webhookUrl";
 var urlCodeId = "urlCode";
 var key = "webhook";
+var lgtmIssueTypeId = null;
 
 (function() { // this closure helps us keep our variables to ourselves.
 // This pattern is known as an "iife" - immediately invoked function expression
@@ -23,7 +23,6 @@ var key = "webhook";
 
 		// Init select2 fields
 		AJS.$(projectFieldId).auiSelect2();
-		AJS.$(issueTypeFieldId).auiSelect2();
 		AJS.$(closedStatusFieldId).auiSelect2();
 		AJS.$(reopenedStatusFieldId).auiSelect2();
 		AJS.$(priorityFieldId).auiSelect2();
@@ -78,69 +77,77 @@ function loadProjects() {
 }
 
 function handleProjectChange(event) {
-	clearSelect2Field(issueTypeFieldId);
+	lgtmIssueTypeId = null;
 	clearSelect2Field(priorityFieldId);
 	clearSelect2Field(closedStatusFieldId);
 	clearSelect2Field(reopenedStatusFieldId);
 
 	if (AJS.$(projectFieldId).select2('val') !== "none") {
-		loadIssueTypes(AJS.$(projectFieldId).select2('val'));
+		loadIssueType(AJS.$(projectFieldId).select2('val'), AJS.$(projectFieldId).select2('data').text);
 		loadPriorities(AJS.$(projectFieldId).select2('val'));
 	}
 }
-
-function loadIssueTypes(projectKey) {
+	
+function loadIssueType(projectKey, projectName) {
 	$.ajax({
 		url : AJS.contextPath() + "/rest/api/2/project/" + projectKey + "/statuses"
 	}).done(
 	function(issueTypes) {
-		var fieldContent = issueTypes.map(function(issueType) {
-			return {
-				value : issueType.id,
-				text : issueType.name
-			}
+		var lgtmIssueType = issueTypes.find(function (element) {
+			return element.name.toLowerCase() === "LGTM alert".toLowerCase();
 		});
-		fieldContent.unshift({value : "none", text : ""});
 
-		renderSelect2Field(issueTypeFieldId, fieldContent);
-		AJS.$(issueTypeFieldId).on('change', function(e) {
-			handleIssueTypeChange(issueTypes);
-		});
-	
-		if (config !== null) {
-			changeSelect2Value(issueTypeFieldId, config.issueTypeId);
+		var children = AJS.$("#message-context").children();
+		
+		for (var i = 0; i < children.length; i++) {
+			children[i].remove();
+		}
+		
+		if (lgtmIssueType === undefined) {
+			AJS.messages.error("#message-context", {
+				title : 'The "LGTM alert" issue type is not included in the issue type scheme of '
+					+ projectName + '.', 
+				closeable : true,
+				fadeout : false
+			});
+			
+			var messageContent = document.createElement('span');
+			messageContent.textContent = 'It can be added using the "Edit issue types" action in ' 
+				+ projectName + "'s ";
+			
+			var link = document.createElement('a');
+			var configUrl = AJS.params.baseURL + '/plugins/servlet/project-config/' + encodeURIComponent(projectKey) + '/issuetypes';
+			link.href = configUrl;
+			link.target = "_blank";
+			link.textContent = "issue type settings";
+			
+			AJS.$("#message-context").children()[0].append(messageContent);
+			AJS.$("#message-context").children()[0].append(link);
+		} else {
+			lgtmIssueTypeId = lgtmIssueType.id;
+			loadStatuses(lgtmIssueType);
 		}
 	});
 };
 
-function handleIssueTypeChange(issueTypes) {
-	clearSelect2Field(closedStatusFieldId);
-	clearSelect2Field(reopenedStatusFieldId);
+function loadStatuses(lgtmIssueType) {
+	var statuses = lgtmIssueType.statuses.map(function(status) {
+		return {
+			value : status.id,
+			text : status.name
+		}
+	});
+	statuses.unshift({value : "none", text : ""});
 
-	if (AJS.$(issueTypeFieldId).select2('val') !== "none") {
-		for (var i = 0; i < issueTypes.length; i++) {
-			if (issueTypes[i].id === AJS.$(issueTypeFieldId).select2('val')) {
-				var statuses = issueTypes[i].statuses.map(function(status) {
-					return {
-						value : status.id,
-						text : status.name
-					}
-				});
-				statuses.unshift({value : "none", text : ""});
-				
-				renderSelect2Field(closedStatusFieldId, statuses);
-				renderSelect2Field(reopenedStatusFieldId, statuses);
+	renderSelect2Field(closedStatusFieldId, statuses);
+	renderSelect2Field(reopenedStatusFieldId, statuses);
 
-				if (config !== null) {
-					var closedStatusList = AJS.$(closedStatusFieldId);
-					var reopenedStatusList = AJS.$(reopenedStatusFieldId);
+	if (config !== null) {
+		var closedStatusList = AJS.$(closedStatusFieldId);
+		var reopenedStatusList = AJS.$(reopenedStatusFieldId);
 
-					closedStatusList.select2('val', config.closedStatusId);
-					reopenedStatusList.select2('val', config.reopenedStatusId);
-				}
-				break;
-			}
-		}
+		closedStatusList.select2('val', config.closedStatusId);
+		reopenedStatusList.select2('val', config.reopenedStatusId);
 	}
 }
 
@@ -242,12 +249,8 @@ function updateConfig() {
 		return;
 	}
 
-	if (AJS.$(issueTypeFieldId).select2('val') === "none") {
-		AJS.messages.error("#message-context", {
-			title : 'Please select an IssueType.',
-			closeable : true,
-			fadeout : true
-		});
+	if (lgtmIssueTypeId === null) {
+		// Error message is handled in loadIssueType() when lgtmIssueType is undefined
 		return;
 	}
 
@@ -274,7 +277,7 @@ function updateConfig() {
 		'lgtmSecret' : AJS.$('#secret').attr('value'),
 		'username' : AJS.$('#user').attr('value'),
 		'projectKey' : AJS.$('#project').select2('val'),
-		'issueTypeId' : AJS.$('#issueType').select2('val'),
+		'issueTypeId' : lgtmIssueTypeId,
 		'closedStatusId' : AJS.$('#closedStatus').select2('val'),
 		'reopenedStatusId' : AJS.$('#reopenedStatus').select2('val'),
 		'priorityLevelId' : AJS.$('#priority').select2('val')