Skip to content
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

Jump to bottom

More GA4 Updates #2285

Merged
merged 11 commits into from Feb 22, 2024
Merged

More GA4 Updates #2285

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
24a9cd1
Update Gtag on 404 and 500 pages
thostetler Feb 15, 2024
13b2c1a
Cover additional cases in analytics
thostetler Feb 15, 2024
95c79d4
Update analytics calls in Resources
thostetler Feb 15, 2024
859a819
Fix timing calls
thostetler Feb 15, 2024
1b0b718
Consolidate and fix resource quick link calls
thostetler Feb 15, 2024
cdb39ea
Fix the export component route handler
thostetler Feb 15, 2024
6ed26e8
Couple of changes to some analytics calls
thostetler Feb 15, 2024
3857f28
Fix bug in classic_form property list
thostetler Feb 15, 2024
facf0e2
Attempt to pass a good user_id to GA
thostetler Feb 15, 2024
d0ecfc8
Add view_item and view_item_list events
thostetler Feb 22, 2024
10407a2
fix test
thostetler Feb 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
142 changes: 67 additions & 75 deletions src/404.html
View file
Open in desktop
@@ -1,79 +1,71 @@
<!DOCTYPE html>
<html>
<head>
<link rel="preload" href="./styles/css/styles.css" as="style" />
<link rel="stylesheet" href="./styles/css/styles.css" />
<link rel="preload" href="./libs/require.js" as="script" />
<!-- favicon -->
<link rel="apple-touch-icon" sizes="180x180" href="./styles/favicon/apple-touch-icon.png" />
<link rel="icon" type="image/png" sizes="32x32" href="./styles/favicon/favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="16x16" href="./styles/favicon/favicon-16x16.png" />
<link rel="manifest" href="./styles/favicon/site.webmanifest" />
<link rel="mask-icon" href="./styles/favicon/safari-pinned-tab.svg" color="#5bbad5" />
<meta name="apple-mobile-web-app-title" content="NASA ADS" />
<meta name="application-name" content="NASA ADS" />
<meta name="msapplication-TileColor" content="#ffc40d" />
<meta name="theme-color" content="#ffffff" />
<!-- /favicon -->
<script src="./libs/require.js"></script>
<script>
require.config({
paths: {
underscore: [
'https://unpkg.com/lodash@2.4.2/dist/lodash.compat.min',
'libs/lodash',
],
'google-analytics': ['libs/g', 'data:application/javascript,'],
analytics: 'js/components/analytics',
jquery: [
'https://unpkg.com/jquery@2.2.4/dist/jquery.min',
'libs/jquery',
],
},
shim: {
'google-analytics': {
exports: '__ga__',
},
},
callback: function() {
window.GoogleAnalyticsObject = '__ga__';
<head>
<link rel="preload" href="./styles/css/styles.css" as="style"/>
<link rel="stylesheet" href="./styles/css/styles.css"/>
<link rel="preload" href="./libs/require.js" as="script"/>
<!-- favicon -->
<link rel="apple-touch-icon" sizes="180x180" href="./styles/favicon/apple-touch-icon.png"/>
<link rel="icon" type="image/png" sizes="32x32" href="./styles/favicon/favicon-32x32.png"/>
<link rel="icon" type="image/png" sizes="16x16" href="./styles/favicon/favicon-16x16.png"/>
<link rel="manifest" href="./styles/favicon/site.webmanifest"/>
<link rel="mask-icon" href="./styles/favicon/safari-pinned-tab.svg" color="#5bbad5"/>
<meta name="apple-mobile-web-app-title" content="NASA ADS"/>
<meta name="application-name" content="NASA ADS"/>
<meta name="msapplication-TileColor" content="#ffc40d"/>
<meta name="theme-color" content="#ffffff"/>
<!-- /favicon -->
<script src="./libs/require.js"></script>
<!-- Google Tag Manager -->
<script>(function (w, d, s, l, i) {
w[l] = w[l] || [];
w[l].push({
'gtm.start':
new Date().getTime(), event: 'gtm.js',
});
var f = d.getElementsByTagName(s)[0],
j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : '';
j.async = true;
j.src =
'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
f.parentNode.insertBefore(j, f);
})(window, document, 'script', 'dataLayer', 'GTM-NT2453N');</script>
<!-- End Google Tag Manager -->
<script>
require.config({
paths: {
underscore: [
'https://unpkg.com/lodash@2.4.2/dist/lodash.compat.min',
'libs/lodash',
],
analytics: 'js/components/analytics',
jquery: [
'https://unpkg.com/jquery@2.2.4/dist/jquery.min',
'libs/jquery',
],
},
});
require(['analytics'], function (analytics) {
analytics('send', 'virtual_page_view', '/404');
analytics(
'send',
'event',
'error',
'automatic_redirection',
'404.html',
);
});
</script>
</head>
<body>
<div
style="display: flex; flex-direction: column; min-height: screen; min-width: screen; justify-content: center; align-items: center;"
>
<h1>Bumblebee failed to load. Please try again.</h1>

require(['config/discovery.vars'], function(config) {
setTimeout(function() {
require(['google-analytics', 'analytics'], function() {
var qa = window[window.GoogleAnalyticsObject];
qa.l = Date.now();
qa(
'create',
config.googleTrackingCode || '',
config.googleTrackingOptions
);
});
}, 0);
});
},
});
require(['analytics'], function(analytics) {
analytics('send', 'pageview');
analytics(
'send',
'event',
'error',
'automatic_redirection',
'404.html'
);
});
</script>
</head>
<body>
<div
style="display: flex; flex-direction: column; min-height: screen; min-width: screen; justify-content: center; align-items: center;"
>
<h1>Bumblebee failed to load. Please try again.</h1>

