Skip to content

Supporting Release for Connect 2.4.16 #164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Dec 17, 2019
Merged

Supporting Release for Connect 2.4.16 #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f7ca1c2
Merge pull request #157 from maxceem/hotfix/fix-duplicates-in-emails
Oct 3, 2019
5ee40ee
f2f join-dec-btn
PrakashDurlabhji Oct 15, 2019
7e7397f
Merge pull request #159 from PrakashDurlabhji/dev
maxceem Oct 16, 2019
605500a
fix: improved "Join Project" and "Decline" link styles in emails
maxceem Oct 16, 2019
94f84ca
Merge pull request #160 from maxceem/dev
maxceem Oct 16, 2019
126e30d
Skip filtering bot notifications
Dec 16, 2019
5afe050
Fixing issue with coder bot user details call
Dec 16, 2019
cf95611
fix: part two of fixing the coderbot notifications
Dec 16, 2019
306036e
Revert "fix: part two of fixing the coderbot notifications"
Dec 17, 2019
ed655da
Revert "Fixing issue with coder bot user details call"
Dec 17, 2019
9fcd0af
Revert "Skip filtering bot notifications"
Dec 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion connect/connectNotificationServer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,9 +451,13 @@ const handler = (topic, message, logger, callback) => {
logger.debug('filtered notifications: ', allNotifications);
// now let's retrieve some additional data

const ids = [];
logger.debug(message.initiatorUserId, 'message.initiatorUserId');
if (message.initiatorUserId) {
ids.push(message.initiatorUserId);
}
// if message has userId such messages will likely need userHandle and user full name
// so let's get it
const ids = [message.initiatorUserId];
logger.debug(message.userId, 'message.userId');
if (message.userId) {
ids.push(message.userId);
Expand Down
2 changes: 1 addition & 1 deletion connect/notificationServices/email.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function replacePlaceholders(term, data) {
let ret = term;
if (placeholders && placeholders.length) {
_(placeholders).each(p => {
const values = _.map(data, p.slice(1, -1));
const values = _.uniq(_.map(data, p.slice(1, -1)));
// TODO remove this code if possible.
// This code appears to be not in use causing lint errors.
// For now I'm commenting it, in case it contains some valuable logic.
Expand Down
64 changes: 47 additions & 17 deletions emails/src/partials/project-team.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,25 +104,55 @@
<td class="main-td">
<table class="main-child">
<tr>
<td class="empty-child-one"></td>
<td class="second-child" align="center">
{{#if notifications.[0].[connect.notification.project.member.invite.requested]}}
<a href="{{@root.connectURL}}/projects/{{notifications.[0].projectId}}#manageTopcoderTeam">
Manage project team
</a>
{{#if notifications.[0].[connect.notification.project.member.invite.created]}}
<td class="empty-child-one for-two-buttons"></td>
{{#if notifications.[0].[isSSO]}}
<td class="second-child" align="center">
<a href="{{@root.accountsAppURL}}/sso-login/?app=connect&retUrl={{@root.connectURL}}/projects/{{notifications.[0].projectId}}%3Finvitation%3Daccept">
Join Project
</a>
</td>
<td class="empty-width-10"></td>
<td class="second-child" align="center">
<a class="second-btn" href="{{@root.accountsAppURL}}/sso-login/?app=connect&retUrl={{@root.connectURL}}/projects/{{notifications.[0].projectId}}%3Finvitation%3Ddecline">
Decline
</a>
</td>
{{else}}
{{#if notifications.[0].[isSSO]}}
<a href="{{@root.accountsAppURL}}/sso-login/?app=connect&retUrl={{@root.connectURL}}/projects/{{notifications.[0].projectId}}">
SSO Login
</a>
{{else}}
<a href="{{@root.connectURL}}/projects/{{notifications.[0].projectId}}">
View project on Connect
</a>
{{/if}}
<td class="second-child" align="center">
<a href="{{@root.connectURL}}/projects/{{notifications.[0].projectId}}?invitation=accept">
Join Project
</a>
</td>
<td class="empty-width-10"></td>
<td class="second-child" align="center">
<a class="second-btn" href="{{@root.connectURL}}/projects/{{notifications.[0].projectId}}?invitation=decline">
Decline
</a>
</td>
{{/if}}
</td>
<td class="empty-child-one"></td>
<td class="empty-child-one for-two-buttons"></td>
{{else}}
<td class="empty-child-one"></td>
<td class="second-child" align="center">
{{#if notifications.[0].[connect.notification.project.member.invite.requested]}}
<a href="{{@root.connectURL}}/projects/{{notifications.[0].projectId}}#manageTopcoderTeam">
Manage project team
</a>
{{else}}
{{#if notifications.[0].[isSSO]}}
<a href="{{@root.accountsAppURL}}/sso-login/?app=connect&retUrl={{@root.connectURL}}/projects/{{notifications.[0].projectId}}">
SSO Login
</a>
{{else}}
<a href="{{@root.connectURL}}/projects/{{notifications.[0].projectId}}">
View project on Connect
</a>
{{/if}}
{{/if}}
</td>
<td class="empty-child-one"></td>
{{/if}}
</tr>
</table>
</td>
Expand Down
17 changes: 14 additions & 3 deletions emails/src/styles/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,9 @@ table.container, table.footer-container {
height: 15px;
background-color: #FFFFFF; }

.empty-width-10 {
width: 10px; }

.post-details .main-child {
background-color: #FFFFFF; }
.post-details .main-child .empty-child-one {
Expand Down Expand Up @@ -207,22 +210,30 @@ table.container, table.footer-container {
.button-row .main-child .second-child {
border-radius: 4px;
vertical-align: middle;
background-color: #0681FF;
height: 30px; }
.button-row .main-child .second-child a {
border-radius: 4px;
text-align: center;
text-decoration: none;
display: block;
background-color: #0681FF;
padding-top: 6px;
padding-bottom: 5px;
padding-top: 8px;
padding-bottom: 7px;
text-align: center;
color: #FFFFFF;
font-size: 13px; }
.button-row .main-child .second-child a.second-btn {
color: #555555;
border: 1px solid #808080;
background-color: #FFFFFF;
padding-top: 7px;
padding-bottom: 6px;
width: 165px; }

.button-one .main-child .empty-child-one, .button-three .main-child .empty-child-one {
width: 216px; }
.button-one .main-child .empty-child-one.for-two-buttons, .button-three .main-child .empty-child-one.for-two-buttons {
width: 128px; }

.button-one .main-child .second-child, .button-three .main-child .second-child {
width: 167px; }
Expand Down
1 change: 1 addition & 0 deletions emails/src/styles/modules/_color.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ $grey-color: #888894;
$blue-color: #006DEA;
$grey-hyperlink: #808080;
$button-color: #0681FF;
$tc-gray-70: #555555;
25 changes: 22 additions & 3 deletions emails/src/styles/partials/_base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,10 @@ table.container, table.footer-container {
}
}

.empty-width-10 {
width: 10px;
}

// emptys end

// post details
Expand Down Expand Up @@ -306,7 +310,6 @@ table.container, table.footer-container {
// width: 167px;
border-radius: 4px;
vertical-align: middle;
background-color: $button-color;
height: 30px;
a {
// width: 167px;
Expand All @@ -315,12 +318,22 @@ table.container, table.footer-container {
text-decoration: none;
display: block;
background-color: $button-color;
padding-top: 6px;
padding-bottom: 5px;
padding-top: 8px;
padding-bottom: 7px;
text-align: center;
color: $white-background;
font-size: 13px;
}
a {
&.second-btn {
color: $tc-gray-70;
border: 1px solid $grey-hyperlink;
background-color: $white-background;
padding-top: 7px; // minus 1px border-top
padding-bottom: 6px; // minus 1px border-bottom
width: 165px; // minus 2px borders
}
}
}
}
}
Expand All @@ -332,6 +345,12 @@ table.container, table.footer-container {
.main-child {
.empty-child-one {
width: 216px;

// if we have two buttons in one row with 10px spacing between:
// space=128px + button=167px + space=10px + button=167px + space=128px
&.for-two-buttons {
width: 128px;
}
}
.second-child {
width: 167px;
Expand Down