CR changes

evergreen-ci · Jan 10, 2024 · fb0e788 · fb0e788
1 parent 04a44ba
commit fb0e788
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 27 deletions.
diff --git a/src/components/Table/BaseTable.tsx b/src/components/Table/BaseTable.tsx
@@ -13,7 +13,6 @@ import {
   TableBody,
   type TableProps,
   TableHead,
-  LGTableDataType,
   VirtualItem,
   LeafyGreenTableRow,
 } from "@leafygreen-ui/table";
@@ -49,13 +48,13 @@ declare module "@tanstack/table-core" {
 }
 
 type SpruceTableProps = {
+  className?: string;
   "data-cy-row"?: string;
   "data-cy-table"?: string;
   emptyComponent?: React.ReactNode;
   loading?: boolean;
   /** estimated number of rows the table will have */
   loadingRows?: number;
-  className?: string;
 };
 
 export const BaseTable = forwardRef(
@@ -74,6 +73,8 @@ export const BaseTable = forwardRef(
   ) => {
     const { virtualRows } = table;
     const { rows } = table.getRowModel();
+    const hasVirtualRows = virtualRows && virtualRows.length > 0;
+
     return (
       <>
         <StyledTable
@@ -143,7 +144,16 @@ export const BaseTable = forwardRef(
                 numRows={loadingRows}
               />
             )}
-            <RenderRows rows={rows} virtualRows={virtualRows} />
+            {hasVirtualRows
+              ? virtualRows.map((vr) => {
+                  const row = rows[vr.index];
+                  return (
+                    <RenderableRow row={row} key={row.id} virtualRow={vr} />
+                  );
+                })
+              : rows.map((row) => (
+                  <RenderableRow row={row} key={row.id} virtualRow={null} />
+                ))}
           </TableBody>
         </StyledTable>
         {!loading &&
@@ -154,34 +164,11 @@ export const BaseTable = forwardRef(
   }
 );
 
-const RenderRows = <T extends LGRowData>({
-  rows,
-  virtualRows,
-}: {
-  virtualRows?: VirtualItem[];
-  rows: LeafyGreenTableRow<LGTableDataType<T>>[];
-}) => {
-  const hasVirtualRows = virtualRows && virtualRows.length > 0;
-  return (
-    <>
-      {!hasVirtualRows &&
-        rows.map((row) => (
-          <RenderableRow row={row} key={row.id} virtualRow={null} />
-        ))}
-      {hasVirtualRows &&
-        virtualRows.map((vr) => {
-          const row = rows[vr.index];
-          return <RenderableRow row={row} key={row.id} virtualRow={vr} />;
-        })}
-    </>
-  );
-};
-
 const RenderableRow = <T extends LGRowData>({
   row,
   virtualRow,
 }: {
-  row: LeafyGreenTableRow<LGTableDataType<T>>;
+  row: LeafyGreenTableRow<T>;
   virtualRow: VirtualItem;
 }) => (
   <Row

diff --git a/src/gql/generated/types.ts b/src/gql/generated/types.ts
@@ -364,6 +364,7 @@ export type DisplayTask = {
 /** Distro models an environment configuration for a host. */
 export type Distro = {
   __typename?: "Distro";
+  adminOnly: Scalars["Boolean"]["output"];
   aliases: Array<Scalars["String"]["output"]>;
   arch: Arch;
   authorizedKeysFile: Scalars["String"]["output"];
@@ -429,6 +430,8 @@ export type DistroInfo = {
 };
 
 export type DistroInput = {
+  /** TODO: require adminOnly field upon completion of DEVPROD-3533 */
+  adminOnly?: InputMaybe<Scalars["Boolean"]["input"]>;
   aliases: Array<Scalars["String"]["input"]>;
   arch: Arch;
   authorizedKeysFile: Scalars["String"]["input"];