Detecting react component and fetching files in promise.race

software-mansion-labs · Sep 26, 2023 · 20aaac4 · 20aaac4
1 parent 90708ea
commit 20aaac4
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/.github/actions/javascript/authorChecklist/authorChecklist.js b/.github/actions/javascript/authorChecklist/authorChecklist.js
@@ -31,8 +31,9 @@ async function getChecklistCategoriesForPullRequest() {
         per_page: 100,
     });
 
-    _.each(CHECKLIST_CATEGORIES, ({ detectFunction, items }) => {
-        if (!detectFunction(changedFiles)) {
+    _.each(CHECKLIST_CATEGORIES, async ({ detectFunction, items }) => {
+        const categoryDetected = await detectFunction(changedFiles);
+        if (!categoryDetected) {
             return;
         }
         categories.push(items);

diff --git a/.github/actions/javascript/authorChecklist/index.js b/.github/actions/javascript/authorChecklist/index.js
@@ -41,8 +41,9 @@ async function getChecklistCategoriesForPullRequest() {
         per_page: 100,
     });
 
-    _.each(CHECKLIST_CATEGORIES, ({ detectFunction, items }) => {
-        if (!detectFunction(changedFiles)) {
+    _.each(CHECKLIST_CATEGORIES, async ({ detectFunction, items }) => {
+        const categoryDetected = await detectFunction(changedFiles);
+        if (!categoryDetected) {
             return;
         }
         categories.push(items);
@@ -248,24 +249,25 @@ function detectReactComponent(code) {
     return isReactComponent;
 };
 
-function fetchFile(filename) {
+async function detectReactComponentInFile(filename) {
     const content = {
         owner: CONST.GITHUB_OWNER,
         repo: CONST.APP_REPO,
         path: filename,
         ref: github.context.payload.pull_request.head.ref,
     };
     try {
-        return GithubUtils.octokit.repos.getContent(content);
+        const { data } = await GithubUtils.octokit.repos.getContent(content);
+        return detectReactComponent(data);
     } catch (error) {
         console.error(`An unknown error occurred with the GitHub API: ${error}, while fetching ${content}`);
     }
 }
-
-function detectFunction(changedFiles) {
+;
+async function detectFunction(changedFiles) {
     const filteredFiles = _.filter((changedFiles), ({ filename }) => filename.endsWith('.js') || filename.endsWith('.jsx') || filename.endsWith('.ts') || filename.endsWith('.tsx'));
-    return _.some(filteredFiles, ({ filename }) => detectReactComponent(fetchFile(filename)));
-}
+    return Promise.race(_.map(filteredFiles, ({ filename }) => detectReactComponentInFile(filename)));
+};
 
 module.exports = {
     detectFunction,

diff --git a/.github/actions/javascript/authorChecklist/newComponentCategory.js b/.github/actions/javascript/authorChecklist/newComponentCategory.js
@@ -48,24 +48,25 @@ function detectReactComponent(code) {
     return isReactComponent;
 };
 
-function fetchFile(filename) {
+async function detectReactComponentInFile(filename) {
     const content = {
         owner: CONST.GITHUB_OWNER,
         repo: CONST.APP_REPO,
         path: filename,
         ref: github.context.payload.pull_request.head.ref,
     };
     try {
-        return GithubUtils.octokit.repos.getContent(content);
+        const { data } = await GithubUtils.octokit.repos.getContent(content);
+        return detectReactComponent(data);
     } catch (error) {
         console.error(`An unknown error occurred with the GitHub API: ${error}, while fetching ${content}`);
     }
 }
-
-function detectFunction(changedFiles) {
+;
+async function detectFunction(changedFiles) {
     const filteredFiles = _.filter((changedFiles), ({ filename }) => filename.endsWith('.js') || filename.endsWith('.jsx') || filename.endsWith('.ts') || filename.endsWith('.tsx'));
-    return _.some(filteredFiles, ({ filename }) => detectReactComponent(fetchFile(filename)));
-}
+    return Promise.race(_.map(filteredFiles, ({ filename }) => detectReactComponentInFile(filename)));
+};
 
 module.exports = {
     detectFunction,