@truedat/dd 4.48.11 → 4.49.0

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

@@ -0,0 +1,86 @@
+import { testSaga } from "redux-saga-test-plan";
+import {
+  tagStructureSaga,
+  tagStructureRequestSaga,
+  onSuccess,
+} from "../tagStructure";
+import { tagStructure } from "../../routines";
+import { TAG_STRUCTURE } from "../../api/mutations";
+
+describe("sagas: tagStructureRequestSaga", () => {
+  it("should invoke tagStructureSaga on tagStructure.TRIGGER", () => {
+    expect(() => {
+      testSaga(tagStructureRequestSaga)
+        .next()
+        .takeLatest(tagStructure.TRIGGER, tagStructureSaga)
+        .finish()
+        .isDone();
+    }).not.toThrow();
+  });
+
+  it("should throw exception if an unhandled action is received", () => {
+    expect(() => {
+      testSaga(tagStructureRequestSaga)
+        .next()
+        .takeLatest("FOO", tagStructureSaga);
+    }).toThrow();
+  });
+});
+
+describe("sagas: tagStructureSaga", () => {
+  const payload = {
+    tagId: 1,
+    dataStructureId: 1,
+    comment: "foo",
+    inherit: false,
+  };
+  const data = { id: 1 };
+  const client = { mutate: jest.fn() };
+
+  it("should put a success action when a response is returned", () => {
+    expect(() => {
+      testSaga(tagStructureSaga, { payload })
+        .next()
+        .getContext("client")
+        .next(client)
+        .put(tagStructure.request(payload))
+        .next()
+        .call(client.mutate, {
+          mutation: TAG_STRUCTURE,
+          update: onSuccess,
+          variables: { structureTag: payload },
+        })
+        .next({ data })
+        .put(tagStructure.success(data))
+        .next()
+        .put(tagStructure.fulfill())
+        .next()
+        .isDone();
+    }).not.toThrow();
+  });
+
+  it("should put a failure action when the call returns an error with message", () => {
+    const message = "Request failed";
+    const error = { message };
+
+    expect(() => {
+      testSaga(tagStructureSaga, { payload })
+        .next()
+        .getContext("client")
+        .next(client)
+        .put(tagStructure.request(payload))
+        .next()
+        .call(client.mutate, {
+          mutation: TAG_STRUCTURE,
+          update: onSuccess,
+          variables: { structureTag: payload },
+        })
+        .throw(error)
+        .put(tagStructure.failure(message))
+        .next()
+        .put(tagStructure.fulfill())
+        .next()
+        .isDone();
+    }).not.toThrow();
+  });
+});

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

