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

Add sidebar value text expansion #4487

Merged
merged 2 commits into from
Jun 14, 2024
Merged

Conversation

benjaminpkane
Copy link
Contributor

@benjaminpkane benjaminpkane commented Jun 12, 2024

What changes are proposed in this pull request?

Adds text expansion option via container click.

Screen.Recording.2024-06-12.at.10.46.21.AM.mov

How is this patch tested? If it is not, please explain why.

Locally

import fiftyone.zoo as foz

LOREM = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."

dataset = foz.load_zoo_dataset(
    "quickstart", max_samples=1, dataset_name="long-text"
)

sample = dataset.first()
sample["lorem"] = LOREM
sample["lorems"] = [LOREM, LOREM]
sample.save()

Release Notes

  • Added on click text expansion in the modal sidebar

What areas of FiftyOne does this PR affect?

  • App: FiftyOne application changes
  • Build: Build and test infrastructure changes
  • Core: Core fiftyone Python library changes
  • Documentation: FiftyOne documentation changes
  • Other

Summary by CodeRabbit

  • New Features

    • Introduced state management for expanded entries and texts in the sidebar.
    • Improved rendering logic for expanded entries and texts.
  • Style

    • Updated styling and layout adjustments for better user experience.

Copy link
Contributor

coderabbitai bot commented Jun 12, 2024

Walkthrough

The changes in PathValueEntry.tsx include enhancements to state management and rendering logic for expanded entries and text within the component. They also introduce new imports and styled components, such as LoadingDots, FRAME_SUPPORT_FIELD, TitleDiv, and modifications in ScalarDiv. These updates improve the handling of expandable sections and visual adjustments in the sidebar.

Changes

Files involve Change Summaries
.../PathValueEntry.tsx - Addition of LoadingDots import
- Addition of FRAME_SUPPORT_FIELD import
- Changes in the useRecoilState import
- Addition of expandedPathValueEntry atomFamily
- Addition of TitleDiv styled component
- Changes in ScalarDiv styled component
- Addition of state management for expanded entries
- Changes in rendering logic for expanded entries in ScalarValueEntry and ListValueEntry
- Addition of state management for expanded text in ListValueEntry
- Changes in rendering logic for expanded text in ListValueEntry, ListLoadable, SlicesListLoadable, and SlicesLoadable
- Changes in styling and layout adjustments

Poem

By my burrow, I see the code,
Expanded paths now take the load.
With LoadingDots and TitleDiv,
In lists and scalars, entries live.
State is managed clear and fine,
Where once was plain, now all align.
Hopping through these fields and frames,
The sidebar shines, enhanced with names.


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>.
    • 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 generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @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 as 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 resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration 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: 2

Outside diff range and nitpick comments (2)
app/packages/core/src/components/Sidebar/Entries/PathValueEntry.tsx (2)

Line range hint 74-78: Switch cases in format function are falling through.

  case FRAME_SUPPORT_FIELD:
    value = `[${value[0]}, ${value[1]}]`;
+   break;
  case DATE_FIELD:
    // @ts-ignore
    value = formatDate(value.datetime as number);
+   break;
  case DATE_TIME_FIELD:
    // @ts-ignore
    value = formatDateTime(value.datetime as number, timeZone);

Add break statements to prevent unintended fallthrough in switch cases.


Line range hint 293-293: Unnecessary use of React Fragments.

- <>
+ // Remove the fragment if it's not serving any purpose.

Consider removing unnecessary React Fragments to clean up the code.

Also applies to: 319-319

Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 39201f4 and 57464fd.

Files selected for processing (1)
  • app/packages/core/src/components/Sidebar/Entries/PathValueEntry.tsx (12 hunks)
Additional context used
Path-based instructions (1)
app/packages/core/src/components/Sidebar/Entries/PathValueEntry.tsx (1)

