Fix typescript errors

StanfordBDHG · Jan 20, 2025 · ef70d7b · ef70d7b
1 parent c35d015
commit ef70d7b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/src/components/AnchorMenu/AnchorMenu.tsx b/src/components/AnchorMenu/AnchorMenu.tsx
@@ -1,5 +1,5 @@
 import './AnchorMenu.css';
-import { DndProvider, useDrag } from 'react-dnd';
+import { DndProvider, useDrag, DndProviderProps } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
 
 import React from 'react';
@@ -172,7 +172,7 @@ const AnchorMenu = (props: AnchorMenuProps): JSX.Element => {
 
     const orderTreeData = mapToTreeData(props.qOrder, '');
     return (
-        <DndProvider backend={HTML5Backend}>
+        <DndProvider backend={HTML5Backend} {...({} as any)}>
             <div className="questionnaire-overview">
                 <div className="questionnaire-overview__toolbox">
                     {createTypeComponent(IQuestionnaireItemType.display, t('Instruction'))}

diff --git a/src/components/PredefinedValueSetModal/PredefinedValueSetModal.tsx b/src/components/PredefinedValueSetModal/PredefinedValueSetModal.tsx
@@ -76,17 +76,18 @@ const PredefinedValueSetModal = (props: Props): JSX.Element => {
 
     const removeElement = (id?: string) => {
         const compose = { ...newValueSet.compose };
-        const conceptToDelete = compose.include[0].concept?.findIndex((x) => x && x.id === id);
+
+        const conceptToDelete = compose.include?.[0].concept?.findIndex((x) => x && x.id === id);
         if (conceptToDelete || conceptToDelete === 0) {
-            compose.include[0].concept?.splice(conceptToDelete, 1);
+            compose.include?.[0].concept?.splice(conceptToDelete, 1);
         }
 
         setNewValueSet({ ...newValueSet });
     };
 
     const handleConceptItem = (value: string, updateField: 'code' | 'display', id?: string) => {
         const compose = { ...newValueSet.compose };
-        const item = compose.include[0]?.concept?.find((x) => x && x.id === id);
+        const item = compose.include?.[0]?.concept?.find((x) => x && x.id === id);
 
         if (item) {
             item[updateField] = value;
@@ -139,16 +140,21 @@ const PredefinedValueSetModal = (props: Props): JSX.Element => {
         const toIndex = result.destination.index;
 
         const compose = { ...newValueSet.compose };
-        const itemToMove = compose.include[0].concept?.splice(fromIndex, 1);
+        const itemToMove = compose.include?.[0].concept?.splice(fromIndex, 1);
 
         if (fromIndex !== toIndex && itemToMove) {
-            compose.include[0].concept?.splice(toIndex, 0, itemToMove[0]);
+            compose.include?.[0].concept?.splice(toIndex, 0, itemToMove[0]);
             setNewValueSet({ ...newValueSet });
         }
     };
 
     const handleSystem = (value: string) => {
         const compose = { ...newValueSet.compose };
+
+        if(!compose.include) {
+            return;
+        }
+
         compose.include[0].system = value;
         setNewValueSet({ ...newValueSet });
     };