@truedat/core 4.49.10 → 4.50.4

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [4.50.3] 2022-08-29
+
+### Changed
+
+- [TD-5091] Dynamic `domain` fields are now integer ids instead of embedded
+  documents
+
 ## [4.49.4] 2022-07-29
 
 ### Fixed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/core",
-  "version": "4.49.10",
+  "version": "4.50.4",
   "description": "Truedat Web Core",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -112,5 +112,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "fb6fcd549a722d777d692f2938dbc991c72dd3a1"
+  "gitHead": "d9f12f551a3780a8785197e02c6842b89ab24ec3"
 }

package/src/api/queries.js

@@ -4,6 +4,7 @@ export const DOMAINS_QUERY = gql`
   query DomainsQuery($action: String!, $domainActions: [String!]) {
     domains(action: $action) {
       id
+      externalId
       name
       parentId
       actions(actions: $domainActions)

package/src/components/Date.js

@@ -0,0 +1,15 @@
+import React from "react";
+import PropTypes from "prop-types";
+import Moment from "react-moment";
+
+export const Date = ({ value, className }) =>
+  value ? (
+    <Moment className={className} date={value} format="YYYY-MM-DD" />
+  ) : null;
+
+Date.propTypes = {
+  value: PropTypes.string,
+  className: PropTypes.string,
+};
+
+export default Date;

package/src/components/FilterItem.js

@@ -26,10 +26,12 @@ export const FilterItem = ({
   active,
   filter,
   toggleFilterValue,
-  option: { text, value }
+  option: { text, value },
 }) => (
   <Dropdown.Item
-    onClick={e => preventDefault(e, () => toggleFilterValue({ filter, value }))}
+    onClick={(e) =>
+      preventDefault(e, () => toggleFilterValue({ filter, value }))
+    }
     active={active}
   >
     <Icon name={active ? "check square outline" : "square outline"} />
@@ -41,7 +43,7 @@ FilterItem.propTypes = {
   active: PropTypes.bool,
   filter: PropTypes.string,
   toggleFilterValue: PropTypes.func,
-  option: PropTypes.object
+  option: PropTypes.object,
 };
 
 export default FilterItem;

package/src/components/SelectedFilters.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React, { useEffect } from "react";
+import React from "react";
 import PropTypes from "prop-types";
 import { FormattedMessage } from "react-intl";
 import FilterDropdown from "./FilterDropdown";

package/src/components/TemplateSelector.js

@@ -25,6 +25,8 @@ export const TemplateSelector = ({
   required,
   selectedValue,
   templates,
+  placeholder,
+  hideLabel = false,
 }) => {
   const { formatMessage } = useIntl();
   const options = makeOptions(formatMessage)(templates);
@@ -37,23 +39,29 @@ export const TemplateSelector = ({
 
   return hidden ? null : (
     <Form.Field required={required}>
-      <label>
-        <FormattedMessage id="template.selector.label" />
-        {!selectedValue && required ? (
-          <Label pointing="left">
-            <FormattedMessage id="template.form.validation.empty_required" />
-          </Label>
-        ) : null}
-      </label>
+      {hideLabel ? null : (
+        <label>
+          <FormattedMessage id="template.selector.label" />
+          {!selectedValue && required ? (
+            <Label pointing="left">
+              <FormattedMessage id="template.form.validation.empty_required" />
+            </Label>
+          ) : null}
+        </label>
+      )}
       <Form.Dropdown
         clearable={clearable}
         loading={loading}
         name={name}
         onChange={handleChange}
         options={options}
-        placeholder={formatMessage({
-          id: loading ? "loading" : "template.selector.placeholder",
-        })}
+        placeholder={
+          placeholder
+            ? placeholder
+            : formatMessage({
+                id: loading ? "loading" : "template.selector.placeholder",
+              })
+        }
         search
         selection
         value={_.toString(selectedValue)}
@@ -70,6 +78,8 @@ TemplateSelector.propTypes = {
   required: PropTypes.bool,
   selectedValue: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
   templates: PropTypes.array,
+  placeholder: PropTypes.string,
+  hideLabel: PropTypes.bool,
 };
 
 const emptyTemplates = [];

package/src/components/TreeSelector.js

@@ -49,8 +49,10 @@ const labelValues = _.cond([
 ]);
 
 export const TreeSelector = ({
+  check = false,
   error,
   label,
+  labels = false,
   multiple = false,
   name,
   onBlur,
@@ -113,13 +115,15 @@ export const TreeSelector = ({
     ({ id, level }) => level === 0 || _.includes(id)(displayed)
   );
 
-  const trigger = (
+  const trigger = labels ? (
     <SelectedLabels
       placeholder={placeholder}
       options={options}
       onClick={handleClick}
       value={labelValues(value)}
     />
+  ) : (
+    <label>{placeholder}</label>
   );
 
   const items = _.flow(
@@ -128,7 +132,7 @@ export const TreeSelector = ({
     _.map((option) => (
       <DropdownMenuItem
         key={option?.id}
-        check={false}
+        check={check}
         onOpen={handleOpen}
         onClick={handleClick}
         open={_.contains(option.id)(open)}
@@ -175,8 +179,10 @@ export const TreeSelector = ({
 };
 
 TreeSelector.propTypes = {
+  check: PropTypes.bool,
   error: PropTypes.bool,
   label: PropTypes.string,
+  labels: PropTypes.bool,
   multiple: PropTypes.bool,
   name: PropTypes.string,
   onBlur: PropTypes.func,

package/src/components/__tests__/DomainSelector.spec.js

@@ -12,10 +12,34 @@ const domainsMock = {
   result: {
     data: {
       domains: [
-        { __typename: "Domain", id: "1", name: "foo", parentId: null },
-        { __typename: "Domain", id: "2", name: "bar", parentId: "1" },
-        { __typename: "Domain", id: "3", name: "baz", parentId: "2" },
-        { __typename: "Domain", id: "4", name: "xyzzy", parentId: "99" },
+        {
+          __typename: "Domain",
+          id: "1",
+          name: "foo",
+          externalId: "A",
+          parentId: null,
+        },
+        {
+          __typename: "Domain",
+          id: "2",
+          name: "bar",
+          externalId: "B",
+          parentId: "1",
+        },
+        {
+          __typename: "Domain",
+          id: "3",
+          name: "baz",
+          externalId: "C",
+          parentId: "2",
+        },
+        {
+          __typename: "Domain",
+          id: "4",
+          name: "xyzzy",
+          externalId: "D",
+          parentId: "99",
+        },
       ],
     },
   },

package/src/components/index.js

@@ -10,6 +10,7 @@ import Comments from "./Comments";
 import CommentsLoader from "./CommentsLoader";
 import ConfirmModal from "./ConfirmModal";
 import DashboardMenu from "./DashboardMenu";
+import Date from "./Date";
 import DateFilter from "./DateFilter";
 import DateRangeFilter from "./DateRangeFilter";
 import DateTime from "./DateTime";
@@ -58,6 +59,7 @@ export {
   CommentsLoader,
   ConfirmModal,
   DashboardMenu,
+  Date,
   DateFilter,
   DateRangeFilter,
   DateTime,

package/src/services/__tests__/filters.spec.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import { mergeFilters, getSearchPayload } from "../filters";
+import { isEmbedded, mergeFilters, getSearchPayload } from "../filters";
 
 describe("services: filters", () => {
   describe("mergeFilters", () => {
@@ -72,4 +72,12 @@ describe("services: filters", () => {
       });
     });
   });
+
+  describe("isEmbedded", () => {
+    test("returns true iff item has name and id prop", () => {
+      expect(isEmbedded({ id: 123, name: "foo" })).toBe(true);
+      expect(isEmbedded(123)).toBe(false);
+      expect(isEmbedded("123")).toBe(false);
+    });
+  });
 });

package/src/services/filters.js

@@ -28,10 +28,14 @@ export const getSearchPayload = (searchQuery, props) => {
   ]);
 };
 
+export const isEmbedded = _.overEvery(_.has("id"), _.has("name"));
+
 export const formatFilterValues = (selectedFilter) => (values) =>
   selectedFilter === "taxonomy"
     ? getDomainSelectorOptions({ domains: values })
+    : _.any(isEmbedded)(values)
+    ? _.map(({ id, name }) => ({ value: id, text: name }))(values)
     : values;
 
 export const toFilterValues = (filterValues) =>
-  _.map((v) => (_.isObject(v) ? v.id : v))(filterValues);
+  _.map((v) => (_.isObject(v) ? v.id || v.value : v))(filterValues);