@truedat/dd 5.5.2 → 5.6.1

package/src/reducers/structureActiveFilters.js

@@ -1,3 +1,4 @@
+import _ from "lodash/fp";
 import {
   includes,
   isArray,
@@ -7,6 +8,7 @@ import {
   propOr,
   union,
   without,
+  tap,
 } from "lodash/fp";
 import {
   addStructureFilter,
@@ -24,6 +26,13 @@ export const structureActiveFilters = (
   state = initialState,
   { type, payload }
 ) => {
+  const toggle = (state, filter, value) =>
+    _.flow(
+      () => state[filter] || [],
+      (currentValues) => _.xor(isArray(value) ? value : [value], currentValues),
+      (newValues) => ({ ...state, [filter]: newValues })
+    );
+
   switch (type) {
     case clearStructureFilters.TRIGGER:
       return initialState;
@@ -50,15 +59,7 @@ export const structureActiveFilters = (
       return initialState;
     }
     case toggleStructureFilterValue.TRIGGER: {
-      const { filter, value } = payload;
-      if (isArray(value)) {
-        return { ...state, [filter]: value };
-      }
-      const values = propOr([], filter)(state);
-      const nextValues = includes(value)(values)
-        ? without([value])(values)
-        : union([value])(values);
-      return { ...state, [filter]: nextValues };
+      return toggle(state, payload.filter, payload.value)();
     }
     default:
       return state;

package/src/reducers/structureSelectedFilter.js

@@ -3,7 +3,7 @@ import {
   closeStructureFilter,
   openStructureFilter,
   removeStructureFilter,
-  resetStructureFilters
+  resetStructureFilters,
 } from "../routines";
 
 /** @type {string} */

package/src/reducers/structures.js

@@ -7,6 +7,7 @@ const pickFields = _.pick([
   "id",
   "domain_id",
   "name",
+  "grants",
   "group",
   "description",
   "path",
@@ -21,6 +22,10 @@ const pickFields = _.pick([
   "mutable_metadata",
   "note",
   "original_name",
+  "my_grants",
+  "my_grant_request",
+  "data_fields",
+  "user_permissions",
 ]);
 
 const structures = (state = initialState, { type, payload }) => {

package/src/sagas/createGrantRequestStatus.js

@@ -1,17 +1,26 @@
 import { compile } from "path-to-regexp";
 import { call, put, takeLatest } from "redux-saga/effects";
 import { apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
-import { createGrantRequestStatus, fetchStructure } from "../routines";
+import {
+  createGrantRequestStatus,
+  fetchStructure,
+  fetchStructures,
+} from "../routines";
 import { API_GRANT_REQUEST_STATUS } from "../api";
 
 export function* createGrantRequestStatusSaga({ payload }) {
   try {
-    const { grantRequestId, status, structureId } = payload;
+    const { grantRequestId, status, structureId, previousStructureQuery } =
+      payload;
     const url = compile(API_GRANT_REQUEST_STATUS)({ id: grantRequestId });
     yield put(createGrantRequestStatus.request({ status }));
     const { data } = yield call(apiJsonPost, url, { status }, JSON_OPTS);
     yield put(createGrantRequestStatus.success(data));
-    yield put(fetchStructure.trigger({ id: structureId }));
+    yield put(
+      previousStructureQuery
+        ? fetchStructures.trigger(previousStructureQuery)
+        : fetchStructure.trigger({ id: structureId })
+    );
   } catch (error) {
     if (error.response) {
       const { status, data } = error.response;

package/src/sagas/requestGrantRemoval.js

@@ -1,18 +1,28 @@
 import { compile } from "path-to-regexp";
 import { call, put, takeLatest } from "redux-saga/effects";
 import { apiJsonPatch, JSON_OPTS } from "@truedat/core/services/api";
-import { requestGrantRemoval, fetchStructure } from "../routines";
+import {
+  requestGrantRemoval,
+  fetchStructure,
+  fetchStructures,
+} from "../routines";
 import { API_GRANT } from "../api";
 
 export function* requestGrantRemovalSaga({ payload }) {
   try {
-    const { id, action, data_structure_id, version } = payload;
+    const { id, action, data_structure_id, version, previousStructureQuery } =
+      payload;
     const url = compile(API_GRANT)({ id });
     const requestData = { action };
     yield put(requestGrantRemoval.request());
     const { data } = yield call(apiJsonPatch, url, requestData, JSON_OPTS);
     yield put(requestGrantRemoval.success(data));
-    yield put(fetchStructure.trigger({ id: data_structure_id, version }));
+
+    yield put(
+      previousStructureQuery
+        ? fetchStructures.trigger(previousStructureQuery)
+        : fetchStructure.trigger({ id: data_structure_id, version })
+    );
   } catch (error) {
     if (error.response) {
       const { status, data } = error.response;

package/src/selectors/structureColumnsSelector.js

@@ -80,9 +80,19 @@ const getStructureColumnNames = createSelector(
   (columns) => _.concat("structure_type")(_.map("name")(columns))
 );
 
-export const structureRowsSelector = createSelector(
-  getStructures,
-  getStructureColumnNames,
-  (structures, columnNames) =>
-    _.map(_.pick([...columnNames, "id", "domain_id", "note"]))(structures)
-);
+export const structureRowsSelector = (state, props, extraColumns = []) =>
+  createSelector(
+    getStructures,
+    getStructureColumnNames,
+    (structures, columnNames) =>
+      _.map(
+        _.pick([
+          ...columnNames,
+          "id",
+          "domain_id",
+          "note",
+          "grants",
+          ...extraColumns,
+        ])
+      )(structures)
+  )(state, props);

package/src/components/StructureGrantButton.js

@@ -1,43 +0,0 @@
-import _ from "lodash/fp";
-import React from "react";
-import PropTypes from "prop-types";
-import { useQuery } from "@apollo/client";
-import { connect } from "react-redux";
-import { Loading } from "@truedat/core/components";
-import { LATEST_GRANT_REQUEST_QUERY } from "../api/queries";
-import StructureGrantRequestButton from "./StructureGrantRequestButton";
-import StructureGrantDropdown from "./StructureGrantDropdown";
-
-export const StructureGrantButton = ({ structure }) => {
-  const { grant, id } = structure;
-
-  const { loading, error, data } = useQuery(LATEST_GRANT_REQUEST_QUERY, {
-    fetchPolicy: "cache-and-network",
-    variables: { id },
-  });
-  if (error) return null;
-  if (loading) return <Loading />;
-
-  const grantRequest = _.prop("latestGrantRequest")(data);
-  const isActiveRequest = _.includes(_.prop("status.status")(grantRequest))([
-    "pending",
-    "approved",
-    "processing",
-  ]);
-
-  return grant || isActiveRequest ? (
-    <StructureGrantDropdown
-      grantRequest={isActiveRequest ? grantRequest : null}
-    />
-  ) : (
-    <StructureGrantRequestButton />
-  );
-};
-
-StructureGrantButton.propTypes = {
-  structure: PropTypes.object,
-};
-
-const mapStateToProps = ({ structure }) => ({ structure });
-
-export default connect(mapStateToProps)(StructureGrantButton);