Pattern **/*.{ts,tsx}: Review the Typescript and React code for conformity with best practices in React, Recoil, Graphql, and Typescript. Highlight any deviations.

Biome
app/packages/core/src/components/Sidebar/Entries/PathValueEntry.tsx

[error] 74-75: This case is falling through to the next case. (lint/suspicious/noFallthroughSwitchClause)

Add a break or return statement to the end of this case to prevent fallthrough.


[error] 76-78: This case is falling through to the next case. (lint/suspicious/noFallthroughSwitchClause)

Add a break or return statement to the end of this case to prevent fallthrough.


[error] 133-133: Enforce to have the onClick mouse event with the onKeyUp, the onKeyDown, or the onKeyPress keyboard event. (lint/a11y/useKeyWithClickEvents)

Actions triggered using mouse events should have corresponding keyboard events to account for keyboard-only navigation.


[error] 211-215: Enforce to have the onClick mouse event with the onKeyUp, the onKeyDown, or the onKeyPress keyboard event. (lint/a11y/useKeyWithClickEvents)

Actions triggered using mouse events should have corresponding keyboard events to account for keyboard-only navigation.


[error] 218-222: Enforce to have the onClick mouse event with the onKeyUp, the onKeyDown, or the onKeyPress keyboard event. (lint/a11y/useKeyWithClickEvents)

Actions triggered using mouse events should have corresponding keyboard events to account for keyboard-only navigation.


[error] 416-421: Enforce to have the onClick mouse event with the onKeyUp, the onKeyDown, or the onKeyPress keyboard event. (lint/a11y/useKeyWithClickEvents)

Actions triggered using mouse events should have corresponding keyboard events to account for keyboard-only navigation.


[error] 293-293: Avoid using unnecessary Fragment. (lint/complexity/noUselessFragments)

A fragment is redundant if it contains only one child, or if it is the child of a html element, and is not a keyed fragment.
Unsafe fix: Remove the Fragment


[error] 319-319: Avoid using unnecessary Fragment. (lint/complexity/noUselessFragments)

A fragment is redundant if it contains only one child, or if it is the child of a html element, and is not a keyed fragment.
Unsafe fix: Remove the Fragment

Additional comments not posted (5)
app/packages/core/src/components/Sidebar/Entries/PathValueEntry.tsx (5)

6-6: Added import FRAME_SUPPORT_FIELD from @fiftyone/utilities.

This import is necessary for the new feature implementation.


16-19: Updated Recoil imports to include atomFamily, selectorFamily, and useRecoilValueLoadable.

These imports are essential for state management in the updated component.


27-34: Introduced expandedPathValueEntry atomFamily for managing the expanded state of entries.

This is a good use of Recoil's atomFamily for state management specific to each path value entry.


37-40: Added a new styled component TitleDiv.

This addition supports the new UI changes for the title display in the sidebar.


55-57: Updated ScalarDiv to handle expanded state.

This change allows the text to wrap when the entry is expanded, improving readability.

Copy link
Contributor

@brimoor brimoor left a comment

Choose a reason for hiding this comment

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

Video looks great to me 👍👍

@brimoor
Copy link
Contributor

brimoor commented Jun 12, 2024

@benjaminpkane couple UX thoughts here:

  • would be nice if the cursor changed to indicate that something will happen when you click to expand/contract
  • just want to confirm: is it still possible to drag-select the text if you want to ctrl + C a portion of the long string?

@benjaminpkane
Copy link
Contributor Author

@benjaminpkane couple UX thoughts here:

  • would be nice if the cursor changed to indicate that something will happen when you click to expand/contract
  • just want to confirm: is it still possible to drag-select the text if you want to ctrl + C a portion of the long string?

Text selection is still possible. I will add the pointer cursor when outside text

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: 2

Outside diff range and nitpick comments (2)
app/packages/core/src/components/Sidebar/Entries/PathValueEntry.tsx (2)

Line range hint 77-81: Fix switch case fall-through in format function.

The cases for FRAME_SUPPORT_FIELD, DATE_FIELD, and DATE_TIME_FIELD are falling through, which could lead to unexpected behavior. Each case should return immediately after setting the value.

  case FRAME_SUPPORT_FIELD:
    value = `[${value[0]}, ${value[1]}]`;
+   return prettify(value as string);
  case DATE_FIELD:
    // @ts-ignore
    value = formatDate(value.datetime as number);
+   return prettify(value as string);
  case DATE_TIME_FIELD:
    // @ts-ignore
    value = formatDateTime(value.datetime as number, timeZone);
+   return prettify(value as string);

Line range hint 277-277: Remove unnecessary React Fragments.

The use of React Fragments in these cases is redundant and can be safely removed to clean up the code.

- <>
+ // Directly return the JSX elements without a fragment wrapper

Also applies to: 303-303

Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 57464fd and 63bb340.

Files selected for processing (1)
  • app/packages/core/src/components/Sidebar/Entries/PathValueEntry.tsx (12 hunks)
Additional context used
Path-based instructions (1)
app/packages/core/src/components/Sidebar/Entries/PathValueEntry.tsx (1)

Pattern **/*.{ts,tsx}: Review the Typescript and React code for conformity with best practices in React, Recoil, Graphql, and Typescript. Highlight any deviations.

