@truedat/bg 4.46.2 → 4.46.5

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

@@ -26,36 +26,7 @@ exports[`<Concepts /> matches the latest snapshot 1`] = `
     <Segment
       attached="bottom"
     >
-      <Connect(ConceptsActions)
-        concepts={
-          Array [
-            Object {
-              "description": "dd",
-              "id": 1,
-              "name": "s1",
-              "status": "st",
-              "version": "vs",
-            },
-          ]
-        }
-        create={true}
-        update={true}
-      />
-      <Connect(ConceptsSearch) />
-      <ConceptSelectedFilters />
-      <DimmerDimmable
-        dimmed={false}
-      >
-        <Dimmer
-          active={false}
-          inverted={true}
-        >
-          <Loader />
-        </Dimmer>
-        <Connect(ConceptsLabelResults) />
-        <withRouter(Connect(ConceptsTable)) />
-        <Connect(Pagination) />
-      </DimmerDimmable>
+      <Connect(ConceptsPanel) />
     </Segment>
   </Segment>
 </Fragment>

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

@@ -0,0 +1,157 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<ConceptsPanel /> matches latest snapshot 1`] = `
+<div>
+  <div
+    class="ui action left icon input"
+  >
+    <input
+      placeholder="Search concepts..."
+      type="text"
+      value=""
+    />
+    <i
+      aria-hidden="true"
+      class="search link icon"
+    />
+    <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>
+    </div>
+  </div>
+  <div
+    class="selectedFilters"
+  />
+  <div
+    class="dimmable"
+  >
+    <div
+      class="ui inverted dimmer"
+    >
+      <div
+        class="content"
+      >
+        <div
+          class="ui loader"
+        />
+      </div>
+    </div>
+    <div
+      class="ui label concepts-label-results"
+    >
+      123 concepts found
+    </div>
+    <table
+      class="ui selectable sortable table"
+    >
+      <thead
+        class=""
+      >
+        <tr
+          class=""
+        >
+          <th
+            class="seven wide"
+          >
+            Term
+          </th>
+          <th
+            class="three wide"
+          >
+            Domain
+          </th>
+          <th
+            class="two wide"
+          >
+            Status
+          </th>
+          <th
+            class="one wide"
+          >
+            Quality rules
+          </th>
+          <th
+            class="one wide"
+          >
+            Link to field
+          </th>
+          <th
+            class="two wide"
+          >
+            Last modification date
+          </th>
+        </tr>
+      </thead>
+      <tbody
+        class=""
+      >
+        <tr
+          class=""
+        >
+          <td
+            class=""
+          >
+            concept
+          </td>
+          <td
+            class=""
+          >
+            domain
+          </td>
+          <td
+            class=""
+          >
+            Published
+          </td>
+          <td
+            class="center aligned"
+          >
+            
+          </td>
+          <td
+            class="center aligned"
+          >
+            
+          </td>
+          <td
+            class="center aligned"
+          >
+            <time
+              datetime="1577836800000"
+            >
+              2020-01-01 00:00
+            </time>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>
+`;

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

