Skip to content

Commit 7c3c784

Browse files
authored
HP-1666 Feat/faro (#1586)
* add faro * remove dd * add faro * update faro init * update csp * update collector url * add dd back * update * add more faro options * add faro to all bundle * fix properly disable faro * fix * rename ddKnownBotRegex * re org grafanaFaroConfig * fix * fix typo * trigger quay
1 parent 7beca72 commit 7c3c784

12 files changed

+1094
-249
lines changed

dev.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
- https://atlas.qa-mickey.planx-pla.net for Atlas iframe in VHDC qa-mickey
1212
- https://*.quicksight.aws.amazon.com for loading AWS Quicksight dashboards into COVID-19 Home page
1313
-->
14-
<meta http-equiv="Content-Security-Policy" content="default-src 'self' https://login.bionimbus.org https://wayf.incommonfederation.org; child-src blob:; connect-src 'self' blob: localhost https://localhost:9443 wss://localhost:9443 https://*.s3.amazonaws.com https://*.mapbox.com https://opendata.datacommons.io https://static.planx-pla.net https://*.logs.datadoghq.com https://clinicaltrials.gov https://*.google-analytics.com https://*.analytics.google.com https://*.zendesk.com; img-src 'self' https://opendata.datacommons.io https://static.planx-pla.net https://www.google-analytics.com data: https://*.s3.amazonaws.com https://www.google-analytics.com; script-src 'self' 'unsafe-eval' https://*.google-analytics.com https://www.googletagmanager.com localhost https://localhost:9443; worker-src 'self' blob:; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com localhost https://localhost:9443; object-src 'none'; font-src 'self' data: https://fonts.googleapis.com https://fonts.gstatic.com; frame-src 'self' https://auspice.planx-pla.net https://auspice.pandemicresponsecommons.org https://atlas.qa-mickey.planx-pla.net https://*.quicksight.aws.amazon.com; ">
14+
<meta http-equiv="Content-Security-Policy" content="default-src 'self' https://login.bionimbus.org https://wayf.incommonfederation.org; child-src blob:; connect-src 'self' blob: localhost https://localhost:9443 wss://localhost:9443 https://*.s3.amazonaws.com https://*.mapbox.com https://opendata.datacommons.io https://static.planx-pla.net https://faro.planx-pla.net https://*.logs.datadoghq.com https://clinicaltrials.gov https://*.google-analytics.com https://*.analytics.google.com https://*.zendesk.com; img-src 'self' https://opendata.datacommons.io https://static.planx-pla.net https://www.google-analytics.com data: https://*.s3.amazonaws.com https://www.google-analytics.com; script-src 'self' 'unsafe-eval' https://*.google-analytics.com https://www.googletagmanager.com localhost https://localhost:9443; worker-src 'self' blob:; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com localhost https://localhost:9443; object-src 'none'; font-src 'self' data: https://fonts.googleapis.com https://fonts.gstatic.com; frame-src 'self' https://auspice.planx-pla.net https://auspice.pandemicresponsecommons.org https://atlas.qa-mickey.planx-pla.net https://*.quicksight.aws.amazon.com; ">
1515
<meta name="viewport" content="width=device-width" />
1616
<link href="https://fonts.googleapis.com/icon?family=Source+Sans+Pro" rel="stylesheet">
1717
<link href="https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,400;0,700;1,700&display=swap" rel="stylesheet">

docs/portal_config.md

+12-6
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ Below is an example, with inline comments describing what each JSON block config
1414
"ddEnv": "DEV", // optional; the Datadog RUM option specifying the application’s environment, for example: prod, pre-prod, staging, etc. Can be determined automatically if omitted
1515
"ddUrl": "", // optional: the Datadog RUM site/url. Defaults to datadoghq.com
1616
"ddSampleRate": 100, // optional; numeric; the Datadog RUM option specifying the percentage of sessions to track: 100 for all, 0 for none. Default to 100 if omitted
17+
"grafanaFaroConfig": {
18+
"grafanaFaroEnable": true, // optional; flag to turn on Grafana Faro RUM, default to false
19+
"grafanaFaroEnv": "DEV", // optional; the Grafana Faro RUM option specifying the application’s environment, for example: prod, pre-prod, staging, etc. Can be determined automatically if omitted. But it is highly recommended to customize it to include project information, such as 'healprod'
20+
"grafanaFaroUrl": "", // optional: the Grafana Faro collector url. Defaults to https://faro.planx-pla.net/collect
21+
"grafanaFaroSampleRate": 1, // optional; numeric; the Grafana Faro option specifying the percentage of sessions to track: 1 for all, 0 for none. Default to 1 if omitted
22+
},
1723
"DAPTrackingURL": "https://dap.digitalgov.gov/Universal-Federated-Analytics-Min.js?agency=AGENCY&subagency=SUB", // optional, for adding DAP tracking feature if specified (see https://github.com/digital-analytics-program/gov-wide-code#participating-in-the-dap)
1824
"graphql": { // required; start of query section - these attributes must be in the dictionary
1925
"boardCounts": [ // required; graphQL fields to query for the homepage chart
@@ -49,7 +55,7 @@ Below is an example, with inline comments describing what each JSON block config
4955
"components": {
5056
"appName": "Gen3 Generic Data Commons", // required; title of commons that appears on the homepage
5157
"metaDescription": "", // optional; meta description used by search engines
52-
"banner": [ // optional; banner displayed accross top of all of data portal
58+
"banner": [ // optional; banner displayed across top of all of data portal
5359
{
5460
"type": "info", // Type of Alert styles, options: success, info, warning, error
5561
"message": "I'm a banner", // message to be displayed
@@ -148,13 +154,13 @@ Below is an example, with inline comments describing what each JSON block config
148154
"text": "This is a generic Gen3 data commons.", // optional; text on the login page
149155
"contact": "If you have any questions about access or the registration process, please contact ", // optional; text for the contact section of the login page
150156
"email": "[email protected]", // optional; email for contact
151-
"image": "gene" // optional; images displayed on the login page
152-
"hideNavLink": false// optional default false; hide login link in main naviagion
157+
"image": "gene", // optional; images displayed on the login page
158+
"hideNavLink": false// optional default false; hide login link in main navigation
153159
},
154160
"systemUse" : { // optional; will show a Use Message in a popup, to inform users of the use policy of the commons. It will display a message which requires acceptance before a user can use the site.
155161
"systemUseTitle" : "", // required; Title of the popup dialog
156-
"systemUseText" : [""] // required; Message to show in a popup which is used to notify the user of site policy and use restrictions
157-
"expireUseMsgDays" : 0, // optional; the number of days to keep cookie once the "Accept" button is clicked, the default is 0 which sets the cookie to be a browser session cookie
162+
"systemUseText" : [""], // required; Message to show in a popup which is used to notify the user of site policy and use restrictions
163+
"expireUseMsgDays": 0, // optional; the number of days to keep cookie once the "Accept" button is clicked, the default is 0 which sets the cookie to be a browser session cookie
158164
"showOnlyOnLogin" : false, // optional; if set to true, the USe Message will only be shown after a success login
159165
},
160166
"footer": {
@@ -727,7 +733,7 @@ Below is an example, with inline comments describing what each JSON block config
727733
"connectSrcCSPWhitelist": [ // optional; Array of urls to add to the header CSP (Content-Security-Policy) connect-src 'self'
728734
"https://example.s3.amazonaws.com" // full url to be added
729735
],
730-
"analysisTools": [ // analysis apps to be diplayed at the /analysis/ page.
736+
"analysisTools": [ // analysis apps to be displayed at the /analysis/ page.
731737
{
732738
"appId": "myAppId", // Optional. Can be used to ensure the app path after the /analysis/ subpath is fixed, e.g. URL https://SERVER-DOMAIN/analysis/myAppId. If not set, then "title" (below) is used.
733739
"title": "My app title", // App title/name, also displayed on the App card in the /analysis page

0 commit comments

Comments
 (0)