Skip to content

Commit

Permalink
send whole url string in email link (#1464)
Browse files Browse the repository at this point in the history
* send whole url string in email link

* change version to 5.1.7 for pipeline
  • Loading branch information
bcb37 authored Apr 19, 2024
1 parent 0219808 commit fbdd5b7
Show file tree
Hide file tree
Showing 16 changed files with 37 additions and 36 deletions.
4 changes: 2 additions & 2 deletions backend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion backend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ab_testing_backend",
"version": "5.1.5",
"version": "5.1.7",
"description": "Backend for A/B Testing Project",
"scripts": {
"install:all": "npm ci && cd packages/Scheduler && npm ci && cd ../Upgrade && npm ci",
Expand Down
4 changes: 2 additions & 2 deletions backend/packages/Scheduler/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion backend/packages/Scheduler/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ppl-upgrade-serverless",
"version": "5.1.5",
"version": "5.1.7",
"description": "Serverless webpack example using Typescript",
"main": "handler.js",
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions backend/packages/Upgrade/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion backend/packages/Upgrade/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ab_testing_backend",
"version": "5.1.5",
"version": "5.1.7",
"description": "Backend for A/B Testing Project",
"main": "index.js",
"scripts": {
Expand Down
29 changes: 15 additions & 14 deletions backend/packages/Upgrade/src/api/services/AnalyticsService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -291,42 +291,41 @@ export class AnalyticsService {
break;
}
}
logsUser[userId][queryId] = metricKey[0] + ": " + logsUser[userId][queryId]
logsUser[userId][queryId] = metricKey[0] + ': ' + logsUser[userId][queryId];
}
}
}
// merge with data
const csvRows = csvExportData.map((row) => {
const queryObject = logsUser[row.userId];
const queryDataToAdd = {};
let postRule = "";
let revertToCondition = "";
let postRule = '';
let revertToCondition = '';

for (const queryId in queryObject) {
if (queryObject[queryId]) {
queryDataToAdd[queryNameIdMapping[queryId]] = queryObject[queryId];
}
}
if (row.postRule === "assign") {
if (row.postRule === 'assign') {
if (row.revertTo !== null) {
revertToCondition = row.revertTo;
} else {
revertToCondition = "Default";
revertToCondition = 'Default';
}
postRule = "Assign: " + revertToCondition;
postRule = 'Assign: ' + revertToCondition;
} else {
postRule = "Continue";

postRule = 'Continue';
}

let excludeIfReached = "FALSE";
let excludeIfReached = 'FALSE';
if (row.excludeIfReached) {
excludeIfReached = "TRUE";
excludeIfReached = 'TRUE';
}

let stratification = "NA";
let stratification = 'NA';
if (row.stratification && row.stratificationValue) {
stratification = row.stratification + ": " + row.stratificationValue;
stratification = row.stratification + ': ' + row.stratificationValue;
}
return {
ExperimentId: row.experimentId,
Expand All @@ -347,7 +346,9 @@ export class AnalyticsService {
Payload: row.payload ? row.payload : row.conditionName,
PostRule: postRule,
EnrollmentStartDate: new Date(row.enrollmentStartDate).toISOString(),
EnrollmentCompleteDate: row.enrollmentCompleteDate? new Date(row.enrollmentCompleteDate).toISOString(): "",
EnrollmentCompleteDate: row.enrollmentCompleteDate
? new Date(row.enrollmentCompleteDate).toISOString()
: '',
MarkExperimentPointTime: new Date(row.markExperimentPointTime).toISOString(),
EnrollmentCode: row.enrollmentCode,
ExclusionCode: row.exclusionCode,
Expand Down Expand Up @@ -430,7 +431,7 @@ export class AnalyticsService {
<br>
Here is the exported experiment data:
<br>
<a href="${signedURLMonitored[0]}">Monitored Experiment Data</a>`;
<a href="${signedURLMonitored}">Monitored Experiment Data</a>`;

const emailSubject = `Exported Data for the experiment: ${experiment.name}`;
// send email to the user
Expand Down
2 changes: 1 addition & 1 deletion clientlibs/java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
at the same time that happen to rev to the same new version will be caught
by a merge conflict. -->

<version>5.1.5</version>
<version>5.1.7</version>
<build>
<plugins>
<plugin>
Expand Down
4 changes: 2 additions & 2 deletions clientlibs/js/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion clientlibs/js/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "upgrade_client_lib",
"version": "5.1.5",
"version": "5.1.7",
"description": "Client library to communicate with the Upgrade server",
"files": [
"dist/*"
Expand Down
4 changes: 2 additions & 2 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ab-testing",
"version": "5.1.5",
"version": "5.1.7",
"license": "MIT",
"scripts": {
"ng": "ng",
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "UpGrade",
"version": "5.1.5",
"version": "5.1.7",
"description": "This is a combined repository for UpGrade, an open-source platform to support large-scale A/B testing in educational applications. Learn more at www.upgradeplatform.org",
"main": "index.js",
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions types/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion types/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "upgrade_types",
"version": "5.1.5",
"version": "5.1.7",
"description": "",
"main": "src/index.ts",
"types": "src/index.ts",
Expand Down

0 comments on commit fbdd5b7

Please sign in to comment.