@truedat/dd 7.0.8 → 7.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "7.0.8",
+  "version": "7.1.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": "7.0.8",
+    "@truedat/test": "7.1.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": "7.0.8",
-    "@truedat/core": "7.0.8",
-    "@truedat/df": "7.0.8",
+    "@truedat/auth": "7.1.0",
+    "@truedat/core": "7.1.0",
+    "@truedat/df": "7.1.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": "ff536a41caac4df0cfa13df66dc2805b3bb7637a"
+  "gitHead": "cb08380da04c7286e694540bc24d32f01a728dfc"
 }

package/src/components/StructuresBulkUpdate.js

@@ -64,7 +64,7 @@ export const StructuresBulkUpdate = ({
   const { data, loading } = useTemplate({ name: templateName, domainIds });
   const template = _.prop("template")(data);
 
-  if (!template)
+  if (!template && !loading)
     return (
       <Message>
         <Message.Header>

package/src/components/StructuresSearchResults.js

@@ -21,9 +21,11 @@ export const StructuresSearchResults = ({
   selectable,
 }) => (
   <Dimmer.Dimmable dimmed={loading} className="structure-table-overflow">
-    <Dimmer active={loading} inverted>
-      <Loader size="large" />
-    </Dimmer>
+    {loading ? (
+      <Dimmer active={loading} inverted>
+        <Loader size="large" />
+      </Dimmer>
+    ) : null}
     {!_.isEmpty(structures) || !_.isEmpty(selectedStructure) ? (
       <>
         <StructuresLabelResults />

package/src/components/StructuresTable.js

@@ -39,7 +39,7 @@ export const StructuresTable = ({
     structureColumnsSelector(state, defaultFilters, overwriteColumns)
   );
 
-  const structures = searchData?.data;
+  const structures = searchData?.data || [];
 
   if (_.isEmpty(columns)) {
     return null;

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

@@ -57,10 +57,11 @@ describe("<GrantApprovalRules />", () => {
       <GrantApprovalRules />,
       renderOpts(grantApprovalRules)
     );
-    await waitFor(() => expect(queryByText(/lazy/i)).not.toBeInTheDocument());
-    await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
-    );
+
+    await waitFor(() => {
+      expect(queryByText(/lazy/i)).not.toBeInTheDocument();
+      expect(container.querySelector(".loader")).not.toBeInTheDocument();
+    });
     expect(container).toMatchSnapshot();
   });
 
@@ -69,22 +70,24 @@ describe("<GrantApprovalRules />", () => {
       <GrantApprovalRules />,
       renderOpts(emptyGrantApprovalRules)
     );
-    await waitFor(() => expect(queryByText(/lazy/i)).not.toBeInTheDocument());
-    await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
-    );
+
+    await waitFor(() => {
+      expect(queryByText(/lazy/i)).not.toBeInTheDocument();
+      expect(container.querySelector(".loader")).not.toBeInTheDocument();
+    });
     expect(container).toMatchSnapshot();
   });
 
   it("renders ApprovalRule name as Link", async () => {
-    const { queryByText, getByText } = render(
+    const { container, queryByText, getByText } = render(
       <GrantApprovalRules />,
       renderOpts(grantApprovalRules)
     );
-    await waitFor(() => expect(queryByText(/lazy/i)).not.toBeInTheDocument());
-    await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
-    );
+
+    await waitFor(() => {
+      expect(queryByText(/lazy/i)).not.toBeInTheDocument();
+      expect(container.querySelector(".loader")).not.toBeInTheDocument();
+    });
 
     const link = getByText("rule_name");
     expect(link).toHaveAttribute("href", "/grantApproveRules/123");

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

@@ -51,10 +51,10 @@ describe("<StructureGrantSummaryButton />", () => {
       renderOpts
     );
 
-    await waitFor(() => expect(queryByText(/lazy/i)).not.toBeInTheDocument());
-    await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
-    );
+    await waitFor(() => {
+      expect(queryByText(/lazy/i)).not.toBeInTheDocument();
+      expect(container.querySelector(".loader")).not.toBeInTheDocument();
+    });
 
     expectToRenderDropdownComponent(container);
     expect(container).toMatchSnapshot();
@@ -67,10 +67,10 @@ describe("<StructureGrantSummaryButton />", () => {
       <StructureGrantSummaryButton />,
       renderOpts
     );
-    await waitFor(() => expect(queryByText(/lazy/i)).not.toBeInTheDocument());
-    await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
-    );
+    await waitFor(() => {
+      expect(queryByText(/lazy/i)).not.toBeInTheDocument();
+      expect(container.querySelector(".loader")).not.toBeInTheDocument();
+    });
 
     expectToRenderDropdownComponent(container);
     expect(container).toMatchSnapshot();
@@ -83,10 +83,10 @@ describe("<StructureGrantSummaryButton />", () => {
       <StructureGrantSummaryButton />,
       renderOpts
     );
-    await waitFor(() => expect(queryByText(/lazy/i)).not.toBeInTheDocument());
-    await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
-    );
+    await waitFor(() => {
+      expect(queryByText(/lazy/i)).not.toBeInTheDocument();
+      expect(container.querySelector(".loader")).not.toBeInTheDocument();
+    });
 
     expectToRenderDropdownComponent(container);
     expect(container).toMatchSnapshot();
@@ -99,10 +99,10 @@ describe("<StructureGrantSummaryButton />", () => {
       <StructureGrantSummaryButton />,
       renderOpts
     );
-    await waitFor(() => expect(queryByText(/lazy/i)).not.toBeInTheDocument());
-    await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
-    );
+    await waitFor(() => {
+      expect(queryByText(/lazy/i)).not.toBeInTheDocument();
+      expect(container.querySelector(".loader")).not.toBeInTheDocument();
+    });
 
     await expectToRenderRequestButton(container, getByRole);
     expect(container).toMatchSnapshot();
@@ -115,10 +115,10 @@ describe("<StructureGrantSummaryButton />", () => {
       <StructureGrantSummaryButton />,
       renderOpts
     );
-    await waitFor(() => expect(queryByText(/lazy/i)).not.toBeInTheDocument());
-    await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
-    );
+    await waitFor(() => {
+      expect(queryByText(/lazy/i)).not.toBeInTheDocument();
+      expect(container.querySelector(".loader")).not.toBeInTheDocument();
+    });
 
     await expectToRenderRequestButton(container, getByRole);
     expect(container).toMatchSnapshot();

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

@@ -81,6 +81,9 @@ describe("<StructureSelector />", () => {
       renderOpts
     );
 
+    await waitFor(() =>
+      expect(container.querySelector(".loader")).not.toBeInTheDocument()
+    );
     await waitFor(() => {
       expect(container.querySelector(".loading")).toBeNull();
     });

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

@@ -2,14 +2,20 @@ import _ from "lodash/fp";
 import React from "react";
 import { waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
-import { templateByNameMock } from "@truedat/test/mocks";
+import {
+  templateByNameMock,
+  emptyTemplateByNameMock,
+} from "@truedat/test/mocks";
 import { render } from "@truedat/test/render";
 import StructuresBulkUpdate from "../StructuresBulkUpdate";
 import { bulkUpdateStructures } from "../../routines";
 
 describe("<StructuresBulkUpdate />", () => {
   const renderOpts = {
-    mocks: [templateByNameMock({ name: "template1", domainIds: [1] })],
+    mocks: [
+      templateByNameMock({ name: "template1", domainIds: [1] }),
+      emptyTemplateByNameMock(),
+    ],
     state: {
       previousStructureQuery: {
         structureCount: 10,
@@ -31,10 +37,10 @@ describe("<StructuresBulkUpdate />", () => {
       renderOpts
     );
 
-    await waitFor(() => expect(queryByText(/lazy/i)).not.toBeInTheDocument());
-    await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
-    );
+    await waitFor(() => {
+      expect(queryByText(/lazy/i)).not.toBeInTheDocument();
+      expect(container.querySelector(".loader")).not.toBeInTheDocument();
+    });
     expect(container).toMatchSnapshot();
   });
 
@@ -43,10 +49,14 @@ describe("<StructuresBulkUpdate />", () => {
       "state.previousStructureQuery.allFilters",
       () => ({})
     )(renderOpts);
-    const { container, getByText } = render(
+    const { container, queryByText, getByText } = render(
       <StructuresBulkUpdate />,
       thisRenderOpts
     );
+    await waitFor(() => {
+      expect(queryByText(/lazy/i)).not.toBeInTheDocument();
+      expect(container.querySelector(".loader")).not.toBeInTheDocument();
+    });
     const emptySearchText = getByText("Empty Search");
     expect(emptySearchText).toBeInTheDocument();
     expect(container).toMatchSnapshot();
@@ -66,10 +76,11 @@ describe("<StructuresBulkUpdate />", () => {
       { ...thisRenderOpts, dispatch }
     );
 
-    await waitFor(() => expect(queryByText(/lazy/i)).not.toBeInTheDocument());
-    await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
-    );
+    await waitFor(() => {
+      expect(queryByText(/lazy/i)).not.toBeInTheDocument();
+      expect(queryByText(/loading/i)).not.toBeInTheDocument();
+      expect(container.querySelector(".loader")).not.toBeInTheDocument();
+    });
 
     userEvent.type(await findByRole("textbox"), "bar");
 

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

@@ -81,6 +81,9 @@ describe("<StructuresGrantRequestView />", () => {
     await waitFor(() => {
       expect(container.querySelector(".loading")).toBeNull();
     });
+    await waitFor(() =>
+      expect(container.querySelector(".loader")).not.toBeInTheDocument()
+    );
     await waitFor(() => expect(container).toMatchSnapshot());
 
     const structure1Row = await queryByText(/structure_1/).closest("tr");

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

@@ -36,7 +36,7 @@ const searchProps = {
 describe("<StructuresSearchResults />", () => {
   const columns = [{ name: "foo", sort: { name: "name.raw" } }];
 
-  it("matches the latest snapshot", () => {
+  it("matches the latest snapshot", async () => {
     const props = { structures, columns };
     const { container } = render(
       <SearchContextWrapper props={searchProps}>
@@ -44,6 +44,10 @@ describe("<StructuresSearchResults />", () => {
       </SearchContextWrapper>,
       renderOpts
     );
+
+    await waitFor(() =>
+      expect(container.querySelector(".loader")).not.toBeInTheDocument()
+    );
     expect(container).toMatchSnapshot();
   });
 

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

@@ -62,6 +62,7 @@ exports[`<ReferenceDataset /> edit dataset view matches the latest snapshot 1`]
           class="right aligned eight wide column"
         >
           <div
+            aria-disabled="false"
             aria-expanded="false"
             class="ui floating dropdown button icon group-actions"
             role="listbox"
@@ -352,6 +353,7 @@ exports[`<ReferenceDataset /> show dataset view matches the latest snapshot 1`]
           class="right aligned eight wide column"
         >
           <div
+            aria-disabled="false"
             aria-expanded="false"
             class="ui floating dropdown button icon group-actions"
             role="listbox"

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

@@ -3,6 +3,7 @@
 exports[`<ReferenceDatasetActions /> matches the latest snapshot 1`] = `
 <div>
   <div
+    aria-disabled="false"
     aria-expanded="false"
     class="ui floating dropdown button icon group-actions"
     role="listbox"

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

@@ -40,6 +40,7 @@ exports[`<ReferenceDatasetHeader /> matches the latest snapshot 1`] = `
         class="right aligned eight wide column"
       >
         <div
+          aria-disabled="false"
           aria-expanded="false"
           class="ui floating dropdown button icon group-actions"
           role="listbox"

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

@@ -385,6 +385,7 @@ exports[`<ReferenceDatasetRoutes /> matches the latest snapshot (view route) 1`]
           class="right aligned eight wide column"
         >
           <div
+            aria-disabled="false"
             aria-expanded="false"
             class="ui floating dropdown button icon group-actions"
             role="listbox"

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

@@ -19,5 +19,6 @@ exports[`<StructureNoteActions /> matches the latest snapshot 1`] = `
     ]
   }
   direction="left"
+  disabled={false}
 />
 `;

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

@@ -75,18 +75,6 @@ exports[`<StructureSelector /> matches the latest snapshot 1`] = `
     <div
       class="dimmable structure-table-overflow"
     >
-      <div
-        class="ui inverted dimmer"
-        style=""
-      >
-        <div
-          class="content"
-        >
-          <div
-            class="ui large loader"
-          />
-        </div>
-      </div>
       <div
         class="ui label structures-label-results"
       >

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

@@ -108,18 +108,6 @@ exports[`<StructuresGrantRequestView /> Clicking a grant request button triggers
       <div
         class="dimmable structure-table-overflow"
       >
-        <div
-          class="ui inverted dimmer"
-          style=""
-        >
-          <div
-            class="content"
-          >
-            <div
-              class="ui large loader"
-            />
-          </div>
-        </div>
         <div
           class="ui label structures-label-results"
         >

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

@@ -5,17 +5,6 @@ exports[`<StructuresSearchResults /> matches the latest snapshot 1`] = `
   <div
     class="dimmable structure-table-overflow"
   >
-    <div
-      class="ui inverted dimmer"
-    >
-      <div
-        class="content"
-      >
-        <div
-          class="ui large loader"
-        />
-      </div>
-    </div>
     <div
       class="ui label structures-label-results"
     >