@truedat/bg 6.3.2 → 6.3.4

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

@@ -2,9 +2,67 @@ import React from "react";
 import { render } from "@truedat/test/render";
 import { waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
-import { ConceptSelector } from "../ConceptSelector";
+import ConceptSelector from "../ConceptSelector";
 import en from "../../../../messages/en";
 
+const concept = {
+  id: 1,
+  name: "foo",
+  domain: { id: 1, name: "bar" },
+  status: "draft",
+  business_concept_id: 1,
+  last_change_at: "2020-01-01T00:00:00.000Z",
+};
+
+const data = {
+  data: [
+    {
+      id: 1,
+      name: "foo",
+      domain: { id: 1, name: "bar" },
+      status: "draft",
+      business_concept_id: 1,
+      last_change_at: "2020-01-01T00:00:00.000Z",
+    },
+  ],
+};
+
+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 messages = {
   en: {
     ...en,
@@ -12,33 +70,24 @@ const messages = {
     "search.save_filters": "save filters",
     "search.clear_filters": "clear filters",
     "search.applied_filters": "apply filters",
+    "search.placeholder": "Search concepts...",
   },
 };
-const renderOpts = {
-  messages,
-  state: {
-    conceptActiveFilters: { filter: "some" },
-  },
-};
+const renderOpts = { messages };
 
 describe("<ConceptSelector />", () => {
   const handleConceptSelected = jest.fn();
-  const concept = {
-    id: 1,
-    name: "foo",
-    domain: { id: 1, name: "bar" },
-    status: "draft",
-    business_concept_id: 1,
-  };
+
   const props = {
-    conceptsLoading: false,
-    concepts: [concept],
-    selectedConcept: {},
-    handleConceptSelected,
     defaultFilters: {},
+    handleConceptSelected,
   };
-  it("matches the latest snapshot", () => {
-    const { container } = render(<ConceptSelector {...props} />, renderOpts);
+  it("matches the latest snapshot", async () => {
+    const { container, queryByText } = render(
+      <ConceptSelector {...props} />,
+      renderOpts
+    );
+    userEvent.click(await queryByText(/some/));
     expect(container).toMatchSnapshot();
   });
 
@@ -60,29 +109,13 @@ describe("<ConceptSelector />", () => {
       <ConceptSelector {...{ ...props, selectedConcept: null }} />,
       renderOpts
     );
-    userEvent.click(await queryByText(/foo/));
-    await waitFor(() => {
-      expect(handleConceptSelected.mock.calls.length).toBe(1);
-    });
+
+    userEvent.click(await queryByText(/foo/i));
+    await waitFor(() =>
+      expect(handleConceptSelected.mock.calls.length).toBe(1)
+    );
     expect(handleConceptSelected).toHaveBeenCalledWith(
       expect.objectContaining(concept)
     );
   });
-
-  it("renders disable when cannot create structure link", () => {
-    const conceptWithActions = {
-      id: 1,
-      name: "foo",
-      domain: { id: 1, name: "bar" },
-      status: "draft",
-      business_concept_id: 1,
-      _actions: { can_create_structure_link: false },
-    };
-
-    const { container } = render(
-      <ConceptSelector {...{ ...props, concepts: [conceptWithActions] }} />,
-      renderOpts
-    );
-    expect(container.querySelector("tbody > tr")).toHaveClass("disabled");
-  });
 });

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

@@ -0,0 +1,72 @@
+import React from "react";
+import { render } from "@truedat/test/render";
+import ConceptSelector from "../ConceptSelector";
+import en from "../../../../messages/en";
+
+const data = {
+  data: [
+    {
+      id: 1,
+      name: "foo",
+      domain: { id: 1, name: "bar" },
+      status: "draft",
+      business_concept_id: 1,
+      last_change_at: "2020-01-01T00:00:00.000Z",
+      _actions: { can_create_structure_link: false },
+    },
+  ],
+};
+
+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: {},
+          }),
+      }),
+    }),
+    useConceptVersionsSearch: () => ({
+      trigger: () => ({
+        then: (callback) =>
+          callback({
+            data,
+            headers: {},
+          }),
+      }),
+    }),
+  };
+});
+
+const messages = {
+  en: {
+    ...en,
+    "concepts.status.undefined": "undefined",
+    "search.save_filters": "save filters",
+    "search.clear_filters": "clear filters",
+    "search.applied_filters": "apply filters",
+    "search.placeholder": "Search concepts...",
+  },
+};
+const renderOpts = { messages };
+
+describe("<ConceptSelector />", () => {
+  const handleConceptSelected = jest.fn();
+
+  const props = {
+    defaultFilters: {},
+    handleConceptSelected,
+  };
+
+  it("renders disable when cannot create structure link", () => {
+    const { container } = render(<ConceptSelector {...props} />, renderOpts);
+    expect(container.querySelector("tbody > tr")).toHaveClass("disabled");
+  });
+});

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

