Merge pull request #154 from andrepereiradasilva/patch-1

PoC improve component options

administrator/components/com_patchtester/config.xml

@@ -2,17 +2,33 @@
 <config>
 
 	<fieldset
-		name="component"
-		label="COM_PATCHTESTER_COMPONENT_LABEL"
-		description="COM_PATCHTESTER_COMPONENT_DESC"
+		name="repositories"
+		label="COM_PATCHTESTER_FIELDSET_REPOSITORIES_LABEL"
+		description="COM_PATCHTESTER_FIELDSET_REPOSITORIES_DESC"
 		>
 
+		<field
+			name="repository"
+			type="list"
+			label="COM_PATCHTESTER_FIELD_REPOSITORY_LABEL"
+			description="COM_PATCHTESTER_FIELD_REPOSITORY_DESC"
+			default="joomla:joomla-cms"
+			onchange="if (jQuery(this).val() != 'custom') { var parts = jQuery(this).val().split(':'); } else { var parts = ['', '']; }  document.getElementById('jform_org').value = parts[0]; document.getElementById('jform_repo').value = parts[1];"
+			>
+			<option value="joomla:joomla-cms">COM_PATCHTESTER_FIELD_REPOSITORY_OPTION_JOOMLA_CMS</option>
+			<option value="joomla-extensions:patchtester">COM_PATCHTESTER_FIELD_REPOSITORY_OPTION_PATCHTESTER</option>
+			<option value="joomla-extensions:install-from-web-client">COM_PATCHTESTER_FIELD_REPOSITORY_OPTION_INSTALL_FROM_WEB</option>
+			<option value="custom">COM_PATCHTESTER_FIELD_REPOSITORY_CUSTOM</option>
+		</field>
+
 		<field
 			name="org"
 			type="text"
 			label="COM_PATCHTESTER_FIELD_ORG_LABEL"
 			description="COM_PATCHTESTER_FIELD_ORG_DESC"
 			default="joomla"
+			id="org"
+			showon="repository:custom"
 		/>
 
 		<field
@@ -21,14 +37,39 @@
 			label="COM_PATCHTESTER_FIELD_REPO_LABEL"
 			description="COM_PATCHTESTER_FIELD_REPO_DESC"
 			default="joomla-cms"
+			id="repo"
+			showon="repository:custom"
 		/>
 
+	</fieldset>
+
+	<fieldset
+		name="authentication"
+		label="COM_PATCHTESTER_FIELDSET_AUTHENTICATION_LABEL"
+		description="COM_PATCHTESTER_FIELDSET_AUTHENTICATION_DESC"
+		>
+
+		<field
+			name="gh_auth"
+			type="list"
+			label="COM_PATCHTESTER_FIELD_GH_AUTH_LABEL"
+			description="COM_PATCHTESTER_FIELD_GH_AUTH_DESC"
+			default=""
+			>
+			<option value="">JNONE</option>
+			<option value="credentials">COM_PATCHTESTER_FIELD_GH_AUTH_OPTION_CREDENTIALS</option>
+			<option value="token">COM_PATCHTESTER_FIELD_GH_AUTH_OPTION_TOKEN</option>
+		</field>
+
+		<!-- Note: Default username is a space to avoid browser autocomplete. -->
 		<field
 			name="gh_user"
 			type="text"
 			label="COM_PATCHTESTER_FIELD_GH_USER_LABEL"
 			description="COM_PATCHTESTER_FIELD_GH_USER_DESC"
 			autocomplete="off"
+			default=" "
+			showon="gh_auth:credentials"
 		/>
 
 		<field
@@ -37,6 +78,8 @@
 			label="COM_PATCHTESTER_FIELD_GH_PASSWORD_LABEL"
 			description="COM_PATCHTESTER_FIELD_GH_PASSWORD_DESC"
 			autocomplete="off"
+			default=""
+			showon="gh_auth:credentials"
 		/>
 
 		<field
@@ -44,6 +87,7 @@
 			type="text"
 			label="COM_PATCHTESTER_FIELD_GH_TOKEN_LABEL"
 			description="COM_PATCHTESTER_FIELD_GH_TOKEN_DESC"
+			showon="gh_auth:token"
 		/>
 
 	</fieldset>

administrator/components/com_patchtester/language/en-GB/en-GB.com_patchtester.ini

@@ -10,8 +10,6 @@ COM_PATCHTESTER_APPLIED="Applied"
 COM_PATCHTESTER_APPLIED_COMMIT_SHA="Applied Commit SHA: %s"
 COM_PATCHTESTER_APPLY_OK="Patch successfully applied"
 COM_PATCHTESTER_APPLY_PATCH="Apply Patch"
