@truedat/auth 8.12.5 → 8.12.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/auth",
-  "version": "8.12.5",
+  "version": "8.12.7",
   "description": "Truedat Web Auth",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -54,14 +54,14 @@
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.6.1",
-    "@truedat/test": "8.12.5",
+    "@truedat/test": "8.12.7",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "redux-saga-test-plan": "^4.0.6"
   },
   "dependencies": {
     "@apollo/client": "^3.13.8",
-    "@truedat/core": "8.12.5",
+    "@truedat/core": "8.12.7",
     "auth0-js": "^10.2.0",
     "axios": "^1.15.0",
     "graphql": "^16.11.0",
@@ -90,5 +90,5 @@
     "swr": "^2.3.3"
   },
   "overrides": {},
-  "gitHead": "71dd08262e6c26dd25466154c49fadb7b3449bd7"
+  "gitHead": "dae06fd2f915163d5f1e7e3f26c414c8ee9bf055"
 }

package/src/groups/components/Group.js

@@ -2,7 +2,8 @@ import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { Header, Button, Icon, Grid } from "semantic-ui-react";
 import { FormattedMessage, useIntl } from "react-intl";
-import { ConfirmModal, GroupActions } from "@truedat/core/components";
+import ConfirmModal from "@truedat/core/components/ConfirmModal";
+import GroupActions from "@truedat/core/components/GroupActions";
 import { deleteGroup } from "../routines";
 
 const ModalDelete = ({ group: { id, name }, deleteGroup }) => {

package/src/groups/components/GroupCard.js

@@ -3,7 +3,7 @@ import { connect } from "react-redux";
 import { Button, Card, Icon } from "semantic-ui-react";
 import { Link } from "react-router";
 import { FormattedMessage } from "react-intl";
-import { ConfirmModal } from "@truedat/core/components";
+import ConfirmModal from "@truedat/core/components/ConfirmModal";
 import { linkTo } from "@truedat/core/routes";
 import { deleteGroup } from "../routines";
 

package/src/groups/components/GroupForm.js

@@ -4,7 +4,7 @@ import { useForm, Controller } from "react-hook-form";
 import { useIntl } from "react-intl";
 import { connect } from "react-redux";
 import { Button, Form, Header } from "semantic-ui-react";
-import { HistoryBackButton } from "@truedat/core/components";
+import HistoryBackButton from "@truedat/core/components/HistoryBackButton";
 import { accentInsensitivePathOrder } from "@truedat/core/services/sort";
 
 const toOption = ({ id, full_name, user_name }) => ({

package/src/groups/components/GroupLoader.js

@@ -1,7 +1,7 @@
 import { useEffect } from "react";
 import { useParams } from "react-router";
 import { useDispatch, useSelector } from "react-redux";
-import { Loading } from "@truedat/core/components";
+import Loading from "@truedat/core/components/Loading";
 import { clearGroup, fetchGroup } from "../routines";
 
 const GroupLoader = () => {

package/src/groups/components/GroupUsers.js

@@ -5,7 +5,7 @@ import { Link } from "react-router";
 import { connect } from "react-redux";
 import { Segment, Button, Divider } from "semantic-ui-react";
 import { FormattedMessage, useIntl } from "react-intl";
-import { SearchInput } from "@truedat/core/components";
+import SearchInput from "@truedat/core/components/SearchInput";
 import { linkTo } from "@truedat/core/routes";
 import GroupUsersTable from "./GroupUsersTable";
 

package/src/groups/components/GroupUsersTable.js

@@ -5,7 +5,7 @@ import { useIntl } from "react-intl";
 import { connect } from "react-redux";
 import { useNavigate } from "react-router";
 import { Table, Header, Icon, Button } from "semantic-ui-react";
-import { ConfirmModal } from "@truedat/core/components";
+import ConfirmModal from "@truedat/core/components/ConfirmModal";
 import { linkTo } from "@truedat/core/routes";
 import { columnDecorator } from "@truedat/core/services";
 import { accentInsensitivePathOrder } from "@truedat/core/services/sort";

package/src/groups/components/GroupsLoader.js

@@ -1,7 +1,7 @@
 import { Component } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
-import { Loading } from "@truedat/core/components";
+import Loading from "@truedat/core/components/Loading";
 import { fetchGroups } from "../routines";
 
 class GroupsLoader extends Component {

package/src/groups/components/__tests__/GroupUsersTable.spec.js

@@ -1,5 +1,6 @@
 import userEvent from "@testing-library/user-event";
-import { render, waitForLoad } from "@truedat/test/render";
+import { renderWithIntl as render } from "@truedat/test/renderWithIntl";
+import { waitForLoad } from "@truedat/test/waitForLoad";
 import { GroupUsersTable } from "../GroupUsersTable";
 
 jest.mock("react-router", () => ({
@@ -53,7 +54,7 @@ describe("<GroupUsersTable />", () => {
 
     // Click on the username column header to sort
     const usernameHeader = rendered.getByText(/user_name/i);
-    userEvent.click(usernameHeader);
+    await userEvent.click(usernameHeader);
 
     // First row should now contain "auser_3" after sorting
     const firstRowCells = rendered.container.querySelectorAll(

package/src/roles/components/RoleCards.js

@@ -3,7 +3,7 @@ import { Button, Card, Label, Icon } from "semantic-ui-react";
 import { connect } from "react-redux";
 import { Link } from "react-router";
 import { FormattedMessage } from "react-intl";
-import { ConfirmModal } from "@truedat/core/components";
+import ConfirmModal from "@truedat/core/components/ConfirmModal";
 import { linkTo } from "@truedat/core/routes";
 import { deleteRole } from "../routines";
 

package/src/roles/components/RoleForm.js

@@ -4,7 +4,7 @@ import { useForm, Controller } from "react-hook-form";
 import { Button, Form } from "semantic-ui-react";
 import { useIntl } from "react-intl";
 import { connect } from "react-redux";
-import { HistoryBackButton } from "@truedat/core/components";
+import HistoryBackButton from "@truedat/core/components/HistoryBackButton";
 
 export const RoleForm = ({ role, isSubmitting, onSubmit }) => {
   const { formatMessage } = useIntl();

package/src/roles/components/RoleLoader.js

@@ -2,7 +2,7 @@ import { useEffect } from "react";
 import PropTypes from "prop-types";
 import { useParams } from "react-router";
 import { useDispatch, useSelector } from "react-redux";
-import { Loading } from "@truedat/core/components";
+import Loading from "@truedat/core/components/Loading";
 import {
   fetchPermissions,
   fetchRole,

package/src/roles/components/RolesLoader.js

@@ -1,7 +1,7 @@
 import { Component } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
-import { Loading } from "@truedat/core/components";
+import Loading from "@truedat/core/components/Loading";
 import { fetchRoles, clearRoles } from "../routines";
 
 class RolesLoader extends Component {

package/src/roles/components/__tests__/PermissionGroup.spec.js

@@ -1,4 +1,5 @@
-import { render, waitForLoad } from "@truedat/test/render";
+import { renderWithIntl as render } from "@truedat/test/renderWithIntl";
+import { waitForLoad } from "@truedat/test/waitForLoad";
 import { PermissionGroup } from "../PermissionGroup";
 
 describe("<PermissionGroup />", () => {

package/src/sessions/components/Auth0Callback.js

@@ -5,7 +5,7 @@ import { connect } from "react-redux";
 import { useLocation } from "react-router";
 import { Navigate } from "react-router";
 import auth0 from "auth0-js";
-import { Loading } from "@truedat/core/components";
+import Loading from "@truedat/core/components/Loading";
 import queryString from "query-string";
 import { SEARCH } from "@truedat/core/routes";
 import { auth0Login } from "../routines";

package/src/sessions/components/NonceCallback.js

@@ -3,7 +3,7 @@ import PropTypes from "prop-types";
 import { useLocation, Navigate } from "react-router";
 import { useDispatch, useSelector } from "react-redux";
 import queryString from "query-string";
-import { Loading } from "@truedat/core/components";
+import Loading from "@truedat/core/components/Loading";
 import { nonceLogin } from "../routines";
 
 export default function NonceCallback({ authMethod }) {

package/src/sessions/components/OpenIDConnect.js

@@ -5,7 +5,7 @@ import queryString from "query-string";
 import { connect } from "react-redux";
 import { useLocation } from "react-router";
 import { Navigate } from "react-router";
-import { Loading } from "@truedat/core/components";
+import Loading from "@truedat/core/components/Loading";
 import { SEARCH } from "@truedat/core/routes";
 import { openIdLogin } from "../routines";
 

package/src/sessions/components/__tests__/Auth0LoginButton.spec.js

@@ -1,4 +1,4 @@
-import { render } from "@truedat/test/render";
+import { renderWithIntl as render } from "@truedat/test/renderWithIntl";
 import { Auth0LoginButton } from "../Auth0LoginButton";
 
 describe("<Auth0LoginButton />", () => {

package/src/sessions/components/__tests__/LoginButtons.spec.js

@@ -1,4 +1,4 @@
-import { render } from "@truedat/test/render";
+import { renderWithIntl as render } from "@truedat/test/renderWithIntl";
 import { LoginButtons } from "../LoginButtons";
 
 describe("<LoginButtons />", () => {

package/src/sessions/components/__tests__/OidcLoginButton.spec.js

@@ -1,4 +1,4 @@
-import { render } from "@truedat/test/render";
+import { renderWithIntl as render } from "@truedat/test/renderWithIntl";
 import { OidcLoginButton } from "../OidcLoginButton";
 
 describe("<OidcLoginButton />", () => {

package/src/users/components/AdminUserRoutes.js

@@ -1,7 +1,7 @@
 import React from "react";
 import { Route, Routes } from "react-router";
 import { Divider, Segment } from "semantic-ui-react";
-import { Unauthorized } from "@truedat/core/components";
+import Unauthorized from "@truedat/core/components/Unauthorized";
 import { useActiveRoute, useAuthorized } from "@truedat/core/hooks";
 import { ProtectedRoute, Loader } from "@truedat/core/router";
 import {

package/src/users/components/Password.js

@@ -5,7 +5,7 @@ import { FormattedMessage, useIntl } from "react-intl";
 import { connect } from "react-redux";
 import { useForm, Controller } from "react-hook-form";
 import { Button, Form } from "semantic-ui-react";
-import { HistoryBackButton } from "@truedat/core/components";
+import HistoryBackButton from "@truedat/core/components/HistoryBackButton";
 import { updatePassword } from "../routines";
 
 const MIN_LENGTH = 6;

package/src/users/components/UserActions.js

@@ -3,7 +3,8 @@ import { connect, useDispatch } from "react-redux";
 import PropTypes from "prop-types";
 import { Button, Icon } from "semantic-ui-react";
 import { FormattedMessage } from "react-intl";
-import { ConfirmModal, GroupActions } from "@truedat/core/components";
+import ConfirmModal from "@truedat/core/components/ConfirmModal";
+import GroupActions from "@truedat/core/components/GroupActions";
 import { linkTo, USERS } from "@truedat/core/routes";
 import { Link, useNavigate } from "react-router";
 import { deleteUser, fetchUsers } from "../routines";

package/src/users/components/UserCards.js

@@ -5,7 +5,7 @@ import { connect } from "react-redux";
 import { Link } from "react-router";
 import { Button, Card, Header, Icon, Message } from "semantic-ui-react";
 import { FormattedMessage, useIntl } from "react-intl";
-import { SearchInput } from "@truedat/core/components";
+import SearchInput from "@truedat/core/components/SearchInput";
 import { USERS_NEW } from "@truedat/core/routes";
 import { filterUsers } from "../selectors/filterUsers";
 import UserCard from "./UserCard";

package/src/users/components/UserDomainsFilter.js

@@ -5,7 +5,7 @@ import { Form } from "semantic-ui-react";
 import { setDashboardDomains } from "@truedat/core/routines";
 import { useIntl } from "react-intl";
 import PropTypes from "prop-types";
-import { DomainSelector } from "@truedat/core/components";
+import DomainSelector from "@truedat/core/components/DomainSelector";
 
 export const UserDomainsFilter = ({
   action = "viewDomain",

package/src/users/components/UserForm.js

@@ -4,7 +4,7 @@ import { useIntl } from "react-intl";
 import { useForm, useWatch, Controller } from "react-hook-form";
 import { Button, Form } from "semantic-ui-react";
 import { connect } from "react-redux";
-import { HistoryBackButton } from "@truedat/core/components";
+import HistoryBackButton from "@truedat/core/components/HistoryBackButton";
 
 const groupOptions = (groups = [], values) => {
   const groupOpts = _.map.convert({ cap: false })((g, i) => {

package/src/users/components/UserLoader.js

@@ -2,7 +2,7 @@ import { useEffect } from "react";
 import { useParams } from "react-router";
 import PropTypes from "prop-types";
 import { useDispatch, useSelector } from "react-redux";
-import { Loading } from "@truedat/core/components";
+import Loading from "@truedat/core/components/Loading";
 import { clearUser, fetchUser } from "../routines";
 
 function UserLoader() {

package/src/users/components/UsersLoader.js

@@ -1,7 +1,7 @@
 import { Component } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
-import { Loading } from "@truedat/core/components";
+import Loading from "@truedat/core/components/Loading";
 import { fetchUsers } from "../routines";
 
 class UsersLoader extends Component {

package/src/users/components/__tests__/CanInitLoader.spec.js

@@ -1,4 +1,5 @@
-import { render, waitForLoad } from "@truedat/test/render";
+import { renderWithIntl as render } from "@truedat/test/renderWithIntl";
+import { waitForLoad } from "@truedat/test/waitForLoad";
 import { CanInitLoader } from "../CanInitLoader";
 
 describe("<CanInitLoader />", () => {

package/src/users/components/__tests__/Password.spec.js

@@ -1,8 +1,12 @@
 import { waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
-import { render } from "@truedat/test/render";
+import { MemoryRouter } from "react-router";
+import { renderWithIntl } from "@truedat/test/renderWithIntl";
 import { Password } from "../Password";
 
+const render = (component) =>
+  renderWithIntl(<MemoryRouter>{component}</MemoryRouter>);
+
 describe("<Password />", () => {
   beforeEach(() => jest.useRealTimers());
 

package/src/users/components/__tests__/UserAclRow.spec.js

@@ -1,4 +1,4 @@
-import { render } from "@truedat/test/render";
+import { renderWithIntl as render } from "@truedat/test/renderWithIntl";
 import { UserAclRow } from "../UserAclRow";
 
 describe("<UserAclRow />", () => {

package/src/users/components/__tests__/UserForm.spec.js

@@ -1,24 +1,23 @@
 import userEvent from "@testing-library/user-event";
 import { waitFor } from "@testing-library/react";
-import { render, waitForLoad } from "@truedat/test/render";
-import UserForm from "../UserForm";
+import { MemoryRouter } from "react-router";
+import { renderWithIntl } from "@truedat/test/renderWithIntl";
+import { waitForLoad } from "@truedat/test/waitForLoad";
+import { UserForm } from "../UserForm";
 
-const renderOpts = {
-  state: {
-    user: { id: 123, user_name: "fred", full_name: "fredrik foobar" },
-  },
-};
+const render = (component) =>
+  renderWithIntl(<MemoryRouter>{component}</MemoryRouter>);
 
 describe("<UserForm />", () => {
   beforeEach(() => jest.useRealTimers());
 
   it("matches the latest snapshot", async () => {
-    const rendered = render(<UserForm />, renderOpts);
+    const rendered = render(<UserForm />);
     await waitForLoad(rendered);
     expect(rendered.container).toMatchSnapshot();
   });
   it("validates email format", async () => {
-    const rendered = render(<UserForm />, renderOpts);
+    const rendered = render(<UserForm />);
     await waitForLoad(rendered);
 
     const user = userEvent.setup({ delay: null });
@@ -50,10 +49,7 @@ describe("<UserForm />", () => {
 
   it("calls the onSubmit function when submitted", async () => {
     const onSubmit = jest.fn();
-    const rendered = render(
-      <UserForm onSubmit={(props) => onSubmit(props)} />,
-      renderOpts,
-    );
+    const rendered = render(<UserForm onSubmit={(props) => onSubmit(props)} />);
     await waitForLoad(rendered);
 
     const user = userEvent.setup({ delay: null });
@@ -108,10 +104,7 @@ describe("<UserForm />", () => {
       { name: "admins", alias: "Administrators" },
       { name: "users", alias: "Users" },
     ];
-    const rendered = render(<UserForm groups={groups} />, {
-      ...renderOpts,
-      state: { ...renderOpts.state, groups },
-    });
+    const rendered = render(<UserForm groups={groups} />);
 
     await waitForLoad(rendered);
 
@@ -141,13 +134,6 @@ describe("<UserForm />", () => {
           groups: ["zzz", "admins", "ZZZ"],
         }}
       />,
-      {
-        ...renderOpts,
-        state: {
-          ...renderOpts.state,
-          groups,
-        },
-      },
     );
     await waitForLoad(rendered);
 

package/src/users/components/__tests__/UserGroupAclRow.spec.js

@@ -1,5 +1,5 @@
 import { waitFor } from "@testing-library/react";
-import { render } from "@truedat/test/render";
+import { renderWithIntl as render } from "@truedat/test/renderWithIntl";
 import UserGroupAclRow from "../UserGroupAclRow";
 
 describe("<UserGroupAclRow />", () => {

package/src/users/components/__tests__/UserRoutes.spec.js

@@ -1,8 +1,15 @@
 import React from "react";
-import { render, waitForLoad } from "@truedat/test/render";
+import { MemoryRouter } from "react-router";
+import { renderWithIntl } from "@truedat/test/renderWithIntl";
+import { waitForLoad } from "@truedat/test/waitForLoad";
 import { useAuthorized } from "@truedat/core/hooks/useAuthorized";
 import { UserRoutes } from "../UserRoutes";
 
+const render = (component, { routes = ["/"] } = {}) =>
+  renderWithIntl(
+    <MemoryRouter initialEntries={routes}>{component}</MemoryRouter>,
+  );
+
 jest.mock("@truedat/core/hooks/useAuthorized", () => ({
   useAuthorized: jest.fn(() => true),
 }));