Merge branch 'task/FP-737-final-UI' into task/FP-737-final-UI--table-…

…ui-closer-to-design
TACC · Jun 14, 2022 · 52dcce2 · 52dcce2
2 parents 8de45f1 + 404551d
commit 52dcce2
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 19 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,14 +1,22 @@
-## Overview: ##
+## Overview
 
-## Related Jira tickets: ##
+
+
+## Related
 
 * [FP-123](https://jira.tacc.utexas.edu/browse/FP-123)
 
-## Summary of Changes: ##
+## Changes
+
+
+
+## Testing
 
-## Testing Steps: ##
 1.
 
-## UI Photos:
+## UI
+
+
+
+## Notes
 
-## Notes: ##
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -68,7 +68,7 @@
     "@babel/preset-env": "^7.7.6",
     "@babel/preset-react": "^7.7.4",
     "@rollup/plugin-eslint": "^8.0.1",
-    "@tacc/core-styles": "^0.5.1",
+    "@tacc/core-styles": "^0.5.2-c",
     "@testing-library/jest-dom": "^5.0.2",
     "@testing-library/react": "^12.1.1",
     "@types/react": "^17.0.26",

diff --git a/client/src/components/Allocations/AllocationsCells.jsx b/client/src/components/Allocations/AllocationsCells.jsx
@@ -1,6 +1,7 @@
 import React, { useState } from 'react';
 import { shape, arrayOf, number, string } from 'prop-types';
-import { Button, Badge } from 'reactstrap';
+import { Badge } from 'reactstrap';
+import { Button } from '_common';
 import { useDispatch } from 'react-redux';
 import { v4 as uuidv4 } from 'uuid';
 import { AllocationsTeamViewModal } from './AllocationsModals';
@@ -18,15 +19,14 @@ export const Team = ({ cell: { value } }) => {
   return (
     <>
       <Button
-        className="btn btn-sm"
-        color="secondary"
         onClick={() => {
           dispatch({
             type: 'GET_TEAMS',
             payload: { ...value },
           });
           setTeamModal(true);
         }}
+        size="small"
         disabled={teamModal}
       >
         View Team

diff --git a/client/src/styles/objects/o-fixed-header-table.css b/client/src/styles/objects/o-fixed-header-table.css
@@ -27,4 +27,7 @@ Styleguide Objects.FixedHeaderTable
 .o-fixed-header-table th {
   position: sticky;
   top: 0;
+
+  z-index: 1; /* so table content (e.g. button)¹ does not scroll over <th> */
+  /* ¹ table content with a `position` value other than static */
 }
diff --git a/server/portal/libs/agave/utils.py b/server/portal/libs/agave/utils.py
@@ -120,8 +120,8 @@ def iterate_level(client, system, path, limit=100):
     while True:
         page = client.files.list(systemId=system,
                                  filePath=urllib.parse.quote(path),
-                                 offset=offset,
-                                 limit=limit)
+                                 offset=int(offset),
+                                 limit=int(limit))
         yield from page
         offset += limit
         if len(page) != limit: