1716: Removes unused params

Author: Ruben van Leeuwen

frontend/packages/pydantic-forms/src/components/form/Footer.tsx

@@ -3,11 +3,10 @@
  *
  * Form footer component
  */
-import React, { useCallback, useState } from 'react';
+import React from 'react';
 
 import RenderReactHookFormErrors from '@/components/render/RenderReactHookFormErrors';
 import { usePydanticFormContext } from '@/core';
-import { preventDefault } from '@/utils';
 
 const Footer = () => {
     const {
@@ -21,35 +20,21 @@ const Footer = () => {
         allowUntouchedSubmit,
     } = usePydanticFormContext();
 
-    const [showErrors, setShowErrors] = useState(false);
-
-    const toggleErrors = useCallback(() => {
-        setShowErrors((state) => !state);
-        rhf.trigger();
-    }, [rhf]);
-
     const hasErrors = !!Object.keys(rhf.formState.errors).length;
 
     return (
         <div style={{ height: '200px' }}>
-            {(!!footerComponent || (showErrors && hasErrors)) && (
+            {(!!footerComponent || hasErrors) && (
                 <div>
                     {footerComponent}
 
-                    {showErrors && <RenderReactHookFormErrors />}
+                    {<RenderReactHookFormErrors />}
                 </div>
             )}
-            <div
-                style={{
-                    display: 'flex',
-                    justifyContent: 'space-between',
-                    margin: '8px',
-                }}
-            >
+            <div>
                 {resetButtonAlternative ?? (
                     <button
                         type="button"
-                        e2e-id="pydanticforms-reset-btn"
                         onClick={(e) => {
                             resetForm(e);
                         }}
@@ -63,38 +48,18 @@ const Footer = () => {
                 {rhf.formState.isValid &&
                     !allowUntouchedSubmit &&
                     !rhf.formState.isDirty && (
-                        <div
-                            className="d-flex mv-0 mr-3"
-                            style={{ opacity: 0.8 }}
-                        >
-                            Het formulier is nog niet aangepast
-                        </div>
+                        <div>Het formulier is nog niet aangepast</div>
                     )}
 
                 {!!onCancel &&
                     (cancelButton ?? (
-                        <button
-                            type="button"
-                            onClick={onCancel}
-                            e2e-id="pydanticforms-cancel-btn"
-                            style={{
-                                marginLeft: '8px',
-                                height: '28px',
-                                padding: '4px',
-                            }}
-                        >
+                        <button type="button" onClick={onCancel}>
                             Annuleren
                         </button>
                     ))}
 
                 <button
-                    e2e-id="pydanticforms-send-btn"
                     type="submit"
-                    style={{
-                        marginLeft: '8px',
-                        height: '28px',
-                        padding: '4px',
-                    }}
                     disabled={
                         !rhf.formState.isValid ||
                         (!allowUntouchedSubmit &&
@@ -106,21 +71,7 @@ const Footer = () => {
                 </button>
             </div>
             {!rhf.formState.isValid && rhf.formState.isDirty && (
-                <div className="d-flex mv-0 mr-3" style={{ opacity: 0.8 }}>
-                    Het formulier is nog niet correct ingevuld{' '}
-                    {!showErrors && (
-                        <>
-                            -{' '}
-                            <a
-                                className="ml-1 font-weight-bold"
-                                href="#"
-                                onClick={preventDefault(toggleErrors)}
-                            >
-                                Toon info
-                            </a>
-                        </>
-                    )}
-                </div>
+                <div>Het formulier is nog niet correct ingevuld</div>
             )}
         </div>
     );

frontend/packages/pydantic-forms/src/core/PydanticFormContextProvider.tsx

@@ -37,7 +37,6 @@ import { useLabelProvider } from '@/core/hooks/useLabelProvider';
 import {
     PydanticFormContextProps,
     PydanticFormInitialContextProps,
-    PydanticFormLayout,
     PydanticFormValidationErrorDetails,
 } from '@/types';
 
@@ -64,33 +63,32 @@ function PydanticFormContextProvider({
     title,
     sendLabel,
     headerComponent,
-    formLayout = PydanticFormLayout.TWO_COL,
     footerComponent,
     successNotice,
     onSuccess,
     onCancel,
     onChange,
     children,
-    hasCardWrapper = true,
     config,
 }: PydanticFormInitialContextProps) {
     const {
-        customDataProvider,
-        labelProvider,
         apiProvider,
-        fieldDetailProvider,
-        onFieldChangeHandler,
+        labelProvider,
+        customDataProvider,
         customDataProviderCacheKey,
+
+        onFieldChangeHandler,
         resetButtonAlternative,
-        footerCtaPrimaryVariant = 'purple',
         customValidationRules,
-        layoutColumnProvider,
         allowUntouchedSubmit,
         skipSuccessNotice,
-        disableSaveProgress,
-        formStructureMutator,
+
         cancelButton,
         componentMatcher,
+
+        formStructureMutator,
+        layoutColumnProvider,
+        fieldDetailProvider,
     } = config;
 
     // TODO: Fix this again
@@ -347,18 +345,14 @@ function PydanticFormContextProvider({
         isFullFilled,
         customDataProvider,
         errorDetails,
-        formLayout,
         successNotice,
-        footerCtaPrimaryVariant,
         submitForm,
         resetForm,
         cancelButton,
         skipSuccessNotice,
         allowUntouchedSubmit,
-        disableSaveProgress,
         resetButtonAlternative,
         config,
-        hasCardWrapper,
         setSaveToLeavePageInCurrentState,
     };
 

frontend/packages/pydantic-forms/src/core/hooks/useCustomDataProvider.tsx

@@ -3,12 +3,12 @@ import useSWR from 'swr';
 import { PydanticFormCustomDataProvider, PydanticFormLabels } from '@/types';
 
 const useCustomDataProvider = (
-    cacheKey: number,
+    customDataProviderCacheKey: number,
     customDataProvider?: PydanticFormCustomDataProvider,
 ) => {
     return useSWR<PydanticFormLabels>(
         // cache key
-        [`pydanticFormsDataProvider-${cacheKey}`],
+        [`pydanticFormsDataProvider-${customDataProviderCacheKey}`],
 
         // return val
         () => {
@@ -19,7 +19,6 @@ const useCustomDataProvider = (
             return customDataProvider();
         },
 
-        // swr config
         {
             fallback: {},
 

frontend/packages/pydantic-forms/src/types.ts

@@ -22,7 +22,6 @@ export interface PydanticFormInitialContextProps {
     title?: string | boolean;
     sendLabel?: string;
     metaData?: PydanticFormMetaData;
-    formLayout?: PydanticFormLayout;
     successNotice?: React.ReactNode;
     onSuccess?: (fieldValues: FieldValues, response: object) => void;
     onCancel?: () => void;
@@ -35,11 +34,6 @@ export interface PydanticFormInitialContextProps {
     config: PydanticFormsContextConfig;
 }
 
-export enum PydanticFormLayout {
-    TWO_COL = 'two-col',
-    ONE_COL = 'one-col',
-}
-
 export type PydanticFormElementProps = {
     pydanticFormField: PydanticFormField;
     rhf: ReturnType<typeof useForm>;
@@ -75,7 +69,6 @@ export interface PydanticFormContextProps {
     footerComponent?: React.ReactNode;
     allowUntouchedSubmit?: boolean;
     skipSuccessNotice?: boolean;
-    formLayout: PydanticFormLayout;
     footerCtaPrimaryVariant?: string;
     setSaveToLeavePageInCurrentState: Dispatch<SetStateAction<boolean>>;
     hasCardWrapper?: boolean;
@@ -300,25 +293,14 @@ export interface PydanticFormZodValidationPresets {
 }
 
 export interface PydanticFormsContextConfig {
-    // use custom method to provide data for the form. This overwrites data fetched from labels endpoint
-    customDataProvider?: PydanticFormCustomDataProvider;
-
-    // use custom method for providing labels and data
-    labelProvider?: PydanticFormLabelProvider;
-
-    // have an option to change the layout columns of fields
-    layoutColumnProvider?: PydanticFormLayoutColumnProvider;
-
-    // have an option to change the layout columns of fields
-    formStructureMutator?: PydanticFormStructureMutator;
-
     // use a custom method for providing the form definition
     apiProvider: PydanticFormApiProvider;
 
-    // Extend field definitions
-    fieldDetailProvider?: PydanticFormFieldDetailProvider;
+    // use custom method for providing labels and data
+    labelProvider?: PydanticFormLabelProvider;
 
-    // be able to refresh the provided data
+    // use custom method to provide data for the form. This overwrites data fetched from labels endpoint
+    customDataProvider?: PydanticFormCustomDataProvider;
     customDataProviderCacheKey?: number;
 
     // whenever a fieldvalue changes, do something
@@ -337,15 +319,20 @@ export interface PydanticFormsContextConfig {
 
     resetButtonAlternative?: React.ReactNode;
 
-    disableSaveProgress?: boolean;
-
-    footerCtaPrimaryVariant?: string;
-
     componentMatcher?: (
         currentMatchers: PydanticComponentMatcher[],
     ) => PydanticComponentMatcher[];
 
     formRenderer?: FormRenderer;
+
+    // Extend field definitions
+    fieldDetailProvider?: PydanticFormFieldDetailProvider;
+
+    // have an option to change the layout columns of fields
+    layoutColumnProvider?: PydanticFormLayoutColumnProvider;
+
+    // have an option to change the layout columns of fields
+    formStructureMutator?: PydanticFormStructureMutator;
 }
 
 export type FormRenderer = React.JSXElementConstructor<{