Merge pull request #1548 from Shelf-nu/1545-bug-safari-dashboard-ui-bug

fix: 1545-bug-safari-dashboard-ui-bug
Shelf-nu · Dec 30, 2024 · 25ecbb5 · 25ecbb5
2 parents 1099618 + a441621
commit 25ecbb5
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/app/components/assets/import-content.tsx b/app/components/assets/import-content.tsx
@@ -101,7 +101,7 @@ export const ImportContent = () => (
           <b>multiline text</b>
         </li>
         <li>
-          <b>date</b> - must be in <b>mm/dd/yyyy</b> format
+          <b>date</b> - must be in <b>YYYY-MM-DD</b> format
         </li>
       </ul>
       If no type is mentioned <b>"text"</b> is used as default type.
@@ -200,7 +200,7 @@ export const FileForm = ({ intent, url }: { intent: string; url?: string }) => {
           <Button
             title={"Confirm asset import"}
             disabled={!selectedFile}
-            className="mt-4"
+            className="my-4"
           >
             Confirm asset import
           </Button>

diff --git a/app/components/dashboard/inventory-value-chart.tsx b/app/components/dashboard/inventory-value-chart.tsx
@@ -46,6 +46,7 @@ export default function InventoryValueChart() {
                     value={(valueKnownAssets / totalAssets) * 100}
                     size="xl"
                     color="orange"
+                    className="relative"
                   >
                     <span className="block text-center text-xs font-medium text-gray-600">
                       Value Known <br />

diff --git a/app/components/dashboard/location-ratio-chart.tsx b/app/components/dashboard/location-ratio-chart.tsx
@@ -46,6 +46,7 @@ export default function LocationRatioChart() {
                     value={(assetsWithLocation / totalAssets) * 100}
                     size="xl"
                     color="orange"
+                    className="relative"
                   >
                     <span className="block text-center text-xs font-medium text-gray-600">
                       Location known <br />

diff --git a/app/components/layout/sidebar/app-sidebar.tsx b/app/components/layout/sidebar/app-sidebar.tsx
@@ -34,7 +34,7 @@ export default function AppSidebar(props: AppSidebarProps) {
       </SidebarContent>
 
       <SidebarFooter>
-        <SidebarNoticeCard />
+        {state !== "collapsed" && <SidebarNoticeCard />}
         <SidebarNav className="p-0" items={bottomMenuItems} />
         <SidebarUserMenu />
       </SidebarFooter>

diff --git a/public/static/shelf.nu-example-asset-import-from-content.csv b/public/static/shelf.nu-example-asset-import-from-content.csv
@@ -1,3 +1,3 @@
 qrId,title,description,kit,category,tags,location,valuation,custodian,bookable,"cf: Serial number,type:text","cf:brand, type:option","cf:purchase date, type:date"
-abcde12345,AMD Ryzen,"CPU from my new home PC",Home PC,CPU,"High priority, small",Sofia office,100,John,yes,WQE239123d,amd,02/22/2024
-12345abcde,"Macbook Pro.","New laptop",Working gear,Laptop,"High priority, mid-size",Dutch office,2500,Thea,no,43543we23d,apple,03/12/2022
+abcde12345,AMD Ryzen,"CPU from my new home PC",Home PC,CPU,"High priority, small",Sofia office,100,John,yes,WQE239123d,amd,2024-02-22
+12345abcde,"Macbook Pro.","New laptop",Working gear,Laptop,"High priority, mid-size",Dutch office,2500,Thea,no,43543we23d,apple,2022-03-12