diff --git a/client/components/edit/ObjectButtonBar.tsx b/client/components/edit/ObjectButtonBar.tsx index 61212cfe..b8057266 100644 --- a/client/components/edit/ObjectButtonBar.tsx +++ b/client/components/edit/ObjectButtonBar.tsx @@ -10,30 +10,30 @@ import DeleteObjectButton from "./DeleteObjectButton"; import RefreshIcon from "@mui/icons-material/Refresh"; export interface ObjectButtonBarProps { - pid: string; + pid: string; } const ObjectButtonBar = ({ pid }: ObjectButtonBarProps): React.ReactElement => { - const { - action: { clearPidFromChildListStorage }, - } = useEditorContext(); + const { + action: { clearPidFromChildListStorage }, + } = useEditorContext(); - return ( -
- - - - - -
- ); + return ( +
+ + + + + +
+ ); }; export default ObjectButtonBar; diff --git a/client/components/edit/ObjectStatus.tsx b/client/components/edit/ObjectStatus.tsx index 548d2e29..89503b81 100644 --- a/client/components/edit/ObjectStatus.tsx +++ b/client/components/edit/ObjectStatus.tsx @@ -5,27 +5,23 @@ import { useGlobalContext } from "../../context/GlobalContext"; import { useEditorContext } from "../../context/EditorContext"; import ObjectLoader from "./ObjectLoader"; -import CheckCircleIcon from '@mui/icons-material/CheckCircle'; -import HelpOutlineIcon from '@mui/icons-material/HelpOutline'; -import ModeStandbyIcon from '@mui/icons-material/ModeStandby'; +import CheckCircleIcon from "@mui/icons-material/CheckCircle"; +import HelpOutlineIcon from "@mui/icons-material/HelpOutline"; +import ModeStandbyIcon from "@mui/icons-material/ModeStandby"; export interface ObjectStatusProps { pid: string; } function getStatusIcon(statusText: string) { - switch (statusText) { - case "Active": - return ; - case "Inactive": - return ; - - } - return ; + switch (statusText) { + case "Active": + return ; + case "Inactive": + return ; + } + return ; } -const statusIcons = { - "Inactive": ModeStandbyIcon, -}; export const ObjectStatus = ({ pid }: ObjectStatusProps): React.ReactElement => { const { diff --git a/client/components/edit/children/Child.tsx b/client/components/edit/children/Child.tsx index 8d66d9c7..031000b2 100644 --- a/client/components/edit/children/Child.tsx +++ b/client/components/edit/children/Child.tsx @@ -38,27 +38,16 @@ export const Child = ({ state: { objectDetailsStorage }, } = useEditorContext(); const [expanded, setExpanded] = useState(false); - const loaded = Object.prototype.hasOwnProperty.call( - objectDetailsStorage, - pid, - ); + const loaded = Object.prototype.hasOwnProperty.call(objectDetailsStorage, pid); const details = loaded ? objectDetailsStorage[pid] : {}; - const title = !loaded - ? initialTitle - : extractFirstMetadataValue(details?.metadata ?? {}, "dc:title", "-"); + const title = !loaded ? initialTitle : extractFirstMetadataValue(details?.metadata ?? {}, "dc:title", "-"); const expandControl = ( setExpanded(!expanded)}> {expanded ? ( - + ) : ( - + )} ); @@ -83,12 +72,7 @@ export const Child = ({
- {expandControl}{" "} - {loaded && parentPid ? ( - - ) : ( - "" - )} + {expandControl} {loaded && parentPid ? : ""} {title || "(no title)"} @@ -97,7 +81,7 @@ export const Child = ({ - + {loaded ? : ""} diff --git a/client/components/edit/children/ChildList.tsx b/client/components/edit/children/ChildList.tsx index c44ac6c7..e0f2869f 100644 --- a/client/components/edit/children/ChildList.tsx +++ b/client/components/edit/children/ChildList.tsx @@ -31,9 +31,7 @@ export const ChildList = ({ // Use session storage to remember the last page viewed across pages/history: const pageStorageKey = "child_page_" + pid; const initialPage: string | null = - typeof sessionStorage !== "undefined" - ? sessionStorage.getItem(pageStorageKey) - : null; + typeof sessionStorage !== "undefined" ? sessionStorage.getItem(pageStorageKey) : null; const [page, setPage] = useState(parseInt(initialPage ?? "1")); if (typeof sessionStorage !== "undefined") { sessionStorage.setItem(pageStorageKey, page.toString()); @@ -134,14 +132,22 @@ export const ChildList = ({ const paginatorLabel = children.numFound > 1 ? (

- Showing {startNumber} -{" "} - {children.numFound < endNumber ? children.numFound : endNumber} of{" "} + Showing {startNumber} - {children.numFound < endNumber ? children.numFound : endNumber} of{" "} {children.numFound}

) : null; return (
+ + {thumbsButton} + + + {modelsButton} + + + {childButton} + {paginatorLabel} @@ -149,9 +155,7 @@ export const ChildList = ({ {paginator} -
    - {contents.length ? contents : Empty.} -
+
    {contents.length ? contents : Empty.}
); }; diff --git a/client/components/paginate/JobPaginator.tsx b/client/components/paginate/JobPaginator.tsx index 8ec38088..fdb7cbfd 100644 --- a/client/components/paginate/JobPaginator.tsx +++ b/client/components/paginate/JobPaginator.tsx @@ -25,22 +25,28 @@ const JobPaginator = ({ initialCategory, initialJob }: JobPaginatorProps): React }, []); return ( - <> -
    -
  • Main Menu
  • -
  • Paginator
  • -
  • {category}{" "}{job}
  • -
- - - - - - - - - - + <> +
    +
  • + Main Menu +
  • +
  • + Paginator +
  • +
  • + {category} {job} +
  • +
+ + + + + + + + + + ); }; diff --git a/client/components/paginate/PaginatorControls.tsx b/client/components/paginate/PaginatorControls.tsx index f888fcb0..1972cb1d 100644 --- a/client/components/paginate/PaginatorControls.tsx +++ b/client/components/paginate/PaginatorControls.tsx @@ -6,9 +6,9 @@ import MagicLabeler from "../../util/MagicLabeler"; import PaginatorControlGroup from "./PaginatorControlGroup"; import ZoomToggleButton from "./ZoomToggleButton"; -import AutoFixHighIcon from '@mui/icons-material/AutoFixHigh'; -import CompareArrowsIcon from '@mui/icons-material/CompareArrows'; -import DeleteForeverIcon from '@mui/icons-material/DeleteForever'; +import AutoFixHighIcon from "@mui/icons-material/AutoFixHigh"; +import CompareArrowsIcon from "@mui/icons-material/CompareArrows"; +import DeleteForeverIcon from "@mui/icons-material/DeleteForever"; const PaginatorControls = (): React.ReactElement => { const { @@ -41,41 +41,46 @@ const PaginatorControls = (): React.ReactElement => { return pageCount > 0 ? (
-
- - - -
-
+
+ + + +
+
-
- - - -
+
+ + + +
{MagicLabeler.prefixes} @@ -87,24 +92,25 @@ const PaginatorControls = (): React.ReactElement => { {MagicLabeler.suffixes}
-
- - - - -
+
+ + + + +
- +
) : (