@@ -28,8 +28,10 @@ exports[`<ConceptRelationForm /> matches the latest snapshot 1`] = `
         class="search link icon"
       />
       <div
-        aria-expanded="false"
-        class="ui button floating labeled scrolling dropdown icon"
+        aria-busy="false"
+        aria-disabled="false"
+        aria-expanded="true"
+        class="ui active visible button floating labeled scrolling dropdown icon"
         role="listbox"
         tabindex="0"
       >
@@ -46,7 +48,7 @@ exports[`<ConceptRelationForm /> matches the latest snapshot 1`] = `
           class="filter icon"
         />
         <div
-          class="menu transition"
+          class="menu transition visible"
         >
           <div
             class="item"
@@ -68,23 +70,57 @@ exports[`<ConceptRelationForm /> matches the latest snapshot 1`] = `
         applied filters
       </div>
       <div
-        aria-expanded="false"
-        class="ui floating item scrolling dropdown"
+        aria-expanded="true"
+        class="ui active visible floating item scrolling dropdown"
         role="listbox"
         tabindex="0"
       >
         <div
           class="ui label"
         >
-          filter
+          some
           <i
             aria-hidden="true"
             class="delete icon"
           />
         </div>
         <div
-          class="menu transition dimmable"
-        />
+          class="menu transition dimmable visible"
+        >
+          <div
+            aria-checked="false"
+            class="item"
+            role="option"
+          >
+            <i
+              aria-hidden="true"
+              class="square outline icon"
+            />
+            some_xwy
+          </div>
+          <div
+            aria-checked="false"
+            class="item"
+            role="option"
+          >
+            <i
+              aria-hidden="true"
+              class="square outline icon"
+            />
+            some_xxx
+          </div>
+          <div
+            aria-checked="false"
+            class="item"
+            role="option"
+          >
+            <i
+              aria-hidden="true"
+              class="square outline icon"
+            />
+            some_yyy
+          </div>
+        </div>
       </div>
       <a
         class="resetFilters"

package/src/concepts/relations/components/__tests__/__snapshots__/ConceptSelector.spec.js.snap

@@ -21,8 +21,10 @@ exports[`<ConceptSelector /> matches the latest snapshot 1`] = `
         class="search link icon"
       />
       <div
-        aria-expanded="false"
-        class="ui button floating labeled scrolling dropdown icon"
+        aria-busy="false"
+        aria-disabled="false"
+        aria-expanded="true"
+        class="ui active visible button floating labeled scrolling dropdown icon"
         role="listbox"
         tabindex="0"
       >
@@ -39,7 +41,7 @@ exports[`<ConceptSelector /> matches the latest snapshot 1`] = `
           class="filter icon"
         />
         <div
-          class="menu transition"
+          class="menu transition visible"
         >
           <div
             class="item"
@@ -61,23 +63,57 @@ exports[`<ConceptSelector /> matches the latest snapshot 1`] = `
         apply filters
       </div>
       <div
-        aria-expanded="false"
-        class="ui floating item scrolling dropdown"
+        aria-expanded="true"
+        class="ui active visible floating item scrolling dropdown"
         role="listbox"
         tabindex="0"
       >
         <div
           class="ui label"
         >
-          filter
+          some
           <i
             aria-hidden="true"
             class="delete icon"
           />
         </div>
         <div
-          class="menu transition dimmable"
-        />
+          class="menu transition dimmable visible"
+        >
+          <div
+            aria-checked="false"
+            class="item"
+            role="option"
+          >
+            <i
+              aria-hidden="true"
+              class="square outline icon"
+            />
+            some_xwy
+          </div>
+          <div
+            aria-checked="false"
+            class="item"
+            role="option"
+          >
+            <i
+              aria-hidden="true"
+              class="square outline icon"
+            />
+            some_xxx
+          </div>
+          <div
+            aria-checked="false"
+            class="item"
+            role="option"
+          >
+            <i
+              aria-hidden="true"
+              class="square outline icon"
+            />
+            some_yyy
+          </div>
+        </div>
       </div>
       <a
         class="resetFilters"
