@truedat/dd 6.5.5 → 6.6.1

package/src/reducers/selectedUserSearchFilter.js

@@ -4,12 +4,7 @@ import {
   clearImplementationFilters,
   resetImplementationFilters,
 } from "@truedat/dq/routines";
-import {
-  applyUserSearchFilter,
-  clearUserSearchFilters,
-  removeStructureFilter,
-  resetStructureFilters,
-} from "../routines";
+import { applyUserSearchFilter, clearUserSearchFilters } from "../routines";
 
 /** @type {string} */
 export const initialState = null;
@@ -30,10 +25,6 @@ export const selectedUserSearchFilter = (
       }
     case clearUserSearchFilters.TRIGGER:
       return initialState;
-    case removeStructureFilter.TRIGGER:
-      return initialState;
-    case resetStructureFilters.TRIGGER:
-      return initialState;
     case clearRuleFilters.TRIGGER:
       return initialState;
     case resetRuleFilters.TRIGGER:

package/src/reducers/structureQuery.js

@@ -1,14 +1,5 @@
 import _ from "lodash/fp";
-import {
-  applyUserSearchFilter,
-  clearStructureFilters,
-  removeStructureFilter,
-  searchStructures,
-  selectStructurePage,
-  sortStructures,
-  toggleStructureFilterValue,
-  clearStructuresSort,
-} from "../routines";
+import { clearStructureFilters, searchStructures } from "../routines";
 
 const defaultPage = 1;
 const defaultSize = 20;
@@ -27,35 +18,12 @@ const structureQuery = (state = initialState, { type, payload }) => {
     case clearStructureFilters.TRIGGER:
       const page = defaultPage;
       return { ...state, page, query: "" };
-    case removeStructureFilter.TRIGGER: {
-      const page = defaultPage;
-      return { ...state, page };
-    }
-    case applyUserSearchFilter.TRIGGER: {
-      const page = defaultPage;
-      return { ...state, page };
-    }
-    case toggleStructureFilterValue.TRIGGER: {
-      const page = defaultPage;
-      return { ...state, page };
-    }
     case searchStructures.TRIGGER: {
       const page = defaultPage;
       const query = _.propOr("", "query")(payload);
       const sort = query != "" ? defaultSearchSort : byNameSort;
       return { ...state, query, page, sort };
     }
-    case selectStructurePage.TRIGGER: {
-      const { activePage } = payload;
-      return { ...state, page: activePage };
-    }
-    case sortStructures.TRIGGER: {
-      const sort = payload;
-      return { ...state, sort, page: defaultPage };
-    }
-    case clearStructuresSort.TRIGGER: {
-      return { ...state, sort: byNameSort };
-    }
     default:
       return state;
   }

package/src/routines.js

@@ -6,14 +6,10 @@ export const addGrantRequestsFilter = createRoutine(
   "ADD_GRANT_REQUESTS_FILTER"
 );
 export const addGrantRequestToCart = createRoutine("ADD_GRANT_REQUEST_TO_CART");
-export const addStructureFilter = createRoutine("ADD_STRUCTURE_FILTER");
 export const addStructureSelectedFilter = createRoutine(
   "ADD_STRUCTURE_SELECTED_FILTER"
 );
 export const applyGrantDateFilter = createRoutine("APPLY_GRANT_DATE_FILTER");
-export const applyStructureDateFilter = createRoutine(
-  "APPLY_STRUCTURE_DATE_FILTER"
-);
 export const applyUserSearchFilter = createRoutine("APPLY_USER_SEARCH_FILTER");
 export const bulkUpdateStructures = createRoutine("BULK_UPDATE_STRUCTURES");
 export const cancelPoll = createRoutine("CANCEL_POLL");
@@ -45,7 +41,6 @@ export const clearStructure = createRoutine("CLEAR_STRUCTURE");
 export const clearStructureFilters = createRoutine("CLEAR_STRUCTURE_FILTERS");
 export const clearStructureNotes = createRoutine("CLEAR_STRUCTURE_NOTES");
 export const clearStructures = createRoutine("CLEAR_STRUCTURES");
