Merge branch 'master' into dm/themes

cesium · Sep 10, 2024 · 8b897a8 · 8b897a8
2 parents 6f6cf70 + a9fff93
commit 8b897a8
Show file tree

Hide file tree

Showing 12 changed files with 1,729 additions and 4,376 deletions.
diff --git a/.github/workflows/trello.yml b/.github/workflows/trello.yml
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,3 @@
-venv
-
 # Logs
 logs
 *.log
@@ -45,3 +43,6 @@ jspm_packages
 # local env files
 .env.*
 !.env.*.sample
+
+# venv
+*venv
diff --git a/components/FilterBlock/FilterBlock.tsx b/components/FilterBlock/FilterBlock.tsx
@@ -203,8 +203,7 @@ const FilterBlock = ({
   }) => {
     return (
       <>
-        {shifts &&
-          shifts.length > 0 &&
+        {shifts && shifts.length > 0 ? (
           shifts.map((item) => (
             <Fragment key={id.toString() + item + "Checkbox"}>
               <div>
@@ -217,7 +216,10 @@ const FilterBlock = ({
                 </Checkbox>
               </div>
             </Fragment>
-          ))}
+          ))
+        ) : (
+          <p className="text-neutral-400">Information not available.</p>
+        )}
       </>
     );
   };
@@ -317,7 +319,7 @@ const FilterBlock = ({
                           >
                             {checkBoxes[index1 * layer2.length + index2] &&
                             checkBoxes[index1 * layer2.length + index2].some(
-                              (item) => item.shifts
+                              (item) => item.shifts && item.shifts.length > 0
                             ) ? (
                               <>
                                 {checkBoxes[
@@ -341,6 +343,12 @@ const FilterBlock = ({
                                   </Fragment>
                                 ))}
                               </>
+                            ) : checkBoxes[
+                                index1 * layer2.length + index2
+                              ].some((item) => item.shifts) ? (
+                              <p className="text-neutral-400">
+                                Information not available.
+                              </p>
                             ) : (
                               <>
                                 <SelectAll