@truedat/bg 6.3.2 → 6.3.4

package/src/concepts/selectors/getConceptColumns.js

@@ -5,11 +5,12 @@ import { FormattedMessage } from "react-intl";
 import { createSelector } from "reselect";
 import Moment from "react-moment";
 
-const iconDecorator = field => (field > 0 ? <Icon name="check circle" /> : "");
+const iconDecorator = (field) =>
+  field > 0 ? <Icon name="check circle" /> : "";
 
-const translateDecorator = text => <FormattedMessage id={text} />;
+const translateDecorator = (text) => <FormattedMessage id={text} />;
 
-const dateDecorator = date => (
+const dateDecorator = (date) => (
   <Moment locale="es" date={date} format="YYYY-MM-DD HH:mm" />
 );
 
@@ -19,50 +20,40 @@ const defaultConceptColumns = [
     name: "domain",
     sort: { name: "domain.name.sort" },
     fieldSelector: _.path("domain.name"),
-    width: 3
+    width: 3,
   },
   {
     name: "status",
     sort: { name: "status" },
-    fieldDecorator: field => translateDecorator(`concepts.status.${field}`),
-    width: 2
+    fieldDecorator: (field) => translateDecorator(`concepts.status.${field}`),
+    width: 2,
   },
   {
     name: "rule_count",
     sort: { name: "rule_count" },
     fieldDecorator: iconDecorator,
     textAlign: "center",
-    width: 1
+    width: 1,
   },
   {
     name: "link_count",
     sort: { name: "link_count" },
     fieldDecorator: iconDecorator,
     textAlign: "center",
-    width: 1
+    width: 1,
   },
   {
     name: "last_change_at",
     sort: { name: "last_change_at" },
     fieldDecorator: dateDecorator,
     textAlign: "center",
-    width: 2
-  }
+    width: 2,
+  },
 ];
 
-const getConcepts = state => state.concepts;
-const getColumns = state => state.conceptsColumns;
+const getColumns = (state) => state.conceptsColumns;
 
 export const getConceptColumns = createSelector(
   getColumns,
   _.defaultTo(defaultConceptColumns)
 );
-
-const getConceptColumnNames = createSelector(getConceptColumns, _.map("name"));
-
-export const getConceptsRows = createSelector(
-  getConcepts,
-  getConceptColumnNames,
-  (concepts, columnNames) =>
-    _.map(_.pick([...columnNames, "id", "business_concept_id"]))(concepts)
-);

package/src/concepts/selectors/index.js

@@ -1,16 +1,10 @@
-export { getConceptsRows, getConceptColumns } from "./getConceptColumns";
-export { getConceptAvailableFilters } from "./getConceptAvailableFilters";
+export { getConceptColumns } from "./getConceptColumns";
 export { getConceptDomainPath } from "./getConceptDomainPath";
-export { getConceptFilterTypes } from "./getConceptFilterTypes";
-export { getConceptSelectedFilters } from "./getConceptSelectedFilters";
-export { getConceptSelectedFilterActiveValues } from "./getConceptSelectedFilterActiveValues";
-export { getConceptSelectedFilterValues } from "./getConceptSelectedFilterValues";
 export {
   getConceptUploadEventColumns,
   defaultConceptsUploadEventColumns,
 } from "./getConceptUploadEventColumns";
 export { getParsedEvents } from "./getParsedEvents";
-export { getPreviousConceptQuery } from "./getPreviousConceptQuery";
 export { getTemplateFields } from "./getTemplateFields";
 export { getTemplateGroups } from "./getTemplateGroups";
 export * from "../relations/selectors";

package/src/concepts/utils/filterOptions.js

