From 8f87091cf46172c5b10497c5c090b2720cfea3a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nora=20S=C3=B6derlund?= Date: Wed, 6 Sep 2023 08:53:48 +0200 Subject: [PATCH] Fix empty descriptions --- dist/index.js | 15 ++++++++++++--- dist/index.js.map | 2 +- package.json | 2 +- src/index.ts | 15 ++++++++++++--- 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/dist/index.js b/dist/index.js index 1c5d78c..e55ed34 100644 --- a/dist/index.js +++ b/dist/index.js @@ -32,13 +32,22 @@ const getIssueDetails_1 = __importDefault(require("./controllers/issues/getIssue //@ts-expect-error const adf2md = __importStar(require("adf-to-md")); const octokit = (0, github_1.getOctokit)((0, core_1.getInput)("GITHUB_TOKEN")); +async function getDescription(description) { + try { + return adf2md.convert(description).result; + } + catch { + return `*No description available.*`; + } +} +; async function execute(storyKey) { console.debug("Getting the story detail from Jira..."); const issueDetails = await (0, getIssueDetails_1.default)(storyKey); - const description = adf2md.convert(issueDetails.fields.description); + const description = getDescription(issueDetails.fields.description); if ((0, core_1.getInput)("JIRA_KEY_MULTIPLE") !== "") { (0, core_1.setOutput)("title", issueDetails.fields.summary); - (0, core_1.setOutput)("description", description.result); + (0, core_1.setOutput)("description", description); } if (github_1.context.payload.pull_request) { if ((0, core_1.getInput)("DISABLE_PULL_REQUEST_COMMENT") !== "") { @@ -65,7 +74,7 @@ async function execute(storyKey) { const body = [ `## [${issueDetails.key}](${(0, core_1.getInput)("JIRA_BASE_URL")}/browse/${issueDetails.key})`, `### ${issueDetails.fields.summary}`, - description.result + description ].join('\n'); if (existingComment) { console.debug("Existing comment exists for story."); diff --git a/dist/index.js.map b/dist/index.js.map index 5517c05..e0d7620 100644 --- a/dist/index.js.map +++ b/dist/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAA+D;AAC/D,4CAAsD;AACtD,2FAAmE;AAEnE,kBAAkB;AAClB,kDAAoC;AAEpC,MAAM,OAAO,GAAG,IAAA,mBAAU,EAAC,IAAA,eAAQ,EAAC,cAAc,CAAC,CAAC,CAAC;AAErD,KAAK,UAAU,OAAO,CAAC,QAAgB;IACrC,OAAO,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC;IAEvD,MAAM,YAAY,GAAG,MAAM,IAAA,yBAAe,EAAC,QAAQ,CAAC,CAAC;IAErD,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAEpE,IAAG,IAAA,eAAQ,EAAC,mBAAmB,CAAC,KAAK,EAAE,EAAE;QACvC,IAAA,gBAAS,EAAC,OAAO,EAAE,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAChD,IAAA,gBAAS,EAAC,aAAa,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;KAC9C;IAED,IAAG,gBAAO,CAAC,OAAO,CAAC,YAAY,EAAE;QAC/B,IAAG,IAAA,eAAQ,EAAC,8BAA8B,CAAC,KAAK,EAAE,EAAE;YAClD,OAAO,CAAC,IAAI,CAAC,mFAAmF,CAAC,CAAC;YAElG,OAAO;SACR;QAED,OAAO,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;QAExD,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC;YACtD,GAAG,gBAAO,CAAC,IAAI;YACf,YAAY,EAAE,gBAAO,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM;SAClD,CAAC,CAAC;QAEH,MAAM,eAAe,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;YACrD,IAAG,CAAC,OAAO,CAAC,IAAI;gBACd,OAAO,KAAK,CAAC;YAEf,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAEvC,IAAG,CAAC,KAAK,CAAC,MAAM;gBACd,OAAO,KAAK,CAAC;YAEf,IAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,YAAY,CAAC,GAAG,GAAG,CAAC;gBACjD,OAAO,KAAK,CAAC;YAEf,IAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC;gBAC5B,OAAO,KAAK,CAAC;YAEf,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG;YACX,OAAO,YAAY,CAAC,GAAG,KAAK,IAAA,eAAQ,EAAC,eAAe,CAAC,WAAW,YAAY,CAAC,GAAG,GAAG;YACnF,OAAO,YAAY,CAAC,MAAM,CAAC,OAAO,EAAE;YACpC,WAAW,CAAC,MAAM;SACnB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEb,IAAG,eAAe,EAAE;YAClB,OAAO,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;YAEpD,IAAG,eAAe,CAAC,IAAI,KAAK,IAAI,EAAE;gBAChC,OAAO,CAAC,IAAI,CAAC,iEAAiE,CAAC,CAAC;gBAEhF,OAAO;aACR;YAED,MAAM,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC;gBACtC,GAAG,gBAAO,CAAC,IAAI;gBACf,UAAU,EAAE,eAAe,CAAC,EAAE;gBAC9B,IAAI;aACL,CAAC,CAAC;SACJ;aACI;YACH,OAAO,CAAC,KAAK,CAAC,8CAA8C,CAAC,CAAC;YAE9D,MAAM,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC;gBACtC,GAAG,gBAAO,CAAC,IAAI;gBACf,YAAY,EAAE,gBAAO,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM;gBACjD,IAAI;aACL,CAAC,CAAC;SACJ;KACF;AACH,CAAC;AAAA,CAAC;AAEF,KAAK,UAAU,IAAI;IACjB,MAAM,OAAO,GAAG,IAAA,eAAQ,EAAC,UAAU,CAAC,CAAC;IAErC,IAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QACzB,IAAG,CAAC,gBAAO,CAAC,OAAO,CAAC,YAAY;YAC9B,OAAO,IAAA,gBAAS,EAAC,qDAAqD,CAAC,CAAC;QAE1E,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;YAC/C,GAAG,gBAAO,CAAC,IAAI;YACf,WAAW,EAAE,gBAAO,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM;SACjD,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG;YACb,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;YACzB,WAAW,CAAC,IAAI,CAAC,KAAK;YACtB,WAAW,CAAC,IAAI,CAAC,IAAI;SACtB,CAAC;QAEF,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,GAAG,OAAO,eAAe,EAAE,GAAG,CAAC,CAAC;QAEzD,MAAM,SAAS,GAAa,EAAE,CAAC;QAE/B,KAAI,IAAI,KAAK,IAAI,MAAM,EAAE;YACvB,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;YAExC,IAAG,OAAO,EAAE,MAAM,EAAE;gBAClB,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;gBAE3B,SAAS;aACV;SACF;QAED,IAAG,CAAC,SAAS,CAAC,MAAM,EAAE;YACpB,IAAG,IAAA,eAAQ,EAAC,iCAAiC,CAAC,KAAK,EAAE,EAAE;gBACrD,OAAO,CAAC,KAAK,CAAC,0CAA0C,GAAG,OAAO,CAAC,CAAC;gBAEpE,OAAO,CAAC,IAAI,CAAC,yEAAyE,CAAC,CAAC;aACzF;;gBAEC,IAAA,gBAAS,EAAC,0CAA0C,GAAG,OAAO,CAAC,CAAC;YAElE,OAAO;SACR;QAED,IAAG,IAAA,eAAQ,EAAC,mBAAmB,CAAC,KAAK,EAAE,EAAE;YACvC,KAAI,IAAI,QAAQ,IAAI,SAAS;gBAC3B,OAAO,CAAC,QAAQ,CAAC,CAAC;SACrB;;YAEC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;KACzB;;QAEC,OAAO,CAAC,OAAO,CAAC,CAAC;AACrB,CAAC;AAAA,CAAC;AAEF,IAAI;IACF,IAAI,EAAE,CAAC;CACR;AACD,OAAM,KAAK,EAAE;IACX,IAAG,KAAK,YAAY,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;QACpD,IAAA,gBAAS,EAAC,KAAK,CAAC,CAAC;;QAEjB,IAAA,gBAAS,EAAC,iBAAiB,GAAG,KAAK,CAAC,CAAC;CACxC"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package.json b/package.json index 1043050..e94ee80 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jira-summary-action", - "version": "0.9.1", + "version": "0.9.2", "description": "A GitHub Action that posts the summary of a linked Jira story in pull requests.", "main": "dist/index.js", "scripts": { diff --git a/src/index.ts b/src/index.ts index d25c9d1..404a060 100644 --- a/src/index.ts +++ b/src/index.ts @@ -7,16 +7,25 @@ import * as adf2md from "adf-to-md"; const octokit = getOctokit(getInput("GITHUB_TOKEN")); +async function getDescription(description: any) { + try { + return adf2md.convert(description).result; + } + catch { + return `*No description available.*`; + } +}; + async function execute(storyKey: string) { console.debug("Getting the story detail from Jira..."); const issueDetails = await getIssueDetails(storyKey); - const description = adf2md.convert(issueDetails.fields.description); + const description = getDescription(issueDetails.fields.description); if(getInput("JIRA_KEY_MULTIPLE") !== "") { setOutput("title", issueDetails.fields.summary); - setOutput("description", description.result); + setOutput("description", description); } if(context.payload.pull_request) { @@ -54,7 +63,7 @@ async function execute(storyKey: string) { const body = [ `## [${issueDetails.key}](${getInput("JIRA_BASE_URL")}/browse/${issueDetails.key})`, `### ${issueDetails.fields.summary}`, - description.result + description ].join('\n'); if(existingComment) {