Press n or j to go to the next uncovered block, b, p or k for the previous block.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 | 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x | // Testing pages for comparing local charts against live versions import { Router } from "express" import * as React from "react" import { renderToHtmlPage, expectInt } from "../serverUtils/serverUtil" import { OldChart, Chart } from "../db/model/Chart" import { Head } from "../site/Head" import * as db from "../db/db" import { ADMIN_BASE_URL, BAKED_GRAPHER_URL, BAKED_BASE_URL, } from "../settings/serverSettings" import { excludeUndefined, parseIntOrUndefined } from "../clientUtils/Util" import { grapherToSVG } from "../baker/GrapherImageBaker" import { ChartTypeName, EntitySelectionMode, GrapherTabOption, StackMode, } from "../grapher/core/GrapherConstants" import { Url } from "../clientUtils/urls/Url" import { queryParamsToStr } from "../clientUtils/urls/UrlUtils" const IS_LIVE = ADMIN_BASE_URL === "https://owid.cloud" const DEFAULT_COMPARISON_URL = "https://ourworldindata.org" const testPageRouter = Router() interface ChartItem { id: number slug: string } function parseStringArrayOrUndefined(param: string | undefined): string[] { if (param === undefined) return [] return param.split(",") } function parseIntArrayOrUndefined(param: string | undefined): number[] { return excludeUndefined( parseStringArrayOrUndefined(param).map(parseIntOrUndefined) ) } interface EmbedTestPageQueryParams { readonly originalUrl: string readonly comparisonUrl?: string readonly perPage?: string readonly page?: string readonly random?: string readonly tab?: GrapherTabOption readonly type?: ChartTypeName readonly logLinear?: string readonly comparisonLines?: string readonly stackMode?: StackMode readonly relativeToggle?: string readonly categoricalLegend?: string readonly mixedTimeTypes?: string readonly addCountryMode?: EntitySelectionMode readonly includePrivate?: string readonly ids?: string readonly datasetIds?: string readonly namespace?: string readonly namespaces?: string } async function propsFromQueryParams( params: EmbedTestPageQueryParams ): Promise<EmbedTestPageProps> { const page = params.page ? expectInt(params.page) : params.random ? Math.floor(1 + Math.random() * 180) // Sample one of 180 pages. Some charts won't ever get picked but good enough. : 1 const perPage = parseIntOrUndefined(params.perPage) ?? 20 const ids = parseIntArrayOrUndefined(params.ids) const datasetIds = parseIntArrayOrUndefined(params.datasetIds) const namespaces = parseStringArrayOrUndefined(params.namespaces) ?? (params.namespace ? [params.namespace] : []) let query = Chart.createQueryBuilder("charts") .where("publishedAt IS NOT NULL") .limit(perPage) .offset(perPage * (page - 1)) .orderBy("id", "ASC") let tab = params.tab if (params.type) { if (params.type === ChartTypeName.WorldMap) { query = query.andWhere(`config->"$.hasMapTab" IS TRUE`) tab = tab || GrapherTabOption.map } else { if (params.type === "LineChart") { query = query.andWhere( `( config->"$.type" = "LineChart" OR config->"$.type" IS NULL ) AND COALESCE(config->"$.hasChartTab", TRUE) IS TRUE` ) } else { query = query.andWhere( `config->"$.type" = :type AND COALESCE(config->"$.hasChartTab", TRUE) IS TRUE`, { type: params.type } ) } tab = tab || GrapherTabOption.chart } } if (params.logLinear) { query = query.andWhere( `config->'$.yAxis.canChangeScaleType' IS TRUE OR config->>'$.xAxis.canChangeScaleType' IS TRUE` ) tab = GrapherTabOption.chart } if (params.comparisonLines) { query = query.andWhere(`config->'$.comparisonLines[0].yEquals' != ''`) tab = GrapherTabOption.chart } if (params.stackMode) { query = query.andWhere(`config->'$.stackMode' = :stackMode`, { stackMode: params.stackMode, }) tab = GrapherTabOption.chart } if (params.relativeToggle) { query = query.andWhere(`config->'$.hideRelativeToggle' IS FALSE`) tab = GrapherTabOption.chart } if (params.categoricalLegend) { // This is more of a heuristic, since this query can potentially include charts that don't // have a visible categorial legend, and can leave out some that have one. // But in practice it seems to work reasonably well. query = query.andWhere( `json_length(config->'$.map.colorScale.customCategoryColors') > 1` ) tab = GrapherTabOption.map } if (params.mixedTimeTypes) { query = query.andWhere( ` ( SELECT COUNT(DISTINCT CASE WHEN variables.display->"$.yearIsDay" IS NULL THEN "year" ELSE "day" END) as timeTypeCount FROM variables JOIN chart_dimensions ON chart_dimensions.variableId = variables.id WHERE chart_dimensions.chartId = charts.id ) >= 2 ` ) } if (params.addCountryMode) { const mode = params.addCountryMode if (mode === EntitySelectionMode.MultipleEntities) { query = query.andWhere( `config->'$.addCountryMode' IS NULL OR config->'$.addCountryMode' = :mode`, { mode: EntitySelectionMode.MultipleEntities, } ) } else { query = query.andWhere(`config->'$.addCountryMode' = :mode`, { mode, }) } } if (ids.length > 0) { query = query.andWhere(`charts.id IN (${params.ids})`) } if (tab === GrapherTabOption.map) { query = query.andWhere(`config->"$.hasMapTab" IS TRUE`) } else if (tab === GrapherTabOption.chart) { query = query.andWhere( `COALESCE(config->"$.hasChartTab", TRUE) IS TRUE` ) } // Exclude charts that have the "Private" tag assigned, unless `includePrivate` is passed. // The data for these charts is not included in the public database dump used to populate // staging and local, so they are not comparable. if (params.includePrivate === undefined) { query.andWhere(` NOT EXISTS( SELECT * FROM tags JOIN chart_tags ON chart_tags.tagId = tags.id WHERE chart_tags.chartId = charts.id AND tags.name = 'Private' ) `) } if (datasetIds.length > 0) { const datasetIds = params.datasetIds query.andWhere( ` EXISTS( SELECT * FROM variables INNER JOIN chart_dimensions ON chart_dimensions.variableId = variables.id WHERE variables.datasetId IN (:datasetIds) AND chart_dimensions.chartId = charts.id ) `, { datasetIds } ) } if (namespaces.length > 0) { query.andWhere( ` EXISTS( SELECT * FROM datasets INNER JOIN variables ON variables.datasetId = datasets.id INNER JOIN chart_dimensions ON chart_dimensions.variableId = variables.id WHERE datasets.namespace IN (:namespaces) AND chart_dimensions.chartId = charts.id ) `, { namespaces: namespaces } ) } const charts: ChartItem[] = (await query.getMany()).map((c) => ({ id: c.id, slug: c.config.slug, })) if (tab) { charts.forEach((c) => (c.slug += `?tab=${tab}`)) } const count = await query.getCount() const numPages = Math.ceil(count / perPage) const originalUrl = Url.fromURL(params.originalUrl) const prevPageUrl = page > 1 ? originalUrl.updateQueryParams({ page: (page - 1).toString() }) .fullUrl : undefined const nextPageUrl = page < numPages ? originalUrl.updateQueryParams({ page: (page + 1).toString() }) .fullUrl : undefined return { prevPageUrl: prevPageUrl, nextPageUrl: nextPageUrl, charts: charts, currentPage: page, totalPages: numPages, comparisonUrl: params.comparisonUrl ?? "https://ourworldindata.org", } } interface EmbedTestPageProps { prevPageUrl?: string nextPageUrl?: string currentPage?: number totalPages?: number charts: ChartItem[] comparisonUrl: string } function EmbedTestPage(props: EmbedTestPageProps) { const style = ` html, body { height: 100%; margin: 0; background-color: #f1f1f1; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; } figure, iframe { border: 0; flex: 1; height: 450px; margin: 10px; } figure { padding-top: 3px; } .row { padding: 10px; margin: 0; border-bottom: 1px solid #ddd; } .side-by-side { display: flex; align-items: center; justify-content: center; width: 100%; } h3 { width: 50%; text-align: center; margin: 0; } nav.pagination { width: 100%; text-align: center; padding: 15px; } .chart-id { font-size: 18px; font-weight: bold; padding-top: 10px; text-align: center; } .chart-id a { text-decoration: underline; text-decoration-color: #ccc; } ` return ( <html> <Head canonicalUrl="" pageTitle="Test Embeds" baseUrl={BAKED_BASE_URL} > <style dangerouslySetInnerHTML={{ __html: style }} /> </Head> <body> <div className="row"> <div className="side-by-side"> <h3>{props.comparisonUrl}</h3> {!IS_LIVE && <h3>{BAKED_BASE_URL}</h3>} </div> </div> {props.charts.map((chart) => ( <div key={chart.slug} className="row"> <div className="chart-id"> <a href={queryParamsToStr({ ids: chart.id.toString(), comparisonUrl: props.comparisonUrl, })} > {chart.id} </a> </div> <div className="side-by-side"> <iframe src={`${props.comparisonUrl}/grapher/${chart.slug}`} loading="lazy" /> {!IS_LIVE && ( <figure data-grapher-src={`${BAKED_GRAPHER_URL}/${chart.slug}`} /> )} </div> </div> ))} <nav className="pagination"> {props.prevPageUrl && ( <a href={props.prevPageUrl}><< Prev</a> )}{" "} {props.currentPage !== undefined && props.totalPages !== undefined && `Page ${props.currentPage} of ${props.totalPages}`}{" "} {props.nextPageUrl && ( <a href={props.nextPageUrl}>Next >></a> )} </nav> <script src={`${BAKED_GRAPHER_URL}/embedCharts.js`} /> </body> </html> ) } testPageRouter.get("/embeds", async (req, res) => { const props = await propsFromQueryParams({ ...req.query, originalUrl: req.originalUrl, }) res.send(renderToHtmlPage(<EmbedTestPage {...props} />)) }) testPageRouter.get("/embeds/:id", async (req, res) => { const id = req.params.id const chart = await Chart.createQueryBuilder() .where("id = :id", { id: id }) .getOne() if (chart) { const charts = [ { id: chart.id, slug: `${chart.config.slug}${ req.query.tab ? `?tab=${req.query.tab}` : "" }`, }, ] res.send( renderToHtmlPage( <EmbedTestPage charts={charts} comparisonUrl={DEFAULT_COMPARISON_URL} /> ) ) } else { res.send("Could not find chart ID") } }) function PreviewTestPage(props: { charts: any[] }) { const style = ` html, body { height: 100%; margin: 0; } img { width: 45%; } nav.pagination { width: 100%; text-align: center; } ` return ( <html> <head> <meta name="viewport" content="width=device-width, initial-scale=1" /> <title>Test Previews</title> <style dangerouslySetInnerHTML={{ __html: style }} /> </head> <body> {props.charts.map((chart) => ( <div key={chart.slug} className="row"> <a href={`https://ourworldindata.org/grapher/${chart.slug}`} > <img src={`https://ourworldindata.org/grapher/exports/${chart.slug}.svg`} /> </a> <a href={`/grapher/${chart.slug}`}> <img src={`/grapher/exports/${chart.slug}.svg`} /> </a> </div> ))} </body> </html> ) } function EmbedVariantsTestPage( props: Omit<EmbedTestPageProps, "comparisonUrl"> ) { const style = ` html, body { height: 100%; margin: 0; background-color: #f1f1f1; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; } figure, iframe { border: 0; flex: 1; height: 450px; margin: 10px; } .row { padding: 10px; margin: 0; border-bottom: 1px solid #ddd; } .side-by-side { display: flex; align-items: center; justify-content: center; width: 100%; } h3 { width: 50%; text-align: center; margin: 0; } nav.pagination { width: 100%; text-align: center; padding: 15px; } .chart-id { font-size: 18px; font-weight: bold; padding-top: 10px; text-align: center; } ` return ( <html> <head> <meta name="viewport" content="width=device-width, initial-scale=1" /> <title>Test Embed Variants</title> <style dangerouslySetInnerHTML={{ __html: style }} /> </head> <body> {props.charts.map((chart) => ( <div key={chart.slug} className="row"> <div className="chart-id">{chart.id}</div> <div className="side-by-side"> <iframe src={`${BAKED_GRAPHER_URL}/${chart.slug}`} /> {!IS_LIVE && ( <figure data-grapher-src={`${BAKED_GRAPHER_URL}/${chart.slug}`} /> )} </div> </div> ))} <nav className="pagination"> {props.prevPageUrl && ( <a href={props.prevPageUrl}><< Prev</a> )}{" "} {props.currentPage !== undefined && props.totalPages !== undefined && `Page ${props.currentPage} of ${props.totalPages}`}{" "} {props.nextPageUrl && ( <a href={props.nextPageUrl}>Next >></a> )} </nav> <script src={`${BAKED_GRAPHER_URL}/embedCharts.js`} /> </body> </html> ) } testPageRouter.get("/previews", async (req, res) => { const rows = await db.queryMysql(`SELECT config FROM charts LIMIT 200`) const charts = rows.map((row: any) => JSON.parse(row.config)) res.send(renderToHtmlPage(<PreviewTestPage charts={charts} />)) }) testPageRouter.get("/embedVariants", async (req, res) => { const rows = await db.queryMysql(`SELECT config FROM charts WHERE id=64`) const charts = rows.map((row: any) => JSON.parse(row.config)) res.send(renderToHtmlPage(<EmbedVariantsTestPage charts={charts} />)) }) testPageRouter.get("/:slug.svg", async (req, res) => { const grapher = await OldChart.getBySlug(req.params.slug) const vardata = await grapher.getVariableData() res.send(await grapherToSVG(grapher.config, vardata)) }) export { testPageRouter } |