Merge latest master to resolve package-lock conflicts

Jakub007d · Jakub007d · commit 166f4a2576fa · 2026-01-26T15:26:15.000+01:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -70,10 +70,7 @@
     "@babel/preset-react": "^7.16.7",
     "@babel/preset-typescript": "^7.16.7",
     "@nx/jest": "^22.1.1",
-    "@nx/js": "22.0.1",
-    "@swc-node/register": "~1.9.1",
-    "@swc/core": "~1.5.7",
-    "@swc/helpers": "~0.5.11",
+    "@nx/js": "^22.1.1",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
@@ -104,7 +101,7 @@
     "inquirer": "^8.2.0",
     "jest": "^27.4.7",
     "ncp": "^2.0.0",
-    "nx": "^22.0.2",
+    "nx": "^22.1.1",
     "prettier": "^2.5.1",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
@@ -118,7 +115,7 @@
     "ts-loader": "^9.2.6",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0",
-    "typescript": "^4.5.4",
+    "typescript": "^5.9.3",
     "webpack": "^5.66.0",
     "webpack-cli": "^4.9.1",
     "webpack-dev-server": "^4.7.3"
diff --git a/packages/ant-component-mapper/package.json b/packages/ant-component-mapper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@data-driven-forms/ant-component-mapper",
-  "version": "4.1.7",
+  "version": "4.1.9",
   "description": "Ant Design React component mapper for Data Driven Forms.",
   "main": "index.js",
   "module": "esm/index.js",
diff --git a/packages/blueprint-component-mapper/package.json b/packages/blueprint-component-mapper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@data-driven-forms/blueprint-component-mapper",
-  "version": "4.1.4",
+  "version": "4.1.6",
   "description": "BlueprintJS React component mapper for Data Driven Forms.",
   "main": "index.js",
   "module": "esm/index.js",
diff --git a/packages/carbon-component-mapper/package.json b/packages/carbon-component-mapper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@data-driven-forms/carbon-component-mapper",
-  "version": "4.1.4",
+  "version": "4.1.6",
   "description": "Carbon React component mapper for Data Driven Forms.",
   "main": "index.js",
   "module": "esm/index.js",
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@data-driven-forms/common",
-  "version": "4.1.4",
+  "version": "4.1.6",
   "description": "Common components, helpers and other pieces of code for Data Driven Forms",
   "license": "Apache-2.0",
   "main": "index.js",
diff --git a/packages/common/src/wizard/reducer.js b/packages/common/src/wizard/reducer.js
@@ -22,6 +22,7 @@ const createSchema = ({ formOptions, fields }) => {
           field.substepOf,
         index,
         primary: !schema[schema.length - 1] || !field.substepOf || field.substepOf !== schema[schema.length - 1].substepOf,
+        isProgressAfterSubmissionStep: field.isProgressAfterSubmissionStep,
       },
     ];
 
diff --git a/packages/mui-component-mapper/package.json b/packages/mui-component-mapper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@data-driven-forms/mui-component-mapper",
-  "version": "4.1.4",
+  "version": "4.1.6",
   "description": "Component mapper for Material ui component mapper form data-driven-forms.",
   "main": "index.js",
   "module": "esm/index.js",
diff --git a/packages/pf4-component-mapper/README.md b/packages/pf4-component-mapper/README.md
@@ -128,4 +128,4 @@ We welcome any community contribution. Don't be afraid to report bug or to creat
 
 ### LICENSE
 
-Apache License 2.0
+Apache License 2.0
diff --git a/packages/pf4-component-mapper/demo/demo-schemas/wizard-schema.js b/packages/pf4-component-mapper/demo/demo-schemas/wizard-schema.js
@@ -441,3 +441,62 @@ export const wizardSchemaMoreSubsteps = {
     }
   ]
 };
