Merge remote-tracking branch 'origin/main' into dev

Shelf-nu · Jul 24, 2024 · c958eb7 · c958eb7
2 parents 97e85d2 + 8441842
commit c958eb7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/app/components/table.tsx b/app/components/table.tsx
@@ -21,7 +21,7 @@ export function Th({
   className,
   colSpan,
 }: {
-  children: React.ReactNode;
+  children?: React.ReactNode;
   className?: string;
   colSpan?: number;
 }) {

diff --git a/app/routes/_layout+/bookings.tsx b/app/routes/_layout+/bookings.tsx
@@ -209,8 +209,9 @@ export default function BookingsIndexPage({
           className="overflow-x-visible md:overflow-x-auto"
           headerChildren={
             <>
+              <Th className="hidden md:table-cell" />
               <Th className="hidden md:table-cell">Description</Th>
-              <Th className="hidden md:table-cell"> </Th>
+
               <Th className="hidden md:table-cell">From</Th>
               <Th className="hidden md:table-cell">To</Th>
               <Th className="hidden md:table-cell">Custodian</Th>
@@ -296,10 +297,6 @@ const ListAssetContent = ({
         </div>
       </Td>
 
-      <Td className="hidden md:table-cell">
-        {item.description ? <LineBreakText text={item.description} /> : null}
-      </Td>
-
       {/**
        * Optional label when the booking includes assets that are either:
        * 1. Marked as not available for boooking
@@ -318,6 +315,10 @@ const ListAssetContent = ({
         ) : null}
       </Td>
 
+      <Td className="hidden md:table-cell">
+        {item.description ? <LineBreakText text={item.description} /> : null}
+      </Td>
+
       {/* From */}
       <Td className="hidden md:table-cell">
         {item.displayFrom ? (