Merge branch 'develop' into dependabot/npm_and_yarn/multi-0c8d4f7015

This commit is contained in:
Jeremy-Z 2026-06-18 11:23:28 -04:00 committed by GitHub
commit f0dd386153
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 16 additions and 8 deletions

View file

@ -162,6 +162,14 @@ body {
bailoutInfo.push({ name: 'App Name', value: 'ISS' });
bailoutInfo.push({ name: 'Site Name', value: 'ISS 2.0' });
// Build Info
bailoutInfo.push({ name: 'Build Version', value: mainStore.issConfig?.buildInfo?.versionString });
bailoutInfo.push({ name: 'Build Time', value: mainStore.issConfig?.buildInfo?.buildTime });
// ISS Configuration Info
bailoutInfo.push({ name: 'Client Tag', value: mainStore.issConfig?.clientTag });
bailoutInfo.push({ name: 'Client Name', value: mainStore.issConfig?.clientName });
// Not included (yet) from heritage:
// - Site ID
// - Code
@ -356,19 +364,16 @@ body {
diagnosticContainer.remove();
}
// TODO: Re-enable logging after some further testing.
/*
const apiHostname = environmentInfo?.apiHostname;
if(apiHostname) {
try {
const endpointUrl = `https://${apiHostname}/analytics/api/v1/logging/log-error`;
const infoString = bailoutInfo?.map(
(entry) => `${entry.name}: ${entry.value}`
)?.reduce(
(prev, next) => `${prev}\n${next}`
);
const entryString = `User encountered bailout page.\n${new Date()}\n${infoString ?? 'No information recoverable'}`;
const entryString = `User landed on the static-error page.\n${new Date()}\n${infoString ?? 'No information recoverable'}`;
const headers = generateRequestHeader(headerInfo);
@ -419,8 +424,7 @@ body {
console.error(`=== ERROR SENDING PAGEVIEW`);
console.error(e);
}
}
*/
}
};
</script>
</body>

View file

@ -82,6 +82,7 @@ export default {
sessionKey: getSessionKeyValue(),
pageName: currentPageName,
referralSequenceNumber: order.referralSequenceNumber,
referralNumber: order.referralNumber,
parentAccountNumber: parentAccountNumber,
sessionId: getSessionIdValue(),
action: '',
@ -111,6 +112,7 @@ export default {
sessionKey: getSessionKeyValue(),
pageName: currentPageName,
referralSequenceNumber: order.referralSequenceNumber,
referralNumber: order.referralNumber,
parentAccountNumber: parentAccountNumber,
sessionId: getSessionIdValue(),
category,

View file

@ -2574,13 +2574,14 @@ export const useMainStore = defineStore({
});
}
},
async logPageView({ userId, sessionKey, pageName, referralSequenceNumber, parentAccountNumber, sessionId, action, event, shouldUseSessionId, experimentsForUser }) {
async logPageView({ userId, sessionKey, pageName, referralSequenceNumber, referralNumber, parentAccountNumber, sessionId, action, event, shouldUseSessionId, experimentsForUser }) {
const payload = {
userId,
sessionKey,
sessionId,
pageName,
referralSequenceNumber,
referralNumber,
parentAccountNumber,
applicationName: applicationConfig.APPLICATION_NAME,
action,
@ -2602,7 +2603,7 @@ export const useMainStore = defineStore({
}
);
},
async logCustomEvent({ userId, sessionKey, pageName, sessionId, category, action, label, value, shouldUseSessionId, experimentsForUser, referralSequenceNumber, parentAccountNumber }) {
async logCustomEvent({ userId, sessionKey, pageName, sessionId, category, action, label, value, shouldUseSessionId, experimentsForUser, referralSequenceNumber, referralNumber, parentAccountNumber }) {
if (pageName == null || pageName.length === 0) { pageName = 'none'; }
const payload = {
@ -2618,6 +2619,7 @@ export const useMainStore = defineStore({
shouldUseSessionId,
experimentsForUser,
referralSequenceNumber,
referralNumber,
parentAccountNumber
};