@truedat/auth 5.8.4 → 5.9.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/auth",
-  "version": "5.8.4",
+  "version": "5.9.1",
   "description": "Truedat Web Auth",
   "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.8.4",
+    "@truedat/test": "5.8.5",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -86,7 +86,7 @@
     ]
   },
   "dependencies": {
-    "@truedat/core": "5.8.4",
+    "@truedat/core": "5.9.1",
     "auth0-js": "^9.19.2",
     "decode-uri-component": "^0.2.2",
     "jwt-decode": "^2.2.0",
@@ -109,5 +109,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "7dfd208b88f5e98b40dde7797a58db8a64fef37d"
+  "gitHead": "aaeee38d6569e8c4c6bb605b0cc9b888bd4723a3"
 }

package/src/roles/components/RoleSelector.js

@@ -3,7 +3,7 @@ import React from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { useIntl } from "react-intl";
-import { Form } from "semantic-ui-react";
+import { Dropdown } from "semantic-ui-react";
 
 export const RoleSelector = ({
   value,
@@ -11,7 +11,8 @@ export const RoleSelector = ({
   onBlur,
   error,
   disabled,
-  roles
+  roles,
+  multiple = false,
 }) => {
   const { formatMessage } = useIntl();
   const options = _.flow(
@@ -19,11 +20,11 @@ export const RoleSelector = ({
     _.map(({ name: value, id: key }) => ({
       key,
       value,
-      text: value
+      text: value,
     }))
   )(roles);
   return (
-    <Form.Dropdown
+    <Dropdown
       disabled={disabled}
       error={error}
       onBlur={onBlur}
@@ -33,6 +34,7 @@ export const RoleSelector = ({
       options={options}
       onChange={onChange}
       value={value}
+      multiple={multiple}
     />
   );
 };
@@ -43,7 +45,8 @@ RoleSelector.propTypes = {
   onBlur: PropTypes.func,
   error: PropTypes.bool,
   disabled: PropTypes.bool,
-  roles: PropTypes.array
+  roles: PropTypes.array,
+  multiple: PropTypes.bool,
 };
 
 const mapStateToProps = _.pick(["roles"]);

package/src/roles/components/__tests__/__snapshots__/RoleSelector.spec.js.snap

@@ -3,50 +3,47 @@
 exports[`<RoleSelector /> matches the latest snapshot 1`] = `
 <div>
   <div
-    class="field"
+    aria-expanded="false"
+    class="ui search selection dropdown"
+    role="combobox"
   >
+    <input
+      aria-autocomplete="list"
+      autocomplete="off"
+      class="search"
+      tabindex="0"
+      type="text"
+      value=""
+    />
     <div
-      aria-expanded="false"
-      class="ui search selection dropdown"
-      role="combobox"
+      aria-atomic="true"
+      aria-live="polite"
+      class="divider default text"
+      role="alert"
+    >
+      Search Roles…
+    </div>
+    <i
+      aria-hidden="true"
+      class="dropdown icon"
+    />
+    <div
+      aria-multiselectable="false"
+      class="menu transition"
+      role="listbox"
     >
-      <input
-        aria-autocomplete="list"
-        autocomplete="off"
-        class="search"
-        tabindex="0"
-        type="text"
-        value=""
-      />
-      <div
-        aria-atomic="true"
-        aria-live="polite"
-        class="divider default text"
-        role="alert"
-      >
-        Search Roles…
-      </div>
-      <i
-        aria-hidden="true"
-        class="dropdown icon"
-      />
       <div
-        class="menu transition"
-        role="listbox"
+        aria-checked="false"
+        aria-selected="true"
+        class="selected item"
+        role="option"
+        style="pointer-events: all;"
       >
-        <div
-          aria-checked="false"
-          aria-selected="true"
-          class="selected item"
-          role="option"
-          style="pointer-events: all;"
+        <span
+          class="text"
         >
-          <span
-            class="text"
-          >
-            test1
-          </span>
-        </div>
+          test1
+        </span>
       </div>
     </div>
   </div>

package/src/users/components/UsersSearchLoader.js

@@ -1,3 +1,4 @@
+import _ from "lodash/fp";
 import React, { useEffect } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
@@ -6,6 +7,8 @@ import { searchUsers, clearUsersSearch } from "../routines";
 
 export const UsersSearchLoader = ({
   query,
+  domains,
+  roles,
   permission,
   hideLoading,
   searchUsers,
@@ -13,11 +16,18 @@ export const UsersSearchLoader = ({
   loading,
 }) => {
   useEffect(() => {
-    searchUsers({ query, permission });
+    const omissibleParams = _.omitBy(_.isEmpty)({ domains, roles });
+    const searchParams = {
+      query,
+      permission,
+      ...omissibleParams,
+    };
+
+    searchUsers(searchParams);
     return () => {
       clearUsersSearch();
     };
-  }, [searchUsers, clearUsersSearch, query, permission]);
+  }, [searchUsers, clearUsersSearch, query, domains, roles, permission]);
   return loading && !hideLoading ? (
     <Dimmer active inverted>
       <Loader size="massive" inverted />
@@ -28,6 +38,8 @@ export const UsersSearchLoader = ({
 UsersSearchLoader.propTypes = {
   query: PropTypes.string,
   permission: PropTypes.string,
+  domains: PropTypes.array,
+  roles: PropTypes.array,
   hideLoading: PropTypes.bool,
   searchUsers: PropTypes.func,
   clearUsersSearch: PropTypes.func,

package/src/users/sagas/searchUsers.js

@@ -8,7 +8,7 @@ export function* searchUsersSaga({ payload }) {
   try {
     const requestData = _.flow(
       _.omitBy(_.isNil),
-      _.pick(["query", "permission"])
+      _.pick(["query", "domains", "roles", "permission"])
     )(payload);
     const url = API_USERS_SEARCH;
     yield put(searchUsers.request());