@truedat/bg 4.30.4 → 4.30.6

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [Unreleased]
+
+### Fixed
+
+- [TD-3874] Allow rule creation specifying domain for shared concepts
+
 ## [4.30.4] 2021-10-07
 
 ### Changed

package/package.json

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

package/src/concepts/components/SharedToForm.js

@@ -75,9 +75,7 @@ SharedToForm.propTypes = {
 };
 
 const mapStateToProps = (state) => ({
-  domainOptions: getDomainSelectorOptions({
-    domains: _.pathOr([], "domainsByActions.*")(state),
-  }),
+  domainOptions: getDomainSelectorOptions(state),
   id: state.concept.business_concept_id,
   saving: state.savingSharedTo,
   sharedTo: state.sharedToDomains,

package/src/taxonomy/components/DomainDropdownSelector.js

@@ -49,9 +49,11 @@ export const DomainDropdownSelector = ({
   useEffect(() => {
     if (_.size(options) === 1) {
       const firstValue = _.first(options).id;
-      handleChange({ preventDefault: () => {} }, { value: firstValue });
+      if (value !== firstValue) {
+        handleChange({ preventDefault: () => {} }, { value: firstValue });
+      }
     }
-  }, [defaultValue, options]);
+  }, [options]);
 
   useEffect(() => {
     const option = _.find({ id: value })(options);
@@ -185,13 +187,7 @@ DomainDropdownSelector.propTypes = {
 const mapStateToProps = (state, props) => ({
   domainOptions: _.flow(
     _.prop("domainOptions"),
-    _.defaultTo(
-      props.scope
-        ? getDomainSelectorOptions({
-            domains: _.pathOr([], "domainsByActions." + props.scope)(state),
-          })
-        : getDomainSelectorOptions(state)
-    )
+    _.defaultTo(getDomainSelectorOptions(state))
   )(props),
 });
 

package/src/taxonomy/reducers/index.js

@@ -15,7 +15,6 @@ import { domainsActions } from "./domainsActions";
 import { domainsFilter } from "./domainsFilter";
 import { domainsLoading } from "./domainsLoading";
 import { domainUpdating } from "./domainUpdating";
-import { domainsByActions } from "./domainsByActions";
 
 export {
   domain,
@@ -35,5 +34,4 @@ export {
   domainsFilter,
   domainsLoading,
   domainUpdating,
-  domainsByActions,
 };

package/src/taxonomy/reducers/__tests__/domainsByActions.spec.js

@@ -1,49 +0,0 @@
-import { fetchDomains } from "../../routines";
-import { domainsByActions } from "..";
-
-const fooState = { foo: "bar" };
-
-describe("reducers: domainsByActions", () => {
-  const initialState = {};
-
-  it("should provide the initial state", () => {
-    expect(domainsByActions(undefined, {})).toEqual(initialState);
-  });
-
-  it("should handle the SUCCESS action", () => {
-    const data = [
-      { id: 1, name: "Domain 1", description: "Desc 1" },
-      { id: 2, name: "Domain 2", description: "Desc 2", parent_id: 1 },
-    ];
-    const actions = "manage_cool_things";
-
-    expect(
-      domainsByActions(fooState, {
-        type: fetchDomains.SUCCESS,
-        payload: { data: { data }, actions },
-      })
-    ).toMatchObject({
-      manage_cool_things: data,
-    });
-  });
-
-  it("should handle the SUCCESS action without specific permission", () => {
-    const data = [
-      { id: 1, name: "Domain 1", description: "Desc 1" },
-      { id: 2, name: "Domain 2", description: "Desc 2", parent_id: 1 },
-    ];
-
-    expect(
-      domainsByActions(fooState, {
-        type: fetchDomains.SUCCESS,
-        payload: { data: { data } },
-      })
-    ).toMatchObject({
-      "*": data,
-    });
-  });
-
-  it("should ignore unknown actions", () => {
-    expect(domainsByActions(fooState, { type: "FOO" })).toBe(fooState);
-  });
-});

package/src/taxonomy/reducers/domainsByActions.js

@@ -1,22 +0,0 @@
-import _ from "lodash/fp";
-import { fetchDomains, clearDomains } from "../routines";
-
-const initialState = {};
-
-const caseInsensitiveName = ({ name }) => _.toLower(name);
-
-export const domainsByActions = (state = initialState, { type, payload }) => {
-  switch (type) {
-    case fetchDomains.SUCCESS:
-      const { data, actions } = payload;
-      const collection = _.prop("data")(data);
-      return _.set(
-        actions ? actions : "*",
-        _.sortBy(caseInsensitiveName)(collection)
-      )(state);
-    case clearDomains.TRIGGER:
-      return initialState;
-    default:
-      return state;
-  }
-};