@truedat/bg 6.3.2 → 6.3.4

package/src/concepts/components/__tests__/__snapshots__/ConceptsTable.spec.js.snap

@@ -1,52 +1,36 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<ConceptsTable /> matches the latest snapshot 1`] = `
-<Fragment>
-  <Table
-    as="table"
-    selectable={true}
-    sortable={true}
+<div>
+  <table
+    class="ui selectable sortable table"
   >
-    <TableHeader
-      as="thead"
+    <thead
+      class=""
     >
-      <TableRow
-        as="tr"
-        cellAs="td"
+      <tr
+        class=""
       >
-        <TableHeaderCell
-          as="th"
-          className="disabled"
-          content={
-            <Memo(MemoizedFormattedMessage)
-              id="concepts.props.name"
-            />
-          }
-          key="0"
-          onClick={[Function]}
-          sorted="ascending"
-        />
-      </TableRow>
-    </TableHeader>
-    <TableBody
-      as="tbody"
+        <th
+          class="disabled"
+        >
+          Term
+        </th>
+      </tr>
+    </thead>
+    <tbody
+      class=""
     >
-      <ConceptRow
-        columns={
-          [
-            {
-              "name": "name",
-            },
-          ]
-        }
-        concept={
-          {
-            "id": 1,
-          }
-        }
-        key="0"
-      />
-    </TableBody>
-  </Table>
-</Fragment>
+      <tr
+        class=""
+      >
+        <td
+          class=""
+        >
+          concept
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</div>
 `;

package/src/concepts/components/__tests__/__snapshots__/ConceptsUpdateButton.spec.js.snap

@@ -1,52 +1,15 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<ConceptsUpdateButton /> matches the latest snapshot 1`] = `
-<Popup
-  content={
-    <Memo(MemoizedFormattedMessage)
-      id="concepts.actions.bulk_update.popup"
-    />
-  }
-  disabled={true}
-  eventsEnabled={true}
-  on={
-    [
-      "click",
-      "hover",
-    ]
-  }
-  pinned={false}
-  popperModifiers={[]}
-  position="top right"
-  trigger={
-    <span
-      className="button-update"
+<div>
+  <span
+    class="button-update"
+  >
+    <button
+      class="ui primary button"
     >
-      <Button
-        as={
-          {
-            "$$typeof": Symbol(react.forward_ref),
-            "displayName": "Link",
-            "propTypes": {
-              "innerRef": [Function],
-              "onClick": [Function],
-              "replace": [Function],
-              "target": [Function],
-              "to": [Function],
-            },
-            "render": [Function],
-          }
-        }
-        content={
-          <Memo(MemoizedFormattedMessage)
-            id="actions.update"
-          />
-        }
-        disabled={false}
-        primary={true}
-        to="url?concept"
-      />
-    </span>
-  }
-/>
+      Update
+    </button>
+  </span>
+</div>
 `;

package/src/concepts/hooks/useConcepts.js

@@ -0,0 +1,34 @@
+import useSWR from "swr";
+import useSWRMutations from "swr/mutation";
+import { apiJson, apiJsonPost } from "@truedat/core/services/api";
+
+import {
+  API_CONCEPT_FILTERS,
+  API_BUSINESS_CONCEPT_VERSIONS_SEARCH,
+  API_BUSINESS_CONCEPT_VERSIONS_ACTIONS,
+} from "../api";
+
+export const useConceptFilters = () => {
+  return useSWRMutations(API_CONCEPT_FILTERS, (url, { arg }) =>
+    apiJsonPost(url, arg)
+  );
+};
+
+export const useConceptVersionsSearch = () => {
+  return useSWRMutations(API_BUSINESS_CONCEPT_VERSIONS_SEARCH, (url, { arg }) =>
+    apiJsonPost(url, arg)
+  );
+};
+
+export const useConceptVersionsActions = () => {
+  const { data, error, mutate } = useSWR(
+    API_BUSINESS_CONCEPT_VERSIONS_ACTIONS,
+    apiJson
+  );
+  return {
+    actions: data?.data?._actions,
+    error,
+    loading: !error && !data,
+    mutate,
+  };
+};

package/src/concepts/reducers/bulkUpdateQueryInfo.js

