@truedat/bg 4.46.12 → 4.47.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [4.47.1] 2022-06-22
+
+### Fixed
+
+- [TD-4720] Missing upload concepts button, remove new concept from /concepts.
+
+## [4.46.13] 2022-06-21
+
+### Fixed
+
+- [TD-4958] Missing concept actions in state
+
 ## [4.46.11] 2022-06-20
 
 ### Fixed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/bg",
-  "version": "4.46.12",
+  "version": "4.47.2",
   "description": "Truedat Web Business Glossary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "4.46.12",
+    "@truedat/test": "4.47.2",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -86,8 +86,8 @@
     ]
   },
   "dependencies": {
-    "@truedat/core": "4.46.12",
-    "@truedat/df": "4.46.12",
+    "@truedat/core": "4.47.2",
+    "@truedat/df": "4.47.2",
     "file-saver": "^2.0.5",
     "moment": "^2.24.0",
     "path-to-regexp": "^1.7.0",
@@ -107,5 +107,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "97adb120fffb6392692f94ed99b5f74385ce0f0b"
+  "gitHead": "53cb62b57d41745cfcd4c0b90154a6cfcd168534"
 }

package/src/concepts/components/ConceptRoutes.js

@@ -76,6 +76,16 @@ export const ConceptRoutes = ({ concept, conceptLoaded, templatesLoaded }) => {
           )
         }
       />
+      <Route
+        path={CONCEPTS}
+        render={() => (
+          <ConceptsLoader
+            defaultFilters={{
+              status: ["published"],
+            }}
+          />
+        )}
+      />
       <Route
         path={CONCEPTS}
         render={() =>
@@ -91,11 +101,6 @@ export const ConceptRoutes = ({ concept, conceptLoaded, templatesLoaded }) => {
                         status: ["published"],
                       }}
                     />
-                    <ConceptsLoader
-                      defaultFilters={{
-                        status: ["published"],
-                      }}
-                    />
                     <ConceptUserFiltersLoader />
                     <Concepts
                       header="concepts.header"

package/src/concepts/components/Concepts.js

@@ -5,7 +5,7 @@ import { FormattedMessage } from "react-intl";
 import ConceptCrumbs from "./ConceptCrumbs";
 import ConceptsPanel from "./ConceptsPanel";
 
