From 753e97bd678a73d56cc7dcf30d32a7cf4556ccca Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 12:04:28 -0500 Subject: [PATCH 01/60] create getContext --- getData/context.ts | 29 +++++++++++++++++++++++++++++ index.ts | 3 ++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 getData/context.ts diff --git a/getData/context.ts b/getData/context.ts new file mode 100644 index 0000000..4428988 --- /dev/null +++ b/getData/context.ts @@ -0,0 +1,29 @@ +const core = require("@actions/core"); +const github = require("@actions/github"); + +const axios = require("axios"); +export default async function getContext() { + let textToWrite = ""; + await axios + .post("http://app.watermelontools.com/api/actions/getContext", { + user: github.event.pull_request.user.login, + repo: github.event.repository.name, + owner: github.event.repository.owner.login, + commitList: "264ef7c1455b51f1cb65d4457aeaa700478c91f4", + }) + .then((response) => { + console.log(response); + }) + .catch((error) => { + console.log(error.message); + }); + await axios + .get(github.event.pull_request.commits.href) + .then((response) => { + console.log(response); + }) + .catch((error) => { + console.log(error.message); + }); + return true; +} diff --git a/index.ts b/index.ts index 715065e..80799eb 100644 --- a/index.ts +++ b/index.ts @@ -1,3 +1,4 @@ +import getContext from "./getData/context"; import getGithub from "./getData/github"; import getJira from "./getData/jira"; import getSlack from "./getData/slack"; @@ -7,7 +8,7 @@ const github = require("@actions/github"); try { // Get the JSON webhook payload for the event that triggered the workflow let textToWrite = "## Context by Watermelon\n"; - let getDataPromises = [getGithub(), getJira(), getSlack()]; + let getDataPromises = [getContext()]; Promise.all(getDataPromises) .then((values) => { values.forEach((value) => { From 2ccf6c1cb6132a46cfc0a33c11bc4af84f7612c8 Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 12:04:34 -0500 Subject: [PATCH 02/60] Update index.js --- dist/index.js | 118 ++++++++------------------------------------------ 1 file changed, 18 insertions(+), 100 deletions(-) diff --git a/dist/index.js b/dist/index.js index 8d88aba..e5bfd9f 100644 --- a/dist/index.js +++ b/dist/index.js @@ -16294,7 +16294,7 @@ var __webpack_exports__ = {}; // ESM COMPAT FLAG __nccwpck_require__.r(__webpack_exports__); -;// CONCATENATED MODULE: ./getData/github.ts +;// CONCATENATED MODULE: ./getData/context.ts var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) { function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } return new (P || (P = Promise))(function (resolve, reject) { @@ -16304,127 +16304,45 @@ var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _argume step((generator = generator.apply(thisArg, _arguments || [])).next()); }); }; +const core = __nccwpck_require__(2556); +const github = __nccwpck_require__(8348); const axios = __nccwpck_require__(4158); -function getGithub() { +function getContext() { return __awaiter(this, void 0, void 0, function* () { let textToWrite = ""; yield axios - .post("http://app.watermelontools.com/api/github/getIssuesByCommits", { - user: "estebandalelr@gmail.com", - repo: "watermelon", - owner: "watermelontools", + .post("http://app.watermelontools.com/api/actions/getContext", { + user: github.event.pull_request.user.login, + repo: github.event.repository.name, + owner: github.event.repository.owner.login, commitList: "264ef7c1455b51f1cb65d4457aeaa700478c91f4", }) .then((response) => { - textToWrite += "### GitHub PRs"; - for (let index = 0; index < response.data.items.length; index++) { - const element = response.data.items[index]; - textToWrite += `\n - [#${element.number} - ${element.title}](${element.html_url})`; - textToWrite += `\n`; - // shortcircuit to three results - if (index === 2) { - textToWrite += `and ${response.data.items.length - 3} more`; - break; - } - } + console.log(response); }) .catch((error) => { console.log(error.message); }); - return textToWrite; - }); -} - -;// CONCATENATED MODULE: ./getData/jira.ts -var jira_awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -const jira_axios = __nccwpck_require__(4158); -function getJira() { - return jira_awaiter(this, void 0, void 0, function* () { - let textToWrite = ""; - yield jira_axios - .post("http://app.watermelontools.com/api/jira/getMostRelevantJiraTicket", { - user: "estebandalelr@gmail.com", - prTitle: "WM-49: Create payments success page", - }) - .then((response) => { - textToWrite += "### Jira Tickets"; - for (let index = 0; index < response.data.length; index++) { - const element = response.data[index]; - textToWrite += `\n - [${element.key} - ${element.fields.summary}](${element.serverInfo.baseUrl}/browse/${element.key})`; - textToWrite += `\n`; - // shortcircuit to three results - if (index === 2) { - textToWrite += `and ${response.data.length - 3} more`; - break; - } - } - }) - .catch((error) => { - console.log(error.message); - }); - return textToWrite; - }); -} - -;// CONCATENATED MODULE: ./getData/slack.ts -var slack_awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -const slack_axios = __nccwpck_require__(4158); -function getSlack() { - return slack_awaiter(this, void 0, void 0, function* () { - let textToWrite = ""; - yield slack_axios - .post("http://app.watermelontools.com/api/slack/searchMessagesByText", { - user: "estebandalelr@gmail.com", - text: "action github", - }) + yield axios + .get(github.event.pull_request.commits.href) .then((response) => { - textToWrite += "### Slack Threads"; - for (let index = 0; index < response.data.messages.matches.length; index++) { - const element = response.data.messages.matches[index]; - textToWrite += `\n - [#${element.channel.name} - ${element.username}\n ${element.text.length > 100 - ? element.text.substring(0, 100) + "..." - : element.text}](${element.permalink})`; - textToWrite += `\n`; - // shortcircuit to three results - if (index === 2) { - textToWrite += `and ${response.data.messages.matches.length - 3} more`; - break; - } - } + console.log(response); }) .catch((error) => { console.log(error.message); }); - return textToWrite; + return true; }); } ;// CONCATENATED MODULE: ./index.ts - - -const core = __nccwpck_require__(2556); -const github = __nccwpck_require__(8348); +const index_core = __nccwpck_require__(2556); +const index_github = __nccwpck_require__(8348); try { // Get the JSON webhook payload for the event that triggered the workflow let textToWrite = "## Context by Watermelon\n"; - let getDataPromises = [getGithub(), getJira(), getSlack()]; + let getDataPromises = [getContext()]; Promise.all(getDataPromises) .then((values) => { values.forEach((value) => { @@ -16436,11 +16354,11 @@ try { console.log(error.message); }) .finally(() => { - core.setOutput("textToWrite", textToWrite); + index_core.setOutput("textToWrite", textToWrite); }); } catch (error) { - core.setFailed(error.message); + index_core.setFailed(error.message); } })(); From 4b31b21c46e048a99b1687c755399e22bf8d4121 Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 12:06:04 -0500 Subject: [PATCH 03/60] add payload --- getData/context.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/getData/context.ts b/getData/context.ts index 4428988..e5629ba 100644 --- a/getData/context.ts +++ b/getData/context.ts @@ -6,9 +6,9 @@ export default async function getContext() { let textToWrite = ""; await axios .post("http://app.watermelontools.com/api/actions/getContext", { - user: github.event.pull_request.user.login, - repo: github.event.repository.name, - owner: github.event.repository.owner.login, + user: github.event.payload.pull_request.user.login, + repo: github.event.payload.repository.name, + owner: github.event.payload.repository.owner.login, commitList: "264ef7c1455b51f1cb65d4457aeaa700478c91f4", }) .then((response) => { @@ -18,7 +18,7 @@ export default async function getContext() { console.log(error.message); }); await axios - .get(github.event.pull_request.commits.href) + .get(github.event.payload.pull_request.commits.href) .then((response) => { console.log(response); }) From 94a8bde93c26eec17c0b0a0456256d2499cf7c6f Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 12:06:07 -0500 Subject: [PATCH 04/60] add payload --- dist/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dist/index.js b/dist/index.js index e5bfd9f..44e5e90 100644 --- a/dist/index.js +++ b/dist/index.js @@ -16312,9 +16312,9 @@ function getContext() { let textToWrite = ""; yield axios .post("http://app.watermelontools.com/api/actions/getContext", { - user: github.event.pull_request.user.login, - repo: github.event.repository.name, - owner: github.event.repository.owner.login, + user: github.event.payload.pull_request.user.login, + repo: github.event.payload.repository.name, + owner: github.event.payload.repository.owner.login, commitList: "264ef7c1455b51f1cb65d4457aeaa700478c91f4", }) .then((response) => { @@ -16324,7 +16324,7 @@ function getContext() { console.log(error.message); }); yield axios - .get(github.event.pull_request.commits.href) + .get(github.event.payload.pull_request.commits.href) .then((response) => { console.log(response); }) From c8930d5d860e7dd9317d127449aac6b1b83385ff Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 12:07:18 -0500 Subject: [PATCH 05/60] print event --- getData/context.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/getData/context.ts b/getData/context.ts index e5629ba..03a074c 100644 --- a/getData/context.ts +++ b/getData/context.ts @@ -4,6 +4,7 @@ const github = require("@actions/github"); const axios = require("axios"); export default async function getContext() { let textToWrite = ""; + console.log(github.event); await axios .post("http://app.watermelontools.com/api/actions/getContext", { user: github.event.payload.pull_request.user.login, From 48e1f689d5d1bd86b296295fe3650d6cc645a42e Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 12:07:23 -0500 Subject: [PATCH 06/60] print event --- dist/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/dist/index.js b/dist/index.js index 44e5e90..5fe7a39 100644 --- a/dist/index.js +++ b/dist/index.js @@ -16310,6 +16310,7 @@ const axios = __nccwpck_require__(4158); function getContext() { return __awaiter(this, void 0, void 0, function* () { let textToWrite = ""; + console.log(github.event); yield axios .post("http://app.watermelontools.com/api/actions/getContext", { user: github.event.payload.pull_request.user.login, From 08e902f554b23c2a7aac5e47e29ca8f179a91fe6 Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 12:37:05 -0500 Subject: [PATCH 07/60] change what to print --- getData/context.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/getData/context.ts b/getData/context.ts index 03a074c..48c34dd 100644 --- a/getData/context.ts +++ b/getData/context.ts @@ -4,7 +4,7 @@ const github = require("@actions/github"); const axios = require("axios"); export default async function getContext() { let textToWrite = ""; - console.log(github.event); + console.log(github); await axios .post("http://app.watermelontools.com/api/actions/getContext", { user: github.event.payload.pull_request.user.login, From 1036431e3475dafdb1cff428208747d98e9599da Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 12:37:13 -0500 Subject: [PATCH 08/60] print all of github --- dist/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/index.js b/dist/index.js index 5fe7a39..c933ff2 100644 --- a/dist/index.js +++ b/dist/index.js @@ -16310,7 +16310,7 @@ const axios = __nccwpck_require__(4158); function getContext() { return __awaiter(this, void 0, void 0, function* () { let textToWrite = ""; - console.log(github.event); + console.log(github); yield axios .post("http://app.watermelontools.com/api/actions/getContext", { user: github.event.payload.pull_request.user.login, From dfd3b815c327a498ab5e4f60a75945569ac96cbd Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 12:38:35 -0500 Subject: [PATCH 09/60] Fix object --- getData/context.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/getData/context.ts b/getData/context.ts index 48c34dd..5e0dfd4 100644 --- a/getData/context.ts +++ b/getData/context.ts @@ -4,12 +4,11 @@ const github = require("@actions/github"); const axios = require("axios"); export default async function getContext() { let textToWrite = ""; - console.log(github); await axios .post("http://app.watermelontools.com/api/actions/getContext", { - user: github.event.payload.pull_request.user.login, - repo: github.event.payload.repository.name, - owner: github.event.payload.repository.owner.login, + user: github.payload.pull_request.user.login, + repo: github.payload.repository.name, + owner: github.payload.repository.owner.login, commitList: "264ef7c1455b51f1cb65d4457aeaa700478c91f4", }) .then((response) => { @@ -19,7 +18,7 @@ export default async function getContext() { console.log(error.message); }); await axios - .get(github.event.payload.pull_request.commits.href) + .get(github.payload.pull_request.commits.href) .then((response) => { console.log(response); }) From 81367158a71544fa15b0debcaf93afa40c39f7c2 Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 12:38:39 -0500 Subject: [PATCH 10/60] Fix object --- dist/index.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dist/index.js b/dist/index.js index c933ff2..6720544 100644 --- a/dist/index.js +++ b/dist/index.js @@ -16310,12 +16310,11 @@ const axios = __nccwpck_require__(4158); function getContext() { return __awaiter(this, void 0, void 0, function* () { let textToWrite = ""; - console.log(github); yield axios .post("http://app.watermelontools.com/api/actions/getContext", { - user: github.event.payload.pull_request.user.login, - repo: github.event.payload.repository.name, - owner: github.event.payload.repository.owner.login, + user: github.payload.pull_request.user.login, + repo: github.payload.repository.name, + owner: github.payload.repository.owner.login, commitList: "264ef7c1455b51f1cb65d4457aeaa700478c91f4", }) .then((response) => { @@ -16325,7 +16324,7 @@ function getContext() { console.log(error.message); }); yield axios - .get(github.event.payload.pull_request.commits.href) + .get(github.payload.pull_request.commits.href) .then((response) => { console.log(response); }) From e113004c0f1387d5bd866539aa2a07e4dcb6d85c Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 12:40:47 -0500 Subject: [PATCH 11/60] use context object --- getData/context.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/getData/context.ts b/getData/context.ts index 5e0dfd4..bd25686 100644 --- a/getData/context.ts +++ b/getData/context.ts @@ -6,9 +6,9 @@ export default async function getContext() { let textToWrite = ""; await axios .post("http://app.watermelontools.com/api/actions/getContext", { - user: github.payload.pull_request.user.login, - repo: github.payload.repository.name, - owner: github.payload.repository.owner.login, + user: github.context.payload.pull_request.user.login, + repo: github.context.payload.repository.name, + owner: github.context.payload.repository.owner.login, commitList: "264ef7c1455b51f1cb65d4457aeaa700478c91f4", }) .then((response) => { @@ -18,7 +18,7 @@ export default async function getContext() { console.log(error.message); }); await axios - .get(github.payload.pull_request.commits.href) + .get(github.context.payload.pull_request.commits.href) .then((response) => { console.log(response); }) From a884e1d87dcccf62db1d4b968fa4e2c4fa4bf5b7 Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 12:40:51 -0500 Subject: [PATCH 12/60] use context object --- dist/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dist/index.js b/dist/index.js index 6720544..10ea640 100644 --- a/dist/index.js +++ b/dist/index.js @@ -16312,9 +16312,9 @@ function getContext() { let textToWrite = ""; yield axios .post("http://app.watermelontools.com/api/actions/getContext", { - user: github.payload.pull_request.user.login, - repo: github.payload.repository.name, - owner: github.payload.repository.owner.login, + user: github.context.payload.pull_request.user.login, + repo: github.context.payload.repository.name, + owner: github.context.payload.repository.owner.login, commitList: "264ef7c1455b51f1cb65d4457aeaa700478c91f4", }) .then((response) => { @@ -16324,7 +16324,7 @@ function getContext() { console.log(error.message); }); yield axios - .get(github.payload.pull_request.commits.href) + .get(github.context.payload.pull_request.commits.href) .then((response) => { console.log(response); }) From c17f6e44c59c82af90d9a3bcc7dd43bd3672ca2f Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 12:42:34 -0500 Subject: [PATCH 13/60] print api reponses --- index.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/index.ts b/index.ts index 80799eb..de1ccdc 100644 --- a/index.ts +++ b/index.ts @@ -11,7 +11,9 @@ try { let getDataPromises = [getContext()]; Promise.all(getDataPromises) .then((values) => { + console.log(values); values.forEach((value) => { + console.log(value); textToWrite += value; textToWrite += "\n"; }); From 160934b3453a277a5d59334dfdc266a919aa34fe Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 12:43:09 -0500 Subject: [PATCH 14/60] print api reponses --- dist/index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dist/index.js b/dist/index.js index 10ea640..511a2d5 100644 --- a/dist/index.js +++ b/dist/index.js @@ -16345,7 +16345,9 @@ try { let getDataPromises = [getContext()]; Promise.all(getDataPromises) .then((values) => { + console.log(values); values.forEach((value) => { + console.log(value); textToWrite += value; textToWrite += "\n"; }); From 3e7425233ca456fa01d5114a6455fabfe64e20d3 Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 13:05:15 -0500 Subject: [PATCH 15/60] try writing gh data --- getData/context.ts | 15 +++++++++++++-- index.ts | 2 -- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/getData/context.ts b/getData/context.ts index bd25686..b04bf6c 100644 --- a/getData/context.ts +++ b/getData/context.ts @@ -12,7 +12,18 @@ export default async function getContext() { commitList: "264ef7c1455b51f1cb65d4457aeaa700478c91f4", }) .then((response) => { - console.log(response); + console.log("api", response.data); + textToWrite += "### GitHub PRs"; + for (let index = 0; index < response.data.items.length; index++) { + const element = response.data.items[index]; + textToWrite += `\n - [#${element.number} - ${element.title}](${element.html_url})`; + textToWrite += `\n`; + // shortcircuit to three results + if (index === 2) { + textToWrite += `and ${response.data.items.length - 3} more`; + break; + } + } }) .catch((error) => { console.log(error.message); @@ -20,7 +31,7 @@ export default async function getContext() { await axios .get(github.context.payload.pull_request.commits.href) .then((response) => { - console.log(response); + console.log("commits", response.data); }) .catch((error) => { console.log(error.message); diff --git a/index.ts b/index.ts index de1ccdc..80799eb 100644 --- a/index.ts +++ b/index.ts @@ -11,9 +11,7 @@ try { let getDataPromises = [getContext()]; Promise.all(getDataPromises) .then((values) => { - console.log(values); values.forEach((value) => { - console.log(value); textToWrite += value; textToWrite += "\n"; }); From d3885f453ebd33b8b1cdba89a324a19e3cccd0bb Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 13:05:19 -0500 Subject: [PATCH 16/60] try writing gh data --- dist/index.js | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dist/index.js b/dist/index.js index 511a2d5..7ec9f96 100644 --- a/dist/index.js +++ b/dist/index.js @@ -16318,7 +16318,18 @@ function getContext() { commitList: "264ef7c1455b51f1cb65d4457aeaa700478c91f4", }) .then((response) => { - console.log(response); + console.log("api", response.data); + textToWrite += "### GitHub PRs"; + for (let index = 0; index < response.data.items.length; index++) { + const element = response.data.items[index]; + textToWrite += `\n - [#${element.number} - ${element.title}](${element.html_url})`; + textToWrite += `\n`; + // shortcircuit to three results + if (index === 2) { + textToWrite += `and ${response.data.items.length - 3} more`; + break; + } + } }) .catch((error) => { console.log(error.message); @@ -16326,7 +16337,7 @@ function getContext() { yield axios .get(github.context.payload.pull_request.commits.href) .then((response) => { - console.log(response); + console.log("commits", response.data); }) .catch((error) => { console.log(error.message); @@ -16345,9 +16356,7 @@ try { let getDataPromises = [getContext()]; Promise.all(getDataPromises) .then((values) => { - console.log(values); values.forEach((value) => { - console.log(value); textToWrite += value; textToWrite += "\n"; }); From 324b2d19c845351682384f29a20a6ddf27a5ba90 Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 20:01:25 -0500 Subject: [PATCH 17/60] move commit list getting to start --- getData/context.ts | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/getData/context.ts b/getData/context.ts index b04bf6c..dc88860 100644 --- a/getData/context.ts +++ b/getData/context.ts @@ -4,6 +4,14 @@ const github = require("@actions/github"); const axios = require("axios"); export default async function getContext() { let textToWrite = ""; + await axios + .get(github.context.payload.pull_request.commits.href) + .then((response) => { + console.log("commits", response.data); + }) + .catch((error) => { + console.log(error.message); + }); await axios .post("http://app.watermelontools.com/api/actions/getContext", { user: github.context.payload.pull_request.user.login, @@ -28,13 +36,6 @@ export default async function getContext() { .catch((error) => { console.log(error.message); }); - await axios - .get(github.context.payload.pull_request.commits.href) - .then((response) => { - console.log("commits", response.data); - }) - .catch((error) => { - console.log(error.message); - }); + return true; } From fd229f2bf0a69f89d1a322c3adcaf44b664fce18 Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 20:02:09 -0500 Subject: [PATCH 18/60] move commit list to start --- dist/index.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dist/index.js b/dist/index.js index 7ec9f96..072ca20 100644 --- a/dist/index.js +++ b/dist/index.js @@ -16310,6 +16310,14 @@ const axios = __nccwpck_require__(4158); function getContext() { return __awaiter(this, void 0, void 0, function* () { let textToWrite = ""; + yield axios + .get(github.context.payload.pull_request.commits.href) + .then((response) => { + console.log("commits", response.data); + }) + .catch((error) => { + console.log(error.message); + }); yield axios .post("http://app.watermelontools.com/api/actions/getContext", { user: github.context.payload.pull_request.user.login, @@ -16334,14 +16342,6 @@ function getContext() { .catch((error) => { console.log(error.message); }); - yield axios - .get(github.context.payload.pull_request.commits.href) - .then((response) => { - console.log("commits", response.data); - }) - .catch((error) => { - console.log(error.message); - }); return true; }); } From 988f0b10bca5ba7084f464c97e5b2f756907e176 Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 20:04:43 -0500 Subject: [PATCH 19/60] comment out fetching --- getData/context.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/getData/context.ts b/getData/context.ts index dc88860..9824a3d 100644 --- a/getData/context.ts +++ b/getData/context.ts @@ -12,7 +12,7 @@ export default async function getContext() { .catch((error) => { console.log(error.message); }); - await axios + /* await axios .post("http://app.watermelontools.com/api/actions/getContext", { user: github.context.payload.pull_request.user.login, repo: github.context.payload.repository.name, @@ -35,7 +35,7 @@ export default async function getContext() { }) .catch((error) => { console.log(error.message); - }); + }); */ return true; } From 1b94f74cf1c6c200a978ed271c73c886a239bd3b Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 20:05:21 -0500 Subject: [PATCH 20/60] log commits url --- getData/context.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/getData/context.ts b/getData/context.ts index 9824a3d..71065c4 100644 --- a/getData/context.ts +++ b/getData/context.ts @@ -4,6 +4,7 @@ const github = require("@actions/github"); const axios = require("axios"); export default async function getContext() { let textToWrite = ""; + console.log(github.context.payload.pull_request.commits.href); await axios .get(github.context.payload.pull_request.commits.href) .then((response) => { From e3982352852f66a60c618265ae2d8196073fe6c9 Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 20:05:26 -0500 Subject: [PATCH 21/60] Update index.js --- dist/index.js | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/dist/index.js b/dist/index.js index 072ca20..5769994 100644 --- a/dist/index.js +++ b/dist/index.js @@ -16310,6 +16310,7 @@ const axios = __nccwpck_require__(4158); function getContext() { return __awaiter(this, void 0, void 0, function* () { let textToWrite = ""; + console.log(github.context.payload.pull_request.commits.href); yield axios .get(github.context.payload.pull_request.commits.href) .then((response) => { @@ -16318,30 +16319,30 @@ function getContext() { .catch((error) => { console.log(error.message); }); - yield axios - .post("http://app.watermelontools.com/api/actions/getContext", { + /* await axios + .post("http://app.watermelontools.com/api/actions/getContext", { user: github.context.payload.pull_request.user.login, repo: github.context.payload.repository.name, owner: github.context.payload.repository.owner.login, commitList: "264ef7c1455b51f1cb65d4457aeaa700478c91f4", - }) - .then((response) => { + }) + .then((response) => { console.log("api", response.data); textToWrite += "### GitHub PRs"; for (let index = 0; index < response.data.items.length; index++) { - const element = response.data.items[index]; - textToWrite += `\n - [#${element.number} - ${element.title}](${element.html_url})`; - textToWrite += `\n`; - // shortcircuit to three results - if (index === 2) { - textToWrite += `and ${response.data.items.length - 3} more`; - break; - } + const element = response.data.items[index]; + textToWrite += `\n - [#${element.number} - ${element.title}](${element.html_url})`; + textToWrite += `\n`; + // shortcircuit to three results + if (index === 2) { + textToWrite += `and ${response.data.items.length - 3} more`; + break; + } } - }) - .catch((error) => { + }) + .catch((error) => { console.log(error.message); - }); + }); */ return true; }); } From dda558c0714f369bc26828fac94f52e33eaf73d0 Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 20:07:09 -0500 Subject: [PATCH 22/60] better logging --- getData/context.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/getData/context.ts b/getData/context.ts index 71065c4..e197c4f 100644 --- a/getData/context.ts +++ b/getData/context.ts @@ -4,7 +4,7 @@ const github = require("@actions/github"); const axios = require("axios"); export default async function getContext() { let textToWrite = ""; - console.log(github.context.payload.pull_request.commits.href); + console.log("url ", github.context.payload.pull_request.commits.href); await axios .get(github.context.payload.pull_request.commits.href) .then((response) => { From ac0404e121a01ebf7b32b6f30262525cec5dba2b Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 20:07:13 -0500 Subject: [PATCH 23/60] Update index.js --- dist/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/index.js b/dist/index.js index 5769994..bcd92b8 100644 --- a/dist/index.js +++ b/dist/index.js @@ -16310,7 +16310,7 @@ const axios = __nccwpck_require__(4158); function getContext() { return __awaiter(this, void 0, void 0, function* () { let textToWrite = ""; - console.log(github.context.payload.pull_request.commits.href); + console.log("url ", github.context.payload.pull_request.commits.href); yield axios .get(github.context.payload.pull_request.commits.href) .then((response) => { From 2b4175492540c26fc4823dc8f402361c1998408b Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 20:10:32 -0500 Subject: [PATCH 24/60] log all payload --- getData/context.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/getData/context.ts b/getData/context.ts index e197c4f..e97f0b1 100644 --- a/getData/context.ts +++ b/getData/context.ts @@ -4,6 +4,7 @@ const github = require("@actions/github"); const axios = require("axios"); export default async function getContext() { let textToWrite = ""; + console.log("url ", github.context); console.log("url ", github.context.payload.pull_request.commits.href); await axios .get(github.context.payload.pull_request.commits.href) From ca4cad847bd4f915a975467bd5eaa2492f98627d Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 20:10:35 -0500 Subject: [PATCH 25/60] Update index.js --- dist/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/dist/index.js b/dist/index.js index bcd92b8..281def8 100644 --- a/dist/index.js +++ b/dist/index.js @@ -16310,6 +16310,7 @@ const axios = __nccwpck_require__(4158); function getContext() { return __awaiter(this, void 0, void 0, function* () { let textToWrite = ""; + console.log("url ", github.context); console.log("url ", github.context.payload.pull_request.commits.href); yield axios .get(github.context.payload.pull_request.commits.href) From e65f86976c0577324cf5d0deadd13bd057c7abed Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 20:12:50 -0500 Subject: [PATCH 26/60] fix link to call --- getData/context.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/getData/context.ts b/getData/context.ts index e97f0b1..01aa25b 100644 --- a/getData/context.ts +++ b/getData/context.ts @@ -4,10 +4,9 @@ const github = require("@actions/github"); const axios = require("axios"); export default async function getContext() { let textToWrite = ""; - console.log("url ", github.context); - console.log("url ", github.context.payload.pull_request.commits.href); + console.log("url ", github.context.payload.pull_request._links.commits.href); await axios - .get(github.context.payload.pull_request.commits.href) + .get(github.context.payload.pull_request._links.commits.href) .then((response) => { console.log("commits", response.data); }) From 0e0dc76ccf2c2478e7cb68f0e252b2e4de13da0d Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 20:12:54 -0500 Subject: [PATCH 27/60] Update index.js --- dist/index.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dist/index.js b/dist/index.js index 281def8..16bfa94 100644 --- a/dist/index.js +++ b/dist/index.js @@ -16310,10 +16310,9 @@ const axios = __nccwpck_require__(4158); function getContext() { return __awaiter(this, void 0, void 0, function* () { let textToWrite = ""; - console.log("url ", github.context); - console.log("url ", github.context.payload.pull_request.commits.href); + console.log("url ", github.context.payload.pull_request._links.commits.href); yield axios - .get(github.context.payload.pull_request.commits.href) + .get(github.context.payload.pull_request._links.commits.href) .then((response) => { console.log("commits", response.data); }) From a40b518ab1f58d603e6ac73300a1aadcef7c5d1e Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 20:21:39 -0500 Subject: [PATCH 28/60] add back commit list --- getData/context.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/getData/context.ts b/getData/context.ts index 01aa25b..7ed5d44 100644 --- a/getData/context.ts +++ b/getData/context.ts @@ -5,23 +5,25 @@ const axios = require("axios"); export default async function getContext() { let textToWrite = ""; console.log("url ", github.context.payload.pull_request._links.commits.href); + let commitList = []; await axios .get(github.context.payload.pull_request._links.commits.href) .then((response) => { - console.log("commits", response.data); + for (let index = 0; index < response.data.length; index++) { + commitList.push(response.data[index].sha); + } }) .catch((error) => { console.log(error.message); }); - /* await axios + await axios .post("http://app.watermelontools.com/api/actions/getContext", { user: github.context.payload.pull_request.user.login, repo: github.context.payload.repository.name, owner: github.context.payload.repository.owner.login, - commitList: "264ef7c1455b51f1cb65d4457aeaa700478c91f4", + commitList, }) .then((response) => { - console.log("api", response.data); textToWrite += "### GitHub PRs"; for (let index = 0; index < response.data.items.length; index++) { const element = response.data.items[index]; @@ -36,7 +38,7 @@ export default async function getContext() { }) .catch((error) => { console.log(error.message); - }); */ + }); return true; } From 6eefec7ef2e46adc25cd1a0f0de9a01cd946f0da Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 20:21:49 -0500 Subject: [PATCH 29/60] Update index.js --- dist/index.js | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/dist/index.js b/dist/index.js index 16bfa94..912b42a 100644 --- a/dist/index.js +++ b/dist/index.js @@ -16311,38 +16311,40 @@ function getContext() { return __awaiter(this, void 0, void 0, function* () { let textToWrite = ""; console.log("url ", github.context.payload.pull_request._links.commits.href); + let commitList = []; yield axios .get(github.context.payload.pull_request._links.commits.href) .then((response) => { - console.log("commits", response.data); + for (let index = 0; index < response.data.length; index++) { + commitList.push(response.data[index].sha); + } }) .catch((error) => { console.log(error.message); }); - /* await axios - .post("http://app.watermelontools.com/api/actions/getContext", { + yield axios + .post("http://app.watermelontools.com/api/actions/getContext", { user: github.context.payload.pull_request.user.login, repo: github.context.payload.repository.name, owner: github.context.payload.repository.owner.login, - commitList: "264ef7c1455b51f1cb65d4457aeaa700478c91f4", - }) - .then((response) => { - console.log("api", response.data); + commitList, + }) + .then((response) => { textToWrite += "### GitHub PRs"; for (let index = 0; index < response.data.items.length; index++) { - const element = response.data.items[index]; - textToWrite += `\n - [#${element.number} - ${element.title}](${element.html_url})`; - textToWrite += `\n`; - // shortcircuit to three results - if (index === 2) { - textToWrite += `and ${response.data.items.length - 3} more`; - break; - } + const element = response.data.items[index]; + textToWrite += `\n - [#${element.number} - ${element.title}](${element.html_url})`; + textToWrite += `\n`; + // shortcircuit to three results + if (index === 2) { + textToWrite += `and ${response.data.items.length - 3} more`; + break; + } } - }) - .catch((error) => { + }) + .catch((error) => { console.log(error.message); - }); */ + }); return true; }); } From 8bc7bb039ba3627a41d7c80aa8a35ccaf2ef004f Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 20:36:25 -0500 Subject: [PATCH 30/60] encode commit list --- getData/context.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/getData/context.ts b/getData/context.ts index 7ed5d44..f6e2fd6 100644 --- a/getData/context.ts +++ b/getData/context.ts @@ -21,7 +21,7 @@ export default async function getContext() { user: github.context.payload.pull_request.user.login, repo: github.context.payload.repository.name, owner: github.context.payload.repository.owner.login, - commitList, + commitList: encodeURIComponent(commitList.toString()), }) .then((response) => { textToWrite += "### GitHub PRs"; From 1318be72f814a167ad67f4fa4023adf3a6f16ba0 Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 20:36:33 -0500 Subject: [PATCH 31/60] Update index.js --- dist/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/index.js b/dist/index.js index 912b42a..fa8eda8 100644 --- a/dist/index.js +++ b/dist/index.js @@ -16327,7 +16327,7 @@ function getContext() { user: github.context.payload.pull_request.user.login, repo: github.context.payload.repository.name, owner: github.context.payload.repository.owner.login, - commitList, + commitList: encodeURIComponent(commitList.toString()), }) .then((response) => { textToWrite += "### GitHub PRs"; From fb0f5c20372317747f5c5267309ec705d2bd7fa6 Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 20:42:08 -0500 Subject: [PATCH 32/60] remove unused imports --- index.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/index.ts b/index.ts index 80799eb..447e41e 100644 --- a/index.ts +++ b/index.ts @@ -1,7 +1,4 @@ import getContext from "./getData/context"; -import getGithub from "./getData/github"; -import getJira from "./getData/jira"; -import getSlack from "./getData/slack"; const core = require("@actions/core"); const github = require("@actions/github"); From b4a9c72ebb3ce463501638e2d2d175e4d0599a59 Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 20:42:18 -0500 Subject: [PATCH 33/60] return text --- getData/context.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/getData/context.ts b/getData/context.ts index f6e2fd6..aa683b0 100644 --- a/getData/context.ts +++ b/getData/context.ts @@ -16,6 +16,7 @@ export default async function getContext() { .catch((error) => { console.log(error.message); }); + console.log("clist length", commitList.length); await axios .post("http://app.watermelontools.com/api/actions/getContext", { user: github.context.payload.pull_request.user.login, @@ -40,5 +41,5 @@ export default async function getContext() { console.log(error.message); }); - return true; + return textToWrite; } From 544ef4869b6e237372b2b4ce2703695d5bb66035 Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 20:42:29 -0500 Subject: [PATCH 34/60] Update index.js --- dist/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dist/index.js b/dist/index.js index fa8eda8..8a149f2 100644 --- a/dist/index.js +++ b/dist/index.js @@ -16322,6 +16322,7 @@ function getContext() { .catch((error) => { console.log(error.message); }); + console.log("clist length", commitList.length); yield axios .post("http://app.watermelontools.com/api/actions/getContext", { user: github.context.payload.pull_request.user.login, @@ -16345,7 +16346,7 @@ function getContext() { .catch((error) => { console.log(error.message); }); - return true; + return textToWrite; }); } From e77468aeb27bb6520e0b9356895db9d4096722da Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 20:53:54 -0500 Subject: [PATCH 35/60] log all params --- getData/context.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/getData/context.ts b/getData/context.ts index aa683b0..08cae8c 100644 --- a/getData/context.ts +++ b/getData/context.ts @@ -16,7 +16,14 @@ export default async function getContext() { .catch((error) => { console.log(error.message); }); - console.log("clist length", commitList.length); + console.log({ + user: github.context.payload.pull_request.user.login, + repo: github.context.payload.repository.name, + owner: github.context.payload.repository.owner.login, + commitList: encodeURIComponent(commitList.toString()), + }); + console.log(commitList); + await axios .post("http://app.watermelontools.com/api/actions/getContext", { user: github.context.payload.pull_request.user.login, From 41191b57c23d5f3e722092054048380224af7cdf Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 20:54:00 -0500 Subject: [PATCH 36/60] Update index.js --- dist/index.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dist/index.js b/dist/index.js index 8a149f2..b8c4d95 100644 --- a/dist/index.js +++ b/dist/index.js @@ -16322,7 +16322,13 @@ function getContext() { .catch((error) => { console.log(error.message); }); - console.log("clist length", commitList.length); + console.log({ + user: github.context.payload.pull_request.user.login, + repo: github.context.payload.repository.name, + owner: github.context.payload.repository.owner.login, + commitList: encodeURIComponent(commitList.toString()), + }); + console.log(commitList); yield axios .post("http://app.watermelontools.com/api/actions/getContext", { user: github.context.payload.pull_request.user.login, From 6c98dc5947dfcde6c1a575e649d48e66e665dc00 Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 21:07:19 -0500 Subject: [PATCH 37/60] max commits to 20 in 6 chars --- getData/context.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/getData/context.ts b/getData/context.ts index 08cae8c..3c8cd76 100644 --- a/getData/context.ts +++ b/getData/context.ts @@ -10,7 +10,8 @@ export default async function getContext() { .get(github.context.payload.pull_request._links.commits.href) .then((response) => { for (let index = 0; index < response.data.length; index++) { - commitList.push(response.data[index].sha); + commitList.push(response.data[index].sha.slice(0, 5)); + if (index > 20) break; } }) .catch((error) => { From 5f829dff40720d5044b30e104311e18c9322ba90 Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 14 Mar 2023 21:07:23 -0500 Subject: [PATCH 38/60] Update index.js --- dist/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dist/index.js b/dist/index.js index b8c4d95..7734330 100644 --- a/dist/index.js +++ b/dist/index.js @@ -16316,7 +16316,9 @@ function getContext() { .get(github.context.payload.pull_request._links.commits.href) .then((response) => { for (let index = 0; index < response.data.length; index++) { - commitList.push(response.data[index].sha); + commitList.push(response.data[index].sha.slice(0, 5)); + if (index > 20) + break; } }) .catch((error) => { From 9200b97c7445c518e9e236bb7a25a32a33b02c8b Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Wed, 15 Mar 2023 11:03:58 -0500 Subject: [PATCH 39/60] Send message instead of sha --- getData/context.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/getData/context.ts b/getData/context.ts index 3c8cd76..8c98633 100644 --- a/getData/context.ts +++ b/getData/context.ts @@ -10,8 +10,7 @@ export default async function getContext() { .get(github.context.payload.pull_request._links.commits.href) .then((response) => { for (let index = 0; index < response.data.length; index++) { - commitList.push(response.data[index].sha.slice(0, 5)); - if (index > 20) break; + commitList.push(response.data[index].commit.message); } }) .catch((error) => { @@ -21,7 +20,7 @@ export default async function getContext() { user: github.context.payload.pull_request.user.login, repo: github.context.payload.repository.name, owner: github.context.payload.repository.owner.login, - commitList: encodeURIComponent(commitList.toString()), + commitList, }); console.log(commitList); @@ -30,7 +29,7 @@ export default async function getContext() { user: github.context.payload.pull_request.user.login, repo: github.context.payload.repository.name, owner: github.context.payload.repository.owner.login, - commitList: encodeURIComponent(commitList.toString()), + commitList: commitList.toString(), }) .then((response) => { textToWrite += "### GitHub PRs"; From 785176942ae3c1ed98aecbe751abb1ab8e1afc21 Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Wed, 15 Mar 2023 11:04:01 -0500 Subject: [PATCH 40/60] Update index.js --- dist/index.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dist/index.js b/dist/index.js index 7734330..e5313ba 100644 --- a/dist/index.js +++ b/dist/index.js @@ -16316,9 +16316,7 @@ function getContext() { .get(github.context.payload.pull_request._links.commits.href) .then((response) => { for (let index = 0; index < response.data.length; index++) { - commitList.push(response.data[index].sha.slice(0, 5)); - if (index > 20) - break; + commitList.push(response.data[index].commit.message); } }) .catch((error) => { @@ -16328,7 +16326,7 @@ function getContext() { user: github.context.payload.pull_request.user.login, repo: github.context.payload.repository.name, owner: github.context.payload.repository.owner.login, - commitList: encodeURIComponent(commitList.toString()), + commitList, }); console.log(commitList); yield axios @@ -16336,7 +16334,7 @@ function getContext() { user: github.context.payload.pull_request.user.login, repo: github.context.payload.repository.name, owner: github.context.payload.repository.owner.login, - commitList: encodeURIComponent(commitList.toString()), + commitList: commitList.toString(), }) .then((response) => { textToWrite += "### GitHub PRs"; From 6fa0bf126589846644be5f7ea456fdf9b7f3355c Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Wed, 15 Mar 2023 11:58:10 -0500 Subject: [PATCH 41/60] Send title and body --- getData/context.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/getData/context.ts b/getData/context.ts index 8c98633..ec54743 100644 --- a/getData/context.ts +++ b/getData/context.ts @@ -21,6 +21,8 @@ export default async function getContext() { repo: github.context.payload.repository.name, owner: github.context.payload.repository.owner.login, commitList, + title: github.context.payload.pull_request.title, + body: github.context.payload.pull_request.body, }); console.log(commitList); From dc639a31493adac1778a0d3de466f5edbda9f991 Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Wed, 15 Mar 2023 11:58:16 -0500 Subject: [PATCH 42/60] Update index.js --- dist/index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dist/index.js b/dist/index.js index e5313ba..e207eb6 100644 --- a/dist/index.js +++ b/dist/index.js @@ -16327,6 +16327,8 @@ function getContext() { repo: github.context.payload.repository.name, owner: github.context.payload.repository.owner.login, commitList, + title: github.context.payload.pull_request.title, + body: github.context.payload.pull_request.body, }); console.log(commitList); yield axios From 6fb01b86ce045fbdda42ac1a57296d5acdb0d6dd Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Wed, 15 Mar 2023 12:02:02 -0500 Subject: [PATCH 43/60] Send title and body to backend --- getData/context.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/getData/context.ts b/getData/context.ts index ec54743..821f2fc 100644 --- a/getData/context.ts +++ b/getData/context.ts @@ -32,6 +32,8 @@ export default async function getContext() { repo: github.context.payload.repository.name, owner: github.context.payload.repository.owner.login, commitList: commitList.toString(), + title: github.context.payload.pull_request.title, + body: github.context.payload.pull_request.body, }) .then((response) => { textToWrite += "### GitHub PRs"; From a05613c30cc45f8f6c204f0164e9250fad1126df Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Wed, 15 Mar 2023 12:02:04 -0500 Subject: [PATCH 44/60] Update index.js --- dist/index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dist/index.js b/dist/index.js index e207eb6..23265ec 100644 --- a/dist/index.js +++ b/dist/index.js @@ -16337,6 +16337,8 @@ function getContext() { repo: github.context.payload.repository.name, owner: github.context.payload.repository.owner.login, commitList: commitList.toString(), + title: github.context.payload.pull_request.title, + body: github.context.payload.pull_request.body, }) .then((response) => { textToWrite += "### GitHub PRs"; From 579ecb10190e6bad32e5d65e6a2970f2e9d6cae0 Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Wed, 15 Mar 2023 12:57:36 -0500 Subject: [PATCH 45/60] Remove unused functions --- getData/context.ts | 47 +++++++++++++++++++++++++++++++++++----------- getData/github.ts | 28 --------------------------- getData/jira.ts | 26 ------------------------- getData/slack.ts | 38 ------------------------------------- 4 files changed, 36 insertions(+), 103 deletions(-) delete mode 100644 getData/github.ts delete mode 100644 getData/jira.ts delete mode 100644 getData/slack.ts diff --git a/getData/context.ts b/getData/context.ts index 821f2fc..82d9dab 100644 --- a/getData/context.ts +++ b/getData/context.ts @@ -14,17 +14,8 @@ export default async function getContext() { } }) .catch((error) => { - console.log(error.message); + console.error(error.message); }); - console.log({ - user: github.context.payload.pull_request.user.login, - repo: github.context.payload.repository.name, - owner: github.context.payload.repository.owner.login, - commitList, - title: github.context.payload.pull_request.title, - body: github.context.payload.pull_request.body, - }); - console.log(commitList); await axios .post("http://app.watermelontools.com/api/actions/getContext", { @@ -47,9 +38,43 @@ export default async function getContext() { break; } } + textToWrite += "### Jira Tickets"; + for (let index = 0; index < response.data.length; index++) { + const element = response.data[index]; + textToWrite += `\n - [${element.key} - ${element.fields.summary}](${element.serverInfo.baseUrl}/browse/${element.key})`; + textToWrite += `\n`; + // shortcircuit to three results + if (index === 2) { + textToWrite += `and ${response.data.length - 3} more`; + break; + } + } + textToWrite += "### Slack Threads"; + for ( + let index = 0; + index < response.data.messages.matches.length; + index++ + ) { + const element = response.data.messages.matches[index]; + textToWrite += `\n - [#${element.channel.name} - ${ + element.username + }\n ${ + element.text.length > 100 + ? element.text.substring(0, 100) + "..." + : element.text + }](${element.permalink})`; + textToWrite += `\n`; + // shortcircuit to three results + if (index === 2) { + textToWrite += `and ${ + response.data.messages.matches.length - 3 + } more`; + break; + } + } }) .catch((error) => { - console.log(error.message); + console.error(error.message); }); return textToWrite; diff --git a/getData/github.ts b/getData/github.ts deleted file mode 100644 index 4eb94bd..0000000 --- a/getData/github.ts +++ /dev/null @@ -1,28 +0,0 @@ -const axios = require("axios"); -export default async function getGithub() { - let textToWrite = ""; - await axios - .post("http://app.watermelontools.com/api/github/getIssuesByCommits", { - user: "estebandalelr@gmail.com", - repo: "watermelon", - owner: "watermelontools", - commitList: "264ef7c1455b51f1cb65d4457aeaa700478c91f4", - }) - .then((response) => { - textToWrite += "### GitHub PRs"; - for (let index = 0; index < response.data.items.length; index++) { - const element = response.data.items[index]; - textToWrite += `\n - [#${element.number} - ${element.title}](${element.html_url})`; - textToWrite += `\n`; - // shortcircuit to three results - if (index === 2) { - textToWrite += `and ${response.data.items.length - 3} more`; - break; - } - } - }) - .catch((error) => { - console.log(error.message); - }); - return textToWrite; -} diff --git a/getData/jira.ts b/getData/jira.ts deleted file mode 100644 index a982fb8..0000000 --- a/getData/jira.ts +++ /dev/null @@ -1,26 +0,0 @@ -const axios = require("axios"); -export default async function getJira() { - let textToWrite = ""; - await axios - .post("http://app.watermelontools.com/api/jira/getMostRelevantJiraTicket", { - user: "estebandalelr@gmail.com", - prTitle: "WM-49: Create payments success page", - }) - .then((response) => { - textToWrite += "### Jira Tickets"; - for (let index = 0; index < response.data.length; index++) { - const element = response.data[index]; - textToWrite += `\n - [${element.key} - ${element.fields.summary}](${element.serverInfo.baseUrl}/browse/${element.key})`; - textToWrite += `\n`; - // shortcircuit to three results - if (index === 2) { - textToWrite += `and ${response.data.length - 3} more`; - break; - } - } - }) - .catch((error) => { - console.log(error.message); - }); - return textToWrite; -} diff --git a/getData/slack.ts b/getData/slack.ts deleted file mode 100644 index fe9b3fb..0000000 --- a/getData/slack.ts +++ /dev/null @@ -1,38 +0,0 @@ -const axios = require("axios"); -export default async function getSlack() { - let textToWrite = ""; - await axios - .post("http://app.watermelontools.com/api/slack/searchMessagesByText", { - user: "estebandalelr@gmail.com", - text: "action github", - }) - .then((response) => { - textToWrite += "### Slack Threads"; - for ( - let index = 0; - index < response.data.messages.matches.length; - index++ - ) { - const element = response.data.messages.matches[index]; - textToWrite += `\n - [#${element.channel.name} - ${ - element.username - }\n ${ - element.text.length > 100 - ? element.text.substring(0, 100) + "..." - : element.text - }](${element.permalink})`; - textToWrite += `\n`; - // shortcircuit to three results - if (index === 2) { - textToWrite += `and ${ - response.data.messages.matches.length - 3 - } more`; - break; - } - } - }) - .catch((error) => { - console.log(error.message); - }); - return textToWrite; -} From 20b844e467b7e00dc1dc9ffba26daeabfed8b34c Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Wed, 15 Mar 2023 13:00:01 -0500 Subject: [PATCH 46/60] fix objects --- getData/context.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/getData/context.ts b/getData/context.ts index 82d9dab..5e3e06c 100644 --- a/getData/context.ts +++ b/getData/context.ts @@ -28,34 +28,34 @@ export default async function getContext() { }) .then((response) => { textToWrite += "### GitHub PRs"; - for (let index = 0; index < response.data.items.length; index++) { - const element = response.data.items[index]; + for (let index = 0; index < response.data.ghValue.items.length; index++) { + const element = response.data.ghValue.items[index]; textToWrite += `\n - [#${element.number} - ${element.title}](${element.html_url})`; textToWrite += `\n`; // shortcircuit to three results if (index === 2) { - textToWrite += `and ${response.data.items.length - 3} more`; + textToWrite += `and ${response.data.ghValue.items.length - 3} more`; break; } } textToWrite += "### Jira Tickets"; - for (let index = 0; index < response.data.length; index++) { - const element = response.data[index]; + for (let index = 0; index < response.data.jiraValue.length; index++) { + const element = response.data.jiraValue[index]; textToWrite += `\n - [${element.key} - ${element.fields.summary}](${element.serverInfo.baseUrl}/browse/${element.key})`; textToWrite += `\n`; // shortcircuit to three results if (index === 2) { - textToWrite += `and ${response.data.length - 3} more`; + textToWrite += `and ${response.data.jiraValue.length - 3} more`; break; } } textToWrite += "### Slack Threads"; for ( let index = 0; - index < response.data.messages.matches.length; + index < response.data.slackValue.messages.matches.length; index++ ) { - const element = response.data.messages.matches[index]; + const element = response.data.slackValue.messages.matches[index]; textToWrite += `\n - [#${element.channel.name} - ${ element.username }\n ${ @@ -67,7 +67,7 @@ export default async function getContext() { // shortcircuit to three results if (index === 2) { textToWrite += `and ${ - response.data.messages.matches.length - 3 + response.data.slackValue.messages.matches.length - 3 } more`; break; } From 4e609d0c286deaf16df54da5bd70da9b337a024b Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Wed, 15 Mar 2023 13:03:33 -0500 Subject: [PATCH 47/60] Added conditional for not logged in --- getData/context.ts | 64 ++++++++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 28 deletions(-) diff --git a/getData/context.ts b/getData/context.ts index 5e3e06c..acb6e19 100644 --- a/getData/context.ts +++ b/getData/context.ts @@ -39,37 +39,45 @@ export default async function getContext() { } } textToWrite += "### Jira Tickets"; - for (let index = 0; index < response.data.jiraValue.length; index++) { - const element = response.data.jiraValue[index]; - textToWrite += `\n - [${element.key} - ${element.fields.summary}](${element.serverInfo.baseUrl}/browse/${element.key})`; - textToWrite += `\n`; - // shortcircuit to three results - if (index === 2) { - textToWrite += `and ${response.data.jiraValue.length - 3} more`; - break; + if (response.data.jiraValue.error === "no jira token") { + textToWrite += `\n [Click here to login to Jira](https://app.watermelontools.com)`; + } else { + for (let index = 0; index < response.data.jiraValue.length; index++) { + const element = response.data.jiraValue[index]; + textToWrite += `\n - [${element.key} - ${element.fields.summary}](${element.serverInfo.baseUrl}/browse/${element.key})`; + textToWrite += `\n`; + // shortcircuit to three results + if (index === 2) { + textToWrite += `and ${response.data.jiraValue.length - 3} more`; + break; + } } } textToWrite += "### Slack Threads"; - for ( - let index = 0; - index < response.data.slackValue.messages.matches.length; - index++ - ) { - const element = response.data.slackValue.messages.matches[index]; - textToWrite += `\n - [#${element.channel.name} - ${ - element.username - }\n ${ - element.text.length > 100 - ? element.text.substring(0, 100) + "..." - : element.text - }](${element.permalink})`; - textToWrite += `\n`; - // shortcircuit to three results - if (index === 2) { - textToWrite += `and ${ - response.data.slackValue.messages.matches.length - 3 - } more`; - break; + if (response.data.slackValue.error === "no slack token") { + textToWrite += `\n [Click here to login to Slack](https://app.watermelontools.com)`; + } else { + for ( + let index = 0; + index < response.data.slackValue.messages.matches.length; + index++ + ) { + const element = response.data.slackValue.messages.matches[index]; + textToWrite += `\n - [#${element.channel.name} - ${ + element.username + }\n ${ + element.text.length > 100 + ? element.text.substring(0, 100) + "..." + : element.text + }](${element.permalink})`; + textToWrite += `\n`; + // shortcircuit to three results + if (index === 2) { + textToWrite += `and ${ + response.data.slackValue.messages.matches.length - 3 + } more`; + break; + } } } }) From dd644d3288a0ee8c1c5e4728b51c3617fcf70a2d Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Wed, 15 Mar 2023 13:03:39 -0500 Subject: [PATCH 48/60] Update index.js --- dist/index.js | 53 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 39 insertions(+), 14 deletions(-) diff --git a/dist/index.js b/dist/index.js index 23265ec..6c73989 100644 --- a/dist/index.js +++ b/dist/index.js @@ -16320,17 +16320,8 @@ function getContext() { } }) .catch((error) => { - console.log(error.message); + console.error(error.message); }); - console.log({ - user: github.context.payload.pull_request.user.login, - repo: github.context.payload.repository.name, - owner: github.context.payload.repository.owner.login, - commitList, - title: github.context.payload.pull_request.title, - body: github.context.payload.pull_request.body, - }); - console.log(commitList); yield axios .post("http://app.watermelontools.com/api/actions/getContext", { user: github.context.payload.pull_request.user.login, @@ -16342,19 +16333,53 @@ function getContext() { }) .then((response) => { textToWrite += "### GitHub PRs"; - for (let index = 0; index < response.data.items.length; index++) { - const element = response.data.items[index]; + for (let index = 0; index < response.data.ghValue.items.length; index++) { + const element = response.data.ghValue.items[index]; textToWrite += `\n - [#${element.number} - ${element.title}](${element.html_url})`; textToWrite += `\n`; // shortcircuit to three results if (index === 2) { - textToWrite += `and ${response.data.items.length - 3} more`; + textToWrite += `and ${response.data.ghValue.items.length - 3} more`; break; } } + textToWrite += "### Jira Tickets"; + if (response.data.jiraValue.error === "no jira token") { + textToWrite += `\n [Click here to login to Jira](https://app.watermelontools.com)`; + } + else { + for (let index = 0; index < response.data.jiraValue.length; index++) { + const element = response.data.jiraValue[index]; + textToWrite += `\n - [${element.key} - ${element.fields.summary}](${element.serverInfo.baseUrl}/browse/${element.key})`; + textToWrite += `\n`; + // shortcircuit to three results + if (index === 2) { + textToWrite += `and ${response.data.jiraValue.length - 3} more`; + break; + } + } + } + textToWrite += "### Slack Threads"; + if (response.data.slackValue.error === "no slack token") { + textToWrite += `\n [Click here to login to Slack](https://app.watermelontools.com)`; + } + else { + for (let index = 0; index < response.data.slackValue.messages.matches.length; index++) { + const element = response.data.slackValue.messages.matches[index]; + textToWrite += `\n - [#${element.channel.name} - ${element.username}\n ${element.text.length > 100 + ? element.text.substring(0, 100) + "..." + : element.text}](${element.permalink})`; + textToWrite += `\n`; + // shortcircuit to three results + if (index === 2) { + textToWrite += `and ${response.data.slackValue.messages.matches.length - 3} more`; + break; + } + } + } }) .catch((error) => { - console.log(error.message); + console.error(error.message); }); return textToWrite; }); From 5465d745b03d5c2baf50fbc90a1adddea77aa769 Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Wed, 15 Mar 2023 13:07:10 -0500 Subject: [PATCH 49/60] Fix item --- getData/context.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/getData/context.ts b/getData/context.ts index acb6e19..ea54ea2 100644 --- a/getData/context.ts +++ b/getData/context.ts @@ -4,12 +4,11 @@ const github = require("@actions/github"); const axios = require("axios"); export default async function getContext() { let textToWrite = ""; - console.log("url ", github.context.payload.pull_request._links.commits.href); let commitList = []; await axios .get(github.context.payload.pull_request._links.commits.href) .then((response) => { - for (let index = 0; index < response.data.length; index++) { + for (let index = 0; index < response?.data?.length; index++) { commitList.push(response.data[index].commit.message); } }) @@ -28,13 +27,13 @@ export default async function getContext() { }) .then((response) => { textToWrite += "### GitHub PRs"; - for (let index = 0; index < response.data.ghValue.items.length; index++) { - const element = response.data.ghValue.items[index]; + for (let index = 0; index < response.data?.ghValue?.length; index++) { + const element = response.data.ghValue[index]; textToWrite += `\n - [#${element.number} - ${element.title}](${element.html_url})`; textToWrite += `\n`; // shortcircuit to three results if (index === 2) { - textToWrite += `and ${response.data.ghValue.items.length - 3} more`; + textToWrite += `and ${response.data.ghValue.length - 3} more`; break; } } From 7c44caf289c0eb4654f0e7ef41e70031af29bfa9 Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Wed, 15 Mar 2023 13:07:12 -0500 Subject: [PATCH 50/60] Update index.js --- dist/index.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dist/index.js b/dist/index.js index 6c73989..df9458a 100644 --- a/dist/index.js +++ b/dist/index.js @@ -16310,12 +16310,12 @@ const axios = __nccwpck_require__(4158); function getContext() { return __awaiter(this, void 0, void 0, function* () { let textToWrite = ""; - console.log("url ", github.context.payload.pull_request._links.commits.href); let commitList = []; yield axios .get(github.context.payload.pull_request._links.commits.href) .then((response) => { - for (let index = 0; index < response.data.length; index++) { + var _a; + for (let index = 0; index < ((_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.length); index++) { commitList.push(response.data[index].commit.message); } }) @@ -16332,14 +16332,15 @@ function getContext() { body: github.context.payload.pull_request.body, }) .then((response) => { + var _a, _b; textToWrite += "### GitHub PRs"; - for (let index = 0; index < response.data.ghValue.items.length; index++) { - const element = response.data.ghValue.items[index]; + for (let index = 0; index < ((_b = (_a = response.data) === null || _a === void 0 ? void 0 : _a.ghValue) === null || _b === void 0 ? void 0 : _b.length); index++) { + const element = response.data.ghValue[index]; textToWrite += `\n - [#${element.number} - ${element.title}](${element.html_url})`; textToWrite += `\n`; // shortcircuit to three results if (index === 2) { - textToWrite += `and ${response.data.ghValue.items.length - 3} more`; + textToWrite += `and ${response.data.ghValue.length - 3} more`; break; } } From bf50b37e4c912150929e0c281d3aed0f61c82f3f Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Wed, 15 Mar 2023 13:09:49 -0500 Subject: [PATCH 51/60] Add length checking --- getData/context.ts | 64 ++++++++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 28 deletions(-) diff --git a/getData/context.ts b/getData/context.ts index ea54ea2..893bacd 100644 --- a/getData/context.ts +++ b/getData/context.ts @@ -41,42 +41,50 @@ export default async function getContext() { if (response.data.jiraValue.error === "no jira token") { textToWrite += `\n [Click here to login to Jira](https://app.watermelontools.com)`; } else { - for (let index = 0; index < response.data.jiraValue.length; index++) { - const element = response.data.jiraValue[index]; - textToWrite += `\n - [${element.key} - ${element.fields.summary}](${element.serverInfo.baseUrl}/browse/${element.key})`; - textToWrite += `\n`; - // shortcircuit to three results - if (index === 2) { - textToWrite += `and ${response.data.jiraValue.length - 3} more`; - break; + if (response?.data?.jiraValue?.length) { + for (let index = 0; index < response.data.jiraValue.length; index++) { + const element = response.data.jiraValue[index]; + textToWrite += `\n - [${element.key} - ${element.fields.summary}](${element.serverInfo.baseUrl}/browse/${element.key})`; + textToWrite += `\n`; + // shortcircuit to three results + if (index === 2) { + textToWrite += `and ${response.data.jiraValue.length - 3} more`; + break; + } } + } else { + textToWrite += `\n No results found :(`; } } textToWrite += "### Slack Threads"; if (response.data.slackValue.error === "no slack token") { textToWrite += `\n [Click here to login to Slack](https://app.watermelontools.com)`; } else { - for ( - let index = 0; - index < response.data.slackValue.messages.matches.length; - index++ - ) { - const element = response.data.slackValue.messages.matches[index]; - textToWrite += `\n - [#${element.channel.name} - ${ - element.username - }\n ${ - element.text.length > 100 - ? element.text.substring(0, 100) + "..." - : element.text - }](${element.permalink})`; - textToWrite += `\n`; - // shortcircuit to three results - if (index === 2) { - textToWrite += `and ${ - response.data.slackValue.messages.matches.length - 3 - } more`; - break; + if (response?.data?.slackValue?.messages?.matches?.length) { + for ( + let index = 0; + index < response.data.slackValue.messages.matches.length; + index++ + ) { + const element = response.data.slackValue.messages.matches[index]; + textToWrite += `\n - [#${element.channel.name} - ${ + element.username + }\n ${ + element.text.length > 100 + ? element.text.substring(0, 100) + "..." + : element.text + }](${element.permalink})`; + textToWrite += `\n`; + // shortcircuit to three results + if (index === 2) { + textToWrite += `and ${ + response.data.slackValue.messages.matches.length - 3 + } more`; + break; + } } + } else { + textToWrite += `\n No results found :(`; } } }) From e28e4b023becf10b7a7028a584dadf7c25d999e3 Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Wed, 15 Mar 2023 13:09:52 -0500 Subject: [PATCH 52/60] Update index.js --- dist/index.js | 48 +++++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/dist/index.js b/dist/index.js index df9458a..8941ba2 100644 --- a/dist/index.js +++ b/dist/index.js @@ -16332,7 +16332,7 @@ function getContext() { body: github.context.payload.pull_request.body, }) .then((response) => { - var _a, _b; + var _a, _b, _c, _d, _e, _f, _g, _h; textToWrite += "### GitHub PRs"; for (let index = 0; index < ((_b = (_a = response.data) === null || _a === void 0 ? void 0 : _a.ghValue) === null || _b === void 0 ? void 0 : _b.length); index++) { const element = response.data.ghValue[index]; @@ -16349,34 +16349,44 @@ function getContext() { textToWrite += `\n [Click here to login to Jira](https://app.watermelontools.com)`; } else { - for (let index = 0; index < response.data.jiraValue.length; index++) { - const element = response.data.jiraValue[index]; - textToWrite += `\n - [${element.key} - ${element.fields.summary}](${element.serverInfo.baseUrl}/browse/${element.key})`; - textToWrite += `\n`; - // shortcircuit to three results - if (index === 2) { - textToWrite += `and ${response.data.jiraValue.length - 3} more`; - break; + if ((_d = (_c = response === null || response === void 0 ? void 0 : response.data) === null || _c === void 0 ? void 0 : _c.jiraValue) === null || _d === void 0 ? void 0 : _d.length) { + for (let index = 0; index < response.data.jiraValue.length; index++) { + const element = response.data.jiraValue[index]; + textToWrite += `\n - [${element.key} - ${element.fields.summary}](${element.serverInfo.baseUrl}/browse/${element.key})`; + textToWrite += `\n`; + // shortcircuit to three results + if (index === 2) { + textToWrite += `and ${response.data.jiraValue.length - 3} more`; + break; + } } } + else { + textToWrite += `\n No results found :(`; + } } textToWrite += "### Slack Threads"; if (response.data.slackValue.error === "no slack token") { textToWrite += `\n [Click here to login to Slack](https://app.watermelontools.com)`; } else { - for (let index = 0; index < response.data.slackValue.messages.matches.length; index++) { - const element = response.data.slackValue.messages.matches[index]; - textToWrite += `\n - [#${element.channel.name} - ${element.username}\n ${element.text.length > 100 - ? element.text.substring(0, 100) + "..." - : element.text}](${element.permalink})`; - textToWrite += `\n`; - // shortcircuit to three results - if (index === 2) { - textToWrite += `and ${response.data.slackValue.messages.matches.length - 3} more`; - break; + if ((_h = (_g = (_f = (_e = response === null || response === void 0 ? void 0 : response.data) === null || _e === void 0 ? void 0 : _e.slackValue) === null || _f === void 0 ? void 0 : _f.messages) === null || _g === void 0 ? void 0 : _g.matches) === null || _h === void 0 ? void 0 : _h.length) { + for (let index = 0; index < response.data.slackValue.messages.matches.length; index++) { + const element = response.data.slackValue.messages.matches[index]; + textToWrite += `\n - [#${element.channel.name} - ${element.username}\n ${element.text.length > 100 + ? element.text.substring(0, 100) + "..." + : element.text}](${element.permalink})`; + textToWrite += `\n`; + // shortcircuit to three results + if (index === 2) { + textToWrite += `and ${response.data.slackValue.messages.matches.length - 3} more`; + break; + } } } + else { + textToWrite += `\n No results found :(`; + } } }) .catch((error) => { From a96b28c7c626d29025ceeb0050c7b2000cb6a05e Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Wed, 15 Mar 2023 13:13:39 -0500 Subject: [PATCH 53/60] Fix whitespace, length check github --- getData/context.ts | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/getData/context.ts b/getData/context.ts index 893bacd..e96588b 100644 --- a/getData/context.ts +++ b/getData/context.ts @@ -27,16 +27,23 @@ export default async function getContext() { }) .then((response) => { textToWrite += "### GitHub PRs"; - for (let index = 0; index < response.data?.ghValue?.length; index++) { - const element = response.data.ghValue[index]; - textToWrite += `\n - [#${element.number} - ${element.title}](${element.html_url})`; - textToWrite += `\n`; - // shortcircuit to three results - if (index === 2) { - textToWrite += `and ${response.data.ghValue.length - 3} more`; - break; + if (response?.data?.ghValue?.length) { + for (let index = 0; index < response.data?.ghValue?.length; index++) { + const element = response.data.ghValue[index]; + textToWrite += `\n - [#${element.number} - ${element.title}](${element.html_url})`; + textToWrite += `\n`; + // shortcircuit to three results + if (index === 2) { + textToWrite += `and ${response.data.ghValue.length - 3} more`; + break; + } } + } else { + textToWrite += `\n No results found :(`; } + + textToWrite += `\n`; + textToWrite += "### Jira Tickets"; if (response.data.jiraValue.error === "no jira token") { textToWrite += `\n [Click here to login to Jira](https://app.watermelontools.com)`; @@ -56,6 +63,8 @@ export default async function getContext() { textToWrite += `\n No results found :(`; } } + textToWrite += `\n`; + textToWrite += "### Slack Threads"; if (response.data.slackValue.error === "no slack token") { textToWrite += `\n [Click here to login to Slack](https://app.watermelontools.com)`; From b914b3fb9b93c7c799fb95f8c3b85db9b2c3a680 Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Wed, 15 Mar 2023 13:13:41 -0500 Subject: [PATCH 54/60] Update index.js --- dist/index.js | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/dist/index.js b/dist/index.js index 8941ba2..4f60872 100644 --- a/dist/index.js +++ b/dist/index.js @@ -16332,24 +16332,30 @@ function getContext() { body: github.context.payload.pull_request.body, }) .then((response) => { - var _a, _b, _c, _d, _e, _f, _g, _h; + var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k; textToWrite += "### GitHub PRs"; - for (let index = 0; index < ((_b = (_a = response.data) === null || _a === void 0 ? void 0 : _a.ghValue) === null || _b === void 0 ? void 0 : _b.length); index++) { - const element = response.data.ghValue[index]; - textToWrite += `\n - [#${element.number} - ${element.title}](${element.html_url})`; - textToWrite += `\n`; - // shortcircuit to three results - if (index === 2) { - textToWrite += `and ${response.data.ghValue.length - 3} more`; - break; + if ((_b = (_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.ghValue) === null || _b === void 0 ? void 0 : _b.length) { + for (let index = 0; index < ((_d = (_c = response.data) === null || _c === void 0 ? void 0 : _c.ghValue) === null || _d === void 0 ? void 0 : _d.length); index++) { + const element = response.data.ghValue[index]; + textToWrite += `\n - [#${element.number} - ${element.title}](${element.html_url})`; + textToWrite += `\n`; + // shortcircuit to three results + if (index === 2) { + textToWrite += `and ${response.data.ghValue.length - 3} more`; + break; + } } } + else { + textToWrite += `\n No results found :(`; + } + textToWrite += `\n`; textToWrite += "### Jira Tickets"; if (response.data.jiraValue.error === "no jira token") { textToWrite += `\n [Click here to login to Jira](https://app.watermelontools.com)`; } else { - if ((_d = (_c = response === null || response === void 0 ? void 0 : response.data) === null || _c === void 0 ? void 0 : _c.jiraValue) === null || _d === void 0 ? void 0 : _d.length) { + if ((_f = (_e = response === null || response === void 0 ? void 0 : response.data) === null || _e === void 0 ? void 0 : _e.jiraValue) === null || _f === void 0 ? void 0 : _f.length) { for (let index = 0; index < response.data.jiraValue.length; index++) { const element = response.data.jiraValue[index]; textToWrite += `\n - [${element.key} - ${element.fields.summary}](${element.serverInfo.baseUrl}/browse/${element.key})`; @@ -16365,12 +16371,13 @@ function getContext() { textToWrite += `\n No results found :(`; } } + textToWrite += `\n`; textToWrite += "### Slack Threads"; if (response.data.slackValue.error === "no slack token") { textToWrite += `\n [Click here to login to Slack](https://app.watermelontools.com)`; } else { - if ((_h = (_g = (_f = (_e = response === null || response === void 0 ? void 0 : response.data) === null || _e === void 0 ? void 0 : _e.slackValue) === null || _f === void 0 ? void 0 : _f.messages) === null || _g === void 0 ? void 0 : _g.matches) === null || _h === void 0 ? void 0 : _h.length) { + if ((_k = (_j = (_h = (_g = response === null || response === void 0 ? void 0 : response.data) === null || _g === void 0 ? void 0 : _g.slackValue) === null || _h === void 0 ? void 0 : _h.messages) === null || _j === void 0 ? void 0 : _j.matches) === null || _k === void 0 ? void 0 : _k.length) { for (let index = 0; index < response.data.slackValue.messages.matches.length; index++) { const element = response.data.slackValue.messages.matches[index]; textToWrite += `\n - [#${element.channel.name} - ${element.username}\n ${element.text.length > 100 From 043176dd749f3897eb28326cfe9e5b25d386978b Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Wed, 15 Mar 2023 16:29:21 -0500 Subject: [PATCH 55/60] Update README.md --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 4bbbb38..1b9e78e 100644 --- a/README.md +++ b/README.md @@ -1 +1,7 @@ # Watermelon Context Action + +This action uses Watermelon's backend to query. + +[Start by logging in](https://app.watermelontools.com) + +It will bring context from your logged in systems on every commit. From 52c45f3e88f6867cc86e796778633edf8f86c4cb Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Wed, 15 Mar 2023 17:37:21 -0400 Subject: [PATCH 56/60] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 1b9e78e..3f54431 100644 --- a/README.md +++ b/README.md @@ -5,3 +5,5 @@ This action uses Watermelon's backend to query. [Start by logging in](https://app.watermelontools.com) It will bring context from your logged in systems on every commit. + +Currently works on GitHub, Jira and Slack. From 0836cf2a327ad7a373d2cf11fd87d27096ebcde7 Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 21 Mar 2023 12:24:26 -0500 Subject: [PATCH 57/60] Remove checkout step --- .github/workflows/main.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5d6496c..cc49180 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,8 +8,6 @@ jobs: outputs: result: ${{ steps.watermelon.outputs.textToWrite }} steps: - - name: Checkout - uses: actions/checkout@v3 - name: Watermelon context id: watermelon uses: ./ From 8b977ce561181ab0b6fb88c09dcda8c479cffcd6 Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 21 Mar 2023 12:25:34 -0500 Subject: [PATCH 58/60] Remove Output --- action.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/action.yml b/action.yml index 6701238..18c01ae 100644 --- a/action.yml +++ b/action.yml @@ -1,8 +1,5 @@ name: "Watermelon" description: "Get code context using Watermelon" -outputs: - time: # id of output - description: "The time we greeted you" runs: using: "node16" main: "dist/index.js" From 5e8e0036c97c8632c0f623d3df27540d664617ea Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Tue, 21 Mar 2023 14:04:27 -0400 Subject: [PATCH 59/60] Update main.yml --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cc49180..5d6496c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,6 +8,8 @@ jobs: outputs: result: ${{ steps.watermelon.outputs.textToWrite }} steps: + - name: Checkout + uses: actions/checkout@v3 - name: Watermelon context id: watermelon uses: ./ From 1d792319c1d35d1b88c78cc70faf4334a4d1aa26 Mon Sep 17 00:00:00 2001 From: Esteban Dalel R Date: Wed, 22 Mar 2023 11:18:01 -0500 Subject: [PATCH 60/60] Improve metadata --- action.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/action.yml b/action.yml index 18c01ae..3b9104d 100644 --- a/action.yml +++ b/action.yml @@ -1,5 +1,9 @@ name: "Watermelon" description: "Get code context using Watermelon" +author: "Watermelon Tools, Inc" +branding: + icon: "info" + color: "red" runs: using: "node16" main: "dist/index.js"