@blaze-cms/plugin-gtm-fe 0.146.0-node18-core-styles.1 → 0.146.0-node18-core-styles.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +8 -0
- package/lib/GoogleTagManager/GTMRender.js +3 -8
- package/lib/GoogleTagManager/GTMRender.js.map +1 -1
- package/lib/GoogleTagManagerEvent/GTMClickEvent.js +1 -1
- package/lib/GoogleTagManagerEvent/GTMClickEvent.js.map +1 -1
- package/lib/GoogleTagManagerEvent/GTMEventRender.js +3 -8
- package/lib/GoogleTagManagerEvent/GTMEventRender.js.map +1 -1
- package/lib-es/GoogleTagManager/GTMRender.js +4 -10
- package/lib-es/GoogleTagManager/GTMRender.js.map +1 -1
- package/lib-es/GoogleTagManagerEvent/GTMClickEvent.js +2 -2
- package/lib-es/GoogleTagManagerEvent/GTMClickEvent.js.map +1 -1
- package/lib-es/GoogleTagManagerEvent/GTMEventRender.js +4 -10
- package/lib-es/GoogleTagManagerEvent/GTMEventRender.js.map +1 -1
- package/package.json +5 -5
- package/src/GoogleTagManager/GTMRender.js +4 -6
- package/src/GoogleTagManagerEvent/GTMClickEvent.js +2 -2
- package/src/GoogleTagManagerEvent/GTMEventRender.js +4 -6
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,14 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [0.146.0-node18-core-styles.2](https://github.com/thebyte9/blaze/compare/v0.146.0-node18-core-styles.1...v0.146.0-node18-core-styles.2) (2025-05-16)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @blaze-cms/plugin-gtm-fe
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
6
14
|
# [0.146.0-node18-core-styles.1](https://github.com/thebyte9/blaze/compare/v0.146.0-node18-core-styles.0...v0.146.0-node18-core-styles.1) (2025-04-07)
|
|
7
15
|
|
|
8
16
|
**Note:** Version bump only for package @blaze-cms/plugin-gtm-fe
|
|
@@ -22,7 +22,6 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
|
22
22
|
var _client = require("@apollo/client");
|
|
23
23
|
var _router = require("next/router");
|
|
24
24
|
var _reactPageBuilder = require("@blaze-cms/react-page-builder");
|
|
25
|
-
var _coreAuthUi = require("@blaze-cms/core-auth-ui");
|
|
26
25
|
var _helpers = require("../helpers");
|
|
27
26
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
28
27
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
@@ -49,14 +48,10 @@ var GTMRender = function GTMRender(_ref) {
|
|
|
49
48
|
data = _useQuery.data,
|
|
50
49
|
error = _useQuery.error,
|
|
51
50
|
loading = _useQuery.loading;
|
|
52
|
-
var
|
|
53
|
-
userId = _checkIfLoggedIn.id;
|
|
54
|
-
var hasUserProps = userId && userPropsToDisplay && userPropsToDisplay.length;
|
|
51
|
+
var hasUserProps = userPropsToDisplay && userPropsToDisplay.length;
|
|
55
52
|
var userProps = hasUserProps ? (0, _helpers.buildUserQueryProps)(userPropsToDisplay) : '';
|
|
56
|
-
var _useQuery2 = (0, _client.useQuery)((0, _reactPageBuilder.
|
|
57
|
-
variables: {
|
|
58
|
-
id: userId
|
|
59
|
-
},
|
|
53
|
+
var _useQuery2 = (0, _client.useQuery)((0, _reactPageBuilder.getCurrentUser)(userProps), {
|
|
54
|
+
variables: {},
|
|
60
55
|
skip: !hasUserProps
|
|
61
56
|
}),
|
|
62
57
|
userData = _useQuery2.data,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GTMRender.js","names":["_react","require","_propTypes","_interopRequireDefault","_client","_router","_reactPageBuilder","
|
|
1
|
+
{"version":3,"file":"GTMRender.js","names":["_react","require","_propTypes","_interopRequireDefault","_client","_router","_reactPageBuilder","_helpers","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty2","getOwnPropertyDescriptors","defineProperties","defineProperty","GTMRender","_ref","router","action","propsToDisplay","parentId","webVitals","userPropsToDisplay","asPath","_useState","useState","url","shouldPushLayer","_useState2","_slicedToArray2","currentLocation","setCurrentLocation","_useQuery","useQuery","variables","id","data","error","loading","hasUserProps","userProps","buildUserQueryProps","_useQuery2","getCurrentUser","skip","userData","userLoading","entityData","message","dataLayerObject","buildDataLayer","userLayerObject","buildUserLayer","extendedDataLayer","buildAndPushWebVitals","pushToDataLayer","propTypes","PropTypes","array","isRequired","object","string","bool","_default","exports","withRouter"],"sources":["../../src/GoogleTagManager/GTMRender.js"],"sourcesContent":["import { useState } from 'react';\nimport PropTypes from 'prop-types';\nimport { useQuery } from '@apollo/client';\nimport { withRouter } from 'next/router';\nimport { getCurrentUser } from '@blaze-cms/react-page-builder';\nimport {\n buildDataLayer,\n buildAndPushWebVitals,\n pushToDataLayer,\n buildUserQueryProps,\n buildUserLayer\n} from '../helpers';\n\nconst GTMRender = ({ router, action, propsToDisplay, parentId, webVitals, userPropsToDisplay }) => {\n const { asPath } = router;\n const [currentLocation, setCurrentLocation] = useState({ url: '', shouldPushLayer: false });\n\n const { data, error, loading } = useQuery(action, {\n variables: { id: parentId }\n });\n const hasUserProps = userPropsToDisplay && userPropsToDisplay.length;\n const userProps = hasUserProps ? buildUserQueryProps(userPropsToDisplay) : '';\n const { data: userData, loading: userLoading } = useQuery(getCurrentUser(userProps), {\n variables: {},\n skip: !hasUserProps\n });\n\n if (loading || userLoading || !data || !data.entityData) return null;\n if (data.entityData.id !== parentId) return null;\n if (error) return error.message;\n if (currentLocation.url !== asPath) setCurrentLocation({ url: asPath, shouldPushLayer: true });\n if (!currentLocation.shouldPushLayer) return null;\n\n const { entityData } = data;\n const dataLayerObject = buildDataLayer(entityData, propsToDisplay, currentLocation.url);\n const userLayerObject = buildUserLayer(userData, userPropsToDisplay);\n const extendedDataLayer = { ...dataLayerObject, ...userLayerObject };\n\n if (webVitals) buildAndPushWebVitals();\n pushToDataLayer(extendedDataLayer, true);\n setCurrentLocation({ ...currentLocation, shouldPushLayer: false });\n\n return null;\n};\n\nGTMRender.propTypes = {\n userPropsToDisplay: PropTypes.array.isRequired,\n action: PropTypes.object.isRequired,\n propsToDisplay: PropTypes.array.isRequired,\n parentId: PropTypes.string.isRequired,\n webVitals: PropTypes.bool.isRequired\n};\n\nexport default withRouter(GTMRender);\n"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAC,sBAAA,CAAAF,OAAA;AACA,IAAAG,OAAA,GAAAH,OAAA;AACA,IAAAI,OAAA,GAAAJ,OAAA;AACA,IAAAK,iBAAA,GAAAL,OAAA;AACA,IAAAM,QAAA,GAAAN,OAAA;AAMoB,SAAAO,QAAAC,CAAA,EAAAC,CAAA,QAAAC,CAAA,GAAAC,MAAA,CAAAC,IAAA,CAAAJ,CAAA,OAAAG,MAAA,CAAAE,qBAAA,QAAAC,CAAA,GAAAH,MAAA,CAAAE,qBAAA,CAAAL,CAAA,GAAAC,CAAA,KAAAK,CAAA,GAAAA,CAAA,CAAAC,MAAA,WAAAN,CAAA,WAAAE,MAAA,CAAAK,wBAAA,CAAAR,CAAA,EAAAC,CAAA,EAAAQ,UAAA,OAAAP,CAAA,CAAAQ,IAAA,CAAAC,KAAA,CAAAT,CAAA,EAAAI,CAAA,YAAAJ,CAAA;AAAA,SAAAU,cAAAZ,CAAA,aAAAC,CAAA,MAAAA,CAAA,GAAAY,SAAA,CAAAC,MAAA,EAAAb,CAAA,UAAAC,CAAA,WAAAW,SAAA,CAAAZ,CAAA,IAAAY,SAAA,CAAAZ,CAAA,QAAAA,CAAA,OAAAF,OAAA,CAAAI,MAAA,CAAAD,CAAA,OAAAa,OAAA,WAAAd,CAAA,QAAAe,gBAAA,aAAAhB,CAAA,EAAAC,CAAA,EAAAC,CAAA,CAAAD,CAAA,SAAAE,MAAA,CAAAc,yBAAA,GAAAd,MAAA,CAAAe,gBAAA,CAAAlB,CAAA,EAAAG,MAAA,CAAAc,yBAAA,CAAAf,CAAA,KAAAH,OAAA,CAAAI,MAAA,CAAAD,CAAA,GAAAa,OAAA,WAAAd,CAAA,IAAAE,MAAA,CAAAgB,cAAA,CAAAnB,CAAA,EAAAC,CAAA,EAAAE,MAAA,CAAAK,wBAAA,CAAAN,CAAA,EAAAD,CAAA,iBAAAD,CAAA;AAEpB,IAAMoB,SAAS,GAAG,SAAZA,SAASA,CAAAC,IAAA,EAAoF;EAAA,IAA9EC,MAAM,GAAAD,IAAA,CAANC,MAAM;IAAEC,MAAM,GAAAF,IAAA,CAANE,MAAM;IAAEC,cAAc,GAAAH,IAAA,CAAdG,cAAc;IAAEC,QAAQ,GAAAJ,IAAA,CAARI,QAAQ;IAAEC,SAAS,GAAAL,IAAA,CAATK,SAAS;IAAEC,kBAAkB,GAAAN,IAAA,CAAlBM,kBAAkB;EAC1F,IAAQC,MAAM,GAAKN,MAAM,CAAjBM,MAAM;EACd,IAAAC,SAAA,GAA8C,IAAAC,eAAQ,EAAC;MAAEC,GAAG,EAAE,EAAE;MAAEC,eAAe,EAAE;IAAM,CAAC,CAAC;IAAAC,UAAA,OAAAC,eAAA,aAAAL,SAAA;IAApFM,eAAe,GAAAF,UAAA;IAAEG,kBAAkB,GAAAH,UAAA;EAE1C,IAAAI,SAAA,GAAiC,IAAAC,gBAAQ,EAACf,MAAM,EAAE;MAChDgB,SAAS,EAAE;QAAEC,EAAE,EAAEf;MAAS;IAC5B,CAAC,CAAC;IAFMgB,IAAI,GAAAJ,SAAA,CAAJI,IAAI;IAAEC,KAAK,GAAAL,SAAA,CAALK,KAAK;IAAEC,OAAO,GAAAN,SAAA,CAAPM,OAAO;EAG5B,IAAMC,YAAY,GAAGjB,kBAAkB,IAAIA,kBAAkB,CAACb,MAAM;EACpE,IAAM+B,SAAS,GAAGD,YAAY,GAAG,IAAAE,4BAAmB,EAACnB,kBAAkB,CAAC,GAAG,EAAE;EAC7E,IAAAoB,UAAA,GAAiD,IAAAT,gBAAQ,EAAC,IAAAU,gCAAc,EAACH,SAAS,CAAC,EAAE;MACnFN,SAAS,EAAE,CAAC,CAAC;MACbU,IAAI,EAAE,CAACL;IACT,CAAC,CAAC;IAHYM,QAAQ,GAAAH,UAAA,CAAdN,IAAI;IAAqBU,WAAW,GAAAJ,UAAA,CAApBJ,OAAO;EAK/B,IAAIA,OAAO,IAAIQ,WAAW,IAAI,CAACV,IAAI,IAAI,CAACA,IAAI,CAACW,UAAU,EAAE,OAAO,IAAI;EACpE,IAAIX,IAAI,CAACW,UAAU,CAACZ,EAAE,KAAKf,QAAQ,EAAE,OAAO,IAAI;EAChD,IAAIiB,KAAK,EAAE,OAAOA,KAAK,CAACW,OAAO;EAC/B,IAAIlB,eAAe,CAACJ,GAAG,KAAKH,MAAM,EAAEQ,kBAAkB,CAAC;IAAEL,GAAG,EAAEH,MAAM;IAAEI,eAAe,EAAE;EAAK,CAAC,CAAC;EAC9F,IAAI,CAACG,eAAe,CAACH,eAAe,EAAE,OAAO,IAAI;EAEjD,IAAQoB,UAAU,GAAKX,IAAI,CAAnBW,UAAU;EAClB,IAAME,eAAe,GAAG,IAAAC,uBAAc,EAACH,UAAU,EAAE5B,cAAc,EAAEW,eAAe,CAACJ,GAAG,CAAC;EACvF,IAAMyB,eAAe,GAAG,IAAAC,uBAAc,EAACP,QAAQ,EAAEvB,kBAAkB,CAAC;EACpE,IAAM+B,iBAAiB,GAAA9C,aAAA,CAAAA,aAAA,KAAQ0C,eAAe,GAAKE,eAAe,CAAE;EAEpE,IAAI9B,SAAS,EAAE,IAAAiC,8BAAqB,EAAC,CAAC;EACtC,IAAAC,wBAAe,EAACF,iBAAiB,EAAE,IAAI,CAAC;EACxCtB,kBAAkB,CAAAxB,aAAA,CAAAA,aAAA,KAAMuB,eAAe;IAAEH,eAAe,EAAE;EAAK,EAAE,CAAC;EAElE,OAAO,IAAI;AACb,CAAC;AAEDZ,SAAS,CAACyC,SAAS,GAAG;EACpBlC,kBAAkB,EAAEmC,qBAAS,CAACC,KAAK,CAACC,UAAU;EAC9CzC,MAAM,EAAEuC,qBAAS,CAACG,MAAM,CAACD,UAAU;EACnCxC,cAAc,EAAEsC,qBAAS,CAACC,KAAK,CAACC,UAAU;EAC1CvC,QAAQ,EAAEqC,qBAAS,CAACI,MAAM,CAACF,UAAU;EACrCtC,SAAS,EAAEoC,qBAAS,CAACK,IAAI,CAACH;AAC5B,CAAC;AAAC,IAAAI,QAAA,GAAAC,OAAA,cAEa,IAAAC,kBAAU,EAAClD,SAAS,CAAC","ignoreList":[]}
|
|
@@ -36,7 +36,7 @@ var GTMClickEvent = function GTMClickEvent(_ref) {
|
|
|
36
36
|
var _checkIfLoggedIn = (0, _coreAuthUi.checkIfLoggedIn)(),
|
|
37
37
|
userId = _checkIfLoggedIn.id;
|
|
38
38
|
var userProps = userId ? (0, _helpers.buildUserQueryProps)(userPropsToDisplay) : '';
|
|
39
|
-
var _useQuery = (0, _client.useQuery)((0, _reactPageBuilder.
|
|
39
|
+
var _useQuery = (0, _client.useQuery)((0, _reactPageBuilder.getCurretUser)(userProps), {
|
|
40
40
|
variables: {
|
|
41
41
|
id: userId
|
|
42
42
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GTMClickEvent.js","names":["_react","_interopRequireDefault","require","_propTypes","_client","_coreAuthUi","_reactPageBuilder","_GTMEvent","_helpers","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty2","getOwnPropertyDescriptors","defineProperties","defineProperty","GTMClickEvent","_ref","event","componentProps","parentComponent","eventTrigger","propsToDisplay","userPropsToDisplay","eventEcommerce","_checkIfLoggedIn","checkIfLoggedIn","userId","id","userProps","buildUserQueryProps","_useQuery","useQuery","
|
|
1
|
+
{"version":3,"file":"GTMClickEvent.js","names":["_react","_interopRequireDefault","require","_propTypes","_client","_coreAuthUi","_reactPageBuilder","_GTMEvent","_helpers","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty2","getOwnPropertyDescriptors","defineProperties","defineProperty","GTMClickEvent","_ref","event","componentProps","parentComponent","eventTrigger","propsToDisplay","userPropsToDisplay","eventEcommerce","_checkIfLoggedIn","checkIfLoggedIn","userId","id","userProps","buildUserQueryProps","_useQuery","useQuery","getCurretUser","variables","skip","userData","data","loading","dataLayerProps","buildDataLayer","dataLayerObject","buildNestedEvent","userLayerObject","buildUserLayer","extendedDataLayer","createElement","propTypes","PropTypes","object","isRequired","oneOfType","array","defaultProps","_default","exports"],"sources":["../../src/GoogleTagManagerEvent/GTMClickEvent.js"],"sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\nimport { useQuery } from '@apollo/client';\nimport { checkIfLoggedIn } from '@blaze-cms/core-auth-ui';\nimport { getCurretUser } from '@blaze-cms/react-page-builder';\nimport GTMEvent from './GTMEvent';\nimport { buildDataLayer, buildNestedEvent, buildUserQueryProps, buildUserLayer } from '../helpers';\n\nconst GTMClickEvent = ({ event, componentProps, parentComponent }) => {\n const { eventTrigger, propsToDisplay, userPropsToDisplay, eventEcommerce } = event;\n const { id: userId } = checkIfLoggedIn();\n const userProps = userId ? buildUserQueryProps(userPropsToDisplay) : '';\n const { data: userData, loading } = useQuery(getCurretUser(userProps), {\n variables: { id: userId },\n skip: !userId\n });\n if (loading) return null;\n const dataLayerProps = buildDataLayer(componentProps, propsToDisplay);\n const dataLayerObject = buildNestedEvent(eventEcommerce, event, dataLayerProps, parentComponent);\n const userLayerObject = buildUserLayer(userData, userPropsToDisplay);\n\n const extendedDataLayer = { ...dataLayerObject, ...userLayerObject };\n\n return <GTMEvent dataLayerObject={extendedDataLayer} eventTrigger={eventTrigger} />;\n};\n\nGTMClickEvent.propTypes = {\n event: PropTypes.object.isRequired,\n componentProps: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),\n parentComponent: PropTypes.object\n};\n\nGTMClickEvent.defaultProps = {\n componentProps: {},\n parentComponent: {}\n};\n\nexport default GTMClickEvent;\n"],"mappings":"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","ignoreList":[]}
|
|
@@ -26,7 +26,6 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
|
|
|
26
26
|
var _react = _interopRequireWildcard(require("react"));
|
|
27
27
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
28
28
|
var _client = require("@apollo/client");
|
|
29
|
-
var _coreAuthUi = require("@blaze-cms/core-auth-ui");
|
|
30
29
|
var _reactPageBuilder = require("@blaze-cms/react-page-builder");
|
|
31
30
|
var _router = require("next/router");
|
|
32
31
|
var _GTMEvent = _interopRequireDefault(require("./GTMEvent"));
|
|
@@ -55,14 +54,10 @@ var GTMEventRender = function GTMEventRender(_ref) {
|
|
|
55
54
|
data = _useQuery$data === void 0 ? {} : _useQuery$data,
|
|
56
55
|
error = _useQuery.error,
|
|
57
56
|
loading = _useQuery.loading;
|
|
58
|
-
var
|
|
59
|
-
userId = _checkIfLoggedIn.id;
|
|
60
|
-
var hasUserProps = userId && userPropsToDisplay && userPropsToDisplay.length;
|
|
57
|
+
var hasUserProps = userPropsToDisplay && userPropsToDisplay.length;
|
|
61
58
|
var userProps = hasUserProps ? (0, _helpers.buildUserQueryProps)(userPropsToDisplay) : '';
|
|
62
|
-
var _useQuery2 = (0, _client.useQuery)((0, _reactPageBuilder.
|
|
63
|
-
variables: {
|
|
64
|
-
id: userId
|
|
65
|
-
},
|
|
59
|
+
var _useQuery2 = (0, _client.useQuery)((0, _reactPageBuilder.getCurrentUser)(userProps), {
|
|
60
|
+
variables: {},
|
|
66
61
|
skip: !hasUserProps
|
|
67
62
|
}),
|
|
68
63
|
userData = _useQuery2.data,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GTMEventRender.js","names":["_react","_interopRequireWildcard","require","_propTypes","_interopRequireDefault","_client","
|
|
1
|
+
{"version":3,"file":"GTMEventRender.js","names":["_react","_interopRequireWildcard","require","_propTypes","_interopRequireDefault","_client","_reactPageBuilder","_router","_GTMEvent","_helpers","_excluded","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","_typeof","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","ownKeys","keys","getOwnPropertySymbols","o","filter","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty2","getOwnPropertyDescriptors","defineProperties","GTMEventRender","_ref","router","action","actionKey","queryVariables","parentComponent","userPropsToDisplay","handleOnSuccess","eventProps","_objectWithoutProperties2","asPath","_useState","useState","_useState2","_slicedToArray2","currentLocation","setCurrentLocation","_useQuery","useQuery","_useQuery$data","data","error","loading","hasUserProps","userProps","buildUserQueryProps","_useQuery2","getCurrentUser","variables","skip","userData","userLoading","gtmData","entityData","eventTrigger","propsToDisplay","eventEcommerce","dataLayerProps","buildDataLayer","dataLayerObject","buildNestedEvent","userLayerObject","buildUserLayer","extendedDataLayer","createElement","propTypes","PropTypes","array","object","isRequired","string","func","defaultProps","_default","exports","withRouter"],"sources":["../../src/GoogleTagManagerEvent/GTMEventRender.js"],"sourcesContent":["import React, { useState } from 'react';\nimport PropTypes from 'prop-types';\nimport { useQuery } from '@apollo/client';\nimport { getCurrentUser } from '@blaze-cms/react-page-builder';\nimport { withRouter } from 'next/router';\nimport GTMEvent from './GTMEvent';\nimport { buildDataLayer, buildNestedEvent, buildUserQueryProps, buildUserLayer } from '../helpers';\n\nconst GTMEventRender = ({\n router,\n action,\n actionKey,\n queryVariables,\n parentComponent,\n userPropsToDisplay,\n handleOnSuccess,\n ...eventProps\n}) => {\n const { asPath } = router;\n const [currentLocation, setCurrentLocation] = useState('');\n const { data = {}, error, loading } = useQuery(action, queryVariables);\n const hasUserProps = userPropsToDisplay && userPropsToDisplay.length;\n const userProps = hasUserProps ? buildUserQueryProps(userPropsToDisplay) : '';\n const { data: userData, loading: userLoading } = useQuery(getCurrentUser(userProps), {\n variables: {},\n skip: !hasUserProps\n });\n\n if (loading || userLoading || error) return null;\n const gtmData = data.entityData || data[actionKey];\n\n if (currentLocation !== asPath) {\n setCurrentLocation(asPath);\n return null;\n }\n\n const { eventTrigger, propsToDisplay, eventEcommerce } = eventProps;\n const dataLayerProps = buildDataLayer(gtmData, propsToDisplay);\n\n const dataLayerObject = buildNestedEvent(\n eventEcommerce,\n eventProps,\n dataLayerProps,\n parentComponent\n );\n const userLayerObject = buildUserLayer(userData, userPropsToDisplay);\n const extendedDataLayer = { ...dataLayerObject, ...userLayerObject };\n\n return (\n <GTMEvent\n dataLayerObject={extendedDataLayer}\n eventTrigger={eventTrigger}\n currentLocation={currentLocation}\n handleOnSuccess={handleOnSuccess}\n />\n );\n};\n\nGTMEventRender.propTypes = {\n userPropsToDisplay: PropTypes.array,\n router: PropTypes.object.isRequired,\n action: PropTypes.object.isRequired,\n actionKey: PropTypes.string.isRequired,\n queryVariables: PropTypes.object.isRequired,\n parentComponent: PropTypes.object.isRequired,\n handleOnSuccess: PropTypes.func\n};\n\nGTMEventRender.defaultProps = {\n userPropsToDisplay: [],\n handleOnSuccess: () => {}\n};\n\nGTMEventRender.defaultProps = {\n userPropsToDisplay: []\n};\n\nexport default withRouter(GTMEventRender);\n"],"mappings":"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","ignoreList":[]}
|
|
@@ -5,8 +5,7 @@ import { useState } from 'react';
|
|
|
5
5
|
import PropTypes from 'prop-types';
|
|
6
6
|
import { useQuery } from '@apollo/client';
|
|
7
7
|
import { withRouter } from 'next/router';
|
|
8
|
-
import {
|
|
9
|
-
import { checkIfLoggedIn } from '@blaze-cms/core-auth-ui';
|
|
8
|
+
import { getCurrentUser } from '@blaze-cms/react-page-builder';
|
|
10
9
|
import { buildDataLayer, buildAndPushWebVitals, pushToDataLayer, buildUserQueryProps, buildUserLayer } from '../helpers';
|
|
11
10
|
const GTMRender = ({
|
|
12
11
|
router,
|
|
@@ -32,18 +31,13 @@ const GTMRender = ({
|
|
|
32
31
|
id: parentId
|
|
33
32
|
}
|
|
34
33
|
});
|
|
35
|
-
const
|
|
36
|
-
id: userId
|
|
37
|
-
} = checkIfLoggedIn();
|
|
38
|
-
const hasUserProps = userId && userPropsToDisplay && userPropsToDisplay.length;
|
|
34
|
+
const hasUserProps = userPropsToDisplay && userPropsToDisplay.length;
|
|
39
35
|
const userProps = hasUserProps ? buildUserQueryProps(userPropsToDisplay) : '';
|
|
40
36
|
const {
|
|
41
37
|
data: userData,
|
|
42
38
|
loading: userLoading
|
|
43
|
-
} = useQuery(
|
|
44
|
-
variables: {
|
|
45
|
-
id: userId
|
|
46
|
-
},
|
|
39
|
+
} = useQuery(getCurrentUser(userProps), {
|
|
40
|
+
variables: {},
|
|
47
41
|
skip: !hasUserProps
|
|
48
42
|
});
|
|
49
43
|
if (loading || userLoading || !data || !data.entityData) return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GTMRender.js","names":["useState","PropTypes","useQuery","withRouter","
|
|
1
|
+
{"version":3,"file":"GTMRender.js","names":["useState","PropTypes","useQuery","withRouter","getCurrentUser","buildDataLayer","buildAndPushWebVitals","pushToDataLayer","buildUserQueryProps","buildUserLayer","GTMRender","router","action","propsToDisplay","parentId","webVitals","userPropsToDisplay","asPath","currentLocation","setCurrentLocation","url","shouldPushLayer","data","error","loading","variables","id","hasUserProps","length","userProps","userData","userLoading","skip","entityData","message","dataLayerObject","userLayerObject","extendedDataLayer","_objectSpread","propTypes","array","isRequired","object","string","bool"],"sources":["../../src/GoogleTagManager/GTMRender.js"],"sourcesContent":["import { useState } from 'react';\nimport PropTypes from 'prop-types';\nimport { useQuery } from '@apollo/client';\nimport { withRouter } from 'next/router';\nimport { getCurrentUser } from '@blaze-cms/react-page-builder';\nimport {\n buildDataLayer,\n buildAndPushWebVitals,\n pushToDataLayer,\n buildUserQueryProps,\n buildUserLayer\n} from '../helpers';\n\nconst GTMRender = ({ router, action, propsToDisplay, parentId, webVitals, userPropsToDisplay }) => {\n const { asPath } = router;\n const [currentLocation, setCurrentLocation] = useState({ url: '', shouldPushLayer: false });\n\n const { data, error, loading } = useQuery(action, {\n variables: { id: parentId }\n });\n const hasUserProps = userPropsToDisplay && userPropsToDisplay.length;\n const userProps = hasUserProps ? buildUserQueryProps(userPropsToDisplay) : '';\n const { data: userData, loading: userLoading } = useQuery(getCurrentUser(userProps), {\n variables: {},\n skip: !hasUserProps\n });\n\n if (loading || userLoading || !data || !data.entityData) return null;\n if (data.entityData.id !== parentId) return null;\n if (error) return error.message;\n if (currentLocation.url !== asPath) setCurrentLocation({ url: asPath, shouldPushLayer: true });\n if (!currentLocation.shouldPushLayer) return null;\n\n const { entityData } = data;\n const dataLayerObject = buildDataLayer(entityData, propsToDisplay, currentLocation.url);\n const userLayerObject = buildUserLayer(userData, userPropsToDisplay);\n const extendedDataLayer = { ...dataLayerObject, ...userLayerObject };\n\n if (webVitals) buildAndPushWebVitals();\n pushToDataLayer(extendedDataLayer, true);\n setCurrentLocation({ ...currentLocation, shouldPushLayer: false });\n\n return null;\n};\n\nGTMRender.propTypes = {\n userPropsToDisplay: PropTypes.array.isRequired,\n action: PropTypes.object.isRequired,\n propsToDisplay: PropTypes.array.isRequired,\n parentId: PropTypes.string.isRequired,\n webVitals: PropTypes.bool.isRequired\n};\n\nexport default withRouter(GTMRender);\n"],"mappings":";;;AAAA,SAASA,QAAQ,QAAQ,OAAO;AAChC,OAAOC,SAAS,MAAM,YAAY;AAClC,SAASC,QAAQ,QAAQ,gBAAgB;AACzC,SAASC,UAAU,QAAQ,aAAa;AACxC,SAASC,cAAc,QAAQ,+BAA+B;AAC9D,SACEC,cAAc,EACdC,qBAAqB,EACrBC,eAAe,EACfC,mBAAmB,EACnBC,cAAc,QACT,YAAY;AAEnB,MAAMC,SAAS,GAAGA,CAAC;EAAEC,MAAM;EAAEC,MAAM;EAAEC,cAAc;EAAEC,QAAQ;EAAEC,SAAS;EAAEC;AAAmB,CAAC,KAAK;EACjG,MAAM;IAAEC;EAAO,CAAC,GAAGN,MAAM;EACzB,MAAM,CAACO,eAAe,EAAEC,kBAAkB,CAAC,GAAGnB,QAAQ,CAAC;IAAEoB,GAAG,EAAE,EAAE;IAAEC,eAAe,EAAE;EAAM,CAAC,CAAC;EAE3F,MAAM;IAAEC,IAAI;IAAEC,KAAK;IAAEC;EAAQ,CAAC,GAAGtB,QAAQ,CAACU,MAAM,EAAE;IAChDa,SAAS,EAAE;MAAEC,EAAE,EAAEZ;IAAS;EAC5B,CAAC,CAAC;EACF,MAAMa,YAAY,GAAGX,kBAAkB,IAAIA,kBAAkB,CAACY,MAAM;EACpE,MAAMC,SAAS,GAAGF,YAAY,GAAGnB,mBAAmB,CAACQ,kBAAkB,CAAC,GAAG,EAAE;EAC7E,MAAM;IAAEM,IAAI,EAAEQ,QAAQ;IAAEN,OAAO,EAAEO;EAAY,CAAC,GAAG7B,QAAQ,CAACE,cAAc,CAACyB,SAAS,CAAC,EAAE;IACnFJ,SAAS,EAAE,CAAC,CAAC;IACbO,IAAI,EAAE,CAACL;EACT,CAAC,CAAC;EAEF,IAAIH,OAAO,IAAIO,WAAW,IAAI,CAACT,IAAI,IAAI,CAACA,IAAI,CAACW,UAAU,EAAE,OAAO,IAAI;EACpE,IAAIX,IAAI,CAACW,UAAU,CAACP,EAAE,KAAKZ,QAAQ,EAAE,OAAO,IAAI;EAChD,IAAIS,KAAK,EAAE,OAAOA,KAAK,CAACW,OAAO;EAC/B,IAAIhB,eAAe,CAACE,GAAG,KAAKH,MAAM,EAAEE,kBAAkB,CAAC;IAAEC,GAAG,EAAEH,MAAM;IAAEI,eAAe,EAAE;EAAK,CAAC,CAAC;EAC9F,IAAI,CAACH,eAAe,CAACG,eAAe,EAAE,OAAO,IAAI;EAEjD,MAAM;IAAEY;EAAW,CAAC,GAAGX,IAAI;EAC3B,MAAMa,eAAe,GAAG9B,cAAc,CAAC4B,UAAU,EAAEpB,cAAc,EAAEK,eAAe,CAACE,GAAG,CAAC;EACvF,MAAMgB,eAAe,GAAG3B,cAAc,CAACqB,QAAQ,EAAEd,kBAAkB,CAAC;EACpE,MAAMqB,iBAAiB,GAAAC,aAAA,CAAAA,aAAA,KAAQH,eAAe,GAAKC,eAAe,CAAE;EAEpE,IAAIrB,SAAS,EAAET,qBAAqB,CAAC,CAAC;EACtCC,eAAe,CAAC8B,iBAAiB,EAAE,IAAI,CAAC;EACxClB,kBAAkB,CAAAmB,aAAA,CAAAA,aAAA,KAAMpB,eAAe;IAAEG,eAAe,EAAE;EAAK,EAAE,CAAC;EAElE,OAAO,IAAI;AACb,CAAC;AAEDX,SAAS,CAAC6B,SAAS,GAAG;EACpBvB,kBAAkB,EAAEf,SAAS,CAACuC,KAAK,CAACC,UAAU;EAC9C7B,MAAM,EAAEX,SAAS,CAACyC,MAAM,CAACD,UAAU;EACnC5B,cAAc,EAAEZ,SAAS,CAACuC,KAAK,CAACC,UAAU;EAC1C3B,QAAQ,EAAEb,SAAS,CAAC0C,MAAM,CAACF,UAAU;EACrC1B,SAAS,EAAEd,SAAS,CAAC2C,IAAI,CAACH;AAC5B,CAAC;AAED,eAAetC,UAAU,CAACO,SAAS,CAAC","ignoreList":[]}
|
|
@@ -5,7 +5,7 @@ import React from 'react';
|
|
|
5
5
|
import PropTypes from 'prop-types';
|
|
6
6
|
import { useQuery } from '@apollo/client';
|
|
7
7
|
import { checkIfLoggedIn } from '@blaze-cms/core-auth-ui';
|
|
8
|
-
import {
|
|
8
|
+
import { getCurretUser } from '@blaze-cms/react-page-builder';
|
|
9
9
|
import GTMEvent from './GTMEvent';
|
|
10
10
|
import { buildDataLayer, buildNestedEvent, buildUserQueryProps, buildUserLayer } from '../helpers';
|
|
11
11
|
const GTMClickEvent = ({
|
|
@@ -26,7 +26,7 @@ const GTMClickEvent = ({
|
|
|
26
26
|
const {
|
|
27
27
|
data: userData,
|
|
28
28
|
loading
|
|
29
|
-
} = useQuery(
|
|
29
|
+
} = useQuery(getCurretUser(userProps), {
|
|
30
30
|
variables: {
|
|
31
31
|
id: userId
|
|
32
32
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GTMClickEvent.js","names":["React","PropTypes","useQuery","checkIfLoggedIn","
|
|
1
|
+
{"version":3,"file":"GTMClickEvent.js","names":["React","PropTypes","useQuery","checkIfLoggedIn","getCurretUser","GTMEvent","buildDataLayer","buildNestedEvent","buildUserQueryProps","buildUserLayer","GTMClickEvent","event","componentProps","parentComponent","eventTrigger","propsToDisplay","userPropsToDisplay","eventEcommerce","id","userId","userProps","data","userData","loading","variables","skip","dataLayerProps","dataLayerObject","userLayerObject","extendedDataLayer","_objectSpread","createElement","propTypes","object","isRequired","oneOfType","array","defaultProps"],"sources":["../../src/GoogleTagManagerEvent/GTMClickEvent.js"],"sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\nimport { useQuery } from '@apollo/client';\nimport { checkIfLoggedIn } from '@blaze-cms/core-auth-ui';\nimport { getCurretUser } from '@blaze-cms/react-page-builder';\nimport GTMEvent from './GTMEvent';\nimport { buildDataLayer, buildNestedEvent, buildUserQueryProps, buildUserLayer } from '../helpers';\n\nconst GTMClickEvent = ({ event, componentProps, parentComponent }) => {\n const { eventTrigger, propsToDisplay, userPropsToDisplay, eventEcommerce } = event;\n const { id: userId } = checkIfLoggedIn();\n const userProps = userId ? buildUserQueryProps(userPropsToDisplay) : '';\n const { data: userData, loading } = useQuery(getCurretUser(userProps), {\n variables: { id: userId },\n skip: !userId\n });\n if (loading) return null;\n const dataLayerProps = buildDataLayer(componentProps, propsToDisplay);\n const dataLayerObject = buildNestedEvent(eventEcommerce, event, dataLayerProps, parentComponent);\n const userLayerObject = buildUserLayer(userData, userPropsToDisplay);\n\n const extendedDataLayer = { ...dataLayerObject, ...userLayerObject };\n\n return <GTMEvent dataLayerObject={extendedDataLayer} eventTrigger={eventTrigger} />;\n};\n\nGTMClickEvent.propTypes = {\n event: PropTypes.object.isRequired,\n componentProps: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),\n parentComponent: PropTypes.object\n};\n\nGTMClickEvent.defaultProps = {\n componentProps: {},\n parentComponent: {}\n};\n\nexport default GTMClickEvent;\n"],"mappings":";;;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,OAAOC,SAAS,MAAM,YAAY;AAClC,SAASC,QAAQ,QAAQ,gBAAgB;AACzC,SAASC,eAAe,QAAQ,yBAAyB;AACzD,SAASC,aAAa,QAAQ,+BAA+B;AAC7D,OAAOC,QAAQ,MAAM,YAAY;AACjC,SAASC,cAAc,EAAEC,gBAAgB,EAAEC,mBAAmB,EAAEC,cAAc,QAAQ,YAAY;AAElG,MAAMC,aAAa,GAAGA,CAAC;EAAEC,KAAK;EAAEC,cAAc;EAAEC;AAAgB,CAAC,KAAK;EACpE,MAAM;IAAEC,YAAY;IAAEC,cAAc;IAAEC,kBAAkB;IAAEC;EAAe,CAAC,GAAGN,KAAK;EAClF,MAAM;IAAEO,EAAE,EAAEC;EAAO,CAAC,GAAGhB,eAAe,CAAC,CAAC;EACxC,MAAMiB,SAAS,GAAGD,MAAM,GAAGX,mBAAmB,CAACQ,kBAAkB,CAAC,GAAG,EAAE;EACvE,MAAM;IAAEK,IAAI,EAAEC,QAAQ;IAAEC;EAAQ,CAAC,GAAGrB,QAAQ,CAACE,aAAa,CAACgB,SAAS,CAAC,EAAE;IACrEI,SAAS,EAAE;MAAEN,EAAE,EAAEC;IAAO,CAAC;IACzBM,IAAI,EAAE,CAACN;EACT,CAAC,CAAC;EACF,IAAII,OAAO,EAAE,OAAO,IAAI;EACxB,MAAMG,cAAc,GAAGpB,cAAc,CAACM,cAAc,EAAEG,cAAc,CAAC;EACrE,MAAMY,eAAe,GAAGpB,gBAAgB,CAACU,cAAc,EAAEN,KAAK,EAAEe,cAAc,EAAEb,eAAe,CAAC;EAChG,MAAMe,eAAe,GAAGnB,cAAc,CAACa,QAAQ,EAAEN,kBAAkB,CAAC;EAEpE,MAAMa,iBAAiB,GAAAC,aAAA,CAAAA,aAAA,KAAQH,eAAe,GAAKC,eAAe,CAAE;EAEpE,oBAAO5B,KAAA,CAAA+B,aAAA,CAAC1B,QAAQ;IAACsB,eAAe,EAAEE,iBAAkB;IAACf,YAAY,EAAEA;EAAa,CAAE,CAAC;AACrF,CAAC;AAEDJ,aAAa,CAACsB,SAAS,GAAG;EACxBrB,KAAK,EAAEV,SAAS,CAACgC,MAAM,CAACC,UAAU;EAClCtB,cAAc,EAAEX,SAAS,CAACkC,SAAS,CAAC,CAAClC,SAAS,CAACgC,MAAM,EAAEhC,SAAS,CAACmC,KAAK,CAAC,CAAC;EACxEvB,eAAe,EAAEZ,SAAS,CAACgC;AAC7B,CAAC;AAEDvB,aAAa,CAAC2B,YAAY,GAAG;EAC3BzB,cAAc,EAAE,CAAC,CAAC;EAClBC,eAAe,EAAE,CAAC;AACpB,CAAC;AAED,eAAeH,aAAa","ignoreList":[]}
|
|
@@ -6,8 +6,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
6
6
|
import React, { useState } from 'react';
|
|
7
7
|
import PropTypes from 'prop-types';
|
|
8
8
|
import { useQuery } from '@apollo/client';
|
|
9
|
-
import {
|
|
10
|
-
import { getUser } from '@blaze-cms/react-page-builder';
|
|
9
|
+
import { getCurrentUser } from '@blaze-cms/react-page-builder';
|
|
11
10
|
import { withRouter } from 'next/router';
|
|
12
11
|
import GTMEvent from './GTMEvent';
|
|
13
12
|
import { buildDataLayer, buildNestedEvent, buildUserQueryProps, buildUserLayer } from '../helpers';
|
|
@@ -31,18 +30,13 @@ const GTMEventRender = _ref => {
|
|
|
31
30
|
error,
|
|
32
31
|
loading
|
|
33
32
|
} = useQuery(action, queryVariables);
|
|
34
|
-
const
|
|
35
|
-
id: userId
|
|
36
|
-
} = checkIfLoggedIn();
|
|
37
|
-
const hasUserProps = userId && userPropsToDisplay && userPropsToDisplay.length;
|
|
33
|
+
const hasUserProps = userPropsToDisplay && userPropsToDisplay.length;
|
|
38
34
|
const userProps = hasUserProps ? buildUserQueryProps(userPropsToDisplay) : '';
|
|
39
35
|
const {
|
|
40
36
|
data: userData,
|
|
41
37
|
loading: userLoading
|
|
42
|
-
} = useQuery(
|
|
43
|
-
variables: {
|
|
44
|
-
id: userId
|
|
45
|
-
},
|
|
38
|
+
} = useQuery(getCurrentUser(userProps), {
|
|
39
|
+
variables: {},
|
|
46
40
|
skip: !hasUserProps
|
|
47
41
|
});
|
|
48
42
|
if (loading || userLoading || error) return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GTMEventRender.js","names":["React","useState","PropTypes","useQuery","
|
|
1
|
+
{"version":3,"file":"GTMEventRender.js","names":["React","useState","PropTypes","useQuery","getCurrentUser","withRouter","GTMEvent","buildDataLayer","buildNestedEvent","buildUserQueryProps","buildUserLayer","GTMEventRender","_ref","router","action","actionKey","queryVariables","parentComponent","userPropsToDisplay","handleOnSuccess","eventProps","_objectWithoutProperties","_excluded","asPath","currentLocation","setCurrentLocation","data","error","loading","hasUserProps","length","userProps","userData","userLoading","variables","skip","gtmData","entityData","eventTrigger","propsToDisplay","eventEcommerce","dataLayerProps","dataLayerObject","userLayerObject","extendedDataLayer","_objectSpread","createElement","propTypes","array","object","isRequired","string","func","defaultProps"],"sources":["../../src/GoogleTagManagerEvent/GTMEventRender.js"],"sourcesContent":["import React, { useState } from 'react';\nimport PropTypes from 'prop-types';\nimport { useQuery } from '@apollo/client';\nimport { getCurrentUser } from '@blaze-cms/react-page-builder';\nimport { withRouter } from 'next/router';\nimport GTMEvent from './GTMEvent';\nimport { buildDataLayer, buildNestedEvent, buildUserQueryProps, buildUserLayer } from '../helpers';\n\nconst GTMEventRender = ({\n router,\n action,\n actionKey,\n queryVariables,\n parentComponent,\n userPropsToDisplay,\n handleOnSuccess,\n ...eventProps\n}) => {\n const { asPath } = router;\n const [currentLocation, setCurrentLocation] = useState('');\n const { data = {}, error, loading } = useQuery(action, queryVariables);\n const hasUserProps = userPropsToDisplay && userPropsToDisplay.length;\n const userProps = hasUserProps ? buildUserQueryProps(userPropsToDisplay) : '';\n const { data: userData, loading: userLoading } = useQuery(getCurrentUser(userProps), {\n variables: {},\n skip: !hasUserProps\n });\n\n if (loading || userLoading || error) return null;\n const gtmData = data.entityData || data[actionKey];\n\n if (currentLocation !== asPath) {\n setCurrentLocation(asPath);\n return null;\n }\n\n const { eventTrigger, propsToDisplay, eventEcommerce } = eventProps;\n const dataLayerProps = buildDataLayer(gtmData, propsToDisplay);\n\n const dataLayerObject = buildNestedEvent(\n eventEcommerce,\n eventProps,\n dataLayerProps,\n parentComponent\n );\n const userLayerObject = buildUserLayer(userData, userPropsToDisplay);\n const extendedDataLayer = { ...dataLayerObject, ...userLayerObject };\n\n return (\n <GTMEvent\n dataLayerObject={extendedDataLayer}\n eventTrigger={eventTrigger}\n currentLocation={currentLocation}\n handleOnSuccess={handleOnSuccess}\n />\n );\n};\n\nGTMEventRender.propTypes = {\n userPropsToDisplay: PropTypes.array,\n router: PropTypes.object.isRequired,\n action: PropTypes.object.isRequired,\n actionKey: PropTypes.string.isRequired,\n queryVariables: PropTypes.object.isRequired,\n parentComponent: PropTypes.object.isRequired,\n handleOnSuccess: PropTypes.func\n};\n\nGTMEventRender.defaultProps = {\n userPropsToDisplay: [],\n handleOnSuccess: () => {}\n};\n\nGTMEventRender.defaultProps = {\n userPropsToDisplay: []\n};\n\nexport default withRouter(GTMEventRender);\n"],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@blaze-cms/plugin-gtm-fe",
|
|
3
|
-
"version": "0.146.0-node18-core-styles.
|
|
3
|
+
"version": "0.146.0-node18-core-styles.2",
|
|
4
4
|
"description": "Blaze GTM plugin fe",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"module": "lib-es/index.js",
|
|
@@ -27,16 +27,16 @@
|
|
|
27
27
|
},
|
|
28
28
|
"license": "GPL-3.0",
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@blaze-cms/core-auth-ui": "0.146.0-node18-core-styles.
|
|
30
|
+
"@blaze-cms/core-auth-ui": "0.146.0-node18-core-styles.2",
|
|
31
31
|
"@blaze-cms/nextjs-components": "0.146.0-node18-core-styles.0",
|
|
32
|
-
"@blaze-cms/react-page-builder": "0.146.0-node18-core-styles.
|
|
32
|
+
"@blaze-cms/react-page-builder": "0.146.0-node18-core-styles.2",
|
|
33
33
|
"@blaze-cms/setup-ui": "0.146.0-node18-core-styles.0",
|
|
34
34
|
"core-js": "^3.2.1",
|
|
35
35
|
"regenerator-runtime": "^0.13.3",
|
|
36
36
|
"web-vitals": "^0.2.2"
|
|
37
37
|
},
|
|
38
38
|
"devDependencies": {
|
|
39
|
-
"@blaze-cms/core-ui": "0.146.0-node18-core-styles.
|
|
39
|
+
"@blaze-cms/core-ui": "0.146.0-node18-core-styles.2"
|
|
40
40
|
},
|
|
41
41
|
"peerDependencies": {
|
|
42
42
|
"next": "14.1.0"
|
|
@@ -45,5 +45,5 @@
|
|
|
45
45
|
"lib/*",
|
|
46
46
|
"lib-es/*"
|
|
47
47
|
],
|
|
48
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "c124596c6b8d92f08f58c4dc004a4ea7d1703f23"
|
|
49
49
|
}
|
|
@@ -2,8 +2,7 @@ import { useState } from 'react';
|
|
|
2
2
|
import PropTypes from 'prop-types';
|
|
3
3
|
import { useQuery } from '@apollo/client';
|
|
4
4
|
import { withRouter } from 'next/router';
|
|
5
|
-
import {
|
|
6
|
-
import { checkIfLoggedIn } from '@blaze-cms/core-auth-ui';
|
|
5
|
+
import { getCurrentUser } from '@blaze-cms/react-page-builder';
|
|
7
6
|
import {
|
|
8
7
|
buildDataLayer,
|
|
9
8
|
buildAndPushWebVitals,
|
|
@@ -19,11 +18,10 @@ const GTMRender = ({ router, action, propsToDisplay, parentId, webVitals, userPr
|
|
|
19
18
|
const { data, error, loading } = useQuery(action, {
|
|
20
19
|
variables: { id: parentId }
|
|
21
20
|
});
|
|
22
|
-
const
|
|
23
|
-
const hasUserProps = userId && userPropsToDisplay && userPropsToDisplay.length;
|
|
21
|
+
const hasUserProps = userPropsToDisplay && userPropsToDisplay.length;
|
|
24
22
|
const userProps = hasUserProps ? buildUserQueryProps(userPropsToDisplay) : '';
|
|
25
|
-
const { data: userData, loading: userLoading } = useQuery(
|
|
26
|
-
variables: {
|
|
23
|
+
const { data: userData, loading: userLoading } = useQuery(getCurrentUser(userProps), {
|
|
24
|
+
variables: {},
|
|
27
25
|
skip: !hasUserProps
|
|
28
26
|
});
|
|
29
27
|
|
|
@@ -2,7 +2,7 @@ import React from 'react';
|
|
|
2
2
|
import PropTypes from 'prop-types';
|
|
3
3
|
import { useQuery } from '@apollo/client';
|
|
4
4
|
import { checkIfLoggedIn } from '@blaze-cms/core-auth-ui';
|
|
5
|
-
import {
|
|
5
|
+
import { getCurretUser } from '@blaze-cms/react-page-builder';
|
|
6
6
|
import GTMEvent from './GTMEvent';
|
|
7
7
|
import { buildDataLayer, buildNestedEvent, buildUserQueryProps, buildUserLayer } from '../helpers';
|
|
8
8
|
|
|
@@ -10,7 +10,7 @@ const GTMClickEvent = ({ event, componentProps, parentComponent }) => {
|
|
|
10
10
|
const { eventTrigger, propsToDisplay, userPropsToDisplay, eventEcommerce } = event;
|
|
11
11
|
const { id: userId } = checkIfLoggedIn();
|
|
12
12
|
const userProps = userId ? buildUserQueryProps(userPropsToDisplay) : '';
|
|
13
|
-
const { data: userData, loading } = useQuery(
|
|
13
|
+
const { data: userData, loading } = useQuery(getCurretUser(userProps), {
|
|
14
14
|
variables: { id: userId },
|
|
15
15
|
skip: !userId
|
|
16
16
|
});
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import React, { useState } from 'react';
|
|
2
2
|
import PropTypes from 'prop-types';
|
|
3
3
|
import { useQuery } from '@apollo/client';
|
|
4
|
-
import {
|
|
5
|
-
import { getUser } from '@blaze-cms/react-page-builder';
|
|
4
|
+
import { getCurrentUser } from '@blaze-cms/react-page-builder';
|
|
6
5
|
import { withRouter } from 'next/router';
|
|
7
6
|
import GTMEvent from './GTMEvent';
|
|
8
7
|
import { buildDataLayer, buildNestedEvent, buildUserQueryProps, buildUserLayer } from '../helpers';
|
|
@@ -20,11 +19,10 @@ const GTMEventRender = ({
|
|
|
20
19
|
const { asPath } = router;
|
|
21
20
|
const [currentLocation, setCurrentLocation] = useState('');
|
|
22
21
|
const { data = {}, error, loading } = useQuery(action, queryVariables);
|
|
23
|
-
const
|
|
24
|
-
const hasUserProps = userId && userPropsToDisplay && userPropsToDisplay.length;
|
|
22
|
+
const hasUserProps = userPropsToDisplay && userPropsToDisplay.length;
|
|
25
23
|
const userProps = hasUserProps ? buildUserQueryProps(userPropsToDisplay) : '';
|
|
26
|
-
const { data: userData, loading: userLoading } = useQuery(
|
|
27
|
-
variables: {
|
|
24
|
+
const { data: userData, loading: userLoading } = useQuery(getCurrentUser(userProps), {
|
|
25
|
+
variables: {},
|
|
28
26
|
skip: !hasUserProps
|
|
29
27
|
});
|
|
30
28
|
|