@truedat/dd 4.33.2 → 4.33.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [4.33.3] 2021-11-25
+
+### Added
+
+- [TD-4344] `structure_types` improve API request
+
 ## [4.33.0] 2021-11-17
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "4.33.2",
+  "version": "4.33.3",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "4.33.2",
+    "@truedat/test": "4.33.3",
     "babel-jest": "^27.0.6",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -84,9 +84,9 @@
     ]
   },
   "dependencies": {
-    "@truedat/auth": "4.33.2",
-    "@truedat/core": "4.33.2",
-    "@truedat/df": "4.33.2",
+    "@truedat/auth": "4.33.3",
+    "@truedat/core": "4.33.3",
+    "@truedat/df": "4.33.3",
     "lodash": "^4.17.21",
     "path-to-regexp": "^1.7.0",
     "prop-types": "^15.7.2",
@@ -107,5 +107,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "fcb19bbbe67e7aca3242426f56e1f2e52be8bdcb"
+  "gitHead": "4423c4077cf22e7d21d2679670287ed3d86ec8d7"
 }

package/src/api.js

@@ -29,6 +29,7 @@ const API_STRUCTURE_TAG = "/api/data_structure_tags/:id";
 const API_STRUCTURE_TAGS = "/api/data_structure_tags";
 const API_STRUCTURE_TYPE = "/api/data_structure_types/:id";
 const API_STRUCTURE_TYPES = "/api/data_structure_types";
+const API_STRUCTURE_TYPES_LITE = "/api/data_structure_types/lite";
 const API_STRUCTURES_TAG = "/api/data_structures/:data_structure_id/tags/:id";
 const API_STRUCTURES_TAGS = "/api/data_structures/:data_structure_id/tags";
 const API_STRUCTURE_USER_FILTERS = "/api/data_structure_user_filters";
