@truedat/dq 4.35.3 → 4.35.7

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [4.35.5] 2021-12-20
+
+### Added
+
+- [TD-4384] Include tests in rules and implementations bulk load
+
 ## [4.35.2] 2021-12-20
 
 ### Fixed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dq",
-  "version": "4.35.3",
+  "version": "4.35.7",
   "description": "Truedat Web Data Quality Module",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -82,8 +82,8 @@
   },
   "dependencies": {
     "@apollo/client": "^3.4.10",
-    "@truedat/core": "4.35.3",
-    "@truedat/df": "4.35.3",
+    "@truedat/core": "4.35.7",
+    "@truedat/df": "4.35.7",
     "axios": "^0.19.2",
     "graphql": "^15.5.3",
     "path-to-regexp": "^1.7.0",
@@ -103,5 +103,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "10cfa24ea2c47fe56e640e16cecaa51f302aaad3"
+  "gitHead": "99812619b928d7802bb2f33df3f3321c9c36995e"
 }

package/src/components/ImplementationsUploadButton.js

@@ -52,8 +52,8 @@ ImplementationsUploadButton.propTypes = {
   loading: PropTypes.bool,
 };
 
-const mapStateToProps = ({ uploadImplementationsFile: { loading } }) => ({
-  loading,
+const mapStateToProps = ({ uploadingImplementationsFile }) => ({
+  loading: uploadingImplementationsFile,
 });
 
 export default connect(mapStateToProps, { uploadImplementations })(

package/src/components/RulesActions.js

@@ -8,7 +8,7 @@ import { RULE_NEW } from "@truedat/core/routes";
 import { uploadRules } from "../routines";
 import RulesUploadButton from "./RulesUploadButton";
 
-export const RulesActions = ({ userRulesPermissions, upload }) => (
+export const RulesActions = ({ userRulesPermissions, loading }) => (
   <div style={{ float: "right" }}>
     {userRulesPermissions.manage_quality_rules && (
       <>
@@ -18,7 +18,7 @@ export const RulesActions = ({ userRulesPermissions, upload }) => (
           to={RULE_NEW}
           content={<FormattedMessage id="quality.actions.create" />}
         />
-        {upload && <RulesUploadButton />}
+        {loading && <RulesUploadButton />}
         <RulesUploadButton />
       </>
     )}
@@ -27,7 +27,7 @@ export const RulesActions = ({ userRulesPermissions, upload }) => (
 
 RulesActions.propTypes = {
   userRulesPermissions: PropTypes.object,
-  upload: PropTypes.bool,
+  loading: PropTypes.bool,
 };
 
 const mapStateToProps = ({ userRulesPermissions }) => ({

package/src/components/RulesUploadButton.js

@@ -51,8 +51,8 @@ RulesUploadButton.propTypes = {
   loading: PropTypes.bool,
 };
 
-const mapStateToProps = ({ uploadRulesFile: { loading } }) => ({
-  loading,
+const mapStateToProps = ({ uploadingRulesFile }) => ({
+  loading: uploadingRulesFile,
 });
 
 export default connect(mapStateToProps, { uploadRules })(RulesUploadButton);

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

@@ -0,0 +1,23 @@
+import React from "react";
+import { render } from "@truedat/test/render";
+import { ImplementationsUploadButton } from "../ImplementationsUploadButton";
+
+describe("<ImplementationsUploadButton />", () => {
+  const props = {
+    uploadRules: jest.fn(),
+    upload: false,
+  };
+  const renderOpts = {
+    messages: {
+      en: { "ruleImplementations.actions.upload.tooltip": "Upload Rules" },
+    },
+  };
+
+  it("matches the latest snapshot", () => {
+    const { contanier } = render(
+      <ImplementationsUploadButton {...props} />,
+      renderOpts
+    );
+    expect(contanier).toMatchSnapshot();
+  });
+});

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

@@ -7,9 +7,10 @@ describe("<Rule />", () => {
     rule: { id: 1, name: "foo" },
     userRulePermissions: {
       manage_quality_rule_implementations: true,
-      manage_quality_rules: true
+      manage_quality_rules: true,
     },
-    match: { params: { id: 1, qc: 2 } }
+    match: { params: { id: 1, qc: 2 } },
+    implementations: [{ id: 100, implementation_key: "bar" }],
   };
 
   it("matches the latest snapshot", () => {

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

@@ -27,6 +27,7 @@ const renderOpts = {
       "ruleImplementation.actions.deprecate": "archive",
       "ruleImplementation.actions.delete.confirmation.header": "header",
       "ruleImplementation.actions.delete.confirmation.content": "confirm",
+      "quality.result.no.data": "No information about quality",
     },
   },
   state,

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

@@ -0,0 +1,20 @@
+import React from "react";
+import { render } from "@truedat/test/render";
+import { RulesUploadButton } from "../RulesUploadButton";
+
+describe("<RulesUploadButton />", () => {
+  const props = {
+    uploadRules: jest.fn(),
+    upload: false,
+  };
+  const renderOpts = {
+    messages: {
+      en: { "rules.actions.upload.tooltip": "Upload Rules" },
+    },
+  };
+
+  it("matches the latest snapshot", () => {
+    const { contanier } = render(<RulesUploadButton {...props} />, renderOpts);
+    expect(contanier).toMatchSnapshot();
+  });
+});

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

@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<ImplementationsUploadButton /> matches the latest snapshot 1`] = `undefined`;

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

@@ -16,7 +16,16 @@ exports[`<Rule /> matches the latest snapshot 1`] = `
         />
         <HeaderContent>
           foo
-          <RuleSummary />
+          <RuleSummary
+            implementations={
+              Array [
+                Object {
+                  "id": 100,
+                  "implementation_key": "bar",
+                },
+              ]
+            }
+          />
         </HeaderContent>
       </Header>
     </GridColumn>

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

@@ -34,7 +34,7 @@ exports[`<RuleImplementation /> matches the latest snapshot 1`] = `
                 <span
                   class="value"
                 >
-                  quality.result.no.data
+                  No information about quality
                 </span>
               </span>
             </a>

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

@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<RulesUploadButton /> matches the latest snapshot 1`] = `undefined`;

package/src/messages/en.js

@@ -26,7 +26,7 @@ export default {
   "dataset.form.button.add_structure": "Add Structure",
   "datasetForm.implementation_key.tooltip":
     "Leave empty for autogeneration of implementation key after saving implementation",
-  executionGroup: "Executions",
+  "executionGroup": "Executions",
   "executions.completed.content": "{count} executions completed.",
   "executions.completed.header": "Executions completed",
   "executions.pending.content":
@@ -501,7 +501,7 @@ export default {
   "ruleImplementations.upload.success.errors":
     "Error in {implementation_key} attribute: {key} message: {message} ",
   "ruleImplementations.upload.success.header":
-    "Upload success! Loaded {count_ids} omitted {count_errors}:",
+    "Upload success! Loaded {count_ids} omitted {count_errors}",
   "ruleImplementations.upload.failed.header":
     "Error uploading file. No rules have been created.",
   "ruleImplementations.upload.failed.misssing_required_columns":
@@ -537,7 +537,7 @@ export default {
   "rules.upload.success.errors":
     "Error in {rule_name} attribute: {key} message: {message} ",
   "rules.upload.success.header":
-    "Upload successful! Loaded {count_ids} omitted {count_errors}:",
+    "Upload successful! Loaded {count_ids} omitted {count_errors}",
   "rules.upload.failed.header":
     "Error uploading file. No rules have been created.",
   "rules.upload.failed.misssing_required_columns":

package/src/messages/es.js

@@ -26,7 +26,7 @@ export default {
   "dataset.form.button.add_structure": "Añadir Estructura",
   "datasetForm.implementation_key.tooltip":
     "En caso de no introducir clave de implementación, se autogenerará al guardar la implementación",
-  executionGroup: "Ejecuciones",
+  "executionGroup": "Ejecuciones",
   "executions.completed.content": "Se han ejecutado {count} implementaciones.",
   "executions.completed.header": "Ejecuciones finalizadas",
   "executions.pending.content":
@@ -519,7 +519,7 @@ export default {
   "ruleImplementations.upload.success.errors":
     "Error en {name} atributo: {key} mensaje: {message} ",
   "ruleImplementations.upload.success.header":
-    "¡Fichero subido correctamente! subidos {count_ids} errores {count_errors}:",
+    "¡Fichero subido correctamente! subidos {count_ids} errores {count_errors}",
   "ruleImplementations.upload.failed.header":
     "Error al subir el fichero. No se ha realizado ninguna inserción.",
   "ruleImplementations.upload.failed.misssing_required_columns":
@@ -552,7 +552,7 @@ export default {
   "rules.upload.success.errors":
     "Error en {rule_name} atributo: {key} mensaje: {message} ",
   "rules.upload.success.header":
-    "¡Fichero subido correctamente! subidos {count_ids} errores {count_errors}:",
+    "¡Fichero subido correctamente! subidos {count_ids} errores {count_errors}",
   "rules.upload.failed.header":
     "Error al subir el fichero. No se ha realizado ninguna inserción.",
   "rules.upload.failed.misssing_required_columns":

package/src/reducers/__tests__/uploadImplementationsFile.spec.js

@@ -0,0 +1,27 @@
+import { uploadImplementations } from "../../routines";
+import { uploadingImplementationsFile } from "../uploadingImplementationsFile";
+
+const fooState = { foo: "bar" };
+const initialState = false;
+
+describe("reduces: uploadingImplementationsFile", () => {
+  it("should provide the initial state", () => {
+    expect(uploadingImplementationsFile(undefined, {})).toEqual(initialState);
+  });
+
+  it("should handle the uploadingImplementationsFile.TRIGGER action", () => {
+    expect(
+      uploadingImplementationsFile(fooState, {
+        type: uploadImplementations.TRIGGER,
+      })
+    ).toBeTruthy();
+  });
+
+  it("should handle the uploadingImplementationsFile.FULLFILL action", () => {
+    expect(
+      uploadingImplementationsFile(fooState, {
+        type: uploadImplementations.FULFILL,
+      })
+    ).toBeFalsy;
+  });
+});

package/src/reducers/__tests__/uploadRulesFile.spec.js

@@ -0,0 +1,27 @@
+import { uploadRules } from "../../routines";
+import { uploadingRulesFile } from "../uploadingRulesFile";
+
+const fooState = { foo: "bar" };
+const initialState = false;
+
+describe("reduces: uploadingRulesFile", () => {
+  it("should provide the initial state", () => {
+    expect(uploadingRulesFile(undefined, {})).toEqual(initialState);
+  });
+
+  it("should handle the uploadingRulesFile.TRIGGER action", () => {
+    expect(
+      uploadingRulesFile(fooState, {
+        type: uploadRules.TRIGGER,
+      })
+    ).toBeTruthy();
+  });
+
+  it("should handle the uploadingRulesFile.FULLFILL action", () => {
+    expect(
+      uploadingRulesFile(fooState, {
+        type: uploadRules.FULFILL,
+      })
+    ).toBeFalsy;
+  });
+});

package/src/reducers/__tests__/uploadingResults.spec.js

@@ -5,7 +5,7 @@ const fooState = { foo: "bar" };
 
 const initialState = false;
 
-describe("reducers: previousRuleImplementationQuery", () => {
+describe("reducers: uploadingResults", () => {
   it("should provide the initial state", () => {
     expect(uploadingResults(undefined, {})).toEqual(initialState);
   });

package/src/reducers/index.js

@@ -37,8 +37,8 @@ import { ruleUpdating } from "./ruleUpdating";
 import { rules } from "./rules";
 import { rulesLoading } from "./rulesLoading";
 import { rulesPageSize } from "./rulesPageSize";
-import { uploadImplementationsFile } from "./uploadImplementationsFile";
-import { uploadRulesFile } from "./uploadRulesFile";
+import { uploadingImplementationsFile } from "./uploadingImplementationsFile";
+import { uploadingRulesFile } from "./uploadingRulesFile";
 import { userRulePermissions } from "./userRulePermissions";
 import { userRulesPermissions } from "./userRulesPermissions";
 import { userImplementationsPermissions } from "./userImplementationsPermissions";
@@ -84,8 +84,8 @@ export {
   rules,
   rulesLoading,
   rulesPageSize,
-  uploadRulesFile,
-  uploadImplementationsFile,
+  uploadingRulesFile,
+  uploadingImplementationsFile,
   userRulePermissions,
   userRulesPermissions,
   userImplementationsPermissions,

package/src/reducers/ruleImplementationRedirect.js

@@ -1,4 +1,4 @@
-import { linkTo } from "@truedat/core/routes";
+import { IMPLEMENTATIONS, linkTo } from "@truedat/core/routes";
 import { clearRedirect } from "@truedat/core/routines";
 import {
   createExecutionGroup,
@@ -12,7 +12,7 @@ const initialState = "";
 
 export const ruleImplementationRedirect = (
   state = initialState,
-  { type, payload, meta }
+  { type, payload }
 ) => {
   switch (type) {
     case clearRedirect.TRIGGER:
@@ -31,8 +31,7 @@ export const ruleImplementationRedirect = (
       return linkTo.RULE_IMPLEMENTATION({ id, implementation_id });
     }
     case uploadImplementations.SUCCESS: {
-      const { redirectUrl } = meta;
-      return redirectUrl;
+      return IMPLEMENTATIONS;
     }
     case deleteRuleResult.SUCCESS: {
       const { rule_implementation_id: implementation_id, rule_id: id } =

package/src/reducers/ruleRedirect.js

@@ -39,8 +39,7 @@ export const ruleRedirect = (state = initialState, { type, payload, meta }) => {
       return _.isNil(rule_id) ? state : linkTo.RULE({ id: rule_id });
     }
     case uploadRules.SUCCESS: {
-      const { redirectUrl } = meta;
-      return redirectUrl;
+      return RULES;
     }
     case deleteSubscription.SUCCESS: {
       const { rule_id } = payload;

package/src/reducers/uploadingImplementationsFile.js

@@ -0,0 +1,19 @@
+import { uploadImplementations } from "../routines";
+
+const initialState = false;
+
+export const uploadingImplementationsFile = (
+  state = initialState,
+  { type }
+) => {
+  switch (type) {
+    case uploadImplementations.TRIGGER:
+      return true;
+    case uploadImplementations.FULFILL:
+      return false;
+    default:
+      return state;
+  }
+};
+
+export default uploadingImplementationsFile;

package/src/reducers/uploadingRulesFile.js

@@ -0,0 +1,16 @@
+import { uploadRules } from "../routines";
+
+const initialState = false;
+
+export const uploadingRulesFile = (state = initialState, { type }) => {
+  switch (type) {
+    case uploadRules.TRIGGER:
+      return true;
+    case uploadRules.FULFILL:
+      return false;
+    default:
+      return state;
+  }
+};
+
+export default uploadingRulesFile;

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

@@ -0,0 +1,78 @@
+import { testSaga } from "redux-saga-test-plan";
+import { apiJsonPost, UPLOAD_JSON_OPTS } from "@truedat/core/services/api";
+import {
+  uploadImplementationsRequestsSaga,
+  uploadImplementationsSaga,
+} from "../uploadImplementations";
+import { uploadImplementations } from "../../routines";
+import { API_RULE_IMPLEMENTATIONS_UPLOAD } from "../../api";
+
+describe("sagas: uploadImplementationsRequestsSaga", () => {
+  it("should invoke uploadImplementationsSaga on trigger", () => {
+    expect(() => {
+      testSaga(uploadImplementationsRequestsSaga)
+        .next()
+        .takeLatest(uploadImplementations.TRIGGER, uploadImplementationsSaga)
+        .finish()
+        .isDone();
+    }).not.toThrow();
+  });
+
+  it("should throw exception if an unhandle actios is received", () => {
+    expect(() => {
+      testSaga(uploadImplementationsRequestsSaga)
+        .next()
+        .takeLatest("FOO", uploadImplementationsSaga);
+    }).toThrow;
+  });
+});
+
+describe("sagas: uploadImplementationsSaga", () => {
+  const body = { implementations: "content" };
+  const payload = { data: body };
+  const data = { message: [1, 2] };
+  it("should put a access action when  a response is returned", () => {
+    expect(() => {
+      testSaga(uploadImplementationsSaga, { payload })
+        .next()
+        .put(uploadImplementations.request())
+        .next()
+        .call(
+          apiJsonPost,
+          API_RULE_IMPLEMENTATIONS_UPLOAD,
+          body,
+          UPLOAD_JSON_OPTS
+        )
+        .next({ data })
+        .put(uploadImplementations.success(data))
+        .next()
+        .put(uploadImplementations.fulfill())
+        .next()
+        .isDone();
+    }).not.toThrow();
+  });
+
+  it("should put a failure action when the call returns an error", () => {
+    const message = "Request failed";
+    const error = { message };
+
+    expect(() => {
+      testSaga(uploadImplementationsSaga, { payload })
+        .next()
+        .put(uploadImplementations.request())
+        .next()
+        .call(
+          apiJsonPost,
+          API_RULE_IMPLEMENTATIONS_UPLOAD,
+          body,
+          UPLOAD_JSON_OPTS
+        )
+        .throw(error)
+        .put(uploadImplementations.failure(message))
+        .next()
+        .put(uploadImplementations.fulfill())
+        .next()
+        .isDone();
+    }).not.toThrow();
+  });
+});

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

@@ -0,0 +1,65 @@
+import { testSaga } from "redux-saga-test-plan";
+import { apiJsonPost, UPLOAD_JSON_OPTS } from "@truedat/core/services/api";
+import { uploadRulesRequestsSaga, uploadRulesSaga } from "../uploadRules";
+import { uploadRules } from "../../routines";
+import { API_RULES_UPLOAD } from "../../api";
+
+describe("sagas: uploadRulesRequestsSaga", () => {
+  it("should invoke uploadRulesSaga on trigger", () => {
+    expect(() => {
+      testSaga(uploadRulesRequestsSaga)
+        .next()
+        .takeLatest(uploadRules.TRIGGER, uploadRulesSaga)
+        .finish()
+        .isDone();
+    }).not.toThrow();
+  });
+
+  it("should throw exception if an unhandle actios is received", () => {
+    expect(() => {
+      testSaga(uploadRulesRequestsSaga)
+        .next()
+        .takeLatest("FOO", uploadRulesSaga);
+    }).toThrow;
+  });
+});
+
+describe("sagas: uploadRulesSaga", () => {
+  const body = { rules: "content" };
+  const payload = { data: body };
+  const data = { message: [1, 2] };
+  it("should put a access action when  a response is returned", () => {
+    expect(() => {
+      testSaga(uploadRulesSaga, { payload })
+        .next()
+        .put(uploadRules.request())
+        .next()
+        .call(apiJsonPost, API_RULES_UPLOAD, body, UPLOAD_JSON_OPTS)
+        .next({ data })
+        .put(uploadRules.success(data))
+        .next()
+        .put(uploadRules.fulfill())
+        .next()
+        .isDone();
+    }).not.toThrow();
+  });
+
+  it("should put a failure action when the call returns an error", () => {
+    const message = "Request failed";
+    const error = { message };
+
+    expect(() => {
+      testSaga(uploadRulesSaga, { payload })
+        .next()
+        .put(uploadRules.request())
+        .next()
+        .call(apiJsonPost, API_RULES_UPLOAD, body, UPLOAD_JSON_OPTS)
+        .throw(error)
+        .put(uploadRules.failure(message))
+        .next()
+        .put(uploadRules.fulfill())
+        .next()
+        .isDone();
+    }).not.toThrow();
+  });
+});

package/src/sagas/uploadImplementations.js

@@ -1,16 +1,19 @@
 import { call, put, takeLatest } from "redux-saga/effects";
-import { IMPLEMENTATIONS } from "@truedat/core/routes";
 import { apiJsonPost, UPLOAD_JSON_OPTS } from "@truedat/core/services/api";
 import { uploadImplementations } from "../routines";
+import { API_RULE_IMPLEMENTATIONS_UPLOAD } from "../api";
 
 export function* uploadImplementationsSaga({ payload }) {
   try {
-    const { action, method, href, ...rest } = payload;
-    const meta = { action, method, href, redirectUrl: IMPLEMENTATIONS };
-    yield put(uploadImplementations.request({ method, href, ...rest }));
-    const body = rest || {};
-    const { data } = yield call(apiJsonPost, href, body.data, UPLOAD_JSON_OPTS);
-    yield put({ meta, ...uploadImplementations.success(data) });
+    const { data: body } = payload;
+    yield put(uploadImplementations.request());
+    const { data } = yield call(
+      apiJsonPost,
+      API_RULE_IMPLEMENTATIONS_UPLOAD,
+      body,
+      UPLOAD_JSON_OPTS
+    );
+    yield put(uploadImplementations.success(data));
   } catch (error) {
     if (error.response) {
       const { status, data } = error.response;

package/src/sagas/uploadRules.js

@@ -1,16 +1,19 @@
 import { call, put, takeLatest } from "redux-saga/effects";
-import { RULES } from "@truedat/core/routes";
 import { apiJsonPost, UPLOAD_JSON_OPTS } from "@truedat/core/services/api";
 import { uploadRules } from "../routines";
+import { API_RULES_UPLOAD } from "../api";
 
 export function* uploadRulesSaga({ payload }) {
   try {
-    const { action, method, href, ...rest } = payload;
-    const meta = { action, method, href, redirectUrl: RULES };
-    yield put(uploadRules.request({ method, href, ...rest }));
-    const body = rest || {};
-    const { data } = yield call(apiJsonPost, href, body.data, UPLOAD_JSON_OPTS);
-    yield put({ meta, ...uploadRules.success(data) });
+    const { data: body } = payload;
+    yield put(uploadRules.request());
+    const { data } = yield call(
+      apiJsonPost,
+      API_RULES_UPLOAD,
+      body,
+      UPLOAD_JSON_OPTS
+    );
+    yield put(uploadRules.success(data));
   } catch (error) {
     if (error.response) {
       const { status, data } = error.response;

package/src/reducers/uploadImplementationsFile.js

@@ -1,28 +0,0 @@
-import { uploadImplementations } from "../routines";
-
-const initialState = {
-  loading: false,
-  error: {},
-};
-
-export const uploadImplementationsFile = (
-  state = initialState,
-  { type, payload }
-) => {
-  switch (type) {
-    case uploadImplementations.TRIGGER:
-      return state;
-    case uploadImplementations.REQUEST:
-      return { ...state, loading: true };
-    case uploadImplementations.SUCCESS:
-      return state;
-    case uploadImplementations.FAILURE:
-      return { ...state, error: payload };
-    case uploadImplementations.FULFILL:
-      return { ...state, loading: false };
-    default:
-      return state;
-  }
-};
-
-export default uploadImplementationsFile;

package/src/reducers/uploadRulesFile.js

@@ -1,25 +0,0 @@
-import { uploadRules } from "../routines";
-
-const initialState = {
-  loading: false,
-  error: {},
-};
-
-export const uploadRulesFile = (state = initialState, { type, payload }) => {
-  switch (type) {
-    case uploadRules.TRIGGER:
-      return state;
-    case uploadRules.REQUEST:
-      return { ...state, loading: true };
-    case uploadRules.SUCCESS:
-      return state;
-    case uploadRules.FAILURE:
-      return { ...state, error: payload };
-    case uploadRules.FULFILL:
-      return { ...state, loading: false };
-    default:
-      return state;
-  }
-};
-
-export default uploadRulesFile;