@@ -13,13 +13,47 @@ exports[`<ConceptsTable /> matches the latest snapshot 1`] = `
       <TableRow
         as="tr"
         cellAs="td"
-      />
+      >
+        <TableHeaderCell
+          as="th"
+          className="disabled"
+          content={
+            <Memo(MemoizedFormattedMessage)
+              id="concepts.props.name"
+            />
+          }
+          key="0"
+          onClick={[Function]}
+          sorted="ascending"
+        />
+        <TableHeaderCell
+          as="th"
+          className="disabled"
+          content={
+            <Memo(MemoizedFormattedMessage)
+              id="concepts.props.status"
+            />
+          }
+          key="1"
+          onClick={[Function]}
+          sorted="ascending"
+        />
+      </TableRow>
     </TableHeader>
     <TableBody
       as="tbody"
     >
       <ConceptRow
-        columns={Array []}
+        columns={
+          Array [
+            Object {
+              "name": "name",
+            },
+            Object {
+              "name": "status",
+            },
+          ]
+        }
         concept={
           Object {
             "id": 1,

package/src/concepts/reducers/conceptQuery.js

@@ -6,7 +6,7 @@ import {
   toggleConceptFilterValue,
   searchConcepts,
   selectConceptPage,
-  sortConcepts
+  sortConcepts,
 } from "../routines";
 
 const defaultPage = 1;
@@ -18,7 +18,7 @@ export const initialState = {
   query: "",
   page: defaultPage,
   size: defaultSize,
-  sort: byNameSort
+  sort: byNameSort,
 };
 
 const conceptQuery = (state = initialState, { type, payload }) => {

package/src/concepts/reducers/index.js

@@ -16,7 +16,6 @@ import { conceptRedirect } from "./conceptRedirect";
 import { conceptSelectedFilter } from "./conceptSelectedFilter";
 import { concepts } from "./concepts";
 import { conceptsActions } from "./conceptsActions";
-import { conceptsDefaultFilters } from "./conceptsDefaultFilters";
 import { conceptsDownloading } from "./conceptsDownloading";
 import { conceptsLoading } from "./conceptsLoading";
 import { conceptsPageSize } from "./conceptsPageSize";
@@ -39,7 +38,6 @@ export {
   conceptArchive,
   conceptArchiveLoading,
   conceptCount,
-  conceptsDefaultFilters,
   conceptFilters,
   conceptFiltersLoading,
   conceptLinking,

package/src/concepts/relations/components/ConceptSelector.js

@@ -30,9 +30,12 @@ const ConceptSelectorRow = ({ concept, active, onClick, disabled }) => {
       <Table.Cell
         content={
           <Label color={mapStatusColor[status]}>
-            {<FormattedMessage id={`concepts.status.${status}`} /> || (
-              <Icon name="ellipsis vertical" color="grey" />
-            )}
+            {(
+              <FormattedMessage
+                id={`concepts.status.${status}`}
+                defaultMessage={status}
+              />
+            ) || <Icon name="ellipsis vertical" color="grey" />}
           </Label>
         }
       />

package/src/concepts/routines.js

@@ -36,12 +36,6 @@ export const toggleConceptFilterValue = createRoutine(
   "TOGGLE_CONCEPT_FILTER_VALUE"
 );
 export const bulkUpdate = createRoutine("BULK_UPDATE");
-export const setConceptDefaultFilters = createRoutine(
-  "SET_CONCEPT_DEFAULT_FILTERS"
-);
-export const clearConceptDefaultFilters = createRoutine(
-  "CLEAR_CONCEPT_DEFAULT_FILTERS"
-);
 export const saveSharedTo = createRoutine("SAVE_SHARED_TO");
 export const setConfidentialConcept = createRoutine("SET_CONFIDENTIAL_CONCEPT");
 

package/src/messages/en.js

@@ -286,6 +286,7 @@ export default {
   "tabs.bg.qualityImplementations": "Quality Implementations",
   "tabs.bg.relations_business_concept": "Related Concepts",
   "tabs.bg.relations_data_field": "Linkage",
+  "tabs.concepts": "Concepts",
   "tabs.domains": "Domains",
   "tabs.members": "Members",
   "tabs.se.concepts": "Concepts",

package/src/messages/es.js

@@ -290,6 +290,7 @@ export default {
   "tabs.bg.qualityImplementations": "Implementaciones",
   "tabs.bg.relations_business_concept": "Conceptos relacionados",
   "tabs.bg.relations_data_field": "Vinculación",
+  "tabs.concepts": "Conceptos",
   "tabs.domains": "Dominios",
   "tabs.members": "Roles",
   "tabs.se.concepts": "Conceptos",

package/src/taxonomy/components/Domain.js

@@ -4,7 +4,13 @@ import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { Route, Switch } from "react-router-dom";
 import { Segment } from "semantic-ui-react";
-import { DOMAIN, DOMAIN_MEMBERS, linkTo } from "@truedat/core/routes";
+import {
+  DOMAIN,
+  DOMAIN_CONCEPTS,
+  DOMAIN_MEMBERS,
+  linkTo,
+} from "@truedat/core/routes";
+import DomainConcepts from "../../concepts/components/DomainConcepts";
 import DomainActions from "./DomainActions";
 import DomainCrumbs from "./DomainCrumbs";
 import DomainCards from "./DomainCards";
@@ -19,8 +25,8 @@ export const Domain = ({ hasChildren, domain, domainLoading }) => {
       order: 1,
       icon: "cube",
       messageId: "domain.actions.create",
-      action: id => linkTo.DOMAIN_ACTION({ action: "new", id })
-    }
+      action: (id) => linkTo.DOMAIN_NEW({ id }),
+    },
   };
 
   return domainLoading ? null : domain && domain.id ? (
@@ -42,7 +48,16 @@ export const Domain = ({ hasChildren, domain, domainLoading }) => {
                 </>
               )}
             />
-            <Route path={DOMAIN_MEMBERS} component={DomainMembers} exact />
+            <Route
+              path={DOMAIN_MEMBERS}
+              render={() => <DomainMembers />}
+              exact
+            />
+            <Route
+              path={DOMAIN_CONCEPTS}
+              render={() => <DomainConcepts />}
+              exact
+            />
           </Switch>
         </Segment>
       </Segment>
@@ -52,7 +67,8 @@ export const Domain = ({ hasChildren, domain, domainLoading }) => {
 
 Domain.propTypes = {
   hasChildren: PropTypes.bool,
-  domain: PropTypes.object
+  domain: PropTypes.object,
+  domainLoading: PropTypes.bool,
 };
 
 const mapStateToProps = ({ domain, domainLoading, domains }) => ({
@@ -62,7 +78,7 @@ const mapStateToProps = ({ domain, domainLoading, domains }) => ({
     _.filter(_.prop("parent_id")),
     _.filter(_.propEq("parent_id", _.prop("id")(domain))),
     _.negate(_.isEmpty)
-  )(domains)
+  )(domains),
 });
 
 export default connect(mapStateToProps)(Domain);

package/src/taxonomy/components/DomainCrumbs.js

@@ -44,13 +44,14 @@ export const DomainCrumbs = ({ parents, domain, actionCrumb }) => (
 );
 
 DomainCrumbs.propTypes = {
+  actionCrumb: PropTypes.string,
+  domain: PropTypes.object,
   parents: PropTypes.array,
-  domain: PropTypes.object
 };
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
   domain: state.domain,
-  parents: getAncestorDomains(state)
+  parents: getAncestorDomains(state),
 });
 
 export default connect(mapStateToProps)(DomainCrumbs);

package/src/taxonomy/components/DomainDetail.js

@@ -8,17 +8,15 @@ import { linkTo } from "@truedat/core/routes";
 
 import DomainActions from "./DomainActions";
 
-const toActionPath = linkTo.DOMAIN_ACTION;
-
 export const DomainDetail = ({ type, name, description, domain_group }) => {
   const available_actions = {
     update: {
       order: 2,
       icon: "edit",
       messageId: "actions.edit",
-      action: id => toActionPath({ action: "edit", id })
+      action: (id) => linkTo.DOMAIN_EDIT({ id }),
     },
-    deleteOption: true
+    deleteOption: true,
   };
   return (
     <>
@@ -57,7 +55,7 @@ DomainDetail.propTypes = {
   type: PropTypes.string,
   name: PropTypes.string,
   description: PropTypes.string,
-  domain_group: PropTypes.object
+  domain_group: PropTypes.object,
 };
 
 const mapStateToProps = ({ domain }) => ({ ...domain });

package/src/taxonomy/components/DomainRoutes.js

@@ -4,13 +4,14 @@ import { Unauthorized } from "@truedat/core/components";
 import { useAuthorized } from "@truedat/core/hooks";
 import {
   DOMAIN,
+  DOMAIN_CONCEPTS,
   DOMAINS,
   DOMAINS_NEW,
   DOMAINS_SEARCH,
   DOMAIN_EDIT,
   DOMAIN_MEMBERS,
   DOMAIN_MEMBERS_NEW,
-  DOMAIN_NEW
+  DOMAIN_NEW,
 } from "@truedat/core/routes";
 import AddDomainMember from "./AddMember";
 import Domain from "./Domain";
@@ -39,6 +40,7 @@ const AuthorizedRoutes = () => (
             <Route component={DomainLoader} />
             <Route component={DomainMembersLoader} />
             <Route path={DOMAIN} component={Domain} exact />
+            <Route path={DOMAIN_CONCEPTS} component={Domain} exact />
             <Route path={DOMAIN_MEMBERS} component={Domain} exact />
             <Route path={DOMAIN_EDIT} component={EditDomain} exact />
             <Route path={DOMAIN_NEW} component={NewDomain} exact />

package/src/taxonomy/components/DomainTabs.js

@@ -6,10 +6,16 @@ import { connect } from "react-redux";
 import { Link } from "react-router-dom";
 import { Menu } from "semantic-ui-react";
 import { usePath } from "@truedat/core/hooks";
-import { DOMAIN, DOMAIN_MEMBERS, linkTo } from "@truedat/core/routes";
+import {
+  DOMAIN,
+  DOMAIN_CONCEPTS,
+  DOMAIN_MEMBERS,
+  linkTo,
+} from "@truedat/core/routes";
 
 const DomainTabs = ({ domain }) => {
   const path = usePath();
+  const id = domain?.id;
   return (
     <Menu attached="top" pointing secondary tabular>
       <Menu.Item
@@ -18,22 +24,30 @@ const DomainTabs = ({ domain }) => {
         to={linkTo.DOMAIN(domain)}
         replace
       >
-        <FormattedMessage id={"tabs.subdomains"} />
+        <FormattedMessage id="tabs.subdomains" />
       </Menu.Item>
       <Menu.Item
         active={path === DOMAIN_MEMBERS}
         as={Link}
-        to={linkTo.DOMAIN_ACTION({ action: "members", ...domain })}
+        to={linkTo.DOMAIN_MEMBERS({ id })}
         replace
       >
-        <FormattedMessage id={"tabs.members"} />
+        <FormattedMessage id="tabs.members" />
+      </Menu.Item>
+      <Menu.Item
+        active={path === DOMAIN_CONCEPTS}
+        as={Link}
+        to={linkTo.DOMAIN_CONCEPTS({ id })}
+        replace
+      >
+        <FormattedMessage id="tabs.concepts" />
       </Menu.Item>
     </Menu>
   );
 };
 
 DomainTabs.propTypes = {
-  domain: PropTypes.object
+  domain: PropTypes.object,
 };
 
 const mapStateToProps = ({ domain }) => ({ domain });

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

@@ -16,17 +16,14 @@ exports[`<Domain /> matches the latest snapshot (no subdomains) 1`] = `
           render={[Function]}
         />
         <Route
