Skip to content

Commit 95d8156

Browse files
committed
latest technologies schema
1 parent a5740ae commit 95d8156

File tree

2 files changed

+30
-18
lines changed

2 files changed

+30
-18
lines changed

definitions/output/reports/cwv_tech_technologies.js

+29-18
Original file line numberDiff line numberDiff line change
@@ -11,37 +11,47 @@ WITH pages AS (
1111
client,
1212
root_page,
1313
tech.technology
14-
FROM ${ctx.ref('crawl', 'pages')},
15-
UNNEST(technologies) AS tech
14+
FROM ${ctx.ref('crawl', 'pages')} AS pages
15+
INNER JOIN pages.technologies AS tech
1616
WHERE
1717
date = '${pastMonth}'
1818
${constants.devRankFilter}
1919
),
2020
2121
tech_origins AS (
2222
SELECT
23-
client,
2423
technology,
25-
COUNT(DISTINCT root_page) AS origins
26-
FROM pages
27-
GROUP BY
28-
client,
29-
technology
24+
STRUCT(
25+
MAX(IF(client = 'desktop', origins, 0)) AS desktop,
26+
MAX(IF(client = 'mobile', origins, 0)) AS mobile
27+
) AS origins
28+
FROM (
29+
SELECT
30+
client,
31+
technology,
32+
COUNT(DISTINCT root_page) AS origins
33+
FROM pages
34+
GROUP BY
35+
client,
36+
technology
37+
)
38+
GROUP BY technology
3039
),
3140
3241
technologies AS (
3342
SELECT
3443
name AS technology,
3544
description,
45+
icon,
3646
STRING_AGG(DISTINCT category, ', ' ORDER BY category ASC) AS category,
37-
categories AS category_obj,
38-
NULL AS similar_technologies
39-
FROM ${ctx.ref('wappalyzer', 'technologies')},
40-
UNNEST(categories) AS category
47+
categories AS category_obj
48+
FROM ${ctx.ref('wappalyzer', 'technologies')} AS technologies
49+
INNER JOIN technologies.categories AS category
4150
GROUP BY
4251
technology,
4352
description,
44-
categories
53+
categories,
54+
icon
4555
),
4656
4757
total_pages AS (
@@ -53,12 +63,11 @@ total_pages AS (
5363
)
5464
5565
SELECT
56-
client,
5766
technology,
5867
description,
68+
icon,
5969
category,
6070
category_obj,
61-
similar_technologies,
6271
origins
6372
FROM tech_origins
6473
INNER JOIN technologies
@@ -67,12 +76,14 @@ USING(technology)
6776
UNION ALL
6877
6978
SELECT
70-
client,
7179
'ALL' AS technology,
7280
NULL AS description,
81+
NULL AS icon,
7382
NULL AS category,
7483
NULL AS category_obj,
75-
NULL AS similar_technologies,
76-
origins
84+
STRUCT(
85+
MAX(IF(client = 'desktop', origins, 0)) AS desktop,
86+
MAX(IF(client = 'mobile', origins, 0)) AS mobile
87+
) AS origins
7788
FROM total_pages
7889
`)

infra/tf/masthead-deployment

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit 92b5b6db174e0b7939efcc14f17a7f421a4e81d5

0 commit comments

Comments
 (0)