<h2>
<a href="javascript:history.back()">Go Back</a>
</h2>
</div>
</body>
<h2>
<a href="javascript:history.back()">Go Back</a>
</h2>
</div>
</body>
</html>
211 changes: 102 additions & 109 deletions src/500.html
View file
Open in desktop
@@ -1,116 +1,109 @@
<!DOCTYPE html>
<html>
<head>
<link rel="preload" href="./styles/css/styles.css" as="style" />
<link rel="preload" href="./libs/require.js" as="script" />
<link rel="stylesheet" href="./styles/css/styles.css" />
<!-- favicon -->
<link rel="apple-touch-icon" sizes="180x180" href="./styles/favicon/apple-touch-icon.png" />
<link rel="icon" type="image/png" sizes="32x32" href="./styles/favicon/favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="16x16" href="./styles/favicon/favicon-16x16.png" />
<link rel="manifest" href="./styles/favicon/site.webmanifest" />
<link rel="mask-icon" href="./styles/favicon/safari-pinned-tab.svg" color="#5bbad5" />
<meta name="apple-mobile-web-app-title" content="NASA ADS" />
<meta name="application-name" content="NASA ADS" />
<meta name="msapplication-TileColor" content="#ffc40d" />
<meta name="theme-color" content="#ffffff" />
<!-- /favicon -->
<script src="./libs/require.js"></script>
<script>
!window.requirejs &&
document.write(
'<script src="./libs/requirejs/require.js">\x3C/script>'
);
</script>
<script>
require.config({
paths: {
underscore: [
'https://unpkg.com/lodash@2.4.2/dist/lodash.compat.min',
'libs/lodash',
],
'google-analytics': ['libs/g', 'data:application/javascript,'],
analytics: 'js/components/analytics',
jquery: [
'https://unpkg.com/jquery@2.2.4/dist/jquery.min',
'libs/jquery',
],
},
shim: {
'google-analytics': {
exports: '__ga__',
},
},
callback: function() {
window.GoogleAnalyticsObject = '__ga__';
require(['config/discovery.vars'], function(config) {
setTimeout(function() {
require(['google-analytics', 'analytics'], function() {
var qa = window[window.GoogleAnalyticsObject];
qa.l = Date.now();
qa(
'create',
config.googleTrackingCode || '',
config.googleTrackingOptions
);
});
}, 0);
});
},
});
require(['analytics'], function(analytics) {
analytics('send', 'pageview');
analytics(
'send',
'event',
'error',
'automatic_redirection',
'404.html'
);
});
</script>
<style>
@keyframes moveAcross {
from {
left: -75%;
}
to {
left: 75%;
}
<head>
<link rel="preload" href="./styles/css/styles.css" as="style"/>
<link rel="preload" href="./libs/require.js" as="script"/>
<link rel="stylesheet" href="./styles/css/styles.css"/>
<!-- favicon -->
<link rel="apple-touch-icon" sizes="180x180" href="./styles/favicon/apple-touch-icon.png"/>
<link rel="icon" type="image/png" sizes="32x32" href="./styles/favicon/favicon-32x32.png"/>
<link rel="icon" type="image/png" sizes="16x16" href="./styles/favicon/favicon-16x16.png"/>
<link rel="manifest" href="./styles/favicon/site.webmanifest"/>
<link rel="mask-icon" href="./styles/favicon/safari-pinned-tab.svg" color="#5bbad5"/>
<meta name="apple-mobile-web-app-title" content="NASA ADS"/>
<meta name="application-name" content="NASA ADS"/>
<meta name="msapplication-TileColor" content="#ffc40d"/>
<meta name="theme-color" content="#ffffff"/>
<!-- /favicon -->
<script src="./libs/require.js"></script>
<script>
!window.requirejs &&
document.write(
'<script src="./libs/requirejs/require.js">\x3C/script>',
);
</script>
<!-- Google Tag Manager -->
<script>(function (w, d, s, l, i) {
w[l] = w[l] || [];
w[l].push({
'gtm.start':
new Date().getTime(), event: 'gtm.js',
});
var f = d.getElementsByTagName(s)[0],
j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : '';
j.async = true;
j.src =
'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
f.parentNode.insertBefore(j, f);
})(window, document, 'script', 'dataLayer', 'GTM-NT2453N');</script>
<!-- End Google Tag Manager -->
<script>
require.config({
paths: {
underscore: [
'https://unpkg.com/lodash@2.4.2/dist/lodash.compat.min',
'libs/lodash',
],
analytics: 'js/components/analytics',
jquery: [
'https://unpkg.com/jquery@2.2.4/dist/jquery.min',
'libs/jquery',
],
},
});
require(['analytics'], function (analytics) {
analytics('send', 'virtual_page_view', '/500');
analytics(
'send',
'event',
'error',
'automatic_redirection',
'500.html',
);
});
</script>
<style>
@keyframes moveAcross {
from {
left: -75%;
}

body {
max-width: 100%;
overflow-x: hidden;
to {
left: 75%;
}
}

.mobile-bbb {
position: relative;
width: 40%;
margin-bottom: 40px;
animation: moveAcross linear 20s forwards infinite;
}
body {
max-width: 100%;
overflow-x: hidden;
}

p {
font-size: 18px;
}
</style>
</head>
<body>
<div style="text-align: center;margin-top:10%">
<img
src="/styles/img/500_bumblerocket.png"
alt="500 error image"
class="mobile-bbb"
/>
<h1>500</h1>
<h3>We've made an error.</h3>
<p>
<a href="/">Click here to try going to the home page.</a>
</p>
<p>
If that doesn't work, please try again later.
</p>
</div>
</body>
.mobile-bbb {
position: relative;
width: 40%;
margin-bottom: 40px;
animation: moveAcross linear 20s forwards infinite;
}

p {
font-size: 18px;
}
</style>
</head>
<body>
<div style="text-align: center;margin-top:10%">
<img
src="/styles/img/500_bumblerocket.png"
alt="500 error image"
class="mobile-bbb"
/>
<h1>500</h1>
<h3>We've made an error.</h3>
<p>
<a href="/">Click here to try going to the home page.</a>
</p>
<p>
If that doesn't work, please try again later.
</p>
</div>
</body>
</html>
9 changes: 5 additions & 4 deletions src/js/apps/discovery/main.js
View file
Open in desktop
Expand Up @@ -194,10 +194,10 @@ define(['config/discovery.config', 'module'], function(config, module) {
const url = window.getCanonicalUrl();
const msg = `
<p>
You are using a proxied version of ADS, we recommend you switch to the regular non-proxied URL:
You are using a proxied version of ADS, we recommend you switch to the regular non-proxied URL:
<a href="${url}${location.pathname}" rel="noopener noreferrer">${url}</a></p>
<p>
Configure authenticated access to publisher content via the Library Link Server in your account
Configure authenticated access to publisher content via the Library Link Server in your account
<a href="${url}/user/settings/librarylink" rel="noopener noreferrer">preferences</a>.
</p>
`;
Expand All @@ -216,8 +216,9 @@ define(['config/discovery.config', 'module'], function(config, module) {

if (window.__PAGE_LOAD_TIMESTAMP) {
var time = new Date() - window.__PAGE_LOAD_TIMESTAMP;
analytics('send', {
hitType: 'timing',
analytics('send',
'timing',
{
timingCategory: 'Application',
timingVar: 'Loaded',
timingValue: time,
Expand Down