@truedat/dd 4.53.1 → 4.53.3

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+
+## [4.53.3] 2022-10-07
+
+### Added
+
+- [TD-5195] Support for global user filters
+
+## [4.53.2] 2022-10-07
+
+### Changed
+
+- [TD-5226] Use `useOperators` hook to load operators
+
 ## [4.53.1] 2022-10-05
 
 ### Changed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "4.53.1",
+  "version": "4.53.3",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "4.53.1",
+    "@truedat/test": "4.53.3",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -88,9 +88,9 @@
   },
   "dependencies": {
     "@apollo/client": "^3.6.4",
-    "@truedat/auth": "4.53.1",
-    "@truedat/core": "4.53.1",
-    "@truedat/df": "4.53.1",
+    "@truedat/auth": "4.53.3",
+    "@truedat/core": "4.53.3",
+    "@truedat/df": "4.53.3",
     "lodash": "^4.17.21",
     "path-to-regexp": "^1.7.0",
     "prop-types": "^15.8.1",
@@ -112,5 +112,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "aec23f8f32a131dfa84620ec6e14c31916118d44"
+  "gitHead": "d4f6cc40692e4d1e3f13e42774938765fe49c3b7"
 }

package/src/components/StructureGrantCart.js

@@ -3,7 +3,6 @@ import _ from "lodash/fp";
 import React, { useState, useEffect } from "react";
 import { Link, useLocation, useHistory } from "react-router-dom";
 import PropTypes from "prop-types";
-import { bindActionCreators } from "redux";
 import { connect } from "react-redux";
 import { useIntl } from "react-intl";
 import {
@@ -16,9 +15,10 @@ import {
   Grid,
   Form,
 } from "semantic-ui-react";
+import { Loading } from "@truedat/core/components";
+import { useOperators } from "@truedat/core/hooks";
 import { GRANTS_REQUESTS_CHECKOUT, STRUCTURES } from "@truedat/core/routes";
 import { FiltersGrid } from "@truedat/dq/components/ruleImplementationForm/FiltersGrid";
-import { getRuleImplementationOperators } from "@truedat/dq/selectors/getRuleImplementationOperators";
 import {
   removeGrantRequestFromCart,
   updateGrantRequestFilter,
@@ -142,22 +142,24 @@ StructureGrantCart.propTypes = {
   updateGrantRequestFilter: PropTypes.func,
 };
 
-const mapStateToProps = (state) => {
-  const { structure, grantRequestsCart, userPermissions } = state;
-  return {
-    structure,
-    grantRequestsCart,
-    authorized: _.pathOr(false, "request_grant")(userPermissions),
-    typeOperators: getRuleImplementationOperators(state),
-  };
+export const StructureGrantCartLoader = (props) => {
+  const { data, error, loading } = useOperators();
+  if (error) return null;
+  if (loading) return <Loading />;
+  return <StructureGrantCart typeOperators={data} {...props} />;
 };
-const mapDispatchToProps = (dispatch) =>
-  bindActionCreators(
-    {
-      removeGrantRequestFromCart,
-      updateGrantRequestFilter,
-    },
-    dispatch
-  );
 
-export default connect(mapStateToProps, mapDispatchToProps)(StructureGrantCart);
+export const mapStateToProps = ({
+  structure,
+  grantRequestsCart,
+  userPermissions,
+}) => ({
+  structure,
+  grantRequestsCart,
+  authorized: _.pathOr(false, "request_grant")(userPermissions),
+});
+
+export default connect(mapStateToProps, {
+  removeGrantRequestFromCart,
+  updateGrantRequestFilter,
+})(StructureGrantCartLoader);

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

@@ -33,12 +33,14 @@ describe("sagas: saveStructureFiltersSaga", () => {
     filterName: "a",
     filters: { country: ["A"] },
     scope: "data_structure",
+    isGlobal: true,
   };
   const requestData = {
     user_search_filter: {
       name: "a",
       filters: { country: ["A"] },
       scope: "data_structure",
+      is_global: true,
     },
   };
   it("should put a success action when a response is returned", () => {

package/src/sagas/saveUserSearchFilters.js

@@ -5,10 +5,15 @@ import { API_USER_SEARCH_FILTERS } from "../api";
 
 export function* saveUserSearchFiltersSaga({ payload }) {
   try {
-    const { filterName, filters, scope } = payload;
+    const { filterName, filters, scope, isGlobal } = payload;
     const url = API_USER_SEARCH_FILTERS;
     const requestData = {
-      user_search_filter: { name: filterName, filters, scope },
+      user_search_filter: {
+        name: filterName,
+        filters,
+        scope,
+        is_global: isGlobal,
+      },
     };
     yield put({ ...saveUserSearchFilters.request() });
     const { data } = yield call(apiJsonPost, url, requestData, JSON_OPTS);