-
-
Notifications
You must be signed in to change notification settings - Fork 229
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: grapher page related research from DB content graph #3176
Conversation
Current dependencies on/for this PR:
This stack of pull requests is managed by Graphite. |
Important Auto Review SkippedAuto reviews are disabled on base/target branches other than the default branch. Please add the base/target branch pattern to the list of additional branches to be reviewed in the settings. Please check the settings in the CodeRabbit UI or the To trigger a single review, invoke the Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (invoked as PR comments)
Additionally, you can add CodeRabbit Configration File (
|
Back to the drawing board, evaluating whether |
cb1d456
to
8265f67
Compare
e6ae373
to
346822f
Compare
8265f67
to
c2e9291
Compare
346822f
to
3b47356
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good! Two minor comments but neither is very important
MAX(chart_tags.keyChartLevel) as keyChartLevel | ||
FROM charts | ||
INNER JOIN chart_tags ON charts.id=chart_tags.chartId | ||
WHERE JSON_CONTAINS(config->'$.dimensions', '{"variableId":${variableId}}') |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it's better to join on the chart_dimensions table rather than this json_contains (normal tables are much faster to filter than nested json in mysql)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thanks, that makes sense. This was only moved during a refactor so I made an issue for it: #3203.
-- note: we are not filtering by linkType to cast of wider net: if a post links to an | ||
-- explorer having the same slug as the grapher chart, we want to surface it as | ||
-- a "Related research" as it is most likely relevant. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't quite get this comment - can you try to explain to me in different words what you mean?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The idea here was to not restrict linkType to "grapher" only, so a post embedding an explorer sharing the same slug as the chart would also be returned (next to posts linking to the chart only). This was more of an edge case optimization which I ended up dropping when I merged references (in the grapher admin) with related posts (in the grapher page) in a58fea7.
3b47356
to
8568bca
Compare
8c1eac2
to
6c8f189
Compare
8568bca
to
445f734
Compare
6c8f189
to
85cf4fe
Compare
445f734
to
05ecc94
Compare
05ecc94
to
bbcf834
Compare
f15615f
to
e93d1ba
Compare
bbcf834
to
3ba5145
Compare
3ba5145
to
08fe279
Compare
This PR merges the content graph queries used in grapher pages (see #3176) and the references queries used in the chart admin to indicate where a chart is being used. If fixes two issues on the tab page: - Overridden Wordpress posts now ignored - Remove duplicate posts Reusable blocks are no longer surfaced. This is ok since reusable blocks are now dereferenced in the embedding article, which means a chart within a reusable block would show in the parent article. One exception is explorer content blocks, which are still standalone. A quick manual check on all explorers reveals that only one explorer references a chart: https://ourworldindata.org/explorers/plastic-pollution. Given these blocks' scope and limited lifetime, this caveat is acceptable. _A future PR should use these references during the check performed before deleting a chart. Currently, [only gdocs are being checked](https://github.com/owid/owid-grapher/blob/e5acb212754bbba7d5d563fcd856adbb32ab8a36/adminSiteServer/apiRouter.ts#L603-L611)._ ### Before <img width="546" alt="Screenshot 2024-02-07 at 17 07 50" src="https://github.com/owid/owid-grapher/assets/13406362/1a4c25b8-3398-44b7-b14c-10c752d442d3"> ### After <img width="530" alt="Screenshot 2024-02-07 at 20 38 49" src="https://github.com/owid/owid-grapher/assets/13406362/1fad824e-8613-4825-9342-6d18a089d900"> ### Testing links Below are some testing links to grapher pages, backlinking to posts in different configurations. - gdoc: [https://ourworldindata.org/grapher/agricultural-export-subsidies](https://ourworldindata.org/grapher/agricultural-export-subsidies) - [x] [http://localhost:3030/grapher/agricultural-export-subsidies](http://localhost:3030/grapher/agricultural-export-subsidies) - [x] [http://staging-site-content-graph-references/grapher/agricultural-export-subsidies](http://staging-site-content-graph-references/grapher/agricultural-export-subsidies) - gdocs: [https://ourworldindata.org/grapher/pollution-deaths-from-fossil-fuels](https://ourworldindata.org/grapher/pollution-deaths-from-fossil-fuels) - [x] [http://localhost:3030/grapher/pollution-deaths-from-fossil-fuels](http://localhost:3030/grapher/pollution-deaths-from-fossil-fuels) - [x] [http://staging-site-content-graph-references/grapher/pollution-deaths-from-fossil-fuels](http://staging-site-content-graph-references/grapher/pollution-deaths-from-fossil-fuels) - wp: [https://ourworldindata.org/grapher/dalys-rate-from-all-causes](https://ourworldindata.org/grapher/dalys-rate-from-all-causes) - [x] [http://localhost:3030/grapher/dalys-rate-from-all-causes](http://localhost:3030/grapher/dalys-rate-from-all-causes) - [x] [http://staging-site-content-graph-references/grapher/dalys-rate-from-all-causes](http://staging-site-content-graph-references/grapher/dalys-rate-from-all-causes) - wp (with chart redirect): [https://ourworldindata.org/grapher/age-standardized-death-rate-from-pm25-pollution-per-100000-vs-gdp-per-capita-int-](https://ourworldindata.org/grapher/age-standardized-death-rate-from-pm25-pollution-per-100000-vs-gdp-per-capita-int-) - [x] [http://localhost:3030/grapher/age-standardized-death-rate-from-pm25-pollution-per-100000-vs-gdp-per-capita-int-](http://localhost:3030/grapher/age-standardized-death-rate-from-pm25-pollution-per-100000-vs-gdp-per-capita-int-) - [x] [http://staging-site-content-graph-references/grapher/age-standardized-death-rate-from-pm25-pollution-per-100000-vs-gdp-per-capita-int-](http://staging-site-content-graph-references/grapher/age-standardized-death-rate-from-pm25-pollution-per-100000-vs-gdp-per-capita-int-) - gdoc (with chart redirect): [https://ourworldindata.org/grapher/population-long-run-with-projections?time=earliest..2100&country=~OWID_WRL](https://ourworldindata.org/grapher/population-long-run-with-projections?time=earliest..2100&country=~OWID_WRL) - [x] [http://localhost:3030/grapher/population-long-run-with-projections?time=earliest..2100&country=~OWID_WRL](http://localhost:3030/grapher/population-long-run-with-projections?time=earliest..2100&country=~OWID_WRL) - [x] [http://staging-site-content-graph-references/grapher/population-long-run-with-projections?time=earliest..2100&country=~OWID_WRL](http://staging-site-content-graph-references/grapher/population-long-run-with-projections?time=earliest..2100&country=~OWID_WRL) - none: [https://ourworldindata.org/grapher/death-rates-alcohol-drug-overdoses-by-age-who](https://ourworldindata.org/grapher/death-rates-alcohol-drug-overdoses-by-age-who) - [x] [http://localhost:3030/grapher/death-rates-alcohol-drug-overdoses-by-age-who](http://localhost:3030/grapher/death-rates-alcohol-drug-overdoses-by-age-who) - [x] [http://staging-site-content-graph-references/grapher/death-rates-alcohol-drug-overdoses-by-age-who](http://staging-site-content-graph-references/grapher/death-rates-alcohol-drug-overdoses-by-age-who)
This PR replaces the fortunejs content graph with a DB-based alternative, using the links stored in the
posts_links
andposts_gdoc_links
tables.This PR also continues the deprecation work started in #3166.
Inconsistency on how grapher chart links are stored in the DB: there are a handful of chart links stored with the https://ourworldindata.org/grapher prefix. These disappear upon saving the containing articles, which indicates that they were created with an older version of the codebase. I'm then opting for not supporting them in the content graph.
Testing links
Below are some testing links to grapher pages, backlinking to posts in different configurations.