@truedat/bg 4.46.3 → 4.46.4

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [4.46.4] 2022-06-16
+
+### Added
+
+- [TD-4720] Include concepts tab in domain view
+
 ## [4.46.2] 2022-06-16
 
 ### Changed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/bg",
-  "version": "4.46.3",
+  "version": "4.46.4",
   "description": "Truedat Web Business Glossary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "4.46.3",
+    "@truedat/test": "4.46.4",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -86,8 +86,8 @@
     ]
   },
   "dependencies": {
-    "@truedat/core": "4.46.3",
-    "@truedat/df": "4.46.3",
+    "@truedat/core": "4.46.4",
+    "@truedat/df": "4.46.4",
     "file-saver": "^2.0.5",
     "moment": "^2.24.0",
     "path-to-regexp": "^1.7.0",
@@ -107,5 +107,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "dfb9df52cce497f8040ba6c17bfb23c9225683d3"
+  "gitHead": "dcd0aa42ffe1fb816945154ec2a2d06889dca7e7"
 }

package/src/concepts/components/ConceptArchiveRow.js

@@ -13,7 +13,7 @@ export const ConceptArchiveRow = ({
   status,
   last_change_at,
   last_change_by,
-  version
+  version,
 }) => {
   const history = useHistory();
   return (
@@ -23,7 +23,12 @@ export const ConceptArchiveRow = ({
       }
     >
       <Table.Cell
-        content={<FormattedMessage id={`concepts.status.${status}`} />}
+        content={
+          <FormattedMessage
+            id={`concepts.status.${status}`}
+            defaultMessage={status}
+          />
+        }
       />
       <Table.Cell content={version} />
       <Table.Cell content={_.propOr("", "full_name")(last_change_by)} />
@@ -38,7 +43,7 @@ ConceptArchiveRow.propTypes = {
   status: PropTypes.string,
   last_change_at: PropTypes.string,
   last_change_by: PropTypes.string,
-  version: PropTypes.number
+  version: PropTypes.number,
 };
 
 export default ConceptArchiveRow;

package/src/concepts/components/ConceptFiltersLoader.js

@@ -17,6 +17,7 @@ const makeMapStateToProps = () => {
   const mapStateToProps = (state, props) => ({
     selectedFilter: state.conceptSelectedFilter,
     filters: activeFiltersSelector(state, props),
+    defaultFilters: props?.defaultFilters || {},
   });
   return mapStateToProps;
 };

package/src/concepts/components/ConceptRoutes.js

@@ -25,7 +25,6 @@ import ConceptLoader from "./ConceptLoader";
 import Concepts from "./Concepts";
 import ConceptsBulkUpdate from "./ConceptsBulkUpdate";
 import ConceptsLoader from "./ConceptsLoader";
-import ConceptsDefaultFiltersLoader from "./ConceptsDefaultFiltersLoader";
 import ConceptSubscriptionLoader from "./ConceptSubscriptionLoader";
 
 const RelationTagsLoader = React.lazy(() =>
@@ -56,19 +55,9 @@ export const ConceptRoutes = ({ concept, conceptLoaded, templatesLoaded }) => {
           authorized ? (
             <>
               <ConceptUserFiltersLoader />
-              <ConceptsDefaultFiltersLoader
-                defaultFilters={{
-                  status: ["pending_approval", "draft", "rejected"],
-                }}
-              />
               <ConceptFiltersLoader
                 defaultFilters={{
-                  status: [
-                    "pending_approval",
-                    "draft",
-                    "rejected",
-                    "published",
-                  ],
+                  status: ["pending_approval", "draft", "rejected"],
                 }}
               />
               <Concepts
@@ -96,11 +85,6 @@ export const ConceptRoutes = ({ concept, conceptLoaded, templatesLoaded }) => {
                   render={() => (
                     <>
                       <ConceptUserFiltersLoader />
-                      <ConceptsDefaultFiltersLoader
-                        defaultFilters={{
-                          status: ["published"],
-                        }}
-                      />
                       <ConceptFiltersLoader
                         defaultFilters={{
                           status: ["published"],

package/src/concepts/components/ConceptSummary.js

@@ -28,11 +28,11 @@ FieldValue.propTypes = {
   field: PropTypes.any,
   value: PropTypes.any,
   color: PropTypes.any,
-  in_progress: PropTypes.bool
+  in_progress: PropTypes.bool,
 };
 
 export const ConceptSummary = ({
-  concept: { status, version, last_change_at, last_change_user, in_progress }
+  concept: { status, version, last_change_at, last_change_user, in_progress },
 }) => (
   <Segment>
     <Header as="h3" dividing>
@@ -41,7 +41,12 @@ export const ConceptSummary = ({
 
     <FieldValue
       field="status"
-      value={<FormattedMessage id={`concepts.status.${status}`} />}
+      value={
+        <FormattedMessage
+          id={`concepts.status.${status}`}
+          defaultMessage={status}
+        />
+      }
       color={mapStatusColor[status]}
       in_progress={in_progress}
     />
@@ -60,12 +65,12 @@ export const ConceptSummary = ({
 );
 
 ConceptSummary.propTypes = {
-  concept: PropTypes.object
+  concept: PropTypes.object,
 };
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
   concept: state.concept,
-  fieldValues: getFieldValues(state)
+  fieldValues: getFieldValues(state),
 });
 
 export default connect(mapStateToProps)(ConceptSummary);

package/src/concepts/components/Concepts.js

@@ -1,17 +1,11 @@
 import React from "react";
 import PropTypes from "prop-types";
-import { connect } from "react-redux";
-import { Dimmer, Header, Icon, Loader, Segment } from "semantic-ui-react";
+import { Header, Icon, Segment } from "semantic-ui-react";
 import { FormattedMessage } from "react-intl";
-import ConceptsActions from "./ConceptsActions";
 import ConceptCrumbs from "./ConceptCrumbs";
-import ConceptsLabelResults from "./ConceptsLabelResults";
-import ConceptsPagination from "./ConceptsPagination";
-import ConceptsSearch from "./ConceptsSearch";
-import ConceptsTable from "./ConceptsTable";
-import ConceptSelectedFilters from "./ConceptSelectedFilters";
+import ConceptsPanel from "./ConceptsPanel";
 
-export const Concepts = ({ loading, header, subheader, icon, ...actions }) => (
+export const Concepts = ({ header, subheader, icon }) => (
   <>
     <ConceptCrumbs />
     <Segment>
@@ -25,17 +19,7 @@ export const Concepts = ({ loading, header, subheader, icon, ...actions }) => (
         </Header.Content>
       </Header>
       <Segment attached="bottom">
-        <ConceptsActions {...actions} />
-        <ConceptsSearch />
-        <ConceptSelectedFilters />
-        <Dimmer.Dimmable dimmed={loading}>
-          <Dimmer active={loading} inverted>
-            <Loader />
-          </Dimmer>
-          <ConceptsLabelResults />
-          <ConceptsTable />
-          <ConceptsPagination />
-        </Dimmer.Dimmable>
+        <ConceptsPanel />
       </Segment>
     </Segment>
   </>
@@ -44,12 +28,7 @@ export const Concepts = ({ loading, header, subheader, icon, ...actions }) => (
 Concepts.propTypes = {
   header: PropTypes.string,
   icon: PropTypes.string,
-  loading: PropTypes.bool,
-  subheader: PropTypes.string
+  subheader: PropTypes.string,
 };
 
-const mapStateToProps = ({ conceptsLoading }) => ({
-  loading: conceptsLoading
-});
-
-export default connect(mapStateToProps)(Concepts);
+export default Concepts;

package/src/concepts/components/ConceptsActions.js

@@ -23,8 +23,8 @@ export const ConceptsActions = ({
   create,
   createUrl,
   conceptsDownloading,
-  conceptActionsLoaded,
   downloadConcepts,
+  hidden,
   upload,
 }) => {
   const { formatMessage } = useIntl();
@@ -32,7 +32,7 @@ export const ConceptsActions = ({
     _.map((l) => [l, formatMessage({ id: `concepts.props.${l}` })]),
     _.fromPairs
   )(staticLabels);
-  return conceptActionsLoaded ? (
+  return hidden ? null : (
     <div>
       {create && createUrl && (
         <Button
@@ -56,25 +56,27 @@ export const ConceptsActions = ({
       {upload && <ConceptsUploadButton />}
       <ConceptsUpdateButton />
     </div>
-  ) : null;
+  );
 };
 
 ConceptsActions.propTypes = {
   conceptsDownloading: PropTypes.bool,
-  conceptActionsLoaded: PropTypes.bool,
+  hidden: PropTypes.bool,
   create: PropTypes.bool,
   createUrl: PropTypes.string,
   downloadConcepts: PropTypes.func,
   upload: PropTypes.bool,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = ({
+  conceptActions,
+  conceptsActions,
+  conceptsDownloading,
+}) => ({
   createUrl:
-    _.isEmpty(state.conceptActions) &&
-    _.has("create")(state.conceptsActions) &&
-    CONCEPTS_NEW,
-  conceptsDownloading: state.conceptsDownloading,
-  conceptActionsLoaded: _.negate(_.isEmpty)(state.conceptsActions),
+    _.isEmpty(conceptActions) && conceptsActions?.create ? CONCEPTS_NEW : null,
+  conceptsDownloading: conceptsDownloading,
+  hidden: _.isEmpty(conceptsActions),
 });
 
 export default connect(mapStateToProps, { downloadConcepts, uploadConcepts })(

package/src/concepts/components/ConceptsLoader.js

@@ -1,26 +1,15 @@
-import _ from "lodash/fp";
 import { useEffect } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { makeSearchQuerySelector } from "@truedat/core/selectors";
-import {
-  clearConcepts,
-  clearConceptDefaultFilters,
-  fetchConcepts,
-} from "../routines";
+import { clearConcepts, fetchConcepts } from "../routines";
 
-export const ConceptsLoader = ({
-  clearConcepts,
-  clearConceptDefaultFilters,
-  fetchConcepts,
-  payload,
-}) => {
+export const ConceptsLoader = ({ clearConcepts, fetchConcepts, payload }) => {
   useEffect(() => {
     return () => {
       clearConcepts();
-      clearConceptDefaultFilters();
     };
-  }, [clearConcepts, clearConceptDefaultFilters]);
+  }, [clearConcepts]);
   useEffect(() => {
     fetchConcepts(payload);
   }, [payload, fetchConcepts]);
@@ -33,27 +22,17 @@ ConceptsLoader.propTypes = {
   payload: PropTypes.object,
 };
 
-const defaultFilters = (defaultFilters, conceptsDefaultFilters) =>
-  defaultFilters || conceptsDefaultFilters;
 const makeMapStateToProps = () => {
   const searchQuerySelector = makeSearchQuerySelector(
     "conceptQuery",
     "conceptActiveFilters"
   );
   const mapStateToProps = (state, props) => ({
-    payload: searchQuerySelector(state, {
-      ...props,
-      defaultFilters: defaultFilters(
-        _.prop("defaultFilters")(props),
-        _.prop("conceptsDefaultFilters")(state)
-      ),
-    }),
+    payload: searchQuerySelector(state, props),
   });
   return mapStateToProps;
 };
 
-export default connect(makeMapStateToProps, {
-  clearConcepts,
-  clearConceptDefaultFilters,
-  fetchConcepts,
-})(ConceptsLoader);
+export default connect(makeMapStateToProps, { clearConcepts, fetchConcepts })(
+  ConceptsLoader
+);

package/src/concepts/components/ConceptsPanel.js

@@ -0,0 +1,34 @@
+import React from "react";
+import PropTypes from "prop-types";
+import { connect } from "react-redux";
+import { Dimmer, Loader } from "semantic-ui-react";
+import ConceptsActions from "./ConceptsActions";
+import ConceptsLabelResults from "./ConceptsLabelResults";
+import ConceptsPagination from "./ConceptsPagination";
+import ConceptsSearch from "./ConceptsSearch";
+import ConceptsTable from "./ConceptsTable";
+import ConceptSelectedFilters from "./ConceptSelectedFilters";
+
+export const ConceptsPanel = ({ loading, ...actions }) => (
+  <>
+    <ConceptsActions {...actions} />
+    <ConceptsSearch />
+    <ConceptSelectedFilters />
+    <Dimmer.Dimmable dimmed={loading}>
+      <Dimmer active={loading} inverted>
+        <Loader />
+      </Dimmer>
+      <ConceptsLabelResults />
+      <ConceptsTable />
+      <ConceptsPagination />
+    </Dimmer.Dimmable>
+  </>
+);
+
+ConceptsPanel.propTypes = {
+  loading: PropTypes.bool,
+};
+
+const mapStateToProps = ({ conceptsLoading }) => ({ loading: conceptsLoading });
+
+export default connect(mapStateToProps)(ConceptsPanel);

package/src/concepts/components/ConceptsTable.js

@@ -7,14 +7,15 @@ import { Table, Header, Icon } from "semantic-ui-react";
 import { FormattedMessage } from "react-intl";
 import { withRouter } from "react-router";
 import { getSortInfo, sortColumn } from "@truedat/core/services/sort";
-import { CONCEPTS, CONCEPTS_PENDING } from "@truedat/core/routes";
+import { CONCEPTS } from "@truedat/core/routes";
 import { sortConcepts } from "../routines";
 import { getConceptsRows, getConceptColumns } from "../selectors";
 import ConceptRow from "./ConceptRow";
 
 export class ConceptsTable extends React.Component {
   static propTypes = {
-    conceptsLoading: PropTypes.bool,
+    loading: PropTypes.bool,
+    sortBy: PropTypes.array,
     concepts: PropTypes.array,
     columns: PropTypes.array,
     location: PropTypes.object,
@@ -23,8 +24,8 @@ export class ConceptsTable extends React.Component {
 
   //initial state
   state = {
-    sortedColumn: _.prop("column")(getSortInfo(this.props.conceptsSorting)),
-    direction: _.prop("direction")(getSortInfo(this.props.conceptsSorting)),
+    sortedColumn: _.prop("column")(getSortInfo(this.props.sortBy)),
+    direction: _.prop("direction")(getSortInfo(this.props.sortBy)),
   };
 
   setDirection = (direction) => {
@@ -36,25 +37,23 @@ export class ConceptsTable extends React.Component {
   };
 
   componentDidUpdate(prevProps) {
-    if (prevProps.conceptsSorting != this.props.conceptsSorting) {
+    if (prevProps.sortBy != this.props.sortBy) {
       const { column: sortedColumn, direction: direction } = getSortInfo(
-        this.props.conceptsSorting
+        this.props.sortBy
       );
       this.setState({ sortedColumn, direction });
     }
   }
 
   render() {
-    const { concepts, columns, conceptsLoading, location, sortConcepts } =
-      this.props;
-
+    const { concepts, columns, loading, location, sortConcepts } = this.props;
     const { sortedColumn, direction } = this.state;
 
     const pathname = _.prop("pathname")(location);
     const conceptColumns = columns.filter(
       (column) =>
-        (pathname == CONCEPTS && column.name != "status") ||
-        pathname == CONCEPTS_PENDING
+        (pathname === CONCEPTS && column.name != "status") ||
+        pathname !== CONCEPTS
     );
 
     return (
@@ -100,7 +99,7 @@ export class ConceptsTable extends React.Component {
             </Table.Body>
           </Table>
         )}
-        {_.isEmpty(concepts) && !conceptsLoading && (
+        {loading || concepts?.length ? null : (
           <Header as="h4">
             <Icon name="search" />
             <Header.Content>
@@ -116,8 +115,8 @@ export class ConceptsTable extends React.Component {
 const mapStateToProps = (state) => ({
   columns: getConceptColumns(state),
   concepts: getConceptsRows(state),
-  conceptsLoading: state.conceptsLoading,
-  conceptsSorting: _.path("conceptQuery.sort")(state),
+  loading: state.conceptsLoading,
+  sortBy: _.path("conceptQuery.sort")(state),
 });
 
 export default compose(

package/src/concepts/components/DomainConcepts.js

@@ -0,0 +1,29 @@
+import React from "react";
+import PropTypes from "prop-types";
+import { connect } from "react-redux";
+import ConceptsPanel from "./ConceptsPanel";
+import ConceptsLoader from "./ConceptsLoader";
+import ConceptFiltersLoader from "./ConceptFiltersLoader";
+
+export const DomainConcepts = ({ domain = {} }) => {
+  const defaultFilters = {
+    taxonomy: [domain.id],
+    current: [true],
+    status: ["published"],
+  };
+  return (
+    <>
+      <ConceptFiltersLoader defaultFilters={defaultFilters} />
+      <ConceptsLoader defaultFilters={defaultFilters} />
+      <ConceptsPanel />
+    </>
+  );
+};
+
+DomainConcepts.propTypes = {
+  domain: PropTypes.object.isRequired,
+};
+
+export const mapStateToProps = ({ domain }) => ({ domain });
+
+export default connect(mapStateToProps)(DomainConcepts);

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

@@ -1,26 +1,23 @@
 import React from "react";
-import { shallow } from "enzyme";
+import { render } from "@truedat/test/render";
 import ConceptArchiveRow from "../ConceptArchiveRow";
 
-const mockHistory = {
-  push: jest.fn()
-};
-
-jest.mock("react-router-dom", () => ({
-  ...jest.requireActual("react-router-dom"),
-  useHistory: () => mockHistory
-}));
-
 describe("<ConceptArchiveRow />", () => {
   it("matches the latest snapshot", () => {
     const props = {
       id: 123,
-      status: "status",
+      status: "draft",
       last_change_at: "2018-06-27T07:32:53.154377Z",
       last_change_by: "maixu",
-      version: 1
+      version: 1,
     };
-    const wrapper = shallow(<ConceptArchiveRow {...props} />);
-    expect(wrapper).toMatchSnapshot();
+    const { container } = render(
+      <table>
+        <tbody>
+          <ConceptArchiveRow {...props} />
+        </tbody>
+      </table>
+    );
+    expect(container).toMatchSnapshot();
   });
 });

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

@@ -4,9 +4,8 @@ import { ConceptsLoader } from "../ConceptsLoader";
 
 const getProps = () => ({
   clearConcepts: jest.fn(),
-  clearConceptDefaultFilters: jest.fn(),
   conceptsLoading: false,
-  fetchConcepts: jest.fn()
+  fetchConcepts: jest.fn(),
 });
 
 describe("<ConceptsLoader />", () => {
@@ -18,14 +17,12 @@ describe("<ConceptsLoader />", () => {
     expect(props.fetchConcepts).toHaveBeenCalledTimes(1);
   });
 
-  it("calls clearConcepts and clearConceptDefaultFilters when component unmounts but not when it mounts", () => {
+  it("calls clearConcepts when component unmounts but not when it mounts", () => {
     const props = getProps();
     const wrapper = mount(<ConceptsLoader {...props} />);
     expect(props.clearConcepts).toHaveBeenCalledTimes(0);
-    expect(props.clearConceptDefaultFilters).toHaveBeenCalledTimes(0);
     wrapper.unmount();
     expect(props.clearConcepts).toHaveBeenCalledTimes(1);
-    expect(props.clearConceptDefaultFilters).toHaveBeenCalledTimes(1);
   });
 
   it("merges default filters with query filters", () => {

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

@@ -0,0 +1,25 @@
+import React from "react";
+import { render } from "@truedat/test/render";
+import ConceptsPanel from "../ConceptsPanel";
+
+const renderOpts = {
+  state: {
+    conceptCount: 123,
+    concepts: [
+      {
+        id: 1,
+        name: "concept",
+        domain: { name: "domain" },
+        status: "published",
+        last_change_at: "2020-01-01T00:00:00.000Z",
+      },
+    ],
+  },
+};
+
+describe("<ConceptsPanel />", () => {
+  it("matches latest snapshot", () => {
+    const { container } = render(<ConceptsPanel />, renderOpts);
+    expect(container).toMatchSnapshot();
+  });
+});

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

@@ -1,34 +1,38 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<ConceptArchiveRow /> matches the latest snapshot 1`] = `
-<TableRow
-  as="tr"
-  cellAs="td"
-  onClick={[Function]}
->
-  <TableCell
-    as="td"
-    content={
-      <Memo(MemoizedFormattedMessage)
-        id="concepts.status.status"
-      />
-    }
-  />
-  <TableCell
-    as="td"
-    content={1}
-  />
-  <TableCell
-    as="td"
-    content=""
-  />
-  <TableCell
-    as="td"
-    content={
-      <DateTime
-        value="2018-06-27T07:32:53.154377Z"
-      />
-    }
-  />
-</TableRow>
+<div>
+  <table>
+    <tbody>
+      <tr
+        class=""
+      >
+        <td
+          class=""
+        >
+          Draft
+        </td>
+        <td
+          class=""
+        >
+          1
+        </td>
+        <td
+          class=""
+        >
+          
+        </td>
+        <td
+          class=""
+        >
+          <time
+            datetime="1530084773154"
+          >
+            2018-06-27 07:32
+          </time>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</div>
 `;