@truedat/dd 8.12.2 → 8.12.4

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

@@ -4,6 +4,15 @@ import { render, waitForLoad } from "@truedat/test/render";
 import _ from "lodash/fp";
 import { StructureRow } from "../StructureRow";
 
+const renderRow = (props) =>
+  render(
+    <table>
+      <tbody>
+        <StructureRow {...props} />
+      </tbody>
+    </table>,
+  );
+
 describe("<StructureRow />", () => {
   const structure = {
     id: 1,
@@ -22,7 +31,7 @@ describe("<StructureRow />", () => {
 
   it("matches the latest snapshot", async () => {
     const props = { structure, columns };
-    const rendered = render(<StructureRow {...props} />);
+    const rendered = renderRow(props);
     await waitForLoad(rendered);
     expect(rendered.container).toMatchSnapshot();
   });
@@ -30,7 +39,7 @@ describe("<StructureRow />", () => {
   it("clicking the row will pass the structure to onClick()", async () => {
     const onClick = jest.fn();
     const props = { structure, columns, onClick };
-    const rendered = render(<StructureRow {...props} />);
+    const rendered = renderRow(props);
     await waitForLoad(rendered);
     const user = userEvent.setup({ delay: null });
 
@@ -56,7 +65,7 @@ describe("<StructureRow />", () => {
       },
     ];
     const props = { structure: testStructure, columns: testColumns };
-    const rendered = render(<StructureRow {...props} />);
+    const rendered = renderRow(props);
     await waitForLoad(rendered);
 
     expect(rendered.container.querySelector("td")).toHaveTextContent(testValue);
@@ -71,7 +80,7 @@ describe("<StructureRow />", () => {
     };
     const testColumns = [{ name: "testObject", fieldDecorator }];
     const props = { structure: testStructure, columns: testColumns };
-    const rendered = render(<StructureRow {...props} />);
+    const rendered = renderRow(props);
     await waitForLoad(rendered);
 
     const decoratedValue = fieldDecorator(testValue);

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

@@ -1,6 +1,8 @@
 import { render, waitForLoad } from "@truedat/test/render";
 import { StructureSelector } from "../StructureSelector";
 
+jest.mock("@truedat/core/hooks/useUserFilters");
+
 const data = {
   _actions: { bulkUpdate: {} },
   data: [

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

@@ -4,6 +4,8 @@ import userEvent from "@testing-library/user-event";
 import { StructureTag } from "../StructureTag";
 
 describe("<StructureTag />", () => {
+  beforeEach(() => jest.useRealTimers());
+
   const tagName = "Tag 42";
   const structureTag = {
     id: "1",

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

@@ -4,6 +4,8 @@ import { render, waitForLoad } from "@truedat/test/render";
 import { StructureTagForm } from "../StructureTagForm";
 
 describe("<StructureTagForm />", () => {
+  beforeEach(() => jest.useRealTimers());
+
   const tags = [
     { id: "1", name: "Tag1", description: "desc1" },
     { id: "2", name: "Tag2", description: "desc2" },

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

@@ -1,3 +1,4 @@
+import { act } from "@testing-library/react";
 import { render } from "@truedat/test/render";
 import StructureType from "../StructureType";
 
@@ -17,8 +18,9 @@ const renderOpts = {
 };
 
 describe("<StructureType />", () => {
-  it("matches the latest snapshot", () => {
+  it("matches the latest snapshot", async () => {
     const { container } = render(<StructureType />, renderOpts);
+    await act(async () => {});
     expect(container).toMatchSnapshot();
   });
 });

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

@@ -1,3 +1,4 @@
+import { act } from "@testing-library/react";
 import { render } from "@truedat/test/render";
 import StructureTypeForm from "../StructureTypeForm";
 
@@ -39,8 +40,9 @@ const renderOpts = {
 };
 
 describe("<StructureTypeForm />", () => {
-  it("matches the latest snapshot", () => {
+  it("matches the latest snapshot", async () => {
     const { container } = render(<StructureTypeForm />, renderOpts);
+    await act(async () => {});
     expect(container).toMatchSnapshot();
   });
 });

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

@@ -1,7 +1,12 @@
 import { render } from "@truedat/test/render";
 import { waitFor } from "@testing-library/react";
+import { STRUCTURE_TAGS_QUERY } from "../../api/queries";
 import StructureView from "../StructureView";
 
+jest.mock("../../hooks/useBucketStructures", () => ({
+  useBucketStructures: () => ({ data: undefined, isLoading: true }),
+}));
+
 jest.mock("react-router", () => ({
   ...jest.requireActual("react-router"),
   useParams: () => ({ id: 1 }),
@@ -33,6 +38,14 @@ const commonState = {
 };
 
 describe("<StructureView />", () => {
+  const structureTagsMock = {
+    request: { query: STRUCTURE_TAGS_QUERY, variables: { id: 1 } },
+    result: {
+      data: {
+        dataStructure: { id: 1, availableTags: [], structureTags: [] },
+      },
+    },
+  };
   it("Some inner component shows the structure name", () => {
     const renderOpts = {
       state: {
@@ -48,7 +61,10 @@ describe("<StructureView />", () => {
       },
     };
 
-    const { getAllByText } = render(<StructureView />, renderOpts);
+    const { getAllByText } = render(<StructureView />, {
+      ...renderOpts,
+      mocks: [structureTagsMock],
+    });
     expect(getAllByText("some_db")[0]).toBeInTheDocument();
   });
 

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

@@ -6,6 +6,8 @@ import { functionsMock } from "@truedat/test/mocks";
 import { StructuresGrantRequestView } from "../StructuresGrantRequestView";
 import en from "../../messages/en";
 
+jest.mock("@truedat/core/hooks/useUserFilters");
+
 const mockHistory = jest.fn();
 
 jest.mock("react-router", () => ({

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

@@ -1,10 +1,11 @@
-import _ from "lodash/fp";
 import { within } from "@testing-library/react";
 import { render, waitForLoad } from "@truedat/test/render";
 import SearchContext from "@truedat/core/search/SearchContext";
 import StructuresView from "../StructuresView";
 import { StructuresViewContent } from "../StructuresView";
 
+jest.mock("@truedat/core/hooks/useUserFilters");
+
 const mockHistory = jest.fn();
 
 jest.mock("react-router", () => ({

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

@@ -1,10 +1,13 @@
 import { render } from "@truedat/test/render";
+import { domainsMock } from "@truedat/test/mocks";
 import Tag from "../Tag";
 
 describe("<Tag />", () => {
   it("matches the latest snapshot", () => {
     const createTag = jest.fn();
-    const { container } = render(<Tag createTag={createTag} />);
+    const { container } = render(<Tag createTag={createTag} />, {
+      mocks: [domainsMock({ action: "manageTags" })],
+    });
     expect(container).toMatchSnapshot();
   });
 });

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

@@ -1,9 +1,15 @@
 import { render } from "@truedat/test/render";
+import { TAGS_QUERY } from "../../api/queries";
 import Tags from "../Tags";
 
+const tagsMock = {
+  request: { query: TAGS_QUERY },
+  result: { data: { tags: [] } },
+};
+
 describe("<Tags />", () => {
   it("matches the latest snapshot", () => {
-    const { container } = render(<Tags />);
+    const { container } = render(<Tags />, { mocks: [tagsMock] });
     expect(container).toMatchSnapshot();
   });
 });

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

@@ -41,7 +41,23 @@ exports[`<GrantsTable /> matches the latest snapshot 1`] = `
       >
         <td
           class=""
-        />
+        >
+          <h4
+            class="ui header"
+          >
+            <div
+              class="content"
+            >
+              user_full_name_1
+               
+              <div
+                class="sub header"
+              >
+                user1@example.com
+              </div>
+            </div>
+          </h4>
+        </td>
         <td
           class=""
         >
@@ -92,7 +108,23 @@ exports[`<GrantsTable /> matches the latest snapshot 1`] = `
       >
         <td
           class=""
-        />
+        >
+          <h4
+            class="ui header"
+          >
+            <div
+              class="content"
+            >
+              user_full_name_2
+               
+              <div
+                class="sub header"
+              >
+                user2@example.com
+              </div>
+            </div>
+          </h4>
+        </td>
         <td
           class=""
         >

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

@@ -2,35 +2,37 @@
 
 exports[`<LineageDefs /> matches the latest snapshot 1`] = `
 <div>
-  <defs>
-    <marker
-      id="end"
-      markerheight="6"
-      markerwidth="6"
-      orient="auto"
-      refx="10"
-      refy="0"
-      viewbox="0 -5 10 10"
-    >
-      <path
-        d="M0,-5L10,0L0,5L0,-5"
-        fill="#999"
-      />
-    </marker>
-    <marker
-      id="end-active"
-      markerheight="6"
-      markerwidth="6"
-      orient="auto"
-      refx="10"
-      refy="0"
-      viewbox="0 -5 10 10"
-    >
-      <path
-        d="M0,-5L10,0L0,5L0,-5"
-        fill="orangered"
-      />
-    </marker>
-  </defs>
+  <svg>
+    <defs>
+      <marker
+        id="end"
+        markerHeight="6"
+        markerWidth="6"
+        orient="auto"
+        refX="10"
+        refY="0"
+        viewBox="0 -5 10 10"
+      >
+        <path
+          d="M0,-5L10,0L0,5L0,-5"
+          fill="#999"
+        />
+      </marker>
+      <marker
+        id="end-active"
+        markerHeight="6"
+        markerWidth="6"
+        orient="auto"
+        refX="10"
+        refY="0"
+        viewBox="0 -5 10 10"
+      >
+        <path
+          d="M0,-5L10,0L0,5L0,-5"
+          fill="orangered"
+        />
+      </marker>
+    </defs>
+  </svg>
 </div>
 `;

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

@@ -142,22 +142,7 @@ exports[`<StructureFields /> matches the latest snapshot 1`] = `
         </td>
         <td
           class=""
-        >
-          <div
-            class="ui list"
-            role="list"
-          >
-            <div
-              class="item"
-              role="listitem"
-            >
-              <a
-                data-discover="true"
-                href="/concepts/123/versions/current"
-              />
-            </div>
-          </div>
-        </td>
+        />
       </tr>
       <tr
         class=""

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

@@ -2,24 +2,28 @@
 
 exports[`<StructureRelationRow /> matches the latest snapshot 1`] = `
 <div>
-  <tr
-    class=""
-  >
-    <td
-      class=""
-    >
-      Structure 1
-    </td>
-    <td
-      class=""
-    >
-      Some Type 1
-    </td>
-    <td
-      class=""
-    >
-      used_by
-    </td>
-  </tr>
+  <table>
+    <tbody>
+      <tr
+        class=""
+      >
+        <td
+          class=""
+        >
+          Structure 1
+        </td>
+        <td
+          class=""
+        >
+          Some Type 1
+        </td>
+        <td
+          class=""
+        >
+          used_by
+        </td>
+      </tr>
+    </tbody>
+  </table>
 </div>
 `;

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

@@ -2,29 +2,33 @@
 
 exports[`<StructureRow /> matches the latest snapshot 1`] = `
 <div>
-  <tr
-    class=""
-  >
-    <td
-      class="structure-cell-overflow"
-    >
-      s1
-    </td>
-    <td
-      class=""
-    >
-      org
-    </td>
-    <td
-      class=""
-    >
-      sys
-    </td>
-    <td
-      class=""
-    >
-      gp
-    </td>
-  </tr>
+  <table>
+    <tbody>
+      <tr
+        class=""
+      >
+        <td
+          class="structure-cell-overflow"
+        >
+          s1
+        </td>
+        <td
+          class=""
+        >
+          org
+        </td>
+        <td
+          class=""
+        >
+          sys
+        </td>
+        <td
+          class=""
+        >
+          gp
+        </td>
+      </tr>
+    </tbody>
+  </table>
 </div>
 `;

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

@@ -11,9 +11,13 @@ exports[`<StructuresUpdateOption /> matches the latest snapshot 1`] = `
       aria-hidden="true"
       class="refresh icon"
     />
-    <span>
-      update
-    </span>
+    <div
+      class="text"
+    >
+      <span>
+        update
+      </span>
+    </div>
   </div>
 </div>
 `;

package/src/messages/en.js

@@ -132,8 +132,8 @@ export default {
   "grantRequest.header.updated_at": "Updated",
   "grantRequest.header.user": "User",
   "grantRequest.header.group": "User group",
-  "grantRequest.deleted.user": "Deleted user",
-  "grantRequest.deleted.group": "Deleted group",
+  "deleted.user": "Deleted user",
+  "deleted.group": "Deleted group",
   "grantRequest.header.createdBy": "Created by",
   "grantRequest.header.create": "Create grant request",
   "grantRequest.header.type": "Request type",

package/src/messages/es.js

@@ -135,8 +135,8 @@ export default {
   "grantRequest.header.updated_at": "Actualizado",
   "grantRequest.header.user": "Usuario",
   "grantRequest.header.group": "Grupo de usuarios",
-  "grantRequest.deleted.user": "Usuario eliminado",
-  "grantRequest.deleted.group": "Grupo eliminado",
+  "deleted.user": "Usuario eliminado",
+  "deleted.group": "Grupo eliminado",
   "grantRequest.header.createdBy": "Creado por",
   "grantRequest.header.create": "Crear petición de acceso",
   "grantRequest.header.type": "Tipo de petición",

package/src/reducers/__tests__/grantRequestsCart.spec.js

@@ -497,4 +497,21 @@ describe("reducers: grantRequestsCart", () => {
     expect([null, undefined, ""]).toContain(state.user?.id);
     expect(state.user?.id).not.toBe("group:10");
   });
+
+  it("sets user_group_id when setGrantChangeRequestCart.TRIGGER opens a group grant", () => {
+    const structure = { id: 1 };
+    const grant = {
+      id: 2,
+      user_id: null,
+      user_group_id: 10,
+      detail: {},
+    };
+    const state = grantRequestsCart(initialState, {
+      type: setGrantChangeRequestCart.TRIGGER,
+      payload: { structure, grant },
+    });
+
+    expect(state.user_group_id).toBe(10);
+    expect(state.user?.id ?? null).toBeNull();
+  });
 });

package/src/reducers/__tests__/structureRelations.spec.js

@@ -95,3 +95,31 @@ describe("reducers: parentRelations", () => {
     expect(parentRelations(fooState, { type: "FOO" })).toBe(fooState);
   });
 });
+
+describe("reducers: structure relation concept links", () => {
+  const links = [{ name: "foo concept", resource_id: "1" }];
+  const data = {
+    relations: {
+      children: [{ id: 1, links }],
+      parents: [{ id: 2, links }],
+    },
+  };
+
+  it("should keep concept links on children relations", () => {
+    expect(
+      childrenRelations([], {
+        type: fetchStructure.SUCCESS,
+        payload: { data },
+      }),
+    ).toEqual([{ id: 1, links }]);
+  });
+
+  it("should keep concept links on parent relations", () => {
+    expect(
+      parentRelations([], {
+        type: fetchStructure.SUCCESS,
+        payload: { data },
+      }),
+    ).toEqual([{ id: 2, links }]);
+  });
+});

package/src/reducers/grantRequestsCart.js

@@ -127,6 +127,9 @@ const grantRequestsCart = (state = initialState, { type, payload }) => {
         templateContent: formatLegacyContent(grant.detail),
         modificationGrant: grant,
         structures: [mapPayload(structure)],
+        ...(_.isNil(grant?.user_group_id)
+          ? {}
+          : { user_group_id: grant.user_group_id }),
       };
     }
     case updateGrantRequestFilter.TRIGGER:

package/src/selectors/__tests__/__snapshots__/getGrantsColumns.spec.js.snap

@@ -62,15 +62,7 @@ exports[`GrantUserDecorator matches the latest snapshot 1`] = `
     <div
       class="content"
     >
-       
-      <div
-        class="ui teal small label"
-      >
-        Same
-      </div>
-      <div
-        class="sub header"
-      />
+      deleted.user
     </div>
   </h4>
 </div>

package/src/selectors/__tests__/getGrantRequestsSearchColumns.spec.js

@@ -73,8 +73,8 @@ describe("selectors: getGrantRequestsSearchColumns", () => {
           en: {
             "grantRequest.header.user": "User",
             "grantRequest.header.group": "User group",
-            "grantRequest.deleted.user": "Deleted user",
-            "grantRequest.deleted.group": "Deleted group",
+            "deleted.user": "Deleted user",
+            "deleted.group": "Deleted group",
           },
         },
       },
@@ -100,8 +100,8 @@ describe("selectors: getGrantRequestsSearchColumns", () => {
           en: {
             "grantRequest.header.user": "User",
             "grantRequest.header.group": "User group",
-            "grantRequest.deleted.user": "Deleted user",
-            "grantRequest.deleted.group": "Deleted group",
+            "deleted.user": "Deleted user",
+            "deleted.group": "Deleted group",
           },
         },
       },
@@ -109,4 +109,11 @@ describe("selectors: getGrantRequestsSearchColumns", () => {
     expect(rendered.getByText(/^deleted group$/i)).toBeInTheDocument();
     expect(rendered.queryByText(/^deleted user$/i)).not.toBeInTheDocument();
   });
+
+  it("sorts the user column by user_or_group.raw", () => {
+    const column = _.find({ name: "user" })(
+      defaultGrantRequestsSearchTableColumns,
+    );
+    expect(column.sort.name).toBe("user_or_group.raw");
+  });
 });