@truedat/bg 7.5.3 → 7.5.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/bg",
-  "version": "7.5.3",
+  "version": "7.5.5",
   "description": "Truedat Web Business Glossary",
   "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": "7.5.3",
+    "@truedat/test": "7.5.5",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -86,9 +86,9 @@
     ]
   },
   "dependencies": {
-    "@truedat/core": "7.5.3",
-    "@truedat/df": "7.5.3",
-    "@truedat/lm": "7.5.3",
+    "@truedat/core": "7.5.5",
+    "@truedat/df": "7.5.5",
+    "@truedat/lm": "7.5.5",
     "decode-uri-component": "^0.2.2",
     "file-saver": "^2.0.5",
     "moment": "^2.29.4",
@@ -111,5 +111,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "0493d9170268bd7cae7874b0f6d3b251f730e7a0"
+  "gitHead": "2a4343b3b2837540358b57d3d647408ab292aa21"
 }

package/src/concepts/components/ConceptActions.js

@@ -2,7 +2,7 @@ import _ from "lodash/fp";
 import React from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
-import { Button } from "semantic-ui-react";
+import { Button, Icon } from "semantic-ui-react";
 import { Link } from "react-router-dom";
 import { FormattedMessage } from "react-intl";
 import { ConfirmModal, GroupActions } from "@truedat/core/components";
@@ -51,8 +51,7 @@ const ModalDelete = ({
     icon="trash"
     trigger={
       <Button
-        className="negative"
-        icon="trash"
+        icon={<Icon name="trash alternate outline" color="red" />}
         content={<FormattedMessage id="actions.delete" />}
       />
     }

package/src/concepts/components/ConceptTaxonomy.js

@@ -6,7 +6,6 @@ import { List, Header, Segment } from "semantic-ui-react";
 import { FormattedMessage } from "react-intl";
 import { getConceptDomainPath } from "../selectors";
 import DomainItem from "../../taxonomy/components/DomainItem";
-import DomainsConceptLoader from "../../taxonomy/components/DomainsConceptLoader";
 import ConceptManageDomainPopup from "./ConceptManageDomainPopup";
 
 export const ConceptTaxonomy = ({ domainPath }) =>
@@ -15,7 +14,6 @@ export const ConceptTaxonomy = ({ domainPath }) =>
       <Header as="h3" dividing>
         <FormattedMessage id="concepts.taxonomy" defaultMessage="Taxonomía" />
       </Header>
-      <DomainsConceptLoader actions="manage_business_concepts_domain" />
       <ConceptManageDomainPopup conceptAction="concepts.actions.edit" />
 
       <List horizontal>

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

@@ -67,7 +67,7 @@ describe("<ConceptCrumbs />", () => {
           id: 456,
         },
         sidemenuGlossarySubscopes: [],
-        templates: [{ name: "someType", subscope: "someSubscope" }],
+        allTemplates: [{ name: "someType", subscope: "someSubscope" }],
       },
     };
     const { container } = render(<ConceptCrumbs />, renderOpts);
@@ -85,7 +85,7 @@ describe("<ConceptCrumbs />", () => {
           id: 456,
         },
         sidemenuGlossarySubscopes: ["someSubscope"],
-        templates: [{ name: "someType", subscope: "someSubscope" }],
+        allTemplates: [{ name: "someType", subscope: "someSubscope" }],
       },
     };
     const { container } = render(<ConceptCrumbs />, renderOpts);
