gatsby-core-theme 17.0.9 → 17.0.10
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/.ci.yml +1 -1
- package/CHANGELOG.md +16 -0
- package/package.json +1 -1
- package/src/constants/settings.js +1 -0
- package/src/helpers/generators.js +7 -2
- package/src/helpers/generators.test.js +1 -3
package/.ci.yml
CHANGED
|
@@ -19,7 +19,7 @@ Theme Tests:
|
|
|
19
19
|
- if: '$CI_PIPELINE_SOURCE == "push" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "beta") && $PIPELINE == "automated"'
|
|
20
20
|
|
|
21
21
|
Theme Publish:
|
|
22
|
-
image:
|
|
22
|
+
image: node:18.0.0
|
|
23
23
|
stage: publish
|
|
24
24
|
tags:
|
|
25
25
|
- floyd-runner-test
|
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,19 @@
|
|
|
1
|
+
## [17.0.10](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v17.0.9...v17.0.10) (2023-01-10)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* add multiple type of tracekr link ([a44341e](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/a44341ecc69ad66e62ef9712f1a44998c4b38998))
|
|
7
|
+
* add onlinegamblingsa.com settings ([3ad1a68](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/3ad1a68f827b93f850c4c77aa48860fb2702d0fb))
|
|
8
|
+
* change image for release pipeline ([44955af](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/44955af855683d04272161756750127395c6e673))
|
|
9
|
+
* clean up code ([a10323b](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/a10323b279d42a5c04444c4b49bb78804289209a))
|
|
10
|
+
* cleanup ([8fdc216](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/8fdc216e3c491347f7157437907ac0d5efebe34d))
|
|
11
|
+
* fix tests ([8bbe189](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/8bbe1893da3ead8cfd1f2c61f5f71a97eab679b6))
|
|
12
|
+
* remove brackets ([03fa67d](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/03fa67d4555f7636c1f19cd68ff115efd10ccf9c))
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
* Merge branch 'tm-2933-tracker' into 'master' ([26108f3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/26108f357982c64a90f23a7a9517aef21cf89368))
|
|
16
|
+
|
|
1
17
|
## [17.0.9](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v17.0.8...v17.0.9) (2023-01-05)
|
|
2
18
|
|
|
3
19
|
|
package/package.json
CHANGED
|
@@ -14,6 +14,7 @@ export default {
|
|
|
14
14
|
'norskespilleautomater.com': ['inactive', 'blacklisted'],
|
|
15
15
|
'playcasino.co.za': ['inactive', 'blacklisted'],
|
|
16
16
|
'onlinegamblingsa.co.za': ['inactive', 'blacklisted'],
|
|
17
|
+
'onlinegamblingsa.com': ['inactive', 'blacklisted'],
|
|
17
18
|
},
|
|
18
19
|
keep_page_extra_fields: {
|
|
19
20
|
operator: {
|
|
@@ -1,15 +1,20 @@
|
|
|
1
1
|
import { months } from '../constants/common';
|
|
2
2
|
|
|
3
3
|
export function generateTrackerLink(operator, trackerType, provider = false) {
|
|
4
|
-
|
|
4
|
+
let defaultTrackerFormat = provider
|
|
5
5
|
? process.env.PROVIDER_TRACKER_LINK_FORMAT_MAIN
|
|
6
6
|
: process.env.TRACKER_LINK_FORMAT_MAIN;
|
|
7
|
-
|
|
7
|
+
let trackerFormat = provider
|
|
8
8
|
? process.env.PROVIDER_TRACKER_LINK_FORMAT_NON_MAIN
|
|
9
9
|
: process.env.TRACKER_LINK_FORMAT_NON_MAIN;
|
|
10
|
+
|
|
10
11
|
if (defaultTrackerFormat && trackerFormat) {
|
|
12
|
+
if (operator.type === 'casino') {
|
|
13
|
+
defaultTrackerFormat = defaultTrackerFormat.replace('type,', '');
|
|
14
|
+
}
|
|
11
15
|
const linkFormatArray =
|
|
12
16
|
trackerType === 'main' ? defaultTrackerFormat.split(',') : trackerFormat.split(',');
|
|
17
|
+
|
|
13
18
|
const trackerArr = linkFormatArray.map((item) => {
|
|
14
19
|
const customSection = item.match(/\[(.*)\]/);
|
|
15
20
|
if (customSection) {
|
|
@@ -15,10 +15,8 @@ describe('Generate Tracker Link Helper', () => {
|
|
|
15
15
|
expect(trackerLink).toEqual('/no/visit/bet365/casino/non_main');
|
|
16
16
|
});
|
|
17
17
|
test('generateTrackerLink no tracker format', () => {
|
|
18
|
-
process.env.TRACKER_LINK_FORMAT_MAIN = '';
|
|
19
|
-
process.env.TRACKER_LINK_FORMAT_NON_MAIN = '';
|
|
20
18
|
const trackerLink = generateTrackerLink({ type: 'casino', short_name: 'bet365' }, 'main');
|
|
21
|
-
expect(trackerLink).
|
|
19
|
+
expect(trackerLink).toEqual('/no/visit/bet365');
|
|
22
20
|
});
|
|
23
21
|
});
|
|
24
22
|
|