fix: Fix time table not showing up in some cases

suzuka-kosen-festa · Oct 28, 2022 · b29c267 · b29c267
1 parent 7055665
commit b29c267
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 3 deletions.
diff --git a/src/components/molecules/time-table-row/__snapshots__/time-table-row.test.tsx.snap b/src/components/molecules/time-table-row/__snapshots__/time-table-row.test.tsx.snap
@@ -162,6 +162,7 @@ exports[`(components) molecules/time-table-row > take snap shot 1`] = `
         EXBALLON
       </p>
     </li>
+    <div />
   </ul>
 </div>
 `;
diff --git a/src/components/molecules/time-table-row/index.tsx b/src/components/molecules/time-table-row/index.tsx
@@ -17,7 +17,19 @@ const TimeTableRow: FC<TimeTableRowProperties> = ({ events, intervals, stage })
         return dayjs(event.start_time).format("HH:mm") === "09:00" ? arr.push(event) : arr.push("gap", event);
       }
       if (i === a.length - 1) {
-        return dayjs(event.end_time).format("HH:mm") === "16:00" ? arr.push(event) : arr.push("gap", event);
+        /* eslint-disable no-nested-ternary */
+        return dayjs(a[i - 1].end_time).format("HH:mm") === dayjs(a[i].start_time).format("HH:mm") &&
+          dayjs(event.end_time).format("HH:mm") === "16:00"
+          ? arr.push(event)
+          : dayjs(a[i - 1].end_time).format("HH:mm") === dayjs(a[i].start_time).format("HH:mm")
+          ? arr.push(event, "gap")
+          : dayjs(event.end_time).format("HH:mm") === "16:00"
+          ? arr.push("gap", event)
+          : arr.push("gap", event, "gap");
+        /* eslint-enable no-nested-ternary */
+      }
+      if (i === a.length - 1) {
+        return dayjs(event.end_time).format("HH:mm") === "16:00" ? arr.push(event) : arr.push(event, "gap");
       }
       return dayjs(a[i - 1].end_time).format("HH:mm") === dayjs(a[i].start_time).format("HH:mm")
         ? arr.push(event)

diff --git a/src/components/organisms/access-section/__snapshots__/access-section.test.tsx.snap b/src/components/organisms/access-section/__snapshots__/access-section.test.tsx.snap
@@ -29,7 +29,7 @@ exports[`(components) organisms/access-section > take snap shot 1`] = `
         loading="lazy"
         referrerpolicy="no-referrer-when-downgrade"
         role="document"
-        src="https://www.google.com/maps/embed/v1/view?key=&center=34.85167124241317%2C136.58132309784355&zoom=15"
+        src="https://www.google.com/maps/embed/v1/view?key=AIzaSyCk9WMilIT2wiBMqcn1YZQKJz5Lzy9ipQg&center=34.85167124241317%2C136.58132309784355&zoom=15"
         title="鈴鹿工業高等専門学校の地図"
       />
     </div>

diff --git a/src/components/organisms/time-table/__snapshots__/time-table.test.tsx.snap b/src/components/organisms/time-table/__snapshots__/time-table.test.tsx.snap
@@ -228,6 +228,7 @@ exports[`(components) organisms/time-table > take snap shot 1`] = `
             EXBALLON
           </p>
         </li>
+        <div />
       </ul>
     </section>
     <section
@@ -349,6 +350,7 @@ exports[`(components) organisms/time-table > take snap shot 1`] = `
             出張Radio
           </p>
         </li>
+        <div />
       </ul>
     </section>
     <section
@@ -452,6 +454,7 @@ exports[`(components) organisms/time-table > take snap shot 1`] = `
             あどばん
           </p>
         </li>
+        <div />
       </ul>
     </section>
     <section

diff --git a/src/components/templates/time-table/__snapshots__/time-table.test.tsx.snap b/src/components/templates/time-table/__snapshots__/time-table.test.tsx.snap
@@ -276,6 +276,7 @@ exports[`(components) templates/time-table > take snap shot 1`] = `
                 EXBALLON
               </p>
             </li>
+            <div />
           </ul>
         </section>
         <section
@@ -397,6 +398,7 @@ exports[`(components) templates/time-table > take snap shot 1`] = `
                 出張Radio
               </p>
             </li>
+            <div />
           </ul>
         </section>
         <section
@@ -500,6 +502,7 @@ exports[`(components) templates/time-table > take snap shot 1`] = `
                 あどばん
               </p>
             </li>
+            <div />
           </ul>
         </section>
         <section

diff --git a/src/components/templates/top/__snapshots__/top.test.tsx.snap b/src/components/templates/top/__snapshots__/top.test.tsx.snap
@@ -558,7 +558,7 @@ exports[`(components) templates/top > take snap shot 1`] = `
           loading="lazy"
           referrerpolicy="no-referrer-when-downgrade"
           role="document"
-          src="https://www.google.com/maps/embed/v1/view?key=&center=34.85167124241317%2C136.58132309784355&zoom=15"
+          src="https://www.google.com/maps/embed/v1/view?key=AIzaSyCk9WMilIT2wiBMqcn1YZQKJz5Lzy9ipQg&center=34.85167124241317%2C136.58132309784355&zoom=15"
           title="鈴鹿工業高等専門学校の地図"
         />
       </div>