Merge pull request #1299 from GSA/4567_set-up-gtag-datalayer

4567- Remove all instances of ckanext-googleanalytics
GSA · Apr 9, 2024 · 8d18842 · 8d18842
2 parents 6698694 + 88dd610
commit 8d18842
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 17 deletions.
diff --git a/.env b/.env
@@ -47,7 +47,7 @@ CKAN_SMTP_MAIL_FROM=ckan@localhost
 # Extensions
 # TODO: Reenable pending https://github.com/GSA/data.gov/issues/3986
 # qa archiver
-CKAN__PLUGINS=image_view text_view recline_view metrics_dashboard report ckan_harvester datajson_validator datajson_harvest geodatagov datagovtheme datagov_harvest geodatagov_miscs z3950_harvester arcgis_harvester geodatagov_geoportal_harvester waf_harvester_collection geodatagov_csw_harvester geodatagov_doc_harvester geodatagov_waf_harvester spatial_metadata spatial_query spatial_harvest_metadata_api googleanalytics dcat dcat_json_interface structured_data datagovcatalog envvars
+CKAN__PLUGINS=image_view text_view recline_view metrics_dashboard report ckan_harvester datajson_validator datajson_harvest geodatagov datagovtheme datagov_harvest geodatagov_miscs z3950_harvester arcgis_harvester geodatagov_geoportal_harvester waf_harvester_collection geodatagov_csw_harvester geodatagov_doc_harvester geodatagov_waf_harvester spatial_metadata spatial_query spatial_harvest_metadata_api dcat dcat_json_interface structured_data datagovcatalog envvars
 
 # Extensions that exist but are not used in dev:
 # - ckanext-saml2

diff --git a/ckan/requirements.in b/ckan/requirements.in
@@ -2,7 +2,6 @@
 ckan==2.10.4
 git+https://github.com/ckan/ckanext-dcat@master#egg=ckanext-dcat
 -e git+https://github.com/ckan/[email protected]#egg=ckanext-harvest
--e git+https://github.com/ckan/ckanext-googleanalytics.git@master#egg=ckanext-googleanalytics
 -e git+https://github.com/ckan/[email protected]#egg=ckanext-spatial
 git+https://github.com/GSA/ckanext-saml2auth.git@create_user_via_saml.log_210#egg=ckanext-saml2auth
 # -e git+https://github.com/ckan/ckanext-qa.git@master#egg=ckanext-qa
@@ -26,13 +25,6 @@ pika>=1.1.0,<1.3.0
 # requests>=2.11.1 # included in ckan core
 # six>=1.12.0 # included in dcat
 
-# ckanext-googleanalytics
-# https://github.com/ckan/ckanext-googleanalytics/blob/master/requirements.txt
-gdata>=2.0.0
-google-api-python-client>=1.6.1, <1.7.0
-pyOpenSSL>=16.2.0
-rsa>=4.7
-
 # ckanext-archiver
 # https://github.com/ckan/ckanext-archiver/blob/master/requirements.txt
 progressbar2==3.53.3

diff --git a/ckan/requirements.txt b/ckan/requirements.txt
@@ -18,7 +18,6 @@ ckanext-datajson==0.1.23
 ckanext-dcat @ git+https://github.com/ckan/ckanext-dcat@e2183dd13bf2dbb0532281d84225f909b8362dd3
 ckanext-envvars==0.0.3
 ckanext-geodatagov==0.2.8
--e git+https://github.com/ckan/ckanext-googleanalytics.git@24d9a7ff62235bc2d543e6594f7362763411b0f9#egg=ckanext_googleanalytics
 -e git+https://github.com/ckan/ckanext-harvest.git@9fb44f79809a1c04dfeb0e1ca2540c5ff3cacef4#egg=ckanext_harvest
 ckanext-metrics-dashboard==0.1.6
 -e git+https://github.com/ckan/ckanext-report.git@3588577f46d17e5f6ef163bb984d0e7016daef71#egg=ckanext_report