@@ -1,7 +1,8 @@
-export const translations = formatMessage => ({
-  status: v => formatMessage({ id: `concepts.status.${v}`, defaultMessage: v }),
-  rule_count: v =>
+export const translations = (formatMessage) => ({
+  status: (v) =>
+    formatMessage({ id: `concepts.status.${v}`, defaultMessage: v }),
+  rule_count: (v) =>
     formatMessage({ id: `concepts.rule_count.${v}`, defaultMessage: v }),
-  link_count: v =>
-    formatMessage({ id: `concepts.link_count.${v}`, defaultMessage: v })
+  link_count: (v) =>
+    formatMessage({ id: `concepts.link_count.${v}`, defaultMessage: v }),
 });

package/src/concepts/components/ConceptFilters.js

@@ -1,20 +0,0 @@
-import { bindActionCreators } from "redux";
-import { connect } from "react-redux";
-import { AvailableFilters } from "@truedat/core/components";
-import { addConceptFilter, resetConceptFilters } from "../routines";
-import { getConceptAvailableFilters } from "../selectors";
-
-const mapStateToProps = (state) => ({
-  filters: getConceptAvailableFilters(state),
-  disabled: state.conceptFiltersLoading,
-  loading: state.conceptFiltersLoading,
-  filtersGroup: state.conceptFiltersGroup || [],
-});
-
-const mapDispatchToProps = (dispatch) =>
-  bindActionCreators(
-    { addFilter: addConceptFilter, resetFilters: resetConceptFilters },
-    dispatch
-  );
-
-export default connect(mapStateToProps, mapDispatchToProps)(AvailableFilters);

package/src/concepts/components/ConceptFiltersLoader.js

@@ -1,27 +0,0 @@
-import { connect } from "react-redux";
-import { bindActionCreators } from "redux";
-import { FiltersLoader } from "@truedat/core/components";
-import { makeActiveFiltersSelector } from "@truedat/core/selectors";
-import { clearConceptFilters, fetchConceptFilters } from "../routines";
-
-const EMPTY = {};
-
-const mapDispatchToProps = (dispatch) =>
-  bindActionCreators(
-    { clearFilters: clearConceptFilters, fetchFilters: fetchConceptFilters },
-    dispatch
-  );
-
-const makeMapStateToProps = () => {
-  const activeFiltersSelector = makeActiveFiltersSelector(
-    "conceptActiveFilters"
-  );
-  const mapStateToProps = (state, props) => ({
-    selectedFilter: state.conceptSelectedFilter,
-    filters: activeFiltersSelector(state, props),
-    defaultFilters: props?.defaultFilters || EMPTY,
-  });
-  return mapStateToProps;
-};
-
-export default connect(makeMapStateToProps, mapDispatchToProps)(FiltersLoader);

package/src/concepts/components/ConceptSelectedFilters.js

@@ -1,29 +0,0 @@
-import React from "react";
-import { Route, Switch } from "react-router-dom";
-import {
-  CONCEPTS,
-  CONCEPTS_PENDING,
-  DOMAIN_CONCEPTS,
-} from "@truedat/core/routes";
-import ConceptSelectedFiltersDefault from "./ConceptSelectedFiltersDefault";
-import ConceptSelectedFiltersPending from "./ConceptSelectedFiltersPending";
-import ConceptSelectedFiltersPublished from "./ConceptSelectedFiltersPublished";
-
-export const ConceptSelectedFilters = () => (
-  <Switch>
-    <Route
-      exact
-      path={DOMAIN_CONCEPTS}
-      component={ConceptSelectedFiltersPublished}
-    />
-    <Route exact path={CONCEPTS} component={ConceptSelectedFiltersPublished} />
-    <Route
-      exact
-      path={CONCEPTS_PENDING}
-      component={ConceptSelectedFiltersPending}
-    />
-    <Route component={ConceptSelectedFiltersDefault} />
-  </Switch>
-);
-
-export default ConceptSelectedFilters;

package/src/concepts/components/ConceptSelectedFiltersDefault.js

@@ -1,42 +0,0 @@
-import { injectIntl } from "react-intl";
-import { bindActionCreators, compose } from "redux";
-import { connect } from "react-redux";
-import { SelectedFilters } from "@truedat/core/components";
-import {
-  applyConceptUserFilter,
-  deleteConceptUserFilter,
-  saveConceptFilters,
-  closeConceptFilter,
-  openConceptFilter,
-  removeConceptFilter,
-  resetConceptFilters,
-  toggleConceptFilterValue,
-} from "../routines";
-import { mapSelectedFilterStateToPropsByStatus } from "../selectors/mapSelectedFilterStateToPropsByStatus";
-
-const mapStateToProps = mapSelectedFilterStateToPropsByStatus([
-  "draft",
-  "pending_approval",
-  "published",
-  "rejected",
-]);
-
-const mapDispatchToProps = (dispatch) =>
-  bindActionCreators(
-    {
-      applyUserFilter: applyConceptUserFilter,
-      deleteUserFilter: deleteConceptUserFilter,
-      saveFilters: saveConceptFilters,
-      closeFilter: closeConceptFilter,
-      openFilter: openConceptFilter,
-      removeFilter: removeConceptFilter,
-      resetFilters: resetConceptFilters,
-      toggleFilterValue: toggleConceptFilterValue,
-    },
-    dispatch
-  );
-
-export default compose(
-  injectIntl,
-  connect(mapStateToProps, mapDispatchToProps)
-)(SelectedFilters);

package/src/concepts/components/ConceptSelectedFiltersPending.js

@@ -1,41 +0,0 @@
-import { injectIntl } from "react-intl";
-import { bindActionCreators, compose } from "redux";
-import { connect } from "react-redux";
-import { SelectedFilters } from "@truedat/core/components";
-import {
-  applyConceptUserFilter,
-  closeConceptFilter,
-  deleteConceptUserFilter,
-  openConceptFilter,
-  removeConceptFilter,
-  resetConceptFilters,
-  saveConceptFilters,
-  toggleConceptFilterValue,
-} from "../routines";
-import { mapSelectedFilterStateToPropsByStatus } from "../selectors/mapSelectedFilterStateToPropsByStatus";
-
-const mapStateToProps = mapSelectedFilterStateToPropsByStatus([
-  "draft",
-  "pending_approval",
-  "rejected",
-]);
-
-const mapDispatchToProps = (dispatch) =>
-  bindActionCreators(
-    {
-      applyUserFilter: applyConceptUserFilter,
-      closeFilter: closeConceptFilter,
-      deleteUserFilter: deleteConceptUserFilter,
-      openFilter: openConceptFilter,
-      removeFilter: removeConceptFilter,
-      resetFilters: resetConceptFilters,
-      saveFilters: saveConceptFilters,
-      toggleFilterValue: toggleConceptFilterValue,
-    },
-    dispatch
-  );
-
-export default compose(
-  injectIntl,
-  connect(mapStateToProps, mapDispatchToProps)
-)(SelectedFilters);

package/src/concepts/components/ConceptSelectedFiltersPublished.js

@@ -1,73 +0,0 @@
-import _ from "lodash/fp";
-import { bindActionCreators, compose } from "redux";
-import { connect } from "react-redux";
-import { injectIntl } from "react-intl";
-import { SelectedFilters } from "@truedat/core/components";
-import { makeOption } from "@truedat/core/services/i18n";
-import {
-  applyConceptUserFilter,
-  closeConceptFilter,
-  deleteConceptUserFilter,
-  openConceptFilter,
-  removeConceptFilter,
-  resetConceptFilters,
-  saveConceptFilters,
-  toggleConceptFilterValue,
-} from "../routines";
-import {
-  getConceptSelectedFilterActiveValues,
-  getConceptSelectedFilters,
-  getConceptSelectedFilterValues,
-  getConceptFilterTypes,
-} from "../selectors";
-import { translations } from "../utils/filterOptions";
-
-export const mapStateToProps = (state, ownProps) => {
-  const formatMessage = _.pathOr(_.prop("id"), "intl.formatMessage")(ownProps);
-  const {
-    conceptSelectedFilter: selectedFilter,
-    conceptSelectedUserFilter: selectedUserFilter,
-    conceptActiveFilters: activeFilters,
-    conceptUserFilters: userFilters,
-    conceptFiltersLoading: loading,
-  } = state;
-  const selectedFilterValues = getConceptSelectedFilterValues(state);
-  const selectedFilterActiveValues =
-    getConceptSelectedFilterActiveValues(state);
-  return {
-    activeFilters,
-    loading,
-    filterTypes: getConceptFilterTypes(state),
-    selectedFilter,
-    selectedFilters: _.flow(
-      getConceptSelectedFilters,
-      _.without(["status"])
-    )(state),
-    selectedFilterActiveValues,
-    selectedFilterValues: _.map(
-      makeOption(translations(formatMessage), selectedFilter)
-    )(selectedFilterValues),
-    selectedUserFilter,
-    userFilters,
-  };
-};
-
-const mapDispatchToProps = (dispatch) =>
-  bindActionCreators(
-    {
-      applyUserFilter: applyConceptUserFilter,
-      closeFilter: closeConceptFilter,
-      deleteUserFilter: deleteConceptUserFilter,
-      openFilter: openConceptFilter,
-      removeFilter: removeConceptFilter,
-      resetFilters: resetConceptFilters,
-      saveFilters: saveConceptFilters,
-      toggleFilterValue: toggleConceptFilterValue,
-    },
-    dispatch
-  );
-
-export default compose(
-  injectIntl,
-  connect(mapStateToProps, mapDispatchToProps)
-)(SelectedFilters);

package/src/concepts/components/ConceptUserFiltersLoader.js

@@ -1,27 +0,0 @@
-import { useEffect } from "react";
-import PropTypes from "prop-types";
-import { connect } from "react-redux";
-import { clearConceptUserFilters, fetchConceptUserFilters } from "../routines";
-
-export const ConceptUserFiltersLoader = ({
-  clearConceptUserFilters,
-  fetchConceptUserFilters,
-}) => {
-  useEffect(() => {
-    fetchConceptUserFilters();
-    return () => {
-      clearConceptUserFilters();
-    };
-  }, [clearConceptUserFilters, fetchConceptUserFilters]);
-  return null;
-};
-
-ConceptUserFiltersLoader.propTypes = {
-  clearConceptUserFilters: PropTypes.func,
-  fetchConceptUserFilters: PropTypes.func,
-};
-
-export default connect(null, {
-  clearConceptUserFilters,
-  fetchConceptUserFilters,
-})(ConceptUserFiltersLoader);

package/src/concepts/components/ConceptsLoader.js

@@ -1,38 +0,0 @@
-import { useEffect } from "react";
-import PropTypes from "prop-types";
-import { connect } from "react-redux";
-import { makeSearchQuerySelector } from "@truedat/core/selectors";
-import { clearConcepts, fetchConcepts } from "../routines";
-
-export const ConceptsLoader = ({ clearConcepts, fetchConcepts, payload }) => {
-  useEffect(() => {
-    return () => {
-      clearConcepts();
-    };
-  }, [clearConcepts]);
-  useEffect(() => {
-    fetchConcepts(payload);
-  }, [payload, fetchConcepts]);
-  return null;
-};
-
-ConceptsLoader.propTypes = {
-  clearConcepts: PropTypes.func,
-  fetchConcepts: PropTypes.func,
-  payload: PropTypes.object,
-};
-
-const makeMapStateToProps = () => {
-  const searchQuerySelector = makeSearchQuerySelector(
-    "conceptQuery",
-    "conceptActiveFilters"
-  );
-  const mapStateToProps = (state, props) => ({
-    payload: searchQuerySelector(state, props),
-  });
-  return mapStateToProps;
-};
-
-export default connect(makeMapStateToProps, { clearConcepts, fetchConcepts })(
-  ConceptsLoader
-);

package/src/concepts/components/ConceptsSearch.js

@@ -1,32 +0,0 @@
-import React from "react";
-import PropTypes from "prop-types";
-import { connect } from "react-redux";
-import { Input } from "semantic-ui-react";
-import { useIntl } from "react-intl";
-import { searchConcepts } from "../routines";
-import ConceptFilters from "./ConceptFilters";
-
-const ConceptsSearch = ({ query, searchConcepts, loading }) => {
-  const { formatMessage } = useIntl();
-  return (
-    <Input
-      value={query}
-      onChange={(_e, data) => searchConcepts({ query: data.value })}
-      icon={{ name: "search", link: true }}
-      iconPosition="left"
-      action={<ConceptFilters />}
-      placeholder={formatMessage({ id: "concepts.search.placeholder" })}
-      loading={loading}
-    />
-  );
-};
-
-ConceptsSearch.propTypes = {
-  query: PropTypes.string,
-  searchConcepts: PropTypes.func,
-  loading: PropTypes.bool,
-};
-
-const mapStateToProps = ({ conceptQuery }) => ({ query: conceptQuery?.query });
-
-export default connect(mapStateToProps, { searchConcepts })(ConceptsSearch);

package/src/concepts/components/__tests__/ConceptFilters.spec.js

@@ -1,19 +0,0 @@
-import React from "react";
-import { render } from "@truedat/test/render";
-import ConceptFilters from "../ConceptFilters";
-
-const state = {
-  conceptFilters: {
-    domain_id: { values: [1, 2] },
-    confidential: { values: ["yes", "no"] },
-  },
-  conceptActiveFilters: { domain_id: [1] },
-};
-const renderOpts = { state };
-
-describe("<ConceptFilters />", () => {
-  it("matches the latest snapshot", () => {
-    const { container } = render(<ConceptFilters />, renderOpts);
-    expect(container).toMatchSnapshot();
-  });
-});

package/src/concepts/components/__tests__/ConceptSelectedFilters.spec.js

@@ -1,10 +0,0 @@
-import React from "react";
-import { render } from "@truedat/test/render";
-import { ConceptSelectedFilters } from "../ConceptSelectedFilters";
-
-describe("<ConceptSelectedFilters />", () => {
-  it("matches the latest snapshot", () => {
-    const { container } = render(<ConceptSelectedFilters />);
-    expect(container).toMatchSnapshot();
-  });
-});

package/src/concepts/components/__tests__/ConceptUserFiltersLoader.spec.js

@@ -1,27 +0,0 @@
-import React from "react";
-import { shallow, mount } from "enzyme";
-import { ConceptUserFiltersLoader } from "../ConceptUserFiltersLoader";
-
-describe("<ConceptUserFiltersLoader />", () => {
-  const fetchConceptUserFilters = jest.fn();
-  const clearConceptUserFilters = jest.fn();
-
-  it("matches the latest snapshot", () => {
-    const props = { clearConceptUserFilters, fetchConceptUserFilters };
-    const wrapper = shallow(<ConceptUserFiltersLoader {...props} />);
-    expect(wrapper).toMatchSnapshot();
-  });
-
-  it("calls fetchConceptUserFilters when component mounts, clearConceptUserFilters when component unmounts", () => {
-    const fetchConceptUserFilters = jest.fn();
-    const clearConceptUserFilters = jest.fn();
-
-    const props = { fetchConceptUserFilters, clearConceptUserFilters };
-    const wrapper = mount(<ConceptUserFiltersLoader {...props} />);
-    expect(clearConceptUserFilters.mock.calls.length).toBe(0);
-    expect(fetchConceptUserFilters.mock.calls.length).toBe(1);
-    wrapper.unmount();
-    expect(clearConceptUserFilters.mock.calls.length).toBe(1);
-    expect(fetchConceptUserFilters.mock.calls.length).toBe(1);
-  });
-});

package/src/concepts/components/__tests__/ConceptsLoader.spec.js

@@ -1,34 +0,0 @@
-import React from "react";
-import { mount } from "enzyme";
-import { ConceptsLoader } from "../ConceptsLoader";
-
-const getProps = () => ({
-  clearConcepts: jest.fn(),
-  conceptsLoading: false,
-  fetchConcepts: jest.fn(),
-});
-
-describe("<ConceptsLoader />", () => {
-  it("calls fetchConcepts when component mounts but not when it unmounts", () => {
-    const props = getProps();
-    const wrapper = mount(<ConceptsLoader {...props} />);
-    expect(props.fetchConcepts).toHaveBeenCalledTimes(1);
-    wrapper.unmount();
-    expect(props.fetchConcepts).toHaveBeenCalledTimes(1);
-  });
-
-  it("calls clearConcepts when component unmounts but not when it mounts", () => {
-    const props = getProps();
-    const wrapper = mount(<ConceptsLoader {...props} />);
-    expect(props.clearConcepts).toHaveBeenCalledTimes(0);
-    wrapper.unmount();
-    expect(props.clearConcepts).toHaveBeenCalledTimes(1);
-  });
-
-  it("merges default filters with query filters", () => {
-    const props = getProps();
-    const payload = { foo: "foo" };
-    mount(<ConceptsLoader payload={payload} {...props} />);
-    expect(props.fetchConcepts).toHaveBeenCalledWith(payload);
-  });
-});

package/src/concepts/components/__tests__/__snapshots__/ConceptFilters.spec.js.snap

@@ -1,47 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<ConceptFilters /> matches the latest snapshot 1`] = `
-<div>
-  <div
-    aria-expanded="false"
-    class="ui button floating labeled scrolling dropdown icon"
-    role="listbox"
-    tabindex="0"
-  >
-    <div
-      aria-atomic="true"
-      aria-live="polite"
-      class="divider text"
-      role="alert"
-    >
-      Filters
-    </div>
-    <i
-      aria-hidden="true"
-      class="filter icon"
-    />
-    <div
-      class="menu transition"
-    >
-      <div
-        class="item"
-        role="option"
-      >
-        <em>
-          (reset all filters)
-        </em>
-      </div>
-      <div
-        class="item"
-        role="option"
-      >
-        <span
-          class="text"
-        >
-          confidential
-        </span>
-      </div>
-    </div>
-  </div>
-</div>
-`;

package/src/concepts/components/__tests__/__snapshots__/ConceptSelectedFilters.spec.js.snap

@@ -1,9 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<ConceptSelectedFilters /> matches the latest snapshot 1`] = `
-<div>
-  <div
-    class="selectedFilters"
-  />
-</div>
-`;

package/src/concepts/components/__tests__/__snapshots__/ConceptUserFiltersLoader.spec.js.snap

@@ -1,3 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<ConceptUserFiltersLoader /> matches the latest snapshot 1`] = `""`;