-
Notifications
You must be signed in to change notification settings - Fork 233
feat(compass-collection): CLOUDP-348131: Schema Editor Dropdowns: Add mongo type to faker method mapping #7425
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
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
import type { MongoDBFieldType } from '@mongodb-js/compass-generative-ai'; | ||
import { MockDataGeneratorStep } from './types'; | ||
|
||
export const StepButtonLabelMap = { | ||
|
@@ -10,3 +11,72 @@ export const StepButtonLabelMap = { | |
|
||
export const DEFAULT_DOCUMENT_COUNT = 1000; | ||
export const MAX_DOCUMENT_COUNT = 100000; | ||
|
||
/** | ||
* Map of MongoDB types to available Faker methods. | ||
* Not all Faker methods are included here. | ||
* More can be found in the Faker.js API: https://fakerjs.dev/api/ | ||
*/ | ||
export const MONGO_TYPE_TO_FAKER_METHODS: Record< | ||
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. Gave Augment link to https://v9.fakerjs.dev/api/ and had it come up with some more additions. (If you upgrade to v10 can do the same with the new API link):
|
||
MongoDBFieldType, | ||
Array<string> | ||
> = { | ||
String: [ | ||
'lorem.word', | ||
'lorem.words', | ||
'lorem.sentence', | ||
'lorem.paragraph', | ||
'person.firstName', | ||
'person.lastName', | ||
'person.fullName', | ||
'person.jobTitle', | ||
'internet.email', | ||
'internet.url', | ||
'internet.domainName', | ||
'internet.userName', | ||
'phone.number', | ||
'location.city', | ||
'location.country', | ||
'location.streetAddress', | ||
'location.zipCode', | ||
'location.state', | ||
'company.name', | ||
'company.catchPhrase', | ||
'color.human', | ||
'commerce.productName', | ||
'commerce.department', | ||
'finance.accountName', | ||
'finance.currencyCode', | ||
'git.commitSha', | ||
'string.uuid', | ||
'string.alpha', | ||
'string.alphanumeric', | ||
], | ||
Number: [ | ||
'number.int', | ||
'number.float', | ||
'finance.amount', | ||
'location.latitude', | ||
'location.longitude', | ||
], | ||
Int32: ['number.int', 'finance.amount'], | ||
Long: ['number.int', 'number.bigInt'], | ||
Decimal128: ['number.float', 'finance.amount'], | ||
Boolean: ['datatype.boolean'], | ||
Date: [ | ||
'date.recent', | ||
'date.past', | ||
'date.future', | ||
'date.anytime', | ||
'date.birthdate', | ||
], | ||
Timestamp: ['date.recent', 'date.past', 'date.future', 'date.anytime'], | ||
ObjectId: ['database.mongodbObjectId'], | ||
Binary: ['string.hexadecimal', 'string.binary'], | ||
RegExp: ['lorem.word', 'string.alpha'], | ||
Code: ['lorem.sentence', 'lorem.paragraph', 'git.commitMessage'], | ||
MinKey: ['number.int'], | ||
MaxKey: ['number.int'], | ||
Symbol: ['lorem.word', 'string.symbol'], | ||
DBRef: ['database.mongodbObjectId'], | ||
}; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,152 @@ | ||
import { expect } from 'chai'; | ||
import React from 'react'; | ||
import { | ||
screen, | ||
render, | ||
cleanup, | ||
waitFor, | ||
userEvent, | ||
} from '@mongodb-js/testing-library-compass'; | ||
import sinon from 'sinon'; | ||
import FakerMappingSelector from './faker-mapping-selector'; | ||
import { UNRECOGNIZED_FAKER_METHOD } from '../../modules/collection-tab'; | ||
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. [Drive-by suggestion]: This made me realize, due to parallel implementation there's a slight mismatch with |
||
import { MONGO_TYPE_TO_FAKER_METHODS } from './constants'; | ||
import { MongoDBFieldTypeValues } from '@mongodb-js/compass-generative-ai'; | ||
|
||
const mockActiveJsonType = MongoDBFieldTypeValues.String; | ||
const mockActiveFakerFunction = 'lorem.word'; | ||
const onJsonTypeSelectStub = sinon.stub(); | ||
const onFakerFunctionSelectStub = sinon.stub(); | ||
|
||
describe('FakerMappingSelector', () => { | ||
afterEach(() => { | ||
cleanup(); | ||
}); | ||
|
||
it('should display all MongoDB types in the dropdown', async () => { | ||
// Check that all MongoDB types from the constant are present | ||
const mongoTypes = Object.keys(MongoDBFieldTypeValues); | ||
|
||
render( | ||
<FakerMappingSelector | ||
activeJsonType={mockActiveJsonType} | ||
activeFakerFunction="lorem.word" | ||
onJsonTypeSelect={onJsonTypeSelectStub} | ||
onFakerFunctionSelect={onFakerFunctionSelectStub} | ||
/> | ||
); | ||
|
||
const jsonTypeSelect = screen.getByLabelText('JSON Type'); | ||
userEvent.click(jsonTypeSelect); | ||
|
||
for (const type of mongoTypes) { | ||
await waitFor(() => { | ||
expect(screen.getByRole('option', { name: type })).to.exist; | ||
}); | ||
} | ||
}); | ||
|
||
describe('should display faker methods for each MongoDB type', () => { | ||
Object.entries(MONGO_TYPE_TO_FAKER_METHODS).forEach( | ||
([mongoType, methods]) => { | ||
it(`should display faker methods for ${mongoType}`, () => { | ||
const firstMethod = methods[0]; | ||
|
||
render( | ||
<FakerMappingSelector | ||
activeJsonType={ | ||
mongoType as keyof typeof MONGO_TYPE_TO_FAKER_METHODS | ||
} | ||
activeFakerFunction={firstMethod} | ||
onJsonTypeSelect={onJsonTypeSelectStub} | ||
onFakerFunctionSelect={onFakerFunctionSelectStub} | ||
/> | ||
); | ||
|
||
const fakerFunctionSelect = screen.getByLabelText('Faker Function'); | ||
userEvent.click(fakerFunctionSelect); | ||
|
||
methods.forEach((method) => { | ||
expect(screen.getByRole('option', { name: method })).to.exist; | ||
}); | ||
}); | ||
} | ||
); | ||
}); | ||
|
||
it('should call onJsonTypeSelect when MongoDB type changes', async () => { | ||
render( | ||
<FakerMappingSelector | ||
activeJsonType={mockActiveJsonType} | ||
activeFakerFunction={mockActiveFakerFunction} | ||
onJsonTypeSelect={onJsonTypeSelectStub} | ||
onFakerFunctionSelect={onFakerFunctionSelectStub} | ||
/> | ||
); | ||
|
||
const jsonTypeSelect = screen.getByLabelText('JSON Type'); | ||
userEvent.click(jsonTypeSelect); | ||
|
||
const numberOption = await screen.findByRole('option', { name: 'Number' }); | ||
userEvent.click(numberOption); | ||
|
||
expect(onJsonTypeSelectStub).to.have.been.calledOnceWith('Number'); | ||
}); | ||
|
||
it('should call onFakerFunctionSelect when faker function changes', async () => { | ||
render( | ||
<FakerMappingSelector | ||
activeJsonType={mockActiveJsonType} | ||
activeFakerFunction={mockActiveFakerFunction} | ||
onJsonTypeSelect={onJsonTypeSelectStub} | ||
onFakerFunctionSelect={onFakerFunctionSelectStub} | ||
/> | ||
); | ||
|
||
const fakerFunctionSelect = screen.getByLabelText('Faker Function'); | ||
userEvent.click(fakerFunctionSelect); | ||
|
||
const emailOption = await screen.findByRole('option', { | ||
name: 'internet.email', | ||
}); | ||
userEvent.click(emailOption); | ||
|
||
expect(onFakerFunctionSelectStub).to.have.been.calledOnceWith( | ||
'internet.email' | ||
); | ||
}); | ||
|
||
it('should show warning banner when faker method is unrecognized', () => { | ||
render( | ||
<FakerMappingSelector | ||
activeJsonType={mockActiveJsonType} | ||
activeFakerFunction={UNRECOGNIZED_FAKER_METHOD} | ||
onJsonTypeSelect={onJsonTypeSelectStub} | ||
onFakerFunctionSelect={onFakerFunctionSelectStub} | ||
/> | ||
); | ||
|
||
expect( | ||
screen.getByText( | ||
/Please select a function or we will default fill this field/ | ||
) | ||
).to.exist; | ||
}); | ||
|
||
it('should not show warning banner when faker method is recognized', () => { | ||
render( | ||
<FakerMappingSelector | ||
activeJsonType={mockActiveJsonType} | ||
activeFakerFunction={mockActiveFakerFunction} | ||
onJsonTypeSelect={onJsonTypeSelectStub} | ||
onFakerFunctionSelect={onFakerFunctionSelectStub} | ||
/> | ||
); | ||
|
||
expect( | ||
screen.queryByText( | ||
/Please select a function or we will default fill this field/ | ||
) | ||
).to.not.exist; | ||
}); | ||
}); |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,9 +8,11 @@ import { | |
Select, | ||
spacing, | ||
} from '@mongodb-js/compass-components'; | ||
import React from 'react'; | ||
import React, { useMemo } from 'react'; | ||
import { UNRECOGNIZED_FAKER_METHOD } from '../../modules/collection-tab'; | ||
import type { MongoDBFieldType } from '@mongodb-js/compass-generative-ai'; | ||
import { MongoDBFieldTypeValues } from '@mongodb-js/compass-generative-ai'; | ||
import { MONGO_TYPE_TO_FAKER_METHODS } from './constants'; | ||
|
||
const fieldMappingSelectorsStyles = css({ | ||
width: '50%', | ||
|
@@ -37,6 +39,17 @@ const FakerMappingSelector = ({ | |
onJsonTypeSelect, | ||
onFakerFunctionSelect, | ||
}: Props) => { | ||
const fakerMethodOptions = useMemo(() => { | ||
const methods = | ||
MONGO_TYPE_TO_FAKER_METHODS[activeJsonType as MongoDBFieldType] || []; | ||
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. Let's just type |
||
|
||
if (methods.includes(activeFakerFunction)) { | ||
return methods; | ||
} | ||
|
||
return [activeFakerFunction, ...methods]; | ||
}, [activeJsonType, activeFakerFunction]); | ||
|
||
return ( | ||
<div className={fieldMappingSelectorsStyles}> | ||
<Body className={labelStyles}>Mapping</Body> | ||
|
@@ -46,8 +59,7 @@ const FakerMappingSelector = ({ | |
value={activeJsonType} | ||
onChange={(value) => onJsonTypeSelect(value as MongoDBFieldType)} | ||
> | ||
{/* TODO(CLOUDP-344400) : Make the select input editable and render other options depending on the JSON type selected */} | ||
{[activeJsonType].map((type) => ( | ||
{Object.values(MongoDBFieldTypeValues).map((type) => ( | ||
<Option key={type} value={type}> | ||
{type} | ||
</Option> | ||
|
@@ -59,10 +71,9 @@ const FakerMappingSelector = ({ | |
value={activeFakerFunction} | ||
onChange={onFakerFunctionSelect} | ||
> | ||
{/* TODO(CLOUDP-344400): Make the select input editable and render other JSON types */} | ||
{[activeFakerFunction].map((field) => ( | ||
<Option key={field} value={field}> | ||
{field} | ||
{fakerMethodOptions.map((method) => ( | ||
<Option key={method} value={method}> | ||
{method} | ||
</Option> | ||
))} | ||
</Select> | ||
|
Original file line number | Diff line number | Diff line change | ||
---|---|---|---|---|
|
@@ -14,6 +14,7 @@ import FieldSelector from './schema-field-selector'; | |||
import FakerMappingSelector from './faker-mapping-selector'; | ||||
import type { FakerSchema, MockDataGeneratorState } from './types'; | ||||
import type { MongoDBFieldType } from '@mongodb-js/compass-generative-ai'; | ||||
import { getDefaultFakerMethod } from './script-generation-utils'; | ||||
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. The import of
Suggested change
Copilot uses AI. Check for mistakes. Positive FeedbackNegative Feedback |
||||
|
||||
const containerStyles = css({ | ||||
display: 'flex', | ||||
|
@@ -72,11 +73,15 @@ const FakerSchemaEditorContent = ({ | |||
const onJsonTypeSelect = (newJsonType: MongoDBFieldType) => { | ||||
const currentMapping = fakerSchemaFormValues[activeField]; | ||||
if (currentMapping) { | ||||
// When MongoDB type changes, update the faker method to a default for that type | ||||
const defaultFakerMethod = getDefaultFakerMethod(newJsonType); | ||||
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. Similarly to my comment about faker args, can we persist the LLM-suggested faker method so that if the user changes the Mongo Type and then reselects the original type, we default to the LLM-suggested faker method? Like with the args, we can store in state. Quick AI mock-up just as an example, please review ofc:
|
||||
setFakerSchemaFormValues({ | ||||
...fakerSchemaFormValues, | ||||
[activeField]: { | ||||
...currentMapping, | ||||
mongoType: newJsonType, | ||||
fakerMethod: defaultFakerMethod, | ||||
fakerArgs: [], // Reset args when changing type | ||||
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. Can we store these args so if the user re-selects the LLM-suggested method, they're re-displayed? I think we can store it in the state of 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. Quick example code mock-up in this comment |
||||
}, | ||||
}); | ||||
resetIsSchemaConfirmed(); | ||||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,6 +9,7 @@ import { | |
BannerVariant, | ||
Body, | ||
DocumentList, | ||
useDarkMode, | ||
} from '@mongodb-js/compass-components'; | ||
|
||
import { usePreference } from 'compass-preferences-model/provider'; | ||
|
@@ -23,11 +24,14 @@ interface RawSchemaConfirmationScreenProps { | |
fakerSchemaGenerationStatus: MockDataGeneratorState['status']; | ||
} | ||
|
||
const documentContainerStyles = css({ | ||
backgroundColor: palette.gray.light3, | ||
border: `1px solid ${palette.gray.light2}`, | ||
borderRadius: spacing[400], | ||
}); | ||
const getDocumentContainerStyles = (isDarkMode: boolean) => | ||
css({ | ||
backgroundColor: isDarkMode ? palette.gray.dark3 : palette.gray.light3, | ||
border: `1px solid ${ | ||
isDarkMode ? palette.gray.dark2 : palette.gray.light2 | ||
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. Awesome 😎 |
||
}`, | ||
borderRadius: spacing[400], | ||
}); | ||
|
||
const documentStyles = css({ | ||
padding: `${spacing[400]}px ${spacing[900]}px`, | ||
|
@@ -52,6 +56,7 @@ const RawSchemaConfirmationScreen = ({ | |
const enableSampleDocumentPassing = usePreference( | ||
'enableGenAISampleDocumentPassing' | ||
); | ||
const isDarkMode = useDarkMode(); | ||
|
||
const subtitleText = enableSampleDocumentPassing | ||
? 'Sample Documents Collected' | ||
|
@@ -69,7 +74,7 @@ const RawSchemaConfirmationScreen = ({ | |
{subtitleText} | ||
</Body> | ||
<Body className={descriptionStyles}>{descriptionText}</Body> | ||
<div className={documentContainerStyles}> | ||
<div className={getDocumentContainerStyles(!!isDarkMode)}> | ||
<DocumentList.Document | ||
className={documentStyles} | ||
editable={false} | ||
|
Uh oh!
There was an error while loading. Please reload this page.
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.
This is linking to faker v10, while we're currently on v9— maybe we should just take this opportunity to bump to v10. Think we could just update in
package.json
:"@faker-js/faker": "^10.0.0"
, I think should be straightforward, only change I see on first pass would beinternet.userName
->internet.username
in this file