@axinom/mosaic-ui 0.43.0-rc.0 → 0.43.0-rc.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/FormStation/FormGrid/FormGrid.d.ts +7 -0
- package/dist/components/FormStation/FormGrid/FormGrid.d.ts.map +1 -0
- package/dist/components/FormStation/FormGrid/index.d.ts +2 -0
- package/dist/components/FormStation/FormGrid/index.d.ts.map +1 -0
- package/dist/components/FormStation/FormStation.d.ts +3 -12
- package/dist/components/FormStation/FormStation.d.ts.map +1 -1
- package/dist/components/FormStation/FormStation.models.d.ts +16 -2
- package/dist/components/FormStation/FormStation.models.d.ts.map +1 -1
- package/dist/components/FormStation/FormStationActions/FormStationActions.d.ts +21 -0
- package/dist/components/FormStation/FormStationActions/FormStationActions.d.ts.map +1 -0
- package/dist/components/FormStation/FormStationActions/index.d.ts +2 -0
- package/dist/components/FormStation/FormStationActions/index.d.ts.map +1 -0
- package/dist/components/FormStation/FormStationContentWrapper/FormStationContentWrapper.d.ts +11 -0
- package/dist/components/FormStation/FormStationContentWrapper/FormStationContentWrapper.d.ts.map +1 -0
- package/dist/components/FormStation/FormStationContentWrapper/index.d.ts +2 -0
- package/dist/components/FormStation/FormStationContentWrapper/index.d.ts.map +1 -0
- package/dist/components/FormStation/FormStationHeader/FormStationHeader.d.ts +11 -0
- package/dist/components/FormStation/FormStationHeader/FormStationHeader.d.ts.map +1 -0
- package/dist/components/FormStation/FormStationHeader/index.d.ts +2 -0
- package/dist/components/FormStation/FormStationHeader/index.d.ts.map +1 -0
- package/dist/components/FormStation/helpers/useDataProvider.d.ts +14 -0
- package/dist/components/FormStation/helpers/useDataProvider.d.ts.map +1 -0
- package/dist/components/FormStation/{useValidationError.d.ts → helpers/useValidationError.d.ts} +1 -1
- package/dist/components/FormStation/helpers/useValidationError.d.ts.map +1 -0
- package/dist/components/FormStation/index.d.ts +2 -1
- package/dist/components/FormStation/index.d.ts.map +1 -1
- package/dist/index.es.js +4 -4
- package/dist/index.es.js.map +1 -1
- package/dist/index.js +4 -4
- package/dist/index.js.map +1 -1
- package/package.json +3 -3
- package/src/components/FormStation/FormGrid/FormGrid.scss +10 -0
- package/src/components/FormStation/FormGrid/FormGrid.tsx +25 -0
- package/src/components/FormStation/FormGrid/index.ts +1 -0
- package/src/components/FormStation/FormStation.models.ts +28 -2
- package/src/components/FormStation/FormStation.scss +1 -117
- package/src/components/FormStation/FormStation.stories.tsx +4 -11
- package/src/components/FormStation/FormStation.tsx +39 -388
- package/src/components/FormStation/FormStationActions/FormStationActions.tsx +130 -0
- package/src/components/FormStation/FormStationActions/index.ts +1 -0
- package/src/components/FormStation/FormStationContentWrapper/FormStationContentWrapper.scss +66 -0
- package/src/components/FormStation/FormStationContentWrapper/FormStationContentWrapper.tsx +76 -0
- package/src/components/FormStation/FormStationContentWrapper/index.ts +1 -0
- package/src/components/FormStation/FormStationHeader/FormStationHeader.tsx +88 -0
- package/src/components/FormStation/FormStationHeader/index.ts +1 -0
- package/src/components/FormStation/helpers/useDataProvider.ts +124 -0
- package/src/components/FormStation/{useValidationError.tsx → helpers/useValidationError.tsx} +2 -1
- package/src/components/FormStation/index.ts +2 -5
- package/dist/components/FormStation/StationErrorStateType.d.ts +0 -5
- package/dist/components/FormStation/StationErrorStateType.d.ts.map +0 -1
- package/dist/components/FormStation/useValidationError.d.ts.map +0 -1
- package/src/components/FormStation/StationErrorStateType.tsx +0 -5
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
import clsx from 'clsx';
|
|
2
|
+
import { Form } from 'formik';
|
|
3
|
+
import React from 'react';
|
|
4
|
+
import { Data } from '../../../types';
|
|
5
|
+
import { MessageBar } from '../../MessageBar';
|
|
6
|
+
import { FormGrid } from '../FormGrid';
|
|
7
|
+
import { FormStationProps } from '../FormStation';
|
|
8
|
+
import { StationErrorStateType } from '../FormStation.models';
|
|
9
|
+
import classes from './FormStationContentWrapper.scss';
|
|
10
|
+
|
|
11
|
+
interface FormStationContentWrapperProps
|
|
12
|
+
extends Pick<
|
|
13
|
+
FormStationProps<Data>,
|
|
14
|
+
'stationMessage' | 'edgeToEdgeContent' | 'infoPanel' | 'initialData'
|
|
15
|
+
> {
|
|
16
|
+
stationError?: StationErrorStateType;
|
|
17
|
+
setStationError: React.Dispatch<
|
|
18
|
+
React.SetStateAction<StationErrorStateType | undefined>
|
|
19
|
+
>;
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
export const FormStationContentWrapper: React.FC<
|
|
23
|
+
FormStationContentWrapperProps
|
|
24
|
+
> = ({
|
|
25
|
+
stationMessage,
|
|
26
|
+
edgeToEdgeContent,
|
|
27
|
+
infoPanel,
|
|
28
|
+
initialData,
|
|
29
|
+
stationError,
|
|
30
|
+
setStationError,
|
|
31
|
+
children,
|
|
32
|
+
}) => (
|
|
33
|
+
<>
|
|
34
|
+
{stationError && (
|
|
35
|
+
<div className={classes.errorMessage}>
|
|
36
|
+
<MessageBar
|
|
37
|
+
type="error"
|
|
38
|
+
title={String(stationError.title)}
|
|
39
|
+
onClose={() => setStationError(undefined)}
|
|
40
|
+
>
|
|
41
|
+
{stationError?.body}
|
|
42
|
+
</MessageBar>
|
|
43
|
+
</div>
|
|
44
|
+
)}
|
|
45
|
+
{initialData.loading ? (
|
|
46
|
+
// TODO: Loading skeleton of the page
|
|
47
|
+
<></>
|
|
48
|
+
) : initialData.error ||
|
|
49
|
+
initialData.data === null ||
|
|
50
|
+
initialData.entityNotFound ? (
|
|
51
|
+
// Error on loading - we can't show the form
|
|
52
|
+
<div className={classes.loadingError}></div>
|
|
53
|
+
) : (
|
|
54
|
+
<div className={classes.children}>
|
|
55
|
+
<div className={classes.main}>
|
|
56
|
+
<div
|
|
57
|
+
className={clsx(classes.formWrapper, {
|
|
58
|
+
[classes.hasMessage]: stationMessage,
|
|
59
|
+
})}
|
|
60
|
+
>
|
|
61
|
+
{stationMessage && <MessageBar {...stationMessage} />}
|
|
62
|
+
<Form>
|
|
63
|
+
<FormGrid edgeToEdgeContent={edgeToEdgeContent}>
|
|
64
|
+
{children}
|
|
65
|
+
{/* Adding a invisible text input here to prevent the browser from submitting on "Enter" when there is only a single text input field in the form
|
|
66
|
+
See: https://www.w3.org/MarkUp/html-spec/html-spec_8.html#SEC8.2 */}
|
|
67
|
+
<input type="text" style={{ display: 'none' }} />
|
|
68
|
+
</FormGrid>
|
|
69
|
+
</Form>
|
|
70
|
+
</div>
|
|
71
|
+
{infoPanel}
|
|
72
|
+
</div>
|
|
73
|
+
</div>
|
|
74
|
+
)}
|
|
75
|
+
</>
|
|
76
|
+
);
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './FormStationContentWrapper';
|
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
import { FormikValues, useFormikContext } from 'formik';
|
|
2
|
+
import React, { useEffect } from 'react';
|
|
3
|
+
import { useHistory } from 'react-router-dom';
|
|
4
|
+
import { SaveIndicatorType, setSaveIndicator } from '../../../initialize';
|
|
5
|
+
import { IconName } from '../../Icons';
|
|
6
|
+
import {
|
|
7
|
+
PageHeader,
|
|
8
|
+
PageHeaderActionType,
|
|
9
|
+
PageHeaderProps,
|
|
10
|
+
} from '../../PageHeader';
|
|
11
|
+
|
|
12
|
+
/**
|
|
13
|
+
* Handles showRefresh and cancel buttons based on form states
|
|
14
|
+
*/
|
|
15
|
+
export const FormStationHeader: React.FC<
|
|
16
|
+
Omit<PageHeaderProps, 'title'> & {
|
|
17
|
+
titleProperty?: string;
|
|
18
|
+
defaultTitle?: string;
|
|
19
|
+
cancelNavigationUrl?: string;
|
|
20
|
+
}
|
|
21
|
+
> = ({
|
|
22
|
+
titleProperty,
|
|
23
|
+
defaultTitle,
|
|
24
|
+
subtitle,
|
|
25
|
+
cancelNavigationUrl,
|
|
26
|
+
className,
|
|
27
|
+
}) => {
|
|
28
|
+
const { dirty, resetForm, values } = useFormikContext<FormikValues>();
|
|
29
|
+
|
|
30
|
+
useEffect(() => {
|
|
31
|
+
// Set the save indicator to dirty depending on the form state
|
|
32
|
+
if (dirty) {
|
|
33
|
+
setSaveIndicator(SaveIndicatorType.Dirty);
|
|
34
|
+
} else {
|
|
35
|
+
setSaveIndicator(SaveIndicatorType.Inactive);
|
|
36
|
+
}
|
|
37
|
+
return () => {
|
|
38
|
+
// The form is not always considered "not dirty" after the save
|
|
39
|
+
// so this code will make sure that the indicator is set to inactive
|
|
40
|
+
// when the station is left.
|
|
41
|
+
setSaveIndicator(SaveIndicatorType.Inactive);
|
|
42
|
+
};
|
|
43
|
+
}, [dirty]);
|
|
44
|
+
|
|
45
|
+
const history = useHistory();
|
|
46
|
+
|
|
47
|
+
const title =
|
|
48
|
+
titleProperty && values[titleProperty] !== ''
|
|
49
|
+
? values[titleProperty]
|
|
50
|
+
: defaultTitle ?? '';
|
|
51
|
+
|
|
52
|
+
return (
|
|
53
|
+
<PageHeader
|
|
54
|
+
title={title}
|
|
55
|
+
subtitle={subtitle}
|
|
56
|
+
className={className}
|
|
57
|
+
actions={[
|
|
58
|
+
...(dirty === true // add undo action if form as been altered
|
|
59
|
+
? [
|
|
60
|
+
{
|
|
61
|
+
label: 'Undo Changes',
|
|
62
|
+
icon: IconName.Undo,
|
|
63
|
+
actionType: PageHeaderActionType.Context,
|
|
64
|
+
onClick: () => {
|
|
65
|
+
resetForm();
|
|
66
|
+
},
|
|
67
|
+
},
|
|
68
|
+
]
|
|
69
|
+
: []),
|
|
70
|
+
...(cancelNavigationUrl // add cancel action if applicable
|
|
71
|
+
? [
|
|
72
|
+
{
|
|
73
|
+
label: 'Cancel',
|
|
74
|
+
icon: IconName.X,
|
|
75
|
+
onClick: () => {
|
|
76
|
+
resetForm();
|
|
77
|
+
// If the form has errors, Navigation needs to be wrapped in a promise or timeout.
|
|
78
|
+
Promise.resolve().then(() =>
|
|
79
|
+
history.push(cancelNavigationUrl),
|
|
80
|
+
);
|
|
81
|
+
},
|
|
82
|
+
},
|
|
83
|
+
]
|
|
84
|
+
: []),
|
|
85
|
+
]}
|
|
86
|
+
/>
|
|
87
|
+
);
|
|
88
|
+
};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './FormStationHeader';
|
|
@@ -0,0 +1,124 @@
|
|
|
1
|
+
import { FormikHelpers } from 'formik';
|
|
2
|
+
import {
|
|
3
|
+
Dispatch,
|
|
4
|
+
SetStateAction,
|
|
5
|
+
useCallback,
|
|
6
|
+
useEffect,
|
|
7
|
+
useRef,
|
|
8
|
+
useState,
|
|
9
|
+
} from 'react';
|
|
10
|
+
import { SaveIndicatorType, setSaveIndicator } from '../../../initialize';
|
|
11
|
+
import { Data } from '../../../types';
|
|
12
|
+
import { ErrorTypeToStationError } from '../../../utils/ErrorTypeToStationError';
|
|
13
|
+
import { ErrorType } from '../../models';
|
|
14
|
+
import {
|
|
15
|
+
InitialFormData,
|
|
16
|
+
SaveDataFunction,
|
|
17
|
+
StationErrorStateType,
|
|
18
|
+
} from '../FormStation.models';
|
|
19
|
+
|
|
20
|
+
export type FormStationDataProvider = <TValues extends Data, TSubmitResponse>(
|
|
21
|
+
initialData: InitialFormData<TValues>,
|
|
22
|
+
saveData: SaveDataFunction<TValues, TSubmitResponse>,
|
|
23
|
+
) => {
|
|
24
|
+
onSubmit: (
|
|
25
|
+
values: TValues,
|
|
26
|
+
formikHelpers: FormikHelpers<TValues>,
|
|
27
|
+
) => Promise<void>;
|
|
28
|
+
stationError?: StationErrorStateType;
|
|
29
|
+
setStationError: Dispatch<SetStateAction<StationErrorStateType | undefined>>;
|
|
30
|
+
isFormSubmitting: boolean;
|
|
31
|
+
lastSubmittedResponse: React.MutableRefObject<TSubmitResponse | undefined>;
|
|
32
|
+
initialValues: TValues | null | undefined;
|
|
33
|
+
};
|
|
34
|
+
|
|
35
|
+
export const useDataProvider: FormStationDataProvider = <
|
|
36
|
+
TValues extends Data,
|
|
37
|
+
TSubmitResponse,
|
|
38
|
+
>(
|
|
39
|
+
initialData: InitialFormData<TValues>,
|
|
40
|
+
saveData: SaveDataFunction<TValues, TSubmitResponse>,
|
|
41
|
+
) => {
|
|
42
|
+
const [stationError, setStationError] = useState<StationErrorStateType>();
|
|
43
|
+
const [isFormSubmitting, setIsFormSubmitting] = useState<boolean>(false);
|
|
44
|
+
const lastSubmittedResponse = useRef<TSubmitResponse>();
|
|
45
|
+
|
|
46
|
+
useEffect(() => {
|
|
47
|
+
if (
|
|
48
|
+
initialData.error ||
|
|
49
|
+
(initialData.data === null && !initialData.loading) ||
|
|
50
|
+
initialData.entityNotFound
|
|
51
|
+
) {
|
|
52
|
+
const stationError = {
|
|
53
|
+
...ErrorTypeToStationError(
|
|
54
|
+
initialData.error,
|
|
55
|
+
'An error occurred when trying to load data.',
|
|
56
|
+
'Entity not found',
|
|
57
|
+
),
|
|
58
|
+
type: 'loading',
|
|
59
|
+
};
|
|
60
|
+
|
|
61
|
+
setStationError(stationError);
|
|
62
|
+
} else {
|
|
63
|
+
if (stationError?.type === 'loading') {
|
|
64
|
+
// Only clear the error if it is a loading error, which now seems to be cleared.
|
|
65
|
+
setStationError(undefined);
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
}, [
|
|
69
|
+
initialData.loading,
|
|
70
|
+
initialData.error,
|
|
71
|
+
initialData.entityNotFound,
|
|
72
|
+
initialData.data,
|
|
73
|
+
stationError?.type,
|
|
74
|
+
]);
|
|
75
|
+
|
|
76
|
+
const onSubmit = useCallback(
|
|
77
|
+
async (
|
|
78
|
+
values: TValues,
|
|
79
|
+
formikHelpers: FormikHelpers<TValues>,
|
|
80
|
+
): Promise<void> => {
|
|
81
|
+
if (isFormSubmitting) {
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
try {
|
|
86
|
+
setIsFormSubmitting(true);
|
|
87
|
+
setSaveIndicator(SaveIndicatorType.Saving);
|
|
88
|
+
setStationError(undefined);
|
|
89
|
+
if (!initialData.loading && saveData) {
|
|
90
|
+
const response = await saveData(values, initialData, formikHelpers);
|
|
91
|
+
if (response) {
|
|
92
|
+
lastSubmittedResponse.current = response;
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
} catch (error) {
|
|
96
|
+
setStationError(
|
|
97
|
+
ErrorTypeToStationError(
|
|
98
|
+
error as ErrorType,
|
|
99
|
+
'An error occurred when trying to save data.',
|
|
100
|
+
),
|
|
101
|
+
);
|
|
102
|
+
|
|
103
|
+
setSaveIndicator(SaveIndicatorType.Dirty);
|
|
104
|
+
|
|
105
|
+
// We still throw the error, to make sure that navigation or action execution
|
|
106
|
+
// will not continue after a failed save.
|
|
107
|
+
throw error;
|
|
108
|
+
} finally {
|
|
109
|
+
formikHelpers.setSubmitting(false);
|
|
110
|
+
setIsFormSubmitting(false);
|
|
111
|
+
}
|
|
112
|
+
},
|
|
113
|
+
[isFormSubmitting, initialData, saveData, setStationError],
|
|
114
|
+
);
|
|
115
|
+
|
|
116
|
+
return {
|
|
117
|
+
onSubmit,
|
|
118
|
+
stationError,
|
|
119
|
+
setStationError,
|
|
120
|
+
isFormSubmitting,
|
|
121
|
+
lastSubmittedResponse,
|
|
122
|
+
initialValues: initialData.data,
|
|
123
|
+
};
|
|
124
|
+
};
|
package/src/components/FormStation/{useValidationError.tsx → helpers/useValidationError.tsx}
RENAMED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { useFormikContext } from 'formik';
|
|
2
2
|
import React, { useCallback, useEffect, useState } from 'react';
|
|
3
|
-
import { StationErrorStateType } from '
|
|
3
|
+
import { StationErrorStateType } from '../FormStation.models';
|
|
4
4
|
|
|
5
5
|
/**
|
|
6
6
|
* Component that watches for changes in the form validation state
|
|
@@ -15,6 +15,7 @@ const ValidationWatcher: React.FC<{
|
|
|
15
15
|
}, [formik.isValid, isValid]);
|
|
16
16
|
return null;
|
|
17
17
|
};
|
|
18
|
+
|
|
18
19
|
/**
|
|
19
20
|
* Cares for showing (and removing) validation errors.
|
|
20
21
|
* @param stationError the currently showing error
|
|
@@ -1,8 +1,5 @@
|
|
|
1
1
|
export { Create, CreateProps } from './Create/Create';
|
|
2
2
|
export { Details, DetailsProps } from './Details/Details';
|
|
3
|
-
export {
|
|
4
|
-
|
|
5
|
-
FormStationProps,
|
|
6
|
-
ObjectSchemaDefinition,
|
|
7
|
-
} from './FormStation';
|
|
3
|
+
export { FormGrid } from './FormGrid';
|
|
4
|
+
export { FormStation, FormStationProps } from './FormStation';
|
|
8
5
|
export * from './FormStation.models';
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"StationErrorStateType.d.ts","sourceRoot":"","sources":["../../../src/components/FormStation/StationErrorStateType.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEzC,MAAM,WAAW,qBAAsB,SAAQ,YAAY;IACzD,IAAI,CAAC,EAAE,MAAM,CAAC;CACf"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"useValidationError.d.ts","sourceRoot":"","sources":["../../../src/components/FormStation/useValidationError.tsx"],"names":[],"mappings":"AACA,OAAO,KAA2C,MAAM,OAAO,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAehE;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAChC,YAAY,EAAE,qBAAqB,GAAG,SAAS,EAC/C,eAAe,EAAE,KAAK,CAAC,QAAQ,CAC7B,KAAK,CAAC,cAAc,CAAC,qBAAqB,GAAG,SAAS,CAAC,CACxD,GACA;IACD,kBAAkB,EAAE,MAAM,IAAI,CAAC;IAC/B,iBAAiB,EAAE,GAAG,CAAC,OAAO,CAAC;CAChC,CAyBA"}
|