@@ -0,0 +1,12 @@
+import { bulkUpdateQuery } from "../routines";
+
+const bulkUpdateQueryInfo = (state = {}, { type, payload }) => {
+  switch (type) {
+    case bulkUpdateQuery.TRIGGER:
+      return payload;
+    default:
+      return state;
+  }
+};
+
+export { bulkUpdateQueryInfo };

package/src/concepts/reducers/index.js

@@ -1,62 +1,38 @@
 import { concept } from "./concept";
 import { conceptActionLoading } from "./conceptActionLoading";
 import { conceptActions } from "./conceptActions";
-import { conceptActiveFilters } from "./conceptActiveFilters";
 import { conceptArchive } from "./conceptArchive";
 import { conceptArchiveLoading } from "./conceptArchiveLoading";
-import { conceptCount } from "./conceptCount";
-import { conceptFilters } from "./conceptFilters";
-import { conceptFiltersLoading } from "./conceptFiltersLoading";
+import { bulkUpdateQueryInfo } from "./bulkUpdateQueryInfo";
 import { conceptLinking } from "./conceptLinking";
 import { conceptLinks } from "./conceptLinks";
 import { conceptLoading } from "./conceptLoading";
 import { conceptPermissions } from "./conceptPermissions";
-import { conceptQuery } from "./conceptQuery";
 import { conceptRedirect } from "./conceptRedirect";
-import { conceptSelectedFilter } from "./conceptSelectedFilter";
-import { concepts } from "./concepts";
-import { conceptsActions } from "./conceptsActions";
 import { conceptsDownloading } from "./conceptsDownloading";
-import { conceptsLoading } from "./conceptsLoading";
-import { conceptsPageSize } from "./conceptsPageSize";
 import { uploadConceptsFile } from "./uploadConceptsFile";
-import { previousConceptQuery } from "./previousConceptQuery";
 import { bulkUpdateLoading } from "./bulkUpdateLoading";
 import { conceptUpdating } from "./conceptUpdating";