-COM_PATCHTESTER_COMPONENT_DESC="Joomla! Patch Tester Configuration Values"
-COM_PATCHTESTER_COMPONENT_LABEL="Joomla! Patch Tester"
 COM_PATCHTESTER_CONFIGURATION="Joomla! Patch Tester Settings"
 COM_PATCHTESTER_CONFIRM_RESET="Resetting will attempt to revert all applied patches and removes all backed up files. This may result in a corrupted environment. Are you sure you want to continue?"
 COM_PATCHTESTER_CONFLICT_S="The patch could not be applied because it conflicts with a previously applied patch: %s"
@@ -32,16 +30,30 @@ COM_PATCHTESTER_FETCH_INITIALIZING_DESCRIPTION="Making sure all is well to fetch
 COM_PATCHTESTER_FETCH_PAGE_NUMBER="Processing page %s of GitHub data"
 COM_PATCHTESTER_FETCH_PROCESSING="Processing data from GitHub"
 COM_PATCHTESTER_FETCH_SUCCESSFUL="Successfully retrieved pull requests"
+COM_PATCHTESTER_FIELD_GH_AUTH_DESC="Select 'Credentials' to use authentication through GitHub Username and Password, to 'Token' for GitHub API Token"
+COM_PATCHTESTER_FIELD_GH_AUTH_LABEL="GitHub Authentication Method"
+COM_PATCHTESTER_FIELD_GH_AUTH_OPTION_CREDENTIALS="Credentials"
+COM_PATCHTESTER_FIELD_GH_AUTH_OPTION_TOKEN="Token"
 COM_PATCHTESTER_FIELD_GH_PASSWORD_LABEL="GitHub Account Password"
 COM_PATCHTESTER_FIELD_GH_PASSWORD_DESC="Password for the account entered in the 'GitHub Account' field. Note that accounts using Two Factor Authentication will not work with this component."
 COM_PATCHTESTER_FIELD_GH_TOKEN_DESC="Use this field to input a GitHub API Token in place of your username and password. Note that this is required if your account has Two Factor Authentication enabled."
 COM_PATCHTESTER_FIELD_GH_TOKEN_LABEL="GitHub Token"
 COM_PATCHTESTER_FIELD_GH_USER_LABEL="GitHub Account Username"
 COM_PATCHTESTER_FIELD_GH_USER_DESC="Name of account on GitHub to use to authenticate to the API."
-COM_PATCHTESTER_FIELD_ORG_LABEL="GitHub Project Owner"
+COM_PATCHTESTER_FIELD_ORG_LABEL="Custom Project Owner"
 COM_PATCHTESTER_FIELD_ORG_DESC="A username or organization on GitHub to monitor pull requests for."
-COM_PATCHTESTER_FIELD_REPO_LABEL="GitHub Project Repository"
+COM_PATCHTESTER_FIELD_REPO_LABEL="Custom Project Repository"
 COM_PATCHTESTER_FIELD_REPO_DESC="Name of a repository on GitHub to monitor pull requests for."
+COM_PATCHTESTER_FIELD_REPOSITORY_DESC="Available Joomla repositories. Select to autopopulate the organization and repository fields values."
+COM_PATCHTESTER_FIELD_REPOSITORY_LABEL="GitHub Repository"
+COM_PATCHTESTER_FIELD_REPOSITORY_OPTION_JOOMLA_CMS="Joomla CMS"
+COM_PATCHTESTER_FIELD_REPOSITORY_OPTION_PATCHTESTER="Joomla PatchTester Component"
+COM_PATCHTESTER_FIELD_REPOSITORY_OPTION_INSTALL_FROM_WEB="Joomla Install From Web Plugin"
+COM_PATCHTESTER_FIELD_REPOSITORY_CUSTOM="Custom"
+COM_PATCHTESTER_FIELDSET_REPOSITORIES_DESC="Configuration Values for GitHub Repository"
+COM_PATCHTESTER_FIELDSET_REPOSITORIES_LABEL="GitHub Repository"
+COM_PATCHTESTER_FIELDSET_AUTHENTICATION_DESC="Configuration Values for GitHub Authentication"
+COM_PATCHTESTER_FIELDSET_AUTHENTICATION_LABEL="GitHub Authentication"
 COM_PATCHTESTER_FILE_DELETED_DOES_NOT_EXIST_S="The file marked for deletion does not exist: %s"
 COM_PATCHTESTER_FILE_MODIFIED_DOES_NOT_EXIST_S="The file marked for modification does not exist: %s"
 COM_PATCHTESTER_FILTER_APPLIED_PATCHES="Filter Applied Patches"