Merge branch 'hotfix-19.1' into develop

Author: kylehenning

Rock.Blocks/Engagement/ConnectionsHub.cs

@@ -360,28 +360,33 @@ private ConnectionsHubOptionsBag GetOptions()
             var delimitedBadgeGuids = GetAttributeValue( AttributeKey.Badges );
             options.BadgeGuids = delimitedBadgeGuids.SplitDelimitedValues().AsGuidList();
 
-            var manualWorkflows = new List<ConnectionWorkflow>();
-            var authorizedWorkflowItems = new List<ListItemBag>();
+            var manualWorkflows = new List<(ConnectionWorkflow Workflow, Guid? OpportunityGuid)>();
+            var authorizedWorkflowItems = new List<ConnectionWorkflowBag>();
 
             manualWorkflows.AddRange( connectionType.ConnectionWorkflows
                 .Where( w => w.TriggerType == ConnectionWorkflowTriggerType.Manual && ( w.WorkflowType.IsActive ?? true ) ) // Mirroring Webforms by setting IsActive to true by default.
+                .Select( w => ( w, ( Guid? ) null ) )
                 .ToList() );
 
             manualWorkflows.AddRange( connectionType.ConnectionOpportunities
-                .SelectMany( o => o.ConnectionWorkflows )
-                .Where( w => w.TriggerType == ConnectionWorkflowTriggerType.Manual && ( w.WorkflowType.IsActive ?? true ) ) // Mirroring Webforms by setting IsActive to true by default.
+                .SelectMany( o => o.ConnectionWorkflows.Select( w => (Workflow: w, OpportunityGuid: ( Guid? ) o.Guid) ) )
+                .Where( x => x.Workflow.TriggerType == ConnectionWorkflowTriggerType.Manual && ( x.Workflow.WorkflowType.IsActive ?? true ) ) // Mirroring Webforms by setting IsActive to true by default.
                 .ToList()
             );
 
             foreach ( var manualWorkflow in manualWorkflows )
             {
-                if ( manualWorkflow.WorkflowType.IsAuthorized( Authorization.VIEW, RequestContext.CurrentPerson ) )
+                if ( manualWorkflow.Workflow.WorkflowType.IsAuthorized( Authorization.VIEW, RequestContext.CurrentPerson ) )
                 {
-                    authorizedWorkflowItems.Add( new ListItemBag
+                    authorizedWorkflowItems.Add( new ConnectionWorkflowBag
                     {
-                        Text = manualWorkflow.WorkflowType.Name,
-                        Value = manualWorkflow.Guid.ToString(),
-                        Category = manualWorkflow.ConnectionTypeId.HasValue ? "Connection Type Workflows" : "Connection Opportunity Workflows"
+                        ListItemBag = new ListItemBag
+                        {
+                            Text = manualWorkflow.Workflow.WorkflowType.Name,
+                            Value = manualWorkflow.Workflow.Guid.ToString(),
+                            Category = manualWorkflow.Workflow.ConnectionTypeId.HasValue ? "Connection Type Workflows" : "Connection Opportunity Workflows"
+                        },
+                        ConnectionOpportunityGuid = manualWorkflow.OpportunityGuid
                     } );
                 }
             }
@@ -747,6 +752,11 @@ private List<int> GetDataViewValues( int dataViewId )
         /// <returns>True if the Connection Request meets all criteria for the Connection Workflow; otherwise false.</returns>
         private bool IsEligibleForWorkflow( ConnectionWorkflow cw, ConnectionRequest request, List<int> includeIds, List<int> excludeIds )
         {
+            if ( cw.ConnectionOpportunityId.HasValue && cw.ConnectionOpportunityId != request.ConnectionOpportunityId )
+            {
+                return false;
+            }
+
             if ( cw.ManualTriggerFilterConnectionStatusId.HasValue && cw.ManualTriggerFilterConnectionStatusId != request.ConnectionStatusId )
             {
                 return false;
@@ -2185,6 +2195,7 @@ private ConnectionRequestDetailsBag GetConnectionRequestDetailsBag( ConnectionRe
                     IsDefaultStatus = connectionRequest.ConnectionStatus.IsDefault
                 } : null,
                 FollowUpDate = connectionRequest.FollowupDate?.ToRockDateTimeOffset(),
+                ConnectionOpportunityGuid = connectionRequest.ConnectionOpportunity.Guid,
                 ConnectionOpportunityName = connectionRequest.ConnectionOpportunity.Name,
                 ConnectionOpportunityIcon = connectionRequest.ConnectionOpportunity.IconCssClass,
                 Campus = connectionRequest.Campus?.Name,

Rock.JavaScript.Obsidian.Blocks/src/Engagement/ConnectionsHub/launchWorkflowModal.partial.obs

@@ -17,7 +17,7 @@
         <div class="row">
             <div class="col-md-4">
                 <DropDownList v-model="workflow"
-                              :items="workflowItems"
+                              :items="workflowDropDownItems"
                               label="Workflow"
                               rules="required"
                               showBlankItem
@@ -36,10 +36,11 @@
     import NotificationBox from "@Obsidian/Controls/notificationBox.obs";
     import DropDownList from "@Obsidian/Controls/dropDownList.obs";
     import RequestTable from "./requestTable.partial.obs";
-    import { ref, PropType, watch } from "vue";
+    import { computed, ref, PropType, watch } from "vue";
     import { isNullOrWhiteSpace } from "@Obsidian/Utility/stringUtils";
     import { useVModelPassthrough } from "@Obsidian/Utility/component";
     import { BulkRequestViewBag } from "@Obsidian/ViewModels/Blocks/Engagement/ConnectionsHub/bulkRequestViewBag";
+    import { ConnectionWorkflowBag } from "@Obsidian/ViewModels/Blocks/Engagement/ConnectionsHub/connectionWorkflowBag";
     import { ListItemBag } from "@Obsidian/ViewModels/Utility/listItemBag";
     import { ViewOptions } from "./types.partial";
     import { LaunchWorkflowBag } from "@Obsidian/ViewModels/Blocks/Engagement/ConnectionsHub/launchWorkflowBag";
@@ -51,7 +52,7 @@
         },
 
         workflowItems: {
-            type: Array as PropType<ListItemBag[]>,
+            type: Array as PropType<ConnectionWorkflowBag[]>,
             required: true
         },
 
@@ -85,6 +86,23 @@
 
     const isVisible = useVModelPassthrough(props, "visible", emit);
 
+    const requestOpportunityGuids = computed<string[]>(() => {
+        return [...new Set(
+            props.requestDetails
+                .map(r => r.connectionOpportunityGuid)
+                .filter((g): g is string => !!g)
+        )];
+    });
+
+    const workflowDropDownItems = computed<ListItemBag[]>(() => {
+        const opportunityGuids = requestOpportunityGuids.value;
+
+        return props.workflowItems
+            .filter(w => !w.connectionOpportunityGuid || opportunityGuids.includes(w.connectionOpportunityGuid))
+            .map(w => w.listItemBag)
+            .filter((item): item is ListItemBag => item != null);
+    });
+
     const workflow = ref();
 
     function onSave(): void {

Rock.JavaScript.Obsidian.Blocks/src/Engagement/connectionsHub.obs

@@ -1538,6 +1538,7 @@
         }
 
         const connectionOpportunity = row["connectionOpportunity"] as string | null | undefined;
+        const connectionOpportunityGuid = row["connectionOpportunityGuid"] as string | null | undefined;
         const connectionStatus = row["connectionStatus"] as ConnectionStatusBag | null | undefined;
         const connectionTypeSource = row["connectionTypeSource"] as string | null | undefined;
         const connector = row["connectorDetails"] as ListItemBag | null | undefined;
@@ -1549,6 +1550,7 @@
         return {
             idKey,
             connectionOpportunity,
+            connectionOpportunityGuid,
             connectionStatus,
             connectionTypeSource,
             connector,
@@ -1570,6 +1572,7 @@
         const bag = <BulkRequestViewBag>{
             idKey: box.entity.connectionRequestIdKey,
             connectionOpportunity: box.entity.connectionOpportunityName,
+            connectionOpportunityGuid: box.entity.connectionOpportunityGuid,
             connectionStatus: box.entity.connectionStatus,
             connectionTypeSource: box.entity.connectionTypeSource,
             connector: connector,

Rock.JavaScript.Obsidian/Framework/ViewModels/Blocks/Engagement/ConnectionsHub/bulkRequestViewBag.d.ts

@@ -21,6 +21,7 @@
 // </copyright>
 //
 
+import { Guid } from "@Obsidian/Types";
 import { ConnectionStatusBag } from "@Obsidian/ViewModels/Blocks/Engagement/ConnectionsHub/connectionStatusBag";
 import { PersonFieldBag } from "@Obsidian/ViewModels/Core/Grid/personFieldBag";
 import { ListItemBag } from "@Obsidian/ViewModels/Utility/listItemBag";
@@ -33,6 +34,9 @@ export type BulkRequestViewBag = {
     /** Gets or sets the name of the connection opportunity this request is associated with. */
     connectionOpportunity?: string | null;
 
+    /** Gets or sets the conection opportunity Guid. */
+    connectionOpportunityGuid?: Guid | null;
+
     /** Gets or sets the current connection status of this request. */
     connectionStatus?: ConnectionStatusBag | null;
 

Rock.JavaScript.Obsidian/Framework/ViewModels/Blocks/Engagement/ConnectionsHub/connectionRequestDetailsBag.d.ts

@@ -62,6 +62,9 @@ export type ConnectionRequestDetailsBag = {
     /** Gets or sets the date by which this request was completed. */
     completedDateTime?: string | null;
 
+    /** Gets or sets the GUID of the connection opportunity this request belongs to. */
+    connectionOpportunityGuid?: Guid | null;
+
     /** Gets or sets the CSS icon class for the connection opportunity this request belongs to. */
     connectionOpportunityIcon?: string | null;
 

Rock.JavaScript.Obsidian/Framework/ViewModels/Blocks/Engagement/ConnectionsHub/connectionWorkflowBag.d.ts

@@ -0,0 +1,37 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by the Rock.CodeGeneration project
+//     Changes to this file will be lost when the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+// <copyright>
+// Copyright by the Spark Development Network
+//
+// Licensed under the Rock Community License (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.rockrms.com/license
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </copyright>
+//
+
+import { Guid } from "@Obsidian/Types";
+import { ListItemBag } from "@Obsidian/ViewModels/Utility/listItemBag";
+
+/** Represents a connection workflow that can be launched from the Connections Hub. */
+export type ConnectionWorkflowBag = {
+    /**
+     * Gets or sets the GUID of the Connection Opportunity this workflow belongs to,
+     * or null if this is a Connection Type-level workflow.
+     */
+    connectionOpportunityGuid?: Guid | null;
+
+    /** Gets or sets the workflow item details including the workflow type name and connection workflow identifier. */
+    listItemBag?: ListItemBag | null;
+};

Rock.JavaScript.Obsidian/Framework/ViewModels/Blocks/Engagement/ConnectionsHub/connectionsHubOptionsBag.d.ts

@@ -25,6 +25,7 @@ import { Guid } from "@Obsidian/Types";
 import { ConnectionActivityTypeBag } from "@Obsidian/ViewModels/Blocks/Engagement/ConnectionsHub/connectionActivityTypeBag";
 import { ConnectionOpportunityDetailBag } from "@Obsidian/ViewModels/Blocks/Engagement/ConnectionsHub/connectionOpportunityDetailBag";
 import { ConnectionStatusBag } from "@Obsidian/ViewModels/Blocks/Engagement/ConnectionsHub/connectionStatusBag";
+import { ConnectionWorkflowBag } from "@Obsidian/ViewModels/Blocks/Engagement/ConnectionsHub/connectionWorkflowBag";
 import { ListItemBag } from "@Obsidian/ViewModels/Utility/listItemBag";
 import { PublicAttributeBag } from "@Obsidian/ViewModels/Utility/publicAttributeBag";
 
@@ -103,5 +104,5 @@ export type ConnectionsHubOptionsBag = {
     title?: string | null;
 
     /** Gets or sets the list of workflows that can be launched from connection requests. */
-    workflowItems?: ListItemBag[] | null;
+    workflowItems?: ConnectionWorkflowBag[] | null;
 };

Rock.ViewModels/Blocks/Engagement/ConnectionsHub/BulkRequestViewBag.cs

@@ -45,6 +45,11 @@ public class BulkRequestViewBag
         /// </summary>
         public string ConnectionOpportunity { get; set; }
 
+        /// <summary>
+        /// Gets or sets the conection opportunity Guid.
+        /// </summary>
+        public Guid? ConnectionOpportunityGuid { get; set; }
+
         /// <summary>
         /// Gets or sets the display value of the request source (e.g., a defined value description).
         /// </summary>

Rock.ViewModels/Blocks/Engagement/ConnectionsHub/ConnectionRequestDetailsBag.cs

@@ -66,6 +66,11 @@ public class ConnectionRequestDetailsBag
         /// </summary>
         public DateTimeOffset? FollowUpDate { get; set; }
 
+        /// <summary>
+        /// Gets or sets the GUID of the connection opportunity this request belongs to.
+        /// </summary>
+        public Guid? ConnectionOpportunityGuid { get; set; }
+
         /// <summary>
         /// Gets or sets the name of the connection opportunity this request belongs to.
         /// </summary>

Rock.ViewModels/Blocks/Engagement/ConnectionsHub/ConnectionWorkflowBag.cs

@@ -0,0 +1,40 @@
+// <copyright>
+// Copyright by the Spark Development Network
+//
+// Licensed under the Rock Community License (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.rockrms.com/license
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </copyright>
+//
+
+using System;
+
+using Rock.ViewModels.Utility;
+
+namespace Rock.ViewModels.Blocks.Engagement.ConnectionsHub
+{
+    /// <summary>
+    /// Represents a connection workflow that can be launched from the Connections Hub.
+    /// </summary>
+    public class ConnectionWorkflowBag
+    {
+        /// <summary>
+        /// Gets or sets the workflow item details including the workflow type name and connection workflow identifier.
+        /// </summary>
+        public ListItemBag ListItemBag { get; set; }
+
+        /// <summary>
+        /// Gets or sets the GUID of the Connection Opportunity this workflow belongs to,
+        /// or <c>null</c> if this is a Connection Type-level workflow.
+        /// </summary>
+        public Guid? ConnectionOpportunityGuid { get; set; }
+    }
+}