@truedat/dd 4.46.2 → 4.46.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [4.46.5] 2022-06-17
+
+### Added
+
+- [TD-4894] Multiple column operator in implementation creation
+
 ## [4.46.1] 2022-06-15
 
 ### Fixed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "4.46.2",
+  "version": "4.46.5",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "4.46.2",
+    "@truedat/test": "4.46.5",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -88,9 +88,9 @@
   },
   "dependencies": {
     "@apollo/client": "^3.6.4",
-    "@truedat/auth": "4.46.2",
-    "@truedat/core": "4.46.2",
-    "@truedat/df": "4.46.2",
+    "@truedat/auth": "4.46.5",
+    "@truedat/core": "4.46.5",
+    "@truedat/df": "4.46.5",
     "lodash": "^4.17.21",
     "path-to-regexp": "^1.7.0",
     "prop-types": "^15.8.1",
@@ -111,5 +111,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "161f3fae4428ee4e4e26b62fd2f9764ce389d0e2"
+  "gitHead": "cc6e42515345adf2926f47216622e0fc4f7a0d86"
 }

package/src/components/StructureFieldsDropdown.js

@@ -11,23 +11,37 @@ export const StructureFieldsDropdown = ({
   fluid,
   inline,
   onSelectField,
+  onSelectFields,
   structureFields,
   filters,
   value,
   typeCastModifiers,
+  multiple,
 }) => {
   const { formatMessage } = useIntl();
   const onClick = ({ value, modifier }) => {
+    onSelectField(dropdownItemToField(value), modifier);
+  };
+
+  const onChangeStructureFieldsDropdown = (valueOrValues) => {
+    return _.flow(
+      _.map((value) => {
+        return dropdownItemToField(value);
+      }),
+      multiple ? onSelectFields : onSelectField
+    )(Array.isArray(valueOrValues) ? valueOrValues : [valueOrValues]);
+  };
+
+  const dropdownItemToField = (value) => {
     const [data_structure_id, parent_index] = _.isString(value)
       ? value.split("/").map(Number)
       : [value, undefined];
-    const field = _.isNil(parent_index)
+    return _.isNil(parent_index)
       ? _.find({ data_structure_id: data_structure_id })(structureFields)
       : _.find({
           data_structure_id: data_structure_id,
           parent_index: parent_index,
         })(structureFields);
-    onSelectField(field, modifier);
   };
 
   const formatOption = (field) => {
@@ -62,14 +76,15 @@ export const StructureFieldsDropdown = ({
       }),
     };
   };
-  const toFieldOption = (field) =>
-    _.has("options")(field)
+  const toFieldOption = (field) => {
+    return _.has("options")(field)
       ? {
           icon: "table",
           label: field.label,
           options: _.map(formatOption)(field.options),
         }
       : formatOption(field);
+  };
 
   const getOptions = _.flow(
     _.sortBy(_.flow(_.prop("name"), _.toLower)),
@@ -100,11 +115,13 @@ export const StructureFieldsDropdown = ({
 
   return (
     <OptionGroup
+      multiple={multiple}
       fluid={fluid}
       inline={inline}
       label={label}
       value={value}
       onClick={onClick}
+      onChange={onChangeStructureFieldsDropdown}
       placeholder={formatMessage({
         id: "structureFields.dropdown.placeholder",
       })}
@@ -120,8 +137,10 @@ StructureFieldsDropdown.propTypes = {
   value: PropTypes.number,
   structureFields: PropTypes.array,
   onSelectField: PropTypes.func,
+  onSelectFields: PropTypes.func,
   filters: PropTypes.object,
   typeCastModifiers: PropTypes.array,
+  multiple: PropTypes.bool,
 };
 
 const mapStateToProps = (state, props) => ({

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

@@ -36,21 +36,31 @@ exports[`<ValueConditionStructure /> matches the latest snapshot 1`] = `
       role="listbox"
     >
       <div
-        class="divider"
-      />
-      <div
-        class="header"
+        aria-checked="false"
+        aria-selected="true"
+        class="selected item"
+        role="option"
+        style="pointer-events: all;"
       >
-        <i
-          aria-hidden="true"
-          class="table icon"
+        <div
+          class="divider"
         />
-        bar
+        <div
+          class="header"
+        >
+          <i
+            aria-hidden="true"
+            class="table icon"
+          />
+          bar
+        </div>
       </div>
       <div
+        aria-checked="false"
         aria-selected="false"
         class="item group"
         role="option"
+        style="pointer-events: all;"
       >
         <i
           aria-hidden="true"

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

@@ -1,7 +1,6 @@
 import _ from "lodash/fp";
 import React from "react";
 import { render } from "@truedat/test/render";
-import moment from "moment";
 import {
   defaultGrantsColumns,
   defaultGrantsTableColumns,

package/src/selectors/getGrantsColumns.js

@@ -6,7 +6,6 @@ import { Link } from "react-router-dom";
 import { linkTo } from "@truedat/core/routes";
 import { useIntl } from "react-intl";
 import Moment from "react-moment";
-import moment from "moment";
 import PropTypes from "prop-types";
 
 export const GrantUserDecorator = ({ authentication, user }) => {
@@ -137,11 +136,7 @@ export const EndDateDecorator = ({ end_date, pending_removal }) => {
       trigger={
         <Header>
           <Header.Subheader>
-            <Moment
-              locale={locale}
-              date={end_date}
-              from={moment().format("L")}
-            />
+            <Moment locale={locale} date={end_date} fromNow />
           </Header.Subheader>
         </Header>
       }