@truedat/dq 4.42.5 → 4.43.1

package/src/reducers/segmentResults.js

@@ -0,0 +1,19 @@
+import _ from "lodash/fp";
+import { fetchSegmentResults, clearSegmentResults } from "../routines";
+
+const initialState = {};
+
+const segmentResults = (state = initialState, { type, payload }) => {
+  switch (type) {
+    case fetchSegmentResults.TRIGGER:
+      return initialState;
+    case fetchSegmentResults.SUCCESS:
+      return _.prop("data")(payload);
+    case clearSegmentResults.TRIGGER:
+      return initialState;
+    default:
+      return state;
+  }
+};
+
+export { segmentResults };

package/src/routines.js

@@ -59,6 +59,9 @@ export const searchRuleImplementations = createRoutine(
 
 export const deleteRuleResult = createRoutine("DELETE_RULE_RESULT");
 
+export const fetchSegmentResults = createRoutine("FETCH_SEGMENT_RESULTS");
+export const clearSegmentResults = createRoutine("CLEAR_SEGMENT_RESULTS");
+
 export const clearImplementationFilters = createRoutine(
   "CLEAR_IMPLEMENTATION_FILTERS"
 );
@@ -96,3 +99,10 @@ export const createExecutionGroup = createRoutine("CREATE_EXECUTION_GROUP");
 export const fetchExecutionGroup = createRoutine("FETCH_EXECUTION_GROUP");
 export const clearExecutionGroup = createRoutine("CLEAR_EXECUTION_GROUP");
 export const fetchRemediation = createRoutine("FETCH_REMEDIATION");
+
+export const createImplementationStructure = createRoutine(
+  "CREATE_IMPLEMENTATION_STRUCTURE"
+);
+export const deleteImplementationStructure = createRoutine(
+  "DELETE_IMPLEMENTATION_STRUCTURE"
+);

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

@@ -0,0 +1,86 @@
+import { compile } from "path-to-regexp";
+import { testSaga } from "redux-saga-test-plan";
+import { apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
+import {
+  createImplementationStructureRequestSaga,
+  createImplementationStructureSaga,
+} from "../createImplementationStructure";
+import { API_IMPLEMENTATIONS_STRUCTURES } from "../../api";
+import { createImplementationStructure } from "../../routines";
+
+describe("sagas: createImplementationStructureRequestSaga", () => {
+  it("should invoke createImplementationStructureSaga on trigger", () => {
+    expect(() => {
+      testSaga(createImplementationStructureRequestSaga)
+        .next()
+        .takeLatest(
+          createImplementationStructure.TRIGGER,
+          createImplementationStructureSaga
+        )
+        .finish()
+        .isDone();
+    }).not.toThrow();
+  });
+
+  it("should throw exception if an unhandled action is received", () => {
+    expect(() => {
+      testSaga(createImplementationStructureRequestSaga)
+        .next()
+        .takeLatest("FOO", createImplementationStructure);
+    }).toThrow();
+  });
+});
+
+describe("sagas: createImplementationStructureSaga", () => {
+  const implementationId = 1;
+  const dataStructureId = 2;
+  const type = "dataset";
+  const redirectUrl = "uri";
+
+  const url = compile(API_IMPLEMENTATIONS_STRUCTURES)({ implementationId });
+  const payload = {
+    implementationId,
+    dataStructureId,
+    type,
+    redirectUrl,
+  };
+
+  const requestData = { data_structure_id: dataStructureId, type };
+
+  const data = { response: "foo" };
+
+  it("should encode request content and put a success action when a response is returned", () => {
+    expect(() => {
+      testSaga(createImplementationStructureSaga, { payload })
+        .next()
+        .put(createImplementationStructure.request(payload))
+        .next()
+        .call(apiJsonPost, url, requestData, JSON_OPTS)
+        .next({ data })
+        .put(createImplementationStructure.success({ data, redirectUrl }))
+        .next()
+        .put(createImplementationStructure.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(createImplementationStructureSaga, { payload })
+        .next()
+        .put(createImplementationStructure.request(payload))
+        .next()
+        .call(apiJsonPost, url, requestData, JSON_OPTS)
+        .throw(error)
+        .put(createImplementationStructure.failure(message))
+        .next()
+        .put(createImplementationStructure.fulfill())
+        .next()
+        .isDone();
+    }).not.toThrow();
+  });
+});

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

@@ -0,0 +1,84 @@
+import { compile } from "path-to-regexp";
+import { testSaga } from "redux-saga-test-plan";
+import { apiJsonDelete, JSON_OPTS } from "@truedat/core/services/api";
+import {
+  deleteImplementationStructureRequestSaga,
+  deleteImplementationStructureSaga,
+} from "../deleteImplementationStructure";
+import {
+  deleteImplementationStructure,
+  fetchRuleImplementation,
+} from "../../routines";
+import { API_IMPLEMENTATIONS_STRUCTURE } from "../../api";
+
+describe("sagas: deleteImplementationStructureRequestSaga", () => {
+  it("should invoke deleteImplementationStructureSaga on trigger", () => {
+    expect(() => {
+      testSaga(deleteImplementationStructureRequestSaga)
+        .next()
+        .takeLatest(
+          deleteImplementationStructure.TRIGGER,
+          deleteImplementationStructureSaga
+        )
+        .finish()
+        .isDone();
+    }).not.toThrow();
+  });
+
+  it("should throw exception if an unhandled action is received", () => {
+    expect(() => {
+      testSaga(deleteImplementationStructureRequestSaga)
+        .next()
+        .takeLatest("FOO", deleteImplementationStructure);
+    }).toThrow();
+  });
+});
+
+describe("sagas: deleteImplementationStructureSaga", () => {
+  const implementationId = 1;
+  const id = 2;
+
+  const url = compile(API_IMPLEMENTATIONS_STRUCTURE)({
+    implementationId,
+    id,
+  });
+  const payload = { implementationId, id };
+  const data = {};
+
+  it("should put a success action when a response is returned", () => {
+    expect(() => {
+      testSaga(deleteImplementationStructureSaga, { payload })
+        .next()
+        .put(deleteImplementationStructure.request())
+        .next()
+        .call(apiJsonDelete, url, JSON_OPTS)
+        .next({ data })
+        .put(deleteImplementationStructure.success(data))
+        .next()
+        .put(fetchRuleImplementation.trigger({ id: implementationId }))
+        .next()
+        .put(deleteImplementationStructure.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(deleteImplementationStructureSaga, { payload })
+        .next()
+        .put(deleteImplementationStructure.request())
+        .next()
+        .call(apiJsonDelete, url, JSON_OPTS)
+        .throw(error)
+        .put(deleteImplementationStructure.failure(message))
+        .next()
+        .put(deleteImplementationStructure.fulfill())
+        .next()
+        .isDone();
+    }).not.toThrow();
+  });
+});

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

@@ -0,0 +1,78 @@
+import { compile } from "path-to-regexp";
+import { testSaga } from "redux-saga-test-plan";
+import { apiJson, JSON_OPTS } from "@truedat/core/services/api";
+import {
+  fetchSegmentResultsRequestSaga,
+  fetchSegmentResultsSaga,
+} from "../fetchSegmentResults";
+import { fetchSegmentResults } from "../../routines";
+import { API_SEGMENT_RESULTS } from "../../api";
+
+describe("sagas: fetchSegmentResultsRequestSaga", () => {
+  it("should invoke fetchSegmentResultsSaga on trigger", () => {
+    expect(() => {
+      testSaga(fetchSegmentResultsRequestSaga)
+        .next()
+        .takeLatest(fetchSegmentResults.TRIGGER, fetchSegmentResultsSaga)
+        .finish()
+        .isDone();
+    }).not.toThrow();
+  });
+
+  it("should throw exception if an unhandled action is received", () => {
+    expect(() => {
+      testSaga(fetchSegmentResultsRequestSaga)
+        .next()
+        .takeLatest("FOO", fetchSegmentResultsSaga);
+    }).toThrow();
+  });
+});
+
+describe("sagas: fetchRemediaitonSaga", () => {
+  it("should put a success action when a response is returned", () => {
+    const ruleResultId = 1;
+    const url = compile(API_SEGMENT_RESULTS)({ rule_result_id: ruleResultId });
+    const payload = { rule_result_id: ruleResultId };
+    const data = {
+      id: 1,
+      df_name: "remediation_template",
+      df_content: { text: "some_text" },
+    };
+
+    expect(() => {
+      testSaga(fetchSegmentResultsSaga, { payload })
+        .next()
+        .put(fetchSegmentResults.request())
+        .next()
+        .call(apiJson, url, JSON_OPTS)
+        .next({ data })
+        .put(fetchSegmentResults.success(data))
+        .next()
+        .put(fetchSegmentResults.fulfill())
+        .next()
+        .isDone();
+    }).not.toThrow();
+  });
+
+  it("should put a failure action when the call returns an error", () => {
+    const message = "Request failed";
+    const error = { message };
+    const ruleResultId = 1;
+    const url = compile(API_SEGMENT_RESULTS)({ rule_result_id: ruleResultId });
+    const payload = { rule_result_id: ruleResultId };
+
+    expect(() => {
+      testSaga(fetchSegmentResultsSaga, { payload })
+        .next()
+        .put(fetchSegmentResults.request())
+        .next()
+        .call(apiJson, url, JSON_OPTS)
+        .throw(error)
+        .put(fetchSegmentResults.failure(message))
+        .next()
+        .put(fetchSegmentResults.fulfill())
+        .next()
+        .isDone();
+    }).not.toThrow();
+  });
+});

package/src/sagas/createImplementationStructure.js

@@ -0,0 +1,32 @@
+import { compile } from "path-to-regexp";
+import { call, put, takeLatest } from "redux-saga/effects";
+import { apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
+import { createImplementationStructure } from "../routines";
+import { API_IMPLEMENTATIONS_STRUCTURES } from "../api";
+
+export function* createImplementationStructureSaga({ payload }) {
+  try {
+    const { implementationId, dataStructureId, type, redirectUrl } = payload;
+    const url = compile(API_IMPLEMENTATIONS_STRUCTURES)({ implementationId });
+    const requestData = { data_structure_id: dataStructureId, type };
+    yield put(createImplementationStructure.request(payload));
+    const { data } = yield call(apiJsonPost, url, requestData, JSON_OPTS);
+    yield put(createImplementationStructure.success({ data, redirectUrl }));
+  } catch (error) {
+    if (error.response) {
+      const { status, data } = error.response;
+      yield put(createImplementationStructure.failure({ status, data }));
+    } else {
+      yield put(createImplementationStructure.failure(error.message));
+    }
+  } finally {
+    yield put(createImplementationStructure.fulfill());
+  }
+}
+
+export function* createImplementationStructureRequestSaga() {
+  yield takeLatest(
+    createImplementationStructure.TRIGGER,
+    createImplementationStructureSaga
+  );
+}

package/src/sagas/deleteImplementationStructure.js

@@ -0,0 +1,37 @@
+import { compile } from "path-to-regexp";
+import { call, put, takeLatest } from "redux-saga/effects";
+import { apiJsonDelete, JSON_OPTS } from "@truedat/core/services/api";
+import {
+  deleteImplementationStructure,
+  fetchRuleImplementation,
+} from "../routines";
+import { API_IMPLEMENTATIONS_STRUCTURE } from "../api";
+
+export function* deleteImplementationStructureSaga({ payload }) {
+  try {
+    const { implementationId, id } = payload;
+
+    const url = compile(API_IMPLEMENTATIONS_STRUCTURE)({ id });
+    yield put(deleteImplementationStructure.request());
+    const { data } = yield call(apiJsonDelete, url, JSON_OPTS);
+    yield put(deleteImplementationStructure.success(data));
+    //Re-fetch implementation
+    yield put(fetchRuleImplementation.trigger({ id: implementationId }));
+  } catch (error) {
+    if (error.response) {
+      const { status, data } = error.response;
+      yield put(deleteImplementationStructure.failure({ status, data }));
+    } else {
+      yield put(deleteImplementationStructure.failure(error.message));
+    }
+  } finally {
+    yield put(deleteImplementationStructure.fulfill());
+  }
+}
+
+export function* deleteImplementationStructureRequestSaga() {
+  yield takeLatest(
+    deleteImplementationStructure.TRIGGER,
+    deleteImplementationStructureSaga
+  );
+}

package/src/sagas/fetchSegmentResults.js

@@ -0,0 +1,30 @@
+import { compile } from "path-to-regexp";
+import { call, put, takeLatest } from "redux-saga/effects";
+import { apiJson, JSON_OPTS } from "@truedat/core/services/api";
+import { fetchSegmentResults } from "../routines";
+import { API_SEGMENT_RESULTS } from "../api";
+
+export function* fetchSegmentResultsSaga({ payload }) {
+  try {
+    const { rule_result_id } = payload;
+    const url = compile(API_SEGMENT_RESULTS)({
+      rule_result_id,
+    });
+    yield put(fetchSegmentResults.request());
+    const { data } = yield call(apiJson, url, JSON_OPTS);
+    yield put(fetchSegmentResults.success(data));
+  } catch (error) {
+    if (error.response) {
+      const { status, data } = error.response;
+      yield put(fetchSegmentResults.failure({ status, data }));
+    } else {
+      yield put(fetchSegmentResults.failure(error.message));
+    }
+  } finally {
+    yield put(fetchSegmentResults.fulfill());
+  }
+}
+
+export function* fetchSegmentResultsRequestSaga() {
+  yield takeLatest(fetchSegmentResults.TRIGGER, fetchSegmentResultsSaga);
+}

package/src/sagas/index.js

@@ -1,8 +1,9 @@
 import { createExecutionGroupRequestSaga } from "./createExecutionGroup";
-import { createRuleImplementationRequestSaga } from "./createRuleImplementation";
+import { createImplementationStructureRequestSaga } from "./createImplementationStructure";
 import { createRemediationRequestSaga } from "./createRemediation";
+import { createRuleImplementationRequestSaga } from "./createRuleImplementation";
 import { createRuleRequestSaga } from "./createRule";
-import { setRuleImplementationStatusRequestSaga } from "./setRuleImplementationStatus";
+import { deleteImplementationStructureRequestSaga } from "./deleteImplementationStructure";
 import { deleteRemediationRequestSaga } from "./deleteRemediation";
 import { deleteRuleRequestSaga } from "./deleteRule";
 import { deleteRuleResultRequestSaga } from "./deleteRuleResult";
@@ -16,20 +17,23 @@ import { fetchRuleImplementationRequestSaga } from "./fetchRuleImplementation";
 import { fetchRuleImplementationsRequestSaga } from "./fetchRuleImplementations";
 import { fetchRuleRequestSaga } from "./fetchRule";
 import { fetchRulesRequestSaga } from "./fetchRules";
+import { fetchSegmentResultsRequestSaga } from "./fetchSegmentResults";
 import { searchRuleImplementationsRequestSaga } from "./searchRuleImplementations";
+import { setRuleImplementationStatusRequestSaga } from "./setRuleImplementationStatus";
 import { updateRemediationRequestSaga } from "./updateRemediation";
-import { uploadImplementationsRequestsSaga } from "./uploadImplementations";
-import { uploadRulesRequestsSaga } from "./uploadRules";
 import { updateRuleImplementationRequestSaga } from "./updateRuleImplementation";
 import { updateRuleRequestSaga } from "./updateRule";
+import { uploadImplementationsRequestsSaga } from "./uploadImplementations";
 import { uploadResultsRequestSaga } from "./uploadResults";
+import { uploadRulesRequestsSaga } from "./uploadRules";
 
 export {
   createExecutionGroupRequestSaga,
+  createImplementationStructureRequestSaga,
   createRemediationRequestSaga,
   createRuleImplementationRequestSaga,
   createRuleRequestSaga,
-  setRuleImplementationStatusRequestSaga,
+  deleteImplementationStructureRequestSaga,
   deleteRemediationRequestSaga,
   deleteRuleRequestSaga,
   deleteRuleResultRequestSaga,
@@ -43,21 +47,24 @@ export {
   fetchRuleImplementationsRequestSaga,
   fetchRuleRequestSaga,
   fetchRulesRequestSaga,
+  fetchSegmentResultsRequestSaga,
   searchRuleImplementationsRequestSaga,
+  setRuleImplementationStatusRequestSaga,
   updateRemediationRequestSaga,
-  uploadRulesRequestsSaga,
-  uploadImplementationsRequestsSaga,
   updateRuleImplementationRequestSaga,
   updateRuleRequestSaga,
+  uploadImplementationsRequestsSaga,
   uploadResultsRequestSaga,
+  uploadRulesRequestsSaga,
 };
 
 export default [
   createExecutionGroupRequestSaga(),
+  createImplementationStructureRequestSaga(),
   createRemediationRequestSaga(),
   createRuleImplementationRequestSaga(),
   createRuleRequestSaga(),
-  setRuleImplementationStatusRequestSaga(),
+  deleteImplementationStructureRequestSaga(),
   deleteRemediationRequestSaga(),
   deleteRuleRequestSaga(),
   deleteRuleResultRequestSaga(),
@@ -71,11 +78,13 @@ export default [
   fetchRuleImplementationsRequestSaga(),
   fetchRuleRequestSaga(),
   fetchRulesRequestSaga(),
+  fetchSegmentResultsRequestSaga(),
   searchRuleImplementationsRequestSaga(),
+  setRuleImplementationStatusRequestSaga(),
   updateRemediationRequestSaga(),
-  uploadRulesRequestsSaga(),
-  uploadImplementationsRequestsSaga(),
   updateRuleImplementationRequestSaga(),
   updateRuleRequestSaga(),
+  uploadImplementationsRequestsSaga(),
   uploadResultsRequestSaga(),
+  uploadRulesRequestsSaga(),
 ];

package/src/services/encodeRawContent.js

@@ -1,18 +1,18 @@
 import _ from "lodash/fp";
 
-const encodeValue = value => (_.isNil(value) ? value : btoa(value));
+const encodeValue = (value) => (_.isNil(value) ? value : btoa(value));
 
-const encodeProps = o =>
+const encodeProps = (o) =>
   _.flow(
-    _.pick(["dataset", "population", "validations"]),
+    _.pick(["dataset", "population", "validations", "segments"]),
     _.mapValues(encodeValue),
     _.assign(o)
   )(o);
 
-export const encodeRawContent = ruleImplementation =>
+export const encodeRawContent = (ruleImplementation) =>
   _.has("raw_content.dataset")(ruleImplementation)
     ? {
         ...ruleImplementation,
-        raw_content: encodeProps(ruleImplementation.raw_content)
+        raw_content: encodeProps(ruleImplementation.raw_content),
       }
     : ruleImplementation;

package/src/styles/remediationPlan.less

@@ -1,3 +1,7 @@
+.new-remedation-container {
+  padding-top: 1rem;
+}
+
 .ui.button.button-edit-remediation {
   float: right;
   margin-left: 5px;
@@ -5,4 +9,5 @@
 
 .ui.actions.remediation {
   float: right;
+  padding: 2rem;
 }

package/src/styles/ruleImplementationForm/DatasetForm.less

@@ -1,3 +1,8 @@
 #add-structure-button {
   margin-top: 12px;
+}
+
+.segment-trash-buttom {
+  // padding-left: 6rem;
+  padding-top: 1rem;
 }