@truedat/dd 5.2.2 → 5.2.4

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [5.2.4] 2023-02-24
+
+### Fixed
+
+- [TD-3541] Error showing versions in StructureCrumbs
+
+## [5.2.3] 2023-02-23
+
+### Added
+
+- [TD-4554] Concept link manager integration with Structure search results
+
 ## [5.2.1] 2023-02-22
 
 ### Changed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "5.2.2",
+  "version": "5.2.4",
   "description": "Truedat Web Data Dictionary",
   "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": "5.2.2",
+    "@truedat/test": "5.2.4",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -87,9 +87,9 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@truedat/auth": "5.2.2",
-    "@truedat/core": "5.2.2",
-    "@truedat/df": "5.2.2",
+    "@truedat/auth": "5.2.4",
+    "@truedat/core": "5.2.4",
+    "@truedat/df": "5.2.4",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "path-to-regexp": "^1.7.0",
@@ -114,5 +114,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "39b2e1047e9a1ef56be526292208be23bfdd798d"
+  "gitHead": "30945576a3812f88a70b30553caec79bb8957d5c"
 }

package/src/components/StructureCrumbs.js

@@ -102,7 +102,12 @@ export const StructureCrumbs = ({
         version={version}
         isStructureCrumbActive={isStructureCrumbActive}
       />
-      {_.isNil(version) ? null : <VersionCrumb id={id} version={version} />}
+      {_.isNil(version) || version === "latest" ? null : (
+        <>
+          {" "}
+          <VersionCrumb id={id} version={version} />
+        </>
+      )}
     </Breadcrumb>
   ) : null;
 

package/src/components/StructureRow.js

@@ -9,12 +9,14 @@ export const StructureRow = ({
   columns,
   onClick,
   active,
-  disabled
+  disabled,
+  positive,
 }) =>
   _.isEmpty(columns) || _.isEmpty(structure) ? null : (
     <Table.Row
       active={active}
       disabled={disabled}
+      positive={positive}
       onClick={() => onClick && onClick(structure)}
     >
       {columns.map((column, i) => (
@@ -30,7 +32,10 @@ export const StructureRow = ({
 StructureRow.propTypes = {
   structure: PropTypes.object,
   columns: PropTypes.array,
-  onClick: PropTypes.func
+  onClick: PropTypes.func,
+  active: PropTypes.bool,
+  disabled: PropTypes.bool,
+  positive: PropTypes.bool,
 };
 
 export default StructureRow;

package/src/components/StructureSelector.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React, { useState } from "react";
+import React, { useState, useEffect } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { Segment } from "semantic-ui-react";
@@ -23,8 +23,13 @@ export const StructureSelector = ({
   selectedStructure: structure,
   onSelect,
   pageSize = 7,
+  links,
+  placeToTop,
 }) => {
-  const [selectedStructure, setSelectedStructure] = useState(structure);
+  const [selectedStructure, setSelectedStructure] = useState(null);
+  useEffect(() => {
+    setSelectedStructure(structure);
+  }, [structure]);
 
   const handleSelect = (structure) => {
     const selectedStructure = _.find(_.propEq("id", structure.id))(structures);
@@ -48,6 +53,8 @@ export const StructureSelector = ({
         structures={structuresRows}
         onSelect={handleSelect}
         selectedStructure={selectedStructure}
+        links={links}
+        placeToTop={placeToTop}
       />
     </Segment>
   );
@@ -63,6 +70,8 @@ StructureSelector.propTypes = {
   selectedStructure: PropTypes.object,
   structures: PropTypes.array,
   structuresRows: PropTypes.array,
+  links: PropTypes.array,
+  placeToTop: PropTypes.bool,
 };
 
 export const mapStateToProps = (state, props) => ({

package/src/components/StructuresSearchResults.js

@@ -15,6 +15,8 @@ export const StructuresSearchResults = ({
   selectedStructure,
   structures,
   loading,
+  links,
+  placeToTop,
 }) => (
   <Dimmer.Dimmable dimmed={loading}>
     <Dimmer active={loading} inverted>
@@ -29,6 +31,8 @@ export const StructuresSearchResults = ({
           selectedStructure={selectedStructure}
           structures={structures}
           onStructureSelected={onSelect}
+          links={links}
+          placeToTop={placeToTop}
         />
         <StructuresPagination size={size} />
       </>
@@ -55,6 +59,8 @@ StructuresSearchResults.propTypes = {
   structures: PropTypes.array,
   selectedStructure: PropTypes.object,
   loading: PropTypes.bool,
+  links: PropTypes.array,
+  placeToTop: PropTypes.bool,
 };
 
 export default StructuresSearchResults;

package/src/components/StructuresTable.js

@@ -9,6 +9,15 @@ import { sortStructures } from "../routines";
 import { structureColumnsSelector } from "../selectors";
 import StructureRow from "./StructureRow";
 
+const isPositive = (links, id) => {
+  const link = _.find(
+    (link) =>
+      _.propEq("resource_id", id.toString())(link) &&
+      _.propEq("resource_type", "data_structure")(link)
+  )(links);
+  return link ? true : false;
+};
+
 export class StructuresTable extends React.Component {
   state = {
     sortedColumn: _.prop("column")(getSortInfo(this.props.structuresSort)),
@@ -40,6 +49,8 @@ export class StructuresTable extends React.Component {
       size,
       sortStructures,
       structures,
+      links = [],
+      placeToTop = true,
     } = this.props;
     const { sortedColumn, direction } = this.state;
 
@@ -47,11 +58,13 @@ export class StructuresTable extends React.Component {
       return null;
     } else {
       // selectedStructure will be placed at top unless it is present in structures
-      const tableData = _.has("id")(selectedStructure)
-        ? _.any(_.propEq("id", selectedStructure.id))(structures)
-          ? structures
-          : [selectedStructure, ...structures]
-        : structures;
+      const tableData =
+        _.has("id")(selectedStructure) && placeToTop
+          ? _.any(_.propEq("id", selectedStructure.id))(structures) &&
+            placeToTop
+            ? structures
+            : [selectedStructure, ...structures]
+          : structures;
       const headerRow = columns.map((column, key) => (
         <Table.HeaderCell
           key={key}
@@ -83,6 +96,7 @@ export class StructuresTable extends React.Component {
           columns={columns}
           structure={s}
           active={selectedStructure && _.propEq("id", s.id)(selectedStructure)}
+          positive={isPositive(links, s.id)}
           onClick={onStructureSelected}
         />
       );
@@ -108,6 +122,8 @@ StructuresTable.propTypes = {
   sortStructures: PropTypes.func,
   structures: PropTypes.array,
   structuresSort: PropTypes.array,
+  links: PropTypes.array,
+  placeToTop: PropTypes.bool,
 };
 
 const mapStateToProps = (state, props) => ({

package/src/components/__tests__/__snapshots__/StructureCrumbs.spec.js.snap

@@ -72,6 +72,7 @@ exports[`<StructureCrumbs /> matches the latest snapshot (system, ancestry, stru
     name="structure a"
     version="32"
   />
+   
   <VersionCrumb
     id={123}
     version="32"
@@ -101,6 +102,7 @@ exports[`<StructureCrumbs /> matches the latest snapshot (system. ancestry, stru
     name="structure a"
     version="32"
   />
+   
   <VersionCrumb
     id={123}
     version="32"

package/src/components/__tests__/__snapshots__/StructureSelector.spec.js.snap

@@ -28,6 +28,7 @@ exports[`<StructureSelector /> matches the latest snapshot 1`] = `
       ]
     }
     onSelect={[Function]}
+    selectedStructure={null}
     size="small"
     structures={
       Array [

package/src/hooks/useStructures.js

@@ -21,7 +21,6 @@ const asQueryParams = (queryParams) => {
 };
 
 export const useStructures = (args) => {
-  console.log(args);
   const url = toApiPath({ id: args.systemId });
   const requestData = () => apiJson(`${url}${asQueryParams(args)}`);
   const options = { keepPreviousData: true };