Skip to content

Commit

Permalink
🐛 Remove DIVA support
Browse files Browse the repository at this point in the history
Signed-off-by: ibolton336 <[email protected]>
  • Loading branch information
ibolton336 committed Dec 1, 2023
1 parent d2ea8c1 commit 01b8d26
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 22 deletions.
1 change: 0 additions & 1 deletion client/src/app/api/models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,6 @@ export interface TaskData {
binary: boolean;
withDeps: boolean;
artifact: string;
diva: boolean;
csv?: boolean;
};
targets?: string[];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ const defaultTaskData: TaskData = {
binary: false,
withDeps: false,
artifact: "",
diva: false,
},
targets: [],
sources: [],
Expand Down Expand Up @@ -171,7 +170,6 @@ export const AnalysisWizard: React.FC<IAnalysisWizard> = ({
excludedPackages: [],
customRulesFiles: [],
excludedRulesTags: [],
diva: false,
hasExcludedPackages: false,
associatedCredentials: "",
rulesKind: "manual",
Expand Down Expand Up @@ -238,7 +236,6 @@ export const AnalysisWizard: React.FC<IAnalysisWizard> = ({
artifact: fieldValues.artifact?.name
? `/binary/${fieldValues.artifact.name}`
: "",
diva: fieldValues.diva,
},
scope: {
withKnownLibs: fieldValues.withKnownLibs.includes("oss")
Expand Down
4 changes: 0 additions & 4 deletions client/src/app/pages/applications/analysis-wizard/review.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ export const Review: React.FC<IReview> = ({ applications, mode }) => {
excludedPackages,
customRulesFiles,
excludedRulesTags,
diva,
autoTaggingEnabled,
} = watch();

Expand Down Expand Up @@ -197,9 +196,6 @@ export const Review: React.FC<IReview> = ({ applications, mode }) => {
<DescriptionListTerm>
{t("wizard.terms.transactionReport")}
</DescriptionListTerm>
<DescriptionListDescription id="diva">
{diva ? t("wizard.terms.enabled") : t("wizard.terms.disabled")}
</DescriptionListDescription>
</DescriptionListGroup>{" "}
<DescriptionListGroup>
<DescriptionListTerm>
Expand Down
2 changes: 0 additions & 2 deletions client/src/app/pages/applications/analysis-wizard/schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,6 @@ const useCustomRulesStepSchema = (): yup.SchemaOf<CustomRulesStepValues> => {
};

export interface OptionsStepValues {
diva: boolean;
excludedRulesTags: string[];
autoTaggingEnabled: boolean;
selectedSourceLabels: TargetLabel[];
Expand All @@ -164,7 +163,6 @@ export interface OptionsStepValues {
const useOptionsStepSchema = (): yup.SchemaOf<OptionsStepValues> => {
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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export const SetOptions: React.FC = () => {
const { watch, control, setValue } =
useFormContext<AnalysisWizardFormValues>();

const { formLabels, diva, excludedRulesTags, autoTaggingEnabled } = watch();
const { formLabels, excludedRulesTags, autoTaggingEnabled } = watch();

Check warning on line 35 in client/src/app/pages/applications/analysis-wizard/set-options.tsx

View check run for this annotation

Codecov / codecov/patch

client/src/app/pages/applications/analysis-wizard/set-options.tsx#L35

Added line #L35 was not covered by tests

const [isSelectTargetsOpen, setSelectTargetsOpen] = React.useState(false);
const [isSelectSourcesOpen, setSelectSourcesOpen] = React.useState(false);
Expand Down Expand Up @@ -244,16 +244,6 @@ export const SetOptions: React.FC = () => {
removeItemButtonId={(tag) => `remove-${tag}-from-excluded-rules-tags`}
className={spacing.mtMd}
/>
<Checkbox
className={spacing.mtMd}
label={t("wizard.composed.enable", {
what: t("wizard.terms.transactionReport").toLowerCase(),
})}
isChecked={diva}
onChange={() => setValue("diva", !diva)}
id="enable-transaction-report-checkbox"
name="enableTransactionReport"
/>
<Checkbox
className={spacing.mtMd}
label={t("wizard.composed.enable", {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -875,7 +875,7 @@ export const ApplicationsTable: React.FC = () => {
const hasAssessedArchetype = applicationArchetypes?.some(
(archetype) => !!archetype?.assessments?.length
);
console.log("hasassessed", hasAssessedArchetype);

return (
<Tr
key={application.name}
Expand Down

0 comments on commit 01b8d26

Please sign in to comment.