Disable timer for info slides and fix info slide bug

client/src/pages/presentationEditor/components/SlideDisplay.tsx

@@ -59,11 +59,11 @@ const SlideDisplay = ({ variant, activeViewTypeId, currentSlideId }: SlideDispla
     <SlideEditorContainer>
       <SlideEditorContainerRatio>
         <SlideEditorPaper ref={editorPaperRef}>
-          <SlideDisplayText scale={scale}>
+          <SlideDisplayText $scale={scale}>
             {variant === 'editor' && slide?.timer ? `Tid kvar: ${slide?.timer}` : ''}
             {variant === 'presentation' && <Timer />}
           </SlideDisplayText>
-          <SlideDisplayText scale={scale} right>
+          <SlideDisplayText $scale={scale} $right>
             {slide && `Sida: ${slide?.order + 1} / ${totalSlides}`}
           </SlideDisplayText>
           {(competitionBackgroundImage || slideBackgroundImage) && (

client/src/pages/presentationEditor/components/SlideSettings.tsx

@@ -33,7 +33,9 @@ const SlideSettings: React.FC = () => {
       <SettingsList>
         {activeSlide && <SlideType activeSlide={activeSlide} competitionId={competitionId} />}
         <Divider />
-        {activeSlide && <Timer activeSlide={activeSlide} competitionId={competitionId} />}
+        {activeSlide && Boolean(activeSlide.questions[0]) && (
+          <Timer activeSlide={activeSlide} competitionId={competitionId} />
+        )}
       </SettingsList>
 
       {activeSlide?.questions[0] && <QuestionSettings activeSlide={activeSlide} competitionId={competitionId} />}

client/src/pages/presentationEditor/components/slideSettingsComponents/SlideType.tsx

@@ -53,7 +53,6 @@ const SlideType = ({ activeSlide, competitionId }: SlideTypeProps) => {
     closeSlideTypeDialog()
     if (activeSlide) {
       if (activeSlide.questions?.[0] && activeSlide.questions[0].type_id !== selectedSlideType) {
-        deleteQuestionComponent(questionComponentId)
         if (selectedSlideType === 0) {
           // Change slide type from a question type to information
           await axios
@@ -78,13 +77,13 @@ const SlideType = ({ activeSlide, competitionId }: SlideTypeProps) => {
               total_score: 0,
               type_id: selectedSlideType,
             })
-            .then(() => {
+            .then(({ data }) => {
               dispatch(getEditorCompetition(competitionId))
-              removeQuestionComponent().then(() => createQuestionComponent())
+              removeQuestionComponent().then(() => createQuestionComponent(data.id))
             })
             .catch(console.log)
         }
-      } else if (activeSlide.questions[0].type_id === 0 && selectedSlideType !== 0) {
+      } else if (!activeSlide.questions[0] && selectedSlideType !== 0) {
         // Change slide type from information to a question type
         await axios
           .post(`/api/competitions/${competitionId}/slides/${activeSlide.id}/questions`, {
@@ -92,16 +91,16 @@ const SlideType = ({ activeSlide, competitionId }: SlideTypeProps) => {
             total_score: 0,
             type_id: selectedSlideType,
           })
-          .then(() => {
+          .then(({ data }) => {
             dispatch(getEditorCompetition(competitionId))
-            createQuestionComponent()
+            createQuestionComponent(data.id)
           })
           .catch(console.log)
       }
     }
   }
 
-  const createQuestionComponent = async () => {
+  const createQuestionComponent = async (question_id: number) => {
     await axios
       .post(`/api/competitions/${competitionId}/slides/${activeSlide.id}/components`, {
         x: 0,
@@ -110,7 +109,7 @@ const SlideType = ({ activeSlide, competitionId }: SlideTypeProps) => {
         h: 250,
         type_id: 3,
         view_type_id: 1,
-        question_id: activeSlide.questions[0].id,
+        question_id,
       })
       .then(() => {
         dispatch(getEditorCompetition(competitionId))
@@ -127,14 +126,6 @@ const SlideType = ({ activeSlide, competitionId }: SlideTypeProps) => {
     }
   }
 
-  const deleteQuestionComponent = (componentId: number | undefined) => {
-    if (componentId) {
-      axios
-        .delete(`/api/competitions/${competitionId}/slides/${activeSlide.id}/components/${componentId}`)
-        .catch(console.log)
-    }
-  }
-
   return (
     <FirstItem>
       <ListItem>

client/src/pages/presentationEditor/components/styled.tsx

@@ -147,14 +147,14 @@ export const SettingsItemContainer = styled.div`
 `
 
 interface SlideDisplayTextProps {
-  scale: number
-  right?: boolean
+  $scale: number
+  $right?: boolean
 }
 
 export const SlideDisplayText = styled(Typography)<SlideDisplayTextProps>`
   position: absolute;
   top: 5px;
-  left: ${(props) => (props.right ? undefined : 5)}px;
-  right: ${(props) => (props.right ? 5 : undefined)}px;
-  font-size: ${(props) => 24 * props.scale}px;
+  left: ${(props) => (props.$right ? undefined : 5)}px;
+  right: ${(props) => (props.$right ? 5 : undefined)}px;
+  font-size: ${(props) => 24 * props.$scale}px;
 `