+
+export const wizardSchemaProgressAfterSubmission = {
+  fields: [
+    {
+      component: componentTypes.WIZARD,
+      name: 'progress-wizard',
+      title: 'Progress after submission',
+      description: 'This wizard shows a progress step after submission',
+      fields: [
+        {
+          title: 'Step 1',
+          name: 'step-1',
+          nextStep: 'step-2',
+          fields: [
+            {
+              component: componentTypes.TEXT_FIELD,
+              name: 'name',
+              label: 'Name',
+              isRequired: true,
+              validate: [
+                {
+                  type: validatorTypes.REQUIRED
+                }
+              ]
+            }
+          ]
+        },
+        {
+          title: 'Step 2',
+          name: 'step-2',
+          nextStep: 'progress-step',
+          fields: [
+            {
+              component: componentTypes.TEXT_FIELD,
+              name: 'email',
+              label: 'Email',
+              isRequired: true,
+              validate: [
+                {
+                  type: validatorTypes.REQUIRED
+                }
+              ]
+            }
+          ]
+        },
+        {
+          name: 'progress-step',
+          isProgressAfterSubmissionStep: true,
+          fields: [
+            {
+              name: 'progress-content',
+              component: 'progress-step-content'
+            }
+          ]
+        }
+      ]
+    }
+  ]
+};
diff --git a/packages/pf4-component-mapper/demo/index.js b/packages/pf4-component-mapper/demo/index.js
@@ -1,15 +1,29 @@
 import React from 'react';
 import { createRoot } from 'react-dom/client';
-import { FormRenderer } from '@data-driven-forms/react-form-renderer';
+import { FormRenderer, WizardContext } from '@data-driven-forms/react-form-renderer';
 import { arraySchemaDDF } from './demo-schemas/widget-schema';
 import { componentMapper, FormTemplate } from '../src';
-import { Title, Button, Toolbar, ToolbarGroup, ToolbarItem } from '@patternfly/react-core';
+import {
+  Title,
+  Button,
+  Toolbar,
+  ToolbarGroup,
+  ToolbarItem,
+  EmptyState,
+  EmptyStateBody,
+  EmptyStateFooter,
+  EmptyStateActions,
+  Progress,
+  Bullseye
+} from '@patternfly/react-core';
+import { CogsIcon } from '@patternfly/react-icons';
 import {
   wizardSchema,
   wizardSchemaWithFunction,
   wizardSchemaSimple,
   wizardSchemaSubsteps,
   wizardSchemaMoreSubsteps,
+  wizardSchemaProgressAfterSubmission,
 } from './demo-schemas/wizard-schema';
 import sandboxSchema from './demo-schemas/sandbox';
 import dualSchema from './demo-schemas/dual-list-schema';
@@ -18,6 +32,48 @@ import selectSchema from './demo-schemas/select-schema';
 
 const Summary = (props) => <div>Custom summary component.</div>;
 
