Skip to content

Commit 2e43c53

Browse files
authored
feat: Update foss dd process (#214)
1 parent 2c7ca3a commit 2e43c53

3 files changed

Lines changed: 9 additions & 2 deletions

File tree

frontend/apps/portal/.env.local

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ VITE_OAUTH_LOGOUT=/api/v1/oauth/logout
44
VITE_PUBLIC_API_ENDPOINT=https://localhost:3333/api/public/v1
55
VITE_PUBLIC_UI_URL=https://localhost:3000/cli
66
VITE_USE_NEW_WIZARD=true
7-
VITE_USE_FUTURE_FOSS=false
8-
VITE_USE_FUTURE_PRODUCT=false
7+
VITE_USE_FUTURE_FOSS=true
8+
VITE_USE_FUTURE_PRODUCT=true
99
VITE_USE_FUTURE_IT=true
1010
VITE_PERSONAL_ACCESS_TOKEN=true
1111
VITE_USE_REFACTORED_APPROVAL=true
12+

frontend/libs/portal/components/approval/SbomChannelSelector.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ const {isAudited} = useApprovalCheck();
3636
:items="props.channels"
3737
:disabled="props.noFOSS"
3838
hide-details
39+
clearable
3940
autocomplete="off" />
4041
<v-autocomplete
4142
v-model="selectedSbom"
@@ -44,6 +45,7 @@ const {isAudited} = useApprovalCheck();
4445
item-title="name"
4546
:label="t('SELECT_SBOM_DELIVERY')"
4647
hide-details
48+
clearable
4749
autocomplete="off"
4850
:items="props.sboms">
4951
<template v-slot:item="{item, props: itemProps}">

frontend/libs/portal/components/dialog/project/RequestFOSSDDV2.vue

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ const {
7878
7979
const markedApprovableSpdx = computed(() => projectModel.value.approvablespdx);
8080
81+
const noSbomSelected = computed(() => !projectModel.value.isGroup && selectedSbom.value === null);
82+
8183
const getChannelSboms = (versionKey: string): SpdxFile[] => {
8284
const versionEntry = sbomStore.getAllSBOMs.find((entry) => entry.versionKey === versionKey);
8385
return (versionEntry?.spdxFileHistory ?? []).map((sbom, index) => ({...sbom, isRecent: index === 0}));
@@ -442,6 +444,7 @@ defineExpose({open});
442444
:c3="c3"
443445
:c4="c4"
444446
:c5="c5"
447+
@update:noFOSS="noFOSS = $event"
445448
@update:c1="c1 = $event"
446449
@update:c2="c2 = $event"
447450
@update:c3="c3 = $event"
@@ -465,6 +468,7 @@ defineExpose({open});
465468
v-if="!isDeniedOrUnasserted"
466469
size="small"
467470
variant="flat"
471+
:disabled="noSbomSelected && !noFOSS"
468472
@click="doDialogAction"
469473
:text="t('BTN_GENERATE_FOSS_DD')" />
470474

0 commit comments

Comments
 (0)