Skip to content

Commit 37b61f9

Browse files
committed
fix: all tests passing
1 parent 5308e0a commit 37b61f9

24 files changed

+125
-111
lines changed

.eslintrc.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ module.exports = {
1919
'no-trailing-spaces': 'off',
2020
'react/jsx-indent': 'off',
2121
'no-unused-vars': 'off',
22+
'no-mixed-spaces-and-tabs': 'off',
2223
'react/jsx-indent-props': 'off',
2324
'react/jsx-props-no-spreading': 'off',
2425
'react/prop-types': 'off',
@@ -74,4 +75,7 @@ module.exports = {
7475
'env': {
7576
'jest/globals': true
7677
},
78+
"ignorePatterns": [
79+
"src/types/helpers/TransformSchema.type.ts"
80+
],
7781
};

jest.config.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,16 @@ module.exports = {
66
'<rootDir>/node_modules/regenerator-runtime/runtime',
77
'<rootDir>/scripts/config/polyfills.js'
88
],
9+
moduleNameMapper: {
10+
"^@root(.*)$": "<rootDir>/src/types$1",
11+
"^@utils(.*)$": "<rootDir>/src/helpers/utils$1",
12+
"^@config(.*)$": "<rootDir>/src/config$1",
13+
"^@helpers(.*)$": "<rootDir>/src/helpers$1",
14+
"^@universal-schema(.*)$": "<rootDir>/src/universal-schema$1",
15+
"^@cross-framework-wrapper(.*)$": "<rootDir>/src/cross-framework-wrapper$1",
16+
"^@generated(.*)$": "<rootDir>/src/framework/generated$1",
17+
"^@framework(.*)$": "<rootDir>/src/framework$1",
18+
},
919
snapshotSerializers: ['enzyme-to-json/serializer'],
1020
setupFilesAfterEnv: ['<rootDir>/scripts/config/jest/setup.js'],
1121
testMatch: [

src/cross-framework-wrapper/react/FieldSet/FieldSet.tsx

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,19 @@ import has from 'lodash/has';
77
// UI
88
import Framework from '@universal-schema/framework';
99

10+
// Utils
11+
import Utils from '@helpers/utils';
12+
13+
// Variants
14+
import { FieldSetProps } from '@core-types/FieldSet.type';
15+
import { isPageLayoutSet } from './variants/page-layout.variants';
16+
import RENDER_BASED_ON_SCHEMA_TYPE from './variants/schema-type.variants';
17+
18+
// Types
19+
1020
const {
1121
internal: {
12-
ValidationMessages
22+
ValidationMessages,
1323
},
1424
wrapperComponents: {
1525
Typography,
@@ -18,20 +28,10 @@ const {
1828
FieldsetHTML,
1929
},
2030
styles: {
21-
FieldSetStyles: fieldSetStyles
22-
}
31+
FieldSetStyles: fieldSetStyles,
32+
},
2333
} = Framework.uiFramework;
2434

25-
// Utils
26-
import Utils from '@helpers/utils';
27-
28-
// Variants
29-
import { isPageLayoutSet } from './variants/page-layout.variants';
30-
import RENDER_BASED_ON_SCHEMA_TYPE from './variants/schema-type.variants';
31-
32-
// Types
33-
import { FieldSetProps } from '@core-types/FieldSet.type';
34-
3535
const classNames = require('classnames');
3636

3737
export const shouldHideTitle = (uiSchema, schema) => isPageLayoutSet(uiSchema) || has(schema, 'items.enum');

src/cross-framework-wrapper/react/FieldSet/FieldSetArray.tsx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,6 @@ import React from 'react';
44
// UI
55
import Framework from '@universal-schema/framework';
66

7-
const {
8-
wrapperComponents: {
9-
Div,
10-
},
11-
styles: {
12-
FieldSetStyles: fieldSetStyles
13-
}
14-
} = Framework.uiFramework;
15-
167
// Helpers
178
import getDefinitionSchemaFromRef from '@helpers/get-definition-schema';
189

@@ -25,6 +16,15 @@ import Utils from '@helpers/utils';
2516
// Variant
2617
import RENDER_ARRAY_WRAPPERS from './variants/fieldset-array/field-array.wrappers';
2718

19+
const {
20+
wrapperComponents: {
21+
Div,
22+
},
23+
styles: {
24+
FieldSetStyles: fieldSetStyles,
25+
},
26+
} = Framework.uiFramework;
27+
2828
export const RawFieldSetArray = (props: FieldSetArrayProps) => {
2929
const {
3030
startIdx = 0,

src/cross-framework-wrapper/react/FieldSet/FieldSetObject.tsx

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,19 @@ import { get } from 'lodash';
44
import keys from 'lodash/keys';
55

66
// Internal
7-
import ReorderableFormField from './ReorderableFormField';
8-
import FormField from '../FormField';
97

108
// UI
119
import Framework from '@universal-schema/framework';
1210

11+
// Helpers
12+
import getDefaultValue from '@helpers/get-default-value';
13+
import getDefinitionSchemaFromRef from '@helpers/get-definition-schema';
14+
15+
// types
16+
import { FieldSetObjectProps } from '@core-types/FieldSetObject.type';
17+
import FormField from '../FormField';
18+
import ReorderableFormField from './ReorderableFormField';
19+
1320
const {
1421
wrapperComponents: {
1522
Typography,
@@ -19,17 +26,10 @@ const {
1926
Span,
2027
},
2128
styles: {
22-
FieldSetStyles: fieldSetStyles
23-
}
29+
FieldSetStyles: fieldSetStyles,
30+
},
2431
} = Framework.uiFramework;
2532

26-
// Helpers
27-
import getDefaultValue from '@helpers/get-default-value';
28-
import getDefinitionSchemaFromRef from '@helpers/get-definition-schema';
29-
30-
// types
31-
import { FieldSetObjectProps } from '@core-types/FieldSetObject.type';
32-
3333
const classNames = require('classnames');
3434

3535
export const RawFieldSetObject = ({

src/cross-framework-wrapper/react/FieldSet/FieldSetStepper.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import React from 'react';
77
import { StepperContext } from '@helpers/context';
88

99
// Internal
10+
import Framework from '@universal-schema/framework';
1011
import FieldSetObject from './FieldSetObject';
1112

1213
// UI
13-
import Framework from '@universal-schema/framework';
1414

1515
const {
1616
wrapperComponents: {
@@ -22,8 +22,8 @@ const {
2222
Div,
2323
},
2424
styles: {
25-
FormStepperStyles: useStyles
26-
}
25+
FormStepperStyles: useStyles,
26+
},
2727
} = Framework.uiFramework;
2828

2929
export default function HorizontalNonLinearStepperWithError(props) {

src/cross-framework-wrapper/react/FieldSet/FieldSetTabs.tsx

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@ import React from 'react';
44
// UI
55
import Framework from '@universal-schema/framework';
66

7+
// Internal
8+
import {
9+
getHashCodeFromXHRDef,
10+
} from '@helpers/state-machine/form/hooks';
11+
import FieldSetObject from './FieldSetObject';
12+
13+
// Helpers
14+
715
const {
816
wrapperComponents: {
917
Typography,
@@ -15,18 +23,10 @@ const {
1523
Div,
1624
},
1725
styles: {
18-
FieldSetStyles: fieldSetStyles
19-
}
26+
FieldSetStyles: fieldSetStyles,
27+
},
2028
} = Framework.uiFramework;
2129

22-
// Internal
23-
import FieldSetObject from './FieldSetObject';
24-
25-
// Helpers
26-
import {
27-
getHashCodeFromXHRDef,
28-
} from '@helpers/state-machine/form/hooks';
29-
3030
function TabPanel(props) {
3131
const { children, value, index, ...other } = props;
3232

src/cross-framework-wrapper/react/FieldSet/ReorderControls.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ const {
1616
Div,
1717
},
1818
styles: {
19-
FieldSetStyles: fieldSetStyles
20-
}
19+
FieldSetStyles: fieldSetStyles,
20+
},
2121
} = Framework.uiFramework;
2222

2323
export const RawReorderControls = (

src/cross-framework-wrapper/react/FieldSet/ReorderableFormField.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
/* eslint-disable react/jsx-props-no-spreading */
22
import React from 'react';
3+
import { ReorderableFormFieldProps } from '@core-types/ReoderableFormField.type';
4+
import Framework from '@universal-schema/framework';
35
import FormField from '../FormField';
46
import ReorderControls from './ReorderControls';
57

68
// Type
7-
import { ReorderableFormFieldProps } from '@core-types/ReoderableFormField.type';
89

910
// UI
10-
import Framework from '@universal-schema/framework';
1111

1212
const {
1313
wrapperComponents: {
1414
Div,
1515
},
1616
styles: {
17-
FieldSetStyles: fieldSetStyles
18-
}
17+
FieldSetStyles: fieldSetStyles,
18+
},
1919
} = Framework.uiFramework;
2020

2121
const classNames = require('classnames');

src/cross-framework-wrapper/react/FieldSet/variants/fieldset-array/field-array.variants.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import ReorderableFormField from '../../ReorderableFormField';
1818
const {
1919
wrapperComponents: {
2020
IconButton,
21-
AddCircle
22-
}
21+
AddCircle,
22+
},
2323
} = Framework.uiFramework;
2424

2525
const { ARRAY_VARIANTS } = FIELDSET_CONFIG;

0 commit comments

Comments
 (0)