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

fix: allow appmetadata to be undefined when validating name when data model is uploaded #14236

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { mockAppMetadata, mockDataTypeId } from '../../../../../test/applicationMetadataMock';
import { extractDataTypeNamesFromAppMetadata } from './validationUtils';
import { extractDataTypeNamesFromAppMetadata, findFileNameError } from './validationUtils';

describe('extractDataTypeNamesFromAppMetadata', () => {
it('should extract data type names when application metadata is provided', () => {
Expand All @@ -21,3 +21,23 @@ describe('extractDataTypeNamesFromAppMetadata', () => {
expect(dataTypeNames).toEqual([]);
});
});

describe('findFileNameError', () => {
it('should validate name as invalid if name does not match regEx', () => {
const fileName = 'æ';
const validationResult = findFileNameError(fileName, mockAppMetadata);
expect(validationResult).toEqual('invalidFileName');
});

it('should validate name as invalid if name exists in appMetadata', () => {
const fileName = mockAppMetadata.dataTypes[0].id;
const validationResult = findFileNameError(fileName, mockAppMetadata);
expect(validationResult).toEqual('fileExists');
});

it('should validate name as valid if appMetadata is undefined', () => {
const fileName = 'fileName';
const validationResult = findFileNameError(fileName, undefined);
expect(validationResult).toEqual(null);
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const isNameFormatValid = (fileNameWithoutExtension: string): boolean => {
const doesFileExistInMetadata = (
appMetadata: ApplicationMetadata,
fileNameWithoutExtension: string,
): boolean => appMetadata.dataTypes?.some((dataType) => dataType.id === fileNameWithoutExtension);
): boolean => appMetadata?.dataTypes?.some((dataType) => dataType.id === fileNameWithoutExtension);

export const extractDataTypeNamesFromAppMetadata = (
appMetadata?: ApplicationMetadata,
Expand Down
Loading