Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

✨ Fix Divergent Branch Issue and Update Default Mode Logic #2106

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

✨ Fix Divergent Branch Issue and Update Default Mode Logic #2106

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
47fdc9a
Change-the-default-mode
yael-spinner Sep 22, 2024
9a1e1fe
finish change the default mode
yael-spinner Oct 8, 2024
fcd823f
successful change the default mode
yael-spinner Oct 9, 2024
ed501e1
Merge branch 'main' into s_y_change_deafault_mode
yael-spinner Oct 9, 2024
ab92d33
Final update to default mode
yael-spinner Oct 10, 2024
84fd2cb
Merge branch 's_y_change_deafault_mode' of https://github.com/yael-sp…
yael-spinner Oct 10, 2024
cb65e37
Final update on default mode change before upload
yael-spinner Oct 27, 2024
4b7eecf
Arrange the notes on the change default mode
shirael Oct 31, 2024
3b430cc
Merge pull request #1 from shirael/s_y_change_deafault_mode
yael-spinner Oct 31, 2024
78957e2
Merge branch 'main' into s_y_change_deafault_mode
rszwajko Oct 31, 2024
f549ed7
Completely final update by changing the default state before uploading
yael-spinner Nov 2, 2024
6bc2259
Merge branch 'main' into s_y_change_deafault_mode
rszwajko Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion client/src/app/pages/applications/analysis-wizard/analysis-wizard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,28 @@ interface IAnalysisWizard {
isOpen: boolean;
}

const determineMode = (
applications: Application[]
):
| "binary"
| "source-code-deps"
| "source-code"
| "binary-upload"
| undefined => {
if (applications.length === 0) return undefined;
const modes = applications.map((app) => {
const { repository, binary } = app;
return repository || (repository && binary)
? "source-code-deps"
: binary && binary !== ""
? "binary"
: undefined;
});
const firstMode = modes[0];
rszwajko marked this conversation as resolved.
Show resolved Hide resolved
const allSame = modes.every((mode) => mode === firstMode);
return allSame ? firstMode : undefined;
};

const defaultTaskData: TaskData = {
tagger: {
enabled: true,
Expand Down Expand Up @@ -163,7 +185,7 @@ export const AnalysisWizard: React.FC<IAnalysisWizard> = ({
const methods = useForm<AnalysisWizardFormValues>({
defaultValues: {
artifact: null,
mode: "source-code-deps",
mode: determineMode(applications) ?? "source-code-deps",
formLabels: [],
selectedTargets: [],
// defaults will be passed as initialFilterValues to the table hook
rszwajko marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
1 change: 1 addition & 0 deletions client/src/app/pages/applications/applications-table/applications-table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1060,6 +1060,7 @@ export const ApplicationsTable: React.FC = () => {

<TaskGroupProvider>
<AnalysisWizard
key={selectedRows.map(({ name }) => name).join()}
applications={selectedRows}
isOpen={isAnalyzeModalOpen}
onClose={() => {
Expand Down
Loading