Merge pull request #1060 from rowyio/fix/undefined-some-function

null checking on .some functions
This commit is contained in:
Shams
2023-01-09 13:21:26 +01:00
committed by GitHub
7 changed files with 9 additions and 7 deletions

View File

@@ -48,7 +48,7 @@ export const tablesAtom = atom<TableSettings[]>((get) => {
return sortBy(tables, "name")
.filter((table) =>
userRoles.includes("ADMIN") || Array.isArray(table.roles)
? table.roles.some((role) => userRoles.includes(role))
? table.roles?.some((role) => userRoles.includes(role))
: false
)
.map((table) => ({

View File

@@ -72,7 +72,7 @@ export default function ImportAirtableWizard({ onClose }: ITableModalProps) {
const newColumns = uniqBy(
[...prev.newColumns, ...(value.newColumns ?? [])],
"key"
).filter((col) => pairs.some((pair) => pair.columnKey === col.key));
).filter((col) => pairs?.some((pair) => pair.columnKey === col.key));
return { ...prev, pairs, newColumns };
});
}, []);

View File

@@ -80,7 +80,7 @@ export default function ImportCsvWizard({ onClose }: ITableModalProps) {
const newColumns = uniqBy(
[...prev.newColumns, ...(value.newColumns ?? [])],
"key"
).filter((col) => pairs.some((pair) => pair.columnKey === col.key));
).filter((col) => pairs?.some((pair) => pair.columnKey === col.key));
return { ...prev, pairs, newColumns };
});

View File

@@ -44,7 +44,7 @@ function StepComponent({ setComplete }: ITableTutorialStepComponentProps) {
const [tableColumnsOrdered] = useAtom(tableColumnsOrderedAtom, tableScope);
useEffect(() => {
if (
tableColumnsOrdered.some(
tableColumnsOrdered?.some(
(c) =>
c.type === FieldType.rating && c.name.toLowerCase().includes("rating")
)

View File

@@ -127,7 +127,9 @@ export default function PopupContents({
<Grid item xs>
<List sx={{ overflowY: "auto" }}>
{hits.map((hit) => {
const isSelected = selectedValues.some((v) => v === hit[elementId]);
const isSelected = selectedValues?.some(
(v) => v === hit[elementId]
);
return (
<MenuItem
key={get(hit, elementId)}

View File

@@ -175,7 +175,7 @@ const getDocRef = <T>(
path: string | undefined,
pathSegments?: Array<string | undefined>
) => {
if (!path || (Array.isArray(pathSegments) && pathSegments.some((x) => !x)))
if (!path || (Array.isArray(pathSegments) && pathSegments?.some((x) => !x)))
return null;
return doc(

View File

@@ -84,7 +84,7 @@ export function useTableFunctions() {
if (
checked &&
// Make sure we dont have
!Object.values(columns).some((column) => column.type === type)
!Object.values(columns)?.some((column) => column.type === type)
)
columns["_" + camelCase(type)] = {
type,