Jira email optional + PAT (#2198)

* make jira email optional

* remove logs

* remove more logs

* change wording from PAT -> Personal Access Token

* ensure name fits in default width
This commit is contained in:
pablodanswer
2024-08-21 15:59:08 -07:00
committed by GitHub
parent 584eae17e3
commit 13303edf29
2 changed files with 11 additions and 7 deletions

View File

@@ -11,9 +11,13 @@ export function createValidationSchema(json_values: dictionaryType) {
for (const key in json_values) { for (const key in json_values) {
if (Object.prototype.hasOwnProperty.call(json_values, key)) { if (Object.prototype.hasOwnProperty.call(json_values, key)) {
schemaFields[key] = Yup.string().required( if (json_values[key] === null) {
`Please enter your ${getDisplayNameForCredentialKey(key)}` schemaFields[key] = Yup.string().optional();
); } else {
schemaFields[key] = Yup.string().required(
`Please enter your ${getDisplayNameForCredentialKey(key)}`
);
}
} }
} }

View File

@@ -35,7 +35,7 @@ export interface ConfluenceCredentialJson {
} }
export interface JiraCredentialJson { export interface JiraCredentialJson {
jira_user_email: string; jira_user_email: string | null;
jira_api_token: string; jira_api_token: string;
} }
@@ -201,7 +201,7 @@ export const credentialTemplates: Record<ValidSources, any> = {
confluence_access_token: "", confluence_access_token: "",
} as ConfluenceCredentialJson, } as ConfluenceCredentialJson,
jira: { jira: {
jira_user_email: "", jira_user_email: null,
jira_api_token: "", jira_api_token: "",
} as JiraCredentialJson, } as JiraCredentialJson,
productboard: { productboard_access_token: "" } as ProductboardCredentialJson, productboard: { productboard_access_token: "" } as ProductboardCredentialJson,
@@ -311,8 +311,8 @@ export const credentialDisplayNames: Record<string, string> = {
confluence_access_token: "Confluence Access Token", confluence_access_token: "Confluence Access Token",
// Jira // Jira
jira_user_email: "Jira User Email", jira_user_email: "Jira User Email (required for Jira Cloud)",
jira_api_token: "Jira API Token", jira_api_token: "API or Personal Access Token",
// Productboard // Productboard
productboard_access_token: "Productboard Access Token", productboard_access_token: "Productboard Access Token",