-export const clearStructuresSort = createRoutine("CLEAR_STRUCTURES_SORT");
 export const clearStructureType = createRoutine("CLEAR_STRUCTURE_TYPE");
 export const clearStructureTypes = createRoutine("CLEAR_STRUCTURE_TYPES");
 export const clearSystem = createRoutine("CLEAR_SYSTEM");
@@ -58,7 +53,6 @@ export const closeGrantFilter = createRoutine("CLOSE_GRANT_FILTER");
 export const closeGrantRequestsFilter = createRoutine(
   "CLOSE_GRANT_REQUESTS_FILTERS"
 );
-export const closeStructureFilter = createRoutine("CLOSE_STRUCTURE_FILTER");
 export const createGrantApprovalRule = createRoutine(
   "CREATE_GRANT_APPROVAL_RULE"
 );
@@ -120,7 +114,6 @@ export const fetchNodes = createRoutine("FETCH_NODES");
 export const fetchProfileExecution = createRoutine("FETCH_EXECUTION_PROFILE");
 export const fetchProfileGroup = createRoutine("FETCH_PROFILE_GROUP");
 export const fetchStructure = createRoutine("FETCH_STRUCTURE");
-export const fetchStructureFilters = createRoutine("FETCH_STRUCTURE_FILTERS");
 export const fetchStructureGraph = createRoutine("FETCH_STRUCTURE_GRAPH");
 export const fetchStructureNotes = createRoutine("FETCH_STRUCTURE_NOTES");
 export const fetchStructures = createRoutine("FETCH_STRUCTURES");
@@ -146,7 +139,6 @@ export const openGrantFilter = createRoutine("OPEN_GRANT_FILTER");
 export const openGrantRequestsFilter = createRoutine(
   "OPEN_GRANT_REQUESTS_FILTER"
 );
