@truedat/lm 5.8.1 → 5.8.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/lm",
-  "version": "5.8.1",
+  "version": "5.8.2",
   "description": "Truedat Link Manager",
   "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.8.1",
+    "@truedat/test": "5.8.2",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -86,7 +86,7 @@
     ]
   },
   "dependencies": {
-    "@truedat/core": "5.8.1",
+    "@truedat/core": "5.8.2",
     "path-to-regexp": "^1.7.0",
     "prop-types": "^15.8.1",
     "react-graph-vis": "1.0.6",
@@ -107,5 +107,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "aacafb9e014ac8d1193a5dc2a37c92ea36c3d816"
+  "gitHead": "4eddd0a75147c3ce81b15c491edea1e414a33897"
 }

package/src/components/ConceptLinkTags.js

@@ -1,7 +1,6 @@
 import React from "react";
 import PropTypes from "prop-types";
 import { FormattedMessage } from "react-intl";
-import "../styles/ConceptLinkTags.less";
 
 export const ConceptLinkTags = ({ tags }) => (
   <ul className="concept-link-tags">

package/src/components/ConceptStructureLinkForm.js

@@ -12,7 +12,7 @@ import {
   clearSelectedRelationTags,
   clearStructures,
 } from "../routines";
-import TagTypeSelector from "./TagTypeSelector";
+import TagTypeDropdownSelector from "./TagTypeDropdownSelector";
 
 const StructureSelector = React.lazy(() =>
   import("@truedat/dd/components/StructureSelector")
@@ -56,12 +56,9 @@ export const ConceptStructureLinkForm = ({
   return (
     <>
       <Divider hidden />
-      {!_.isEmpty(tagOptions) && (
-        <TagTypeSelector
-          selectedRelationTags={selectedRelationTags}
-          options={tagOptions}
-        />
-      )}
+      {!_.isEmpty(tagOptions) ? (
+        <TagTypeDropdownSelector options={tagOptions} />
+      ) : null}
       <StructureSelector
         selectedStructure={selectedStructure}
         onSelect={handleSelect}

package/src/components/TagTypeDropdownSelector.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React from "react";
+import React, { useEffect, useState } from "react";
 import PropTypes from "prop-types";
 import { Form, Dropdown } from "semantic-ui-react";
 import { FormattedMessage, useIntl } from "react-intl";
@@ -26,20 +26,37 @@ export const TagTypeDropdownSelector = ({
   setSelectedRelationTags,
 }) => {
   const { formatMessage } = useIntl();
+  const [clearDropdown, setClearDropdown] = useState(false);
+  const [relationTag, setRelationTag] = useState(null);
+
+  useEffect(
+    () => {
+      setSelectedRelationTags({ selectedRelationTags: [] });
+      setClearDropdown(true);
+    },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [options]
+  );
 
   const onChange = (_e, { value }) => {
     setSelectedRelationTags({
       selectedRelationTags: value === "" ? [] : [value],
     });
+    setRelationTag(value);
+    setClearDropdown(false);
   };
   return (
     <Form.Field>
-      <label>
-        <FormattedMessage id="relations.relationType" />
-      </label>
+      <b>
+        <label>
+          <FormattedMessage id="relations.relationType" />
+        </label>
+      </b>
       <div>
         {options && (
           <Dropdown
+            className="concept-link-dropdown"
+            value={clearDropdown ? "" : relationTag}
             clearable
             selection
             options={formatOption(formatMessage)(options)}

package/src/reducers/__tests__/handlingRelation.spec.js

@@ -0,0 +1,34 @@
+import { createRelation, deleteRelation } from "../../routines";
+import { handlingRelation } from "..";
+
+const fooState = { foo: "bar" };
+const payload = { data: fooState };
+
+describe("reducers: handlingRelation", () => {
+  const initialState = false;
+
+  it("should provide the initial state", () => {
+    expect(handlingRelation(undefined, {})).toEqual(initialState);
+  });
+
+  it("should handle the createRelation.SUCCESS action", () => {
+    expect(
+      handlingRelation(fooState, { type: createRelation.SUCCESS, payload })
+    ).toEqual(fooState);
+  });
+
+  it("should handle the createRelation.FAILURE action", () => {
+    expect(
+      handlingRelation(fooState, { type: createRelation.FAILURE })
+    ).toEqual(false);
+  });
+
+  it("should handle the deleteRelation.SUCCESS action", () => {
+    expect(
+      handlingRelation(fooState, {
+        type: deleteRelation.SUCCESS,
+        meta: { id: "1" },
+      })
+    ).toEqual({ id: "1" });
+  });
+});

package/src/reducers/__tests__/relations.spec.js

@@ -35,11 +35,7 @@ describe("reducers: relations", () => {
   it("should handle the deleteRelation.SUCCESS action", () => {
     expect(
       relations(data, { type: deleteRelation.SUCCESS, meta: { id: "1" } })
-    ).toEqual({ id: "1" });
-  });
-
-  it("should handle the deleteRelation.FAILURE action", () => {
-    expect(relations(data, { type: deleteRelation.FAILURE })).toEqual(false);
+    ).toEqual([]);
   });
 
   it("should handle the clearRelations.TRIGGER action", () => {

package/src/reducers/handlingRelation.js

@@ -0,0 +1,18 @@
+import { createRelation, deleteRelation } from "../routines";
+
+export const handlingRelation = (state = false, { type, payload, meta }) => {
+  switch (type) {
+    case createRelation.SUCCESS:
+      return payload.data;
+    case createRelation.FAILURE:
+      return false;
+    case deleteRelation.SUCCESS: {
+      return meta;
+    }
+    case deleteRelation.FAILURE: {
+      return false;
+    }
+    default:
+      return state;
+  }
+};

package/src/reducers/index.js

@@ -1,4 +1,4 @@
-import { creatingRelation } from "./creatingRelation";
+import { handlingRelation } from "./handlingRelation";
 import { selectedRelationTags } from "./selectedRelationTags";
 import { relations } from "./relations";
 import { relationsActions } from "./relationsActions";
@@ -10,7 +10,7 @@ import { relationTags } from "./relationTags";
 import { relationTagsLoading } from "./relationTagsLoading";
 
 export {
-  creatingRelation,
+  handlingRelation,
   selectedRelationTags,
   relations,
   relationsActions,
@@ -19,5 +19,5 @@ export {
   relationsLoading,
   relationRedirect,
   relationTags,
-  relationTagsLoading
+  relationTagsLoading,
 };

package/src/reducers/relations.js

@@ -1,5 +1,10 @@
 import _ from "lodash/fp";
-import { fetchRelations, deleteRelation, clearRelations } from "../routines";
+import {
+  fetchRelations,
+  clearRelations,
+  createRelation,
+  deleteRelation,
+} from "../routines";
 
 const initialState = [];
 
@@ -19,11 +24,13 @@ const relations = (state = initialState, { type, payload, meta }) => {
       return initialState;
     case fetchRelations.SUCCESS:
       return _.flow(_.propOr([], "data"), _.map(pickFields))(payload);
+
+    case createRelation.SUCCESS:
+      return [...state, payload.data];
+
     case deleteRelation.SUCCESS: {
-      return meta;
-    }
-    case deleteRelation.FAILURE: {
-      return false;
+      const { id } = meta;
+      return _.reject(_.propEq("id", id))(state);
     }
     case clearRelations.TRIGGER:
       return initialState;

package/src/styles/ConceptLinkTags.less

@@ -2,3 +2,13 @@
   list-style-type: none;
   padding: 0;
 }
+
+.concept-link-selectors {
+  .ui.selection.dropdown {
+    margin-top: 5px;
+  }
+}
+
+.concept-link-dropdown {
+    margin-top: 5px;
+}

package/src/reducers/__tests__/creatingRelation.spec.js

@@ -1,25 +0,0 @@
-import { createRelation } from "../../routines";
-import { creatingRelation } from "..";
-
-const fooState = { foo: "bar" };
-const payload = { data: fooState };
-
-describe("reducers: creatingRelation", () => {
-  const initialState = false;
-
-  it("should provide the initial state", () => {
-    expect(creatingRelation(undefined, {})).toEqual(initialState);
-  });
-
-  it("should handle the createRelation.SUCCESS action", () => {
-    expect(
-      creatingRelation(fooState, { type: createRelation.SUCCESS, payload })
-    ).toEqual(fooState);
-  });
-
-  it("should handle the createRelation.FAILURE action", () => {
-    expect(
-      creatingRelation(fooState, { type: createRelation.FAILURE })
-    ).toEqual(false);
-  });
-});

package/src/reducers/creatingRelation.js

@@ -1,12 +0,0 @@
-import { createRelation } from "../routines";
-
-export const creatingRelation = (state = false, { type, payload }) => {
-  switch (type) {
-    case createRelation.SUCCESS:
-      return payload.data;
-    case createRelation.FAILURE:
-      return false;
-    default:
-      return state;
-  }
-};