diff --git a/client/src/app/pages/assessment/assessment-page.tsx b/client/src/app/pages/assessment/assessment-page.tsx
index 34e21014b0..e834e4f158 100644
--- a/client/src/app/pages/assessment/assessment-page.tsx
+++ b/client/src/app/pages/assessment/assessment-page.tsx
@@ -64,6 +64,7 @@ const AssessmentPage: React.FC = () => {
>
diff --git a/client/src/app/pages/assessment/components/assessment-actions/components/dynamic-assessment-actions-row.tsx b/client/src/app/pages/assessment/components/assessment-actions/components/dynamic-assessment-actions-row.tsx
index 7de7175663..e7651c7a05 100644
--- a/client/src/app/pages/assessment/components/assessment-actions/components/dynamic-assessment-actions-row.tsx
+++ b/client/src/app/pages/assessment/components/assessment-actions/components/dynamic-assessment-actions-row.tsx
@@ -187,16 +187,6 @@ const DynamicAssessmentActionsRow: FunctionComponent<
}).then(() => {
createAssessment();
});
- history.push(
- formatPath(
- isArchetype
- ? Paths.archetypesAssessment
- : Paths.applicationsAssessment,
- {
- assessmentId: assessment?.id,
- }
- )
- );
} catch (error) {
pushNotification({
title: t("terms.error"),
diff --git a/client/src/app/pages/assessment/components/assessment-wizard/assessment-wizard.tsx b/client/src/app/pages/assessment/components/assessment-wizard/assessment-wizard.tsx
index 077befeb83..75809c0ed0 100644
--- a/client/src/app/pages/assessment/components/assessment-wizard/assessment-wizard.tsx
+++ b/client/src/app/pages/assessment/components/assessment-wizard/assessment-wizard.tsx
@@ -4,6 +4,7 @@ import { useTranslation } from "react-i18next";
import { useHistory } from "react-router-dom";
import { FieldErrors, FormProvider, useForm } from "react-hook-form";
import {
+ Alert,
ButtonVariant,
Spinner,
Wizard,
@@ -42,6 +43,7 @@ import useIsArchetype from "@app/hooks/useIsArchetype";
import { useFetchStakeholderGroups } from "@app/queries/stakeholdergoups";
import { useFetchStakeholders } from "@app/queries/stakeholders";
import { WizardStepNavDescription } from "../wizard-step-nav-description";
+import spacing from "@patternfly/react-styles/css/utilities/Spacing/spacing";
export const SAVE_ACTION_KEY = "saveAction";
@@ -66,11 +68,13 @@ export interface AssessmentWizardValues {
export interface AssessmentWizardProps {
assessment?: Assessment;
isLoadingAssessment: boolean;
+ fetchError?: AxiosError | null;
}
export const AssessmentWizard: React.FC = ({
assessment,
isLoadingAssessment,
+ fetchError,
}) => {
const isArchetype = useIsArchetype();
const queryClient = useQueryClient();
@@ -586,6 +590,14 @@ export const AssessmentWizard: React.FC = ({
return (
<>
+ {fetchError && (
+
+ )}
{isLoadingAssessment ? (
) : (