-export const openStructureFilter = createRoutine("OPEN_STRUCTURE_FILTER");
 export const removeGrantFilter = createRoutine("REMOVE_GRANT_FILTER");
 export const removeGrantRequestFromCart = createRoutine(
   "REMOVE_GRANT_REQUEST_FROM_CART"
@@ -157,7 +149,6 @@ export const removeGrantRequestsFilter = createRoutine(
 export const removeGrantRequestsQuery = createRoutine(
   "REMOVE_GRANT_REQUESTS_QUERY"
 );
-export const removeStructureFilter = createRoutine("REMOVE_STRUCTURE_FILTER");
 export const removeStructureSelectedFilter = createRoutine(
   "REMOVE_STRUCTURE_SELECTED_FILTER"
 );
@@ -166,7 +157,6 @@ export const resetGrantFilters = createRoutine("RESET_GRANT_FILTERS");
 export const resetGrantRequestsFilters = createRoutine(
   "RESERT_GRANT_REQUESTS_FILTERS"
 );
-export const resetStructureFilters = createRoutine("RESET_STRUCTURE_FILTERS");
 export const saveNavFilter = createRoutine("SAVE_BUCKET_FILTER");
 export const saveUserSearchFilters = createRoutine("SAVE_USER_SEARCH_FILTERS");
 export const searchGrantRequests = createRoutine("SEARCH_GRANT_REQUESTS");
@@ -181,15 +171,14 @@ export const selectNode = createRoutine("SELECT_NODE");
 export const selectPath = createRoutine("SELECT_PATH");
 export const selectResources = createRoutine("SELECT_RESOURCES");
 export const selectStructure = createRoutine("SELECT_STRUCTURE");
-export const selectStructurePage = createRoutine("SELECT_STRUCTURE_PAGE");
 export const setGrantChangeRequestCart = createRoutine(
   "SET_GRANT_CHANGE_REQUEST_CART"
 );
 export const setGrantRequestsQuery = createRoutine("SET_GRANT_REQUESTS_QUERY");
 export const sortGrantRequests = createRoutine("SORT_GRANT_REQUESTS");
 export const sortGrants = createRoutine("SORT_GRANTS");
-export const sortStructures = createRoutine("SORT_STRUCTURES");
 export const tagStructure = createRoutine("TAG_STRUCTURE");
+export const structureSearchQuery = createRoutine("STRUCTURES_SEARCH_QUERY");
 export const toggleGrantDateFilter = createRoutine("TOGGLE_GRANT_DATE_FILTER");
 export const toggleGrantFilterValue = createRoutine(
   "TOGGLE_GRANT_FILTER_VALUE"
@@ -197,9 +186,6 @@ export const toggleGrantFilterValue = createRoutine(
 export const toggleGrantRequestsFilterValue = createRoutine(
   "TOGGLE_GRANT_REQUESTS_FILTER_VALUE"
 );
-export const toggleStructureDateFilter = createRoutine(
-  "TOGGLE_STRUCTURE_DATE_FILTER"
-);
 export const toggleStructureFilterValue = createRoutine(
   "TOGGLE_STRUCTURE_FILTER_VALUE"
 );

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

@@ -6,7 +6,6 @@ import {
 } from "../bulkUpdateStructures";
 import { bulkUpdateStructures } from "../../routines";
 import { API_DATA_STRUCTURES_BULK_UPDATE } from "../../api";
-import { getPreviousStructureQuery } from "../../selectors";
 
 describe("sagas: bulkUpdateStructuresRequestsSaga", () => {
   it("should invoke bulkUpdateStructuresSaga on bulkUpdateStructures.TRIGGER", () => {
@@ -32,9 +31,14 @@ describe("sagas: bulkUpdateStructuresSaga", () => {
   const update_attributes = { foo: "foo", bar: "bar" };
   const structureCount = 50;
   const autoPublish = false;
-  const payload = { update_attributes, structureCount, autoPublish };
-
   const structureQuery = { filters: {} };
+  const payload = {
+    update_attributes,
+    structureCount,
+    autoPublish,
+    searchParams: structureQuery,
+  };
+
   const data = { message: [155, 21, 17, 16, 4, 3, 2] };
 
   const body = {
@@ -49,8 +53,6 @@ describe("sagas: bulkUpdateStructuresSaga", () => {
     expect(() => {
       testSaga(bulkUpdateStructuresSaga, { payload })
         .next()
-        .select(getPreviousStructureQuery)
-        .next(structureQuery)
         .put(bulkUpdateStructures.request())
         .next()
         .call(apiJsonPost, API_DATA_STRUCTURES_BULK_UPDATE, body, JSON_OPTS)
@@ -70,8 +72,6 @@ describe("sagas: bulkUpdateStructuresSaga", () => {
     expect(() => {
       testSaga(bulkUpdateStructuresSaga, { payload })
         .next()
-        .select(getPreviousStructureQuery)
-        .next(structureQuery)
         .put(bulkUpdateStructures.request())
         .next()
         .call(apiJsonPost, API_DATA_STRUCTURES_BULK_UPDATE, body, JSON_OPTS)

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

@@ -7,7 +7,6 @@ import {
 } from "../downloadEditableStructures";
 import { downloadEditableStructures } from "../../routines";
 import { API_DATA_STRUCTURES_EDITABLE_CSV } from "../../api";
-import { getPreviousStructureQuery } from "../../selectors";
 
 describe("sagas: downloadEditableStructuresRequestSaga", () => {
   it("should invoke downloadEditableStructuresSaga on downloadEditableStructures.TRIGGER", () => {
@@ -34,8 +33,8 @@ describe("sagas: downloadEditableStructuresRequestSaga", () => {
 
 describe("sagas: downloadEditableStructuresSaga", () => {
   const lang = "es";
-  const payload = { lang };
   const query = { filters: {} };
+  const payload = { lang, searchParams: query };
   const body = {
     structure_url_schema: "http://localhost/structures/:id",
     ...query,
@@ -47,8 +46,6 @@ describe("sagas: downloadEditableStructuresSaga", () => {
     expect(() => {
       testSaga(downloadEditableStructuresSaga, { payload })
         .next()
-        .select(getPreviousStructureQuery)
-        .next(query)
         .put(downloadEditableStructures.request(body))
         .next()
         .call(apiJsonPost, API_DATA_STRUCTURES_EDITABLE_CSV, body, JSON_OPTS)
@@ -70,8 +67,6 @@ describe("sagas: downloadEditableStructuresSaga", () => {
     expect(() => {
       testSaga(downloadEditableStructuresSaga, { payload })
         .next()
-        .select(getPreviousStructureQuery)
-        .next(query)
         .put(downloadEditableStructures.request(body))
         .next()
         .call(apiJsonPost, API_DATA_STRUCTURES_EDITABLE_CSV, body, JSON_OPTS)

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

@@ -7,7 +7,6 @@ import {
 } from "../downloadStructures";
 import { downloadStructures } from "../../routines";
 import { API_DATA_STRUCTURES_CSV } from "../../api";
-import { getPreviousStructureQuery } from "../../selectors";
 
 describe("sagas: downloadStructuresRequestSaga", () => {
   it("should invoke downloadStructuresSaga on downloadStructures.TRIGGER", () => {
@@ -32,9 +31,9 @@ describe("sagas: downloadStructuresRequestSaga", () => {
 describe("sagas: downloadStructuresSaga", () => {
   const headerLabels = { name: "Name" };
   const lang = "es";
-  const payload = { headerLabels, lang: lang };
-
   const query = { filters: {} };
+  const payload = { headerLabels, lang: lang, searchParams: query };
+
   const data = "SOME CSV DATA";
 
   const body = {
@@ -48,8 +47,6 @@ describe("sagas: downloadStructuresSaga", () => {
     expect(() => {
       testSaga(downloadStructuresSaga, { payload })
         .next()
-        .select(getPreviousStructureQuery)
-        .next(query)
         .put(downloadStructures.request(body))
         .next()
         .call(apiJsonPost, API_DATA_STRUCTURES_CSV, body, JSON_OPTS)
@@ -71,8 +68,6 @@ describe("sagas: downloadStructuresSaga", () => {
     expect(() => {
       testSaga(downloadStructuresSaga, { payload })
         .next()
-        .select(getPreviousStructureQuery)
-        .next(query)
         .put(downloadStructures.request(body))
         .next()
         .call(apiJsonPost, API_DATA_STRUCTURES_CSV, body, JSON_OPTS)

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

@@ -3,7 +3,7 @@ import { testSaga } from "redux-saga-test-plan";
 import { apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
 import {
   fetchStructuresRequestSaga,
-  fetchStructuresSaga
+  fetchStructuresSaga,
 } from "../fetchStructures";
 import { fetchStructures } from "../../routines";
 import { API_DATA_STRUCTURES_SEARCH } from "../../api";
@@ -33,11 +33,11 @@ describe("sagas: fetchStructuresSaga", () => {
   const data = {
     collection: [
       { id: 1, name: "Structure 1", description: "desc1" },
-      { id: 2, name: "Structure 2", description: "desc2" }
-    ]
+      { id: 2, name: "Structure 2", description: "desc2" },
+    ],
   };
   const headers = {
-    "x-total-count": "123"
+    "x-total-count": "123",
   };
 
   it("should put a success action when a response is returned", () => {

package/src/sagas/bulkUpdateStructures.js

@@ -1,13 +1,15 @@
-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 { getPreviousStructureQuery } from "../selectors";
 import { bulkUpdateStructures } from "../routines";
 import { API_DATA_STRUCTURES_BULK_UPDATE } from "../api";
 
 export function* bulkUpdateStructuresSaga({ payload }) {
   try {
-    const { update_attributes, structureCount, autoPublish } = payload;
-    const search_params = yield select(getPreviousStructureQuery);
+    const {
+      update_attributes,
+      autoPublish,
+      searchParams: search_params,
+    } = payload;
     yield put(bulkUpdateStructures.request());
     const body = {
       bulk_update_request: {

package/src/sagas/downloadEditableStructures.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 { STRUCTURE } from "@truedat/core/routes";
 import { downloadEditableStructures } from "../routines";
-import { getPreviousStructureQuery } from "../selectors";
 import { API_DATA_STRUCTURES_EDITABLE_CSV } from "../api";
 
 export function saveFile(data) {
@@ -19,7 +18,7 @@ export function saveFile(data) {
 export function* downloadEditableStructuresSaga({ payload }) {
   const lang = _.propOr("en", "lang")(payload);
   try {
-    const query = yield select(getPreviousStructureQuery);
+    const query = _.prop("searchParams")(payload);
     const body = {
       structure_url_schema: getStructureUrlSchema(),
       lang,

package/src/sagas/downloadStructures.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 { STRUCTURE } from "@truedat/core/routes";
 import { downloadStructures } from "../routines";
-import { getPreviousStructureQuery } from "../selectors";
 import { API_DATA_STRUCTURES_CSV } from "../api";
 
 export function saveFile(data) {
@@ -20,8 +19,8 @@ export function* downloadStructuresSaga({ payload }) {
   try {
     const headerLabels = _.propOr({}, "headerLabels")(payload);
     const lang = _.propOr("en", "lang")(payload);
+    const query = _.prop("searchParams")(payload);
 
-    const query = yield select(getPreviousStructureQuery);
     const body = {
       header_labels: headerLabels,
       structure_url_schema: getStructureUrlSchema(),

package/src/sagas/index.js

@@ -33,7 +33,6 @@ import { fetchLineageEventsRequestSaga } from "./fetchLineageEvents";
 import { fetchNodesRequestSaga } from "./fetchNodes";
 import { fetchProfileExecutionRequestSaga } from "./fetchProfileExecution";
 import { fetchProfileGroupRequestSaga } from "./fetchProfileGroup";
-import { fetchStructureFiltersRequestSaga } from "./fetchStructureFilters";
 import { fetchStructureGraphRequestSaga } from "./fetchStructureGraph";
 import { fetchStructureNotesRequestSaga } from "./fetchStructureNotes";
 import { fetchStructureRequestSaga } from "./fetchStructure";
@@ -96,7 +95,6 @@ export {
   fetchNodesRequestSaga,
   fetchProfileExecutionRequestSaga,
   fetchProfileGroupRequestSaga,
-  fetchStructureFiltersRequestSaga,
   fetchStructureGraphRequestSaga,
   fetchStructureNotesRequestSaga,
   fetchStructureRequestSaga,
@@ -160,7 +158,6 @@ export default [
   fetchNodesRequestSaga(),
   fetchProfileExecutionRequestSaga(),
   fetchProfileGroupRequestSaga(),
-  fetchStructureFiltersRequestSaga(),
   fetchStructureGraphRequestSaga(),
   fetchStructureNotesRequestSaga(),
   fetchStructureRequestSaga(),

package/src/selectors/__tests__/getGrantSelectedFilters.spec.js

@@ -4,7 +4,7 @@ const foo = ["foo1", "foo2"];
 const bar = ["bar1", "bar2"];
 const baz = ["baz1", "baz2"];
 
-describe("selectors: getStructureAvailableFilters", () => {
+describe("selectors: getGrantSelectedFilters", () => {
   const grantFilters = { foo, bar, baz };
   const grantActiveFilters = { baz: [] };
   const state = { grantFilters, grantActiveFilters };

package/src/selectors/__tests__/structureColumnsSelector.spec.js

@@ -1,9 +1,10 @@
-import { structureColumnsSelector, structureRowsSelector } from "..";
+import { structureColumnsSelector } from "..";
 
 describe("selectors: structureColumnsSelector", () => {
   it("should return default structuresColumns when present", () => {
     const structuresColumns = [{ name: "test" }];
-    const res = structureColumnsSelector({ structuresColumns });
+    const res = structureColumnsSelector({ structuresColumns }, {});
+
     expect(res).toHaveLength(1);
     expect(res).toEqual(structuresColumns);
   });
@@ -11,7 +12,7 @@ describe("selectors: structureColumnsSelector", () => {
   it("should return own columns prop when present", () => {
     const structuresColumns = [{ name: "test" }];
     const columns = { foo: "bar" };
-    const res = structureColumnsSelector({ structuresColumns }, { columns });
+    const res = structureColumnsSelector({ structuresColumns }, {}, columns);
     expect(res).toBe(columns);
   });
 
@@ -22,23 +23,8 @@ describe("selectors: structureColumnsSelector", () => {
       { name: "bar" },
     ];
     const defaultFilters = { "system.name.raw": [] };
-    const props = { defaultFilters };
-    const res = structureColumnsSelector({ structuresColumns }, props);
+    const res = structureColumnsSelector({ structuresColumns }, defaultFilters);
     expect(res).toHaveLength(2);
     expect(res).toEqual([{ name: "foo" }, { name: "bar" }]);
   });
 });
-
-describe("selectors: structureRowsSelector", () => {
-  it("should return only id field and fields described on structureColumns", () => {
-    const structuresColumns = [{ name: "test" }];
-    const structures = [
-      { id: 0, test: 1 },
-      { id: 1, test: 2, not_test: 3 },
-      { id: 2, not_test: 4 },
-    ];
-    const res = structureRowsSelector({ structures, structuresColumns });
-    expect(res).toHaveLength(3);
-    expect(res).toEqual([{ test: 1, id: 0 }, { test: 2, id: 1 }, { id: 2 }]);
-  });
-});

package/src/selectors/__tests__/templateNamesSelector.spec.js

@@ -0,0 +1,19 @@
+import { templateNamesSelector } from "../templateNamesSelector";
+
+const templates = [
+  { scope: "dd", name: "foo" },
+  { scope: "dd", name: "bar" },
+  { name: "baz" },
+];
+
+describe("selectors: templateNamesSelector", () => {
+  it("should return the names of templates within the dd scope", () => {
+    const state = { templates };
+    expect(templateNamesSelector(state)).toEqual(["foo", "bar"]);
+  });
+
+  it("should return an empty list if no templates are present", () => {
+    const state = { templates: [] };
+    expect(templateNamesSelector(state)).toEqual([]);
+  });
+});

package/src/selectors/index.js

@@ -1,7 +1,6 @@
 export {
   defaultStructureColumns,
   structureColumnsSelector,
-  structureRowsSelector,
 } from "./structureColumnsSelector";
 export { getGrantRequestsSelectedFilterActiveValues } from "./getGrantRequestsSelectedFilterActiveValues";
 export { getGrantRequestsFilterTypes } from "./getGrantRequestsFilterTypes";
@@ -29,24 +28,18 @@ export {
 } from "./getStructureRelations";
 export { getParsedEvents } from "./getParsedEvents";
 export { getPreviousGrantQuery } from "./getPreviousGrantQuery";
-export { getPreviousStructureQuery } from "./getPreviousStructureQuery";
 export {
   getSortedChildrenRelations,
   getSortedParentRelations,
 } from "./getSortedRelations";
 export { getSortedFields } from "./getSortedFields";
 export { getSortedStructureChildren } from "./getSortedStructureChildren";
-export { getStructureAvailableFilters } from "./getStructureAvailableFilters";
 export { getStructureDeletedAt } from "./getStructureDeletedAt";
 export {
   getStructureFieldColumns,
   defaultStructureFieldColumns,
 } from "./getStructureFieldColumns";
-export { getStructureFilterTypes } from "./getStructureFilterTypes";
 export { getStructureParent } from "./getStructureParent";
-export { getStructureSelectedFilterActiveValues } from "./getStructureSelectedFilterActiveValues";
-export { getStructureSelectedFilters } from "./getStructureSelectedFilters";
-export { getStructureSelectedFilterValues } from "./getStructureSelectedFilterValues";
 export { getStructuresFields } from "./getStructuresFields";
 export { getStructureSortingCriteria } from "./getStructureSortingCriteria";
 export { getStructureUpdatedAt } from "./getStructureUpdatedAt";
@@ -59,7 +52,7 @@ export { getSystemTemplate } from "./getSystemTemplate";
 export { getTabVisibility } from "./getTabVisibility";
 export { groupOptionsSelector } from "./groupOptionsSelector";
 export { resourceOptionsSelector } from "./resourceOptionsSelector";
-export * from "./bulkUpdateDisabledSelector";
+export * from "./templateNamesSelector";
 export * from "./getGrantsColumns";
 export * from "./getLineageLevels";
 export * from "./getSortedStructureNotes";

package/src/selectors/structureColumnsSelector.js

@@ -4,11 +4,8 @@ import { createSelector } from "reselect";
 import { FormattedMessage } from "react-intl";
 import Moment from "react-moment";
 
-const typeTranslateDecorator = ({ type, structure_type }) => (
-  <FormattedMessage
-    id={`structure.type.${type}.text`}
-    defaultMessage={_.prop("translation")(structure_type) || type}
-  />
+const typeTranslateDecorator = ({ type }) => (
+  <FormattedMessage id={`structure.type.${type}.text`} defaultMessage={type} />
 );
 
 const dateDecorator = (date) => (
@@ -31,7 +28,7 @@ export const defaultStructureColumns = [
   },
   {
     name: "type",
-    fieldSelector: _.pick(["type", "structure_type"]),
+    fieldSelector: _.pick(["type"]),
     fieldDecorator: typeTranslateDecorator,
     width: 1,
   },
@@ -56,28 +53,14 @@ export const defaultStructureColumns = [
   },
 ];
 
-const getStructures = (state) => {
-  const structures = state.structures;
-  const structureTypes = state.structureTypes;
-  return _.map((structure) => {
-    return {
-      structure_type: _.find(_.propEq("name")(structure.type))(structureTypes),
-      ...structure,
-    };
-  })(structures);
-};
-
 // If default filters include "system.name.raw", exclude the "system" column
 const filterExcludes = { "system.name.raw": "system" };
 
 const columnsToExclude = (defaultFilters) =>
   _.flow(_.pick(_.keys(defaultFilters)), _.values)(filterExcludes);
 
-export const structureColumnsSelector = createSelector(
-  _.prop("structuresColumns"),
-  (_state, props) => _.prop("defaultFilters")(props),
-  (_state, props) => _.prop("columns")(props),
-  (columns, defaultFilters, ownColumns) => {
+export const structureColumnsSelector = (state, defaultFilters, ownColumns) =>
+  createSelector(_.prop("structuresColumns"), (columns) => {
     const excludes = columnsToExclude(defaultFilters);
     const res = ownColumns
       ? ownColumns
@@ -86,27 +69,4 @@ export const structureColumnsSelector = createSelector(
           _.reject(({ name }) => _.includes(name)(excludes))
         )(columns);
     return res;
-  }
-);
-
-const getStructureColumnNames = createSelector(
-  structureColumnsSelector,
-  (columns) => _.concat("structure_type")(_.map("name")(columns))
-);
-
-export const structureRowsSelector = (state, props, extraColumns = []) =>
-  createSelector(
-    getStructures,
-    getStructureColumnNames,
-    (structures, columnNames) =>
-      _.map(
-        _.pick([
-          ...columnNames,
-          "id",
-          "domain_id",
-          "note",
-          "grants",
-          ...extraColumns,
-        ])
-      )(structures)
-  )(state, props);
+  })(state);

package/src/selectors/templateNamesSelector.js

@@ -0,0 +1,7 @@
+import _ from "lodash/fp";
+import { createSelector } from "reselect";
+
+export const templateNamesSelector = createSelector(
+  _.prop("templates"),
+  _.flow(_.filter(_.propEq("scope", "dd")), _.map("name"))
+);

package/src/utils/structureCustomTranslations.js

@@ -0,0 +1,19 @@
+export default (formatMessage) => ({
+  "type.raw": (v) =>
+    formatMessage({
+      id: `structure.type.${v}.text`,
+      defaultMessage: v,
+    }),
+  "with_content.raw": (v) =>
+    formatMessage({
+      id: `filters.with_content.raw.${v}`,
+      defaultMessage: v,
+    }),
+  "with_profiling.raw": (v) =>
+    formatMessage({
+      id: `filters.with_profiling.raw.${v}`,
+      defaultMessage: v,
+    }),
+  linked_concepts: (v) =>
+    formatMessage({ id: `filters.linked_concepts.${v}`, defaultMessage: v }),
+});

package/src/components/StructureDateFilter.js

@@ -1,32 +0,0 @@
-import React from "react";
-import { propOr } from "lodash/fp";
-import PropTypes from "prop-types";
-import { FormattedMessage } from "react-intl";
-import { connect } from "react-redux";
-import DateFilter from "@truedat/core/components/DateFilter";
-import { applyStructureDateFilter } from "../routines";
-
-export const StructureDateFilter = ({
-  active,
-  applyStructureDateFilter,
-  ...props
-}) =>
-  active ? (
-    <DateFilter
-      label={<FormattedMessage id="structure.updated_at" />}
-      name="updated_at"
-      onChange={applyStructureDateFilter}
-      defaultValues={props}
-    />
-  ) : null;
-
-StructureDateFilter.propTypes = {
-  active: PropTypes.bool,
-  applyStructureDateFilter: PropTypes.func
-};
-
-export const mapStateToProps = propOr({}, "structureDateFilter");
-
-export default connect(mapStateToProps, { applyStructureDateFilter })(
-  StructureDateFilter
-);