@truedat/dd 4.35.8 → 4.36.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [4.36.3] 2022-01-18
+
+### Added
+
+- [TD-4100] Allow partial loads for notes in case that there are errors on the file
+
+## [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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "4.35.8",
+  "version": "4.36.3",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -84,9 +84,9 @@
     ]
   },
   "dependencies": {
-    "@truedat/auth": "4.35.8",
-    "@truedat/core": "4.35.8",
-    "@truedat/df": "4.35.8",
+    "@truedat/auth": "4.36.3",
+    "@truedat/core": "4.36.3",
+    "@truedat/df": "4.36.3",
     "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": "35a51ffb36f357fe814258d51420d5ace5b3cd63"
+  "gitHead": "ec1b0afc195462b78b1e9145cf705d9edd87a58b"
 }

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/StructureSelectorInputFieldJoin.js

@@ -124,10 +124,14 @@ export const StructureSelectorInputFieldJoin = ({
   ];
   const deleteClause = (idx) => handleSelectField(removeAt(clauses, idx));
   const handleChange = (prop, idx) => (data) => {
-    const { data_structure_id: id, parent_index: parent_index } = data;
+    const {
+      data_structure_id: id,
+      parent_index: parent_index,
+      name: name,
+    } = data;
     const newClause = _.isNil(parent_index)
-      ? { ...clauses[idx], [prop]: { id } }
-      : { ...clauses[idx], [prop]: { id, parent_index } };
+      ? { ...clauses[idx], [prop]: { id, name } }
+      : { ...clauses[idx], [prop]: { id, parent_index, name } };
     const newClauses = _.set(`[${idx}]`, newClause)(clauses);
     handleSelectField(newClauses);
   };

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/messages/en.js

@@ -366,7 +366,12 @@ export default {
   "structures.bulkUpdateStructures.no.structures.body":
     "No structures selected",
   "structures.bulkUpdateStructures.no.structures.header": "Empty Search",
-  "structures.bulkUpdateStructures.success.header": "Succeded Bulk Update",
+  "structures.bulkUpdateStructures.success.header":
+    "Bulk update success! Loaded {count_ids} omitted {count_errors}",
+  "structures.bulkUpdateStructures.success.errors":
+    "Error in id {id}, in {name} attribute: {key} message: {message}",
+  "structures.bulkUploadStructures.success.errors":
+    "Error in line {row}, in {name} attribute: {key} message: {message}",
   "structures.bulkUpdateStructures.success.unchanged":
     "{unchanged} structures remained unchanged.",
   "structures.bulkUpdateStructures.success.updated":

package/src/messages/es.js

@@ -370,7 +370,11 @@ export default {
     "Ninguna estructura seleccionada",
   "structures.bulkUpdateStructures.no.structures.header": "Búsqueda vacía",
   "structures.bulkUpdateStructures.success.header":
-    "Actualización terminada con éxito",
+    "¡Actualización realizada correctamente! subidos {count_ids} errores {count_errors}",
+  "structures.bulkUpdateStructures.success.errors":
+    "Error en id {id}, en {name} atributo: {key} mensaje: {message}",
+  "structures.bulkUploadStructures.success.errors":
+    "Error en linea {row}, en {name} atributo: {key} mensaje: {message}",
   "structures.bulkUpdateStructures.success.unchanged":
     "{unchanged} se han mantenido sin cambios.",
   "structures.bulkUpdateStructures.success.updated":

package/src/reducers/ddMessage.js

@@ -12,27 +12,39 @@ const ddMessage = (state = initialState, { type, payload }) => {
   switch (type) {
     case dismissAlert.TRIGGER:
       return initialState;
+    case uploadStructures.SUCCESS:
     case bulkUpdateStructures.SUCCESS: {
-      const { data, structureCount } = payload;
-      const changedMessage = {
-        id: "structures.bulkUpdateStructures.success.updated",
-        fields: { changed: _.size(data.message) },
-      };
-      const unchangedMessage = {
-        id: "structures.bulkUpdateStructures.success.unchanged",
-        fields: { unchanged: structureCount - _.size(data.message) },
-      };
-      const messages =
-        structureCount - _.size(data.message) > 0
-          ? [changedMessage, unchangedMessage]
-          : [changedMessage];
+      const messagesImp = _.has("errors")(payload.data)
+        ? _.flow(
+            _.propOr([], "errors"),
+            _.map((error) => ({
+              id:
+                type == bulkUpdateStructures.SUCCESS
+                  ? "structures.bulkUpdateStructures.success.errors"
+                  : "structures.bulkUploadStructures.success.errors",
+              fields: {
+                name: error.implementation_key,
+                key: Object.keys(error.message)[0],
+                message: error.message[Object.keys(error.message)[0]][0],
+                row: error.row,
+                id: error.id,
+              },
+              defaultMessage:
+                "structures.bulkUpdateStructures.success.errors.default",
+            }))
+          )(payload.data)
+        : "";
       return {
         error: false,
         header: "structures.bulkUpdateStructures.success.header",
         icon: "check",
-        color: "green",
+        color: payload.data.errors.length >= 1 ? "orange" : "green",
         text: "",
-        messages: messages,
+        messages: messagesImp,
+        fields: {
+          count_ids: payload.data.ids.length,
+          count_errors: payload.data.errors.length,
+        },
       };
     }
     case updateStructureType.SUCCESS:
@@ -42,25 +54,6 @@ const ddMessage = (state = initialState, { type, payload }) => {
         icon: "check",
         color: "green",
       };
-    case uploadStructures.SUCCESS: {
-      const { data } = payload;
-      const count = _.flow(_.prop("message"), _.size)(data);
-      const content =
-        count === 0
-          ? "structures.uploadStructures.success.content.any"
-          : count === 1
-          ? "structures.uploadStructures.success.content.single"
-          : "structures.uploadStructures.success.content";
-      return {
-        error: false,
-        header: "structures.uploadStructures.success.header",
-        content,
-        icon: "check",
-        color: "green",
-        text: "",
-        fields: { count },
-      };
-    }
     case uploadStructures.FAILURE:
       if (payload.status != 500) {
         const { data } = payload;

package/src/sagas/__tests__/bulkUpdateStructures.spec.js

@@ -55,7 +55,7 @@ describe("sagas: bulkUpdateStructuresSaga", () => {
         .next()
         .call(apiJsonPost, API_DATA_STRUCTURES_BULK_UPDATE, body, JSON_OPTS)
         .next({ data })
-        .put(bulkUpdateStructures.success({ ...data, structureCount }))
+        .put(bulkUpdateStructures.success({ data }))
         .next()
         .put(bulkUpdateStructures.fulfill())
         .next()

package/src/sagas/__tests__/uploadStructures.spec.js

@@ -2,7 +2,7 @@ import { testSaga } from "redux-saga-test-plan";
 import { apiJsonPost, UPLOAD_JSON_OPTS } from "@truedat/core/services/api";
 import {
   uploadStructuresRequestSaga,
-  uploadStructuresSaga
+  uploadStructuresSaga,
 } from "../uploadStructures";
 import { uploadStructures } from "../../routines";
 import { API_STRUCTURES_UPLOAD } from "../../api";
@@ -39,7 +39,7 @@ describe("sagas: uploadStructuresSaga", () => {
         .next()
         .call(apiJsonPost, API_STRUCTURES_UPLOAD, body, UPLOAD_JSON_OPTS)
         .next({ data })
-        .put(uploadStructures.success(data))
+        .put(uploadStructures.success({ data }))
         .next()
         .put(uploadStructures.fulfill())
         .next()

package/src/sagas/bulkUpdateStructures.js

@@ -22,7 +22,7 @@ export function* bulkUpdateStructuresSaga({ payload }) {
       body,
       JSON_OPTS
     );
-    yield put(bulkUpdateStructures.success({ ...data, structureCount }));
+    yield put(bulkUpdateStructures.success({ data }));
   } catch (error) {
     if (error.response) {
       const { status, data } = error.response;

package/src/sagas/uploadStructures.js

@@ -14,7 +14,7 @@ export function* uploadStructuresSaga({ payload }) {
       UPLOAD_JSON_OPTS
     );
 
-    yield put(uploadStructures.success(data));
+    yield put(uploadStructures.success({ data }));
   } catch (error) {
     if (error.response) {
       const { status, data } = error.response;