Biome
app/packages/core/src/components/Sidebar/Entries/PathValueEntry.tsx

[error] 77-78: This case is falling through to the next case. (lint/suspicious/noFallthroughSwitchClause)

Add a break or return statement to the end of this case to prevent fallthrough.


[error] 79-81: This case is falling through to the next case. (lint/suspicious/noFallthroughSwitchClause)

Add a break or return statement to the end of this case to prevent fallthrough.


[error] 136-136: Enforce to have the onClick mouse event with the onKeyUp, the onKeyDown, or the onKeyPress keyboard event. (lint/a11y/useKeyWithClickEvents)

Actions triggered using mouse events should have corresponding keyboard events to account for keyboard-only navigation.


[error] 207-207: Enforce to have the onClick mouse event with the onKeyUp, the onKeyDown, or the onKeyPress keyboard event. (lint/a11y/useKeyWithClickEvents)

Actions triggered using mouse events should have corresponding keyboard events to account for keyboard-only navigation.


[error] 400-405: Enforce to have the onClick mouse event with the onKeyUp, the onKeyDown, or the onKeyPress keyboard event. (lint/a11y/useKeyWithClickEvents)

Actions triggered using mouse events should have corresponding keyboard events to account for keyboard-only navigation.


[error] 277-277: Avoid using unnecessary Fragment. (lint/complexity/noUselessFragments)

A fragment is redundant if it contains only one child, or if it is the child of a html element, and is not a keyed fragment.
Unsafe fix: Remove the Fragment


[error] 303-303: Avoid using unnecessary Fragment. (lint/complexity/noUselessFragments)

A fragment is redundant if it contains only one child, or if it is the child of a html element, and is not a keyed fragment.
Unsafe fix: Remove the Fragment

Additional comments not posted (2)
app/packages/core/src/components/Sidebar/Entries/PathValueEntry.tsx (2)

27-34: Introduce browser storage effect for the expandedPathValueEntry atom.

This implementation using fos.getBrowserStorageEffectForKey ensures that the expansion state of entries persists across browser sessions, enhancing user experience by remembering their preferences.


58-60: Ensure expanded text does not break layout.

Adjusting the white-space property when the text is expanded is a smart way to handle long strings without affecting the layout negatively. This change enhances readability while maintaining a clean UI.

Copy link
Contributor

@sashankaryal sashankaryal left a comment

Choose a reason for hiding this comment

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

LGTM, absolutely love this feature!!!

@benjaminpkane benjaminpkane merged commit a1bdea9 into develop Jun 14, 2024
16 checks passed
@benjaminpkane benjaminpkane deleted the feat/sidebar-wrap-text-value branch June 14, 2024 17:03
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.

3 participants