[MI-2410] Updated subscription card to display run event filters and filter popover for pipelines

server/constants/constants.go

@@ -98,10 +98,12 @@ const (
 	FilterAll                  = "all"
 	FilterBoards               = "boards"
 	FilterRepos                = "repos"
-	EventTypeRelease           = "release"
+	FilterPipelines            = "pipelines"
 	FilterReleaseDefinitionID  = "releaseDefinitionId"
 	FilterReleaseEnvironmentID = "releaseEnvironmentId"
 
+	EventOfTypeRelease = "release"
+
 	DefaultPage         = 0
 	DefaultPerPageLimit = 50
 
@@ -163,6 +165,20 @@ var (
 		SubscriptionEventCodePushed:           true,
 	}
 
+	ValidSubscriptionEventsForPipelines = map[string]bool{
+		SubscriptionEventBuildCompleted:                     true,
+		SubscriptionEventReleaseAbandoned:                   true,
+		SubscriptionEventReleaseCreated:                     true,
+		SubscriptionEventReleaseDeploymentApprovalCompleted: true,
+		SubscriptionEventReleaseDeploymentEventPending:      true,
+		SubscriptionEventReleaseDeploymentCompleted:         true,
+		SubscriptionEventReleaseDeploymentStarted:           true,
+		SubscriptionEventRunStageApprovalCompleted:          true,
+		SubscriptionEventRunStageStateChanged:               true,
+		SubscriptionEventRunStageWaitingForApproval:         true,
+		SubscriptionEventRunStateChanged:                    true,
+	}
+
 	ValidSubscriptionEventsForRun = map[string]bool{
 		SubscriptionEventRunStageApprovalCompleted:  true,
 		SubscriptionEventRunStageStateChanged:       true,

server/plugin/api.go

@@ -381,12 +381,15 @@ func (p *Plugin) handleCreateSubscription(w http.ResponseWriter, r *http.Request
 		ApprovalTypeName:                 body.ApprovalTypeName,
 		ApprovalStatusName:               body.ApprovalStatusName,
 		RunPipeline:                      body.RunPipeline,
+		RunPipelineName:                  body.RunPipelineName,
 		RunStageName:                     body.RunStageName,
 		RunEnvironmentName:               body.RunEnvironmentName,
 		RunStageNameID:                   body.RunStageNameID,
 		RunStageStateID:                  body.RunStageStateID,
+		RunStageStateIDName:              body.RunStageStateIDName,
 		RunStageResultID:                 body.RunStageResultID,
 		RunStateID:                       body.RunStateID,
+		RunStateIDName:                   body.RunStateIDName,
 		RunResultID:                      body.RunResultID,
 	}); storeErr != nil {
 		p.API.LogError("Error in creating a subscription", "Error", storeErr.Error())
@@ -457,6 +460,17 @@ func (p *Plugin) handleGetSubscriptions(w http.ResponseWriter, r *http.Request)
 								subscriptionByProject = append(subscriptionByProject, subscription)
 							}
 						}
+					case constants.FilterPipelines:
+						switch eventType {
+						case "", constants.FilterAll:
+							if constants.ValidSubscriptionEventsForPipelines[subscription.EventType] {
+								subscriptionByProject = append(subscriptionByProject, subscription)
+							}
+						default:
+							if subscription.EventType == eventType {
+								subscriptionByProject = append(subscriptionByProject, subscription)
+							}
+						}
 					}
 				}
 			}
@@ -480,13 +494,16 @@ func (p *Plugin) handleGetSubscriptions(w http.ResponseWriter, r *http.Request)
 				subscriptionByProject[i].StageNameValue+
 				subscriptionByProject[i].ReleaseStatusName+
 				subscriptionByProject[i].RunPipeline+
+				subscriptionByProject[i].RunPipelineName+
 				subscriptionByProject[i].ReleasePipelineName+
 				subscriptionByProject[i].RunStageName+
 				subscriptionByProject[i].RunEnvironmentName+
 				subscriptionByProject[i].RunStageNameID+
 				subscriptionByProject[i].RunStageStateID+
+				subscriptionByProject[i].RunStageStateIDName+
 				subscriptionByProject[i].RunStageResultID+
 				subscriptionByProject[i].RunStateID+
