Skip to content

Commit 9f45067

Browse files
authored
Merge pull request #831 from GridProtectionAlliance/NotificationPagesUpdate
Notification pages update
2 parents 64e2681 + 2311f6f commit 9f45067

35 files changed

Lines changed: 440 additions & 197 deletions

Source/Applications/SystemCenterNotification/Controllers/EmailTypeController.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
using System.Xml.Linq;
3232
using GSF.Configuration;
3333
using GSF.Data;
34+
using GSF.Data.Model;
3435
using GSF.Web.Model;
3536
using Newtonsoft.Json;
3637
using Newtonsoft.Json.Linq;
@@ -413,4 +414,9 @@ private AdoDataConnection CreateDbConnection()
413414
return connection;
414415
}
415416
}
417+
418+
[RoutePrefix("api/OpenXDA/SentEmail"), ViewOnly, AllowSearch]
419+
public class SentEmailController : ModelController<SentEmail>
420+
{
421+
}
416422
}

Source/Applications/SystemCenterNotification/Scripts/TSX/CellCarrier/ByCellCarrier.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ const ByCellCarrier = (props: IProps) => {
6060

6161

6262
React.useEffect(() => {
63-
if (searchStatus == 'unintiated' || searchStatus == 'changed')
63+
if (searchStatus == 'uninitiated' || searchStatus == 'changed')
6464
dispatch(CellCarrierSlice.DBSearch({ filter: filters, sortField, ascending: asc }));
6565
}, [searchStatus])
6666

6767
React.useEffect(() => {
68-
if (status == 'unintiated' || status == 'changed')
68+
if (status == 'uninitiated' || status == 'changed')
6969
dispatch(CellCarrierSlice.Fetch());
7070
}, [status])
7171

Source/Applications/SystemCenterNotification/Scripts/TSX/EmailCategory/ByEmailCategory.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ const ByEmailCategory = (props: IProps) => {
5555
const asc = useAppSelector(EmailCategorySlice.Ascending);
5656

5757
React.useEffect(() => {
58-
if (status == 'unintiated' || status == 'changed')
58+
if (status == 'uninitiated' || status == 'changed')
5959
dispatch(EmailCategorySlice.Fetch());
6060
}, [status]);
6161

6262
React.useEffect(() => {
63-
if (searchStatus == 'unintiated' || searchStatus == 'changed')
63+
if (searchStatus == 'uninitiated' || searchStatus == 'changed')
6464
dispatch(EmailCategorySlice.DBSearch({ filter: search, sortField, ascending: asc }));
6565
}, [searchStatus])
6666

Source/Applications/SystemCenterNotification/Scripts/TSX/EmailCategory/EmailCategoryForm.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ const EmailCategoryForm = (props: IProps) => {
3636
const status = useAppSelector(EmailCategorySlice.Status);
3737

3838
React.useEffect(() => {
39-
if (status == 'unintiated' || status == 'changed')
39+
if (status == 'uninitiated' || status == 'changed')
4040
dispatch(EmailCategorySlice.Fetch());
4141
}, [status]);
4242

Source/Applications/SystemCenterNotification/Scripts/TSX/EmailCategory/EmailCategoryPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ const EmailCategoryPage = (props: IProps) => {
5555
const [tab, setTab] = React.useState<Tab>(getTab());
5656

5757
React.useEffect(() => {
58-
if (status == 'unintiated' || status == 'changed')
58+
if (status == 'uninitiated' || status == 'changed')
5959
dispatch(EmailCategorySlice.Fetch());
6060
}, [status]);
6161

Source/Applications/SystemCenterNotification/Scripts/TSX/EmailCategory/EmailList.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ const EmailList = (props: IProps) => {
4242
const ascending = useAppSelector(EmailTypeSlice.Ascending);
4343

4444
React.useEffect(() => {
45-
if (props.CategoryID != parentID || status == 'unintiated' || status == 'changed')
45+
if (props.CategoryID != parentID || status == 'uninitiated' || status == 'changed')
4646
dispatch(EmailTypeSlice.Fetch(props.CategoryID));
4747
}, [parentID, status, props.CategoryID])
4848

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,17 +76,17 @@ const ByEmailType = (props: IProps) => {
7676

7777

7878
React.useEffect(() => {
79-
if (categoryStatus == 'unintiated' || categoryStatus == 'changed')
79+
if (categoryStatus == 'uninitiated' || categoryStatus == 'changed')
8080
dispatch(EmailCategorySlice.Fetch());
8181
}, [categoryStatus]);
8282

8383
React.useEffect(() => {
84-
if (status == 'unintiated' || status == 'changed' || parentID != null )
84+
if (status == 'uninitiated' || status == 'changed' || parentID != null )
8585
dispatch(EmailTypeSlice.Fetch());
8686
}, [status, parentID]);
8787

8888
React.useEffect(() => {
89-
if (searchStatus == 'unintiated' || searchStatus == 'changed')
89+
if (searchStatus == 'uninitiated' || searchStatus == 'changed')
9090
dispatch(EmailTypeSlice.DBSearch({ filter: search, sortField, ascending: asc }));
9191
}, [searchStatus])
9292

Source/Applications/SystemCenterNotification/Scripts/TSX/EmailTypes/DatasourceUI/DataSourceModal.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,14 @@ const DataSourceModal = (props: IProps) => {
7575
}, [originalsettings, dataSourceUI]);
7676

7777
React.useEffect(() => {
78-
if (typeStatus == 'unintiated' || typeStatus == 'changed')
78+
if (typeStatus == 'uninitiated' || typeStatus == 'changed')
7979
dispatch(TriggeredDataSourceSlice.Fetch());
8080
}, [typeStatus]);
8181

8282
React.useEffect(() => {
8383
if (props.Record == null)
8484
return
85-
if (settingStatus == 'unintiated' || settingStatus == 'changed' || settingsParentID != props.Record.ID)
85+
if (settingStatus == 'uninitiated' || settingStatus == 'changed' || settingsParentID != props.Record.ID)
8686
dispatch(TriggeredDataSourceSettingSlice.Fetch(props.Record.ID));
8787
}, [settingStatus, props.Record]);
8888

Source/Applications/SystemCenterNotification/Scripts/TSX/EmailTypes/DatasourceUI/DataSourceWindow.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ const DataSourceWindow = (props: IProps) => {
4949
const [showDataSourceModal, setShowDataSourceModal] = React.useState<boolean>(false);
5050

5151
React.useEffect(() => {
52-
if (status == 'unintiated' || status == 'changed' || emailID !== props.Record.ID)
52+
if (status == 'uninitiated' || status == 'changed' || emailID !== props.Record.ID)
5353
dispatch(TriggeredEmailDataSourceSlice.Fetch(props.Record.ID));
5454
}, [status, props.Record.ID, emailID, dataSource]);
5555

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ const EmailForm = (props: IProps) => {
4040

4141

4242
React.useEffect(() => {
43-
if (categoryStatus == 'unintiated' || categoryStatus == 'changed')
43+
if (categoryStatus == 'uninitiated' || categoryStatus == 'changed')
4444
dispatch(EmailCategorySlice.Fetch());
4545
}, [categoryStatus]);
4646

4747

4848
React.useEffect(() => {
49-
if (status == 'unintiated' || status == 'changed')
49+
if (status == 'uninitiated' || status == 'changed')
5050
dispatch(EmailTypeSlice.Fetch());
5151
}, [status]);
5252

0 commit comments

Comments
 (0)