Skip to content

Commit a349bce

Browse files
talepretalepre
authored
Merge pull request #2151 from navikt/umami-tracking
Forberedelser til Umami
2 parents ef4e9f2 + 35d310c commit a349bce

File tree

22 files changed

+45
-42
lines changed

22 files changed

+45
-42
lines changed

‎package-lock.json

+7-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"@navikt/ds-css": "7.3.1",
4343
"@navikt/ds-react": "7.3.1",
4444
"@navikt/ds-tokens": "7.3.1",
45-
"@navikt/nav-dekoratoren-moduler": "3.1.3",
45+
"@navikt/nav-dekoratoren-moduler": "3.2.1",
4646
"@navikt/nav-office-reception-info": "1.1.2",
4747
"@reduxjs/toolkit": "2.3.0",
4848
"csp-header": "5.2.1",

‎src/components/_common/accordion/Accordion.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { useEffect, useRef, useState } from 'react';
22
import { Accordion as DSAccordion } from '@navikt/ds-react';
33
import { ParsedHtml } from 'components/_common/parsedHtml/ParsedHtml';
4-
import { AnalyticsEvents, logAmplitudeEvent } from 'utils/amplitude';
4+
import { AnalyticsEvents, logAnalyticsEvent } from 'utils/analytics';
55
import { Shortcuts, useShortcuts } from 'utils/useShortcuts';
66
import { usePageContentProps } from 'store/pageContext';
77
import { getDecoratorParams } from 'utils/decorator-utils';
@@ -38,7 +38,7 @@ export const Accordion = ({ accordion }: AccordionProps) => {
3838
} else {
3939
setOpenAccordions(openAccordions.filter((i) => i !== index));
4040
}
41-
logAmplitudeEvent(isOpening ? AnalyticsEvents.ACC_EXPAND : AnalyticsEvents.ACC_COLLAPSE, {
41+
logAnalyticsEvent(isOpening ? AnalyticsEvents.ACC_EXPAND : AnalyticsEvents.ACC_COLLAPSE, {
4242
tittel,
4343
opprinnelse: 'trekkspill',
4444
komponent: 'Accordion',

‎src/components/_common/card/useCard.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { useLayoutConfig } from 'components/layouts/useLayoutConfig';
44
import { CardSize, CardType } from 'types/card';
55
import { Interaction } from 'types/interaction';
66
import { LinkProps } from 'types/link-props';
7-
import { AnalyticsEvents, logAmplitudeEvent } from 'utils/amplitude';
7+
import { AnalyticsEvents, logAnalyticsEvent } from 'utils/analytics';
88
import { usePublicUrl } from 'utils/usePublicUrl';
99
import { usePageContentProps } from 'store/pageContext';
1010
import { getDecoratorParams } from 'utils/decorator-utils';
@@ -84,7 +84,7 @@ export const useCard = ({ link, size, type }: UseCardSettings): UseCardState =>
8484
return;
8585
}
8686

87-
logAmplitudeEvent(AnalyticsEvents.NAVIGATION, analyticsPayload);
87+
logAnalyticsEvent(AnalyticsEvents.NAVIGATION, analyticsPayload);
8888

8989
const isOpeningInNewWindow = e.ctrlKey || e.metaKey;
9090
if (isOpeningInNewWindow) {

‎src/components/_common/contact-option/CallOption/CallOption.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react';
22
import { Alert, BodyLong, BodyShort, Heading } from '@navikt/ds-react';
33
import { translator } from 'translations';
44
import { LenkeBase } from 'components/_common/lenke/lenkeBase/LenkeBase';
5-
import { AnalyticsEvents } from 'utils/amplitude';
5+
import { AnalyticsEvents } from 'utils/analytics';
66
import { useLayoutConfig } from 'components/layouts/useLayoutConfig';
77
import { ParsedHtml } from 'components/_common/parsedHtml/ParsedHtml';
88
import { OpeningInfo } from 'components/_common/contact-option/openingInfo/OpeningInfo';

‎src/components/_common/contact-option/ChatOption/ChatOption.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { openChatbot } from '@navikt/nav-dekoratoren-moduler';
44
import { translator } from 'translations';
55
import { usePageContentProps } from 'store/pageContext';
66
import { LenkeBase } from 'components/_common/lenke/lenkeBase/LenkeBase';
7-
import { AnalyticsEvents } from 'utils/amplitude';
7+
import { AnalyticsEvents } from 'utils/analytics';
88
import { useLayoutConfig } from 'components/layouts/useLayoutConfig';
99
import { ParsedHtml } from 'components/_common/parsedHtml/ParsedHtml';
1010
import TextWithIndicator from 'components/_common/textWithIndicator/TextWithIndicator';

‎src/components/_common/contact-option/DefaultOption.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { openChatbot } from '@navikt/nav-dekoratoren-moduler';
44
import { translator } from 'translations';
55
import { usePageContentProps } from 'store/pageContext';
66
import { LenkeBase } from 'components/_common/lenke/lenkeBase/LenkeBase';
7-
import { AnalyticsEvents } from 'utils/amplitude';
7+
import { AnalyticsEvents } from 'utils/analytics';
88
import { useLayoutConfig } from 'components/layouts/useLayoutConfig';
99
import { ParsedHtml } from 'components/_common/parsedHtml/ParsedHtml';
1010
import Config from 'config';

‎src/components/_common/copyLink/copyLink.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React, { useState } from 'react';
22
import { LinkIcon } from '@navikt/aksel-icons';
33
import { translator } from 'translations';
44
import { classNames } from 'utils/classnames';
5-
import { AnalyticsEvents, logAmplitudeEvent } from 'utils/amplitude';
5+
import { AnalyticsEvents, logAnalyticsEvent } from 'utils/analytics';
66
import { usePageContentProps } from 'store/pageContext';
77
import { getDecoratorParams } from 'utils/decorator-utils';
88
import { innholdsTypeMap } from 'types/content-props/_content-common';
@@ -41,7 +41,7 @@ export const CopyLink = ({ anchor, heading, className, showLabel = true }: CopyL
4141
setShowCopyTooltip(true);
4242
setTimeout(() => setShowCopyTooltip(false), linkCopiedDisplayTimeMs);
4343
}
44-
logAmplitudeEvent(AnalyticsEvents.COPY_LINK, {
44+
logAnalyticsEvent(AnalyticsEvents.COPY_LINK, {
4545
målgruppe: context,
4646
seksjon: layoutConfig.title,
4747
innholdstype: innholdsTypeMap[type],

‎src/components/_common/expandable/Expandable.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { useEffect, useRef, useState } from 'react';
22
import { ExpansionCard } from '@navikt/ds-react';
33
import { BarChartIcon, BriefcaseClockIcon, CalendarIcon, TasklistIcon } from '@navikt/aksel-icons';
4-
import { AnalyticsEvents, logAmplitudeEvent } from 'utils/amplitude';
4+
import { AnalyticsEvents, logAnalyticsEvent } from 'utils/analytics';
55
import { usePageContentProps } from 'store/pageContext';
66
import { getDecoratorParams } from 'utils/decorator-utils';
77
import { innholdsTypeMap } from 'types/content-props/_content-common';
@@ -49,7 +49,7 @@ export const Expandable = ({
4949
setIsOpen(isOpening);
5050
handleStickyScrollOffset(isOpening, accordionRef.current);
5151

52-
logAmplitudeEvent(isOpening ? AnalyticsEvents.ACC_EXPAND : AnalyticsEvents.ACC_COLLAPSE, {
52+
logAnalyticsEvent(isOpening ? AnalyticsEvents.ACC_EXPAND : AnalyticsEvents.ACC_COLLAPSE, {
5353
tittel,
5454
opprinnelse: analyticsOriginTag || 'utvidbar tekst',
5555
komponent: 'Expandable',

‎src/components/_common/filter-bar/FilterBar.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { useEffect, useRef, useState } from 'react';
22
import { Heading } from '@navikt/ds-react';
3-
import { AnalyticsEvents, logAmplitudeEvent } from 'utils/amplitude';
3+
import { AnalyticsEvents, logAnalyticsEvent } from 'utils/analytics';
44
import { translator } from 'translations';
55
import { useFilterState } from 'store/hooks/useFilteredContent';
66
import { usePageContentProps } from 'store/pageContext';
@@ -85,7 +85,7 @@ export const FilterBar = ({ layoutProps }: Props) => {
8585
key={filter.id}
8686
isSelected={isSelected}
8787
onToggleFilterHandler={() => {
88-
logAmplitudeEvent(AnalyticsEvents.FILTER, {
88+
logAnalyticsEvent(AnalyticsEvents.FILTER, {
8989
kategori: filter.categoryName,
9090
filternavn: filter.filterName,
9191
opprinnelse: 'innholdtekst',

‎src/components/_common/lenke/lenkeBase/LenkeBase.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { Fragment } from 'react';
22
import Link from 'next/link';
33
import { adminOrigin, isNofollowUrl, xpDraftPathPrefix } from 'utils/urls';
4-
import { AnalyticsEvents, logAmplitudeEvent } from 'utils/amplitude';
4+
import { AnalyticsEvents, logAnalyticsEvent } from 'utils/analytics';
55
import { onlyText } from 'utils/react-children';
66
import { useLayoutConfig } from 'components/layouts/useLayoutConfig';
77
import { usePublicUrl } from 'utils/usePublicUrl';
@@ -80,7 +80,7 @@ export const LenkeBase = ({
8080
{...rest}
8181
href={url}
8282
onClick={(e) => {
83-
logAmplitudeEvent(analyticsEvent || AnalyticsEvents.NAVIGATION, analyticsData);
83+
logAnalyticsEvent(analyticsEvent || AnalyticsEvents.NAVIGATION, analyticsData);
8484
onClick?.(e);
8585
}}
8686
shallow={shallow}

‎src/components/_common/overview-filters/OverviewFilters.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { OverviewTextFilter } from 'components/_common/overview-filters/text-fil
77
import { OverviewFilterableItem, useOverviewFilters } from 'store/hooks/useOverviewFilters';
88
import { classNames } from 'utils/classnames';
99
import { translator } from 'translations';
10-
import { AnalyticsEvents, logAmplitudeEvent } from 'utils/amplitude';
10+
import { AnalyticsEvents, logAnalyticsEvent } from 'utils/analytics';
1111
import { usePageContentProps } from 'store/pageContext';
1212
import { getDecoratorParams } from 'utils/decorator-utils';
1313
import { innholdsTypeMap } from 'types/content-props/_content-common';
@@ -49,7 +49,7 @@ const MobileView = ({
4949
onClick={(e) => {
5050
e.preventDefault();
5151
setIsOpen(!isOpen);
52-
logAmplitudeEvent(AnalyticsEvents.FILTER, {
52+
logAnalyticsEvent(AnalyticsEvents.FILTER, {
5353
kategori: 'mobile-toggle',
5454
opprinnelse: 'oversiktsside filter mobil',
5555
komponent: 'MobileView',

‎src/components/_common/overview-filters/area-filter/OverviewAreaFilter.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import { Area } from 'types/areas';
3-
import { AnalyticsEvents, logAmplitudeEvent } from 'utils/amplitude';
3+
import { AnalyticsEvents, logAnalyticsEvent } from 'utils/analytics';
44
import { usePageContentProps } from 'store/pageContext';
55
import { getDecoratorParams } from 'utils/decorator-utils';
66
import { innholdsTypeMap } from 'types/content-props/_content-common';
@@ -43,7 +43,7 @@ export const OverviewAreaFilter = ({ items }: Props) => {
4343
const contentProps = usePageContentProps();
4444
const { context } = getDecoratorParams(contentProps);
4545
const handleFilterUpdate = (area: Area) => {
46-
logAmplitudeEvent(AnalyticsEvents.FILTER, {
46+
logAnalyticsEvent(AnalyticsEvents.FILTER, {
4747
kategori: 'område',
4848
filternavn: analyticsAreas[area],
4949
opprinnelse: 'oversiktsside områder',

‎src/components/_common/overview-filters/taxonomy-filter/OverviewTaxonomyFilter.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import { ProductTaxonomy } from 'types/taxonomies';
3-
import { AnalyticsEvents, logAmplitudeEvent } from 'utils/amplitude';
3+
import { AnalyticsEvents, logAnalyticsEvent } from 'utils/analytics';
44
import { usePageContentProps } from 'store/pageContext';
55
import { getDecoratorParams } from 'utils/decorator-utils';
66
import { innholdsTypeMap } from 'types/content-props/_content-common';
@@ -42,7 +42,7 @@ export const OverviewTaxonomyFilter = ({ items }: Props) => {
4242
const { context } = getDecoratorParams(contentProps);
4343

4444
const handleFilterUpdate = (taxonomy: ProductTaxonomy) => {
45-
logAmplitudeEvent(AnalyticsEvents.FILTER, {
45+
logAnalyticsEvent(AnalyticsEvents.FILTER, {
4646
kategori: 'type',
4747
filternavn: analyticsTaxonomi[taxonomy],
4848
opprinnelse: 'oversiktsside typer',

‎src/components/_common/overview-filters/text-filter/OverviewTextFilter.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React, { useCallback, useEffect, useId, useState } from 'react';
22
import { Search } from '@navikt/ds-react';
33
import debounce from 'lodash.debounce';
44
import { translator } from 'translations';
5-
import { AnalyticsEvents, logAmplitudeEvent } from 'utils/amplitude';
5+
import { AnalyticsEvents, logAnalyticsEvent } from 'utils/analytics';
66
import { usePageContentProps } from 'store/pageContext';
77
import { getDecoratorParams } from 'utils/decorator-utils';
88
import { innholdsTypeMap } from 'types/content-props/_content-common';
@@ -44,7 +44,7 @@ export const OverviewTextFilter = ({ hideLabel }: Props) => {
4444
}
4545
)
4646
);
47-
logAmplitudeEvent(AnalyticsEvents.FILTER, {
47+
logAnalyticsEvent(AnalyticsEvents.FILTER, {
4848
kategori: 'fritekst',
4949
filternavn: analyticsRedaction(value),
5050
komponent: 'OverviewTextFilter',

‎src/components/_common/pageNavigationMenu/PageNavigationMenu.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { BodyShort, Heading } from '@navikt/ds-react';
44
import { AnchorLink } from 'components/parts/page-navigation-menu/PageNavigationMenuPart';
55
import { LenkeBase } from 'components/_common/lenke/lenkeBase/LenkeBase';
66
import { classNames } from 'utils/classnames';
7-
import { AnalyticsEvents } from 'utils/amplitude';
7+
import { AnalyticsEvents } from 'utils/analytics';
88
import { EditorHelp } from 'components/_editor-only/editor-help/EditorHelp';
99

1010
import style from './PageNavigationMenu.module.scss';

‎src/components/_common/productPanelExpandable/ProductPanelExpandable.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { useState, useEffect } from 'react';
22
import { BodyShort, ExpansionCard, Loader } from '@navikt/ds-react';
33
import { PictogramsProps } from 'types/content-props/pictograms';
4-
import { AnalyticsEvents, logAmplitudeEvent } from 'utils/amplitude';
4+
import { AnalyticsEvents, logAnalyticsEvent } from 'utils/analytics';
55
import { usePageContentProps } from 'store/pageContext';
66
import { getDecoratorParams } from 'utils/decorator-utils';
77
import { innholdsTypeMap } from 'types/content-props/_content-common';
@@ -66,7 +66,7 @@ export const ProductPanelExpandable = ({
6666
const toggleExpandCollapse = (isOpening: boolean, tittel: string) => {
6767
setIsOpen(isOpening);
6868
contentLoaderCallback?.();
69-
logAmplitudeEvent(isOpening ? AnalyticsEvents.ACC_EXPAND : AnalyticsEvents.ACC_COLLAPSE, {
69+
logAnalyticsEvent(isOpening ? AnalyticsEvents.ACC_EXPAND : AnalyticsEvents.ACC_COLLAPSE, {
7070
tittel,
7171
opprinnelse: 'produktdetalj',
7272
komponent: 'ProductPanelExpandable',

‎src/components/_common/qbrick-video/useQbrickPlayerState.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { useCallback, useId, useState } from 'react';
22
import { logger } from 'srcCommon/logger';
3-
import { AnalyticsEvents, logAmplitudeEvent } from 'utils/amplitude';
3+
import { AnalyticsEvents, logAnalyticsEvent } from 'utils/analytics';
44
import { QbrickVideoProps } from './utils/videoProps';
55

66
type PlayerState = 'loading' | 'ready' | 'error' | 'stopped';
@@ -102,7 +102,7 @@ const createAndStart = (
102102
})
103103
.on('ready', () => {
104104
setPlayerState('ready');
105-
logAmplitudeEvent(AnalyticsEvents.VIDEO_START, {
105+
logAnalyticsEvent(AnalyticsEvents.VIDEO_START, {
106106
tittel: title,
107107
varighet: duration,
108108
språk: language,

‎src/components/pages/office-page/office-details/officeInformation/OfficeInformation.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { useState } from 'react';
22
import { ExpansionCard, BodyShort, Heading } from '@navikt/ds-react';
33
import { translator } from 'translations';
4-
import { AnalyticsEvents, logAmplitudeEvent } from 'utils/amplitude';
4+
import { AnalyticsEvents, logAnalyticsEvent } from 'utils/analytics';
55
import { usePageContentProps } from 'store/pageContext';
66
import { getDecoratorParams } from 'utils/decorator-utils';
77
import { innholdsTypeMap } from 'types/content-props/_content-common';
@@ -26,7 +26,7 @@ export const OfficeInformation = ({ officeData }: OfficeInformationProps) => {
2626

2727
const toggleExpandCollapse = (isOpening: boolean, tittel: string) => {
2828
setIsOpen(isOpening);
29-
logAmplitudeEvent(isOpening ? AnalyticsEvents.ACC_EXPAND : AnalyticsEvents.ACC_COLLAPSE, {
29+
logAnalyticsEvent(isOpening ? AnalyticsEvents.ACC_EXPAND : AnalyticsEvents.ACC_COLLAPSE, {
3030
tittel,
3131
opprinnelse: 'kontorinformasjon',
3232
komponent: 'OfficeInformation',

‎src/components/parts/filters-menu/FiltersMenuPart.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { useEffect } from 'react';
22
import { BodyLong, CheckboxGroup } from '@navikt/ds-react';
3-
import { AnalyticsEvents, logAmplitudeEvent } from 'utils/amplitude';
3+
import { AnalyticsEvents, logAnalyticsEvent } from 'utils/analytics';
44
import { translator } from 'translations';
55
import { useFilterState } from 'store/hooks/useFilteredContent';
66
import { ExpandableComponentWrapper } from 'components/_common/expandable/ExpandableComponentWrapper';
@@ -64,7 +64,7 @@ export const FiltersMenuPart = ({ config, path }: PartComponentProps<PartType.Fi
6464

6565
const getLabel = translator('filteredContent', language);
6666
const onToggleFilterHandler = (filter: Filter, category: FilterMenuCategory) => {
67-
logAmplitudeEvent(AnalyticsEvents.FILTER, {
67+
logAnalyticsEvent(AnalyticsEvents.FILTER, {
6868
kategori: category.categoryName,
6969
filternavn: filter.filterName,
7070
opprinnelse: 'filtermeny',

‎src/components/parts/readMorePart/ReadMorePart.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { EditorHelp } from 'components/_editor-only/editor-help/EditorHelp';
44
import { ParsedHtml } from 'components/_common/parsedHtml/ParsedHtml';
55
import { classNames } from 'utils/classnames';
66
import { handleStickyScrollOffset } from 'utils/scroll-to';
7-
import { AnalyticsEvents, logAmplitudeEvent } from 'utils/amplitude';
7+
import { AnalyticsEvents, logAnalyticsEvent } from 'utils/analytics';
88
import { usePageContentProps } from 'store/pageContext';
99
import { getDecoratorParams } from 'utils/decorator-utils';
1010
import { innholdsTypeMap } from 'types/content-props/_content-common';
@@ -45,7 +45,7 @@ export const ReadMorePart = ({ config }: PartComponentProps<PartType.ReadMore>)
4545
const openChangeHandler = (isOpening: boolean, tittel: string) => {
4646
handleStickyScrollOffset(isOpening, divRef.current);
4747
setIsOpen(isOpening);
48-
logAmplitudeEvent(isOpening ? AnalyticsEvents.ACC_EXPAND : AnalyticsEvents.ACC_COLLAPSE, {
48+
logAnalyticsEvent(isOpening ? AnalyticsEvents.ACC_EXPAND : AnalyticsEvents.ACC_COLLAPSE, {
4949
tittel,
5050
opprinnelse: 'lesmer',
5151
komponent: 'ReadMore',

‎src/utils/amplitude.ts ‎src/utils/analytics.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { logAmplitudeEvent as logAmplitudeEventDecorator } from '@navikt/nav-dekoratoren-moduler';
1+
import { logAnalyticsEvent as logAnalyticsEventDecorator } from '@navikt/nav-dekoratoren-moduler';
22

33
export enum AnalyticsEvents {
44
NAVIGATION = 'navigere',
@@ -14,11 +14,11 @@ export enum AnalyticsEvents {
1414
VIDEO_STOP = 'video stopp',
1515
}
1616

17-
export function logAmplitudeEvent(
17+
export function logAnalyticsEvent(
1818
eventName: AnalyticsEvents,
1919
data?: Record<string, any>
2020
): Promise<any> {
21-
return logAmplitudeEventDecorator({
21+
return logAnalyticsEventDecorator({
2222
eventName,
2323
origin: 'navno-frontend',
2424
eventData: data,

0 commit comments

Comments
 (0)