diff --git a/app/assets/javascripts/dashboardVisualization.js b/app/assets/javascripts/dashboardVisualization.js index d83c63b35..cc0b524d4 100644 --- a/app/assets/javascripts/dashboardVisualization.js +++ b/app/assets/javascripts/dashboardVisualization.js @@ -187,12 +187,15 @@ var socket = io(); var eventType = type === 'service' ? 'fetch_daily_stats' : 'fetch_daily_stats_by_user'; + var socketConnect = type === 'service' ? 'daily_stats_update' : 'daily_stats_by_user_update'; - socket.on('connect', function() { + socket.on('connect', function () { + const userId = ctx.getAttribute('data-service-id'); // Assuming user ID is the same as service ID + console.log(`User ID: ${userId}`); socket.emit(eventType); }); - socket.on('daily_stats_update', function(data) { + socket.on(socketConnect, function(data) { console.log('Received data:', data); // Log the received data var labels = []; @@ -206,7 +209,7 @@ labels.push(formattedDate); deliveredData.push(data[dateString].sms.delivered); - failedData.push(data[dateString].sms.failed !== undefined ? data[dateString].sms.failed : 0); + failedData.push(data[dateString].sms.failure !== undefined ? data[dateString].sms.failure : 0); } console.log('Formatted labels:', labels); // Log the formatted labels diff --git a/package-lock.json b/package-lock.json index 608add57d..80d7e2e7e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,12 +16,12 @@ "govuk_frontend_toolkit": "8.1.0", "govuk-frontend": "2.13.0", "hogan": "1.0.2", - "jquery": "3.6.1", + "jquery": "3.7.1", "morphdom": "2.6.1", "python": "^0.0.4", "query-command-supported": "1.0.0", "sass-embedded": "^1.69.5", - "socket.io-client": "^4.7.5", + "socket.io-client": "^4.2.0", "textarea-caret": "3.1.0", "timeago": "1.6.7" }, @@ -30,8 +30,8 @@ "@babel/preset-env": "7.19.4", "@uswds/compile": "^1.1.0", "better-npm-audit": "^3.7.3", - "gulp": "4.0.2", - "gulp-add-src": "1.0.0", + "gulp": "^4.0.2", + "gulp-add-src": "^1.0.0", "gulp-babel": "8.0.0", "gulp-better-rollup": "4.0.1", "gulp-clean-css": "4.3.0", @@ -10232,9 +10232,9 @@ } }, "node_modules/jquery": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.1.tgz", - "integrity": "sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw==" + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz", + "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==" }, "node_modules/js-tokens": { "version": "4.0.0", diff --git a/poetry.lock b/poetry.lock index 925f6722a..6ce449b3e 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1681,7 +1681,6 @@ files = [ {file = "msgpack-1.0.8-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5fbb160554e319f7b22ecf530a80a3ff496d38e8e07ae763b9e82fadfe96f273"}, {file = "msgpack-1.0.8-cp39-cp39-win32.whl", hash = "sha256:f9af38a89b6a5c04b7d18c492c8ccf2aee7048aff1ce8437c4683bb5a1df893d"}, {file = "msgpack-1.0.8-cp39-cp39-win_amd64.whl", hash = "sha256:ed59dd52075f8fc91da6053b12e8c89e37aa043f8986efd89e61fae69dc1b011"}, - {file = "msgpack-1.0.8-py3-none-any.whl", hash = "sha256:24f727df1e20b9876fa6e95f840a2a2651e34c0ad147676356f4bf5fbb0206ca"}, {file = "msgpack-1.0.8.tar.gz", hash = "sha256:95c02b0e27e706e48d0e5426d1710ca78e0f0628d6e89d5b5a5b91a5f12274f3"}, ]