Clean up unused code and add default empty string when label is unava…

…ilable (#290) * chore: Refactor event handling in Action class * Refactor event handling in Action class
NOUIY · Jul 30, 2024 · 58c13ec · 58c13ec
1 parent 7dd78cb
commit 58c13ec
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 83 deletions.
diff --git a/common/Action.js b/common/Action.js
diff --git a/common/Action.ts b/common/Action.ts
@@ -91,7 +91,7 @@ export abstract class Action {
  await this.onClosed(octokit, context.payload);
  break;
  case 'labeled':
- await this.onLabeled(octokit, context.payload.label.name);
+ await this.onLabeled(octokit, context.payload?.label?.name ?? '');
  break;
  case 'assigned':
  await this.onAssigned(octokit, context.payload.assignee.login);

diff --git a/english-please/index.js b/english-please/index.js
diff --git a/english-please/index.ts b/english-please/index.ts
@@ -1,4 +1,4 @@
-import { OctoKit, OctoKitIssue } from '../api/octokit';
+import { OctoKitIssue } from '../api/octokit';
 import { Action } from '../common/Action';
 import { getRequiredInput } from '../common/utils';
 import { EnglishPleaseLabler, LanguageSpecificLabeler } from './EnglishPlease';
@@ -33,17 +33,6 @@ class EnglishPlease extends Action {
  async onLabeled(issue: OctoKitIssue, label: string) {
  if (label == nonEnglishLabel) await this.doLanguageSpecific(issue);
  }
-
- async onTriggered(_octokit: OctoKit): Promise<void> {
- // This function is only called during a manual workspace dispatch event
- // caused by a webhook, so we know to expect some inputs.
- const auth = await this.getToken();
- const repo = getRequiredInput('repo');
- const owner = getRequiredInput('owner');
- const issueNumber = +getRequiredInput('issue_number');
- const octokitIssue = new OctoKitIssue(auth, { owner, repo }, { number: issueNumber });
- await this.doLanguageSpecific(octokitIssue);
- }
 }
 
 new EnglishPlease().run() // eslint-disable-line
diff --git a/feature-request/index.js b/feature-request/index.js
diff --git a/feature-request/index.ts b/feature-request/index.ts
@@ -3,7 +3,7 @@
  * Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { OctoKit, OctoKitIssue } from '../api/octokit';
+import { OctoKitIssue } from '../api/octokit';
 import { Action } from '../common/Action';
 import { getInput, getRequiredInput } from '../common/utils';
 import { FeatureRequestConfig, FeatureRequestOnLabel, FeatureRequestOnMilestone } from './FeatureRequest';
@@ -34,22 +34,6 @@ const config: FeatureRequestConfig = {
 class FeatureRequest extends Action {
  id = 'FeatureRequest';
 
- async onTriggered(_github: OctoKit) {
- // This function is only called during a manual workspace dispatch event
- // caused by a webhook, so we know to expect some inputs.
- const auth = await this.getToken();
- const repo = getRequiredInput('repo');
- const owner = getRequiredInput('owner');
- const issue = JSON.parse(getRequiredInput('issue_number'));
-
- const octokitIssue = new OctoKitIssue(auth, { owner, repo }, { number: issue.number });
- await new FeatureRequestOnMilestone(
- octokitIssue,
- config.comments.init!,
- config.milestones.candidateID,
- ).run();
- }
-
  async onLabeled(github: OctoKitIssue, label: string) {
  if (label === config.featureRequestLabel) {
  await new FeatureRequestOnLabel(

diff --git a/test-plan-item-validator/index.js b/test-plan-item-validator/index.js
diff --git a/test-plan-item-validator/index.ts b/test-plan-item-validator/index.ts
@@ -3,18 +3,19 @@
  * Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { OctoKit, OctoKitIssue } from '../api/octokit';
+import { OctoKitIssue } from '../api/octokit';
 import { Action } from '../common/Action';
 import { getRequiredInput } from '../common/utils';
 import { TestPlanItemValidator } from './TestPlanitemValidator';
 
 class TestPlanItemValidatorAction extends Action {
  id = 'TestPlanItemValidator';
 
- async runValidation(issue: OctoKitIssue, token?: string) {
+ async runValidation(issue: OctoKitIssue) {
+ const auth = await this.getToken();
  await new TestPlanItemValidator(
  issue,
- token ?? getRequiredInput('token'),
+ auth ?? getRequiredInput('token'),
  getRequiredInput('refLabel'),
  getRequiredInput('label'),
  getRequiredInput('invalidLabel'),
@@ -33,18 +34,6 @@ class TestPlanItemValidatorAction extends Action {
  protected override async onEdited(issue: OctoKitIssue) {
  await this.runValidation(issue);
  }
-
- protected override async onTriggered(_octokit: OctoKit): Promise<void> {
- // This function is only called during a manual workspace dispatch event
- // caused by a webhook, so we know to expect some inputs.
- const auth = await this.getToken();
- const repo = getRequiredInput('repo');
- const owner = getRequiredInput('owner');
- const issueNumber = +getRequiredInput('issue_number');
-
- const octokitIssue = new OctoKitIssue(auth, { owner, repo }, { number: issueNumber });
- await this.runValidation(octokitIssue, auth);
- }
 }
 
 new TestPlanItemValidatorAction().run() // eslint-disable-line