@truedat/dd 4.35.7 → 4.36.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [4.36.0] 2022-01-13
+
+### Fixed
+
+- [TD-4308] Grant request actions should be hidden unless request is pending
+
+## [4.35.8] 2022-01-07
+
+### Added
+
+- [TD-4390] Support for alias on Implementation
+
 ## [4.35.7] 2021-01-07
 
 ### Fixed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "4.35.7",
+  "version": "4.36.2",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -84,9 +84,9 @@
     ]
   },
   "dependencies": {
-    "@truedat/auth": "4.35.7",
-    "@truedat/core": "4.35.7",
-    "@truedat/df": "4.35.7",
+    "@truedat/auth": "4.36.2",
+    "@truedat/core": "4.36.2",
+    "@truedat/df": "4.36.2",
     "lodash": "^4.17.21",
     "path-to-regexp": "^1.7.0",
     "prop-types": "^15.7.2",
@@ -107,5 +107,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "99812619b928d7802bb2f33df3f3321c9c36995e"
+  "gitHead": "0f4c09d90582210ae7c98e945b8c0b7af0f9a61d"
 }

package/src/components/GrantRequestHeader.js

@@ -8,10 +8,9 @@ import GrantRequestApprovalPopup from "./GrantRequestApprovalPopup";
 
 export const GrantRequestHeader = ({ grantRequest }) => {
   const { formatMessage } = useIntl();
-  const canApprove = _.flow([
-    _.getOr([], "pending_roles"),
-    _.negate(_.isEmpty),
-  ])(grantRequest);
+  const canApprove =
+    grantRequest?.status === "pending" &&
+    !_.isEmpty(grantRequest?.pending_roles);
   return (
     <Grid>
       <Grid.Column width={12}>
@@ -22,7 +21,7 @@ export const GrantRequestHeader = ({ grantRequest }) => {
           </Header.Content>
         </Header>
       </Grid.Column>
-      {canApprove && (
+      {canApprove ? (
         <Grid.Column width={4} textAlign="right">
           <GrantRequestApprovalPopup
             content={formatMessage({ id: "grantRequest.actions.approve" })}
@@ -36,7 +35,7 @@ export const GrantRequestHeader = ({ grantRequest }) => {
             grantRequest={grantRequest}
           />
         </Grid.Column>
-      )}
+      ) : null}
     </Grid>
   );
 };

package/src/components/StructureFieldsDropdown.js

@@ -8,6 +8,7 @@ import { getStructuresFields } from "../selectors/getStructuresFields";
 
 export const StructureFieldsDropdown = ({
   label,
+  fluid,
   inline,
   onSelectField,
   structureFields,
@@ -17,22 +18,33 @@ export const StructureFieldsDropdown = ({
 }) => {
   const { formatMessage } = useIntl();
   const onClick = ({ value, modifier }) => {
-    const field = _.find(_.propEq("data_structure_id", value))(structureFields);
+    const [data_structure_id, parent_index] = _.isString(value)
+      ? value.split("/").map(Number)
+      : [value, undefined];
+    const field = _.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) => {
+    const value = _.isNil(field?.parent_index)
+      ? field.data_structure_id
+      : `${field.data_structure_id}/${field.parent_index}`;
     const modifier = _.find({ sourceType: field.field_type })(
       typeCastModifiers
     );
     if (modifier) {
       return {
-        key: field.data_structure_id,
+        key: value,
         text: `${field.name} (${formatMessage({
           id: `filtersGrid.field.modifier.${modifier.name}`,
         })})`,
         modifier,
-        value: field.data_structure_id,
+        value: value,
         icon: formatMessage({
           id: `field_type.icon.${field.field_type}`,
           defaultMessage: "hashtag",
@@ -41,9 +53,9 @@ export const StructureFieldsDropdown = ({
     }
 
     return {
-      key: field.data_structure_id,
+      key: value,
       text: field.name,
-      value: field.data_structure_id,
+      value: value,
       icon: formatMessage({
         id: `field_type.icon.${field.field_type}`,
         defaultMessage: "hashtag",
@@ -88,6 +100,7 @@ export const StructureFieldsDropdown = ({
 
   return (
     <OptionGroup
+      fluid={fluid}
       inline={inline}
       label={label}
       value={value}
@@ -102,6 +115,7 @@ export const StructureFieldsDropdown = ({
 
 StructureFieldsDropdown.propTypes = {
   label: PropTypes.string,
+  fluid: PropTypes.bool,
   inline: PropTypes.bool,
   value: PropTypes.number,
   structureFields: PropTypes.array,

package/src/components/StructureSelectorInputField.js

@@ -34,6 +34,12 @@ export const StructureSelectorInputField = ({
     onChangeField({ ...selectedStructure, clauses });
   };
 
+  const aliasIsNeeded =
+    _.flow(
+      _.map(_.path("structure.id")),
+      _.filter((s) => s === selectedStructure?.structure?.id)
+    )(structures).length > 1;
+
   return (
     <>
       <Form.Field>
@@ -74,6 +80,30 @@ export const StructureSelectorInputField = ({
           />
         )}
       </Form.Field>
+      {aliasIsNeeded && (
+        <Container style={{ paddingLeft: "8em" }}>
+          <Form.Field>
+            <label>
+              {formatMessage({
+                id: `ruleImplementation.props.structure.alias`,
+              })}
+            </label>
+            <Form.Input
+              width={fieldWidth ? fieldWidth : 7}
+              value={selectedStructure?.alias?.text || ""}
+              onChange={(e) =>
+                onChangeField({
+                  ...selectedStructure,
+                  alias: {
+                    ...(selectedStructure?.alias || {}),
+                    text: e.target.value,
+                  },
+                })
+              }
+            />
+          </Form.Field>
+        </Container>
+      )}
       {joined && _.prop("structure")(selectedStructure) && (
         <Container style={{ paddingLeft: "8em" }}>
           <Form.Field>

package/src/components/StructureSelectorInputFieldJoin.js

@@ -2,10 +2,10 @@ import _ from "lodash/fp";
 import React from "react";
 import PropTypes from "prop-types";
 import { useIntl } from "react-intl";
-import { Form, Icon, Popup } from "semantic-ui-react";
+import { Grid, Icon, Popup } from "semantic-ui-react";
 import StructureFieldsDropdown from "./StructureFieldsDropdown";
 
-const getClauses = selectedStructure => {
+const getClauses = (selectedStructure) => {
   const clauses = _.getOr([], "clauses")(selectedStructure);
   return _.isEmpty(clauses) ? [{}] : clauses;
 };
@@ -14,15 +14,21 @@ const getParentStructures = (structures, selectedStructure) => {
   return structures && selectedStructure
     ? _.flow(
         _.filter(
-          s =>
-            _.path("structure.id")(s) !==
-            _.path("structure.id")(selectedStructure)
+          (s) =>
+            _.path("alias.index")(s) !==
+            _.path("alias.index")(selectedStructure)
         ),
         _.defaultTo([])
       )(structures)
     : [];
 };
 
+const structureToFieldDropdown = (structures) =>
+  _.map((s) => ({
+    ..._.prop("structure")(s),
+    alias: _.prop("alias")(s),
+  }))(structures);
+
 const JoinClause = ({
   createClause,
   deleteClause,
@@ -31,33 +37,43 @@ const JoinClause = ({
   left,
   parentStructures,
   right,
-  selectedStructure
+  selectedStructure,
 }) => {
   const addActionDisabled = _.isEmpty(left) || _.isEmpty(right);
   const { formatMessage } = useIntl();
   return (
-    <Form.Group inline>
-      <Form.Field width={4}>
+    <Grid>
+      <Grid.Column width={4}>
         <StructureFieldsDropdown
-          parentStructures={[_.prop("structure")(selectedStructure)]}
+          fluid
+          parentStructures={structureToFieldDropdown([selectedStructure])}
           onSelectField={handleChange("left", idx)}
-          value={_.prop("id")(left)}
+          value={
+            _.isNil(_.prop("parent_index")(left))
+              ? _.prop("id")(left)
+              : `${_.prop("id")(left)}/${_.prop("parent_index")(left)}`
+          }
         />
-      </Form.Field>
-      <Form.Field width={1}>{"="}</Form.Field>
-      <Form.Field width={4}>
+      </Grid.Column>
+      <Grid.Column width={1}>{"="}</Grid.Column>
+      <Grid.Column width={4}>
         <StructureFieldsDropdown
-          parentStructures={_.map(_.prop("structure"))(parentStructures)}
+          fluid
+          parentStructures={structureToFieldDropdown(parentStructures)}
           onSelectField={handleChange("right", idx)}
-          value={_.prop("id")(right)}
+          value={
+            _.isNil(_.prop("parent_index")(right))
+              ? _.prop("id")(right)
+              : `${_.prop("id")(right)}/${_.prop("parent_index")(right)}`
+          }
         />
-      </Form.Field>
-      <Form.Field width={1}>
+      </Grid.Column>
+      <Grid.Column width={1}>
         {
           <Popup
             disabled={!addActionDisabled}
             content={formatMessage({
-              id: "dataset.form.button.add_join.popup"
+              id: "dataset.form.button.add_join.popup",
             })}
             trigger={
               <Icon
@@ -69,8 +85,8 @@ const JoinClause = ({
             }
           />
         }
-      </Form.Field>
-      <Form.Field width={1}>
+      </Grid.Column>
+      <Grid.Column width={1}>
         {idx > 0 && (
           <Icon
             name="trash"
@@ -78,8 +94,8 @@ const JoinClause = ({
             onClick={() => deleteClause(idx)}
           />
         )}
-      </Form.Field>
-    </Form.Group>
+      </Grid.Column>
+    </Grid>
   );
 };
 
@@ -91,24 +107,31 @@ JoinClause.propTypes = {
   selectedStructure: PropTypes.object,
   createClause: PropTypes.func,
   deleteClause: PropTypes.func,
-  handleChange: PropTypes.func
+  handleChange: PropTypes.func,
 };
 
 export const StructureSelectorInputFieldJoin = ({
   structures,
   selectedStructure,
-  handleSelectField
+  handleSelectField,
 }) => {
   const clauses = getClauses(selectedStructure);
   const parentStructures = getParentStructures(structures, selectedStructure);
   const createClause = () => handleSelectField([...clauses, {}]);
   const removeAt = (arr, idx) => [
     ..._.slice(0, idx)(arr),
-    ..._.slice(idx + 1, arr.length)(arr)
+    ..._.slice(idx + 1, arr.length)(arr),
   ];
-  const deleteClause = idx => handleSelectField(removeAt(clauses, idx));
-  const handleChange = (prop, idx) => ({ data_structure_id: id }) => {
-    const newClause = { ...clauses[idx], [prop]: { id } };
+  const deleteClause = (idx) => handleSelectField(removeAt(clauses, idx));
+  const handleChange = (prop, idx) => (data) => {
+    const {
+      data_structure_id: id,
+      parent_index: parent_index,
+      name: name,
+    } = data;
+    const newClause = _.isNil(parent_index)
+      ? { ...clauses[idx], [prop]: { id, name } }
+      : { ...clauses[idx], [prop]: { id, parent_index, name } };
     const newClauses = _.set(`[${idx}]`, newClause)(clauses);
     handleSelectField(newClauses);
   };
@@ -134,7 +157,7 @@ export const StructureSelectorInputFieldJoin = ({
 StructureSelectorInputFieldJoin.propTypes = {
   structures: PropTypes.array,
   selectedStructure: PropTypes.object,
-  handleSelectField: PropTypes.func
+  handleSelectField: PropTypes.func,
 };
 
 export default StructureSelectorInputFieldJoin;

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

@@ -3,16 +3,29 @@ import { render } from "@truedat/test/render";
 import { GrantRequestHeader } from "../GrantRequestHeader";
 
 describe("<GrantRequestHeader />", () => {
-  const grantRequest = {};
   const renderOpts = {
     messages: {
       en: {
         "grantRequest.header": "header",
+        "grantRequest.actions.approve": "approve",
+        "grantRequest.actions.reject": "reject",
       },
     },
   };
 
   it("matches the latest snapshot", () => {
+    const grantRequest = {};
+    const { container } = render(
+      <Suspense fallback={null}>
+        <GrantRequestHeader grantRequest={grantRequest} />
+      </Suspense>,
+      renderOpts
+    );
+    expect(container).toMatchSnapshot();
+  });
+
+  it("matches the latest snapshot (pending)", () => {
+    const grantRequest = { status: "pending", pending_roles: ["foo", "bar"] };
     const { container } = render(
       <Suspense fallback={null}>
         <GrantRequestHeader grantRequest={grantRequest} />

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

@@ -294,6 +294,7 @@ exports[`<GrantRequest /> matches the latest snapshot with approve actions 1`] =
                             <span
                               class="highlighted"
                             >
+                               
                               "foo"
                             </span>
                           </a>
@@ -560,6 +561,7 @@ exports[`<GrantRequest /> matches the latest snapshot with failed status 1`] = `
                             <span
                               class="highlighted"
                             >
+                               
                               "foo"
                             </span>
                           </a>

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

@@ -1,5 +1,45 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`<GrantRequestHeader /> matches the latest snapshot (pending) 1`] = `
+<div>
+  <div
+    class="ui grid"
+  >
+    <div
+      class="twelve wide column"
+    >
+      <h2
+        class="ui header"
+      >
+        <i
+          aria-hidden="true"
+          class="key circular icon"
+        />
+        <div
+          class="content"
+        >
+          header
+        </div>
+      </h2>
+    </div>
+    <div
+      class="right aligned four wide column"
+    >
+      <button
+        class="ui primary button button icon group-actions"
+      >
+        approve
+      </button>
+      <button
+        class="ui secondary button button icon group-actions"
+      >
+        reject
+      </button>
+    </div>
+  </div>
+</div>
+`;
+
 exports[`<GrantRequestHeader /> matches the latest snapshot 1`] = `
 <div>
   <div

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

@@ -1,37 +1,39 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<StructureSelectorInputFieldJoin /> matches the latest JoinClause snapshot 1`] = `
-<FormGroup
-  inline={true}
->
-  <FormField
+<Grid>
+  <GridColumn
     width={4}
   >
     <Connect(StructureFieldsDropdown)
+      fluid={true}
       onSelectField={[Function]}
       parentStructures={
         Array [
-          undefined,
+          Object {
+            "alias": undefined,
+          },
         ]
       }
       value="7"
     />
-  </FormField>
-  <FormField
+  </GridColumn>
+  <GridColumn
     width={1}
   >
     =
-  </FormField>
-  <FormField
+  </GridColumn>
+  <GridColumn
     width={4}
   >
     <Connect(StructureFieldsDropdown)
+      fluid={true}
       onSelectField={[Function]}
       parentStructures={Array []}
       value="8"
     />
-  </FormField>
-  <FormField
+  </GridColumn>
+  <GridColumn
     width={1}
   >
     <Popup
@@ -57,8 +59,8 @@ exports[`<StructureSelectorInputFieldJoin /> matches the latest JoinClause snaps
         />
       }
     />
-  </FormField>
-  <FormField
+  </GridColumn>
+  <GridColumn
     width={1}
   >
     <Icon
@@ -67,8 +69,8 @@ exports[`<StructureSelectorInputFieldJoin /> matches the latest JoinClause snaps
       name="trash"
       onClick={[Function]}
     />
-  </FormField>
-</FormGroup>
+  </GridColumn>
+</Grid>
 `;
 
 exports[`<StructureSelectorInputFieldJoin /> matches the latest snapshot 1`] = `

package/src/selectors/getStructuresFields.js

@@ -12,7 +12,8 @@ const getFields = (parent, structuresFields) =>
     _.propOr([], _.path("id")(parent)),
     _.map((sf) => ({
       ...sf,
-      label: _.prop("name")(parent),
+      label: _.prop("alias.text")(parent) || _.prop("name")(parent),
+      parent_index: _.prop("alias.index")(parent),
     }))
   )(structuresFields);
 
@@ -20,7 +21,7 @@ const getFieldsFromStructures = (structuresFields, parentStructures) =>
   _.flow(
     _.map((parent) => getFields(parent, structuresFields)),
     _.flatten,
-    _.uniqBy("data_structure_id"),
+    _.uniqBy((s) => `${s.data_structure_id}/${s.parent_index}`),
     _.map(withFieldType)
   )(parentStructures);