From a90a9452f4b066dcb5737ddd4a348f1ce267cdfa Mon Sep 17 00:00:00 2001 From: Rafael Camargo Date: Fri, 5 Aug 2022 18:46:56 -0300 Subject: [PATCH 1/2] fix: analytics service --- src/webapp/scripts/services/analytics.js | 4 ++-- src/webapp/scripts/services/analytics.test.js | 4 ++-- src/webapp/scripts/services/window.js | 4 ++-- src/webapp/scripts/services/window.test.js | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/webapp/scripts/services/analytics.js b/src/webapp/scripts/services/analytics.js index f5bdd3a..48c8d73 100644 --- a/src/webapp/scripts/services/analytics.js +++ b/src/webapp/scripts/services/analytics.js @@ -25,8 +25,8 @@ function getGoogleAnalyticsId(){ } function buildPath(){ - const pathname = windowService.getPathname(); - return pathname.replace('/#!/','/').split('?')[0]; + const pathname = windowService.getHash(); + return pathname.replace('#!/','/').split('?')[0]; } export default _public; diff --git a/src/webapp/scripts/services/analytics.test.js b/src/webapp/scripts/services/analytics.test.js index 4b81643..4a844dd 100644 --- a/src/webapp/scripts/services/analytics.test.js +++ b/src/webapp/scripts/services/analytics.test.js @@ -38,14 +38,14 @@ describe('Analytics Service', () => { }); it('should track page view', () => { - windowService.getPathname = jest.fn(() => '/#!/components/vue/alert?some=param'); + windowService.getHash = jest.fn(() => '#!/components/vue/column'); const googleAnalyticsId = '123'; mockGoogleAnalyticsId(googleAnalyticsId); analyticsService.init(); analyticsService.trackPageView(); expect(ganalyticsInstanceMock.trackPageview).toHaveBeenCalledTimes(1); expect(ganalyticsInstanceMock.trackPageview).toHaveBeenCalledWith({ - path: '/components/vue/alert' + path: '/components/vue/column' }); }); }); diff --git a/src/webapp/scripts/services/window.js b/src/webapp/scripts/services/window.js index 0454383..32d91e6 100644 --- a/src/webapp/scripts/services/window.js +++ b/src/webapp/scripts/services/window.js @@ -16,8 +16,8 @@ _public.getPageYOffset = () => { return window.pageYOffset; }; -_public.getPathname = () => { - return window.location.pathname; +_public.getHash = () => { + return window.location.hash; }; export default _public; diff --git a/src/webapp/scripts/services/window.test.js b/src/webapp/scripts/services/window.test.js index 54aa476..db5904f 100644 --- a/src/webapp/scripts/services/window.test.js +++ b/src/webapp/scripts/services/window.test.js @@ -36,7 +36,7 @@ describe('Window Service', () => { expect(windowService.getPageYOffset()).toEqual(window.pageYOffset); }); - it('should get pathname', () => { - expect(windowService.getPathname()).toEqual(window.location.pathname); + it('should get hash', () => { + expect(windowService.getHash()).toEqual(window.location.hash); }); }); From 6ab102562510b2897794f224ad9d476f43974e57 Mon Sep 17 00:00:00 2001 From: Rafael Camargo Date: Fri, 5 Aug 2022 18:48:40 -0300 Subject: [PATCH 2/2] 1.30.18 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index c022b4c..93cb8ab 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@glorious/pitsby", - "version": "1.30.17", + "version": "1.30.18", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@glorious/pitsby", - "version": "1.30.17", + "version": "1.30.18", "license": "MIT", "dependencies": { "@babel/core": "^7.18.9", diff --git a/package.json b/package.json index 9e2d694..37582e4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@glorious/pitsby", - "version": "1.30.17", + "version": "1.30.18", "description": "Docs generator for AngularJS, React, Vue and Vanilla components", "author": "Rafael Camargo ", "repository": {