🪟 🔧 [DRAFT] Refactor ServiceForm and ConnectorCard to move Formik and ServiceFormContext on top level #18229
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| export interface DeleteBlockProps { | ||
| type: "source" | "destination" | "connection"; | ||
| onDelete: () => Promise<unknown>; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| import { useCallback } from "react"; | ||
| import { useNavigate } from "react-router-dom"; | ||
|
|
||
| import { useConfirmationModalService } from "hooks/services/ConfirmationModal"; | ||
|
|
||
| import { DeleteBlockProps } from "./interfaces"; | ||
|
|
||
| export const useDeleteModal = ({ type, onDelete }: Partial<DeleteBlockProps>): { onDeleteButtonClick: () => void } => { | ||
| const { openConfirmationModal, closeConfirmationModal } = useConfirmationModalService(); | ||
| const navigate = useNavigate(); | ||
|
|
||
| const onDeleteButtonClick = useCallback(() => { | ||
| if (!onDelete) { | ||
| return; | ||
| } | ||
| openConfirmationModal({ | ||
| text: `tables.${type}DeleteModalText`, | ||
| title: `tables.${type}DeleteConfirm`, | ||
| submitButtonText: "form.delete", | ||
| onSubmit: async () => { | ||
| await onDelete(); | ||
| closeConfirmationModal(); | ||
| navigate("../.."); | ||
| }, | ||
| submitButtonDataId: "delete", | ||
| }); | ||
| }, [closeConfirmationModal, onDelete, openConfirmationModal, navigate, type]); | ||
|
|
||
| return { | ||
| onDeleteButtonClick, | ||
| }; | ||
| }; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,128 +1,118 @@ | ||
| import { Formik } from "formik"; | ||
| import React from "react"; | ||
| import { FormattedMessage } from "react-intl"; | ||
|
|
||
| import { JobItem } from "components/JobItem/JobItem"; | ||
| import { Card } from "components/ui/Card"; | ||
|
|
||
| import { ServiceForm } from "views/Connector/ServiceForm"; | ||
|
|
||
| import { useAdvancedModeSetting } from "../../../hooks/services/useAdvancedModeSetting"; | ||
| import { generateMessageFromError } from "../../../utils/errorStatusMessage"; | ||
| import { ConnectorServiceTypeControl } from "../ServiceForm/components/Controls/ConnectorServiceTypeControl"; | ||
| import { FormControls } from "../ServiceForm/FormControls"; | ||
| import { ServiceFormContextProvider } from "../ServiceForm/serviceFormContext"; | ||
| import styles from "./ConnectorCard.module.scss"; | ||
| import { useConnectorCardService } from "./hooks/useConnectorCardService"; | ||
| import { ConnectorCardProps } from "./interfaces"; | ||
| import { useTestConnector } from "./useTestConnector"; | ||
|
|
||
| export const ConnectorCard: React.FC<ConnectorCardProps> = (props) => { | ||
| const { | ||
| title, | ||
| full, | ||
| isLoading, | ||
| additionalSelectorComponent, | ||
| formType, | ||
| selectedConnectorDefinitionSpecification, | ||
| isEditMode, | ||
| availableServices, | ||
| onServiceSelect, | ||
| onDelete, | ||
| } = props; | ||
| const { | ||
| formFields, | ||
| getValues, | ||
| initialValues, | ||
| isFormSubmitting, | ||
| job, | ||
| jsonSchema, | ||
| onFormSubmit, | ||
| resetUiWidgetsInfo, | ||
| saved, | ||
| selectedConnectorDefinitionSpecificationId, | ||
| setUiWidgetsInfo, | ||
| uiWidgetsInfo, | ||
| uniqueFormId, | ||
| validationSchema, | ||
| } = useConnectorCardService(props); | ||
| const [advancedMode] = useAdvancedModeSetting(); | ||
| const { testConnector, isTestConnectionInProgress, onStopTesting, error } = useTestConnector(props); | ||
|
|
||
| return ( | ||
| <Formik | ||
|
There was a problem hiding this comment. Initially I thought it felt slightly weird to have the |
||
| validateOnBlur | ||
| validateOnChange | ||
| initialValues={initialValues} | ||
| validationSchema={validationSchema} | ||
| onSubmit={onFormSubmit} | ||
| enableReinitialize | ||
| > | ||
| <ServiceFormContextProvider | ||
| widgetsInfo={uiWidgetsInfo} | ||
| getValues={getValues} | ||
| setUiWidgetsInfo={setUiWidgetsInfo} | ||
| resetUiWidgetsInfo={resetUiWidgetsInfo} | ||
| formType={formType} | ||
| selectedConnector={selectedConnectorDefinitionSpecification} | ||
| availableServices={availableServices} | ||
| isEditMode={isEditMode} | ||
| isLoadingSchema={isLoading} | ||
| validationSchema={validationSchema} | ||
| > | ||
| <div> | ||
| <Card title={title} fullWidth={full}> | ||
| <div className={styles.cardForm}> | ||
| <div className={styles.connectorSelectControl}> | ||
| <ConnectorServiceTypeControl | ||
| formType={props.formType} | ||
| onChangeServiceType={onServiceSelect} | ||
| availableServices={availableServices} | ||
| isEditMode={isEditMode} | ||
| selectedServiceId={selectedConnectorDefinitionSpecificationId} | ||
| disabled={isFormSubmitting} | ||
| /> | ||
| </div> | ||
| {additionalSelectorComponent} | ||
| <div> | ||
| <ServiceForm | ||
| formId={uniqueFormId} | ||
| jsonSchema={jsonSchema} | ||
| isTestConnectionInProgress={isTestConnectionInProgress} | ||
| formFields={formFields} | ||
| initialValues={initialValues} | ||
| validationSchema={validationSchema} | ||
| availableServices={availableServices} | ||
| /> | ||
| {/* Show the job log only if advanced mode is turned on or the actual job failed (not the check inside the job) */} | ||
| {job && (advancedMode || !job.succeeded) && <JobItem job={job} />} | ||
| </div> | ||
| </div> | ||
| </Card> | ||
| <FormControls | ||
| onDelete={onDelete} | ||
| errorMessage={props.errorMessage || (error && generateMessageFromError(error))} | ||
| isTestConnectionInProgress={isTestConnectionInProgress} | ||
| onStopTestingConnector={onStopTesting ? () => onStopTesting() : undefined} | ||
| onRetest={testConnector ? async () => await testConnector() : undefined} | ||
| formFields={formFields} | ||
| selectedConnector={selectedConnectorDefinitionSpecification} | ||
| successMessage={ | ||
| props.successMessage || (saved && props.isEditMode && <FormattedMessage id="form.changesSaved" />) | ||
| } | ||
| /> | ||
| </div> | ||
| </ServiceFormContextProvider> | ||
| </Formik> | ||
| ); | ||
| }; | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
I like the introduction of this hook - its a nice way to keep this logic encapsulated while allowing it to be used in either a DeleteBlock or directly by a button