@truedat/dd 5.9.1 → 5.9.3

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

@@ -1,55 +1,106 @@
 import React from "react";
-import { shallow } from "enzyme";
-import { FilteredNav } from "../FilteredNav";
+import userEvent from "@testing-library/user-event";
+import { render } from "@truedat/test/render";
+
+import FilteredNavLoader, { FilteredNav } from "../FilteredNav";
+
+jest.mock("../../hooks/useBucketStructures", () => {
+  const originalModule = jest.requireActual("../../hooks/useBucketStructures");
+
+  const data = [
+    { id: 1, name: "bank_capital" },
+    { id: 2, name: "consumorenovables" },
+  ];
+
+  return {
+    __esModule: true,
+    ...originalModule,
+    useBucketStructures: jest.fn(() => ({
+      data: { data: { data }, headers: { "x-total-count": 2 } },
+      error: false,
+      trigger: jest.fn(),
+    })),
+  };
+});
+
+const renderOpts = {
+  state: {
+    navFilter: {},
+  },
+};
 
 describe("<FilteredNav />", () => {
   it("matches the latest snapshot", () => {
     const childStructures = [
       { id: 1, name: "bank_capital" },
-      { id: 2, name: "consumorenovables" }
+      { id: 2, name: "consumorenovables" },
     ];
     const parentStructures = [];
     const props = { childStructures, parentStructures };
 
-    const wrapper = shallow(<FilteredNav {...props} />);
-    expect(wrapper).toMatchSnapshot();
+    const { getByText } = render(<FilteredNav {...props} />, renderOpts);
+    expect(getByText("bank_capital")).toBeInTheDocument();
+    expect(getByText("consumorenovables")).toBeInTheDocument();
   });
 
   it("ChildStructures prop in StructureNav component  should rendered with one item when inputSearch value change", () => {
     const childStructures = [
       { id: 1, name: "bank_capital" },
-      { id: 2, name: "consumorenovables" }
+      { id: 2, name: "consumorenovables" },
     ];
     const parentStructures = [];
     const props = { childStructures, parentStructures };
 
-    const wrapper = shallow(<FilteredNav {...props} />);
-    expect(wrapper.find("StructureNav").prop("childStructures").length).toEqual(
-      2
-    );
-    const inputSearch = wrapper.find("StructureSearch");
-    inputSearch.prop("onChange")("bank");
-    expect(wrapper.find("StructureNav").prop("childStructures").length).toEqual(
-      1
+    const { getByRole, getByText, queryByText } = render(
+      <FilteredNav {...props} />,
+      renderOpts
     );
+    expect(getByText("bank_capital")).toBeInTheDocument();
+    expect(getByText("consumorenovables")).toBeInTheDocument();
+
+    const inputSearch = getByRole("textbox");
+    userEvent.type(inputSearch, "bank");
+    expect(getByText("bank_capital")).toBeInTheDocument();
+    expect(queryByText("consumorenovables")).not.toBeInTheDocument();
   });
 
   it("ChildStructures prop in StructureNav component  should rendered without items when inputSearch value change", () => {
     const childStructures = [
       { id: 1, name: "bank_capital" },
-      { id: 2, name: "consumorenovables" }
+      { id: 2, name: "consumorenovables" },
     ];
     const parentStructures = [];
     const props = { childStructures, parentStructures };
 
-    const wrapper = shallow(<FilteredNav {...props} />);
-    expect(wrapper.find("StructureNav").prop("childStructures").length).toEqual(
-      2
+    const { getByRole, getByText, queryByText } = render(
+      <FilteredNav {...props} />,
+      renderOpts
     );
-    const inputSearch = wrapper.find("StructureSearch");
-    inputSearch.prop("onChange")("renovabless");
-    expect(wrapper.find("StructureNav").prop("childStructures").length).toEqual(
-      0
+    expect(getByText("bank_capital")).toBeInTheDocument();
+    expect(getByText("consumorenovables")).toBeInTheDocument();
+
+    const inputSearch = getByRole("textbox");
+    userEvent.type(inputSearch, "renovabless");
+
+    expect(queryByText("bank_capital")).not.toBeInTheDocument();
+    expect(queryByText("consumorenovables")).not.toBeInTheDocument();
+  });
+
+  it("FilterNavLoader loads from useBucketStructures and shows structures", () => {
+    const { getByText } = render(<FilteredNavLoader />, renderOpts);
+    expect(getByText("bank_capital")).toBeInTheDocument();
+    expect(getByText("consumorenovables")).toBeInTheDocument();
+  });
+
+  it("FilterNavLoader shows displayed/total structures message", () => {
+    const { queryByText, getByText, getByRole } = render(
+      <FilteredNavLoader />,
+      renderOpts
     );
+
+    const inputSearch = getByRole("textbox");
+    expect(queryByText("1 from a total of 2")).not.toBeInTheDocument();
+    userEvent.type(inputSearch, "bank");
+    expect(getByText("1 from a total of 2")).toBeInTheDocument();
   });
 });

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

@@ -33,7 +33,7 @@ describe("<GrantApprovalRuleDeleteButton />", () => {
       dispatch,
     });
     userEvent.click(getByRole("button", { name: /delete/i }));
-    userEvent.click(getByRole("button", { name: /yes/i }));
+    userEvent.click(getByRole("button", { name: "modal-affirmative-action" }));
 
     expect(dispatch).toHaveBeenLastCalledWith({
       ...deleteGrantApprovalRule(),
@@ -49,7 +49,7 @@ describe("<GrantApprovalRuleDeleteButton />", () => {
       dispatch,
     });
     userEvent.click(getByRole("button", { name: /delete/i }));
-    userEvent.click(getByRole("button", { name: /no/i }));
+    userEvent.click(getByRole("button", { name: "modal-negative-action" }));
 
     expect(dispatch).toHaveBeenCalledTimes(0);
   });

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

@@ -3,27 +3,28 @@ import { shallow } from "enzyme";
 import { StructureItemRoot } from "../StructureItemRoot";
 
 const mockHistory = {
-  push: jest.fn()
+  push: jest.fn(),
 };
 
 jest.mock("react-router-dom", () => ({
   ...jest.requireActual("react-router-dom"),
-  useHistory: () => mockHistory
+  useHistory: () => mockHistory,
 }));
 
 describe("<StructureItemRoot />", () => {
   const id = 1;
   const name = "foo";
+  const navFilter = {};
 
   it("matches the latest snapshot", () => {
-    const props = { id, name };
+    const props = { id, name, navFilter };
 
     const wrapper = shallow(<StructureItemRoot {...props} />);
     expect(wrapper).toMatchSnapshot();
   });
 
   it("clicking the item will push to history", () => {
-    const wrapper = shallow(<StructureItemRoot />);
+    const wrapper = shallow(<StructureItemRoot navFilter={{}} />);
     wrapper.find("ListItem").simulate("click");
     expect(mockHistory.push.mock.calls.length).toBe(1);
     expect(mockHistory.push.mock.calls[0][0]).toEqual("/structures");

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

@@ -9,6 +9,9 @@ const renderOpts = {
       "structure.navigation.showing": "from a total of",
     },
   },
+  state: {
+    navFilter: {},
+  },
 };
 
 describe("<StructureNav />", () => {

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

@@ -220,7 +220,7 @@ describe("<StructureStructureLinks />", () => {
     const deleteButton = document.getElementById("delete-link-60217-60218");
     userEvent.click(deleteButton);
     expect(getByText("Delete link")).toBeInTheDocument();
-    const yesButton = getByRole("button", { name: /Yes/i });
+    const yesButton = getByRole("button", { name: "modal-affirmative-action" });
     userEvent.click(yesButton);
 
     expect(dispatch).toHaveBeenCalledWith({

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

@@ -1,19 +1,67 @@
 import React from "react";
-import { shallow } from "enzyme";
-import { StructureView } from "../StructureView";
+import { render } from "@truedat/test/render";
+import { waitFor } from "@testing-library/react";
+import StructureView from "../StructureView";
+
+jest.mock("react-router-dom", () => ({
+  ...jest.requireActual("react-router-dom"),
+  useParams: () => ({ id: 1 }),
+}));
+
+const commonState = {
+  authentication: { role: "admin" },
+  userPermissions: {
+    confidential: true,
+    create_foreign_grant_request: true,
+    profile_permission: false,
+    request_grant: true,
+    update: true,
+    update_domain: true,
+    update_grant_removal: true,
+    view_profiling_permission: true,
+  },
+  navFilter: {},
+  grantRequestsCart: {
+    structures: [],
+    template: null,
+    templateContent: {},
+    modificationGrant: null,
+    user: {
+      id: null,
+      valid: true,
+    },
+  },
+};
 
 describe("<StructureView />", () => {
-  it("matches the latest snapshot", () => {
-    const structure = { id: 42 };
-    const props = { structure };
-    const wrapper = shallow(<StructureView {...props} />);
-    expect(wrapper).toMatchSnapshot();
+  it("Some inner component shows the structure name", () => {
+    const renderOpts = {
+      state: {
+        ...commonState,
+        structureLoading: false,
+        structure: {
+          id: 1,
+          name: "some_db",
+          type: "Database",
+          description: "some description",
+        },
+      },
+    };
+
+    const { getAllByText } = render(<StructureView />, renderOpts);
+    expect(getAllByText("some_db")[0]).toBeInTheDocument();
   });
 
-  it("Grid not rendered on structureLoading", () => {
-    const structure = { id: 42 };
-    const props = { structure, structureLoading: true };
-    const wrapper = shallow(<StructureView {...props} />);
-    expect(wrapper.find("Grid").length).toBe(0);
+  it("Inner components are not rendered if structure is loading, so structure name is not shown", async () => {
+    const renderOpts = {
+      state: {
+        ...commonState,
+        structureLoading: true,
+        structure: {},
+      },
+    };
+
+    const { queryByText } = render(<StructureView />, renderOpts);
+    await waitFor(() => expect(queryByText("some_db")).not.toBeInTheDocument());
   });
 });

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

@@ -1,7 +1,11 @@
 import _ from "lodash/fp";
 import React from "react";
-import { shallow } from "enzyme";
-import { StructuresView, StructuresHeader } from "../StructuresView";
+//import { shallow } from "enzyme";
+import { render } from "@truedat/test/render";
+import { within } from "@testing-library/react";
+
+import { StructuresView } from "../StructuresView";
+import en from "../../messages/en";
 
 const mockHistory = {
   goBack: jest.fn(),
@@ -10,36 +14,77 @@ const mockHistory = {
 jest.mock("react-router-dom", () => ({
   ...jest.requireActual("react-router-dom"),
   useHistory: () => mockHistory,
+  useParams: () => ({ propertyPath: "metadata.database" }),
 }));
 
+const messages = {
+  en: {
+    ...en,
+    missingBucket: "_missing",
+  },
+};
+
 describe("<StructuresView />", () => {
-  it("matches the latest snapshot", () => {
+  it("shows structures table if hasFilterAplied", () => {
     const structures = [
       {
         id: 1,
         domain: { name: "org" },
-        name: "s1",
+        name: "structure1",
         description: "dd",
         group: "gp",
         system: "sys",
+        type: "Table",
       },
     ];
-    const columns = [
-      { name: "name" },
-      { name: "domain", fieldSelector: _.path("domain.name") },
-      { name: "system" },
-      { name: "group" },
-    ];
 
     const actions = {
       bulkUpdate: {},
     };
 
-    const props = { structures, columns, actions };
-    const wrapper = shallow(<StructuresView {...props} />);
-    expect(wrapper).toMatchSnapshot();
+    const props = { structures, actions, hasFilterApplied: true };
+    const { getByRole } = render(<StructuresView {...props} />);
+
+    expect(getByRole("heading")).toBeInTheDocument();
+
+    const table = getByRole("table");
+    const rows = within(table).getAllByRole("row");
+    const tableHeaderRow = rows[0];
+    const tableDataRow = rows[1];
+
+    expect(
+      within(tableHeaderRow).getByRole("columnheader", { name: "Structure" })
+    ).toBeInTheDocument();
+    expect(
+      within(tableDataRow).getByRole("cell", { name: "structure1" })
+    ).toBeInTheDocument();
+  });
+
+  it("shows CatalogCustomViewCards if customView", () => {
+    const structureFilters = {
+      "metadata.database": {
+        buckets: [
+          {
+            doc_count: 11234,
+            key: "_missing",
+          },
+          {
+            doc_count: 2345,
+            key: "database_1",
+          },
+        ],
+        values: ["_missing", "database_1"],
+      },
+    };
+
+    const { getByRole } = render(<StructuresView customView />, {
+      state: { structureFilters },
+      messages,
+    });
 
-    const headerWrapper = shallow(<StructuresHeader />);
-    expect(headerWrapper).toMatchSnapshot();
+    const missingCard = getByRole("link", { name: /_missing/ });
+    expect(missingCard).toBeInTheDocument();
+    const databaseOneCard = getByRole("link", { name: /database_1/ });
+    expect(databaseOneCard).toBeInTheDocument();
   });
 });

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

@@ -18,9 +18,15 @@ jest.mock("../../hooks/useStructures.js", () => {
   };
 });
 
+const renderOpts = {
+  state: {
+    navFilter: {},
+  },
+};
+
 describe("<SystemFilteredNav />", () => {
   it("matches the latest snapshot", () => {
-    const { container } = render(<SystemFilteredNav />, {});
+    const { container } = render(<SystemFilteredNav />, renderOpts);
     expect(container).toMatchSnapshot();
   });
 });

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

@@ -2,6 +2,11 @@ import React from "react";
 import { shallow } from "enzyme";
 import { SystemStructures } from "../SystemStructures";
 
+jest.mock("react-router-dom", () => ({
+  ...jest.requireActual("react-router-dom"),
+  useParams: () => ({ id: 1 }),
+}));
+
 describe("<SystemStructures />", () => {
   it("matches the latest snapshot", () => {
     const wrapper = shallow(<SystemStructures />);

package/src/components/__tests__/__snapshots__/DictionaryRoutes.spec.js.snap

@@ -5,8 +5,28 @@ exports[`<DictionaryRoutes /> matches the latest snapshot 1`] = `
   <Route
     render={[Function]}
   />
+  <Switch>
+    <Route
+      path="/bucketViewConfigs/:id/edit"
+      render={[Function]}
+    />
+    <Route
+      path="/bucketViewConfigs/new"
+      render={[Function]}
+    />
+    <Route
+      path="/bucketViewConfigs"
+      render={[Function]}
+    />
+  </Switch>
   <Route
-    path="/structures"
+    path={
+      [
+        "/structures",
+        "/buckets/:propertyPath",
+        "/bucketStructures",
+      ]
+    }
     render={[Function]}
   />
   <Route

package/src/components/__tests__/__snapshots__/StructureCrumbs.spec.js.snap

@@ -5,7 +5,7 @@ exports[`<StructureCrumbs /> matches the latest snapshot (empty) 1`] = `""`;
 exports[`<StructureCrumbs /> matches the latest snapshot (system, ancestry and structure) 1`] = `
 <Breadcrumb>
   <StructuresCrumb />
-  <SystemCrumb
+  <Connect(SystemCrumb)
     id={42}
     name="system1"
   />
@@ -29,7 +29,7 @@ exports[`<StructureCrumbs /> matches the latest snapshot (system, ancestry and s
 exports[`<StructureCrumbs /> matches the latest snapshot (system, ancestry, structure and field) 1`] = `
 <Breadcrumb>
   <StructuresCrumb />
-  <SystemCrumb
+  <Connect(SystemCrumb)
     id={42}
     name="system1"
   />
@@ -53,7 +53,7 @@ exports[`<StructureCrumbs /> matches the latest snapshot (system, ancestry, stru
 exports[`<StructureCrumbs /> matches the latest snapshot (system, ancestry, structure and version) 1`] = `
 <Breadcrumb>
   <StructuresCrumb />
-  <SystemCrumb
+  <Connect(SystemCrumb)
     id={42}
     name="system1"
   />
@@ -83,7 +83,7 @@ exports[`<StructureCrumbs /> matches the latest snapshot (system, ancestry, stru
 exports[`<StructureCrumbs /> matches the latest snapshot (system. ancestry, structure, version and field) 1`] = `
 <Breadcrumb>
   <StructuresCrumb />
-  <SystemCrumb
+  <Connect(SystemCrumb)
     id={42}
     name="system1"
   />

package/src/components/__tests__/__snapshots__/StructuresRoutes.spec.js.snap

@@ -2,7 +2,13 @@
 
 exports[`<StructuresRoutes /> matches the latest snapshot 1`] = `
 <Route
-  path="/structures"
+  path={
+    [
+      "/structures",
+      "/bucketStructures",
+      "/buckets/:propertyPath",
+    ]
+  }
   render={[Function]}
 />
 `;

package/src/components/__tests__/__snapshots__/SystemStructures.spec.js.snap

@@ -15,9 +15,7 @@ exports[`<SystemStructures /> matches the latest snapshot 1`] = `
     <GridColumn
       width={4}
     >
-      <Segment>
-        <SystemFilteredNav />
-      </Segment>
+      <Segment />
     </GridColumn>
     <GridColumn
       width={12}

package/src/components/index.js

@@ -1,3 +1,4 @@
+import CatalogCustomViewCards from "./CatalogCustomViewCards";
 import DictionaryRoutes from "./DictionaryRoutes";
 import FilteredNav from "./FilteredNav";
 import GrantRoutes from "./GrantRoutes";
@@ -52,6 +53,7 @@ import StructureMetadata from "./StructureMetadata";
 import ValueConditionStructure from "./ValueConditionStructure";
 
 export {
+  CatalogCustomViewCards,
   DictionaryRoutes,
   FilteredNav,
   GrantRoutes,

package/src/hooks/useBucketStructures.js

@@ -0,0 +1,10 @@
+import useSWRMutations from "swr/mutation";
+import { apiJsonPost } from "@truedat/core/services/api";
+import { API_BUCKET_STRUCTURES } from "../api";
+
+export const useBucketStructures = () => {
+  const mutation = useSWRMutations(API_BUCKET_STRUCTURES, (url, { arg }) =>
+    apiJsonPost(url, arg)
+  );
+  return mutation;
+};

package/src/messages/en.js

@@ -212,6 +212,7 @@ export default {
   "lineage.group.placeholder": "Select Top Level Structure",
   "lineage.resources.placeholder": "Select Child Structures",
   "lineage.subgroup.placeholder": "Select Child Structure",
+  metadata: "Metadata",
   "metadataView.fields": "Available metadata fields",
   "metadataView.fields.placeholder":
     "By default all available metadata will be visible",
@@ -228,6 +229,7 @@ export default {
   "navigation.lineage.view": "View in Data Catalog",
   "navigation.profile.executions": "Executions",
   "navigation.profile.executions.detail": "Detail",
+  note: "Note",
   "pendingStructureNotes.header": "Pending Notes",
   "pendingStructureNotes.subheader": "Structure notes pending some action",
   "pendingStructureNotes.props.structure": "Data Structure",
@@ -378,6 +380,7 @@ export default {
   "structure.system.name": "Name",
   "structure.type": "Type",
   "structure.type.Attribute": "Attribute",
+  "structure.type.bucket.icon": "bitbucket",
   "structure.type.File.icon": "file",
   "structure.type.Metric": "Metric",
   "structure.type.WORKFLOW.icon": "network-wired",

package/src/messages/es.js

@@ -219,6 +219,7 @@ export default {
   "lineage.group.placeholder": "Seleccionar Estructura Padre",
   "lineage.resources.placeholder": "Seleccionar Estructuras Hijos",
   "lineage.subgroup.placeholder": "Seleccionar Estructura Hijo",
+  metadata: "Metadata",
   "metadataView.fields": "Campos",
   "metadataView.fields.placeholder":
     "Por defecto, se incluirán todos los campos de metadata",
@@ -235,6 +236,7 @@ export default {
   "navigation.lineage.view": "Ver detalle",
   "navigation.profile.executions": "Ejecuciones",
   "navigation.profile.executions.detail": "Detalle",
+  note: "Nota",
   "pendingStructureNotes.header": "Notas pendientes",
   "pendingStructureNotes.subheader":
     "Notas de estructuras pendientes de acción",
@@ -387,6 +389,7 @@ export default {
   "structure.system.name": "Nombre",
   "structure.type": "Tipo",
   "structure.type.Attribute": "Atributo",
+  "structure.type.bucket.icon": "bitbucket",
   "structure.type.File.icon": "file",
   "structure.type.Metric": "Métrica",
   "structure.type.WORKFLOW.icon": "network-wired",

package/src/reducers/bucketFilter.js

@@ -0,0 +1,15 @@
+import _ from "lodash/fp";
+import { clearNavFilter, saveNavFilter } from "../routines";
+
+export const initialState = {};
+
+export const navFilter = (state = initialState, { type, payload }) => {
+  switch (type) {
+    case clearNavFilter.TRIGGER:
+      return initialState;
+    case saveNavFilter.TRIGGER:
+      return payload;
+    default:
+      return state;
+  }
+};

package/src/reducers/index.js

@@ -1,3 +1,4 @@
+import { navFilter } from "./navFilter";
 import { bulkUpdateStructuresLoading } from "./bulkUpdateStructuresLoading";
 import { childrenRelations, parentRelations } from "./structureRelations";
 import { creatingGrantRequestApproval } from "./creatingGrantRequestApproval";
@@ -38,7 +39,7 @@ import { selectedGroups } from "./selectedGroups";
 import { selectedNode } from "./selectedNode";
 import { selectedResources } from "./selectedResources";
 import { selectedUserSearchFilter } from "./selectedUserSearchFilter";
-import { structure } from "./structure";
+import { structure, structureSticky } from "./structure";
 import { structureActions } from "./structureActions";
 import { structureActiveFilters } from "./structureActiveFilters";
 import { structureAncestry } from "./structureAncestry";
@@ -92,6 +93,7 @@ import { userSearchFilters } from "./userSearchFilters";
 
 export {
   bulkUpdateStructuresLoading,
+  navFilter,
   childrenRelations,
   creatingGrantRequestApproval,
   csvGraphDownloading,
@@ -133,6 +135,7 @@ export {
   selectedResources,
   selectedUserSearchFilter,
   structure,
+  structureSticky,
   structureActions,
   structureActiveFilters,
   structureAncestry,

package/src/reducers/navFilter.js

@@ -0,0 +1,14 @@
+import { clearNavFilter, saveNavFilter } from "../routines";
+
+export const initialState = {};
+
+export const navFilter = (state = initialState, { type, payload }) => {
+  switch (type) {
+    case clearNavFilter.TRIGGER:
+      return initialState;
+    case saveNavFilter.TRIGGER:
+      return payload;
+    default:
+      return state;
+  }
+};