Merge pull request #6031 from specify/issue-6030

specify · Jan 3, 2025 · c55f4dd · c55f4dd
2 parents ea6649f + 16d9ba1
commit c55f4dd
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/specifyweb/frontend/js_src/lib/components/Atoms/DataEntry.tsx b/specifyweb/frontend/js_src/lib/components/Atoms/DataEntry.tsx
@@ -65,7 +65,7 @@ export const DataEntry = {
   >(
     'DataEntry.Grid',
     'div',
-    `items-center p-1 -ml-1 gap-2`,
+    `items-center p-1 gap-2`,
     ({
       viewDefinition,
       display,
@@ -138,7 +138,7 @@ export const DataEntry = {
   SubFormHeader: wrap(
     'DataEntry.SubFormHeader',
     'legend',
-    'gap-2 flex font-bold border-b border-gray-500 pt-5 pb-1 items-center',
+    'gap-2 flex font-bold border-b border-gray-500 pt-3 pb-1 items-center',
     ({ children, ...props }) => ({
       // A hack for Safari. See https://github.com/specify/specify7/issues/1535
       children: <div {...props}>{children}</div>,

diff --git a/...fyweb/frontend/js_src/lib/components/Atoms/__tests__/__snapshots__/DataEntry.test.ts.snap b/...fyweb/frontend/js_src/lib/components/Atoms/__tests__/__snapshots__/DataEntry.test.ts.snap
@@ -199,7 +199,7 @@ exports[`DataEntry.Footer renders without errors 1`] = `
 exports[`DataEntry.Grid renders without errors 1`] = `
 <DocumentFragment>
   <div
-    class="grid items-center p-1 -ml-1 gap-2"
+    class="grid items-center p-1 gap-2"
     style="grid-template-columns: 1fr 2fr 3fr auto;"
   >
     Test
@@ -231,7 +231,7 @@ exports[`DataEntry.SubFormHeader renders without errors 1`] = `
 <DocumentFragment>
   <legend>
     <div
-      class="gap-2 flex font-bold border-b border-gray-500 pt-5 pb-1 items-center"
+      class="gap-2 flex font-bold border-b border-gray-500 pt-3 pb-1 items-center"
     >
       Test
     </div>

diff --git a/specifyweb/frontend/js_src/lib/components/FormCells/FormTable.tsx b/specifyweb/frontend/js_src/lib/components/FormCells/FormTable.tsx
@@ -237,7 +237,11 @@ export function FormTable<SCHEMA extends AnySchema>({
       <p>{formsText.noData()}</p>
     ) : (
       <div
-        className={isCollapsed ? 'hidden' : 'overflow-x-auto'}
+        className={
+          isCollapsed
+            ? 'hidden'
+            : 'overflow-x-auto border border-gray-500 border-t-0 rounded-b pl-1 pr-1 pb-1'
+        }
         onScroll={handleScroll}
       >
         <DataEntry.Grid

diff --git a/specifyweb/frontend/js_src/lib/components/Forms/ResourceView.tsx b/specifyweb/frontend/js_src/lib/components/Forms/ResourceView.tsx
@@ -264,6 +264,9 @@ export function ResourceView<SCHEMA extends AnySchema>({
       </ErrorBoundary>
     ) : undefined;
 
+  const hasNoData =
+    !resource || (Array.isArray(resource) && resource.length === 0);
+
   const headerContent = (
     <>
       {specifyNetworkBadge}
@@ -313,7 +316,17 @@ export function ResourceView<SCHEMA extends AnySchema>({
           </DataEntry.SubFormTitle>
           {headerComponents}
         </DataEntry.SubFormHeader>
-        <div className={isCollapsed ? 'hidden' : ''}>{formattedChildren}</div>
+        <div
+          className={
+            isCollapsed
+              ? 'hidden'
+              : hasNoData
+                ? ''
+                : 'border border-gray-500 border-t-0 rounded-b p-1'
+          }
+        >
+          {formattedChildren}
+        </div>
       </DataEntry.SubForm>
     ) : (
       <Container.FullGray>