Merge pull request #806 from GridProtectionAlliance/NotificationPages

Notification pages

Author: elwills

Source/Applications/SystemCenterNotification/Controllers/EmailTypeController.cs

@@ -233,7 +233,7 @@ void ConfigureRequest(HttpRequestMessage request)
                 for(int index = 0; index < results.Count(); index++)
                 {
                     XElement data = JsonConvert.DeserializeObject<XElement>(results[index]["Data"].ToString());
-                    results[index]["Data"] = data.ToString() ?? "";
+                    results[index]["Data"] = data?.ToString() ?? "";
                 }
 
                 return Ok(results);

Source/Applications/SystemCenterNotification/Scripts/TSX/EmailTypes/ByEmailType.tsx

@@ -219,7 +219,11 @@ const ByEmailType = (props: IProps) => {
                             Field={'ShowSubscription'}
                             HeaderStyle={{ width: '10%' }}
                             RowStyle={{ width: '10%' }}
-                            Content={({ item }) => item.ShowSubscription ? <ReactIcons.CheckMark Color="var(--success)" /> : <ReactIcons.CrossMark Color="var(--danger)" />}
+                            Content={({ item }) =>
+                                item.ShowSubscription && (categories.find(category => category.ID === item.EmailCategoryID)?.SelfSubscribe ?? false) ?
+                                    <ReactIcons.CheckMark Color="var(--success)" /> :
+                                    <ReactIcons.CrossMark Color="var(--danger)" />
+                            }
                         > Self Subscription
                         </Column>
                         <Column<EmailType>

Source/Applications/SystemCenterNotification/Scripts/TSX/EmailTypes/EmailForm.tsx

@@ -71,7 +71,9 @@ const EmailForm = (props: IProps) => {
                     <Select<EmailType> Record={props.record} Field={'EmailCategoryID'} Label={'Category'}
                         Options={categories.map(c => ({ Value: c.ID.toString(), Label: c.Name }))}
                         Setter={(record) => { record.EmailCategoryID = parseInt(record.EmailCategoryID.toString()); props.setRecord(record) }} />
-                    <CheckBox<EmailType> Record={props.record} Field={'ShowSubscription'} Label={'Allow Self Subscription'} Setter={(record) => props.setRecord(record)} />
+                    <CheckBox<EmailType> Record={props.record} Field={'ShowSubscription'} Label={'Allow Self Subscription'} Setter={(record) => props.setRecord(record)}
+                        Disabled={!(categories.find(category => category.ID === props.record.EmailCategoryID)?.SelfSubscribe ?? false)}
+                        Help={"Category must allow self-subscription to change this setting."} />
                     <CheckBox<EmailType> Record={props.record} Field={'RequireApproval'} Label={'Requires Approval'} Setter={(record) => props.setRecord(record)} />
                 </div>
                 <div className="col">

Source/Applications/SystemCenterNotification/Scripts/TSX/Report/ByReport.tsx

@@ -189,7 +189,11 @@ const ByReport = (props: IProps) => {
                             Field={'ShowSubscription'}
                             HeaderStyle={{ width: '15%' }}
                             RowStyle={{ width: '15%' }}
-                            Content={({ item }) => item.ShowSubscription ? <ReactIcons.CheckMark Color="var(--success)" /> : <ReactIcons.CrossMark Color="var(--danger)" />}
+                            Content={({ item }) =>
+                                item.ShowSubscription && (categories.find(category => category.ID === item.EmailCategoryID)?.SelfSubscribe ?? false) ?
+                                    <ReactIcons.CheckMark Color="var(--success)" /> :
+                                    <ReactIcons.CrossMark Color="var(--danger)" />
+                            }
                         > Self Subscription
                         </Column>
                         <Column<ScheduledEmailType>

Source/Applications/SystemCenterNotification/Scripts/TSX/Report/ReportForm.tsx

@@ -75,7 +75,9 @@ const ReportForm = (props: IProps) => {
                     Label={'File Path'}
                     Help={'Specify the path to save this Report as a file. The subject will be used for the file name. If File Path is left empty, no file will be saved.'}
                     Valid={Valid} Setter={(record) => props.setRecord(record)} />
-                <CheckBox<ScheduledEmailType> Record={props.record} Field={'ShowSubscription'} Label={'Allow Self Subscription'} Setter={(record) => props.setRecord(record)} />
+                <CheckBox<ScheduledEmailType> Record={props.record} Field={'ShowSubscription'} Label={'Allow Self Subscription'} Setter={(record) => props.setRecord(record)}
+                    Disabled={!(categories.find(category => category.ID === props.record.EmailCategoryID)?.SelfSubscribe ?? false)}
+                    Help={"Category must allow self-subscription to change this setting."} />
                 <CheckBox<ScheduledEmailType> Record={props.record} Field={'RequireApproval'} Label={'Requires Approval'} Setter={(record) => props.setRecord(record)} />
                 <CheckBox<ScheduledEmailType> Record={props.record} Field={'SMS'} Label={'Send as a Text'} Setter={(record) => props.setRecord(record)} />
             </div>