+				subscriptionByProject[i].RunStateIDName+
 				subscriptionByProject[i].RunResultID <
 				subscriptionByProject[j].ChannelName+
 					subscriptionByProject[j].EventType+
@@ -505,13 +522,16 @@ func (p *Plugin) handleGetSubscriptions(w http.ResponseWriter, r *http.Request)
 					subscriptionByProject[i].StageNameValue+
 					subscriptionByProject[i].ReleaseStatusName+
 					subscriptionByProject[i].RunPipeline+
+					subscriptionByProject[i].RunPipelineName+
 					subscriptionByProject[i].ReleasePipelineName+
 					subscriptionByProject[i].RunStageName+
 					subscriptionByProject[i].RunEnvironmentName+
 					subscriptionByProject[i].RunStageNameID+
 					subscriptionByProject[i].RunStageStateID+
+					subscriptionByProject[i].RunStageStateIDName+
 					subscriptionByProject[i].RunStageResultID+
 					subscriptionByProject[i].RunStateID+
+					subscriptionByProject[i].RunStateIDName+
 					subscriptionByProject[i].RunResultID
 		})
 

server/plugin/client.go

@@ -269,9 +269,9 @@ func (c *client) GetSubscriptionFilterPossibleValues(request *serializers.GetSub
 
 	var subscriptionFilters []*serializers.SubscriptionFilter
 	for _, filter := range request.Filters {
-		if strings.Contains(request.EventType, constants.EventTypeRelease) && (filter == constants.FilterReleaseDefinitionID || filter == constants.FilterReleaseEnvironmentID) {
+		if strings.Contains(request.EventType, constants.EventOfTypeRelease) && (filter == constants.FilterReleaseDefinitionID || filter == constants.FilterReleaseEnvironmentID) {
 			subscriptionFilters = append(subscriptionFilters, &serializers.SubscriptionFilter{InputID: filter})
-		} else if !strings.Contains(request.EventType, constants.EventTypeRelease) {
+		} else if !strings.Contains(request.EventType, constants.EventOfTypeRelease) {
 			subscriptionFilters = append(subscriptionFilters, &serializers.SubscriptionFilter{InputID: filter})
 		}
 	}
@@ -297,7 +297,7 @@ func (c *client) GetSubscriptionFilterPossibleValues(request *serializers.GetSub
 		}
 	}
 
-	if strings.Contains(request.EventType, constants.EventTypeRelease) {
+	if strings.Contains(request.EventType, constants.EventOfTypeRelease) {
 		subscriptionFiltersRequest.Subscription.PublisherInputs = serializers.PublisherInputsGeneric{
 			ProjectID:           request.ProjectID,
 			ReleaseDefinitionID: request.ReleasePipelineID,
@@ -312,7 +312,7 @@ func (c *client) GetSubscriptionFilterPossibleValues(request *serializers.GetSub
 	}
 
 	baseURL := c.plugin.getConfiguration().AzureDevopsAPIBaseURL
-	if strings.Contains(request.EventType, constants.EventTypeRelease) {
+	if strings.Contains(request.EventType, constants.EventOfTypeRelease) {
 		baseURL = strings.Replace(baseURL, "://", "://vsrm.", 1)
 	}
 

server/serializers/subscriptions.go

@@ -97,12 +97,15 @@ type CreateSubscriptionRequestPayload struct {
 	ReleaseStatus                    string `json:"releaseStatus"`
 	ReleaseStatusName                string `json:"releaseStatusName"`
 	RunPipeline                      string `json:"runPipeline"`
+	RunPipelineName                  string `json:"runPipelineName"`
 	RunStageName                     string `json:"runStage"`
 	RunEnvironmentName               string `json:"runEnvironment"`
 	RunStageNameID                   string `json:"runStageId"`
 	RunStageStateID                  string `json:"runStageStateId"`
+	RunStageStateIDName              string `json:"runStageStateIdName"`
 	RunStageResultID                 string `json:"runStageResultId"`
 	RunStateID                       string `json:"runStateId"`
+	RunStateIDName                   string `json:"runStateIdName"`
 	RunResultID                      string `json:"runResultId"`
 }
 
@@ -189,12 +192,15 @@ type SubscriptionDetails struct {
 	ReleaseStatus                    string `json:"releaseStatus"`
 	ReleaseStatusName                string `json:"releaseStatusName"`
 	RunPipeline                      string `json:"runPipeline"`
+	RunPipelineName                  string `json:"runPipelineName"`
 	RunStageName                     string `json:"runStage"`
 	RunEnvironmentName               string `json:"runEnvironment"`
 	RunStageNameID                   string `json:"runStageId"`
 	RunStageStateID                  string `json:"runStageStateId"`
+	RunStageStateIDName              string `json:"runStageStateIdName"`
 	RunStageResultID                 string `json:"runStageResultId"`
 	RunStateID                       string `json:"runStateId"`
+	RunStateIDName                   string `json:"runStateIdName"`
 	RunResultID                      string `json:"runResultId"`
 }
 

server/store/subscriptions.go

@@ -126,12 +126,15 @@ func (subscriptionList *SubscriptionList) AddSubscription(userID string, subscri
 		ApprovalTypeName:                 subscription.ApprovalTypeName,
 		ApprovalStatusName:               subscription.ApprovalStatusName,
 		RunPipeline:                      subscription.RunPipeline,
+		RunPipelineName:                  subscription.RunPipelineName,
 		RunStageName:                     subscription.RunStageName,
 		RunEnvironmentName:               subscription.RunEnvironmentName,
 		RunStageNameID:                   subscription.RunStageNameID,
 		RunStageStateID:                  subscription.RunStageStateID,
+		RunStageStateIDName:              subscription.RunStageStateIDName,
 		RunStageResultID:                 subscription.RunStageResultID,
 		RunStateID:                       subscription.RunStateID,
+		RunStateIDName:                   subscription.RunStateIDName,
 		RunResultID:                      subscription.RunResultID,
 	}
 	subscriptionList.ByMattermostUserID[userID][subscriptionKey] = subscriptionListValue

webapp/src/components/card/subscription/index.tsx

@@ -17,7 +17,7 @@ type SubscriptionCardProps = {
     subscriptionDetails: SubscriptionDetails
 }
 
-const SubscriptionCard = ({handleDeleteSubscrption, subscriptionDetails: {channelType, eventType, serviceType, channelName, createdBy, targetBranch, repositoryName, pullRequestCreatedByName, pullRequestReviewersContainsName, pushedByName, mergeResultName, notificationTypeName, areaPath, releasePipelineName, buildPipeline, buildStatusName, approvalStatusName, approvalTypeName, releaseStatusName, stageNameValue}, subscriptionDetails}: SubscriptionCardProps) => {
+const SubscriptionCard = ({handleDeleteSubscrption, subscriptionDetails: {channelType, eventType, serviceType, channelName, createdBy, targetBranch, repositoryName, pullRequestCreatedByName, pullRequestReviewersContainsName, pushedByName, mergeResultName, notificationTypeName, areaPath, releasePipelineName, buildPipeline, buildStatusName, approvalStatusName, approvalTypeName, releaseStatusName, stageNameValue, runPipelineName, runEnvironment, runStage, runStageId, runResultId, runStageResultId, runStageStateIdName, runStateIdName}, subscriptionDetails}: SubscriptionCardProps) => {
     const showFilter = areaPath || repositoryName || targetBranch || pullRequestCreatedByName || pullRequestReviewersContainsName || pushedByName || mergeResultName || notificationTypeName;
 
     return (
@@ -97,6 +97,14 @@ const SubscriptionCard = ({handleDeleteSubscrption, subscriptionDetails: {channe
                                     {approvalStatusName && <Chip text={`Approval status is: ${approvalStatusName}`}/>}
                                     {approvalTypeName && <Chip text={`Approval type is: ${approvalTypeName}`}/>}
                                     {releaseStatusName && <Chip text={`Release status is: ${releaseStatusName}`}/>}
+                                    {runPipelineName && <Chip text={`Pipeline is: ${runPipelineName}`}/>}
+                                    {runEnvironment && <Chip text={`Environment is: ${runEnvironment}`}/>}
+                                    {runStage && <Chip text={`Stage is: ${runStage}`}/>}
+                                    {runStageId && <Chip text={`Stage is: ${runStageId}`}/>}
+                                    {runStageStateIdName && <Chip text={`Stage state is: ${runStageStateIdName}`}/>}
+                                    {runStageResultId && <Chip text={`Stage result is: ${runStageResultId}`}/>}
+                                    {runStateIdName && <Chip text={`State is: ${runStateIdName}`}/>}
+                                    {runResultId && <Chip text={`Result is: ${runResultId}`}/>}
                                 </div>
                             </div>
                         )

webapp/src/containers/Rhs/projectDetails/header.tsx

@@ -16,7 +16,6 @@ import useApiRequestCompletionState from 'hooks/useApiRequestCompletionState';
 import IconButton from 'components/buttons/iconButton';
 import SVGWrapper from 'components/svgWrapper';
 import useOutsideClick from 'hooks/useClickOutside';
-import {subscriptionFilterEventTypeReposOptions} from 'pluginConstants/form';
 import utils from 'utils';
 
 type HeaderProps = {
@@ -33,7 +32,7 @@ type HeaderProps = {
 const Header = ({projectDetails, showAllSubscriptions, handlePagination, setShowAllSubscriptions, handleResetProjectDetails, filter, setFilter, setSubscriptionList}: HeaderProps) => {
     const {projectName} = projectDetails;
     const {defaultSubscriptionFilters, subscriptionFilters, filterLabelValuePairAll} = pluginConstants.common;
-    const {subscriptionFilterCreatedByOptions, subscriptionFilterServiceTypeOptions, subscriptionFilterEventTypeBoardsOptions, subscriptionModal} = pluginConstants.form;
+    const {subscriptionFilterCreatedByOptions, subscriptionFilterServiceTypeOptions, subscriptionFilterEventTypeBoardsOptions, subscriptionFilterEventTypeReposOptions, subscriptionFilterEventTypePipelinesOptions} = pluginConstants.form;
     const [showProjectConfirmationModal, setShowProjectConfirmationModal] = useState(false);
     const [deleteSubscriptions, setDeleteSubscriptions] = useState(false);
     const [showDeleteSubscriptionsCheckbox, setShowDeleteSubscriptionsCheckbox] = useState(true);
@@ -51,6 +50,8 @@ const Header = ({projectDetails, showAllSubscriptions, handlePagination, setShow
             return subscriptionFilterEventTypeBoardsOptions();
         case subscriptionFilters.serviceType.repos:
             return subscriptionFilterEventTypeReposOptions();
+        case subscriptionFilters.serviceType.pipelines:
+            return subscriptionFilterEventTypePipelinesOptions();
         default:
             return [filterLabelValuePairAll];
         }

webapp/src/containers/Rhs/projectDetails/index.tsx

@@ -124,12 +124,15 @@ const ProjectDetails = memo((projectDetails: ProjectDetails) => {
             stageNameValue: subscriptionDetails.stageNameValue,
             releaseStatusName: subscriptionDetails.releaseStatusName,
             runPipeline: subscriptionDetails.runPipeline,
+            runPipelineName: subscriptionDetails.runPipelineName,
             runStage: subscriptionDetails.runStage,
             runEnvironment: subscriptionDetails.runEnvironment,
             runStageId: subscriptionDetails.runStageId,
             runStageStateId: subscriptionDetails.runStageStateId,
+            runStageStateIdName: subscriptionDetails.runStageStateIdName,
             runStageResultId: subscriptionDetails.runStageResultId,
             runStateId: subscriptionDetails.runStateId,
+            runStateIdName: subscriptionDetails.runStateIdName,
             runResultId: subscriptionDetails.runResultId,
         });
         setDeleteConfirmationModalError(null);

webapp/src/containers/modals/SubscribeModal/index.tsx

@@ -359,6 +359,7 @@ const SubscribeModal = () => {
         setSpecificFieldValue({
             ...formFields,
             runPipeline: newValue === filterLabelValuePairAll.value ? '' : newValue,
+            runPipelineName: pipelienName === filterLabelValuePairAll.value ? '' : pipelienName,
             runStage: newValue === filterLabelValuePairAll.value ? '' : formFields.runStage,
             runStageId: newValue === filterLabelValuePairAll.value ? '' : formFields.runStageId,
         });
@@ -385,6 +386,7 @@ const SubscribeModal = () => {
         setSpecificFieldValue({
             ...formFields,
             runStageStateId: newValue === filterLabelValuePairAll.value ? '' : newValue,
+            runStageStateIdName: stateId === filterLabelValuePairAll.value ? '' : stateId,
             runStageResultId: (newValue !== filterLabelValuePairAll.value && newValue !== 'Completed') ? '' : formFields.runStageResultId,
         });
 
@@ -398,6 +400,7 @@ const SubscribeModal = () => {
         setSpecificFieldValue({
             ...formFields,
             runStateId: newValue === filterLabelValuePairAll.value ? '' : newValue,
+            runStateIdName: stateId === filterLabelValuePairAll.value ? '' : stateId,
             runResultId: (newValue !== filterLabelValuePairAll.value && newValue !== 'Completed') ? '' : formFields.runResultId,
         });
 

webapp/src/pluginConstants/common.ts

@@ -87,6 +87,7 @@ export const subscriptionFilters = {
     serviceType: {
         boards: 'boards',
         repos: 'repos',
+        pipelines: 'pipelines',
         all: 'all',
     },
     eventType: {
@@ -96,6 +97,9 @@ export const subscriptionFilters = {
         repos: {
             ...eventTypeRepos,
         },
+        pipelines: {
+            ...eventTypePipelines,
+        },
         all: 'all',
     },
 };

webapp/src/pluginConstants/form.ts

@@ -448,6 +448,11 @@ export const subscriptionModal: Record<SubscriptionModalFields, ModalFormFieldCo
         type: 'hidden',
         value: '',
     },
+    runPipelineName: {
+        label: 'Pipeline',
+        type: 'hidden',
+        value: '',
+    },
     runStage: {
         label: 'Stage',
         type: 'hidden',
@@ -469,6 +474,12 @@ export const subscriptionModal: Record<SubscriptionModalFields, ModalFormFieldCo
         value: '',
         optionsList: runStageStateIdOptions,
     },
+    runStageStateIdName: {
+        label: 'State',
+        type: 'hidden',
+        value: '',
+        optionsList: runStageStateIdOptions,
+    },
     runStageResultId: {
         label: 'Result',
         type: 'hidden',
@@ -481,6 +492,12 @@ export const subscriptionModal: Record<SubscriptionModalFields, ModalFormFieldCo
         value: '',
         optionsList: runStateIdOptions,
     },
+    runStateIdName: {
+        label: 'State',
+        type: 'hidden',
+        value: '',
+        optionsList: runStateIdOptions,
+    },
     runResultId: {
         label: 'Result',
         type: 'hidden',
@@ -612,6 +629,10 @@ export const subscriptionFilterServiceTypeOptions = [
         value: subscriptionFilters.serviceType.repos,
         label: 'Repos',
     },
+    {
+        value: subscriptionFilters.serviceType.pipelines,
+        label: 'Pipelines',
+    },
     {
         ...filterLabelValuePairAll,
     },
@@ -639,6 +660,17 @@ export const subscriptionFilterEventTypeReposOptions = () => {
     return options;
 };
 
+export const subscriptionFilterEventTypePipelinesOptions = () => {
+    const options: LabelValuePair[] = [];
+    Object.keys(subscriptionFilters.eventType.pipelines).forEach((eventType) => options.push({
+        value: eventType,
+        label: subscriptionFilters.eventType.pipelines[eventType as EventTypePipelines],
+    }));
+
+    options.push(filterLabelValuePairAll);
+    return options;
+};
+
 // Repos subscription filters
 export const mergeResultOptons: LabelValuePair[] = [
     {

webapp/src/pluginConstants/index.ts

@@ -31,6 +31,7 @@ import {
     subscriptionModal,
     subscriptionFilterCreatedByOptions,
     subscriptionFilterServiceTypeOptions,
+    subscriptionFilterEventTypePipelinesOptions,
     subscriptionFilterEventTypeBoardsOptions,
     subscriptionFilterEventTypeReposOptions,
     mergeResultOptons,
@@ -83,6 +84,7 @@ export default {
         subscriptionModal,
         subscriptionFilterCreatedByOptions,
         subscriptionFilterServiceTypeOptions,
+        subscriptionFilterEventTypePipelinesOptions,
         subscriptionFilterEventTypeBoardsOptions,
         subscriptionFilterEventTypeReposOptions,
         mergeResultOptons,