diff --git a/client/src/app/api/models.ts b/client/src/app/api/models.ts index aaf47dc38..3cae716d6 100644 --- a/client/src/app/api/models.ts +++ b/client/src/app/api/models.ts @@ -328,7 +328,6 @@ export interface TaskData { binary: boolean; withDeps: boolean; artifact: string; - diva: boolean; csv?: boolean; }; targets?: string[]; diff --git a/client/src/app/pages/applications/analysis-wizard/analysis-wizard.tsx b/client/src/app/pages/applications/analysis-wizard/analysis-wizard.tsx index 02399a22b..a72942bea 100644 --- a/client/src/app/pages/applications/analysis-wizard/analysis-wizard.tsx +++ b/client/src/app/pages/applications/analysis-wizard/analysis-wizard.tsx @@ -57,7 +57,6 @@ const defaultTaskData: TaskData = { binary: false, withDeps: false, artifact: "", - diva: false, }, targets: [], sources: [], @@ -171,7 +170,6 @@ export const AnalysisWizard: React.FC = ({ excludedPackages: [], customRulesFiles: [], excludedRulesTags: [], - diva: false, hasExcludedPackages: false, associatedCredentials: "", rulesKind: "manual", @@ -238,7 +236,6 @@ export const AnalysisWizard: React.FC = ({ artifact: fieldValues.artifact?.name ? `/binary/${fieldValues.artifact.name}` : "", - diva: fieldValues.diva, }, scope: { withKnownLibs: fieldValues.withKnownLibs.includes("oss") diff --git a/client/src/app/pages/applications/analysis-wizard/review.tsx b/client/src/app/pages/applications/analysis-wizard/review.tsx index 61202775d..0adb0cd4d 100644 --- a/client/src/app/pages/applications/analysis-wizard/review.tsx +++ b/client/src/app/pages/applications/analysis-wizard/review.tsx @@ -50,7 +50,6 @@ export const Review: React.FC = ({ applications, mode }) => { excludedPackages, customRulesFiles, excludedRulesTags, - diva, autoTaggingEnabled, } = watch(); @@ -197,9 +196,6 @@ export const Review: React.FC = ({ applications, mode }) => { {t("wizard.terms.transactionReport")} - - {diva ? t("wizard.terms.enabled") : t("wizard.terms.disabled")} - {" "} diff --git a/client/src/app/pages/applications/analysis-wizard/schema.ts b/client/src/app/pages/applications/analysis-wizard/schema.ts index 8ce5a5409..d9fa9c38d 100644 --- a/client/src/app/pages/applications/analysis-wizard/schema.ts +++ b/client/src/app/pages/applications/analysis-wizard/schema.ts @@ -155,7 +155,6 @@ const useCustomRulesStepSchema = (): yup.SchemaOf => { }; export interface OptionsStepValues { - diva: boolean; excludedRulesTags: string[]; autoTaggingEnabled: boolean; selectedSourceLabels: TargetLabel[]; @@ -164,7 +163,6 @@ export interface OptionsStepValues { const useOptionsStepSchema = (): yup.SchemaOf => { const { t } = useTranslation(); return yup.object({ - diva: yup.bool().defined(), excludedRulesTags: yup.array().of(yup.string().defined()), autoTaggingEnabled: yup.bool().defined(), selectedSourceLabels: yup.array().of( diff --git a/client/src/app/pages/applications/analysis-wizard/set-options.tsx b/client/src/app/pages/applications/analysis-wizard/set-options.tsx index c0a216570..66310ba0d 100644 --- a/client/src/app/pages/applications/analysis-wizard/set-options.tsx +++ b/client/src/app/pages/applications/analysis-wizard/set-options.tsx @@ -32,7 +32,7 @@ export const SetOptions: React.FC = () => { const { watch, control, setValue } = useFormContext(); - const { formLabels, diva, excludedRulesTags, autoTaggingEnabled } = watch(); + const { formLabels, excludedRulesTags, autoTaggingEnabled } = watch(); const [isSelectTargetsOpen, setSelectTargetsOpen] = React.useState(false); const [isSelectSourcesOpen, setSelectSourcesOpen] = React.useState(false); @@ -244,16 +244,6 @@ export const SetOptions: React.FC = () => { removeItemButtonId={(tag) => `remove-${tag}-from-excluded-rules-tags`} className={spacing.mtMd} /> - setValue("diva", !diva)} - id="enable-transaction-report-checkbox" - name="enableTransactionReport" - /> { const hasAssessedArchetype = applicationArchetypes?.some( (archetype) => !!archetype?.assessments?.length ); - console.log("hasassessed", hasAssessedArchetype); + return (