@@ -73,6 +74,7 @@ export {
   API_STRUCTURE_TAGS,
   API_STRUCTURE_TYPE,
   API_STRUCTURE_TYPES,
+  API_STRUCTURE_TYPES_LITE,
   API_STRUCTURE_USER_FILTERS,
   API_STRUCTURE_USER_FILTER,
   API_STRUCTURES_TAG,

package/src/components/DictionaryRoutes.js

@@ -30,7 +30,6 @@ const TemplatesLoader = React.lazy(() =>
 const Loaders = () => (
   <>
     <StructuresLoader />
-    <StructureTypesLoader />
     <StructureFiltersLoader />
     <TemplatesLoader scope="dd" />
   </>
@@ -49,6 +48,7 @@ export const DictionaryRoutes = () => {
         path={STRUCTURES}
         render={() => (
           <>
+            <StructureTypesLoader liteRequest={true} />
             <SystemsLoader />
             <StructuresRoutes />
           </>
@@ -58,17 +58,35 @@ export const DictionaryRoutes = () => {
         path={SYSTEMS}
         render={() => (
           <>
+            <StructureTypesLoader liteRequest={true} />
             <SystemsLoader />
             <SystemsRoutes />
           </>
         )}
       />
-      <Route path={STRUCTURE_TAGS} render={() => <StructureTagsRoutes />} />
-      <Route path={STRUCTURE_TYPES} render={() => <StructureTypesRoutes />} />
+      <Route
+        path={STRUCTURE_TAGS}
+        render={() => (
+          <>
+            <StructureTypesLoader liteRequest={true} />
+            <StructureTagsRoutes />
+          </>
+        )}
+      />
+      <Route
+        path={STRUCTURE_TYPES}
+        render={() => (
+          <>
+            <StructureTypesLoader />
+            <StructureTypesRoutes />
+          </>
+        )}
+      />
       <Route
         path={PROFILE_GROUP}
         render={() => (
           <>
+            <StructureTypesLoader liteRequest={true} />
             <Route render={() => <ProfileGroupLoader />} />
             <Switch>
               <Route

package/src/components/StructureTypesLoader.js

@@ -6,19 +6,21 @@ import { clearStructureTypes, fetchStructureTypes } from "../routines";
 export const StructureTypesLoader = ({
   clearStructureTypes,
   fetchStructureTypes,
+  liteRequest = false,
 }) => {
   useEffect(() => {
-    fetchStructureTypes();
+    fetchStructureTypes({ liteRequest });
     return () => {
       clearStructureTypes();
     };
-  }, [clearStructureTypes, fetchStructureTypes]);
+  }, [clearStructureTypes, fetchStructureTypes, liteRequest]);
   return null;
 };
 
 StructureTypesLoader.propTypes = {
   clearStructureTypes: PropTypes.func,
   fetchStructureTypes: PropTypes.func,
+  liteRequest: PropTypes.bool,
 };
 
 export default connect(null, { clearStructureTypes, fetchStructureTypes })(

package/src/sagas/fetchStructureTypes.js

@@ -1,12 +1,14 @@
 import { call, put, takeLatest } from "redux-saga/effects";
 import { apiJson, JSON_OPTS } from "@truedat/core/services/api";
 import { fetchStructureTypes } from "../routines";
-import { API_STRUCTURE_TYPES } from "../api";
+import { API_STRUCTURE_TYPES, API_STRUCTURE_TYPES_LITE } from "../api";
 
-export function* fetchStructureTypesSaga() {
+export function* fetchStructureTypesSaga({ payload }) {
   try {
+    const { liteRequest } = payload;
     yield put(fetchStructureTypes.request());
-    const { data } = yield call(apiJson, API_STRUCTURE_TYPES, JSON_OPTS);
+    const url = liteRequest ? API_STRUCTURE_TYPES_LITE : API_STRUCTURE_TYPES;
+    const { data } = yield call(apiJson, url, JSON_OPTS);
     yield put(fetchStructureTypes.success(data));
   } catch (error) {
     if (error.response) {

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

@@ -83,10 +83,9 @@ describe("selectors: getTabVisibility", () => {
     });
   });
 
-  it("should include notes if templates are not loading and a template matches the valid structure type", () => {
-    const structure = { type: "foo" };
-    const templates = [{ name: "foo" }];
-    const structureTypes = [{ name: "foo", template: { id: 1, name: "n" } }];
+  it("should include notes if template_id is in structure_note", () => {
+    const structure = { type: "foo", data_structure_type: { template_id: 1 } };
+    const templates = [{ name: "foo", id: 1 }];
     expect(getTabVisibility({ templatesLoading: true })).toMatchObject({
       notes: false,
     });
@@ -94,8 +93,6 @@ describe("selectors: getTabVisibility", () => {
       getTabVisibility({
         structure,
         templates,
-        structureTypes,
-        structureTypesLoading: false,
       })
     ).toMatchObject({
       notes: true,

package/src/selectors/getTabVisibility.js

@@ -24,25 +24,16 @@ const linksTabVisible = (state) => {
   return conceptCount > 0 || !_.isEmpty(structureLinks);
 };
 
-const notesTabVisible = ({
-  templatesLoading,
-  templates,
-  structure,
-  structureTypes,
-  structureTypesLoading,
-}) =>
+const notesTabVisible = ({ templatesLoading, templates, structure }) =>
   !templatesLoading &&
   notEmpty(templates) &&
   _.has("type")(structure) &&
-  !structureTypesLoading &&
-  notEmpty(structureTypes) &&
   _.flow(
     _.find({
-      name: _.prop("type")(structure),
+      id: _.propOr(null, "data_structure_type.template_id")(structure),
     }),
-    _.get("template"),
     _.negate(_.isNil)
-  )(structureTypes);
+  )(templates);
 
 const versionsTabVisible = notEmptyPath("structureVersions");
 const rulesTabVisible = notEmptyPath("ruleImplementations");