@truedat/dd 4.49.8 → 4.50.2

package/src/sagas/index.js

@@ -1,5 +1,6 @@
 import { bulkUpdateStructuresRequestsSaga } from "./bulkUpdateStructures";
 import { createGrantRequestApprovalRequestSaga } from "./createGrantRequestApproval";
+import { createGrantRequestStatusRequestSaga } from "./createGrantRequestStatus";
 import { createGraphRequestSaga } from "./createGraph";
 import { createProfileGroupRequestSaga } from "./createProfileGroup";
 import { createReferenceDatasetRequestSaga } from "./createReferenceDataset";
@@ -54,6 +55,7 @@ import { updateTagRequestSaga } from "./updateTag";
 export {
   bulkUpdateStructuresRequestsSaga,
   createGrantRequestApprovalRequestSaga,
+  createGrantRequestStatusRequestSaga,
   createGraphRequestSaga,
   createProfileGroupRequestSaga,
   createReferenceDatasetRequestSaga,
@@ -109,6 +111,7 @@ export {
 export default [
   bulkUpdateStructuresRequestsSaga(),
   createGrantRequestApprovalRequestSaga(),
+  createGrantRequestStatusRequestSaga(),
   createGraphRequestSaga(),
   createProfileGroupRequestSaga(),
   createReferenceDatasetRequestSaga(),

package/src/sagas/operateGrantRequestCart.js

@@ -1,29 +1,8 @@
 import { call, put, takeLatest } from "redux-saga/effects";
-import { apiJson, apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
-import { API_TEMPLATES } from "@truedat/df/templates/api";
-import { fetchGrantRequestTemplates, checkoutGrantRequest } from "../routines";
+import { apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
+import { checkoutGrantRequest } from "../routines";
 import { API_GRANT_REQUEST_GROUP } from "../api";
 
-export function* fetchGrantRequestTemplatesSaga() {
-  try {
-    const scope = "gr";
-    const url = API_TEMPLATES;
-    yield put(fetchGrantRequestTemplates.request());
-    const json_opts = { ...JSON_OPTS, params: { preprocess: true, scope } };
-    const { data } = yield call(apiJson, url, json_opts);
-    yield put(fetchGrantRequestTemplates.success({ scope, ...data }));
-  } catch (error) {
-    if (error.response) {
-      const { status, data } = error.response;
-      yield put(fetchGrantRequestTemplates.failure({ status, data }));
-    } else {
-      yield put(fetchGrantRequestTemplates.failure(error.message));
-    }
-  } finally {
-    yield put(fetchGrantRequestTemplates.fulfill());
-  }
-}
-
 export function* checkoutGrantRequestSaga({ payload }) {
   try {
     const url = API_GRANT_REQUEST_GROUP;
@@ -43,9 +22,5 @@ export function* checkoutGrantRequestSaga({ payload }) {
 }
 
 export function* operateGrantRequestToCartRequestSaga() {
-  yield takeLatest(
-    fetchGrantRequestTemplates.TRIGGER,
-    fetchGrantRequestTemplatesSaga
-  );
   yield takeLatest(checkoutGrantRequest.TRIGGER, checkoutGrantRequestSaga);
 }

package/src/selectors/getGrantRequestsColumns.js

@@ -1,6 +1,6 @@
 import _ from "lodash/fp";
 import React from "react";
-import { Header } from "semantic-ui-react";
+import { Header, Icon, Popup } from "semantic-ui-react";
 import { createSelector } from "reselect";
 import { useIntl } from "react-intl";
 import PropTypes from "prop-types";
@@ -32,12 +32,24 @@ PathDecorator.propTypes = {
   data_structure: PropTypes.object,
 };
 
-export const StructureDecorator = ({ data_structure }) => {
-  return <>{data_structure.name}</>;
+export const StructureDecorator = ({ data_structure, modificationGrant }) => {
+  const { formatMessage } = useIntl();
+  return (
+    <>
+      {modificationGrant ? (
+        <Popup
+          content={formatMessage({ id: "grantRequest.isModification" })}
+          trigger={<Icon name="edit" />}
+        />
+      ) : null}
+      {data_structure.name}
+    </>
+  );
 };
 
 StructureDecorator.propTypes = {
   data_structure: PropTypes.object,
+  modificationGrant: PropTypes.object,
 };
 
 const DateDecorator = ({ date }) => {
@@ -74,6 +86,9 @@ export const defaultGrantRequestsTableColumns = [
     name: "data_structure",
     fieldSelector: (grantRequest) => ({
       data_structure: grantRequest?._embedded?.data_structure,
+      modificationGrant: _.prop("_embedded.group._embedded.modification_grant")(
+        grantRequest
+      ),
     }),
     fieldDecorator: StructureDecorator,
   },