Skip to content

Sanitize labels in Traffic Analytics#22568

Merged
peterzimon merged 3 commits intomainfrom
ta-sanitize-labels
Mar 19, 2025
Merged

Sanitize labels in Traffic Analytics#22568
peterzimon merged 3 commits intomainfrom
ta-sanitize-labels

Conversation

@peterzimon
Copy link
Contributor

ref ANAL-148, ANAL-147

  • Some of the labels and names should be updated to show a more human readable format

ref ANAL-148, ANAL-147

- Some of the labels and names should be updated to show a more human readable format
@peterzimon peterzimon enabled auto-merge (squash) March 19, 2025 16:06
@coderabbitai
Copy link
Contributor

coderabbitai bot commented Mar 19, 2025

Walkthrough

This pull request refactors how statistical labels are processed and displayed throughout the Ghost Admin. In various chart files (technical.js, top-locations.js, top-sources.js), the code now uses a centralized mapping (STATS_LABEL_MAPPINGS) to derive and render name properties, replacing previous string manipulation methods. In the StatsController, the old locationHumanReadable property is removed and replaced with computed properties (formattedLocation, formattedDevice, formattedSource, and formattedOs) that incorporate the new mappings with appropriate fallbacks. The Handlebars template has been updated to reflect these changes by using the formatted properties for conditionally displaying statistics filters. Additionally, some minor adjustments were made in the CSS to affect container overflow and letter-spacing. A new constant, STATS_LABEL_MAPPINGS, has been added to the utils for coherent label resolution across components.

Possibly related PRs

Suggested labels

browser-tests

Warning

There were issues while running some tools. Please review the errors and either fix the tool’s configuration or disable the tool if it’s a critical failure.

🔧 ESLint

If the error stems from missing dependencies, add them to the package.json file. For unrecoverable errors (e.g., due to private dependencies), disable the tool in the CodeRabbit configuration.

ghost/admin/app/components/stats/charts/technical.js

