-
Notifications
You must be signed in to change notification settings - Fork 250
feat(crud): add UUID type editing support in document editor COMPASS-10194 #7768
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
Open
ivandevp
wants to merge
12
commits into
main
Choose a base branch
from
COMPASS-10194/edit-uuid
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
65cef72
feat(crud): add UUID type editing support in document editor COMPASS-…
ivandevp 6f5f206
fix: add UUID types to UNCASTED_EMPTY_TYPE_VALUE
ivandevp ce6d905
fix: remove unused UUID_REGEX import
ivandevp d36e711
fix: update test fixtures to use $uuid format for Binary subtype 04
ivandevp 918793e
Merge branch 'main' into COMPASS-10194/edit-uuid
ivandevp 382a64c
refactor: extract UUID byte reversal logic into shared utilities
ivandevp 348e60d
perf: memoize UUID input style to prevent unnecessary re-renders
ivandevp 118b901
fix: properly convert between UUID types in changeType
ivandevp 66986d3
fix: use Object.create(null) for UUID_TYPE_TO_ENCODING record
ivandevp 824f830
refactor: use shared UUID utilities from hadron-type-checker in bson-…
ivandevp 18847e4
feat: enable editing of legacy UUID values in document editor
ivandevp 0b76b6c
refactor: move displayType to Element property and fix table view UUI…
ivandevp File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -11,6 +11,13 @@ import { documentTypography } from './typography'; | |||||||
| import { Icon, Tooltip } from '../leafygreen'; | ||||||||
| import { useDarkMode } from '../../hooks/use-theme'; | ||||||||
|
|
||||||||
| const UUID_TYPES = [ | ||||||||
| 'UUID', | ||||||||
| 'LegacyJavaUUID', | ||||||||
| 'LegacyCSharpUUID', | ||||||||
| 'LegacyPythonUUID', | ||||||||
| ] as const; | ||||||||
|
|
||||||||
| const maxWidth = css({ | ||||||||
| maxWidth: '100%', | ||||||||
| overflowX: 'hidden', | ||||||||
|
|
@@ -162,6 +169,29 @@ const editorTextarea = css({ | |||||||
| color: 'inherit', | ||||||||
| }); | ||||||||
|
|
||||||||
| // UUID editor container that shows: UUID(" <input> ") | ||||||||
| const uuidEditorContainer = css({ | ||||||||
| display: 'inline-flex', | ||||||||
| alignItems: 'center', | ||||||||
| maxWidth: '100%', | ||||||||
| }); | ||||||||
|
|
||||||||
| const uuidEditorInput = css({ | ||||||||
| display: 'inline-block', | ||||||||
| whiteSpace: 'nowrap', | ||||||||
| verticalAlign: 'top', | ||||||||
| color: 'inherit', | ||||||||
| }); | ||||||||
|
|
||||||||
| const uuidEditorLabel = css({ | ||||||||
| userSelect: 'none', | ||||||||
| whiteSpace: 'nowrap', | ||||||||
| }); | ||||||||
|
|
||||||||
| function isUUIDType(type: string): boolean { | ||||||||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||
| return (UUID_TYPES as readonly string[]).includes(type); | ||||||||
| } | ||||||||
|
|
||||||||
| export const ValueEditor: React.FunctionComponent<{ | ||||||||
| editing?: boolean; | ||||||||
| onEditStart(): void; | ||||||||
|
|
@@ -220,6 +250,11 @@ export const ValueEditor: React.FunctionComponent<{ | |||||||
| return { width: `${Math.max(val.length, 1)}ch` }; | ||||||||
| }, [val, type]); | ||||||||
|
|
||||||||
| const uuidInputStyle = useMemo(() => { | ||||||||
| // UUID format is 36 characters (xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx) | ||||||||
| return { width: `${Math.max(val.length, 36)}ch` }; | ||||||||
| }, [val]); | ||||||||
|
|
||||||||
| return ( | ||||||||
| <> | ||||||||
| {editing ? ( | ||||||||
|
|
@@ -268,6 +303,36 @@ export const ValueEditor: React.FunctionComponent<{ | |||||||
| {...(mergedProps as React.HTMLProps<HTMLTextAreaElement>)} | ||||||||
| ></textarea> | ||||||||
| </BSONValueContainer> | ||||||||
| ) : isUUIDType(type) ? ( | ||||||||
| <div className={uuidEditorContainer}> | ||||||||
| <span className={uuidEditorLabel}>{type}('</span> | ||||||||
| <input | ||||||||
| type="text" | ||||||||
| data-testid="hadron-document-value-editor" | ||||||||
| value={val} | ||||||||
| placeholder="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" | ||||||||
| onChange={(evt) => { | ||||||||
| onChange(evt.currentTarget.value); | ||||||||
| }} | ||||||||
| // See ./element.tsx | ||||||||
| // eslint-disable-next-line jsx-a11y/no-autofocus | ||||||||
| autoFocus={autoFocus} | ||||||||
| className={cx( | ||||||||
| editorReset, | ||||||||
| editorOutline, | ||||||||
| uuidEditorInput, | ||||||||
| !valid && editorInvalid, | ||||||||
| !valid && | ||||||||
| (darkMode | ||||||||
| ? editorInvalidDarkMode | ||||||||
| : editorInvalidLightMode) | ||||||||
| )} | ||||||||
| spellCheck="false" | ||||||||
| style={uuidInputStyle} | ||||||||
| {...(mergedProps as React.HTMLProps<HTMLInputElement>)} | ||||||||
| ></input> | ||||||||
| <span className={uuidEditorLabel}>')</span> | ||||||||
| </div> | ||||||||
| ) : ( | ||||||||
| <input | ||||||||
| type="text" | ||||||||
|
|
||||||||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
What kind of situation is this
catchintended to cover?