@truedat/dd 4.28.6 → 4.29.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [4.29.1] 2021-09-21
+
+### Added
+
+- [TD-4079] Select default template in grant request cart
+
+## [4.28.8] 2021-09-20
+
+### Added
+
+- [TD-3970] `StructureFieldsDropdown` support for cast type and modifier
+
 ## [4.28.6] 2021-09-20
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "4.28.6",
+  "version": "4.29.1",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -16,8 +16,8 @@
   "scripts": {
     "clean": "rimraf yarn-error.log",
     "debug": "node --inspect-brk node_modules/.bin/jest --runInBand",
-    "test": "jest --coverage",
-    "test:watch": "jest --watch",
+    "test": "TZ=UTC jest --coverage",
+    "test:watch": "TZ=UTC jest --watch",
     "eslint": "eslint src/**",
     "eslint:fix": "eslint --fix src/**"
   },
@@ -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.28.6",
+    "@truedat/test": "4.29.1",
     "babel-jest": "^27.0.6",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -84,9 +84,9 @@
     ]
   },
   "dependencies": {
-    "@truedat/auth": "4.28.6",
-    "@truedat/core": "4.28.6",
-    "@truedat/df": "4.28.6",
+    "@truedat/auth": "4.29.1",
+    "@truedat/core": "4.29.1",
+    "@truedat/df": "4.29.1",
     "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": "c1ed65b6c8440e73e478f07db743c0fd3a473c24"
+  "gitHead": "bd33b4258962a80b10ffedf9d222272cd3babaf0"
 }

package/src/components/StructureFieldsDropdown.js

@@ -6,52 +6,6 @@ import { OptionGroup } from "@truedat/core/components";
 import { useIntl } from "react-intl";
 import { getStructuresFields } from "../selectors/getStructuresFields";
 