@@ -0,0 +1,81 @@
+import { testSaga } from "redux-saga-test-plan";
+import { updateTagRequestSaga, updateTagSaga } from "../updateTag";
+import { UPDATE_TAG } from "../../api/mutations";
+import { updateTag } from "../../routines";
+
+describe("sagas: updateTagRequestSaga", () => {
+  it("should invoke updateTagSaga on updateTag.TRIGGER", () => {
+    expect(() => {
+      testSaga(updateTagRequestSaga)
+        .next()
+        .takeLatest(updateTag.TRIGGER, updateTagSaga)
+        .finish()
+        .isDone();
+    }).not.toThrow();
+  });
+
+  it("should throw exception if an unhandled action is received", () => {
+    expect(() => {
+      testSaga(updateTagRequestSaga)
+        .next()
+        .takeLatest("FOO", updateTagRequestSaga);
+    }).toThrow();
+  });
+});
+
+describe("sagas: updateTagSaga", () => {
+  const client = { mutate: jest.fn() };
+  const tag = {
+    id: "123",
+    name: "tag1",
+    domainIds: ["1", "2"],
+  };
+  const payload = tag;
+  const variables = { id: tag.id, tag };
+  const data = { foo: "bar" };
+
+  it("should put a success action when a response is returned", () => {
+    expect(() => {
+      testSaga(updateTagSaga, { payload })
+        .next()
+        .getContext("client")
+        .next(client)
+        .put(updateTag.request(payload))
+        .next()
+        .call(client.mutate, {
+          mutation: UPDATE_TAG,
+          variables,
+        })
+        .next({ data })
+        .put(updateTag.success(data))
+        .next()
+        .put(updateTag.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(updateTagSaga, { payload })
+        .next()
+        .getContext("client")
+        .next(client)
+        .put(updateTag.request(payload))
+        .next()
+        .call(client.mutate, {
+          mutation: UPDATE_TAG,
+          variables,
+        })
+        .throw(error)
+        .put(updateTag.failure(message))
+        .next()
+        .put(updateTag.fulfill())
+        .next()
+        .isDone();
+    }).not.toThrow();
+  });
+});

package/src/sagas/createTag.js

@@ -0,0 +1,29 @@
+import { call, put, takeLatest, getContext } from "redux-saga/effects";
+import { CREATE_TAG } from "../api/mutations";
+import { createTag } from "../routines";
+
+export const onSuccess = (cache) => {
+  cache.evict({ id: "ROOT_QUERY", fieldName: "tags" });
+  cache.gc();
+};
+
+export function* createTagSaga({ payload }) {
+  const client = yield getContext("client");
+  try {
+    yield put(createTag.request(payload));
+    const { data } = yield call(client.mutate, {
+      mutation: CREATE_TAG,
+      update: onSuccess,
+      variables: { tag: payload },
+    });
+    yield put(createTag.success(data));
+  } catch (error) {
+    yield put(createTag.failure(error.message));
+  } finally {
+    yield put(createTag.fulfill());
+  }
+}
+
+export function* createTagRequestSaga() {
+  yield takeLatest(createTag.TRIGGER, createTagSaga);
+}

package/src/sagas/deleteStructureTag.js

@@ -4,26 +4,29 @@ import { DELETE_STRUCTURE_TAG } from "../api/mutations";
 
 export const onSuccess = (cache, { data: { deleteStructureTag } }) => {
   cache.evict({ id: cache.identify(deleteStructureTag) });
+  cache.evict({
+    id: cache.identify(deleteStructureTag?.dataStructure),
+    fieldName: "structureTags",
+  });
+  cache.evict({
+    id: cache.identify(deleteStructureTag?.dataStructure),
+    fieldName: "availableTags",
+  });
   cache.gc();
 };
 
-export function* deleteStructureTagSaga({ payload }) {
+export function* deleteStructureTagSaga({ payload: id }) {
   const client = yield getContext("client");
   try {
-    yield put(deleteStructureTag.request(payload));
+    yield put(deleteStructureTag.request(id));
     const { data } = yield call(client.mutate, {
       mutation: DELETE_STRUCTURE_TAG,
       update: onSuccess,
-      variables: payload,
+      variables: { id },
     });
     yield put(deleteStructureTag.success(data));
   } catch (error) {
-    if (error.response) {
-      const { status, data } = error.response;
-      yield put(deleteStructureTag.failure({ status, data }));
-    } else {
-      yield put(deleteStructureTag.failure(error.message));
-    }
+    yield put(deleteStructureTag.failure(error.message));
   } finally {
     yield put(deleteStructureTag.fulfill());
   }

package/src/sagas/deleteTag.js

@@ -0,0 +1,34 @@
+import { call, put, takeLatest, getContext } from "redux-saga/effects";
+import { deleteTag } from "../routines";
+import { DELETE_TAG } from "../api/mutations";
+
+export const onSuccess = (cache, { data: { deleteTag } }) => {
+  cache.evict({ id: cache.identify(deleteTag) });
+  cache.gc();
+};
+
+export function* deleteTagSaga({ payload }) {
+  const client = yield getContext("client");
+  try {
+    yield put(deleteTag.request(payload));
+    const { data } = yield call(client.mutate, {
+      mutation: DELETE_TAG,
+      update: onSuccess,
+      variables: payload,
+    });
+    yield put(deleteTag.success(data));
+  } catch (error) {
+    if (error.response) {
+      const { status, data } = error.response;
+      yield put(deleteTag.failure({ status, data }));
+    } else {
+      yield put(deleteTag.failure(error.message));
+    }
+  } finally {
+    yield put(deleteTag.fulfill());
+  }
+}
+
+export function* deleteTagRequestSaga() {
+  yield takeLatest(deleteTag.TRIGGER, deleteTagSaga);
+}

package/src/sagas/index.js

@@ -4,12 +4,12 @@ import { createGraphRequestSaga } from "./createGraph";
 import { createProfileGroupRequestSaga } from "./createProfileGroup";
 import { createReferenceDatasetRequestSaga } from "./createReferenceDataset";
 import { createStructureGraphRequestSaga } from "./createStructureGraph";
-import { createStructureTagRequestSaga } from "./createStructureTag";
 import { createSystemRequestSaga } from "./createSystem";
-import { deleteLinkStructureTagRequestSaga } from "./deleteLinkStructureTag";
+import { createTagRequestSaga } from "./createTag";
+import { deleteStructureTagRequestSaga } from "./deleteStructureTag";
 import { deleteReferenceDatasetRequestSaga } from "./deleteReferenceDataset";
 import { deleteStructureRequestSaga } from "./deleteStructure";
-import { deleteStructureTagRequestSaga } from "./deleteStructureTag";
+import { deleteTagRequestSaga } from "./deleteTag";
 import { deleteUserSearchFilterRequestSaga } from "./deleteUserSearchFilter";
 import { doStructureNoteActionRequestSaga } from "./doStructureNoteAction";
 import { downloadCsvGraphRequestSaga } from "./downloadCsvGraph";
@@ -23,7 +23,6 @@ import { fetchGrantRequestsRequestSaga } from "./fetchGrantRequests";
 import { fetchGrantsRequestSaga } from "./fetchGrants";
 import { fetchGraphRequestSaga } from "./fetchGraph";
 import { fetchLineageEventsRequestSaga } from "./fetchLineageEvents";
-import { fetchLinksStructureTagsRequestSaga } from "./fetchLinksStructureTags";
 import { fetchNodesRequestSaga } from "./fetchNodes";
 import { fetchProfileExecutionRequestSaga } from "./fetchProfileExecution";
 import { fetchProfileGroupRequestSaga } from "./fetchProfileGroup";
@@ -40,17 +39,17 @@ import { fetchSystemStructuresRequestSaga } from "./fetchSystemStructures";
 import { fetchSystemsRequestSaga } from "./fetchSystems";
 import { fetchUnitDomainsRequestSaga } from "./fetchUnitDomains";
 import { fetchUserSearchFiltersRequestSaga } from "./fetchUserSearchFilters";
-import { linkStructureTagRequestSaga } from "./linkStructureTag";
+import { tagStructureRequestSaga } from "./tagStructure";
 import { operateGrantRequestToCartRequestSaga } from "./operateGrantRequestCart";
 import { requestGrantRemovalRequestSaga } from "./requestGrantRemoval";
 import { saveUserSearchFiltersRequestSaga } from "./saveUserSearchFilters";
 import { updateReferenceDatasetRequestSaga } from "./updateReferenceDataset";
 import { updateStructureRequestSaga } from "./updateStructure";
-import { updateStructureTagRequestSaga } from "./updateStructureTag";
 import { updateStructureTypeRequestSaga } from "./updateStructureType";
 import { updateSystemRequestSaga } from "./updateSystem";
 import { uploadStructuresDomainsRequestSaga } from "./uploadStructuresDomains";
 import { uploadStructuresRequestSaga } from "./uploadStructures";
+import { updateTagRequestSaga } from "./updateTag";
 
 export {
   bulkUpdateStructuresRequestsSaga,
@@ -59,12 +58,12 @@ export {
   createProfileGroupRequestSaga,
   createReferenceDatasetRequestSaga,
   createStructureGraphRequestSaga,
-  createStructureTagRequestSaga,
   createSystemRequestSaga,
-  deleteLinkStructureTagRequestSaga,
+  createTagRequestSaga,
+  deleteStructureTagRequestSaga,
   deleteReferenceDatasetRequestSaga,
   deleteStructureRequestSaga,
-  deleteStructureTagRequestSaga,
+  deleteTagRequestSaga,
   deleteUserSearchFilterRequestSaga,
   doStructureNoteActionRequestSaga,
   downloadCsvGraphRequestSaga,
@@ -78,7 +77,6 @@ export {
   fetchGrantsRequestSaga,
   fetchGraphRequestSaga,
   fetchLineageEventsRequestSaga,
-  fetchLinksStructureTagsRequestSaga,
   fetchNodesRequestSaga,
   fetchProfileExecutionRequestSaga,
   fetchProfileGroupRequestSaga,
@@ -95,17 +93,17 @@ export {
   fetchSystemsRequestSaga,
   fetchUnitDomainsRequestSaga,
   fetchUserSearchFiltersRequestSaga,
-  linkStructureTagRequestSaga,
+  tagStructureRequestSaga,
   operateGrantRequestToCartRequestSaga,
   requestGrantRemovalRequestSaga,
   saveUserSearchFiltersRequestSaga,
   updateReferenceDatasetRequestSaga,
   updateStructureRequestSaga,
-  updateStructureTagRequestSaga,
   updateStructureTypeRequestSaga,
   updateSystemRequestSaga,
   uploadStructuresDomainsRequestSaga,
   uploadStructuresRequestSaga,
+  updateTagRequestSaga,
 };
 
 export default [
@@ -115,12 +113,12 @@ export default [
   createProfileGroupRequestSaga(),
   createReferenceDatasetRequestSaga(),
   createStructureGraphRequestSaga(),
-  createStructureTagRequestSaga(),
+  createTagRequestSaga(),
   createSystemRequestSaga(),
-  deleteLinkStructureTagRequestSaga(),
+  deleteStructureTagRequestSaga(),
   deleteReferenceDatasetRequestSaga(),
   deleteStructureRequestSaga(),
-  deleteStructureTagRequestSaga(),
+  deleteTagRequestSaga(),
   deleteUserSearchFilterRequestSaga(),
   doStructureNoteActionRequestSaga(),
   downloadCsvGraphRequestSaga(),
@@ -134,7 +132,6 @@ export default [
   fetchGrantsRequestSaga(),
   fetchGraphRequestSaga(),
   fetchLineageEventsRequestSaga(),
-  fetchLinksStructureTagsRequestSaga(),
   fetchNodesRequestSaga(),
   fetchProfileExecutionRequestSaga(),
   fetchProfileGroupRequestSaga(),
@@ -151,13 +148,13 @@ export default [
   fetchSystemsRequestSaga(),
   fetchUnitDomainsRequestSaga(),
   fetchUserSearchFiltersRequestSaga(),
-  linkStructureTagRequestSaga(),
+  tagStructureRequestSaga(),
   operateGrantRequestToCartRequestSaga(),
   requestGrantRemovalRequestSaga(),
   saveUserSearchFiltersRequestSaga(),
   updateReferenceDatasetRequestSaga(),
   updateStructureRequestSaga(),
-  updateStructureTagRequestSaga(),
+  updateTagRequestSaga(),
   updateStructureTypeRequestSaga(),
   updateSystemRequestSaga(),
   uploadStructuresDomainsRequestSaga(),

package/src/sagas/tagStructure.js

@@ -0,0 +1,37 @@
+import { call, put, takeLatest, getContext } from "redux-saga/effects";
+import { tagStructure } from "../routines";
+import { TAG_STRUCTURE } from "../api/mutations";
+
+export const onSuccess = (cache, { data: { tagStructure } }) => {
+  cache.evict({ id: cache.identify(tagStructure) });
+  cache.evict({
+    id: cache.identify(tagStructure?.dataStructure),
+    fieldName: "structureTags",
+  });
+  cache.evict({
+    id: cache.identify(tagStructure?.dataStructure),
+    fieldName: "availableTags",
+  });
+  cache.gc();
+};
+
+export function* tagStructureSaga({ payload }) {
+  const client = yield getContext("client");
+  try {
+    yield put(tagStructure.request(payload));
+    const { data } = yield call(client.mutate, {
+      mutation: TAG_STRUCTURE,
+      update: onSuccess,
+      variables: { structureTag: payload },
+    });
+    yield put(tagStructure.success(data));
+  } catch (error) {
+    yield put(tagStructure.failure(error.message));
+  } finally {
+    yield put(tagStructure.fulfill());
+  }
+}
+
+export function* tagStructureRequestSaga() {
+  yield takeLatest(tagStructure.TRIGGER, tagStructureSaga);
+}

package/src/sagas/updateTag.js

@@ -0,0 +1,23 @@
+import { call, put, takeLatest, getContext } from "redux-saga/effects";
+import { updateTag } from "../routines";
+import { UPDATE_TAG } from "../api/mutations";
+
+export function* updateTagSaga({ payload }) {
+  const client = yield getContext("client");
+  try {
+    yield put(updateTag.request(payload));
+    const { data } = yield call(client.mutate, {
+      mutation: UPDATE_TAG,
+      variables: { id: payload?.id, tag: payload },
+    });
+    yield put(updateTag.success(data));
+  } catch (error) {
+    yield put(updateTag.failure(error.message));
+  } finally {
+    yield put(updateTag.fulfill());
+  }
+}
+
+export function* updateTagRequestSaga() {
+  yield takeLatest(updateTag.TRIGGER, updateTagSaga);
+}

package/src/components/LinkStructureTagForm.js

@@ -1,163 +0,0 @@
-import _ from "lodash/fp";
-import React from "react";
-import { useForm, Controller } from "react-hook-form";
-import { Button, Container, Form } from "semantic-ui-react";
-import { connect } from "react-redux";
-import PropTypes from "prop-types";
-import { useIntl } from "react-intl";
-import { accentInsensitivePathOrder } from "@truedat/core/services/sort";
-import { deleteLinkStructureTag, linkStructureTag } from "../routines";
-
-export const LinkStructureTagForm = ({
-  deleteLinkStructureTag,
-  comment,
-  linkedStructureTags,
-  linkId,
-  linkStructureTag,
-  structureId,
-  structureTags,
-  tagId,
-}) => {
-  const { formatMessage } = useIntl();
-  const allTags = _.map("id")(structureTags);
-  const availableTags = _.negate(_.isNil)(tagId)
-    ? allTags
-    : _.difference(
-        allTags,
-        _.map(_.path("_embedded.data_structure_tag.id"))(linkedStructureTags)
-      );
-  const options = _.flow(
-    _.filter(({ id }) => _.includes(id)(availableTags)),
-    _.sortBy(accentInsensitivePathOrder("name")),
-    _.map(({ id, name, description }) => ({
-      value: id,
-      text: name,
-      description: description,
-    }))
-  )(structureTags);
-  const defaultTag = _.negate(_.isNil)(tagId)
-    ? tagId
-    : _.size(options) === 1
-    ? _.head(options).value
-    : null;
-  const submitTitle = _.isNil(tagId)
-    ? "structure.tag.add"
-    : "structure.tag.edit";
-  const onSubmit = (params) => {
-    const payload = {
-      structureId,
-      tagId: params.tag,
-      tag: { comment: params.comment },
-    };
-    linkStructureTag(payload);
-  };
-  const doDelete = () => deleteLinkStructureTag({ structureId, tagId });
-  const { handleSubmit, control, formState } = useForm({
-    mode: "all",
-    defaultValues: {
-      comment: comment || "",
-      tag: defaultTag,
-    },
-  });
-  const { isDirty, isValid } = formState;
-  return (
-    <Container className="link-structure-tag-form">
-      <Form onSubmit={handleSubmit(onSubmit)}>
-        <Controller
-          control={control}
-          name="tag"
-          rules={{ required: true }}
-          render={({
-            field: { onBlur, onChange, value },
-            fieldState: { error },
-          }) => (
-            <Form.Dropdown
-              name="tag"
-              disabled={_.negate(_.isNil)(tagId)}
-              error={!!error}
-              placeholder={formatMessage({
-                id: "structure.tag.dropdown.placeholder",
-              })}
-              label={formatMessage({ id: "structure.tag.dropdown.label" })}
-              onBlur={onBlur}
-              onChange={(_e, { value }) => onChange(value)}
-              clearable
-              search
-              selection
-              options={options}
-              value={value}
-            />
-          )}
-        />
-        <Controller
-          control={control}
-          name="comment"
-          render={({
-            field: { onBlur, onChange, value },
-            fieldState: { error },
-          }) => (
-            <Form.TextArea
-              data-testid="comment-id"
-              error={!!error}
-              name="comment"
-              label={formatMessage({ id: "structure.tag.textArea.label" })}
-              placeholder={formatMessage({
-                id: "structure.tag.textArea.placeholder",
-              })}
-              onBlur={onBlur}
-              onChange={(_e, { value }) => onChange(value)}
-              value={value}
-            />
-          )}
-        />
-        <div className="actions">
-          <Button
-            type="submit"
-            disabled={(!isDirty && options.length > 1) || !isValid}
-            primary
-            content={formatMessage({ id: submitTitle })}
-          />
-          {_.negate(_.isNil)(linkId) && (
-            <Button
-              type="button"
-              onClick={doDelete}
-              secondary
-              content={formatMessage({ id: "structure.tag.delete" })}
-            />
-          )}
-        </div>
-      </Form>
-    </Container>
-  );
-};
-
-LinkStructureTagForm.propTypes = {
-  deleteLinkStructureTag: PropTypes.func,
-  comment: PropTypes.string,
-  linkedStructureTags: PropTypes.array,
-  linkId: PropTypes.number,
-  linkStructureTag: PropTypes.func,
-  structureId: PropTypes.number,
-  structureTags: PropTypes.array,
-  tagId: PropTypes.number,
-};
-
-const mapStateToProps = ({
-  linkedStructureTags,
-  structure,
-  editableStructureTags,
-}) => ({
-  linkedStructureTags,
-  structureId: _.prop("id")(structure),
-  structureTags: editableStructureTags,
-});
-
-const mapDispatchToProps = {
-  deleteLinkStructureTag,
-  linkStructureTag,
-};
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(LinkStructureTagForm);