github/oneuptime
1
1
Fork 0
mirror of https://github.com/OneUptime/oneuptime.git synced 2026-04-06 00:32:12 +02:00
Code Issues 193 Packages Projects Releases Wiki Activity

fixed small errors

Browse Source
This commit is contained in:
Nilanshu
2020-11-03 15:20:37 +05:30
parent f708f7696f
commit cbcf3e8960
5 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/backend/services/mailService.js
View File

@@ -1066,6 +1066,8 @@ const _this = {
firstName,
userId,
projectId,
ack_url : acknowledgeUrl,
resolve_url: resolveUrl,
acknowledgeUrl,
resolveUrl,
incidentType,

1
dashboard/.gitignore vendored
View File

@@ -19,6 +19,7 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*
debug.log
yarn.lock
Untitled-1

1
dashboard/debug.log
View File

@@ -65,3 +65,4 @@
[1102/151905.525:ERROR:process_reader_win.cc(151)] SuspendThread: Access is denied. (0x5)
[1102/151905.525:ERROR:process_reader_win.cc(123)] NtOpenThread: {Access Denied} A process has requested access to an object, but has not been granted those access rights. (0xc0000022)
[1102/151905.525:ERROR:exception_snapshot_win.cc(99)] thread ID 13024 not found in process
[1103/081245.415:ERROR:directory_reader_win.cc(43)] FindFirstFile: The system cannot find the path specified. (0x3)

6
dashboard/src/components/nav/TopNav.js
View File

@@ -89,7 +89,8 @@ class TopContent extends Component {
<div
className={`Box-root Flex-flex Flex-direction--row Flex-alignItems--center Box-background--${
incidentCounter > 0 ? 'red' : 'green'
} Text-color--white Border-radius--4 Text-fontWeight--bold Padding-left--8 Padding-right--8 Padding-top--4 Padding-bottom--4 pointer`}
} Text-color--white Border-radius--4 Text-fontWeight--bold Padding-left--8 Padding-right--8 pointer`}
style={{paddingBottom:'6px',paddingTop:'6px'}}
onClick={this.handleActiveIncidentClick}
id="activeIncidents"
>
@@ -125,7 +126,8 @@ class TopContent extends Component {
});
return count > 0 ? (
<div
className="Box-root box__yellow--dark Flex-flex Flex-direction--row Flex-alignItems--center Text-color--white Border-radius--4 Text-fontWeight--bold Padding-left--8 Padding-right--8 Padding-top--4 Padding-bottom--4 pointer Margin-left--20"
className="Box-root box__yellow--dark Flex-flex Flex-direction--row Flex-alignItems--center Text-color--white Border-radius--4 Text-fontWeight--bold Padding-left--8 Padding-right--8 pointer Margin-left--20"
style={{paddingBottom:'6px',paddingTop:'6px'}}
onClick={this.handleActiveIncidentClick}
id="ongoingEvents"
>

15
dashboard/src/components/notification/NotificationMenu.js
View File

@@ -81,7 +81,15 @@ class NotificationMenu extends Component {
render() {
const userId = User.getUserId();
return this.props.notificationsVisible ? (
const allRead = this.props.notifications &&
this.props.notifications.notifications &&
this.props.notifications.notifications
.length ? (
this.props.notifications.notifications
.filter(notification => notification &&
notification.read && notification.read
.indexOf(userId) <= -1)).length : null;
return this.props.notificationsVisible ? (
<div
className="notifications ContextualLayer-layer--topright ContextualLayer-layer--anytop ContextualLayer-layer--anyright ContextualLayer-context--bottom ContextualLayer-context--anybottom ContextualLayer-container ContextualLayer--pointerEvents"
style={{
@@ -138,8 +146,7 @@ class NotificationMenu extends Component {
>
NOTIFICATIONS
</span>
<span
{allRead ? <span
style={{ cursor: 'pointer' }}
onClick={() =>
this.markAllAsRead(
@@ -148,7 +155,7 @@ class NotificationMenu extends Component {
}
>
Mark All As Read
</span>
</span> : ''}
</div>
</div>
<div className="Box-root Padding-vertical--8">