diff --git a/handlers/api-get/milestoneICS.js b/handlers/api-get/milestoneICS.js index c5f40cd8..8d5459ea 100644 --- a/handlers/api-get/milestoneICS.js +++ b/handlers/api-get/milestoneICS.js @@ -116,20 +116,16 @@ function buildEventDescriptionHTML_lots(request, milestone) { '' + ''; for (const lot of milestone.workOrderLots) { - descriptionHTML += - '' + - ('' + - '' + - escapeHTML(lot.lotName ?? '') + - '') + - `${escapeHTML(lot.mapName ?? '')}` + - `${escapeHTML(lot.lotType ?? '')}` + - `${escapeHTML(lot.lotStatus ?? '')}` + - ''; + descriptionHTML += ` + + + ${escapeHTML(lot.lotName ?? '')} + + + ${escapeHTML(lot.mapName ?? '')} + ${escapeHTML(lot.lotType ?? '')} + ${escapeHTML(lot.lotStatus ?? '')} + `; } descriptionHTML += ''; } @@ -152,7 +148,7 @@ function buildEventDescriptionHTML_prints(request, milestone) { '/print/' + printName + '/?workOrderId=' + - milestone.workOrderId) + + milestone.workOrderId.toString()) + '

'; } } @@ -213,7 +209,7 @@ export async function handler(request, response) { }); if (request.query.workOrderId && workOrderMilestones.length > 0) { calendar.name(`Work Order #${workOrderMilestones[0].workOrderNumber}`); - calendar.url(urlRoot + '/workOrders/' + workOrderMilestones[0].workOrderId); + calendar.url(urlRoot + '/workOrders/' + workOrderMilestones[0].workOrderId.toString()); } calendar.prodId({ company: calendarCompany, diff --git a/handlers/api-get/milestoneICS.ts b/handlers/api-get/milestoneICS.ts index cd2934dd..82fd1ffb 100644 --- a/handlers/api-get/milestoneICS.ts +++ b/handlers/api-get/milestoneICS.ts @@ -175,20 +175,16 @@ function buildEventDescriptionHTML_lots( '' for (const lot of milestone.workOrderLots!) { - descriptionHTML += - '' + - ('' + - '' + - escapeHTML(lot.lotName ?? '') + - '') + - `${escapeHTML(lot.mapName ?? '')}` + - `${escapeHTML(lot.lotType ?? '')}` + - `${escapeHTML(lot.lotStatus ?? '')}` + - '' + descriptionHTML += ` + + + ${escapeHTML(lot.lotName ?? '')} + + + ${escapeHTML(lot.mapName ?? '')} + ${escapeHTML(lot.lotType ?? '')} + ${escapeHTML(lot.lotStatus ?? '')} + ` } descriptionHTML += '' @@ -223,7 +219,7 @@ function buildEventDescriptionHTML_prints( '/print/' + printName + '/?workOrderId=' + - milestone.workOrderId) + + milestone.workOrderId!.toString()) + '

' } } @@ -320,7 +316,7 @@ export async function handler( if (request.query.workOrderId && workOrderMilestones.length > 0) { calendar.name(`Work Order #${workOrderMilestones[0].workOrderNumber!}`) - calendar.url(urlRoot + '/workOrders/' + workOrderMilestones[0].workOrderId) + calendar.url(urlRoot + '/workOrders/' + workOrderMilestones[0].workOrderId!.toString()) } calendar.prodId({ diff --git a/package-lock.json b/package-lock.json index 503caf8e..454e024b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35,7 +35,7 @@ "express-session": "^1.17.3", "font-awesome-v5-icons": "^1.3.0", "http-errors": "^2.0.0", - "ical-generator": "^3.6.1", + "ical-generator": "^4.0.0", "leaflet": "^1.9.3", "node-cache": "^5.1.2", "object.hasown": "^1.1.2", @@ -6771,14 +6771,14 @@ } }, "node_modules/ical-generator": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/ical-generator/-/ical-generator-3.6.1.tgz", - "integrity": "sha512-tEH0OTNn00Mp61DcTxIFR+5fhsAivKk1LWAJUAbkMCI+M4yu+cZzT5X8rZf3b5PzFkMogh0zj3PsFh9bHvGGIQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ical-generator/-/ical-generator-4.0.0.tgz", + "integrity": "sha512-zDjku0O3z/nj/XwgWvhj8vcGwZj/09097VelHLIpUJzjfPdUBNnYkYjSsjrHiwc0HodpSA0U4hiJgz8XerHGXw==", "dependencies": { "uuid-random": "^1.3.2" }, "engines": { - "node": ">=12.0.0" + "node": "^14.8.0 || >=16.0.0" }, "peerDependencies": { "@touch4it/ical-timezones": ">=1.6.0", @@ -17773,9 +17773,9 @@ "dev": true }, "ical-generator": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/ical-generator/-/ical-generator-3.6.1.tgz", - "integrity": "sha512-tEH0OTNn00Mp61DcTxIFR+5fhsAivKk1LWAJUAbkMCI+M4yu+cZzT5X8rZf3b5PzFkMogh0zj3PsFh9bHvGGIQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ical-generator/-/ical-generator-4.0.0.tgz", + "integrity": "sha512-zDjku0O3z/nj/XwgWvhj8vcGwZj/09097VelHLIpUJzjfPdUBNnYkYjSsjrHiwc0HodpSA0U4hiJgz8XerHGXw==", "requires": { "uuid-random": "^1.3.2" } diff --git a/package.json b/package.json index caeb286f..40744ad0 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "express-session": "^1.17.3", "font-awesome-v5-icons": "^1.3.0", "http-errors": "^2.0.0", - "ical-generator": "^3.6.1", + "ical-generator": "^4.0.0", "leaflet": "^1.9.3", "node-cache": "^5.1.2", "object.hasown": "^1.1.2",