@truedat/dd 5.10.1 → 5.11.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "5.10.1",
+  "version": "5.11.0",
   "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.10.1",
+    "@truedat/test": "5.11.0",
     "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.10.1",
-    "@truedat/core": "5.10.1",
-    "@truedat/df": "5.10.1",
+    "@truedat/auth": "5.11.0",
+    "@truedat/core": "5.11.0",
+    "@truedat/df": "5.11.0",
     "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": "ba010e6013cc394e610c97786331a5d687ecac64"
+  "gitHead": "ad93d26b0d6eb4481e562a5c793540bcdf964940"
 }

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

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React from "react";
+import React, { useEffect } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { Link, useParams } from "react-router-dom";
@@ -8,9 +8,10 @@ import { useIntl } from "react-intl";
 import { FormattedNumber } from "react-intl";
 import { CardGroupsAccordion } from "@truedat/core/components";
 import { linkTo } from "@truedat/core/routes";
+import { fetchStructureFilters as fetchStructureFiltersRoutine } from "@truedat/dd/routines";
 
 const moveMissingBucketToTheEnd = (buckets) =>
-  _.sortBy(({ key }) => (key === "_missing" ? 1 : 0))(buckets);
+  _.sortBy(({ key }) => (key === "_missing" || key === "" ? 1 : 0))(buckets);
 
 const orderBuckets = (buckets) =>
   _.flow(
@@ -18,7 +19,13 @@ const orderBuckets = (buckets) =>
     moveMissingBucketToTheEnd
   )(buckets);
 
-export const CatalogCustomViewCards = ({ structureFilters }) => {
+export const CatalogCustomViewCards = ({
+  structureFilters,
+  fetchStructureFilters,
+}) => {
+  useEffect(() => {
+    fetchStructureFilters();
+  }, [fetchStructureFilters]);
   const { propertyPath } = useParams();
   const groups = [];
 
@@ -43,6 +50,7 @@ export const CatalogCustomViewCards = ({ structureFilters }) => {
 
 CatalogCustomViewCards.propTypes = {
   structureFilters: PropTypes.object,
+  fetchStructureFilters: PropTypes.func,
 };
 
 export const CatalogCustomViewCard = ({
@@ -59,8 +67,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
@@ -95,4 +109,6 @@ const mapStateToProps = ({ structures, structureFilters }) => ({
   structureFilters,
 });
 
-export default connect(mapStateToProps)(CatalogCustomViewCards);
+export default connect(mapStateToProps, {
+  fetchStructureFilters: fetchStructureFiltersRoutine,
+})(CatalogCustomViewCards);

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/components/StructuresView.js

@@ -7,6 +7,7 @@ import { Header, Icon, Segment, Divider } from "semantic-ui-react";
 import { FormattedMessage } from "react-intl";
 import { linkTo } from "@truedat/core/routes";
 import { BUCKETS_VIEW } from "@truedat/core/routes";
+import { fetchStructureFilters as fetchStructureFiltersRoutine } from "@truedat/dd/routines";
 import { structureRowsSelector } from "../selectors";
 import StructureSelectedFilters from "./StructureSelectedFilters";
 import StructuresOptions from "./StructuresOptions";
@@ -55,10 +56,15 @@ const StructuresViewContent = ({
   const history = useHistory();
   return (
     <>
-      <StructuresOptions hasFilterApplied={hasFilterApplied} {...actions} />
-      <StructuresSearch />
-      <StructureSelectedFilters />
-      <StructureDateFilter />
+      {!customView ? (
+        <>
+          <StructuresOptions hasFilterApplied={hasFilterApplied} {...actions} />
+          <StructuresSearch />
+          <StructureSelectedFilters />
+          <StructureDateFilter />
+        </>
+      ) : null}
+
       {hasFilterApplied || embedded ? (
         <StructuresSearchResults
           structures={structures}
@@ -117,6 +123,7 @@ const isEmptyPath = (state, path) => _.flow(_.path(path), _.isEmpty)(state);
 const mapStateToProps = (state) => ({
   structures: structureRowsSelector(state),
   actions: state.structuresActions,
+  fetchStructureFilters: fetchStructureFiltersRoutine,
   loading: state.structuresLoading,
   systemsLoading: state.systemsLoading,
   hasFilterApplied:

package/src/components/__tests__/CatalogCustomViewCards.spec.js

@@ -24,6 +24,8 @@ const structureFilters = {
   },
 };
 
+const fetchStructureFilters = jest.fn();
+
 const messages = {
   es: {
     ...es,
@@ -38,10 +40,11 @@ jest.mock("react-router-dom", () => ({
 
 describe("<CatalogCustomViewCard />", () => {
   it("Shows a structure filter value and count inside each Card", () => {
-    const { getByRole } = render(
-      <CatalogCustomViewCards structureFilters={structureFilters} />,
-      { locale: "es", messages }
-    );
+    const props = { structureFilters, fetchStructureFilters };
+    const { getByRole } = render(<CatalogCustomViewCards {...props} />, {
+      locale: "es",
+      messages,
+    });
     const missingCard = getByRole("link", { name: /_missing/ });
     expect(missingCard).toBeInTheDocument();
     const databaseOneCard = getByRole("link", { name: /database_1/ });

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))
+  )
+);