@truedat/dd 5.9.6 → 5.9.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "5.9.6",
+  "version": "5.9.8",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "5.9.6",
+    "@truedat/test": "5.9.7",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -88,9 +88,9 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@truedat/auth": "5.9.6",
-    "@truedat/core": "5.9.6",
-    "@truedat/df": "5.9.6",
+    "@truedat/auth": "5.9.8",
+    "@truedat/core": "5.9.8",
+    "@truedat/df": "5.9.8",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "path-to-regexp": "^1.7.0",
@@ -115,5 +115,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "9f323fd84b59cac49e60b9cf0e441efc192465de"
+  "gitHead": "ea466759ff38b111f12c743f430779586c28f37d"
 }

package/src/components/BucketView.js

@@ -7,6 +7,7 @@ import { useParams, useLocation } from "react-router-dom";
 import searchImage from "assets/searching.png";
 import { FormattedMessage, useIntl } from "react-intl";
 import { saveNavFilter as saveNavFilterRoutine } from "../routines";
+import { isBucketFilter } from "../utils/bucketNav";
 import FilteredNav from "./FilteredNav";
 import StructureCrumbs from "./StructureCrumbs";
 import StructureGrantCart from "./StructureGrantCart";
@@ -14,12 +15,6 @@ import StructureSummary from "./StructureSummary";
 import StructureTabPaneRoutes from "./StructureTabPaneRoutes";
 import StructureTabRoutes from "./StructureTabRoutes";
 
-const isBucketFilter = _.flow(
-  Object.keys,
-  // Both metadata and mutable_metadata are "metadata"
-  _.any((entry) => entry.startsWith("metadata", "note"))
-);
-
 const EmptyImage = () => (
   <div
     style={{

package/src/components/CatalogCustomViewCards.js

@@ -10,7 +10,7 @@ import { CardGroupsAccordion } from "@truedat/core/components";
 import { linkTo } from "@truedat/core/routes";
 
 const moveMissingBucketToTheEnd = (buckets) =>
-  _.sortBy(({ key }) => (key === "_missing" ? 1 : 0))(buckets);
+  _.sortBy(({ key }) => (key === "_missing" || key === "" ? 1 : 0))(buckets);
 
 const orderBuckets = (buckets) =>
   _.flow(
@@ -59,8 +59,14 @@ export const CatalogCustomViewCard = ({
   return (
     <Card link as={Link} to={`${linkTo.BUCKET_VIEW()}?${queryParams}`}>
       <Card.Content className="extra-bottom-padding">
-        <Card.Header style={name === "_missing" ? { color: "grey" } : null}>
-          {name === "_missing" ? formatMessage({ id: "missingBucket" }) : name}
+        <Card.Header
+          style={name === "_missing" || name === "" ? { color: "grey" } : null}
+        >
+          {name === "_missing"
+            ? formatMessage({ id: "missingBucket" })
+            : name === ""
+            ? formatMessage({ id: "emptyBucket" })
+            : name}
         </Card.Header>
         {structures_count && (
           <CatalogCustomViewCardPopup

package/src/components/StructureItemRoot.js

@@ -6,12 +6,7 @@ import { useHistory } from "react-router-dom";
 import PropTypes from "prop-types";
 import { List } from "semantic-ui-react";
 import { STRUCTURES, linkTo } from "@truedat/core/routes";
-
-const isBucketFilter = _.flow(
-  Object.keys,
-  // Both metadata and mutable_metadata are "metadata"
-  _.any((entry) => entry.startsWith("metadata", "note"))
-);
+import { isBucketFilter } from "../utils/bucketNav";
 
 const filterParams = _.flow(
   Object.entries,

package/src/selectors/getStructureParent.js

@@ -1,14 +1,9 @@
 import _ from "lodash/fp";
 import { createSelector } from "reselect";
+import { isBucketFilter } from "../utils/bucketNav";
 
 const defaultName = "..";
 
-const isBucketFilter = _.flow(
-  Object.keys,
-  // Both metadata and mutable_metadata are "metadata"
-  _.any((entry) => entry.startsWith("metadata", "note"))
-);
-
 const rootNavItem = (structure) =>
   _.flow(
     _.propOr({}, "system"),

package/src/utils/bucketNav.js

@@ -0,0 +1,9 @@
+import _ from "lodash/fp";
+
+export const isBucketFilter = _.flow(
+  Object.keys,
+  // Both metadata and mutable_metadata are "metadata"
+  _.some((key) =>
+    ["metadata", "note"].some((searchedKey) => key.startsWith(searchedKey))
+  )
+);