@truedat/df 4.56.8 → 4.58.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [4.58.0] 2022-11-15
+
+### Added
+
+- [TD-3919] Add template subscope input
+
 ## [4.54.10] 2022-11-10
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/df",
-  "version": "4.56.8",
+  "version": "4.58.0",
   "description": "Truedat Web Data Quality Module",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "4.56.8",
+    "@truedat/test": "4.58.0",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -87,8 +87,8 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@truedat/auth": "4.56.8",
-    "@truedat/core": "4.56.8",
+    "@truedat/auth": "4.58.0",
+    "@truedat/core": "4.58.0",
     "path-to-regexp": "^1.7.0",
     "prop-types": "^15.8.1",
     "react-color": "^2.17.3",
@@ -107,5 +107,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "9bf266eb26e4af0b774560d5a88b0f22325495e0"
+  "gitHead": "3987557a127b4e999021e0d7179ad7a6375bfe01"
 }

package/src/messages/en.js

@@ -82,6 +82,8 @@ export default {
   "template.form.newGroup": "Add Group",
   "template.form.scope": "Scope",
   "template.form.scope.placeholder": "Select scope...",
+  "template.form.subscope": "Subcope",
+  "template.form.subscope.placeholder": "Type a subscope...",
   "template.form.validation.empty_required": "Empty required field",
   "template.form.validation.name_duplicated": "Name duplicated",
   "template.form.delete.group": "Group will be deleted. Are you sure?",

package/src/messages/es.js

@@ -82,6 +82,8 @@ export default {
   "template.form.newGroup": "Añadir grupo",
   "template.form.scope": "Scope",
   "template.form.scope.placeholder": "Seleccionar scope...",
+  "template.form.subscope": "Subcope",
+  "template.form.subscope.placeholder": "Escriba un subscope...",
   "template.form.validation.empty_required": "Campo obligatorio vacío",
   "template.form.validation.name_duplicated": "Nombre duplicado",
   "template.form.delete.group": "Se va a eliminar el grupo. ¿Estás seguro?",

package/src/selectors/index.js

@@ -1,2 +1,3 @@
 export { makeGetDropdownOptions } from "./getOptions";
 export { makeGetApplyTemplate, makeGetTemplate } from "./templates";
+export { getSubscopes } from "./subscopedTemplates";

package/src/selectors/subscopedTemplates.js

@@ -0,0 +1,16 @@
+import _ from "lodash/fp";
+import { createSelector } from "reselect";
+
+export const getSubscopes = (allTemplates, mainScope) => {
+  return _.flow(
+    _.filter({ scope: mainScope }),
+    _.map("subscope"),
+    _.uniq,
+    _.filter((el) => el !== null)
+  )(allTemplates);
+};
+
+export const makeGetSubscopes = (mainScope) =>
+  createSelector(_.prop("allTemplates"), (allTemplates) =>
+    getSubscopes(allTemplates, mainScope)
+  );

package/src/templates/components/__tests__/__snapshots__/Template.spec.js.snap

@@ -227,6 +227,25 @@ exports[`<Template /> matches the latest snapshot 1`] = `
             </div>
           </div>
         </div>
+        <div
+          class="disabled six wide field"
+        >
+          <label>
+            Subcope
+          </label>
+          <div
+            class="ui disabled input"
+          >
+            <input
+              disabled=""
+              name="subscope"
+              placeholder="Type a subscope..."
+              tabindex="-1"
+              type="text"
+              value=""
+            />
+          </div>
+        </div>
       </div>
       <div
         class="ui horizontal divider"

package/src/templates/components/templateForm/TemplateForm.js

@@ -119,6 +119,17 @@ export const TemplateForm = ({ loading, template, onSubmit, onDelete }) => {
           options={scopeOptions(formatMessage)}
           onChange={handleChange}
         />
+        <Form.Input
+          name="subscope"
+          width={6}
+          placeholder={formatMessage({
+            id: "template.form.subscope.placeholder",
+          })}
+          label={formatMessage({ id: "template.form.subscope" })}
+          value={editedTemplate?.subscope || ""}
+          onChange={handleChange}
+          disabled={editedTemplate?.scope !== "bg"}
+        />
       </Form.Group>
       <Divider horizontal>
         <Header as="h4">

package/src/templates/components/templateForm/__tests__/TemplateForm.spec.js

@@ -19,6 +19,8 @@ const messages = {
     "template.form.newGroup": "template.form.newGroup",
     "template.form.scope": "template.form.scope",
     "template.form.scope.placeholder": "template.form.scope.placeholder",
+    "template.form.subscope": "template.form.subscope",
+    "template.form.subscope.placeholder": "template.form.subscope.placeholder",
     "template.scope.bg": "bg",
     "template.scope.dd": "dd",
     "template.scope.dq": "dq",

package/src/templates/components/templateForm/__tests__/__snapshots__/TemplateForm.spec.js.snap

@@ -187,6 +187,23 @@ exports[`<TemplateForm /> matches the latest snapshot (loading) 1`] = `
           </div>
         </div>
       </div>
+      <div
+        class="six wide field"
+      >
+        <label>
+          template.form.subscope
+        </label>
+        <div
+          class="ui input"
+        >
+          <input
+            name="subscope"
+            placeholder="template.form.subscope.placeholder"
+            type="text"
+            value=""
+          />
+        </div>
+      </div>
     </div>
     <div
       class="ui horizontal divider"
@@ -433,6 +450,23 @@ exports[`<TemplateForm /> matches the latest snapshot 1`] = `
           </div>
         </div>
       </div>
+      <div
+        class="six wide field"
+      >
+        <label>
+          template.form.subscope
+        </label>
+        <div
+          class="ui input"
+        >
+          <input
+            name="subscope"
+            placeholder="template.form.subscope.placeholder"
+            type="text"
+            value=""
+          />
+        </div>
+      </div>
     </div>
     <div
       class="ui horizontal divider"

package/src/templates/reducers/__tests__/allTemplates.spec.js

@@ -0,0 +1,47 @@
+import { clearTemplates, fetchTemplates } from "../../routines";
+import { allTemplates } from "..";
+
+const fooState = { foo: "bar" };
+
+describe("reducers: templates", () => {
+  const initialState = [];
+
+  it("should provide the initial state", () => {
+    expect(allTemplates(undefined, {})).toEqual(initialState);
+  });
+
+  it("should handle the fetchTemplates.TRIGGER action", () => {
+    expect(allTemplates(fooState, { type: fetchTemplates.TRIGGER })).toEqual(
+      initialState
+    );
+  });
+
+  it("should ignore the clearTemplates.TRIGGER action", () => {
+    expect(allTemplates(fooState, { type: clearTemplates.TRIGGER })).toEqual(
+      fooState
+    );
+  });
+
+  it("should ignore fetchTemplates.SUCCESS action with payload.scope", () => {
+    expect(
+      allTemplates(fooState, {
+        type: fetchTemplates.SUCCESS,
+        payload: { scope: "dd", data: [] },
+      })
+    ).toEqual(fooState);
+  });
+
+  it("should handle fetchTemplates.SUCCESS action with undefined payload.scope (i.e., all scopes requested)", () => {
+    const templates = [{ id: 1, name: "Template 1" }];
+    expect(
+      allTemplates(fooState, {
+        type: fetchTemplates.SUCCESS,
+        payload: { data: templates },
+      })
+    ).toEqual(templates);
+  });
+
+  it("should ignore unknown actions", () => {
+    expect(allTemplates(fooState, { type: "FOO" })).toBe(fooState);
+  });
+});

package/src/templates/reducers/__tests__/templates.spec.js

@@ -10,7 +10,7 @@ describe("reducers: templates", () => {
     expect(templates(undefined, {})).toEqual(initialState);
   });
 
-  it("should handle the clearConcept.TRIGGER action", () => {
+  it("should handle the clearTemplates.TRIGGER action", () => {
     expect(templates(fooState, { type: clearTemplates.TRIGGER })).toEqual(
       initialState
     );
@@ -27,7 +27,7 @@ describe("reducers: templates", () => {
     expect(
       templates(fooState, {
         type: fetchTemplates.SUCCESS,
-        payload: { data }
+        payload: { data },
       })
     ).toEqual(data);
   });

package/src/templates/reducers/allTemplates.js

@@ -0,0 +1,18 @@
+import { fetchTemplates } from "../routines";
+
+const initialState = [];
+
+export const allTemplates = (state = initialState, { type, payload }) => {
+  switch (type) {
+    // GlossaryMenu is always present, so this state should always be present
+    // too. Therefore, no case clearTemplates.TRIGGER returning initialState
+    case fetchTemplates.TRIGGER:
+      return payload?.scope === undefined ? initialState : state;
+    case fetchTemplates.SUCCESS:
+      // allTemplates only returns payload.data if all scopes
+      // (payload?.scope === undefined) have been requested.
+      return payload?.scope === undefined ? payload?.data : state;
+    default:
+      return state;
+  }
+};

package/src/templates/reducers/index.js

@@ -1,3 +1,4 @@
+import { allTemplates } from "./allTemplates";
 import { selectedTemplate } from "./selectedTemplate";
 import { template } from "./template";
 import { templateDeleting } from "./templateDeleting";
@@ -8,6 +9,7 @@ import { templatesLoading } from "./templatesLoading";
 import { templateLoading } from "./templateLoading";
 
 export {
+  allTemplates,
   selectedTemplate,
   template,
   templateDeleting,
@@ -15,5 +17,5 @@ export {
   templateSaving,
   templates,
   templatesLoading,
-  templateLoading
+  templateLoading,
 };

package/src/templates/sagas/fetchTemplates.js

@@ -1,4 +1,4 @@
-import { call, put, takeLatest } from "redux-saga/effects";
+import { call, put, takeEvery } from "redux-saga/effects";
 import { apiJson, JSON_OPTS } from "@truedat/core/services/api";
 import { fetchTemplates } from "../routines";
 import { API_TEMPLATES } from "../api";
@@ -24,5 +24,7 @@ export function* fetchTemplatesSaga({ payload }) {
 }
 
 export function* fetchTemplatesRequestSaga() {
-  yield takeLatest(fetchTemplates.TRIGGER, fetchTemplatesSaga);
+  // Several TenplatesLoader are rendered concurrently, so process all
+  // fetchTemplageSaga sagas using takeEvery instead of takeLatest
+  yield takeEvery(fetchTemplates.TRIGGER, fetchTemplatesSaga);
 }