Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 15 additions & 1 deletion src/app/components/EditorMultiselect.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ type Props<T> = {

type PublicCodeData = PublicCode | PublicCodeWithDeprecatedFields;

function filterValidValues(value: string[] | undefined, data: Array<{ value: string; text: string }>): string[] {
if (!value || !Array.isArray(value)) return [];
const validValues = data.map(item => item.value);
return value.filter(val => validValues.includes(val));
}

export default function EditorMultiselect<
T extends FieldPathByValue<RequiredDeep<PublicCodeData>, Array<string>>
>({ fieldName, required, data, filter, deprecated }: Props<T>): JSX.Element {
Expand All @@ -38,6 +44,14 @@ export default function EditorMultiselect<
});
const { t } = useTranslation();

const filteredValue = filterValidValues(value, data);

useEffect(() => {
if (value && Array.isArray(value) && filteredValue.length !== value.length) {
onChange(filteredValue);
}
}, [value, filteredValue, onChange]);

const label = t(`publiccodeyml.${fieldName}.label`);
const description = t(`publiccodeyml.${fieldName}.description`);
const errorMessage = get(errors, `${fieldName}.message`);
Expand Down Expand Up @@ -82,7 +96,7 @@ export default function EditorMultiselect<
id={fieldName}
onBlur={onBlur}
onChange={(arr) => onChange(arr.map((e) => e.value))}
value={value}
value={filteredValue}
data={data}
dataKey="value"
textField="text"
Expand Down
7 changes: 6 additions & 1 deletion src/app/linter/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,13 @@ import PublicCode, {
defaultPiattaforme,
defaultRiuso,
} from "../contents/publiccode";
import categories from "../contents/categories";
import { removeEmpty } from "./remove-empty";

function validateCategories(categoriesArray: string[]): string[] {
return categoriesArray.filter(category => categories.includes(category as any));
}

function sortDescription({
genericName,
localisedName,
Expand Down Expand Up @@ -79,7 +84,7 @@ export default function linter({
releaseDate,
logo,
platforms: clone(platforms),
categories: clone(categories),
categories: validateCategories(categories) as (typeof categories)[number][],
usedBy: clone(usedBy),
roadmap,
developmentStatus,
Expand Down
Loading