@truedat/df 4.44.1 → 4.44.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/df",
-  "version": "4.44.1",
+  "version": "4.44.4",
   "description": "Truedat Web Data Quality Module",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -30,7 +30,7 @@
     "@babel/plugin-transform-modules-commonjs": "^7.15.0",
     "@babel/preset-env": "^7.15.0",
     "@babel/preset-react": "^7.14.5",
-    "@truedat/test": "4.44.1",
+    "@truedat/test": "4.44.4",
     "babel-jest": "^27.0.6",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -80,8 +80,8 @@
     ]
   },
   "dependencies": {
-    "@truedat/auth": "4.44.1",
-    "@truedat/core": "4.44.1",
+    "@truedat/auth": "4.44.4",
+    "@truedat/core": "4.44.4",
     "axios": "^0.19.2",
     "path-to-regexp": "^1.7.0",
     "prop-types": "^15.7.2",
@@ -100,5 +100,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "20d38381ed4cb6658d1122a4bff08a13fedc2d59"
+  "gitHead": "36fb183e1d22181e6a15b3bac2c01b39214eacdb"
 }

package/src/components/DynamicForm.js

@@ -49,17 +49,15 @@ export const DynamicForm = ({
 
   return (
     <>
-      {parsedGroups.map(({ name, fields }, i) => {
-        return (
-          <FieldGroupSegment
-            key={i}
-            onFieldChange={handleChange}
-            name={name}
-            fields={fields}
-            scope={_.prop("scope")(template)}
-          />
-        );
-      })}
+      {parsedGroups.map(({ name, fields }, i) => (
+        <FieldGroupSegment
+          key={i}
+          onFieldChange={handleChange}
+          name={name}
+          fields={fields}
+          scope={_.prop("scope")(template)}
+        />
+      ))}
     </>
   );
 };

package/src/components/widgets/DateTimeField.js

@@ -3,25 +3,23 @@ import PropTypes from "prop-types";
 import React from "react";
 import { DateTimeInput } from "semantic-ui-calendar-react";
 
-export const DateTimeField = ({ field: { name, value }, onChange }) => {
-  return (
-    <DateTimeInput
-      duration={0}
-      closable
-      animation={""}
-      name={name}
-      dateTimeFormat={"YYYY-MM-DD HH:mm"}
-      placeholder="Date Time"
-      value={_.isEmpty(value) ? "" : value}
-      iconPosition="left"
-      onChange={(e, { value }) => onChange(e, { name: name, value: value })}
-    />
-  );
-};
+export const DateTimeField = ({ field: { name, value } = {}, onChange }) => (
+  <DateTimeInput
+    animation=""
+    closable
+    dateTimeFormat={"YYYY-MM-DD HH:mm"}
+    duration={0}
+    iconPosition="left"
+    name={name}
+    onChange={(e, { value }) => onChange(e, { name: name, value: value })}
+    placeholder="Date Time"
+    value={value || ""}
+  />
+);
 
 DateTimeField.propTypes = {
   field: PropTypes.object,
-  onChange: PropTypes.func
+  onChange: PropTypes.func,
 };
 
 export default DateTimeField;

package/src/messages/en.js

@@ -137,7 +137,7 @@ export default {
   "template.error.content.invalidtype":
     "Field {name} with type {type} already exists in another template",
   "widget.image.error.too_big":
-    "Image size is too big. Must be smaller then {size_mb}MB",
+    "File is too big. Must be smaller then {size_mb}MB",
   "widget.image.error.invalidtype": "Invalid File",
   "widget.copy.modaltitle": "Copy fields",
   "widget.copy.error.jsonformat": "Error: copy has wrong format",

package/src/selectors/__tests__/templates.spec.js

@@ -1,42 +1,31 @@
 import { makeGetApplyTemplate, makeGetTemplate } from "..";
 
+const templateFromProps = { id: 1 };
+const templateFromState = { id: 2 };
+
 describe("selectors: makeGetTemplate", () => {
-  const templateFromProps = { id: 1 };
-  const templateFromState = { id: 2 };
   const props = { template: templateFromProps };
   const state = { template: templateFromState };
   it("template from props prevails to template from state", () => {
     const getTemplate = makeGetTemplate();
     const t = getTemplate(state, props);
-    expect(t).toEqual(templateFromProps);
+    expect(t).toBe(templateFromProps);
   });
 
   it("gets template from state if not props provided", () => {
     const getTemplate = makeGetTemplate();
     const t = getTemplate(state, {});
-    expect(t).toEqual(templateFromState);
+    expect(t).toBe(templateFromState);
   });
 });
 
 describe("selectors: makeGetApplyTemplate", () => {
-  const applyTemplate = jest.fn();
-  const templateFromProps = { id: 1 };
-  const templateFromState = { id: 2 };
-
   it("applyTemplate from props prevails to applyTemplate from utils", () => {
+    const applyTemplate = jest.fn();
     const props = { template: templateFromProps, applyTemplate };
     const state = { template: templateFromState };
     const getApplyTemplate = makeGetApplyTemplate();
     getApplyTemplate(state, props);
     expect(applyTemplate).toHaveBeenCalledTimes(1);
   });
-
-  it("get applyTemplate utils when not applyTemplate provided in props", () => {
-    const props = { template: templateFromProps };
-    const state = { template: templateFromState };
-    applyTemplate.mockClear();
-    const getApplyTemplate = makeGetApplyTemplate();
-    getApplyTemplate(state, props);
-    expect(applyTemplate).toHaveBeenCalledTimes(0);
-  });
 });

package/src/selectors/templates.js

@@ -8,6 +8,7 @@ const applyTemplateFromProps = (_state, props) =>
   _.prop("applyTemplate")(props);
 const selectTemplate = (propTemplate, stateTemplate) =>
   _.defaultTo(stateTemplate)(propTemplate);
+
 const selectApplyTemplate = (
   propTemplate,
   stateTemplate,
@@ -17,21 +18,13 @@ const selectApplyTemplate = (
   return _.defaultTo(applyTemplate)(applyTemplateFromProps)(template);
 };
 
-export const makeGetTemplate = () => {
-  const getTemplate = createSelector(
-    templateFromProps,
-    templateFromState,
-    selectTemplate
-  );
-  return getTemplate;
-};
+export const makeGetTemplate = () =>
+  createSelector(templateFromProps, templateFromState, selectTemplate);
 
-export const makeGetApplyTemplate = () => {
-  const getApplyTemplate = createSelector(
+export const makeGetApplyTemplate = () =>
+  createSelector(
     templateFromProps,
     templateFromState,
     applyTemplateFromProps,
     selectApplyTemplate
   );
-  return getApplyTemplate;
-};

package/src/templates/components/TemplateLoader.js

@@ -21,7 +21,7 @@ export class TemplateLoader extends React.Component {
 
   componentDidMount() {
     const { fetchTemplate, domainId, templateId, match } = this.props;
-    if (match && match.params && match.params.templateId) {
+    if (match?.params?.templateId) {
       fetchTemplate({ templateId: match.params.templateId });
     } else if (templateId) {
       fetchTemplate({ domainId, templateId });
@@ -36,11 +36,8 @@ export class TemplateLoader extends React.Component {
       templateId: prevTemplateId,
       match: prevMatch,
     } = prevProps;
-    if (match && match.params && match.params.templateId) {
-      if (
-        prevMatch.params &&
-        match.params.templateId === prevMatch.params.templateId
-      ) {
+    if (match?.params?.templateId) {
+      if (match.params.templateId === prevMatch?.params?.templateId) {
         // No change
       } else {
         fetchTemplate({ templateId: match.params.templateId });

package/src/templates/components/index.js

@@ -1,6 +1,5 @@
 import TemplateLoader from "./TemplateLoader";
 import TemplateRoutes from "./TemplateRoutes";
-import TemplateSelector from "./TemplateSelector";
 import TemplatesLoader from "./TemplatesLoader";
 
-export { TemplateLoader, TemplateRoutes, TemplateSelector, TemplatesLoader };
+export { TemplateLoader, TemplateRoutes, TemplatesLoader };

package/src/templates/components/TemplateSelector.js

@@ -1,59 +0,0 @@
-import _ from "lodash/fp";
-import React from "react";
-import PropTypes from "prop-types";
-import { connect } from "react-redux";
-import { Form, Label } from "semantic-ui-react";
-import { useIntl, FormattedMessage } from "react-intl";
-
-export const TemplateSelector = ({
-  hidden,
-  onChange,
-  options,
-  selectedValue,
-  isOptional,
-}) => {
-  const { formatMessage } = useIntl();
-  const required = !isOptional;
-
-  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>
-      <Form.Dropdown
-        placeholder={formatMessage({ id: "template.selector.placeholder" })}
-        name="template"
-        search
-        selection
-        clearable={isOptional}
-        options={options}
-        onChange={onChange}
-        value={selectedValue || null}
-      />
-    </Form.Field>
-  );
-};
-
-TemplateSelector.propTypes = {
-  onChange: PropTypes.func,
-  options: PropTypes.array,
-  hidden: PropTypes.bool,
-  selectedValue: PropTypes.number,
-  isOptional: PropTypes.bool,
-};
-
-const mapStateToProps = ({ templates }) => ({
-  hidden: _.size(templates) <= 1,
-  options: _.map(({ label: text, id: value }, i) => ({
-    key: i,
-    value,
-    text,
-  }))(templates),
-});
-
-export default connect(mapStateToProps)(TemplateSelector);

package/src/templates/components/__tests__/TemplateSelector.spec.js

@@ -1,29 +0,0 @@
-import React from "react";
-import { shallow } from "enzyme";
-import { intl } from "@truedat/test/intl-stub";
-import { TemplateSelector } from "../TemplateSelector";
-
-// workaround for enzyme issue with React.useContext
-// see https://github.com/airbnb/enzyme/issues/2176#issuecomment-532361526
-jest.spyOn(React, "useContext").mockImplementation(() => intl);
-
-describe("<TemplateSelector />", () => {
-  const options = [0, 1, 2, 3].map(v => ({
-    key: v,
-    value: v,
-    text: `text ${v}`
-  }));
-  const onChange = jest.fn();
-  const props = { options, onChange };
-
-  it("matches the latest snapshot", () => {
-    const wrapper = shallow(<TemplateSelector {...props} />);
-    expect(wrapper).toMatchSnapshot();
-  });
-
-  it("renders null if hidden is true", () => {
-    const props = { options, onChange, hidden: true };
-    const wrapper = shallow(<TemplateSelector {...props} />);
-    expect(wrapper.getElement()).toBeNull();
-  });
-});

package/src/templates/components/__tests__/__snapshots__/TemplateSelector.spec.js.snap

@@ -1,54 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<TemplateSelector /> matches the latest snapshot 1`] = `
-<FormField
-  required={true}
->
-  <label>
-    <MemoizedFormattedMessage
-      id="template.selector.label"
-    />
-    <Label
-      pointing="left"
-    >
-      <MemoizedFormattedMessage
-        id="template.form.validation.empty_required"
-      />
-    </Label>
-  </label>
-  <FormDropdown
-    as={[Function]}
-    control={[Function]}
-    name="template"
-    onChange={[MockFunction]}
-    options={
-      Array [
-        Object {
-          "key": 0,
-          "text": "text 0",
-          "value": 0,
-        },
-        Object {
-          "key": 1,
-          "text": "text 1",
-          "value": 1,
-        },
-        Object {
-          "key": 2,
-          "text": "text 2",
-          "value": 2,
-        },
-        Object {
-          "key": 3,
-          "text": "text 3",
-          "value": 3,
-        },
-      ]
-    }
-    placeholder="template.selector.placeholder"
-    search={true}
-    selection={true}
-    value={null}
-  />
-</FormField>
-`;