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.

Sign up for GitHub

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

fix: datamodels with hyphens in name #14455

Merged
merged 3 commits into from
Jan 21, 2025
Merged

fix: datamodels with hyphens in name #14455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6907f0f
Remove datamodelmetadata parameter from getDataModel function
Jondyr Jan 20, 2025
4674647
Update dataModelUtils.ts
Jondyr Jan 20, 2025
4dc36ae
Merge branch 'main' into 20-01-datamodel-with-hyphen-bug
mlqn Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions frontend/packages/ux-editor/src/hooks/useValidDataModels.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,4 @@ describe('useValidDataModels', () => {
expect(isDataModelValid).toBe(true);
expect(selectedDataModel).toEqual(defaultDataModel);
});

it('should return the default data model from metadata when the current selected data model no longer exists', async () => {
const { result } = setupUseValidDataModelsHook('invalidModel');

expect(result.current.isLoadingDataModels).toBe(true);

await waitFor(() => {
expect(result.current.isLoadingDataModels).toBe(false);
});

const { selectedDataModel, isDataModelValid } = result.current;
expect(isDataModelValid).toBe(false);
expect(selectedDataModel).toEqual(defaultDataModel);
});
});
2 changes: 1 addition & 1 deletion frontend/packages/ux-editor/src/hooks/useValidDataModels.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export const useValidDataModels = (currentDataModel: string) => {

return {
dataModels,
selectedDataModel: getDataModel(isDataModelValid, dataModelMetadata, currentDataModel),
selectedDataModel: getDataModel(isDataModelValid, dataModel, currentDataModel),
dataModelMetadata,
isLoadingDataModels: isPendingDataModels || isPendingDataModelMetadata,
isDataModelValid,
Expand Down
15 changes: 5 additions & 10 deletions frontend/packages/ux-editor/src/utils/dataModelUtils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,45 +249,40 @@ describe('getDataModel', () => {
it('should return default data model when it is defined but invalid', () => {
const isDataModelValid = false;
const currentDataModel = 'currentDataModel';
const dataModelMetadata = dataModelMetadataMock;

const dataModel = getDataModel(isDataModelValid, dataModelMetadata, currentDataModel);
const dataModel = getDataModel(isDataModelValid, defaultModel, currentDataModel);
expect(dataModel).toEqual(defaultModel);
});

it('should return default data model when it is undefined and invalid', () => {
const isDataModelValid = false;
const currentDataModel = undefined;
const dataModelMetadata = dataModelMetadataMock;

const dataModel = getDataModel(isDataModelValid, dataModelMetadata, currentDataModel);
const dataModel = getDataModel(isDataModelValid, defaultModel, currentDataModel);
expect(dataModel).toEqual(defaultModel);
});

it('should return current data model when it is defined and valid', () => {
const isDataModelValid = true;
const currentDataModel = 'currentDataModel';
const dataModelMetadata = dataModelMetadataMock;

const dataModel = getDataModel(isDataModelValid, dataModelMetadata, currentDataModel);
const dataModel = getDataModel(isDataModelValid, defaultModel, currentDataModel);
expect(dataModel).toEqual(currentDataModel);
});

it('should return current data model if metadata is undefined', () => {
const isDataModelValid = true;
const currentDataModel = 'currentDataModel';
const dataModelMetadata = undefined;

const dataModel = getDataModel(isDataModelValid, dataModelMetadata, currentDataModel);
const dataModel = getDataModel(isDataModelValid, defaultModel, currentDataModel);
expect(dataModel).toEqual(currentDataModel);
});

it('should return default data model if current data model is empty string', () => {
const isDataModelValid = true;
const currentDataModel = '';
const dataModelMetadata = dataModelMetadataMock;

const dataModel = getDataModel(isDataModelValid, dataModelMetadata, currentDataModel);
const dataModel = getDataModel(isDataModelValid, defaultModel, currentDataModel);
expect(dataModel).toEqual(defaultModel);
});
});
6 changes: 3 additions & 3 deletions frontend/packages/ux-editor/src/utils/dataModelUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,13 +141,13 @@ export const validateSelectedDataField = (

export const getDataModel = (
isDataModelValid: boolean,
dataModelMetadata?: DataModelFieldElement[],
defaultDataModelName: string | undefined,
currentDataModel?: string,
): string => {
if (dataModelMetadata) {
if (defaultDataModelName) {
return isDataModelValid && currentDataModel !== undefined && currentDataModel !== ''
? currentDataModel
: dataModelMetadata[0]?.id;
: defaultDataModelName;
}
return currentDataModel;
};
Loading