-          component={
-            Object {
-              "$$typeof": Symbol(react.memo),
-              "WrappedComponent": [Function],
-              "compare": null,
-              "displayName": "Connect(DomainMembers)",
-              "type": [Function],
-            }
-          }
           exact={true}
           path="/domains/:id/members"
+          render={[Function]}
+        />
+        <Route
+          exact={true}
+          path="/domains/:id/concepts"
+          render={[Function]}
         />
       </Switch>
     </Segment>
@@ -50,17 +47,14 @@ exports[`<Domain /> matches the latest snapshot (with subdomains) 1`] = `
           render={[Function]}
         />
         <Route
-          component={
-            Object {
-              "$$typeof": Symbol(react.memo),
-              "WrappedComponent": [Function],
-              "compare": null,
-              "displayName": "Connect(DomainMembers)",
-              "type": [Function],
-            }
-          }
           exact={true}
           path="/domains/:id/members"
+          render={[Function]}
+        />
+        <Route
+          exact={true}
+          path="/domains/:id/concepts"
+          render={[Function]}
         />
       </Switch>
     </Segment>

package/src/concepts/components/ConceptsDefaultFiltersLoader.js

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

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

@@ -1,18 +0,0 @@
-import React from "react";
-import { mount } from "enzyme";
-import { ConceptsDefaultFiltersLoader } from "../ConceptsDefaultFiltersLoader";
-
-const getProps = () => ({
-  setConceptDefaultFilters: jest.fn(),
-  defaultFilters: { status: ["pending"] }
-});
-
-describe("<ConceptsDefaultFiltersLoader />", () => {
-  it("calls setConceptDefaultFilters when component mounts but not when it unmounts", () => {
-    const props = getProps();
-    const wrapper = mount(<ConceptsDefaultFiltersLoader {...props} />);
-    expect(props.setConceptDefaultFilters).toHaveBeenCalledTimes(1);
-    wrapper.unmount();
-    expect(props.setConceptDefaultFilters).toHaveBeenCalledTimes(1);
-  });
-});

package/src/concepts/reducers/__tests__/conceptsDefaultFilters.spec.js

@@ -1,37 +0,0 @@
-import {
-  setConceptDefaultFilters,
-  clearConceptDefaultFilters
-} from "../../routines";
-import { conceptsDefaultFilters } from "..";
-
-const fooState = { foo: "bar" };
-const initialState = {};
-
-describe("reducers: conceptsDefaultFilters", () => {
-  it("should provide the initial state", () => {
-    expect(conceptsDefaultFilters(undefined, {})).toEqual(initialState);
-  });
-
-  it("should handle the setConceptDefaultFilters.TRIGGER action", () => {
-    const defaultFilters = { status: ["pending"] };
-    const payload = { defaultFilters };
-    expect(
-      conceptsDefaultFilters(fooState, {
-        type: setConceptDefaultFilters.TRIGGER,
-        payload
-      })
-    ).toEqual(defaultFilters);
-  });
-
-  it("should handle the clearConceptDefaultFilters.TRIGGER action", () => {
-    expect(
-      conceptsDefaultFilters(fooState, {
-        type: clearConceptDefaultFilters.TRIGGER
-      })
-    ).toEqual(initialState);
-  });
-
-  it("should ignore unknown actions", () => {
-    expect(conceptsDefaultFilters(fooState, { type: "FOO" })).toBe(fooState);
-  });
-});

package/src/concepts/reducers/conceptsDefaultFilters.js

@@ -1,20 +0,0 @@
-import {
-  clearConceptDefaultFilters,
-  setConceptDefaultFilters
-} from "../routines";
-
-const initialState = {};
-
-const conceptsDefaultFilters = (state = initialState, { type, payload }) => {
-  switch (type) {
-    case setConceptDefaultFilters.TRIGGER:
-      const { defaultFilters } = payload;
-      return defaultFilters;
-    case clearConceptDefaultFilters.TRIGGER:
-      return initialState;
-    default:
-      return state;
-  }
-};
-
-export { conceptsDefaultFilters };