@truedat/dd 8.2.4 → 8.3.0

package/src/hooks/useTemplatesByIds.js

@@ -0,0 +1,66 @@
+import _ from "lodash/fp";
+import { useState, useEffect } from "react";
+import { apiJson } from "@truedat/core/services/api";
+
+export const normalizeTemplate = (raw) => {
+  if (!raw || typeof raw !== "object") return null;
+  const inner = raw?.data && typeof raw.data === "object" ? raw.data : raw;
+  const content = _.isArray(inner?.content)
+    ? inner.content
+    : _.isArray(inner?.template_content)
+      ? inner.template_content
+      : [];
+  return { ...inner, content };
+};
+
+const ensureTemplateShape = (t) => {
+  if (!t) return null;
+  return t && _.isArray(t.content)
+    ? t
+    : { ...t, content: _.isArray(t.template_content) ? t.template_content : [] };
+};
+
+export const useTemplatesByIds = (ids) => {
+  const [templatesById, setTemplatesById] = useState({});
+  const idsKey =
+    Array.isArray(ids) && ids.length > 0 ? ids.join(",") : "";
+
+  useEffect(() => {
+    if (!idsKey) {
+      setTemplatesById({});
+      return;
+    }
+    const idList = idsKey
+      .split(",")
+      .map((s) => parseInt(s.trim(), 10))
+      .filter((n) => !Number.isNaN(n));
+    if (idList.length === 0) {
+      setTemplatesById({});
+      return;
+    }
+    let cancelled = false;
+    Promise.all(
+      idList.map((id) =>
+        apiJson(`/api/templates/${id}`).then((res) => ({
+          id,
+          raw: res?.data ?? res,
+        }))
+      )
+    )
+      .then((results) => {
+        if (cancelled) return;
+        const map = {};
+        results.forEach(({ id, raw }) => {
+          const t = ensureTemplateShape(normalizeTemplate(raw) ?? raw);
+          if (t) map[id] = t;
+        });
+        setTemplatesById(map);
+      })
+      .catch(() => {});
+    return () => {
+      cancelled = true;
+    };
+  }, [idsKey]);
+
+  return templatesById;
+};

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

@@ -6,10 +6,13 @@ import {
   updateGrantRequestFilter,
   updateGrantRequestTemplateContent,
   checkoutGrantRequest,
+  initGroupTemplates,
+  selectGrantRequestTemplateForGroup,
+  updateGrantRequestTemplateContentForGroup,
 } from "../../routines";
 import { initialState, grantRequestsCart } from "../grantRequestsCart";
 
