@truedat/bg 6.3.0 → 6.3.2

package/src/taxonomy/reducers/__tests__/domainRedirect.spec.js

@@ -1,10 +1,5 @@
 import { clearRedirect } from "@truedat/core/routines";
-import {
-  addDomainMember,
-  createDomain,
-  updateDomain,
-  updateDomainMember,
-} from "../../routines";
+import { createDomain, updateDomain } from "../../routines";
 import { domainRedirect } from "..";
 
 describe("reducers: domainRedirect", () => {
@@ -35,20 +30,6 @@ describe("reducers: domainRedirect", () => {
     ).toEqual("/domains/10");
   });
 
-  it("should handle the addDomainMember.SUCCESS action", () => {
-    const meta = { resource_id: 20 };
-    expect(
-      domainRedirect("foo", { type: addDomainMember.SUCCESS, payload, meta })
-    ).toEqual("/domains/20/members");
-  });
-
-  it("should handle the updateDomainMember.SUCCESS action", () => {
-    const payload = { data: { resource_id: 20 } };
-    expect(
-      domainRedirect("foo", { type: updateDomainMember.SUCCESS, payload })
-    ).toEqual("/domains/20/members");
-  });
-
   it("should ignore unknown actions", () => {
     expect(domainRedirect("foo", { type: "bar", payload })).toEqual("foo");
   });

package/src/taxonomy/reducers/domainRedirect.js

@@ -1,13 +1,7 @@
 import _ from "lodash/fp";
 import { clearRedirect } from "@truedat/core/routines";
 import { linkTo } from "@truedat/core/routes";
-import {
-  addDomainMember,
-  createDomain,
-  deleteDomain,
-  updateDomain,
-  updateDomainMember,
-} from "../routines";
+import { createDomain, deleteDomain, updateDomain } from "../routines";
 
 const initialState = "";
 
@@ -22,14 +16,6 @@ export const domainRedirect = (
       return linkTo.DOMAIN(_.prop("data", payload));
     case updateDomain.SUCCESS:
       return linkTo.DOMAIN(_.prop("data", payload));
-    case addDomainMember.SUCCESS: {
-      const id = _.prop("resource_id")(meta);
-      return linkTo.DOMAIN_MEMBERS({ id });
-    }
-    case updateDomainMember.SUCCESS: {
-      const id = payload?.data?.resource_id;
-      return linkTo.DOMAIN_MEMBERS({ id });
-    }
     case deleteDomain.SUCCESS:
       const { redirectUrl } = meta;
       return redirectUrl;

package/src/taxonomy/reducers/index.js

@@ -2,13 +2,8 @@ import { domain } from "./domain";
 import { domainActions } from "./domainActions";
 import { domainCreating } from "./domainCreating";
 import { domainLoading } from "./domainLoading";
-import { domainMemberDeleting } from "./domainMemberDeleting";
-import { domainMemberSaving } from "./domainMemberSaving";
-import { domainMembers } from "./domainMembers";
 import { domainsConcept } from "./domainsConcept";
 import { domainsConceptLoading } from "./domainsConceptLoading";
-import { domainConceptChildren } from "./domainConceptChildren";
-import { domainConceptChildrenLoading } from "./domainConceptChildrenLoading";
 import { domainMembersActions } from "./domainMembersActions";
 import { domainMembersLoading } from "./domainMembersLoading";
 import { domainRedirect } from "./domainRedirect";
@@ -23,15 +18,10 @@ export {
   domainActions,
   domainCreating,
   domainLoading,
-  domainMemberDeleting,
-  domainMemberSaving,
   domainMembersActions,
-  domainMembers,
   domainMembersLoading,
   domainsConcept,
   domainsConceptLoading,
-  domainConceptChildren,
-  domainConceptChildrenLoading,
   domainRedirect,
   domains,
   domainsActions,

package/src/taxonomy/routines.js

@@ -5,17 +5,8 @@ export const fetchDomainsConcept = createRoutine("FETCH_CONCEPT_DOMAINS");
 export const clearDomainsConcept = createRoutine("CLEAR_DOMAINS");
 export const clearDomains = createRoutine("CLEAR_DOMAINS");
 export const filterDomains = createRoutine("FILTER_DOMAINS");
-export const clearDomainConceptChildren = createRoutine(
-  "CLEAR_DOMAIN_CONCEPT_CHILDREN"
-);
-export const fetchDomainConceptChildren = createRoutine(
-  "FETCH_DOMAIN_CONCEPT_CHILDREN"
-);
 
 export const fetchDomainMembers = createRoutine("FETCH_DOMAIN_MEMBERS");
-export const addDomainMember = createRoutine("ADD_DOMAIN_MEMBER");
-export const deleteDomainMember = createRoutine("DELETE_DOMAIN_MEMBER");
-export const updateDomainMember = createRoutine("UPDATE_DOMAIN_MEMBER");
 
 export const fetchDomain = createRoutine("FETCH_DOMAIN");
 export const createDomain = createRoutine("CREATE_DOMAIN");

package/src/taxonomy/sagas/index.js

@@ -1,39 +1,24 @@
-import { addDomainMemberRequestSaga } from "./addDomainMember";
 import { createDomainRequestSaga } from "./createDomain";
-import { deleteDomainMemberRequestSaga } from "./deleteDomainMember";
-import { updateDomainMemberRequestSaga } from "./updateDomainMember";
 import { updateDomainRequestSaga } from "./updateDomain";
 import { deleteDomainRequestSaga } from "./deleteDomain";
 import { fetchDomainsConceptRequestSaga } from "./fetchDomainsConcept";
-import { fetchDomainConceptChildrenRequestSaga } from "./fetchDomainConceptChildren";
-import { fetchDomainMembersRequestSaga } from "./fetchDomainMembers";
 import { fetchDomainRequestSaga } from "./fetchDomain";
 import { fetchDomainsRequestSaga } from "./fetchDomains";
 
 export {
-  addDomainMemberRequestSaga,
   createDomainRequestSaga,
-  deleteDomainMemberRequestSaga,
-  updateDomainMemberRequestSaga,
   updateDomainRequestSaga,
   deleteDomainRequestSaga,
   fetchDomainsConceptRequestSaga,
-  fetchDomainConceptChildrenRequestSaga,
-  fetchDomainMembersRequestSaga,
   fetchDomainRequestSaga,
   fetchDomainsRequestSaga,
 };
 
 export default [
-  addDomainMemberRequestSaga(),
   createDomainRequestSaga(),
-  deleteDomainMemberRequestSaga(),
-  updateDomainMemberRequestSaga(),
   updateDomainRequestSaga(),
   deleteDomainRequestSaga(),
   fetchDomainsConceptRequestSaga(),
-  fetchDomainConceptChildrenRequestSaga(),
-  fetchDomainMembersRequestSaga(),
   fetchDomainRequestSaga(),
   fetchDomainsRequestSaga(),
 ];

package/src/taxonomy/components/AddMember.js

@@ -1,23 +0,0 @@
-import React from "react";
-import { Container, Header, Icon, Segment } from "semantic-ui-react";
-import { FormattedMessage } from "react-intl";
-
-import AddMemberForm from "./AddMemberForm";
-import DomainCrumbs from "./DomainCrumbs";
-
-export const AddMember = () => (
-  <>
-    <DomainCrumbs />
-    <Container as={Segment} text>
-      <Header as="h2">
-        <Icon name="id card outline" />
-        <Header.Content>
-          <FormattedMessage id="domain.actions.add_member" />
-        </Header.Content>
-      </Header>
-      <AddMemberForm />
-    </Container>
-  </>
-);
-
-export default AddMember;

package/src/taxonomy/components/AddMemberForm.js

@@ -1,187 +0,0 @@
-import _ from "lodash/fp";
-import React, { useState } from "react";
-import PropTypes from "prop-types";
-import { Button, Form } from "semantic-ui-react";
-import { useForm, Controller } from "react-hook-form";
-import { useIntl } from "react-intl";
-import { connect } from "react-redux";
-import {
-  accentInsensitivePathOrder,
-  lowerDeburrTrim,
-} from "@truedat/core/services/sort";
-import { HistoryBackButton } from "@truedat/core/components";
-import { getRecipients } from "@truedat/audit/selectors";
-import { addDomainMember } from "../routines";
-
-const UsersSearchLoader = React.lazy(() =>
-  import("@truedat/auth/users/components/UsersSearchLoader")
-);
-const GroupsSearchLoader = React.lazy(() =>
-  import("@truedat/auth/groups/components/GroupsSearchLoader")
-);
-
-const MIN_SEARCH_CHARACTERS = 2;
-
-const roleOption = ({ id, name }) => ({ key: id, text: name, value: name });
-
-const roleOptions = (roles) =>
-  _.flow(
-    _.uniqBy("name"),
-    _.sortBy(accentInsensitivePathOrder("name")),
-    _.map(roleOption)
-  )(roles);
-
-export const AddMemberForm = ({
-  domain,
-  isSubmitting,
-  roles,
-  options,
-  addDomainMember,
-}) => {
-  const { formatMessage } = useIntl();
-  const [usersGroupsQuery, setUsersGroupsQuery] = useState("");
-  const { handleSubmit, control, formState } = useForm({
-    mode: "all",
-    defaultValues: { id: null, role: null, description: "" },
-  });
-  const onSubmit = ({ id, role, description }) => {
-    const [principal_type, principal_id] = _.split("_")(id);
-    const acl_entry = {
-      role_name: role,
-      resource_type: "domain",
-      principal_type,
-      principal_id: _.toNumber(principal_id),
-      description,
-    };
-    addDomainMember({ resource_id: domain.id, acl_entry });
-  };
-  const { isDirty, isValid } = formState;
-
-  const onSearch = (_currentOptions, { searchQuery }) =>
-    setUsersGroupsQuery(lowerDeburrTrim(searchQuery));
-
-  return (
-    <Form onSubmit={handleSubmit(onSubmit)}>
-      {_.size(usersGroupsQuery) >= MIN_SEARCH_CHARACTERS && (
-        <>
-          <UsersSearchLoader query={usersGroupsQuery} hideLoading />
-          <GroupsSearchLoader query={usersGroupsQuery} hideLoading />
-        </>
-      )}
-      <Controller
-        control={control}
-        name="id"
-        rules={{ required: true }}
-        render={({
-          field: { onBlur, onChange, value },
-          fieldState: { error },
-        }) => (
-          <Form.Dropdown
-            placeholder={formatMessage({
-              id: "domain.member",
-            })}
-            clearable
-            onChange={(_e, { value }) => onChange(value)}
-            deburr
-            minCharacters={MIN_SEARCH_CHARACTERS}
-            onSearchChange={onSearch}
-            search={_.identity}
-            selection
-            options={options}
-            required
-            label={{
-              children: formatMessage({ id: "domain.member" }),
-              htmlFor: "principal",
-            }}
-            error={!!error}
-            onBlur={onBlur}
-            value={value}
-          />
-        )}
-      />
-      <Controller
-        control={control}
-        name="role"
-        rules={{ required: true }}
-        render={({
-          field: { onBlur, onChange, value },
-          fieldState: { error },
-        }) => (
-          <Form.Select
-            basic
-            clearable
-            error={!!error}
-            label={{
-              children: formatMessage({ id: "domain.role" }),
-              htmlFor: "role",
-            }}
-            onBlur={onBlur}
-            onChange={(_e, { value }) => onChange(value)}
-            options={roles}
-            placeholder={formatMessage({ id: "domain.role" })}
-            required
-            search
-            searchInput={{ id: "role" }}
-            value={value}
-          />
-        )}
-      />
-      <Controller
-        control={control}
-        name="description"
-        render={({
-          field: { onBlur, onChange, value },
-          fieldState: { error },
-        }) => (
-          <Form.Input
-            autoComplete="off"
-            error={!!error}
-            id="description"
-            label={formatMessage({ id: "domain.role.member.description" })}
-            maxLength="120"
-            onBlur={onBlur}
-            onChange={(_e, { value }) => onChange(value)}
-            placeholder={formatMessage({
-              id: "domain.role.member.description",
-            })}
-            value={value}
-          />
-        )}
-      />
-      <div className="actions">
-        <Button
-          floated="right"
-          type="submit"
-          primary
-          loading={isSubmitting}
-          disabled={isSubmitting || !isDirty || !isValid}
-        >
-          {formatMessage({ id: "domain.actions.add_member" })}
-        </Button>
-        <HistoryBackButton
-          content={formatMessage({ id: "actions.cancel" })}
-          disabled={isSubmitting}
-        />
-      </div>
-    </Form>
-  );
-};
-
-AddMemberForm.propTypes = {
-  domain: PropTypes.object,
-  isSubmitting: PropTypes.bool,
-  roles: PropTypes.array,
-  options: PropTypes.array,
-  addDomainMember: PropTypes.func.isRequired,
-};
-
-const mapStateToProps = (state) => ({
-  domain: state.domain,
-  roles: roleOptions(state.roles),
-  options: getRecipients(state),
-  isSubmitting: state.domainMemberSaving,
-});
-
-const mapDispatchToProps = { addDomainMember };
-
-export default connect(mapStateToProps, mapDispatchToProps)(AddMemberForm);

package/src/taxonomy/components/DomainMember.js

@@ -1,230 +0,0 @@
-import _ from "lodash/fp";
-import React, { useState } from "react";
-import { useIntl } from "react-intl";
-import { Card, Form, Icon, Button, Popup } from "semantic-ui-react";
-import { connect } from "react-redux";
-import PropTypes from "prop-types";
-import { fetchDomainConceptChildren, updateDomainMember } from "../routines";
-
-import ModalOnRoleDeletion from "./ModalOnRoleDeletion";
-
-const memberTypeToIcon = {
-  group: "users",
-  user: "user",
-};
-
-const memberTypeToPopup = {
-  group: "Group",
-  user: "User",
-};
-
-const retrieveNameFromMember = (principal_type, principal) => {
-  switch (principal_type) {
-    case "group":
-      return null;
-    case "user":
-      return principal.user_name;
-  }
-};
-
-const retrieveFullNameFromMember = (principal_type, principal) => {
-  switch (principal_type) {
-    case "group":
-      return principal.name;
-    case "user":
-      return principal.full_name;
-  }
-};
-
-const DescriptionInput = ({
-  canUpdate,
-  description: currentDescription,
-  updateDescription,
-}) => {
-  const { formatMessage } = useIntl();
-
-  const [description, setDescription] = useState(currentDescription || "");
-  const [editing, setEditing] = useState(false);
-
-  const handleChange = (_, { value }) => setDescription(value);
-
-  const handleSubmit = (e) => {
-    setEditing(false);
-    updateDescription(description);
-  };
-
-  const handleKeyDown = (e) => {
-    if (e.key === "Escape") {
-      setEditing(false);
-      setDescription(currentDescription);
-    }
-  };
-
-  return editing ? (
-    <Form onSubmit={handleSubmit}>
-      <Form.Group>
-        <Form.Input
-          autoComplete="off"
-          name="description"
-          value={description}
-          onKeyDown={handleKeyDown}
-          onChange={handleChange}
-          focus
-          inline
-          action={{
-            icon: "check",
-            type: "submit",
-          }}
-        />
-      </Form.Group>
-    </Form>
-  ) : (
-    <>
-      <span>{description}</span>{" "}
-      {canUpdate && (
-        <Popup
-          content={formatMessage({
-            id: "domain.member.update_description.tooltip",
-          })}
-          trigger={
-            <Icon
-              name="pencil alternate"
-              link
-              onClick={() => setEditing(true)}
-            />
-          }
-        />
-      )}
-    </>
-  );
-};
-
-DescriptionInput.propTypes = {
-  canUpdate: PropTypes.bool,
-  description: PropTypes.string,
-  updateDescription: PropTypes.func,
-};
-
-export const DomainMember = ({
-  description,
-  role_name,
-  domain_id,
-  principal,
-  principal_type,
-  acl_entry_id,
-  _links,
-  fetchDomainConceptChildren,
-  updateDomainMember,
-  domainMemberDeleting,
-  domainConceptChildrenLoading,
-}) => {
-  const memberName = retrieveNameFromMember(principal_type, principal);
-  const fullName = retrieveFullNameFromMember(principal_type, principal);
-  const canDelete = _.flow(
-    _.path("self.methods"),
-    _.includes("DELETE")
-  )(_links);
-  const canUpdate = _.flow(
-    _.path("self.methods"),
-    _.includes("UPDATE")
-  )(_links);
-  return (
-    <Card className="domain-member">
-      <Card.Content className="domain-member__content">
-        <Card.Header>
-          <Popup
-            key={role_name}
-            trigger={<Icon name={memberTypeToIcon[principal_type]} />}
-            content={memberTypeToPopup[principal_type]}
-          />
-          {fullName}
-        </Card.Header>
-        <Card.Description>{memberName}</Card.Description>
-      </Card.Content>
-      {canDelete && (
-        <Card.Content
-          extra
-          className={
-            description
-              ? "domain-member__content-with-description"
-              : "domain-member__content-without-description"
-          }
-        >
-          <Card.Description className="domain-member__description">
-            <DescriptionInput
-              canUpdate={canUpdate}
-              description={description}
-              updateDescription={(description) =>
-                updateDomainMember({
-                  id: acl_entry_id,
-                  acl_entry: { description },
-                })
-              }
-            />
-          </Card.Description>
-
-          <ModalOnRoleDeletion
-            acl_entry_id={acl_entry_id}
-            domainConceptChildrenLoading={domainConceptChildrenLoading.includes(
-              acl_entry_id
-            )}
-            trigger={
-              <Button
-                className={
-                  description
-                    ? "button-domain_delete_description"
-                    : "button-domain_delete_without_description"
-                }
-                basic
-                onClick={() =>
-                  fetchDomainConceptChildren({
-                    domain_id,
-                    user_name: fullName,
-                    principal_type,
-                    acl_entry_id,
-                  })
-                }
-                floated="right"
-                icon="trash"
-                negative
-                loading={
-                  domainMemberDeleting.includes(acl_entry_id) ||
-                  domainConceptChildrenLoading.includes(acl_entry_id)
-                }
-              />
-            }
-          />
-        </Card.Content>
-      )}
-    </Card>
-  );
-};
-
-DomainMember.propTypes = {
-  _links: PropTypes.object,
-  acl_entry_id: PropTypes.number,
-  description: PropTypes.string,
-  domainConceptChildrenLoading: PropTypes.array,
-  domainMemberDeleting: PropTypes.array,
-  domain_id: PropTypes.number,
-  fetchDomainConceptChildren: PropTypes.func,
-  updateDomainMember: PropTypes.func,
-  principal: PropTypes.object,
-  principal_type: PropTypes.string,
-  role_name: PropTypes.string,
-};
-
-const mapStateToProps = ({
-  domainMemberDeleting,
-  domainConceptChildrenLoading,
-  updateDomainMember,
-}) => ({
-  domainMemberDeleting,
-  domainConceptChildrenLoading,
-  updateDomainMember,
-});
-
-export default connect(mapStateToProps, {
-  fetchDomainConceptChildren,
-  updateDomainMember,
-})(DomainMember);

package/src/taxonomy/components/DomainMembersActions.js

@@ -1,32 +0,0 @@
-import _ from "lodash/fp";
-import React from "react";
-import PropTypes from "prop-types";
-import { Link } from "react-router-dom";
-import { Button } from "semantic-ui-react";
-import { connect } from "react-redux";
-import { FormattedMessage } from "react-intl";
-import { linkTo } from "@truedat/core/routes";
-
-export const DomainMembersActions = ({ domain, canCreate }) =>
-  domain && canCreate ? (
-    <Button
-      floated="right"
-      primary
-      content={<FormattedMessage id="domain.actions.add_member" />}
-      icon="add user"
-      as={Link}
-      to={linkTo.DOMAIN_MEMBERS_NEW({ id: domain.id })}
-    />
-  ) : null;
-
-DomainMembersActions.propTypes = {
-  domain: PropTypes.object,
-  canCreate: PropTypes.bool
-};
-
-const mapStateToProps = ({ domain, domainMembersActions }) => ({
-  domain,
-  canCreate: _.flow(_.prop("methods"), _.includes("POST"))(domainMembersActions)
-});
-
-export default connect(mapStateToProps)(DomainMembersActions);

package/src/taxonomy/components/ModalOnRoleDeletion.js

@@ -1,77 +0,0 @@
-import _ from "lodash/fp";
-import React from "react";
-import PropTypes from "prop-types";
-import { useIntl } from "react-intl";
-import { connect } from "react-redux";
-import { ConfirmModal } from "@truedat/core/components";
-import { clearDomainConceptChildren, deleteDomainMember } from "../routines";
-
-const actions = (formatMessage) => [
-  {
-    key: "cancel",
-    content: formatMessage({ id: "actions.cancel" }),
-    color: "red",
-    icon: "remove",
-  },
-];
-
-export const ModalOnRoleDeletion = ({
-  acl_entry_id,
-  clearDomainConceptChildren,
-  deleteDomainMember,
-  domainConceptChildren,
-  domainConceptChildrenLoading,
-  trigger,
-}) => {
-  const { formatMessage } = useIntl();
-  const conceptChildrenCount = _.prop("counter")(domainConceptChildren);
-
-  const handleSubmit = () => {
-    if (conceptChildrenCount == 0) {
-      deleteDomainMember({ id: acl_entry_id });
-    }
-    clearDomainConceptChildren();
-  };
-
-  return (
-    <ConfirmModal
-      actions={conceptChildrenCount > 0 ? actions(formatMessage) : undefined}
-      open={
-        !domainConceptChildrenLoading &&
-        !_.isNil(conceptChildrenCount) &&
-        acl_entry_id == _.prop("acl_entry_id")(domainConceptChildren)
-      }
-      onClose={() => clearDomainConceptChildren()}
-      header={formatMessage({ id: "domain.members.delete" })}
-      content={
-        conceptChildrenCount > 0
-          ? formatMessage(
-              { id: "domain.concept.children.count" },
-              { counter: conceptChildrenCount }
-            )
-          : formatMessage({
-              id: "domain.members.delete.question",
-            })
-      }
-      onConfirm={handleSubmit}
-      trigger={trigger}
-    />
-  );
-};
-
-ModalOnRoleDeletion.propTypes = {
-  acl_entry_id: PropTypes.number,
-  clearDomainConceptChildren: PropTypes.func.isRequired,
-  domainConceptChildrenLoading: PropTypes.bool,
-  deleteDomainMember: PropTypes.func.isRequired,
-  domainConceptChildren: PropTypes.object,
-};
-
-const mapStateToProps = ({ domainConceptChildren }) => ({
-  domainConceptChildren,
-});
-
-export default connect(mapStateToProps, {
-  deleteDomainMember,
-  clearDomainConceptChildren,
-})(ModalOnRoleDeletion);