-const withFilters = (structureFields, filters) =>
-  filters
-    ? _.filter((f) =>
-        _.every.convert({ cap: false })((v, k) => v.includes(_.prop(k)(f)))(
-          filters
-        )
-      )(structureFields)
-    : structureFields;
-
-const getOptions = (structureFields, formatMessage) =>
-  _.flow(
-    _.sortBy(_.flow(_.prop("name"), _.toLower)),
-    _.groupBy("label"),
-    _.reduce.convert({ cap: false })(
-      (acc, v, k) =>
-        _.isNil(k) || k === "undefined"
-          ? [...acc, ...v]
-          : [...acc, { label: k, options: v }],
-      []
-    ),
-    _.map.convert({ cap: false })((field) =>
-      toFieldOption(field, formatMessage)
-    )
-  )(structureFields);
-
-const toFieldOption = (field, formatMessage) =>
-  _.has("options")(field)
-    ? {
-        icon: "table",
-        label: field.label,
-        options: _.map((field) => formatOption(field, formatMessage))(
-          field.options
-        ),
-      }
-    : formatOption(field, formatMessage);
-
-const formatOption = (field, formatMessage) => ({
-  key: field.data_structure_id,
-  text: field.name,
-  value: field.data_structure_id,
-  icon: formatMessage({
-    id: `field_type.icon.${field.field_type}`,
-    defaultMessage: "hashtag",
-  }),
-});
-
 export const StructureFieldsDropdown = ({
   label,
   inline,
@@ -59,12 +13,78 @@ export const StructureFieldsDropdown = ({
   structureFields,
   filters,
   value,
+  typeCastModifiers,
 }) => {
   const { formatMessage } = useIntl();
-  const onClick = ({ value }) => {
+  const onClick = ({ value, modifier }) => {
     const field = _.find(_.propEq("data_structure_id", value))(structureFields);
-    onSelectField(field);
+    onSelectField(field, modifier);
+  };
+
+  const formatOption = (field) => {
+    const modifier = _.find({ sourceType: field.field_type })(
+      typeCastModifiers
+    );
+    if (modifier) {
+      return {
+        key: field.data_structure_id,
+        text: `${field.name} (${formatMessage({
+          id: `filtersGrid.field.modifier.${modifier.name}`,
+        })})`,
+        modifier,
+        value: field.data_structure_id,
+        icon: formatMessage({
+          id: `field_type.icon.${field.field_type}`,
+          defaultMessage: "hashtag",
+        }),
+      };
+    }
+
+    return {
+      key: field.data_structure_id,
+      text: field.name,
+      value: field.data_structure_id,
+      icon: formatMessage({
+        id: `field_type.icon.${field.field_type}`,
+        defaultMessage: "hashtag",
+      }),
+    };
   };
+  const toFieldOption = (field) =>
+    _.has("options")(field)
+      ? {
+          icon: "table",
+          label: field.label,
+          options: _.map(formatOption)(field.options),
+        }
+      : formatOption(field);
+
+  const getOptions = _.flow(
+    _.sortBy(_.flow(_.prop("name"), _.toLower)),
+    _.groupBy("label"),
+    _.reduce.convert({ cap: false })(
+      (acc, v, k) =>
+        _.isNil(k) || k === "undefined"
+          ? [...acc, ...v]
+          : [...acc, { label: k, options: v }],
+      []
+    ),
+    _.map(toFieldOption)
+  );
+
+  const castSourceTypes = _.flow(
+    _.map(({ sourceType }) => sourceType),
+    _.uniq
+  )(typeCastModifiers);
+  const options = _.flow(
+    _.filter(
+      (f) =>
+        _.every.convert({ cap: false })((v, k) => v.includes(_.prop(k)(f)))(
+          filters
+        ) || castSourceTypes.includes(f.field_type)
+    ),
+    getOptions
+  )(structureFields);
 
   return (
     <OptionGroup
@@ -75,7 +95,7 @@ export const StructureFieldsDropdown = ({
       placeholder={formatMessage({
         id: "structureFields.dropdown.placeholder",
       })}
-      options={getOptions(withFilters(structureFields, filters), formatMessage)}
+      options={options}
     />
   );
 };
@@ -87,6 +107,7 @@ StructureFieldsDropdown.propTypes = {
   structureFields: PropTypes.array,
   onSelectField: PropTypes.func,
   filters: PropTypes.object,
+  typeCastModifiers: PropTypes.array,
 };
 
 const mapStateToProps = (state, props) => ({

package/src/components/StructureGrantCartCheckout.js

@@ -74,13 +74,15 @@ export const StructureGrantCartCheckout = ({
   );
 };
 
-StructureGrantCart.propTypes = {
+StructureGrantCartCheckout.propTypes = {
   grantRequestsCart: PropTypes.object,
   checkoutGrantRequest: PropTypes.func,
 };
+
 const mapStateToProps = ({ grantRequestsCart }) => ({
   grantRequestsCart,
 });
+
 const mapDispatchToProps = (dispatch) =>
   bindActionCreators({ checkoutGrantRequest }, dispatch);
 

package/src/components/StructureGrantCartTemplate.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React, { useState, useEffect } from "react";
+import React, { useEffect } from "react";
 import PropTypes from "prop-types";
 import { Segment, Dropdown, Divider, Form, Header } from "semantic-ui-react";
 import { connect } from "react-redux";
@@ -29,6 +29,18 @@ export const StructureGrantCartTemplate = ({
     false,
     "templatesLoading"
   )(grantRequestsCart);
+  const singleTemplate = _.size(templates) === 1;
+
+  useEffect(() => {
+    fetchGrantRequestTemplates();
+  }, [fetchGrantRequestTemplates]);
+
+  useEffect(() => {
+    if (singleTemplate) {
+      const defaultTemplate = _.head(templates);
+      selectGrantRequestTemplate(defaultTemplate?.id);
+    }
+  }, [singleTemplate, selectGrantRequestTemplate, templates]);
 
   const getOptions = _.map((template) => {
     const { id, name } = _.pick(["id", "name"])(template);
@@ -43,28 +55,33 @@ export const StructureGrantCartTemplate = ({
         {formatMessage({ id: `structure.grant.cart.template` })}
       </Header>
       <Divider />
-      <Dropdown
-        label={formatMessage({ id: "structureType.template" })}
-        name="template_id"
-        fluid
-        onChange={(_e, { value }) => selectGrantRequestTemplate(value)}
-        onOpen={fetchGrantRequestTemplates}
-        options={getOptions(templates) || []}
-        selection
-        clearable
-        loading={templatesLoading}
-        value={template?.id || ""}
-      />
+      {!singleTemplate && (
+        <Dropdown
+          placeholder={formatMessage({
+            id: `structure.grant.cart.template.placeholder`,
+          })}
+          label={formatMessage({ id: "structureType.template" })}
+          name="template_id"
+          fluid
+          onChange={(_e, { value }) => selectGrantRequestTemplate(value)}
+          options={getOptions(templates) || []}
+          selection
+          clearable
+          loading={templatesLoading}
+          value={template?.id || ""}
+        />
+      )}
       {template ? (
-        <Form>
-          <Divider />
-          <DynamicForm
-            onChange={updateGrantRequestTemplateContent}
-            template={template}
-            content={templateContent}
-          />
+        <>
           <Divider />
-        </Form>
+          <Form>
+            <DynamicForm
+              onChange={updateGrantRequestTemplateContent}
+              template={template}
+              content={templateContent}
+            />
+          </Form>
+        </>
       ) : null}
     </Segment>
   );

package/src/components/StructureGrantRequestButton.js

@@ -40,6 +40,7 @@ export const StructureGrantRequestButton = ({
 };
 
 StructureGrantRequestButton.propTypes = {
+  authorized: PropTypes.bool,
   structure: PropTypes.object,
   requested: PropTypes.bool,
   addGrantRequestToCart: PropTypes.func,

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

@@ -0,0 +1,134 @@
+import React, { Suspense } from "react";
+import { waitFor } from "@testing-library/react";
+import { render } from "@truedat/test/render";
+import { StructureGrantCartTemplate } from "../StructureGrantCartTemplate";
+
+describe("<StructureGrantCartTemplate />", () => {
+  const fetchGrantRequestTemplates = jest.fn();
+  const selectGrantRequestTemplate = jest.fn();
+  const updateGrantRequestTemplateContent = jest.fn();
+
+  const template = {
+    id: 1,
+    content: [
+      {
+        name: "foo",
+        fields: [
+          {
+            type: "string",
+            name: "foo",
+            label: "Label",
+            cardinality: "1",
+          },
+        ],
+      },
+    ],
+  };
+  const templates = [template];
+  const templatesLoading = false;
+  const templateContent = { foo: "bar" };
+  const grantRequestsCart = {
+    templatesLoading,
+    template,
+    templates,
+  };
+  const props = {
+    grantRequestsCart,
+    templateContent,
+    fetchGrantRequestTemplates,
+    selectGrantRequestTemplate,
+    updateGrantRequestTemplateContent,
+  };
+
+  const messages = {
+    en: {
+      "structure.grant.cart.template": "template",
+      "structure.grant.cart.template.placeholder": "Select request type",
+      "structureType.template": "Type",
+    },
+  };
+
+  it("matches the latest snapshot", () => {
+    const { container } = render(
+      <Suspense fallback={null}>
+        <StructureGrantCartTemplate {...props} />
+      </Suspense>,
+      {
+        messages,
+      }
+    );
+    expect(container).toMatchSnapshot();
+  });
+
+  it("it calls fetchGrantRequestTemplates on render and selects template by default", async () => {
+    fetchGrantRequestTemplates.mockClear();
+    const { findByText } = render(
+      <Suspense fallback={null}>
+        <StructureGrantCartTemplate {...props} />
+      </Suspense>,
+      {
+        messages,
+      }
+    );
+    await waitFor(() => {
+      expect(fetchGrantRequestTemplates).toHaveBeenCalledTimes(1);
+    });
+    await waitFor(() => {
+      expect(selectGrantRequestTemplate).toHaveBeenCalledWith(template.id);
+    });
+
+    await waitFor(() => {
+      expect(findByText(/template/)).toBeTruthy();
+    });
+  });
+
+  it("it renders templates dropdown when there are many", async () => {
+    fetchGrantRequestTemplates.mockClear();
+    selectGrantRequestTemplate.mockClear();
+    const templates = [
+      template,
+      {
+        id: 2,
+        name: "bar",
+        content: [
+          {
+            fields: [
+              {
+                type: "string",
+                name: "bar",
+                label: "Label",
+                cardinality: "1",
+              },
+            ],
+          },
+        ],
+      },
+    ];
+    const { findByRole } = render(
+      <Suspense fallback={null}>
+        <StructureGrantCartTemplate
+          {...{
+            ...props,
+            grantRequestsCart: {
+              ...grantRequestsCart,
+              template: null,
+              templates,
+            },
+          }}
+        />
+      </Suspense>,
+      {
+        messages,
+      }
+    );
+    await waitFor(() => {
+      expect(fetchGrantRequestTemplates).toHaveBeenCalledTimes(1);
+    });
+    await waitFor(() => {
+      expect(selectGrantRequestTemplate).toHaveBeenCalledTimes(0);
+    });
+
+    expect(findByRole("option", { name: "foo" })).toBeTruthy();
+    expect(findByRole("option", { name: "bar" })).toBeTruthy();
+  });
+});

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

@@ -46,13 +46,16 @@ describe("<ValueConditionStructure />", () => {
     const option = getByRole("option", { name: /baz/i });
     userEvent.click(option);
     await waitFor(() => {
-      expect(onChange).toHaveBeenCalledWith({
-        id: 2,
-        name: "baz",
-        data_structure_id: 2,
-        field_type: "string",
-        label: "bar",
-      });
+      expect(onChange).toHaveBeenCalledWith(
+        {
+          id: 2,
+          name: "baz",
+          data_structure_id: 2,
+          field_type: "string",
+          label: "bar",
+        },
+        undefined
+      );
     });
   });
 });

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

@@ -0,0 +1,26 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<StructureGrantCartTemplate /> matches the latest snapshot 1`] = `
+<div>
+  <div
+    class="ui segment"
+    style="display: none;"
+  >
+    <div
+      class="ui header"
+      title="template"
+    >
+      template
+    </div>
+    <div
+      class="ui divider"
+    />
+    <div
+      class="ui divider"
+    />
+    <form
+      class="ui form"
+    />
+  </div>
+</div>
+`;

package/src/messages/en.js

@@ -135,8 +135,9 @@ export default {
   "structure.grant.has_grant": "You have granted access on this structure",
   "structure.grant.request_grant": "Request grant",
   "structure.grant.requested_grant": "Pending request",
-  "structure.grant.cart": "Grants to request",
-  "structure.grant.cart.template": "Request type",
+  "structure.grant.cart": "Requested grants",
+  "structure.grant.cart.template": "Request information",
+  "structure.grant.cart.template.placeholder": "Select request type",
   "structure.grant.cart.filters": "Filters for structure",
   "structure.group": "Group",
   "structure.inserted_at": "Created at",

package/src/messages/es.js

@@ -138,7 +138,8 @@ export default {
   "structure.grant.request_grant": "Solicitar acceso",
   "structure.grant.requested_grant": "Solicitud pendiente",
   "structure.grant.cart": "Accesos a solicitar",
-  "structure.grant.cart.template": "Tipo de solicitud",
+  "structure.grant.cart.template": "Información de solicitud",
+  "structure.grant.cart.template.placeholder": "Seleccione tipo de solicitud",
   "structure.grant.cart.filters": "Filtros para la estructura",
   "structure.group": "Grupo",
   "structure.inserted_at": "Importada",