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

🐛 Use standard filters for languages in the Set Targets step #2045

Merged
merged 10 commits into from
Aug 14, 2024
Merged

🐛 Use standard filters for languages in the Set Targets step #2045

Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5052390
Choose initially selected languages from available providers
rszwajko Aug 2, 2024
703451d
Merge branch 'main' into extraLang
rszwajko Aug 2, 2024
f3d1fa9
Consider success status of queries when pre-selecting providers.
sjd78 Aug 5, 2024
41a6042
Use table hooks to provide target filtering
rszwajko Aug 7, 2024
69efaca
Pre-load setting ui.target.order
rszwajko Aug 8, 2024
39879ca
Merge branch 'main' into extraLang
rszwajko Aug 8, 2024
2022860
Disable paging and use less restrictive breakpoint for compacting fil…
rszwajko Aug 8, 2024
fdab75b
Handle network failures during initial data load
rszwajko Aug 9, 2024
da7785e
Keep stable references for data returned from the hook
rszwajko Aug 9, 2024
ff312e6
Merge branch 'main' into extraLang
rszwajko Aug 14, 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
41 changes: 20 additions & 21 deletions client/src/app/pages/applications/analysis-wizard/set-targets.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import { Application, TagCategory, Target } from "@app/api/models";
import { useFetchTagCategories } from "@app/queries/tags";
import { SimpleSelectCheckbox } from "@app/components/SimpleSelectCheckbox";
import { getUpdatedFormLabels, toggleSelectedTargets } from "./utils";
import { unique } from "radash";

interface SetTargetsProps {
applications: Application[];
Expand Down Expand Up @@ -48,22 +49,23 @@ export const SetTargets: React.FC<SetTargetsProps> = ({ applications }) => {
);
};

const initialProviders = Array.from(
new Set(
applications
.flatMap((app) => app.tags || [])
.map((tag) => {
return {
category: findCategoryForTag(tag.id),
tag,
};
})
.filter((tagWithCat) => tagWithCat?.category?.name === "Language")
.map((tagWithCat) => tagWithCat.tag.name)
)
).filter(Boolean);
const allProviders = targets.flatMap((target) => target.provider);
const languageOptions = Array.from(new Set(allProviders));
rszwajko marked this conversation as resolved.
Show resolved Hide resolved

const [providers, setProviders] = useState(initialProviders);
const initialProviders = unique(
rszwajko marked this conversation as resolved.
Show resolved Hide resolved
applications
.flatMap((app) => app.tags || [])
.map((tag) => {
return {
category: findCategoryForTag(tag.id),
tag,
};
})
.filter((tag) => tag?.category?.name === "Language")
.map((languageTag) => languageTag.tag.name)
).filter((language) => languageOptions.includes(language));

const [selectedProviders, setSelectedProviders] = useState(initialProviders);

const handleOnSelectedCardTargetChange = (selectedLabelName: string) => {
const otherSelectedLabels = formLabels?.filter((formLabel) => {
Expand Down Expand Up @@ -118,16 +120,13 @@ export const SetTargets: React.FC<SetTargetsProps> = ({ applications }) => {
setValue("formLabels", updatedFormLabels);
};

const allProviders = targets.flatMap((target) => target.provider);
const languageOptions = Array.from(new Set(allProviders));

const targetsToRender: Target[] = !targetOrderSetting.isSuccess
? []
: targetOrderSetting.data
.map((targetId) => targets.find((target) => target.id === targetId))
.filter(Boolean)
.filter((target) =>
providers.some((p) => target.provider?.includes(p) ?? false)
selectedProviders.some((p) => target.provider?.includes(p) ?? false)
);

return (
Expand All @@ -145,15 +144,15 @@ export const SetTargets: React.FC<SetTargetsProps> = ({ applications }) => {
<SimpleSelectCheckbox
placeholderText="Filter by language..."
width={300}
value={providers}
value={selectedProviders}
options={languageOptions?.map((language): SelectOptionProps => {
return {
children: <div>{language}</div>,
value: language,
};
})}
onChange={(selection) => {
setProviders(selection as string[]);
setSelectedProviders(selection as string[]);
rszwajko marked this conversation as resolved.
Show resolved Hide resolved
}}
id="filter-by-language"
toggleId="action-select-toggle"
Expand Down
Loading