@@ -120,7 +120,7 @@ describe("<ConceptCrumbs />", () => {
           business_concept_id: 123,
           id: 456,
         },
-        templates: [{ name: "someType", subscope: "someSubscope" }],
+        allTemplates: [{ name: "someType", subscope: "someSubscope" }],
       },
     };
     const props = {
@@ -141,7 +141,7 @@ describe("<ConceptCrumbs />", () => {
           id: 456,
         },
         sidemenuGlossarySubscopes: ["someSubscope"],
-        templates: [{ name: "someType", subscope: "someSubscope" }],
+        allTemplates: [{ name: "someType", subscope: "someSubscope" }],
       },
     };
     const props = {

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

@@ -11,9 +11,6 @@ exports[`<ConceptTaxonomy /> matches the latest snapshot 1`] = `
       id="concepts.taxonomy"
     />
   </Header>
-  <Connect(DomainsConceptLoader)
-    actions="manage_business_concepts_domain"
-  />
   <Connect(ConceptManageDomainPopup)
     conceptAction="concepts.actions.edit"
   />

package/src/concepts/selectors/__tests__/getConceptSubscope.spec.js

@@ -4,7 +4,7 @@ describe("getConceptSubscope", () => {
   it("returns the subscope string if concept type matches a template", () => {
     const state = {
       concept: { id: 123, type: "someType" },
-      templates: [{ name: "someType", subscope: "someSubscope" }],
+      allTemplates: [{ name: "someType", subscope: "someSubscope" }],
     };
     const result = getConceptSubscope(state);
     expect(result).toBe("someSubscope");
@@ -13,7 +13,7 @@ describe("getConceptSubscope", () => {
   it("returns null if concept exists but no template matches its type", () => {
     const state = {
       concept: { id: 123, type: "otherType" },
-      templates: [{ name: "someType", subscope: "someSubscope" }],
+      allTemplates: [{ name: "someType", subscope: "someSubscope" }],
     };
     const result = getConceptSubscope(state);
     expect(result).toBeNull();
@@ -22,14 +22,14 @@ describe("getConceptSubscope", () => {
   it("returns undefined if concept is missing or has no id", () => {
     const stateA = {
       concept: undefined, // No concept at all
-      templates: [{ name: "someType", subscope: "someSubscope" }],
+      allTemplates: [{ name: "someType", subscope: "someSubscope" }],
     };
     const resultA = getConceptSubscope(stateA);
     expect(resultA).toBeUndefined();
 
     const stateB = {
       concept: {}, // Concept object but no id
-      templates: [{ name: "someType", subscope: "someSubscope" }],
+      allTemplates: [{ name: "someType", subscope: "someSubscope" }],
     };
     const resultB = getConceptSubscope(stateB);
     expect(resultB).toBeUndefined();

package/src/concepts/selectors/__tests__/getConceptVersionPath.spec.js

@@ -11,7 +11,7 @@ describe("getConceptVersionPath selector (no mocks)", () => {
         status: "published",
       },
       // No matching template => the sub-scope will be null
-      templates: [{ name: "SomeOtherType", subscope: "someScope" }],
+      allTemplates: [{ name: "SomeOtherType", subscope: "someScope" }],
       sidemenuGlossarySubscopes: undefined,
     };
 
@@ -31,7 +31,7 @@ describe("getConceptVersionPath selector (no mocks)", () => {
         status: "published",
         // no 'id' property
       },
-      templates: [{ name: "Foo", subscope: "myScope" }],
+      allTemplates: [{ name: "Foo", subscope: "myScope" }],
       sidemenuGlossarySubscopes: ["myScope"],
     };
 
@@ -53,7 +53,7 @@ describe("getConceptVersionPath selector (no mocks)", () => {
         status: "draft",
         type: "Foo",
       },
-      templates: [{ name: "Foo", subscope: "myScope" }],
+      allTemplates: [{ name: "Foo", subscope: "myScope" }],
       sidemenuGlossarySubscopes: ["otherScope"],
     };
 
@@ -78,7 +78,7 @@ describe("getConceptVersionPath selector (no mocks)", () => {
         status: "deprecated",
         type: "Foo",
       },
-      templates: [{ name: "Foo", subscope: "myScope" }],
+      allTemplates: [{ name: "Foo", subscope: "myScope" }],
       sidemenuGlossarySubscopes: ["anotherScope"],
     };
 
@@ -103,7 +103,7 @@ describe("getConceptVersionPath selector (no mocks)", () => {
         status: "published",
         type: "SideMenuScope",
       },
-      templates: [{ name: "SideMenuScope", subscope: "someSubscope" }],
+      allTemplates: [{ name: "SideMenuScope", subscope: "someSubscope" }],
       sidemenuGlossarySubscopes: ["someSubscope"],
     };
 
@@ -125,7 +125,7 @@ describe("getConceptVersionPath selector (no mocks)", () => {
         status: "draft",
         type: "SideMenuScope",
       },
-      templates: [{ name: "SideMenuScope", subscope: "subscopeA" }],
+      allTemplates: [{ name: "SideMenuScope", subscope: "subscopeA" }],
       sidemenuGlossarySubscopes: ["subscopeA"],
     };
 
@@ -149,7 +149,7 @@ describe("getConceptVersionPath selector (no mocks)", () => {
         status: "published",
         type: "SideMenuScope",
       },
-      templates: [{ name: "SideMenuScope", subscope: "subscopeA" }],
+      allTemplates: [{ name: "SideMenuScope", subscope: "subscopeA" }],
       sidemenuGlossarySubscopes: ["subscopeA"],
     };
 
@@ -170,7 +170,7 @@ describe("getConceptVersionPath selector (no mocks)", () => {
         status: "published",
         type: "NoSubscope",
       },
-      templates: [{ name: "NoSubscope", subscope: null }],
+      allTemplates: [{ name: "NoSubscope", subscope: null }],
       sidemenuGlossarySubscopes: ["subscopeA"],
     };
 

package/src/concepts/selectors/getConceptSubscope.js

@@ -2,7 +2,7 @@ import { createSelector } from "reselect";
 import _ from "lodash/fp";
 
 export const getConcept = _.prop("concept");
-export const getTemplates = _.prop("templates");
+export const getTemplates = _.prop("allTemplates");
 
 export const getConceptSubscope = createSelector(
   [getConcept, getTemplates],

package/src/sagas.js

@@ -1,4 +1,3 @@
 import conceptSagas from "./concepts/sagas";
-import taxonomySagas from "./taxonomy/sagas";
 
-export default [...conceptSagas, ...taxonomySagas];
+export default [...conceptSagas];

package/src/taxonomy/components/DomainActions.js

@@ -2,7 +2,7 @@ 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 { Button, Icon } from "semantic-ui-react";
 import { FormattedMessage, useIntl } from "react-intl";
 import { ConfirmModal, GroupActions } from "@truedat/core/components";
 
@@ -36,9 +36,8 @@ const ModalDelete = ({ onConfirm }) => {
       onConfirm={onConfirm}
       trigger={
         <Button
-          negative
           content={formatMessage({ id: "actions.delete" })}
-          icon="trash"
+          icon={<Icon name="trash alternate outline" color="red" />}
         />
       }
     />
@@ -53,7 +52,7 @@ const withDelete = (actions, onConfirm) => [
   ...actions,
   {
     key: "delete",
-    icon: "trash",
+    icon: "trash alternate outline",
     value: "delete",
     as: ModalDelete,
     onConfirm,

package/src/taxonomy/components/__tests__/__snapshots__/DomainActions.spec.js.snap

@@ -50,11 +50,11 @@ exports[`<DomainActions /> matches the latest snapshot 1`] = `
           EditDomain
         </a>
         <button
-          class="ui negative button"
+          class="ui button"
         >
           <i
             aria-hidden="true"
-            class="trash icon"
+            class="red trash alternate outline icon"
           />
           ActionDelete
         </button>

package/src/taxonomy/routines.js

@@ -1,5 +1,3 @@
 import { createRoutine } from "redux-saga-routines";
 
-export const fetchDomainsConcept = createRoutine("FETCH_CONCEPT_DOMAINS");
-export const clearDomainsConcept = createRoutine("CLEAR_DOMAINS");
 export const filterDomains = createRoutine("FILTER_DOMAINS");

package/src/taxonomy/components/DomainsConceptLoader.js

@@ -1,43 +0,0 @@
-import React from "react";
-import PropTypes from "prop-types";
-import { connect } from "react-redux";
-import { Loading } from "@truedat/core/components";
-import { clearDomainsConcept, fetchDomainsConcept } from "../routines";
-
-export class DomainsConceptLoader extends React.Component {
-  static propTypes = {
-    actions: PropTypes.string,
-    clearDomainsConcept: PropTypes.func,
-    fetchDomainsConcept: PropTypes.func,
-    filter: PropTypes.string,
-    domainsConceptLoading: PropTypes.bool,
-  };
-
-  componentDidMount() {
-    const { fetchDomainsConcept, actions, filter } = this.props;
-    fetchDomainsConcept({ actions, filter });
-  }
-
-  componentWillUnmount() {
-    const { clearDomainsConcept } = this.props;
-    clearDomainsConcept();
-  }
-
-  render() {
-    const { domainsConceptLoading } = this.props;
-    if (domainsConceptLoading) {
-      return <Loading />;
-    } else {
-      return null;
-    }
-  }
-}
-
-const mapStateToProps = ({ domainsConceptLoading }) => ({
-  domainsConceptLoading,
-});
-
-export default connect(mapStateToProps, {
-  clearDomainsConcept,
-  fetchDomainsConcept,
-})(DomainsConceptLoader);

package/src/taxonomy/components/__tests__/DomainsConceptLoader.spec.js

@@ -1,38 +0,0 @@
-import React from "react";
-import { mount } from "enzyme";
-import { DomainsConceptLoader } from "../DomainsConceptLoader";
-
-const getProps = () => ({
-  clearDomainsConcept: jest.fn(),
-  domainsConceptLoading: false,
-  fetchDomainsConcept: jest.fn(),
-  actions: "create_ingest",
-  filter: "all",
-});
-
-describe("<DomainsConceptLoader />", () => {
-  it("calls fetchDomainsConcept when component mounts but not when it unmounts", () => {
-    const props = getProps();
-    const wrapper = mount(<DomainsConceptLoader {...props} />);
-    expect(props.fetchDomainsConcept).toHaveBeenCalledTimes(1);
-    wrapper.unmount();
-    expect(props.fetchDomainsConcept).toHaveBeenCalledTimes(1);
-  });
-
-  it("calls clearDomainsConcept and clearDomainDefaultFilters when component unmounts but not when it mounts", () => {
-    const props = getProps();
-    const wrapper = mount(<DomainsConceptLoader {...props} />);
-    expect(props.clearDomainsConcept).toHaveBeenCalledTimes(0);
-    wrapper.unmount();
-    expect(props.clearDomainsConcept).toHaveBeenCalledTimes(1);
-  });
-
-  it("renders Loading when domainLoading is true", () => {
-    const props = getProps();
-
-    const wrapper = mount(
-      <DomainsConceptLoader {...{ ...props, domainsConceptLoading: true }} />
-    );
-    expect(wrapper.find("Loading").length).toBe(1);
-  });
-});

package/src/taxonomy/sagas/__tests__/fetchDomainsConcept.spec.js

@@ -1,93 +0,0 @@
-import { testSaga } from "redux-saga-test-plan";
-import { apiJson, JSON_OPTS } from "@truedat/core/services/api";
-import {
-  fetchDomainsConceptRequestSaga,
-  fetchDomainsConceptSaga,
-} from "../fetchDomainsConcept";
-import { fetchDomainsConcept } from "../../routines";
-import { API_DOMAINS } from "../../api";
-
-describe("sagas: fetchDomainsConceptRequestSaga", () => {
-  it("should invoke fetchDomainsConceptSaga on trigger", () => {
-    expect(() => {
-      testSaga(fetchDomainsConceptRequestSaga)
-        .next()
-        .takeLatest(fetchDomainsConcept.TRIGGER, fetchDomainsConceptSaga)
-        .finish()
-        .isDone();
-    }).not.toThrow();
-  });
-
-  it("should throw exception if an unhandled action is received", () => {
-    expect(() => {
-      testSaga(fetchDomainsConceptRequestSaga)
-        .next()
-        .takeLatest("FOO", fetchDomainsConceptSaga);
-    }).toThrow();
-  });
-});
-
-describe("sagas: fetchDomainsConceptSaga", () => {
-  const data = {
-    collection: [
-      { id: 1, name: "Top domain", description: "Desc" },
-      { id: 2, name: "Child domain", description: "Desc2", parent_id: 2 },
-    ],
-  };
-
-  it("should put a success action when a response is returned", () => {
-    const actions = undefined;
-    expect(() => {
-      testSaga(fetchDomainsConceptSaga, {})
-        .next()
-        .put(fetchDomainsConcept.request())
-        .next()
-        .call(apiJson, API_DOMAINS, JSON_OPTS)
-        .next({ data })
-        .put(fetchDomainsConcept.success({ data, actions }))
-        .next()
-        .put(fetchDomainsConcept.fulfill())
-        .next()
-        .isDone();
-    }).not.toThrow();
-  });
-
-  it("should handle actions in the payload", () => {
-    const actions = "show";
-    const filter = "foo";
-    const payload = { actions, filter };
-    const json_opts = { params: { actions, filter }, ...JSON_OPTS };
-    expect(() => {
-      testSaga(fetchDomainsConceptSaga, { payload })
-        .next()
-        .put(fetchDomainsConcept.request(payload))
-        .next()
-        .call(apiJson, API_DOMAINS, json_opts)
-        .next({ data })
-        .put(fetchDomainsConcept.success({ data, actions }))
-        .next()
-        .put(fetchDomainsConcept.fulfill())
-        .next()
-        .isDone();
-    }).not.toThrow();
-  });
-
-  it("should put a failure action when the call throws an error", () => {
-    const message = "Request failed";
-    const error = { message };
-
-    expect(() => {
-      testSaga(fetchDomainsConceptSaga, {})
-        .next()
-        .put(fetchDomainsConcept.request())
-        .next()
-        .call(apiJson, API_DOMAINS, JSON_OPTS)
-        .throw(error)
-        .put(fetchDomainsConcept.failure(message))
-        .next()
-        .put(fetchDomainsConcept.fulfill())
-        .next()
-        .isDone();
-    }).not.toThrow();
-  });
-});

package/src/taxonomy/sagas/fetchDomainsConcept.js

@@ -1,37 +0,0 @@
-import _ from "lodash/fp";
-import { call, put, takeLatest } from "redux-saga/effects";
-import { apiJson, JSON_OPTS } from "@truedat/core/services/api";
-import { fetchDomainsConcept } from "../routines";
-import { API_DOMAINS } from "../api";
-
-export function* fetchDomainsConceptSaga({ payload }) {
-  try {
-    const { actions, filter } = payload || {};
-    const json_opts = actions
-      ? {
-          ...JSON_OPTS,
-          params: {
-            actions: _.flow(_.castArray, _.join(","))(actions),
-            filter,
-          },
-        }
-      : JSON_OPTS;
-    const url = API_DOMAINS;
-    yield put(fetchDomainsConcept.request(payload));
-    const { data } = yield call(apiJson, url, json_opts);
-    yield put(fetchDomainsConcept.success({ data, actions }));
-  } catch (error) {
-    if (error.response) {
-      const { status, data } = error.response;
-      yield put(fetchDomainsConcept.failure({ status, data }));
-    } else {
-      yield put(fetchDomainsConcept.failure(error.message));
-    }
-  } finally {
-    yield put(fetchDomainsConcept.fulfill());
-  }
-}
-
-export function* fetchDomainsConceptRequestSaga() {
-  yield takeLatest(fetchDomainsConcept.TRIGGER, fetchDomainsConceptSaga);
-}

package/src/taxonomy/sagas/index.js

@@ -1,5 +0,0 @@
-import { fetchDomainsConceptRequestSaga } from "./fetchDomainsConcept";
-
-export { fetchDomainsConceptRequestSaga };
-
-export default [fetchDomainsConceptRequestSaga()];