-export const Concepts = ({ header, subheader, icon }) => (
+export const Concepts = ({ header, subheader, icon, ...actions }) => (
   <>
     <ConceptCrumbs />
     <Segment>
@@ -19,7 +19,7 @@ export const Concepts = ({ header, subheader, icon }) => (
         </Header.Content>
       </Header>
       <Segment attached="bottom">
-        <ConceptsPanel />
+        <ConceptsPanel {...actions} />
       </Segment>
     </Segment>
   </>

package/src/concepts/components/ConceptsActions.js

@@ -20,6 +20,7 @@ const staticLabels = [
 ];
 
 export const ConceptsActions = ({
+  create,
   createUrl,
   conceptsDownloading,
   downloadConcepts,
@@ -33,7 +34,7 @@ export const ConceptsActions = ({
   )(staticLabels);
   return hidden ? null : (
     <div>
-      {createUrl ? (
+      {create && createUrl && (
         <Button
           floated="right"
           primary
@@ -41,7 +42,7 @@ export const ConceptsActions = ({
           to={createUrl}
           content={formatMessage({ id: "concepts.actions.create" })}
         />
-      ) : null}
+      )}
       <Button
         floated="right"
         secondary
@@ -61,6 +62,7 @@ export const ConceptsActions = ({
 ConceptsActions.propTypes = {
   conceptsDownloading: PropTypes.bool,
   hidden: PropTypes.bool,
+  create: PropTypes.bool,
   createUrl: PropTypes.string,
   downloadConcepts: PropTypes.func,
   upload: PropTypes.bool,

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

@@ -26,7 +26,22 @@ exports[`<Concepts /> matches the latest snapshot 1`] = `
     <Segment
       attached="bottom"
     >
-      <Connect(ConceptsPanel) />
+      <Connect(ConceptsPanel)
+        concepts={
+          Array [
+            Object {
+              "description": "dd",
+              "id": 1,
+              "name": "s1",
+              "status": "st",
+              "version": "vs",
+            },
+          ]
+        }
+        create={true}
+        loading={false}
+        update={true}
+      />
     </Segment>
   </Segment>
 </Fragment>

package/src/concepts/reducers/__tests__/conceptActiveFilters.spec.js

@@ -1,11 +1,12 @@
 import { initialState } from "../conceptActiveFilters";
+import { fetchDomain } from "../../../taxonomy/routines";
 import {
   addConceptFilter,
   applyConceptUserFilter,
   closeConceptFilter,
   removeConceptFilter,
   resetConceptFilters,
-  toggleConceptFilterValue
+  toggleConceptFilterValue,
 } from "../../routines";
 import { conceptActiveFilters } from "..";
 
@@ -19,22 +20,17 @@ describe("reducers: conceptActiveFilters", () => {
   it("should handle the addConceptFilter.TRIGGER action", () => {
     const filter = "baz";
     const payload = { filter };
-    expect(
-      conceptActiveFilters(fooState, {
-        type: addConceptFilter.TRIGGER,
-        payload
-      })
-    ).toEqual({ ...fooState, baz: [] });
+    expect(conceptActiveFilters(fooState, addConceptFilter(payload))).toEqual({
+      ...fooState,
+      baz: [],
+    });
   });
 
   it("should handle the applyConceptUserFilter.TRIGGER action", () => {
     const filters = { country: ["Sp"] };
     const payload = { userFilter: { filters } };
     expect(
-      conceptActiveFilters(fooState, {
-        type: applyConceptUserFilter.TRIGGER,
-        payload
-      })
+      conceptActiveFilters(fooState, applyConceptUserFilter(payload))
     ).toEqual({ ...filters });
   });
 
@@ -43,12 +39,9 @@ describe("reducers: conceptActiveFilters", () => {
     const bar = [];
     const state = { foo, bar };
     const payload = { filter: "bar" };
-    expect(
-      conceptActiveFilters(state, {
-        type: closeConceptFilter.TRIGGER,
-        payload
-      })
-    ).toEqual({ foo });
+    expect(conceptActiveFilters(state, closeConceptFilter(payload))).toEqual({
+      foo,
+    });
   });
 
   it("should handle the removeConceptFilter.TRIGGER action", () => {
@@ -56,20 +49,15 @@ describe("reducers: conceptActiveFilters", () => {
     const bar = [];
     const state = { foo, bar };
     const payload = { filter: "foo" };
-    expect(
-      conceptActiveFilters(state, {
-        type: removeConceptFilter.TRIGGER,
-        payload
-      })
-    ).toEqual({ bar });
+    expect(conceptActiveFilters(state, removeConceptFilter(payload))).toEqual({
+      bar,
+    });
   });
 
   it("should handle the resetConceptFilters.TRIGGER action", () => {
-    expect(
-      conceptActiveFilters(fooState, {
-        type: resetConceptFilters.TRIGGER
-      })
-    ).toEqual(initialState);
+    expect(conceptActiveFilters(fooState, resetConceptFilters())).toEqual(
+      initialState
+    );
   });
 
   it("should handle the toggleConceptFilterValue.TRIGGER action", () => {
@@ -78,13 +66,17 @@ describe("reducers: conceptActiveFilters", () => {
     const state = { foo, bar };
     const payload = { filter: "foo", value: "foo2" };
     expect(
-      conceptActiveFilters(state, {
-        type: toggleConceptFilterValue.TRIGGER,
-        payload
-      })
+      conceptActiveFilters(state, toggleConceptFilterValue(payload))
     ).toEqual({ foo: ["foo1", "foo3"], bar });
   });
 
+  it("should omit the taxonomy filter on fetchDomain.TRIGGER", () => {
+    const state = { taxonomy: ["foo"], foo: ["bar"] };
+    expect(conceptActiveFilters(state, fetchDomain())).toEqual({
+      foo: ["bar"],
+    });
+  });
+
   it("should ignore unknown actions", () => {
     expect(conceptActiveFilters(fooState, { type: "FOO" })).toBe(fooState);
   });

package/src/concepts/reducers/conceptActiveFilters.js

@@ -1,4 +1,5 @@
 import _ from "lodash/fp";
+import { fetchDomain } from "../../taxonomy/routines";
 import {
   addConceptFilter,
   applyConceptUserFilter,
@@ -48,6 +49,9 @@ export const conceptActiveFilters = (
         : _.union([value])(values);
       return { ...state, [filter]: nextValues };
     }
+    case fetchDomain.TRIGGER: {
+      return _.omit("taxonomy")(state);
+    }
     default:
       return state;
   }