Skip to content
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

Updated logic on custom field component #2331

Merged
merged 2 commits into from
Dec 12, 2024
Merged

Updated logic on custom field component #2331

merged 2 commits into from
Dec 12, 2024

Conversation

OchiengPaul442
Copy link
Contributor

@OchiengPaul442 OchiengPaul442 commented Dec 11, 2024

Summary of Changes (What does this PR do?)

image
image

Summary by CodeRabbit

  • New Features

    • Enhanced formatting for names and field values in the custom fields dropdown.
    • Improved display options for organization field values, allowing for uppercase formatting when specified.
  • Bug Fixes

    • Resolved inconsistencies in formatting behavior for selected options in the custom dropdown.

Copy link

coderabbitai bot commented Dec 11, 2024

📝 Walkthrough
📝 Walkthrough

Walkthrough

The changes in CustomFields.jsx enhance the formatting logic for field values and names within the component. A new FIELD_FORMAT_RULES object has been introduced to define formatting rules for the "organization" field and a default case. The formatFieldValue function now accepts a display parameter to conditionally format values. Additionally, the formatName function has been clarified, and the handleSelect function has been updated to ensure consistent formatting across the component.

Changes

File Path Change Summary
platform/src/common/components/Modal/dataDownload/components/CustomFields.jsx - Introduced FIELD_FORMAT_RULES for structured formatting of field values.
- Updated formatFieldValue to include a display parameter.
- Clarified formatName function behavior.
- Modified handleSelect to utilize the new formatting logic.

Possibly related PRs

Suggested reviewers

  • Baalmart

🎉 In the land of code where functions play,
Formatting names in a brand new way.
With underscores gone and cases refined,
CustomFields shine, beautifully aligned!
So let’s celebrate this coding delight,
As clarity blooms, making everything right! 🌟


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 3900fce and a139fd4.

📒 Files selected for processing (1)
  • platform/src/common/components/Modal/dataDownload/components/CustomFields.jsx (4 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • platform/src/common/components/Modal/dataDownload/components/CustomFields.jsx

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?

❤️ 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. (Experiment)
  • @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 or @coderabbitai title 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

@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: 1

🧹 Outside diff range and nitpick comments (2)
platform/src/common/components/Modal/dataDownload/components/CustomFields.jsx (2)

Line range hint 8-14: Clean implementation, but consider enhancing input validation

The formatName function is well-implemented with good edge case handling. However, we could make the textFormat validation more robust.

Consider adding validation for the textFormat parameter:

 const formatName = (name, textFormat = 'lowercase') => {
   if (typeof name !== 'string' || !name) return name;
+  if (!['uppercase', 'lowercase'].includes(textFormat)) {
+    console.warn(`Invalid textFormat: ${textFormat}. Defaulting to lowercase.`);
+    textFormat = 'lowercase';
+  }
   const formatted = name.replace(/[_-]/g, ' ');
   return textFormat === 'uppercase' ? formatted.toUpperCase() : formatted;
 };

Line range hint 134-134: Add JSDoc for the textFormat prop

While the PropType validation is correct, adding documentation would improve maintainability.

Add JSDoc for the textFormat prop:

 CustomFields.propTypes = {
+  /** 
+   * Controls text case formatting.
+   * @default 'lowercase'
+   */
   textFormat: PropTypes.oneOf(['uppercase', 'lowercase']),
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 017bd94 and 3900fce.

📒 Files selected for processing (1)
  • platform/src/common/components/Modal/dataDownload/components/CustomFields.jsx (4 hunks)
🔇 Additional comments (1)
platform/src/common/components/Modal/dataDownload/components/CustomFields.jsx (1)

70-70: Consistent formatting implementation, verify impact

The formatting changes are consistently applied across both input and button text. However, we should verify the impact on existing data.

Also applies to: 95-95

Comment on lines 17 to 25
* Handles the formatting logic for field values.
* For the "organization" field ID, it retains hyphens in the selected value but displays without hyphens in uppercase.
*/
const formatFieldValue = (value, fieldId, textFormat) => {
const formatFieldValue = (value, fieldId, textFormat, display = false) => {
if (fieldId === 'organization') {
return value.toUpperCase();
return display ? formatName(value, 'uppercase') : value;
}
return formatName(value, textFormat);
};
Copy link

Choose a reason for hiding this comment

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

🛠️ Refactor suggestion

Consider extracting field-specific formatting rules

The special case handling for 'organization' suggests this function might grow unwieldy as more field-specific rules are added.

Consider extracting field-specific formatting rules to a configuration object:

+const FIELD_FORMAT_RULES = {
+  organization: {
+    display: (value) => formatName(value, 'uppercase'),
+    store: (value) => value
+  },
+  default: {
+    display: (value, textFormat) => formatName(value, textFormat),
+    store: (value, textFormat) => formatName(value, textFormat)
+  }
+};

-const formatFieldValue = (value, fieldId, textFormat, display = false) => {
-  if (fieldId === 'organization') {
-    return display ? formatName(value, 'uppercase') : value;
-  }
-  return formatName(value, textFormat);
+const formatFieldValue = (value, fieldId, textFormat, display = false) => {
+  const rules = FIELD_FORMAT_RULES[fieldId] || FIELD_FORMAT_RULES.default;
+  return display ? rules.display(value, textFormat) : rules.store(value, textFormat);
};
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
* Handles the formatting logic for field values.
* For the "organization" field ID, it retains hyphens in the selected value but displays without hyphens in uppercase.
*/
const formatFieldValue = (value, fieldId, textFormat) => {
const formatFieldValue = (value, fieldId, textFormat, display = false) => {
if (fieldId === 'organization') {
return value.toUpperCase();
return display ? formatName(value, 'uppercase') : value;
}
return formatName(value, textFormat);
};
/**
* Handles the formatting logic for field values.
* For the "organization" field ID, it retains hyphens in the selected value but displays without hyphens in uppercase.
*/
const FIELD_FORMAT_RULES = {
organization: {
display: (value) => formatName(value, 'uppercase'),
store: (value) => value
},
default: {
display: (value, textFormat) => formatName(value, textFormat),
store: (value, textFormat) => formatName(value, textFormat)
}
};
const formatFieldValue = (value, fieldId, textFormat, display = false) => {
const rules = FIELD_FORMAT_RULES[fieldId] || FIELD_FORMAT_RULES.default;
return display ? rules.display(value, textFormat) : rules.store(value, textFormat);
};

Copy link
Contributor

New next-platform changes available for preview here

Copy link
Contributor

New next-platform changes available for preview here

@Baalmart Baalmart merged commit 63c27b0 into staging Dec 12, 2024
30 of 31 checks passed
@Baalmart Baalmart deleted the analytics-updates branch December 12, 2024 02:56
@Baalmart Baalmart mentioned this pull request Dec 12, 2024
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants