@truedat/dd 6.6.0 → 6.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "6.6.0",
+  "version": "6.6.1",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "6.6.0",
+    "@truedat/test": "6.6.1",
     "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.7.1",
-    "@truedat/auth": "6.6.0",
-    "@truedat/core": "6.6.0",
-    "@truedat/df": "6.6.0",
+    "@truedat/auth": "6.6.1",
+    "@truedat/core": "6.6.1",
+    "@truedat/df": "6.6.1",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "path-to-regexp": "^1.7.0",
@@ -115,5 +115,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "84d52d5067ff09b8d9c9b8a9bc8018c53a8e700c"
+  "gitHead": "2fa84eee80136fa3bd394c04153e6f16d2e5a1e0"
 }

package/src/components/CatalogCustomViewCards.js

@@ -1,14 +1,13 @@
 import _ from "lodash/fp";
-import React, { useEffect } from "react";
+import React from "react";
 import PropTypes from "prop-types";
-import { connect } from "react-redux";
 import { Link, useParams } from "react-router-dom";
 import { Card, Label } from "semantic-ui-react";
 import { useIntl } from "react-intl";
 import { FormattedNumber, FormattedMessage } from "react-intl";
 import { CardGroupsAccordion } from "@truedat/core/components";
 import { linkTo } from "@truedat/core/routes";
-import { fetchStructureFilters as fetchStructureFiltersRoutine } from "@truedat/dd/routines";
+import { useSearchContext } from "@truedat/core/search/SearchContext";
 import { Loading } from "@truedat/core/components";
 
 const moveMissingBucketToTheEnd = (buckets) =>
@@ -20,15 +19,13 @@ const orderBuckets = (buckets) =>
     moveMissingBucketToTheEnd
   )(buckets);
 
-export const CatalogCustomViewCards = ({
-  fetchStructureFilters,
-  structureFilters,
-  structureFiltersLoading,
-}) => {
-  useEffect(() => {
-    fetchStructureFilters();
-  }, [fetchStructureFilters]);
+export default function CatalogCustomViewCards() {
   const { propertyPath } = useParams();
+  const {
+    loadingFilters: structureFiltersLoading,
+    allFilters: structureFilters,
+  } = useSearchContext();
+
   const groups = [];
   const emptyMessageId = "catalogViewConfig.empty";
 
@@ -53,13 +50,7 @@ export const CatalogCustomViewCards = ({
       ))(orderBuckets(structureFilters[propertyPath]?.buckets))}
     </Card.Group>
   );
-};
-
-CatalogCustomViewCards.propTypes = {
-  fetchStructureFilters: PropTypes.func,
-  structureFilters: PropTypes.object,
-  structureFiltersLoading: PropTypes.bool,
-};
+}
 
 export const CatalogCustomViewCard = ({
   name,
@@ -111,17 +102,3 @@ export const CatalogCustomViewCardPopup = ({ structures_count }) => {
 CatalogCustomViewCardPopup.propTypes = {
   structures_count: PropTypes.number,
 };
-
-const mapStateToProps = ({
-  structures,
-  structureFilters,
-  structureFiltersLoading,
-}) => ({
-  structures,
-  structureFilters,
-  structureFiltersLoading,
-});
-
-export default connect(mapStateToProps, {
-  fetchStructureFilters: fetchStructureFiltersRoutine,
-})(CatalogCustomViewCards);

package/src/components/DictionaryRoutes.js

@@ -26,8 +26,6 @@ import ProfileExecutionLoader from "./ProfileExecutionLoader";
 import ProfileGroupLoader from "./ProfileGroupLoader";
 import ProfileGroup from "./ProfileGroup";
 import ReferenceDatasetRoutes from "./ReferenceDatasetRoutes";
-import StructureFiltersLoader from "./StructureFiltersLoader";
-import StructuresLoader from "./StructuresLoader";
 import StructuresRoutes from "./StructuresRoutes";
 import StructuresUploadEvents from "./StructuresUploadEvents";
 import StructureTypesLoader from "./StructureTypesLoader";
@@ -46,13 +44,7 @@ const TemplatesLoader = React.lazy(() =>
 );
 
 const Loaders = () => {
-  return (
-    <>
-      <StructuresLoader />
-      <StructureFiltersLoader />
-      <TemplatesLoader scope="dd" />
-    </>
-  );
+  return <TemplatesLoader scope="dd" />;
 };
 
 export const DictionaryRoutes = () => {

package/src/components/GrantRemovalDirectButton.js

@@ -6,7 +6,6 @@ import { ConfirmModal } from "@truedat/core/components";
 import { Button } from "semantic-ui-react";
 
 export const GrantRemovalDirectButton = ({
-  actions,
   grant,
   requestGrantRemoval,
   onConfirm,
@@ -69,7 +68,7 @@ export const GrantRemovalDirectButton = ({
         id: `grant.actions.${action}.confirmation.content`,
       })}
       onConfirm={() => {
-        removeGrant(payload)
+        removeGrant(payload);
       }}
       onOpen={(e) => e.stopPropagation()}
       onClose={(e) => e.stopPropagation()}
@@ -78,7 +77,6 @@ export const GrantRemovalDirectButton = ({
 };
 
 GrantRemovalDirectButton.propTypes = {
-  actions: PropTypes.object,
   grant: PropTypes.object,
   requestGrantRemoval: PropTypes.func,
   onConfirm: PropTypes.func,

package/src/components/GrantRequestCancel.js

@@ -49,4 +49,4 @@ GrantRequestCancel.propTypes = {
   setLatestGrantRequest: PropTypes.func,
 };
 
-export default connect(null, { createGrantRequestStatus })(GrantRequestCancel);
+export default connect(null, { createGrantRequestStatus })(GrantRequestCancel);

package/src/components/GrantRoutes.js

@@ -35,9 +35,6 @@ import GrantsLoader from "./GrantsLoader";
 import MyGrantRequests from "./MyGrantRequests";
 import StructureGrantCartCheckout from "./StructureGrantCartCheckout";
 import StructuresGrantRequestView from "./StructuresGrantRequestView";
-import StructuresLoader from "./StructuresLoader";
-import StructureFiltersLoader from "./StructureFiltersLoader";
-import UserSearchFiltersLoader from "./UserSearchFiltersLoader";
 import GrantRequestsFiltersLoader from "./GrantRequestsFiltersLoader";
 
 const TemplatesLoader = React.lazy(() =>
@@ -121,17 +118,7 @@ export const GrantRoutes = ({ grantRequestLoaded }) => {
               field: "classes._grantable",
             },
           };
-          return (
-            <>
-              <StructuresLoader
-                defaultFilters={defaultFilters}
-                withGrantRequests
-              />
-              <StructureFiltersLoader defaultFilters={defaultFilters} />
-              <UserSearchFiltersLoader scope="data_structure" />
-              <StructuresGrantRequestView />
-            </>
-          );
+          return <StructuresGrantRequestView defaultFilters={defaultFilters} />;
         }}
       />
       <Route

package/src/components/StructureGrantListButton.js

@@ -2,6 +2,7 @@ import _ from "lodash/fp";
 import React from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
+import { useSearchContext } from "@truedat/core/search/SearchContext";
 import StructureGrantRequestButton from "./StructureGrantRequestButton";
 import StructureGrantDropdown from "./StructureGrantDropdown";
 
@@ -11,8 +12,9 @@ export const StructureGrantListButton = ({
   authorized_dropdown,
   authorized_request,
   requested,
-  previousStructureQuery,
 }) => {
+  const { filterParams: previousStructureQuery } = useSearchContext();
+
   const grant = _.flow(_.prop("my_grants"), _.first)(structure);
   const grantRequest = _.prop("my_grant_request")(structure);
 
@@ -49,11 +51,10 @@ StructureGrantListButton.propTypes = {
   authorized_dropdown: PropTypes.bool,
   authorized_request: PropTypes.bool,
   requested: PropTypes.bool,
-  previousStructureQuery: PropTypes.object,
 };
 
 const mapStateToProps = (
-  { structureGrantPopup, grantRequestsCart, previousStructureQuery },
+  { structureGrantPopup, grantRequestsCart },
   { structure }
 ) => ({
   structureGrantPopup,
@@ -70,7 +71,6 @@ const mapStateToProps = (
     false,
     "request_grant"
   )(structure.user_permissions),
-  previousStructureQuery,
   structure: {
     ...structure,
     id: structure.id + "",

package/src/components/StructureSelector.js

@@ -3,31 +3,30 @@ import React, { useState, useEffect } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { Segment } from "semantic-ui-react";
-import { structureColumnsSelector, structureRowsSelector } from "../selectors";
-import StructureDateFilter from "./StructureDateFilter";
-import StructureFiltersLoader from "./StructureFiltersLoader";
-import StructureSelectedFilters from "./StructureSelectedFilters";
-import StructureTypesLoader from "./StructureTypesLoader";
-import UserSearchFiltersLoader from "./UserSearchFiltersLoader";
-import StructuresLoader from "./StructuresLoader";
-import StructuresSearch from "./StructuresSearch";
+import SearchWidget from "@truedat/core/search/SearchWidget";
+import {
+  SearchContextProvider,
+  useSearchContext,
+} from "@truedat/core/search/SearchContext";
+import translations from "../utils/structureCustomTranslations";
+import {
+  useDataStructureFilters,
+  useDataStructureSearch,
+} from "../hooks/useStructures";
 import StructuresSearchResults from "./StructuresSearchResults";
 
-export const StructureSelector = ({
-  columns,
+export function StructureSelectorContent({
   overwriteColumns,
-  defaultFilters,
-  loading,
-  structures,
-  structuresRows,
   selectedStructure: structure,
   onSelect,
-  pageSize = 7,
   links,
   placeToTop,
-  withDataFields,
-}) => {
+}) {
   const [selectedStructure, setSelectedStructure] = useState(null);
+  const { searchData, loading } = useSearchContext();
+
+  const structures = searchData?.data;
+
   useEffect(() => {
     setSelectedStructure(structure);
   }, [structure]);
@@ -37,25 +36,14 @@ export const StructureSelector = ({
     setSelectedStructure(structure);
     onSelect && onSelect(selectedStructure);
   };
-
   return (
     <Segment>
-      <StructuresLoader
-        withDataFields
-        pageSize={pageSize}
-        defaultFilters={defaultFilters}
-      />
-      <StructureTypesLoader />
-      <StructureFiltersLoader defaultFilters={defaultFilters} />
-      <StructuresSearch />
-      <StructureSelectedFilters />
-      <StructureDateFilter />
-      <UserSearchFiltersLoader scope="data_structure" />
+      <SearchWidget dateFilter />
       <StructuresSearchResults
-        columns={!_.isEmpty(overwriteColumns) ? overwriteColumns : columns}
+        columns={overwriteColumns}
         loading={loading}
         size="small"
-        structures={structuresRows}
+        structures={structures}
         onSelect={handleSelect}
         selectedStructure={selectedStructure}
         links={links}
@@ -63,28 +51,66 @@ export const StructureSelector = ({
       />
     </Segment>
   );
-};
+}
 
-StructureSelector.propTypes = {
-  columns: PropTypes.array,
+StructureSelectorContent.propTypes = {
   overwriteColumns: PropTypes.array,
-  defaultFilters: PropTypes.object,
-  loading: PropTypes.bool,
   onSelect: PropTypes.func,
-  pageSize: PropTypes.number,
   selectedStructure: PropTypes.object,
-  structures: PropTypes.array,
-  structuresRows: PropTypes.array,
   links: PropTypes.array,
   placeToTop: PropTypes.bool,
+};
+
+export const StructureSelector = (props) => {
+  const defaultFilters = _.propOr({}, "defaultFilters")(props);
+  const filtersGroup = _.propOr([], "filtersGroup")(props);
+  const pageSize = _.prop("pageSize")(props);
+  const withGrantRequests = _.prop("withGrantRequests")(props);
+  const withDataFields = _.prop("withDataFields")(props);
+
+  const enrichSearchPayload = {
+    my_grant_requests: !!withGrantRequests,
+    with_data_fields: !!withDataFields,
+  };
+
+  const searchProps = {
+    initialSortColumn: "name.raw",
+    initialSortDirection: "ascending",
+    useSearch: useDataStructureSearch,
+    useFilters: useDataStructureFilters,
+    pageSize,
+    userFiltersType: "user_search_filters",
+    userFilterScope: "data_structure",
+    translations,
+    filtersGroup,
+    defaultFilters,
+    enrichSearchPayload,
+  };
+
+  return (
+    <>
+      <SearchContextProvider {...searchProps}>
+        <StructureSelectorContent {...props} />
+      </SearchContextProvider>
+    </>
+  );
+};
+
+StructureSelector.propTypes = {
+  pageSize: PropTypes.number,
+  filtersGroup: PropTypes.array,
+  defaultFilters: PropTypes.object,
+  withGrantRequests: PropTypes.bool,
   withDataFields: PropTypes.bool,
+  selectedStructure: PropTypes.object,
+  onSelect: PropTypes.func,
+  overwriteColumns: PropTypes.array,
+  links: PropTypes.array,
+  placeToTop: PropTypes.bool,
 };
 
-export const mapStateToProps = (state, props) => ({
-  columns: structureColumnsSelector(state, props),
-  structures: state.structures,
-  structuresRows: structureRowsSelector(state, props),
-  loading: state.structuresLoading,
+const mapStateToProps = (state) => ({
+  filtersGroup: state?.structureFiltersGroup,
 });
 
 export default connect(mapStateToProps)(StructureSelector);

package/src/components/StructureStructureForm.js

@@ -22,7 +22,7 @@ export const StructureStructureForm = ({
   const { handleSubmit, control, formState } = useForm({
     mode: "all",
     defaultValues: {
-      sourceStructureId: sourceStructure.id,
+      sourceStructureId: sourceStructure?.id,
       targetStructureId: null,
       labelIds: [],
     },

package/src/components/StructuresBulkUpdate.js

@@ -28,14 +28,15 @@ const DynamicForm = React.lazy(() =>
 const isEmptyValue = (value) => !_.isNumber(value) && _.isEmpty(value);
 
 export const StructuresBulkUpdate = ({
-  structureFilters,
   structureTypes,
-  structureCount,
+  previousStructureQuery,
   bulkUpdateStructures,
   bulkUpdateStructuresLoading,
-  publishAllowed,
 }) => {
   const [content, setContent] = useState({});
+  const { searchParams, structureCount, allFilters, actions } =
+    previousStructureQuery;
+  const publishAllowed = !!actions?.autoPublish;
 
   const findTemplateName = (name) =>
     _.flow(_.find({ name }), _.prop("template.name"))(structureTypes);
@@ -49,7 +50,7 @@ export const StructuresBulkUpdate = ({
       ],
       [_.stubTrue, _.constant("")],
     ])
-  )(structureFilters);
+  )(allFilters);
 
   const domainIds = _.flow(
     _.prop("taxonomy.values"),
@@ -58,7 +59,7 @@ export const StructuresBulkUpdate = ({
       [(domains) => _.size(domains) == 1, _.identity],
       [_.stubTrue, _.constant(null)],
     ])
-  )(structureFilters);
+  )(allFilters);
 
   const { data, loading } = useTemplate({ name: templateName, domainIds });
   const template = _.prop("template")(data);
@@ -87,6 +88,7 @@ export const StructuresBulkUpdate = ({
       update_attributes: { df_content: parsedContent },
       structureCount,
       autoPublish,
+      searchParams,
     });
   };
 
@@ -178,26 +180,20 @@ export const StructuresBulkUpdate = ({
 };
 
 StructuresBulkUpdate.propTypes = {
-  structureFilters: PropTypes.object,
   structureTypes: PropTypes.array,
-  structureCount: PropTypes.number,
   bulkUpdateStructures: PropTypes.func,
   bulkUpdateStructuresLoading: PropTypes.bool,
-  publishAllowed: PropTypes.bool,
+  previousStructureQuery: PropTypes.object,
 };
 
 const mapStateToProps = ({
-  structureFilters,
   structureTypes,
-  structureCount,
   bulkUpdateStructuresLoading,
-  structuresActions,
+  previousStructureQuery,
 }) => ({
-  structureFilters,
   structureTypes,
-  structureCount,
   bulkUpdateStructuresLoading,
-  publishAllowed: !!structuresActions?.autoPublish,
+  previousStructureQuery,
 });
 
 export default connect(mapStateToProps, { bulkUpdateStructures })(

package/src/components/StructuresDownloadOption.js

@@ -4,6 +4,7 @@ import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { Dropdown } from "semantic-ui-react";
 import { useIntl } from "react-intl";
+import { useSearchContext } from "@truedat/core/search/SearchContext";
 import { downloadStructures } from "../routines";
 
 const staticLabels = [
@@ -23,53 +24,56 @@ const staticLabels = [
 ];
 
 export const StructuresDownloadOption = ({
-  structures,
   structuresDownloading,
-  structuresLoading,
   downloadStructures,
   hasFilterApplied,
 }) => {
   const { formatMessage, locale } = useIntl();
+
+  const {
+    searchData,
+    loading: structuresLoading,
+    filterParams: searchParams,
+  } = useSearchContext();
+
+  const structures = searchData?.data;
+
   const headerLabels = _.flow(
     _.map((l) => [l, formatMessage({ id: `structures.props.${l}` })]),
     _.fromPairs
   )(staticLabels);
   const isDisabled = _.isEmpty(structures) || !hasFilterApplied;
-  return (
-    !structuresLoading && (
-      <Dropdown.Item
-        icon="download"
-        content={
-          <>
-            <span>
-              {formatMessage({ id: "structures.actions.download.tooltip" })}
-            </span>
-            {isDisabled && (
-              <p className="menu-item-description">
-                {formatMessage({ id: "structures.actions.download.popup" })}
-              </p>
-            )}
-          </>
-        }
-        onClick={() => downloadStructures({ headerLabels, lang: locale })}
-        disabled={isDisabled || structuresDownloading}
-      />
-    )
-  );
+  return !structuresLoading ? (
+    <Dropdown.Item
+      icon="download"
+      content={
+        <>
+          <span>
+            {formatMessage({ id: "structures.actions.download.tooltip" })}
+          </span>
+          {isDisabled && (
+            <p className="menu-item-description">
+              {formatMessage({ id: "structures.actions.download.popup" })}
+            </p>
+          )}
+        </>
+      }
+      onClick={() =>
+        downloadStructures({ headerLabels, lang: locale, searchParams })
+      }
+      disabled={isDisabled || structuresDownloading}
+    />
+  ) : null;
 };
 
 StructuresDownloadOption.propTypes = {
   structuresDownloading: PropTypes.bool,
-  structuresLoading: PropTypes.bool,
   downloadStructures: PropTypes.func,
-  structures: PropTypes.array,
   hasFilterApplied: PropTypes.bool,
 };
 
 const mapStateToProps = (state) => ({
   structuresDownloading: state.structuresDownloading,
-  structuresLoading: state.structuresLoading,
-  structures: state.structures,
 });
 
 export default connect(mapStateToProps, { downloadStructures })(

package/src/components/StructuresEditableDownloadOption.js

@@ -4,16 +4,23 @@ import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { Dropdown } from "semantic-ui-react";
 import { useIntl } from "react-intl";
+import { useSearchContext } from "@truedat/core/search/SearchContext";
 import { downloadEditableStructures } from "../routines";
 
 export const StructuresEditableDownloadOption = ({
-  structures,
   structuresEditableDownloading,
-  structuresLoading,
   downloadEditableStructures,
   hasFilterApplied,
 }) => {
   const { formatMessage, locale } = useIntl();
+  const {
+    searchData,
+    loading: structuresLoading,
+    filterParams: searchParams,
+  } = useSearchContext();
+
+  const structures = searchData?.data;
+
   const isDisabled = _.isEmpty(structures) || !hasFilterApplied;
   return (
     !structuresLoading && (
@@ -33,7 +40,9 @@ export const StructuresEditableDownloadOption = ({
             )}
           </>
         }
-        onClick={() => downloadEditableStructures({ lang: locale })}
+        onClick={() =>
+          downloadEditableStructures({ lang: locale, searchParams })
+        }
         disabled={isDisabled || structuresEditableDownloading}
       />
     )
@@ -41,17 +50,13 @@ export const StructuresEditableDownloadOption = ({
 };
 
 StructuresEditableDownloadOption.propTypes = {
-  structures: PropTypes.object,
   structuresEditableDownloading: PropTypes.bool,
-  structuresLoading: PropTypes.bool,
   downloadEditableStructures: PropTypes.func,
   hasFilterApplied: PropTypes.bool,
 };
 
 const mapStateToProps = (state) => ({
   structuresEditableDownloading: state.structuresEditableDownloading,
-  structuresLoading: state.structuresLoading,
-  structures: state.structures,
 });
 
 export default connect(mapStateToProps, { downloadEditableStructures })(