-import { conceptUserFilters } from "./conceptUserFilters";
-import { conceptSelectedUserFilter } from "./conceptSelectedUserFilter";
 import { sharedToDomains } from "./sharedToDomains";
 import { savingSharedTo } from "./savingSharedTo";
 import { updatingDomain } from "./updatingDomain";
 
 export {
+  bulkUpdateQueryInfo,
   bulkUpdateLoading,
   concept,
   conceptActionLoading,
   conceptActions,
-  conceptActiveFilters,
   conceptArchive,
   conceptArchiveLoading,
-  conceptCount,
-  conceptFilters,
-  conceptFiltersLoading,
   conceptLinking,
   conceptLinks,
   conceptLoading,
   conceptPermissions,
-  conceptQuery,
   conceptRedirect,
-  conceptSelectedFilter,
-  conceptSelectedUserFilter,
-  concepts,
-  conceptsActions,
   conceptsDownloading,
-  conceptsLoading,
-  conceptsPageSize,
   uploadConceptsFile,
-  previousConceptQuery,
   conceptUpdating,
-  conceptUserFilters,
   sharedToDomains,
   savingSharedTo,
   updatingDomain,

package/src/concepts/relations/components/ConceptRelationsRoutes.js

@@ -23,44 +23,48 @@ const StructureTypesLoader = React.lazy(() =>
   import("@truedat/dd/components/StructureTypesLoader")
 );
 
-export const ConceptRelationsRoutes = ({ conceptLoaded, relationsLoading }) => (
-  <Switch>
-    <Route
-      exact
-      path={CONCEPT_LINKS_STRUCTURES_NEW}
-      render={() => (conceptLoaded ? <ConceptStructureLinkForm /> : null)}
-    />
-    <Route
-      exact
-      path={CONCEPT_LINKS_STRUCTURES}
-      render={() =>
-        conceptLoaded ? (
-          <>
-            <StructureTypesLoader />
-            <ConceptStructureLinks />
-          </>
-        ) : null
-      }
-    />
-    <Route
-      exact
-      path={CONCEPT_LINKS_CONCEPTS_NEW}
-      render={() => (conceptLoaded ? <ConceptRelationForm /> : null)}
-    />
-    {!relationsLoading && (
+export const ConceptRelationsRoutes = ({ conceptLoaded, relationsLoading }) => {
+  return (
+    <Switch>
       <Route
         exact
-        path={CONCEPT_LINKS_CONCEPTS}
-        render={() => (conceptLoaded ? <ConceptRelations /> : null)}
+        path={CONCEPT_LINKS_STRUCTURES_NEW}
+        render={() => (conceptLoaded ? <ConceptStructureLinkForm /> : null)}
       />
-    )}
-    <Route
-      exact
-      path={CONCEPT_LINKS_IMPLEMENTATIONS}
-      render={() => (conceptLoaded ? <ConceptImplementationLinks /> : null)}
-    />
-  </Switch>
-);
+      <Route
+        exact
+        path={CONCEPT_LINKS_STRUCTURES}
+        render={() =>
+          conceptLoaded ? (
+            <>
+              <StructureTypesLoader />
+              <ConceptStructureLinks />
+            </>
+          ) : null
+        }
+      />
+
+      <Route
+        exact
+        path={CONCEPT_LINKS_CONCEPTS_NEW}
+        render={() => (conceptLoaded ? <ConceptRelationForm /> : null)}
+      />
+
+      {!relationsLoading ? (
+        <Route
+          exact
+          path={CONCEPT_LINKS_CONCEPTS}
+          render={() => <ConceptRelations />}
+        />
+      ) : null}
+      <Route
+        exact
+        path={CONCEPT_LINKS_IMPLEMENTATIONS}
+        render={() => (conceptLoaded ? <ConceptImplementationLinks /> : null)}
+      />
+    </Switch>
+  );
+};
 
 ConceptRelationsRoutes.propTypes = {
   conceptLoaded: PropTypes.bool,

package/src/concepts/relations/components/ConceptSelector.js

@@ -1,21 +1,21 @@
 import _ from "lodash/fp";
 import React from "react";
 import PropTypes from "prop-types";
-import { connect } from "react-redux";
 import { Table, Message, Label, Icon, Segment } from "semantic-ui-react";
 import { FormattedMessage } from "react-intl";
-import ConceptFiltersLoader from "../../components/ConceptFiltersLoader";
+import SearchWidget from "@truedat/core/search/SearchWidget";
+import {
+  SearchContextProvider,
+  useSearchContext,
+} from "@truedat/core/search/SearchContext";
 import ConceptsPagination from "../../components/ConceptsPagination";
-import ConceptsSearch from "../../components/ConceptsSearch";
-import ConceptSelectedFilters from "../../components/ConceptSelectedFilters";
 import { mapStatusColor } from "../../constants/mappings";
-import ConceptUserFiltersLoader from "../../components/ConceptUserFiltersLoader";
-import ConceptsLoader from "../../components/ConceptsLoader";
+import { translations } from "../../utils/filterOptions";
 
-const filters = {
-  current: [true],
-  status: ["pending_approval", "draft", "rejected", "published"],
-};
+import {
+  useConceptVersionsSearch,
+  useConceptFilters,
+} from "../../hooks/useConcepts";
 
 const isPositive = (links, id, selectedId) => {
   const link =
@@ -70,17 +70,17 @@ ConceptSelectorRow.propTypes = {
   positive: PropTypes.bool,
 };
 
-export const ConceptSelector = ({
+export function ConceptSelectorContent({
   businessConceptId,
-  concepts,
-  defaultFilters = filters,
   handleConceptSelected,
-  loadConcepts = true,
-  pageSize = 7,
   selectedConcept,
   showTitle = true,
   links,
-}) => {
+}) {
+  const { searchData } = useSearchContext();
+
+  const concepts = searchData?.data;
+
   const selectedConceptIsFiltered = !_.reduce(
     (acc, c) => (selectedConcept && c.id == selectedConcept.id) || acc,
     false
@@ -97,19 +97,13 @@ export const ConceptSelector = ({
 
   return (
     <>
-      {loadConcepts && (
-        <ConceptsLoader pageSize={pageSize} defaultFilters={defaultFilters} />
-      )}
-      <ConceptFiltersLoader />
-      <ConceptUserFiltersLoader />
       {showTitle && (
         <label>
           <FormattedMessage id="conceptRelations.relatedConcept" />
         </label>
       )}
       <Segment>
-        <ConceptsSearch />
-        <ConceptSelectedFilters />
+        <SearchWidget />
         {!_.isEmpty(concepts) || selectedConcept ? (
           <Table selectable size="small">
             <Table.Header>
@@ -156,20 +150,32 @@ export const ConceptSelector = ({
       </Segment>
     </>
   );
-};
+}
 
-ConceptSelector.propTypes = {
+ConceptSelectorContent.propTypes = {
   businessConceptId: PropTypes.number,
-  concepts: PropTypes.array,
-  defaultFilters: PropTypes.object,
   handleConceptSelected: PropTypes.func,
-  loadConcepts: PropTypes.bool,
-  pageSize: PropTypes.number,
   selectedConcept: PropTypes.object,
   showTitle: PropTypes.bool,
   links: PropTypes.array,
 };
 
-const mapStateToProps = ({ concepts }) => ({ concepts });
+export default function ConceptSelector(props) {
+  const defaultFilters = _.propOr({}, "defaultFilters")(props);
 
-export default connect(mapStateToProps)(ConceptSelector);
+  const searchProps = {
+    initialSortColumn: "name.raw",
+    initialSortDirection: "ascending",
+    useSearch: useConceptVersionsSearch,
+    useFilters: useConceptFilters,
+    pageSize: 7,
+    userFiltersType: "business_concept_user_filters",
+    omitFilters: ["current", "domain_ids"],
+    translations,
+  };
+  return (
+    <SearchContextProvider {...searchProps} defaultFilters={defaultFilters}>
+      <ConceptSelectorContent {...props} />
+    </SearchContextProvider>
+  );
+}

package/src/concepts/relations/components/__tests__/ConceptRelationForm.spec.js

@@ -8,28 +8,68 @@ import en from "../../../../messages/en";
 
 const linkConcept = jest.fn();
 
-const domain = {
-  external_id: "foo domain",
-  id: 381,
-  name: "foo domain",
+const data = {
+  data: [
+    {
+      business_concept_id: 2,
+      domain: {
+        external_id: "foo domain",
+        id: 381,
+        name: "foo domain",
+      },
+      id: 12355,
+      name: "foo concept",
+      status: "published",
+    },
+    {
+      business_concept_id: 3,
+      domain: {
+        external_id: "foo domain",
+        id: 381,
+        name: "foo domain",
+      },
+      id: 12290,
+      name: "bar concept",
+      status: "draft",
+    },
+  ],
 };
 
-const concepts = [
-  {
-    business_concept_id: 2,
-    domain: domain,
-    id: 12355,
-    name: "foo concept",
-    status: "published",
-  },
-  {
-    business_concept_id: 3,
-    domain: domain,
-    id: 12290,
-    name: "bar concept",
-    status: "draft",
+const filterData = {
+  data: {
+    some: {
+      values: ["some_xxx", "some_yyy", "some_xwy"],
+    },
   },
-];
+};
+
+jest.mock("@truedat/bg/concepts/hooks/useConcepts", () => {
+  const originalModule = jest.requireActual(
+    "@truedat/bg/concepts/hooks/useConcepts"
+  );
+
+  return {
+    __esModule: true,
+    ...originalModule,
+    useConceptFilters: () => ({
+      trigger: () => ({
+        then: (callback) =>
+          callback({
+            data: filterData,
+          }),
+      }),
+    }),
+    useConceptVersionsSearch: () => ({
+      trigger: () => ({
+        then: (callback) =>
+          callback({
+            data,
+            headers: {},
+          }),
+      }),
+    }),
+  };
+});
 
 const concept = {
   id: 1,
@@ -58,22 +98,22 @@ const renderOpts = {
       "search.clear_filters": "clear filters",
       "search.applied_filters": "applied filters",
       "relations.relationType": "relation type",
+      "search.placeholder": "Search concepts...",
     },
   },
   state: {
-    conceptActiveFilters: { filter: "some" },
-    concepts,
     tagOptions,
   },
   fallback: "lazy",
 };
 
 describe("<ConceptRelationForm />", () => {
-  it("matches the latest snapshot", () => {
-    const { container } = render(
+  it("matches the latest snapshot", async () => {
+    const { container, queryByText } = render(
       <ConceptRelationForm {...props} />,
       renderOpts
     );
+    userEvent.click(await queryByText(/some/));
     expect(container).toMatchSnapshot();
   });