Merge pull request #410 from Smithsonian/develop

v0.9.10 Release Candidate 6
Smithsonian · May 14, 2022 · a16cc6a · a16cc6a
2 parents 85df469 + 0c9effc
commit a16cc6a
Show file tree

Hide file tree

Showing 103 changed files with 3,663 additions and 1,913 deletions.
diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dpo-packrat/client",
-  "version": "0.9.9",
+  "version": "0.9.10",
   "private": true,
   "license": "Apache-2.0",
   "description": "Client for Packrat",
@@ -28,7 +28,7 @@
   "dependencies": {
     "@apollo/client": "3.1.5",
     "@date-io/date-fns": "1.3.13",
-    "@dpo-packrat/common": "0.9.9",
+    "@dpo-packrat/common": "0.9.10",
     "@material-ui/core": "4.11.0",
     "@material-ui/data-grid": "4.0.0-alpha.33",
     "@material-ui/icons": "4.9.1",

diff --git a/client/src/components/shared/AssetIdentifiers.tsx b/client/src/components/shared/AssetIdentifiers.tsx
@@ -40,10 +40,12 @@ interface AssetIdentifiersProps {
     onRemoveIdentifer: (identifiers: StateIdentifier[]) => void;
     subjectView?: boolean;
     onUpdateIdIdentifierPreferred?: (id: number) => void;
+    identifierName: string;
 }
 
 function AssetIdentifiers(props: AssetIdentifiersProps): React.ReactElement {
-    const { systemCreated, identifiers, onSystemCreatedChange, onAddIdentifer, onUpdateIdentifer, onRemoveIdentifer, subjectView, onUpdateIdIdentifierPreferred } = props;
+    const { systemCreated, identifiers, onSystemCreatedChange, onAddIdentifer, onUpdateIdentifer, onRemoveIdentifer,
+        subjectView, onUpdateIdIdentifierPreferred, identifierName } = props;
     const classes = useStyles();
     const [getEntries, getInitialEntry] = useVocabularyStore(state => [state.getEntries, state.getInitialEntry]);
 
@@ -78,9 +80,10 @@ function AssetIdentifiers(props: AssetIdentifiersProps): React.ReactElement {
         onUpdateIdentifer(updatedIdentifiers);
     };
 
+    const label: string = (identifierName ? identifierName : 'Asset') + ' Identifier(s)';
     return (
         <Box marginBottom='10px'>
-            <FieldType required label='Asset Identifier(s)' padding='10px'>
+            <FieldType required label={label} padding='10px'>
                 <Box display='flex' justifyContent='space-between'>
                     <Box className={classes.assetIdentifier}>
                         <label htmlFor='systemCreated' style={{ display: 'none' }}>System Created Identifier</label>

diff --git a/client/src/components/shared/DataGridWithPagination.tsx b/client/src/components/shared/DataGridWithPagination.tsx
diff --git a/client/src/components/shared/GenericBreadcrumbsView.tsx b/client/src/components/shared/GenericBreadcrumbsView.tsx
@@ -44,8 +44,9 @@ interface BreadcrumbsViewProps {
 function GenericBreadcrumbsView(props: BreadcrumbsViewProps): React.ReactElement {
     const { items, highlighted = false, end = null } = props;
     const classes = useStyles();
-
-    const splitPathCrumbsArray = items.split('/');
+    if (!items || items.length === 0 || !items.includes('/')) return <React.Fragment />;
+    const trimmedItems = items[items.length - 1] === '/' ? items.slice(0, items.length - 1) : items;
+    const splitPathCrumbsArray = trimmedItems.split('/');
     const finalPathCrumbsArray = splitPathCrumbsArray.map(subPath => {
         return {
             subPath,

diff --git a/client/src/components/shared/Header.tsx b/client/src/components/shared/Header.tsx
@@ -159,7 +159,7 @@ function Header(): React.ReactElement {
     // Filter and keyword clear when in Repository
     const clearSearchAndUpdateRepositorySearch = (): void => {
         resetKeywordSearch();
-        resetRepositoryFilter();
+        resetRepositoryFilter(true, true);
         updateRepositorySearch();
     };