Oops! Something went wrong! :(

ESLint: 8.44.0

Error: Failed to load parser '@babel/eslint-parser' declared in 'ghost/admin/.eslintrc.js': Cannot find module '@babel/eslint-parser'
Require stack:

  • /ghost/admin/.eslintrc.js
    at Module._resolveFilename (node:internal/modules/cjs/loader:1248:15)
    at Function.resolve (node:internal/modules/helpers:145:19)
    at Object.resolve (/node_modules/@eslint/eslintrc/dist/eslintrc.cjs:2346:46)
    at ConfigArrayFactory._loadParser (/node_modules/@eslint/eslintrc/dist/eslintrc.cjs:3325:39)
    at ConfigArrayFactory._normalizeObjectConfigDataBody (/node_modules/@eslint/eslintrc/dist/eslintrc.cjs:3099:43)
    at _normalizeObjectConfigDataBody.next ()
    at ConfigArrayFactory._normalizeObjectConfigData (/node_modules/@eslint/eslintrc/dist/eslintrc.cjs:3040:20)
    at _normalizeObjectConfigData.next ()
    at ConfigArrayFactory.loadInDirectory (/node_modules/@eslint/eslintrc/dist/eslintrc.cjs:2886:28)
    at CascadingConfigArrayFactory._loadConfigInAncestors (/node_modules/@eslint/eslintrc/dist/eslintrc.cjs:3871:46)
ghost/admin/app/utils/stats.js

Oops! Something went wrong! :(

ESLint: 8.44.0

Error: Failed to load parser '@babel/eslint-parser' declared in 'ghost/admin/.eslintrc.js': Cannot find module '@babel/eslint-parser'
Require stack:

  • /ghost/admin/.eslintrc.js
    at Module._resolveFilename (node:internal/modules/cjs/loader:1248:15)
    at Function.resolve (node:internal/modules/helpers:145:19)
    at Object.resolve (/node_modules/@eslint/eslintrc/dist/eslintrc.cjs:2346:46)
    at ConfigArrayFactory._loadParser (/node_modules/@eslint/eslintrc/dist/eslintrc.cjs:3325:39)
    at ConfigArrayFactory._normalizeObjectConfigDataBody (/node_modules/@eslint/eslintrc/dist/eslintrc.cjs:3099:43)
    at _normalizeObjectConfigDataBody.next ()
    at ConfigArrayFactory._normalizeObjectConfigData (/node_modules/@eslint/eslintrc/dist/eslintrc.cjs:3040:20)
    at _normalizeObjectConfigData.next ()
    at ConfigArrayFactory.loadInDirectory (/node_modules/@eslint/eslintrc/dist/eslintrc.cjs:2886:28)
    at CascadingConfigArrayFactory._loadConfigInAncestors (/node_modules/@eslint/eslintrc/dist/eslintrc.cjs:3871:46)
ghost/admin/app/components/stats/charts/top-locations.js

Oops! Something went wrong! :(

ESLint: 8.44.0

Error: Failed to load parser '@babel/eslint-parser' declared in 'ghost/admin/.eslintrc.js': Cannot find module '@babel/eslint-parser'
Require stack:

  • /ghost/admin/.eslintrc.js
    at Module._resolveFilename (node:internal/modules/cjs/loader:1248:15)
    at Function.resolve (node:internal/modules/helpers:145:19)
    at Object.resolve (/node_modules/@eslint/eslintrc/dist/eslintrc.cjs:2346:46)
    at ConfigArrayFactory._loadParser (/node_modules/@eslint/eslintrc/dist/eslintrc.cjs:3325:39)
    at ConfigArrayFactory._normalizeObjectConfigDataBody (/node_modules/@eslint/eslintrc/dist/eslintrc.cjs:3099:43)
    at _normalizeObjectConfigDataBody.next ()
    at ConfigArrayFactory._normalizeObjectConfigData (/node_modules/@eslint/eslintrc/dist/eslintrc.cjs:3040:20)
    at _normalizeObjectConfigData.next ()
    at ConfigArrayFactory.loadInDirectory (/node_modules/@eslint/eslintrc/dist/eslintrc.cjs:2886:28)
    at CascadingConfigArrayFactory._loadConfigInAncestors (/node_modules/@eslint/eslintrc/dist/eslintrc.cjs:3871:46)
  • 3 others

Tip

⚡🧪 Multi-step agentic review comment chat (experimental)
  • We're introducing multi-step agentic chat in review comments. This experimental feature enhances review discussions with the CodeRabbit agentic chat by enabling advanced interactions, including the ability to create pull requests directly from comments.
    - To enable this feature, set early_access to true under in the settings.
✨ Finishing Touches
  • 📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

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 using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Nitpick comments (1)
ghost/admin/app/utils/stats.js (1)

36-53: Well-structured label mapping system

The introduction of STATS_LABEL_MAPPINGS creates a centralized location for human-readable label mappings, organized by category (Countries, Technical, Sources). This facilitates consistent labeling across the application and simplifies future additions.

Consider adding more countries to the mapping for more comprehensive coverage, as currently only US and Taiwan are included.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between a4b3dd9 and d7cddc4.

📒 Files selected for processing (7)
  • ghost/admin/app/components/stats/charts/technical.js (3 hunks)
  • ghost/admin/app/components/stats/charts/top-locations.js (2 hunks)
  • ghost/admin/app/components/stats/charts/top-sources.js (2 hunks)
  • ghost/admin/app/controllers/stats.js (2 hunks)
  • ghost/admin/app/styles/layouts/stats.css (1 hunks)
  • ghost/admin/app/templates/stats.hbs (3 hunks)
  • ghost/admin/app/utils/stats.js (2 hunks)
🧰 Additional context used
🧬 Code Definitions (2)
ghost/admin/app/components/stats/charts/technical.js (1)
ghost/admin/app/utils/stats.js (2) (2)
  • STATS_LABEL_MAPPINGS (36-53)
  • STATS_LABEL_MAPPINGS (36-53)
ghost/admin/app/controllers/stats.js (1)
ghost/admin/app/utils/stats.js (2) (2)
  • STATS_LABEL_MAPPINGS (36-53)
  • STATS_LABEL_MAPPINGS (36-53)
⏰ Context from checks skipped due to timeout of 90000ms (1)
  • GitHub Check: Admin tests - Chrome
🔇 Additional comments (21)
ghost/admin/app/components/stats/charts/top-locations.js (2)

9-9: Good addition - using centralized label mappings

Adding the import for STATS_LABEL_MAPPINGS enables the component to leverage a consistent set of human-readable labels across the application.


53-54: Improved country name resolution with fallback mechanism

The updated getCountryName method now checks for entries in the centralized mapping first before falling back to the ISO country name lookup, enhancing consistency while maintaining backward compatibility for countries not in the mapping.

ghost/admin/app/styles/layouts/stats.css (1)

146-148: Adjusted letter spacing for better readability

The letter spacing change from -0.05em to -0.02em provides slightly more space between characters in metric values, improving readability while maintaining a compact display.

ghost/admin/app/components/stats/charts/top-sources.js (2)

8-8: Good addition - using centralized label mappings

Adding the import for STATS_LABEL_MAPPINGS enables the component to use consistent human-readable labels for sources.


95-95: Improved source label display with fallback mechanism

The updated label rendering now uses the centralized mapping to show more recognizable names for common sources (like "Google" instead of "google.com"), while maintaining the original label as a fallback. This improves user experience by displaying more familiar labels.

ghost/admin/app/components/stats/charts/technical.js (5)

6-6: Import of STATS_LABEL_MAPPINGS looks good.

Adding the import for STATS_LABEL_MAPPINGS supports the goal of standardizing label transformations across the application.


8-8: LGTM: Helper import for fallback formatting.

Importing the capitalizeFirstLetter helper is a good approach for providing consistent fallback formatting when a mapping isn't available.


71-71: LGTM: Simplified name assignment.

The change simplifies how the name property is derived by directly using the value from item[indexBy] without manipulation, which allows the centralized formatting to be applied later.


157-157: LGTM: Passing the original name to filter function.

Passing the unmodified item.name to the filter function ensures consistent filtering behavior based on the original data values.


162-162: LGTM: Improved label display with fallback.

Using STATS_LABEL_MAPPINGS with a fallback to capitalizeFirstLetter ensures that labels are displayed in a consistent, human-readable format across the application.

ghost/admin/app/templates/stats.hbs (5)

39-39: LGTM: Added OS to filter visibility condition.

Including this.os in the condition ensures that OS filters will trigger the display of the filter section, improving consistency in the user interface.


49-49: LGTM: Using formatted source display.

Using this.formattedSource instead of the raw source improves readability by displaying human-friendly names for common sources.


55-55: LGTM: Using formatted location display.

Using this.formattedLocation improves the user experience by displaying full country names instead of country codes.


61-61: LGTM: Using formatted device display.

Using this.formattedDevice provides more user-friendly device names, improving overall readability.


71-75: LGTM: Added OS filter display section.

Adding a conditional section for OS filters with formatted OS names completes the set of filter options and provides a consistent user experience across all filter types.

ghost/admin/app/controllers/stats.js (6)

5-5: LGTM: Import of centralized label mappings.

Importing STATS_LABEL_MAPPINGS allows for consistent label formatting across the application.


7-7: LGTM: Helper import for fallback formatting.

Importing the capitalizeFirstLetter helper provides a consistent way to format labels that don't have explicit mappings.


86-88: LGTM: Improved location formatting with multi-layer fallback.

The formattedLocation getter correctly prioritizes the mapping from STATS_LABEL_MAPPINGS, then falls back to the countries library, and finally to 'Unknown' if neither is available.


90-92: LGTM: Device formatting with capitalization fallback.

The formattedDevice getter properly uses the mapping or falls back to capitalizing the first letter of the device name.


94-96: LGTM: Source formatting with simple fallback.

The formattedSource getter correctly uses the mapping or falls back to the original source value.


98-100: LGTM: OS formatting with simple fallback.

The formattedOs getter properly uses the mapping or falls back to the original OS value.

@peterzimon peterzimon merged commit dcab6a9 into main Mar 19, 2025
21 checks passed
@peterzimon peterzimon deleted the ta-sanitize-labels branch March 19, 2025 16:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant