Skip to content

Commit ff9a46f

Browse files
committed
feat: Always allow external dev foss dd
1 parent 775bc5c commit ff9a46f

2 files changed

Lines changed: 10 additions & 3 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ const {t} = useI18n();
5454
</v-alert>
5555
</section>
5656

57-
<section v-if="props.noFOSS && props.fossVersion === 'legacy'">
57+
<section v-if="props.noFOSS">
5858
<v-alert color="warning" type="warning">
5959
{{ t('NO_FOSS_MESSAGE') }}
6060
</v-alert>

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@ const markedApprovableSpdx = computed(() => projectModel.value.approvablespdx);
8080
8181
const noSbomSelected = computed(() => !projectModel.value.isGroup && selectedSbom.value === null);
8282
83+
const effectiveNoFOSS = computed(
84+
() => noFOSS.value || (!vehicle.value && !projectModel.value.isGroup && !selectedSbom.value),
85+
);
86+
8387
const getChannelSboms = (versionKey: string): SpdxFile[] => {
8488
const versionEntry = sbomStore.getAllSBOMs.find((entry) => entry.versionKey === versionKey);
8589
return (versionEntry?.spdxFileHistory ?? []).map((sbom, index) => ({...sbom, isRecent: index === 0}));
@@ -291,6 +295,10 @@ const doDialogAction = async () => {
291295
}
292296
metaDoc.c6 = noFOSS.value;
293297
298+
if (!vehicle.value && !projectModel.value.isGroup && !selectedSbom.value) {
299+
metaDoc.c6 = true;
300+
}
301+
294302
let determinedFossVersion: 'default' | 'legacy' | 'vehicle-legacy';
295303
296304
if (config.useFutureFoss && !vehicle.value) {
@@ -399,7 +407,7 @@ defineExpose({open});
399407
:is-rd-confirmation-missing="isRdConfirmationMissing"
400408
:is-enterprise-or-mobile-or-other="isEnterpriseOrMobileOrOther"
401409
:mixed-f-o-s-s="mixedFOSS"
402-
:no-f-o-s-s="noFOSS"
410+
:no-f-o-s-s="effectiveNoFOSS"
403411
:foss-version="fossVersion"
404412
:selected-projects-contain-empty-sbom="selectedProjectsContainEmptySbom" />
405413

@@ -468,7 +476,6 @@ defineExpose({open});
468476
v-if="!isDeniedOrUnasserted"
469477
size="small"
470478
variant="flat"
471-
:disabled="noSbomSelected && !noFOSS"
472479
@click="doDialogAction"
473480
:text="t('BTN_GENERATE_FOSS_DD')" />
474481

0 commit comments

Comments
 (0)