@@ -142,25 +178,6 @@ exports[`<ConceptSelector /> matches the latest snapshot 1`] = `
             </div>
           </td>
         </tr>
-        <tr
-          class="active"
-        >
-          <td
-            class=""
-          />
-          <td
-            class=""
-          />
-          <td
-            class=""
-          >
-            <div
-              class="ui label"
-            >
-              undefined
-            </div>
-          </td>
-        </tr>
       </tbody>
     </table>
   </div>

package/src/concepts/routines.js

@@ -1,41 +1,14 @@
 import { createRoutine } from "redux-saga-routines";
-
-export const applyConceptUserFilter = createRoutine(
-  "APPLY_CONCEPT_USER_FILTER"
-);
 export const clearConcept = createRoutine("CLEAR_CONCEPT");
 export const clearConceptArchive = createRoutine("CLEAR_CONCEPT_ARCHIVE");
-export const clearConceptFilters = createRoutine("CLEAR_CONCEPT_FILTERS");
-export const clearConceptUserFilters = createRoutine(
-  "CLEAR_CONCEPT_USER_FILTERS"
-);
-export const clearConcepts = createRoutine("CLEAR_CONCEPTS");
 export const conceptAction = createRoutine("CONCEPT_ACTION");
-export const deleteConceptUserFilter = createRoutine(
-  "DELETE_CONCEPT_USER_FILTER"
-);
 export const downloadConcepts = createRoutine("DOWNLOAD_CONCEPTS");
 export const fetchConcept = createRoutine("FETCH_CONCEPT");
 export const fetchConceptArchive = createRoutine("FETCH_CONCEPT_ARCHIVE");
-export const fetchConceptFilters = createRoutine("FETCH_CONCEPT_FILTERS");
-export const fetchConceptUserFilters = createRoutine(
-  "FETCH_CONCEPT_USER_FILTERS"
-);
-export const fetchConcepts = createRoutine("FETCH_CONCEPTS");
-export const searchConcepts = createRoutine("SEARCH_CONCEPTS");
-export const selectConceptPage = createRoutine("SELECT_CONCEPT_PAGE");
 export const uploadConcepts = createRoutine("UPLOAD_CONCEPTS");
-export const sortConcepts = createRoutine("SORT_CONCEPTS");
-export const addConceptFilter = createRoutine("ADD_CONCEPT_FILTER");
-export const closeConceptFilter = createRoutine("CLOSE_CONCEPT_FILTER");
-export const openConceptFilter = createRoutine("OPEN_CONCEPT_FILTER");
-export const removeConceptFilter = createRoutine("REMOVE_CONCEPT_FILTER");
-export const resetConceptFilters = createRoutine("RESET_CONCEPT_FILTERS");
-export const saveConceptFilters = createRoutine("SAVE_CONCEPT_FILTERS");
-export const toggleConceptFilterValue = createRoutine(
-  "TOGGLE_CONCEPT_FILTER_VALUE"
-);
+
 export const bulkUpdate = createRoutine("BULK_UPDATE");
+export const bulkUpdateQuery = createRoutine("BULK_UPDATE_QUERY");
 export const saveSharedTo = createRoutine("SAVE_SHARED_TO");
 export const setConfidentialConcept = createRoutine("SET_CONFIDENTIAL_CONCEPT");
 

package/src/concepts/sagas/__tests__/bulkUpdate.spec.js

@@ -3,7 +3,6 @@ import { apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
 import { bulkUpdateRequestsSaga, bulkUpdateSaga } from "../bulkUpdate";
 import { bulkUpdate } from "../../routines";
 import { API_BUSINESS_CONCEPT_BULK_UPDATE } from "../../api";
-import { getPreviousConceptQuery } from "../../selectors";
 
 describe("sagas: bulkUpdateRequestsSaga", () => {
   it("should invoke bulkUpdateSaga on bulkUpdate.TRIGGER", () => {
@@ -18,18 +17,19 @@ describe("sagas: bulkUpdateRequestsSaga", () => {
 
   it("should throw exception if an unhandled action is received", () => {
     expect(() => {
-      testSaga(bulkUpdateRequestsSaga)
-        .next()
-        .takeLatest("FOO", bulkUpdateSaga);
+      testSaga(bulkUpdateRequestsSaga).next().takeLatest("FOO", bulkUpdateSaga);
     }).toThrow();
   });
 });
 
 describe("sagas: bulkUpdateSaga", () => {
   const update_attributes = { foo: "foo", bar: "bar" };
-  const payload = { update_attributes };
-
   const conceptQuery = { filters: {} };
+  const payload = {
+    updateAttributes: update_attributes,
+    searchParams: conceptQuery,
+  };
+
   const data = { message: [155, 21, 17, 16, 4, 3, 2] };
 
   const body = { update_attributes, search_params: conceptQuery };
@@ -39,8 +39,6 @@ describe("sagas: bulkUpdateSaga", () => {
     expect(() => {
       testSaga(bulkUpdateSaga, { payload })
         .next()
-        .select(getPreviousConceptQuery)
-        .next(conceptQuery)
         .put(bulkUpdate.request())
         .next()
         .call(apiJsonPost, API_BUSINESS_CONCEPT_BULK_UPDATE, body, JSON_OPTS)
@@ -60,8 +58,6 @@ describe("sagas: bulkUpdateSaga", () => {
     expect(() => {
       testSaga(bulkUpdateSaga, { payload })
         .next()
-        .select(getPreviousConceptQuery)
-        .next(conceptQuery)
         .put(bulkUpdate.request())
         .next()
         .call(apiJsonPost, API_BUSINESS_CONCEPT_BULK_UPDATE, body, JSON_OPTS)

package/src/concepts/sagas/__tests__/downloadConcepts.spec.js

@@ -7,7 +7,6 @@ import {
 } from "../downloadConcepts";
 import { downloadConcepts } from "../../routines";
 import { API_BUSINESS_CONCEPT_VERSIONS_XLSX } from "../../api";
-import { getPreviousConceptQuery } from "../../selectors";
 
 describe("sagas: downloadConceptsRequestSaga", () => {
   it("should invoke downloadConceptsSaga on downloadConcepts.TRIGGER", () => {
@@ -31,7 +30,8 @@ describe("sagas: downloadConceptsRequestSaga", () => {
 
 describe("sagas: downloadConceptsSaga", () => {
   const lang = "es";
-  const payload = { lang: lang };
+  const searchParams = { must: {} };
+  const payload = { lang, searchParams };
 
   const conceptQuery = { filters: {} };
   const data = new Blob(["SOME XLS DATA BINARY"]);
@@ -40,18 +40,16 @@ describe("sagas: downloadConceptsSaga", () => {
   };
 
   const body = {
-    lang: lang,
     concept_url_schema:
       "http://localhost/concepts/:business_concept_id/versions/:id",
-    ...conceptQuery,
+    lang: lang,
+    ...searchParams,
   };
 
   it("should put a success action when a response is returned", () => {
     expect(() => {
       testSaga(downloadConceptsSaga, { payload })
         .next()
-        .select(getPreviousConceptQuery)
-        .next(conceptQuery)
         .put(downloadConcepts.request(body))
         .next()
         .call(apiJsonPost, API_BUSINESS_CONCEPT_VERSIONS_XLSX, body, {
@@ -76,8 +74,6 @@ describe("sagas: downloadConceptsSaga", () => {
     expect(() => {
       testSaga(downloadConceptsSaga, { payload })
         .next()
-        .select(getPreviousConceptQuery)
-        .next(conceptQuery)
         .put(downloadConcepts.request(body))
         .next()
         .call(apiJsonPost, API_BUSINESS_CONCEPT_VERSIONS_XLSX, body, {

package/src/concepts/sagas/bulkUpdate.js

@@ -1,17 +1,18 @@
-import { call, put, select, takeLatest } from "redux-saga/effects";
+import { call, put, takeLatest } from "redux-saga/effects";
 import { CONCEPTS } from "@truedat/core/routes";
 import { apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
-import { getPreviousConceptQuery } from "../selectors";
 import { bulkUpdate } from "../routines";
 import { API_BUSINESS_CONCEPT_BULK_UPDATE } from "../api";
 
 export function* bulkUpdateSaga({ payload }) {
   try {
-    const { update_attributes } = payload;
-    const search_params = yield select(getPreviousConceptQuery);
+    const { updateAttributes, searchParams } = payload;
     const meta = { redirectUrl: CONCEPTS };
     yield put(bulkUpdate.request());
-    const body = { update_attributes, search_params };
+    const body = {
+      update_attributes: updateAttributes,
+      search_params: searchParams,
+    };
     const { data } = yield call(
       apiJsonPost,
       API_BUSINESS_CONCEPT_BULK_UPDATE,

package/src/concepts/sagas/downloadConcepts.js

@@ -1,10 +1,9 @@
 import _ from "lodash/fp";
 import FileSaver from "file-saver";
-import { call, put, select, takeLatest } from "redux-saga/effects";
+import { call, put, takeLatest } from "redux-saga/effects";
 import { apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
 import { CONCEPT_VERSION } from "@truedat/core/routes";
 import { downloadConcepts } from "../routines";
-import { getPreviousConceptQuery } from "../selectors";
 import { API_BUSINESS_CONCEPT_VERSIONS_XLSX } from "../api";
 
 export function saveFile({ data, headers }) {
@@ -19,12 +18,12 @@ export function saveFile({ data, headers }) {
 export function* downloadConceptsSaga({ payload }) {
   try {
     const lang = _.propOr("es", "lang")(payload);
-    const query = yield select(getPreviousConceptQuery);
+    const searchParams = _.prop("searchParams")(payload);
     const conceptUrlSchema = window.location.origin + CONCEPT_VERSION;
     const body = {
       concept_url_schema: conceptUrlSchema,
       lang,
-      ...query,
+      ...searchParams,
     };
     const url = API_BUSINESS_CONCEPT_VERSIONS_XLSX;
     yield put(downloadConcepts.request(body));

package/src/concepts/sagas/index.js

@@ -2,46 +2,31 @@ import relationsSagas from "../relations/sagas";
 import { conceptActionRequestSaga } from "./conceptAction";
 import { downloadConceptsRequestSaga } from "./downloadConcepts";
 import { fetchConceptArchiveRequestSaga } from "./fetchConceptArchive";
-import { fetchConceptFiltersRequestSaga } from "./fetchConceptFilters";
 import { fetchConceptRequestSaga } from "./fetchConcept";
-import { fetchConceptsRequestSaga } from "./fetchConcepts";
 import { uploadConceptsRequestsSaga } from "./uploadConcepts";
 import { bulkUpdateRequestsSaga } from "./bulkUpdate";
-import { saveConceptFiltersRequestSaga } from "./saveConceptFilters";
 import { saveSharedToRequestSaga } from "./saveSharedTo";
 import { setConfidentialConceptRequestSaga } from "./setConfidentialConcept";
-import { fetchConceptUserFiltersRequestSaga } from "./fecthConceptUserFilters";
-import { deleteConceptUserFilterRequestSaga } from "./deleteConceptUserFilter";
 
 export {
   conceptActionRequestSaga,
-  deleteConceptUserFilterRequestSaga,
   downloadConceptsRequestSaga,
   fetchConceptArchiveRequestSaga,
-  fetchConceptFiltersRequestSaga,
-  fetchConceptUserFiltersRequestSaga,
   fetchConceptRequestSaga,
-  fetchConceptsRequestSaga,
   uploadConceptsRequestsSaga,
   bulkUpdateRequestsSaga,
-  saveConceptFiltersRequestSaga,
   saveSharedToRequestSaga,
-  setConfidentialConceptRequestSaga
+  setConfidentialConceptRequestSaga,
 };
 
 export default [
   conceptActionRequestSaga(),
-  deleteConceptUserFilterRequestSaga(),
   downloadConceptsRequestSaga(),
   fetchConceptArchiveRequestSaga(),
-  fetchConceptFiltersRequestSaga(),
-  fetchConceptUserFiltersRequestSaga(),
   fetchConceptRequestSaga(),
-  fetchConceptsRequestSaga(),
   uploadConceptsRequestsSaga(),
   bulkUpdateRequestsSaga(),
-  saveConceptFiltersRequestSaga(),
   saveSharedToRequestSaga(),
   setConfidentialConceptRequestSaga(),
-  ...relationsSagas
+  ...relationsSagas,
 ];