+const ProgressStepContent = () => {
+  const { jumpToStep } = React.useContext(WizardContext);
+  const [percentValidated, setPercentValidated] = React.useState(0);
+
+  const tick = React.useCallback(() => {
+    if (percentValidated < 100) {
+      setPercentValidated(prevValue => prevValue + 20);
+    }
+  }, [percentValidated]);
+
+  React.useEffect(() => {
+    const interval = setInterval(() => tick(), 1000);
+    return () => clearInterval(interval);
+  }, [tick]);
+
+  return (
+    <Bullseye>
+      <EmptyState
+        headingLevel="h4"
+        titleText={percentValidated === 100 ? 'Validation complete' : 'Validating credentials'}
+        icon={CogsIcon}
+        variant="lg"
+      >
+        <EmptyStateBody>
+          <Progress value={percentValidated} measureLocation="outside" aria-label="Wizard validation progress" />
+        </EmptyStateBody>
+        <EmptyStateBody>
+          Description can be used to further elaborate on the validation step, or give the user a better idea of how
+          long the process will take.
+        </EmptyStateBody>
+        <EmptyStateFooter>
+          <EmptyStateActions>
+            <Button isDisabled={percentValidated !== 100} onClick={() => jumpToStep(0)}>
+              Go to beginning
+            </Button>
+          </EmptyStateActions>
+        </EmptyStateFooter>
+      </EmptyState>
+    </Bullseye>
+  );
+};
+
 const fieldArrayState = {
   schema: arraySchemaDDF,
   additionalOptions: {
@@ -135,6 +191,19 @@ class App extends React.Component {
                 FormTemplate={(props) => <FormTemplate {...props} showFormControls={this.state.additionalOptions.showFormControls} />}
                 {...this.state.additionalOptions}
               />
+              <div>Progress after submission</div>
+              <FormRenderer
+                onSubmit={console.log}
+                componentMapper={{
+                  ...componentMapper,
+                  summary: Summary,
+                  'progress-step-content': ProgressStepContent,
+                }}
+                onCancel={() => console.log('Cancel action')}
+                schema={wizardSchemaProgressAfterSubmission}
+                FormTemplate={(props) => <FormTemplate {...props} showFormControls={this.state.additionalOptions.showFormControls} />}
+                {...this.state.additionalOptions}
+              />
             </>
           )}
         </div>
diff --git a/packages/pf4-component-mapper/package.json b/packages/pf4-component-mapper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@data-driven-forms/pf4-component-mapper",
-  "version": "4.1.5",
+  "version": "4.1.7",
   "description": "Patternfly 4 React component mapper for Data Driven Forms.",
   "main": "index.js",
   "module": "esm/index.js",
diff --git a/packages/pf4-component-mapper/src/wizard/wizard-components/wizard-nav.js b/packages/pf4-component-mapper/src/wizard/wizard-components/wizard-nav.js
@@ -22,7 +22,7 @@ const WizardNavigationInternal = React.memo(
   ({ navSchema, activeStepIndex, maxStepIndex, jumpToStep, valid, validating }) => (
     <Fragment>
       {navSchema
-        .filter((field) => field.primary)
+        .filter((field) => field.primary && !field.isProgressAfterSubmissionStep)
         .map((step) => {
           const substeps = step.substepOf && navSchema.filter((field) => field.substepOf === step.substepOf);
 
diff --git a/packages/pf4-component-mapper/src/wizard/wizard.js b/packages/pf4-component-mapper/src/wizard/wizard.js
@@ -85,6 +85,8 @@ const WizardInternal = ({
     return null;
   }
 
+  const isProgressAfterSubmissionStep = currentStep.isProgressAfterSubmissionStep;
+
   return (
     <Modal
       inModal={inModal}
@@ -117,45 +119,57 @@ const WizardInternal = ({
             closeButtonAriaLabel={closeButtonAriaLabel}
           />
         )}
-        <WizardToggle activeStepIndex={activeStepIndex} currentStep={currentStep} navSchema={navSchema} isOpen={state.openNav} dispatch={dispatch} />
-        <div className="pf-v6-c-wizard__outer-wrap">
-          <div className="pf-v6-c-wizard__inner-wrap">
-            <WizardNav aria-label={navAriaLabel} isExpanded={state.openNav}>
-              <FormSpy subscription={{ values: true, valid: true, validating: true }}>
-                {({ values, valid, validating }) => (
-                  <WizardNavigation
-                    navSchema={navSchema}
-                    activeStepIndex={activeStepIndex}
-                    valid={valid}
-                    maxStepIndex={maxStepIndex}
-                    jumpToStep={(...args) => {
-                      state.openNav && dispatch({ type: 'closeNav' });
-                      return jumpToStep(...args);
-                    }}
-                    crossroads={crossroads}
-                    isDynamic={isDynamic}
-                    values={values}
-                    setPrevSteps={setPrevSteps}
-                    validating={validating}
-                  />
-                )}
-              </FormSpy>
-            </WizardNav>
-            <WizardStep
-              conditionalSubmitFlag={conditionalSubmitFlag}
-              buttonLabels={buttonLabels}
-              buttonsClassName={buttonsClassName}
-              showTitles={showTitles}
-              hasNoBodyPadding={hasNoBodyPadding}
-              StepTemplate={StepTemplate}
-              {...currentStep}
-              formOptions={formOptions}
-              handleNext={(nextStep) => handleNext(nextStep)}
-              handlePrev={handlePrev}
-              disableBack={activeStepIndex === 0}
+        {isProgressAfterSubmissionStep ? (
+          currentStep.fields.map((item) => formOptions.renderForm([item], formOptions))
+        ) : (
+          <>
+            <WizardToggle
+              activeStepIndex={activeStepIndex}
+              currentStep={currentStep}
+              navSchema={navSchema}
+              isOpen={state.openNav}
+              dispatch={dispatch}
             />
-          </div>
-        </div>
+            <div className="pf-v6-c-wizard__outer-wrap">
+              <div className="pf-v6-c-wizard__inner-wrap">
+                <WizardNav aria-label={navAriaLabel} isExpanded={state.openNav}>
+                  <FormSpy subscription={{ values: true, valid: true, validating: true }}>
+                    {({ values, valid, validating }) => (
+                      <WizardNavigation
+                        navSchema={navSchema}
+                        activeStepIndex={activeStepIndex}
+                        valid={valid}
+                        maxStepIndex={maxStepIndex}
+                        jumpToStep={(...args) => {
+                          state.openNav && dispatch({ type: 'closeNav' });
+                          return jumpToStep(...args);
+                        }}
+                        crossroads={crossroads}
+                        isDynamic={isDynamic}
+                        values={values}
+                        setPrevSteps={setPrevSteps}
+                        validating={validating}
+                      />
+                    )}
+                  </FormSpy>
+                </WizardNav>
+                <WizardStep
+                  conditionalSubmitFlag={conditionalSubmitFlag}
+                  buttonLabels={buttonLabels}
+                  buttonsClassName={buttonsClassName}
+                  showTitles={showTitles}
+                  hasNoBodyPadding={hasNoBodyPadding}
+                  StepTemplate={StepTemplate}
+                  {...currentStep}
+                  formOptions={formOptions}
+                  handleNext={(nextStep) => handleNext(nextStep)}
+                  handlePrev={handlePrev}
+                  disableBack={activeStepIndex === 0}
+                />
+              </div>
+            </div>
+          </>
+        )}
       </div>
     </Modal>
   );
diff --git a/packages/react-form-renderer/package.json b/packages/react-form-renderer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@data-driven-forms/react-form-renderer",
-  "version": "4.1.4",
+  "version": "4.1.6",
   "description": "React Form Renderer. Data Driven Forms converts JSON form definitions into fully functional React forms.",
   "main": "index.js",
   "module": "esm/index.js",
diff --git a/packages/react-form-renderer/src/tests/form-renderer/condition.test.js b/packages/react-form-renderer/src/tests/form-renderer/condition.test.js
@@ -676,7 +676,7 @@ describe('condition test', () => {
     await waitFor(() => {
       expect(errorSpy).toHaveBeenCalled();
       // eslint-disable-next-line no-console
-      const errorMessage = console.error.mock.calls.map(call => call[0]).join(' ');
+      const errorMessage = console.error.mock.calls.map((call) => call[0]).join(' ');
       expect(errorMessage).toContain('Received invalid setterValue. Expected object, received: ');
     });
   });
diff --git a/packages/suir-component-mapper/package.json b/packages/suir-component-mapper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@data-driven-forms/suir-component-mapper",
-  "version": "4.1.4",
+  "version": "4.1.6",
   "description": "Semantíc UI React component mapper for Data Driven Forms.",
   "main": "index.js",
   "module": "esm/index.js",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@data-driven-forms/ant-component-mapper",`
`3`		`- "version": "4.1.7",`
	`3`	`+ "version": "4.1.9",`
`4`	`4`	`"description": "Ant Design React component mapper for Data Driven Forms.",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"module": "esm/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@data-driven-forms/blueprint-component-mapper",`
`3`		`- "version": "4.1.4",`
	`3`	`+ "version": "4.1.6",`
`4`	`4`	`"description": "BlueprintJS React component mapper for Data Driven Forms.",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"module": "esm/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@data-driven-forms/carbon-component-mapper",`
`3`		`- "version": "4.1.4",`
	`3`	`+ "version": "4.1.6",`
`4`	`4`	`"description": "Carbon React component mapper for Data Driven Forms.",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"module": "esm/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@data-driven-forms/common",`
`3`		`- "version": "4.1.4",`
	`3`	`+ "version": "4.1.6",`
`4`	`4`	`"description": "Common components, helpers and other pieces of code for Data Driven Forms",`
`5`	`5`	`"license": "Apache-2.0",`
`6`	`6`	`"main": "index.js",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@data-driven-forms/mui-component-mapper",`
`3`		`- "version": "4.1.4",`
	`3`	`+ "version": "4.1.6",`
`4`	`4`	`"description": "Component mapper for Material ui component mapper form data-driven-forms.",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"module": "esm/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -128,4 +128,4 @@ We welcome any community contribution. Don't be afraid to report bug or to creat`
`128`	`128`
`129`	`129`	`### LICENSE`
`130`	`130`
`131`		`-Apache License 2.0`
	`131`	`+Apache License 2.0`