This repository has been archived by the owner on Jul 2, 2024. It is now read-only.
DEVPROD-2227: Remove family triggers from trigger definitions #2203
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,7 +16,7 @@ describe("Notifications", () => { | |
| cy.dataCy("add-button").contains("Add Subscription").should("be.visible"); | ||
| cy.dataCy("add-button").click(); | ||
| cy.dataCy("expandable-card").should("contain.text", "New Subscription"); | ||
| cy.selectLGOption("Event", "Any version finishes"); | ||
| cy.selectLGOption("Notification Method", "Email"); | ||
| cy.getInputByLabel("Email").type("[email protected]"); | ||
| cy.dataCy("save-settings-button").scrollIntoView(); | ||
|
|
@@ -43,7 +43,7 @@ describe("Notifications", () => { | |
| cy.dataCy("expandable-card") | ||
| .should("be.visible") | ||
| .should("contain.text", "New Subscription"); | ||
| cy.selectLGOption("Event", "Any task finishes"); | ||
| cy.selectLGOption("Notification Method", "Comment on a JIRA issue"); | ||
| cy.getInputByLabel("JIRA Issue").type("JIRA-123"); | ||
| cy.contains("Subscription type not allowed for tasks in a project.").should( | ||
|
|
@@ -58,7 +58,7 @@ describe("Notifications", () => { | |
| cy.dataCy("expandable-card") | ||
| .should("be.visible") | ||
| .should("contain.text", "New Subscription"); | ||
| cy.selectLGOption("Event", "Any version finishes"); | ||
| cy.selectLGOption("Notification Method", "Email"); | ||
| cy.getInputByLabel("Email").type("Not a real email"); | ||
| cy.contains("Value should be a valid email.").should("be.visible"); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -106,7 +106,7 @@ describe("getGqlPayload", () => { | |
| type: "email", | ||
| target: "[email protected]", | ||
| }, | ||
| trigger: "outcome", | ||
| trigger_data: {}, | ||
| }); | ||
| }); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,7 @@ import { useQuery } from "@apollo/client"; | |
| import styled from "@emotion/styled"; | ||
| import { LeafyGreenTableRow } from "@leafygreen-ui/table"; | ||
| import { size } from "constants/tokens"; | ||
| import { fromFamilyTrigger } from "constants/triggers"; | ||
| import { | ||
| UserSubscriptionsQuery, | ||
| UserSubscriptionsQueryVariables, | ||
|
|
@@ -61,7 +61,7 @@ const processSubscriptionData = ( | |
| // For this table's purposes, FAMILY_TRIGGER = TRIGGER. Convert all family triggers to their base type. | ||
| .map(({ trigger, ...subscription }) => ({ | ||
| ...subscription, | ||
| trigger: fromFamilyTrigger(trigger), | ||
| })) | ||
| // For subscriptions that contain regex selectors or additional trigger data, append an expandable section | ||
| .map((subscription) => { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -38,7 +38,7 @@ describe("getGqlPayload", () => { | |
| webhookSubscriber: undefined, | ||
| jiraIssueSubscriber: undefined, | ||
| }, | ||
| trigger: "outcome", | ||
| trigger_data: { requester: "gitter_request" }, | ||
| }, | ||
| ]); | ||
|
|
@@ -150,7 +150,7 @@ describe("getGqlPayload", () => { | |
| webhookSubscriber: undefined, | ||
| jiraIssueSubscriber: undefined, | ||
| }, | ||
| trigger: "failure", | ||
| trigger_data: { requester: "ad_hoc" }, | ||
| }); | ||
| }); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -80,7 +80,7 @@ describe("project data", () => { | |
| jiraIssueSubscriber: undefined, | ||
| webhookSubscriber: undefined, | ||
| }, | ||
| trigger: "outcome", | ||
| trigger_data: { | ||
| requester: "gitter_request", | ||
| }, | ||
|
|
@@ -143,7 +143,7 @@ describe("project data", () => { | |
| }, | ||
| webhookSubscriber: undefined, | ||
| }, | ||
| trigger: "outcome", | ||
| trigger_data: { | ||
| requester: "gitter_request", | ||
| }, | ||
|
|
@@ -222,7 +222,7 @@ describe("project data", () => { | |
| ], | ||
| }, | ||
| }, | ||
| trigger: "outcome", | ||
| trigger_data: { | ||
| requester: "gitter_request", | ||
| }, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| import { ProjectSettingsTabRoutes } from "constants/routes"; | ||
| import { getSubscriberText } from "constants/subscription"; | ||
| import { fromFamilyTrigger, projectTriggers } from "constants/triggers"; | ||
| import { | ||
| BannerTheme, | ||
| ProjectInput, | ||
|
|
@@ -16,7 +16,7 @@ type Tab = ProjectSettingsTabRoutes.Notifications; | |
| const { toSentenceCase } = string; | ||
|
|
||
| const getTriggerText = (trigger: string, resourceType: string) => { | ||
| const convertedTrigger = fromFamilyTrigger(trigger); | ||
| const triggerText = | ||
| resourceType && trigger | ||
| ? `${toSentenceCase(resourceType)} ${convertedTrigger} ` | ||
|
|
@@ -25,9 +25,10 @@ const getTriggerText = (trigger: string, resourceType: string) => { | |
| }; | ||
|
|
||
| const getTriggerEnum = (trigger: string, resourceType: string) => { | ||
| const convertedTrigger = fromFamilyTrigger(trigger); | ||
|
There was a problem hiding this comment. Can you improve the variable naming for There was a problem hiding this comment. The resolver is a good idea! I will file a ticket for it -- shouldn't be too difficult of a change! |
||
| const triggerEnum = Object.keys(projectTriggers).find( | ||
| (t) => | ||
| projectTriggers[t].trigger === convertedTrigger && | ||
| projectTriggers[t].resourceType === resourceType | ||
| ); | ||
| return triggerEnum; | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thank you... 🥹