-describe("reducers: structureVersion", () => {
+describe("reducers: grantRequestsCart", () => {
   it("should provide the initial state", () => {
     expect(grantRequestsCart(undefined, {})).toEqual(initialState);
   });
@@ -324,10 +327,74 @@ describe("reducers: structureVersion", () => {
     ).toEqual(expectedState);
   });
 
-  it("checkoutGrantRequest.SUCCESS should return the initialState", () => {
+  it("checkoutGrantRequest.SUCCESS should return the initialState and clear groupTemplates", () => {
     expect(
       grantRequestsCart({ foo: "bar" }, { type: checkoutGrantRequest.SUCCESS })
-    ).toEqual(initialState);
+    ).toEqual({ ...initialState, groupTemplates: {} });
+  });
+
+  it("should handle initGroupTemplates.TRIGGER", () => {
+    const payload = {
+      "123": { template: "Template A", templateContent: {}, valid: false },
+      others: { template: null, templateContent: {}, valid: false },
+    };
+    const expectedState = {
+      ...initialState,
+      groupTemplates: payload,
+    };
+    expect(
+      grantRequestsCart(initialState, {
+        type: initGroupTemplates.TRIGGER,
+        payload,
+      })
+    ).toEqual(expectedState);
+  });
+
+  it("should handle selectGrantRequestTemplateForGroup.TRIGGER", () => {
+    const stateWithGroups = {
+      ...initialState,
+      groupTemplates: {
+        "123": { template: null, templateContent: {}, valid: false },
+      },
+    };
+    const expectedState = {
+      ...stateWithGroups,
+      groupTemplates: {
+        "123": { template: "My Template", templateContent: {}, valid: false },
+      },
+    };
+    expect(
+      grantRequestsCart(stateWithGroups, {
+        type: selectGrantRequestTemplateForGroup.TRIGGER,
+        payload: { key: "123", template: "My Template" },
+      })
+    ).toEqual(expectedState);
+  });
+
+  it("should handle updateGrantRequestTemplateContentForGroup.TRIGGER", () => {
+    const stateWithGroups = {
+      ...initialState,
+      groupTemplates: {
+        "123": { template: "T", templateContent: {}, valid: false },
+      },
+    };
+    const content = { field1: { value: "x", origin: "user" } };
+    const expectedState = {
+      ...stateWithGroups,
+      groupTemplates: {
+        "123": {
+          template: "T",
+          templateContent: content,
+          valid: true,
+        },
+      },
+    };
+    expect(
+      grantRequestsCart(stateWithGroups, {
+        type: updateGrantRequestTemplateContentForGroup.TRIGGER,
+        payload: { key: "123", content, valid: [] },
+      })
+    ).toEqual(expectedState);
   });
 
   it("should ignore unknown actions", () => {

package/src/reducers/grantRequestsCart.js

@@ -3,11 +3,14 @@ import { dropAt, replaceAt } from "@truedat/core/services/arrays";
 import {
   addGrantRequestToCart,
   checkoutGrantRequest,
+  initGroupTemplates,
   removeGrantRequestFromCart,
   selectGrantRequestTemplate,
+  selectGrantRequestTemplateForGroup,
   setGrantChangeRequestCart,
   updateGrantRequestFilter,
   updateGrantRequestTemplateContent,
+  updateGrantRequestTemplateContentForGroup,
   updateGrantRequestUser,
 } from "../routines";
 import { formatLegacyContent } from "@truedat/df/utils";
@@ -101,8 +104,39 @@ const grantRequestsCart = (state = initialState, { type, payload }) => {
             : s
         )(state.structures),
       };
+    case initGroupTemplates.TRIGGER:
+      return {
+        ...state,
+        groupTemplates: payload ?? {},
+      };
+    case selectGrantRequestTemplateForGroup.TRIGGER: {
+      const { key, template } = payload;
+      const groupTemplates = _.getOr({}, "groupTemplates", state);
+      return {
+        ...state,
+        groupTemplates: {
+          ...groupTemplates,
+          [key]: { ...groupTemplates[key], template },
+        },
+      };
+    }
+    case updateGrantRequestTemplateContentForGroup.TRIGGER: {
+      const { key, content, valid } = payload;
+      const groupTemplates = _.getOr({}, "groupTemplates", state);
+      return {
+        ...state,
+        groupTemplates: {
+          ...groupTemplates,
+          [key]: {
+            ...groupTemplates[key],
+            templateContent: content,
+            valid: _.size(valid) === 0,
+          },
+        },
+      };
+    }
     case checkoutGrantRequest.SUCCESS:
-      return initialState;
+      return { ...initialState, groupTemplates: {} };
     default:
       return state;
   }

package/src/reducers/structureRedirect.js

@@ -4,6 +4,7 @@ import {
   BUCKET_VIEW_CONFIGS,
   GRANT_REQUESTS,
   GRANT_APPROVAL_RULES,
+  GRANTS_REQUESTS_RESULT,
   MY_GRANT_REQUESTS,
   REFERENCE_DATASETS,
   STRUCTURE_TAGS,
@@ -61,7 +62,16 @@ export const structureRedirect = (
       return linkTo.SYSTEM_STRUCTURES({ id });
     }
     case checkoutGrantRequest.SUCCESS: {
-      const requests = _.path("data._embedded.requests")(payload);
+      const bulkGroups =
+        _.path("data.grant_request_groups")(payload) ??
+        _.get("grant_request_groups", payload);
+      if (_.isArray(bulkGroups) && !_.isEmpty(bulkGroups)) {
+        const ids = bulkGroups.map((g) => g.id).join("-");
+        return `${GRANTS_REQUESTS_RESULT}/${ids}`;
+      }
+      const requests =
+        _.path("data._embedded.requests")(payload) ??
+        _.get("_embedded.requests", payload);
       return _.size(requests) === 1
         ? linkTo.GRANT_REQUEST({ id: requests[0].id })
         : MY_GRANT_REQUESTS;

package/src/routines.js

@@ -133,6 +133,13 @@ export const selectGrantPage = createRoutine("SELECT_GRANT_PAGE");
 export const selectGrantRequestTemplate = createRoutine(
   "SELECT_GRANT_REQUEST_TEMPLATE"
 );
+export const initGroupTemplates = createRoutine("INIT_GROUP_TEMPLATES");
+export const selectGrantRequestTemplateForGroup = createRoutine(
+  "SELECT_GRANT_REQUEST_TEMPLATE_FOR_GROUP"
+);
+export const updateGrantRequestTemplateContentForGroup = createRoutine(
+  "UPDATE_GRANT_REQUEST_TEMPLATE_CONTENT_FOR_GROUP"
+);
 export const selectGroup = createRoutine("SELECT_GROUP");
 export const selectNode = createRoutine("SELECT_NODE");
 export const selectPath = createRoutine("SELECT_PATH");

package/src/sagas/index.js

@@ -42,7 +42,6 @@ import { fetchSystemStructuresRequestSaga } from "./fetchSystemStructures";
 import { fetchUserSearchFiltersRequestSaga } from "./fetchUserSearchFilters";
 import { linkStructureToStructureRequestSaga } from "./linkStructureToStructure";
 import { tagStructureRequestSaga } from "./tagStructure";
-import { operateGrantRequestToCartRequestSaga } from "./operateGrantRequestCart";
 import { requestGrantRemovalRequestSaga } from "./requestGrantRemoval";
 import { saveUserSearchFiltersRequestSaga } from "./saveUserSearchFilters";
 import { updateGrantApprovalRuleRequestSaga } from "./updateGrantApprovalRule";
@@ -99,7 +98,6 @@ export {
   linkStructureToStructureRequestSaga,
   legacyFetchStructureRequestSaga,
   tagStructureRequestSaga,
-  operateGrantRequestToCartRequestSaga,
   requestGrantRemovalRequestSaga,
   saveUserSearchFiltersRequestSaga,
   updateReferenceDatasetRequestSaga,
@@ -157,7 +155,6 @@ export default [
   linkStructureToStructureRequestSaga(),
   legacyFetchStructureRequestSaga(),
   tagStructureRequestSaga(),
-  operateGrantRequestToCartRequestSaga(),
   requestGrantRemovalRequestSaga(),
   saveUserSearchFiltersRequestSaga(),
   updateGrantApprovalRuleRequestSaga(),

package/src/styles/grantCartUserSelector.less

@@ -0,0 +1,3 @@
+.grant-cart-user-selector-label-spaced {
+  margin-right: 1em;
+}

package/src/sagas/operateGrantRequestCart.js

@@ -1,26 +0,0 @@
-import { call, put, takeLatest } from "redux-saga/effects";
-import { apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
-import { checkoutGrantRequest } from "../routines";
-import { API_GRANT_REQUEST_GROUP } from "../api";
-
-export function* checkoutGrantRequestSaga({ payload }) {
-  try {
-    const url = API_GRANT_REQUEST_GROUP;
-    yield put(checkoutGrantRequest.request());
-    const { data } = yield call(apiJsonPost, url, payload, JSON_OPTS);
-    yield put(checkoutGrantRequest.success(data));
-  } catch (error) {
-    if (error.response) {
-      const { status, data } = error.response;
-      yield put(checkoutGrantRequest.failure({ status, data }));
-    } else {
-      yield put(checkoutGrantRequest.failure(error.message));
-    }
-  } finally {
-    yield put(checkoutGrantRequest.fulfill());
-  }
-}
-
-export function* operateGrantRequestToCartRequestSaga() {
-  yield takeLatest(checkoutGrantRequest.TRIGGER, checkoutGrantRequestSaga);
-}