@truedat/cx 4.41.2 → 4.41.5

package/src/sources/reducers/sourceUpdateStatus.js

@@ -1,14 +1,14 @@
-import { updateSourceConfig } from "../routines";
+import { updateSource } from "../routines";
 
 const sourceUpdateStatus = (state = "none", { type }) => {
   switch (type) {
-    case updateSourceConfig.TRIGGER:
+    case updateSource.TRIGGER:
       return "updating";
-    case updateSourceConfig.SUCCESS:
+    case updateSource.SUCCESS:
       return "success";
-    case updateSourceConfig.FAILURE:
+    case updateSource.FAILURE:
       return "fail";
-    case updateSourceConfig.FULFILL:
+    case updateSource.FULFILL:
       return "none";
     default:
       return state;

package/src/sources/routines.js

@@ -1,13 +1,10 @@
 import { createRoutine } from "redux-saga-routines";
 
 export const clearSource = createRoutine("CLEAR_SOURCE");
-export const clearSources = createRoutine("CLEAR_SOURCES");
 export const createJob = createRoutine("CREATE_JOB");
 export const createSource = createRoutine("CREATE_SOURCE");
 export const deleteSource = createRoutine("DELETE_SOURCE");
 export const disableSource = createRoutine("DISABLE_SOURCE");
 export const enableSource = createRoutine("ENABLE_SOURCE");
 export const fetchSource = createRoutine("FETCH_SOURCE");
-export const fetchSources = createRoutine("FETCH_SOURCES");
 export const updateSource = createRoutine("UPDATE_SOURCE");
-export const updateSourceConfig = createRoutine("UPDATE_SOURCE_CONFIG");

package/src/sources/sagas/__tests__/createSource.spec.js

@@ -1,9 +1,12 @@
 import _ from "lodash/fp";
 import { testSaga } from "redux-saga-test-plan";
-import { apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
-import { createSourceRequestSaga, createSourceSaga } from "../createSource";
+import {
+  createSourceRequestSaga,
+  createSourceSaga,
+  onSuccess,
+} from "../createSource";
+import { CREATE_SOURCE } from "../../api/mutations";
 import { createSource } from "../../routines";
-import { API_SOURCES } from "../../api";
 
 describe("sagas: createSourceRequestSaga", () => {
   it("should invoke createSourceSaga on createSource.TRIGGER", () => {
@@ -26,30 +29,34 @@ describe("sagas: createSourceRequestSaga", () => {
 });
 
 describe("sagas: createSourceSaga", () => {
-  const payload = {
-    source: {
-      type: "tag1",
-      external_id: "Micro1",
-      config: { a: 1 }
-    }
+  const client = { mutate: jest.fn() };
+  const source = {
+    type: "tag1",
+    external_id: "Micro1",
+    config: { a: 1 },
   };
-  const request_data = {
-    source: {
-      type: "tag1",
-      external_id: "Micro1",
-      config: { a: 1 }
-    }
+  const payload = { source };
+  const variables = {
+    source: { ...source, config: "stringified config" },
   };
 
   it("should put a success action when a response is returned", () => {
     expect(() => {
       testSaga(createSourceSaga, { payload })
         .next()
-        .put({ ...createSource.request() })
+        .getContext("client")
+        .next(client)
+        .put(createSource.request(payload))
         .next()
-        .call(apiJsonPost, API_SOURCES, request_data, JSON_OPTS)
+        .call(_.update, "source.config", JSON.stringify, payload)
+        .next(variables)
+        .call(client.mutate, {
+          mutation: CREATE_SOURCE,
+          update: onSuccess,
+          variables,
+        })
         .next({ data: payload })
-        .put({ ...createSource.success(payload) })
+        .put(createSource.success(payload))
         .next()
         .put(createSource.fulfill())
         .next()
@@ -64,9 +71,17 @@ describe("sagas: createSourceSaga", () => {
     expect(() => {
       testSaga(createSourceSaga, { payload })
         .next()
-        .put({ ...createSource.request() })
+        .getContext("client")
+        .next(client)
+        .put(createSource.request(payload))
         .next()
-        .call(apiJsonPost, API_SOURCES, request_data, JSON_OPTS)
+        .call(_.update, "source.config", JSON.stringify, payload)
+        .next(variables)
+        .call(client.mutate, {
+          mutation: CREATE_SOURCE,
+          update: onSuccess,
+          variables,
+        })
         .throw(error)
         .put(createSource.failure(message))
         .next()

package/src/sources/sagas/__tests__/deleteSource.spec.js

@@ -1,12 +1,14 @@
-import { compile } from "path-to-regexp";
 import { testSaga } from "redux-saga-test-plan";
-import { apiJsonDelete, JSON_OPTS } from "@truedat/core/services/api";
-import { deleteSourceSaga, deleteSourceRequestSaga } from "../deleteSource";
+import { DELETE_SOURCE } from "../../api/mutations";
 import { deleteSource } from "../../routines";
-import { API_SOURCE } from "../../api";
+import {
+  deleteSourceRequestSaga,
+  deleteSourceSaga,
+  onSuccess,
+} from "../deleteSource";
 
 describe("sagas: deleteSourceRequestSaga", () => {
-  it("should invoke deleteSourceSaga on deleteSource.TRIGGER", () => {
+  it("should invoke deleteSourceSaga on trigger", () => {
     expect(() => {
       testSaga(deleteSourceRequestSaga)
         .next()
@@ -20,23 +22,29 @@ describe("sagas: deleteSourceRequestSaga", () => {
     expect(() => {
       testSaga(deleteSourceRequestSaga)
         .next()
-        .takeLatest("FOO", deleteSourceRequestSaga);
+        .takeLatest("FOO", deleteSourceSaga);
     }).toThrow();
   });
 });
 
 describe("sagas: deleteSourceSaga", () => {
-  const payload = { external_id: "Micro1" };
-  const { external_id } = payload;
-  const url = compile(API_SOURCE)({ external_id });
+  const id = 1;
+  const payload = { id };
+  const client = { mutate: jest.fn() };
 
   it("should put a success action when a response is returned", () => {
     expect(() => {
       testSaga(deleteSourceSaga, { payload })
         .next()
-        .put(deleteSource.request())
+        .getContext("client")
+        .next(client)
+        .put(deleteSource.request(payload))
         .next()
-        .call(apiJsonDelete, url, JSON_OPTS)
+        .call(client.mutate, {
+          mutation: DELETE_SOURCE,
+          update: onSuccess,
+          variables: payload,
+        })
         .next({ data: payload })
         .put(deleteSource.success(payload))
         .next()
@@ -46,16 +54,23 @@ describe("sagas: deleteSourceSaga", () => {
     }).not.toThrow();
   });
 
-  it("should put a failure action when the call returns an error", () => {
+  it("should put a failure action when the call throws an error", () => {
     const message = "Request failed";
     const error = { message };
+    const client = { mutate: jest.fn() };
 
     expect(() => {
       testSaga(deleteSourceSaga, { payload })
         .next()
-        .put(deleteSource.request())
+        .getContext("client")
+        .next(client)
+        .put(deleteSource.request(payload))
         .next()
-        .call(apiJsonDelete, url, JSON_OPTS)
+        .call(client.mutate, {
+          mutation: DELETE_SOURCE,
+          update: onSuccess,
+          variables: payload,
+        })
         .throw(error)
         .put(deleteSource.failure(message))
         .next()

package/src/sources/sagas/__tests__/disableSource.spec.js

@@ -1,11 +1,7 @@
 import { testSaga } from "redux-saga-test-plan";
-import {
-  DISABLE_SOURCE,
-  disableSourceRequestSaga,
-  disableSourceSaga,
-  onSuccess,
-} from "../disableSource";
+import { DISABLE_SOURCE } from "../../api/mutations";
 import { disableSource } from "../../routines";
+import { disableSourceRequestSaga, disableSourceSaga } from "../disableSource";
 
 describe("sagas: disableSourceRequestSaga", () => {
   it("should invoke disableSourceSaga on trigger", () => {
@@ -42,7 +38,6 @@ describe("sagas: disableSourceSaga", () => {
         .next()
         .call(client.mutate, {
           mutation: DISABLE_SOURCE,
-          update: onSuccess,
           variables: payload,
         })
         .next({ data: payload })
@@ -68,7 +63,6 @@ describe("sagas: disableSourceSaga", () => {
         .next()
         .call(client.mutate, {
           mutation: DISABLE_SOURCE,
-          update: onSuccess,
           variables: payload,
         })
         .throw(error)

package/src/sources/sagas/__tests__/enableSource.spec.js

@@ -1,11 +1,7 @@
 import { testSaga } from "redux-saga-test-plan";
-import {
-  ENABLE_SOURCE,
-  enableSourceRequestSaga,
-  enableSourceSaga,
-  onSuccess,
-} from "../enableSource";
+import { ENABLE_SOURCE } from "../../api/mutations";
 import { enableSource } from "../../routines";
+import { enableSourceRequestSaga, enableSourceSaga } from "../enableSource";
 
 describe("sagas: enableSourceRequestSaga", () => {
   it("should invoke enableSourceSaga on trigger", () => {
@@ -42,7 +38,6 @@ describe("sagas: enableSourceSaga", () => {
         .next()
         .call(client.mutate, {
           mutation: ENABLE_SOURCE,
-          update: onSuccess,
           variables: payload,
         })
         .next({ data: payload })
@@ -68,7 +63,6 @@ describe("sagas: enableSourceSaga", () => {
         .next()
         .call(client.mutate, {
           mutation: ENABLE_SOURCE,
-          update: onSuccess,
           variables: payload,
         })
         .throw(error)

package/src/sources/sagas/__tests__/updateSource.spec.js

@@ -1,12 +1,11 @@
-import { compile } from "path-to-regexp";
+import _ from "lodash/fp";
 import { testSaga } from "redux-saga-test-plan";
-import { apiJsonPut, JSON_OPTS } from "@truedat/core/services/api";
-import { updateSourceRequestSaga, updateSourceSaga } from "../updateSource";
+import { UPDATE_SOURCE } from "../../api/mutations";
 import { updateSource } from "../../routines";
-import { API_SOURCE } from "../../api";
+import { updateSourceRequestSaga, updateSourceSaga } from "../updateSource";
 
 describe("sagas: updateSourceRequestSaga", () => {
-  it("should invoke updateSourceSaga on trigger", () => {
+  it("should invoke updateSourceSaga on updateSource.TRIGGER", () => {
     expect(() => {
       testSaga(updateSourceRequestSaga)
         .next()
@@ -20,27 +19,39 @@ describe("sagas: updateSourceRequestSaga", () => {
     expect(() => {
       testSaga(updateSourceRequestSaga)
         .next()
-        .takeLatest("FOO", updateSourceSaga);
+        .takeLatest("FOO", updateSourceRequestSaga);
     }).toThrow();
   });
 });
 
 describe("sagas: updateSourceSaga", () => {
-  const external_id = "Micro1";
-  const url = compile(API_SOURCE)({ external_id });
-  const source = { external_id, config: { a: 1 } };
+  const client = { mutate: jest.fn() };
+  const source = {
+    type: "tag1",
+    external_id: "Micro1",
+    config: { a: 1 },
+  };
   const payload = { source };
-  const requestData = { source };
+  const variables = {
+    source: { ...source, config: "stringified config" },
+  };
 
   it("should put a success action when a response is returned", () => {
     expect(() => {
       testSaga(updateSourceSaga, { payload })
         .next()
-        .put(updateSource.request())
+        .getContext("client")
+        .next(client)
+        .put(updateSource.request(payload))
         .next()
-        .call(apiJsonPut, url, requestData, JSON_OPTS)
+        .call(_.update, "source.config", JSON.stringify, payload)
+        .next(variables)
+        .call(client.mutate, {
+          mutation: UPDATE_SOURCE,
+          variables,
+        })
         .next({ data: payload })
-        .put(updateSource.success({ source }))
+        .put(updateSource.success(payload))
         .next()
         .put(updateSource.fulfill())
         .next()
@@ -55,9 +66,16 @@ describe("sagas: updateSourceSaga", () => {
     expect(() => {
       testSaga(updateSourceSaga, { payload })
         .next()
-        .put(updateSource.request())
+        .getContext("client")
+        .next(client)
+        .put(updateSource.request(payload))
         .next()
-        .call(apiJsonPut, url, requestData, JSON_OPTS)
+        .call(_.update, "source.config", JSON.stringify, payload)
+        .next(variables)
+        .call(client.mutate, {
+          mutation: UPDATE_SOURCE,
+          variables,
+        })
         .throw(error)
         .put(updateSource.failure(message))
         .next()

package/src/sources/sagas/createSource.js

@@ -1,23 +1,33 @@
-import { call, put, takeLatest } from "redux-saga/effects";
-import { apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
+import _ from "lodash/fp";
+import { call, put, takeLatest, getContext } from "redux-saga/effects";
+import { CREATE_SOURCE } from "../api/mutations";
 import { createSource } from "../routines";
-import { API_SOURCES } from "../api";
+
+export const onSuccess = (cache) => {
+  cache.evict({ id: "ROOT_QUERY", fieldName: "sources" });
+  cache.gc();
+};
 
 export function* createSourceSaga({ payload }) {
+  const client = yield getContext("client");
+  yield put(createSource.request(payload));
+  // GraphQL input object does not support JSON scalars, so source.config must
+  // be stringified before sending to the server.
+  const variables = yield call(
+    _.update,
+    "source.config",
+    JSON.stringify,
+    payload
+  );
   try {
-    const { source } = payload;
-    const url = API_SOURCES;
-    const requestData = { source };
-    yield put(createSource.request());
-    const { data } = yield call(apiJsonPost, url, requestData, JSON_OPTS);
+    const { data } = yield call(client.mutate, {
+      mutation: CREATE_SOURCE,
+      update: onSuccess,
+      variables,
+    });
     yield put(createSource.success(data));
   } catch (error) {
-    if (error.response) {
-      const { status, data } = error.response;
-      yield put(createSource.failure({ status, data }));
-    } else {
-      yield put(createSource.failure(error.message));
-    }
+    yield put(createSource.failure(error.message));
   } finally {
     yield put(createSource.fulfill());
   }

package/src/sources/sagas/deleteSource.js

@@ -1,25 +1,24 @@
-import { compile } from "path-to-regexp";
-import { call, put, takeLatest } from "redux-saga/effects";
-import { apiJsonDelete, JSON_OPTS } from "@truedat/core/services/api";
+import { call, put, takeLatest, getContext } from "redux-saga/effects";
+import { DELETE_SOURCE } from "../api/mutations";
 import { deleteSource } from "../routines";
-import { API_SOURCE } from "../api";
 
-const toApiPath = compile(API_SOURCE);
+export const onSuccess = (cache, { data: { deleteSource } }) => {
+  cache.evict({ id: cache.identify(deleteSource) });
+  cache.gc();
+};
 
 export function* deleteSourceSaga({ payload }) {
+  const client = yield getContext("client");
+  yield put(deleteSource.request(payload));
   try {
-    const source = payload;
-    const url = toApiPath(source);
-    yield put(deleteSource.request());
-    const { data } = yield call(apiJsonDelete, url, JSON_OPTS);
+    const { data } = yield call(client.mutate, {
+      mutation: DELETE_SOURCE,
+      update: onSuccess,
+      variables: payload,
+    });
     yield put(deleteSource.success(data));
   } catch (error) {
-    if (error.response) {
-      const { status, data } = error.response;
-      yield put(deleteSource.failure({ status, data }));
-    } else {
-      yield put(deleteSource.failure(error.message));
-    }
+    yield put(deleteSource.failure(error.message));
   } finally {
     yield put(deleteSource.fulfill());
   }

package/src/sources/sagas/disableSource.js

@@ -1,29 +1,13 @@
-import { gql } from "@apollo/client";
 import { call, put, takeLatest, getContext } from "redux-saga/effects";
+import { DISABLE_SOURCE } from "../api/mutations";
 import { disableSource } from "../routines";
 
-export const DISABLE_SOURCE = gql`
-  mutation DisableSource($id: ID!) {
-    disableSource(id: $id) {
-      id
-      externalId
-    }
-  }
-`;
-
-export const onSuccess = (cache, { data: { disableSource } }) => {
-  cache.evict({ id: "ROOT_QUERY", fieldName: "sources" });
-  cache.evict({ id: cache.identify(disableSource) });
-  cache.gc();
-};
-
 export function* disableSourceSaga({ payload }) {
   const client = yield getContext("client");
   yield put(disableSource.request(payload));
   try {
     const { data } = yield call(client.mutate, {
       mutation: DISABLE_SOURCE,
-      update: onSuccess,
       variables: payload,
     });
     yield put(disableSource.success(data));

package/src/sources/sagas/enableSource.js

@@ -1,29 +1,13 @@
-import { gql } from "@apollo/client";
 import { call, put, takeLatest, getContext } from "redux-saga/effects";
+import { ENABLE_SOURCE } from "../api/mutations";
 import { enableSource } from "../routines";
 
-export const ENABLE_SOURCE = gql`
-  mutation EnableSource($id: ID!) {
-    enableSource(id: $id) {
-      id
-      externalId
-    }
-  }
-`;
-
-export const onSuccess = (cache, { data: { enableSource } }) => {
-  cache.evict({ id: "ROOT_QUERY", fieldName: "sources" });
-  cache.evict({ id: cache.identify(enableSource) });
-  cache.gc();
-};
-
 export function* enableSourceSaga({ payload }) {
   const client = yield getContext("client");
   yield put(enableSource.request(payload));
   try {
     const { data } = yield call(client.mutate, {
       mutation: ENABLE_SOURCE,
-      update: onSuccess,
       variables: payload,
     });
     yield put(enableSource.success(data));

package/src/sources/sagas/index.js

@@ -2,20 +2,14 @@ import { createSourceRequestSaga } from "./createSource";
 import { deleteSourceRequestSaga } from "./deleteSource";
 import { disableSourceRequestSaga } from "./disableSource";
 import { enableSourceRequestSaga } from "./enableSource";
-import { fetchSourceRequestSaga } from "./fetchSource";
-import { fetchSourcesRequestSaga } from "./fetchSources";
 import { updateSourceRequestSaga } from "./updateSource";
-import { updateSourceConfigRequestSaga } from "./updateSourceConfig";
 
 export {
   createSourceRequestSaga,
   deleteSourceRequestSaga,
   disableSourceRequestSaga,
   enableSourceRequestSaga,
-  fetchSourceRequestSaga,
-  fetchSourcesRequestSaga,
   updateSourceRequestSaga,
-  updateSourceConfigRequestSaga,
 };
 
 export default [
@@ -23,8 +17,5 @@ export default [
   deleteSourceRequestSaga(),
   disableSourceRequestSaga(),
   enableSourceRequestSaga(),
-  fetchSourceRequestSaga(),
-  fetchSourcesRequestSaga(),
   updateSourceRequestSaga(),
-  updateSourceConfigRequestSaga(),
 ];

package/src/sources/sagas/updateSource.js

@@ -1,24 +1,27 @@
-import { compile } from "path-to-regexp";
-import { call, put, takeLatest } from "redux-saga/effects";
-import { apiJsonPut, JSON_OPTS } from "@truedat/core/services/api";
+import _ from "lodash/fp";
+import { call, put, takeLatest, getContext } from "redux-saga/effects";
+import { UPDATE_SOURCE } from "../api/mutations";
 import { updateSource } from "../routines";
-import { API_SOURCE } from "../api";
 
 export function* updateSourceSaga({ payload }) {
+  const client = yield getContext("client");
+  yield put(updateSource.request(payload));
+  // GraphQL input object does not support JSON scalars, so source.config must
+  // be stringified before sending to the server.
+  const variables = yield call(
+    _.update,
+    "source.config",
+    JSON.stringify,
+    payload
+  );
   try {
-    const { source } = payload;
-    const url = compile(API_SOURCE)(source);
-    const requestData = { source };
-    yield put(updateSource.request());
-    const { data } = yield call(apiJsonPut, url, requestData, JSON_OPTS);
+    const { data } = yield call(client.mutate, {
+      mutation: UPDATE_SOURCE,
+      variables,
+    });
     yield put(updateSource.success(data));
   } catch (error) {
-    if (error.response) {
-      const { status, data } = error.response;
-      yield put(updateSource.failure({ status, data }));
-    } else {
-      yield put(updateSource.failure(error.message));
-    }
+    yield put(updateSource.failure(error.message));
   } finally {
     yield put(updateSource.fulfill());
   }

package/src/sources/components/DynamicSourceForm.js

@@ -1,60 +0,0 @@
-import _ from "lodash/fp";
-import React from "react";
-import PropTypes from "prop-types";
-import { connect } from "react-redux";
-import { selectTemplate } from "@truedat/df/routines";
-
-const DynamicForm = React.lazy(() =>
-  import("@truedat/df/components/DynamicForm")
-);
-
-const TemplateLoader = React.lazy(() =>
-  import("@truedat/df/templates/components/TemplateLoader")
-);
-
-const initialState = {
-  df_content: {},
-  df_name: null,
-};
-
-export class DynamicSourceForm extends React.Component {
-  state = initialState;
-
-  componentDidMount() {
-    const { template, selectTemplate } = this.props;
-    if (template) selectTemplate({ id: template.id });
-  }
-
-  render() {
-    const { dfContent, handleContentChange } = this.props;
-    return (
-      <>
-        <TemplateLoader />
-        <DynamicForm onChange={handleContentChange} content={dfContent} />
-      </>
-    );
-  }
-}
-
-DynamicSourceForm.propTypes = {
-  template: PropTypes.object,
-  selectTemplate: PropTypes.func,
-  dfContent: PropTypes.object,
-  handleContentChange: PropTypes.func,
-};
-
-const findTemplate = ({ templates, source: { type } = {} }) => {
-  return _.find(_.propEq("name", type))(templates);
-};
-
-const mapStateToProps = (state) => {
-  return {
-    source: state.source,
-    templates: state.templates,
-    template: _.isEmpty(state.template)
-      ? findTemplate(state, state.source)
-      : state.template,
-  };
-};
-
-export default connect(mapStateToProps, { selectTemplate })(DynamicSourceForm);