diff --git a/ckan/setup/ckan.ini b/ckan/setup/ckan.ini
@@ -135,7 +135,7 @@ ckan.cors.origin_whitelist = https://data.gov https://www.data.gov
 #		same origin policy
 # TODO: Re-enable pending https://github.com/GSA/data.gov/issues/3986
 # qa archiver
-ckan.plugins = image_view text_view recline_view metrics_dashboard report ckan_harvester datajson_validator datajson_harvest geodatagov datagovtheme datagov_harvest geodatagov_miscs z3950_harvester arcgis_harvester geodatagov_geoportal_harvester waf_harvester_collection geodatagov_csw_harvester geodatagov_doc_harvester geodatagov_waf_harvester spatial_metadata spatial_query spatial_harvest_metadata_api googleanalytics dcat dcat_json_interface structured_data datagovcatalog saml2auth envvars
+ckan.plugins = image_view text_view recline_view metrics_dashboard report ckan_harvester datajson_validator datajson_harvest geodatagov datagovtheme datagov_harvest geodatagov_miscs z3950_harvester arcgis_harvester geodatagov_geoportal_harvester waf_harvester_collection geodatagov_csw_harvester geodatagov_doc_harvester geodatagov_waf_harvester spatial_metadata spatial_query spatial_harvest_metadata_api dcat dcat_json_interface structured_data datagovcatalog saml2auth envvars
 
 # Define which views should be created by default
 # (plugins must be loaded in ckan.plugins)
@@ -282,9 +282,6 @@ ckanext.saml2auth.enable_ckan_internal_login=false
 ckanext.saml2auth.create_user_via_saml=false
 
 
-# Google Analytics
-googleanalytics.id = UA-00000000-0
-
 # ckanext-geodatagov settings
 
 ckanext.geodatagov.bureau_csv.url=https://resources.data.gov/schemas/dcat-us/v1.1/omb_bureau_codes.csv

diff --git a/ckan/test-catalog-next.ini b/ckan/test-catalog-next.ini
@@ -10,10 +10,9 @@ use = config:test-core.ini
 
 ckan.site_title = My Test CKAN Site
 ckan.site_description = A test site for testing my CKAN extension
-ckan.plugins = envvars image_view text_view recline_view datastore datagov_harvest ckan_harvester geodatagov datajson datajson_harvest geodatagov_miscs z3950_harvester arcgis_harvester geodatagov_geoportal_harvester waf_harvester_collection geodatagov_csw_harvester geodatagov_doc_harvester geodatagov_waf_harvester spatial_metadata spatial_query report qa archiver datagovtheme datagovcatalog googleanalytics dcat dcat_json_interface structured_data
+ckan.plugins = envvars image_view text_view recline_view datastore datagov_harvest ckan_harvester geodatagov datajson datajson_harvest geodatagov_miscs z3950_harvester arcgis_harvester geodatagov_geoportal_harvester waf_harvester_collection geodatagov_csw_harvester geodatagov_doc_harvester geodatagov_waf_harvester spatial_metadata spatial_query report qa archiver datagovtheme datagovcatalog dcat dcat_json_interface structured_data
 ckan.harvest.mq.type = redis
 ckan.tracking_enabled = true
-googleanalytics.ids = UA-1010101-1
 # custom config for test extensions
 ckanext.geodatagov.dynamic_menu.url_default = https://www.data.gov/app/plugins/datagov-custom/wp_download_links.php
 

diff --git a/e2e/cypress/integration/ckan_extensions.cy.js b/e2e/cypress/integration/ckan_extensions.cy.js
@@ -30,7 +30,6 @@ describe('CKAN Extensions', () => {
             expect(installed_extensions).to.include('spatial_metadata');
             expect(installed_extensions).to.include('spatial_query');
             expect(installed_extensions).to.include('spatial_harvest_metadata_api');
-            expect(installed_extensions).to.include('googleanalytics');
             expect(installed_extensions).to.include('dcat');
             expect(installed_extensions).to.include('dcat_json_interface');
             expect(installed_extensions).to.include('structured_data');