@truedat/dq 5.0.2 → 5.0.4

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [5.0.4] 2023-01-27
+
+### Changed
+
+- [TD-5522] Merge default and user filters for implementation execution
+
+## [5.0.3] 2023-01-27
+
+- [TD-5478] Render actions and views to convert basic implementation to default
+  or raw implementation
+
 ## [4.59.10] 2023-01-16
 
 ### Changed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dq",
-  "version": "5.0.2",
+  "version": "5.0.4",
   "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": "5.0.2",
+    "@truedat/test": "5.0.4",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -92,8 +92,8 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@truedat/core": "5.0.2",
-    "@truedat/df": "5.0.2",
+    "@truedat/core": "5.0.4",
+    "@truedat/df": "5.0.4",
     "decode-uri-component": "^0.2.2",
     "graphql": "^15.5.3",
     "moment": "^2.29.4",
@@ -118,5 +118,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "627767d6f31541ef09a077d7e535fb488a05700c"
+  "gitHead": "91d484a16499494eedec012362b3a7f45cb1cbc9"
 }

package/src/components/ImplementationActions.js

@@ -24,6 +24,22 @@ export const implementationActions = ({
   formatMessage,
 }) =>
   _.filter(({ key }) => _.flow(Object.keys, _.includes(key))(actions))([
+    {
+      key: "convert_default",
+      icon: "edit",
+      text: formatMessage({ id: "ruleImplementation.actions.convert_default" }),
+      value: "convert_default",
+      as: Link,
+      to: linkTo.IMPLEMENTATION_EDIT_AS_DEFAULT({ implementation_id: id }),
+    },
+    {
+      key: "convert_raw",
+      icon: "edit outline",
+      text: formatMessage({ id: "ruleImplementation.actions.convert_raw" }),
+      value: "convert_raw",
+      as: Link,
+      to: linkTo.IMPLEMENTATION_EDIT_AS_RAW({ implementation_id: id }),
+    },
     {
       key: "clone",
       icon: "copy outline",

package/src/components/ImplementationSearchResults.js

@@ -127,8 +127,11 @@ ImplementationSearchResults.propTypes = {
   ruleImplementations: PropTypes.array,
 };
 
-const mapStateToProps = (state) => ({
-  implementationQuery: getExecutionQuery(state),
+const mapStateToProps = (state, props) => ({
+  implementationQuery: getExecutionQuery({
+    ...state,
+    ruleImplementationDefaultFilters: _.propOr({}, "defaultFilters")(props),
+  }),
   role: state.authentication?.role,
   loading: state.ruleImplementationsLoading,
   ruleImplementations: state.ruleImplementations,

package/src/components/Implementations.js

@@ -18,7 +18,7 @@ export const Implementations = ({ defaultFilters }) => (
     <Segment>
       <ImplementationsHeader />
       <Segment attached="bottom">
-        <ImplementationSearchResults />
+        <ImplementationSearchResults defaultFilters={defaultFilters} />
       </Segment>
     </Segment>
   </>

package/src/components/ImplementationsRoutes.js

@@ -11,6 +11,8 @@ import {
   IMPLEMENTATION_CONCEPT_LINKS_NEW,
   IMPLEMENTATION_CONCEPT_LINKS,
   IMPLEMENTATION_EDIT,
+  IMPLEMENTATION_EDIT_AS_DEFAULT,
+  IMPLEMENTATION_EDIT_AS_RAW,
   IMPLEMENTATION_EVENTS,
   IMPLEMENTATION_EXECUTIONS,
   IMPLEMENTATION_HISTORY,
@@ -218,6 +220,45 @@ export const ImplementationsRoutes = ({
                 </>
               )}
             />
+            <Route
+              exact
+              path={IMPLEMENTATION_EDIT_AS_DEFAULT}
+              render={() => (
+                <>
+                  {ruleImplementationLoaded ? (
+                    <ImplementationStructuresLoader
+                      structureIds={implementationStructures}
+                    />
+                  ) : null}
+                  {!structuresAliasesLoading &&
+                  ruleImplementationLoaded &&
+                  implementationStructuresLoaded ? (
+                    <NewRuleImplementation
+                      edition
+                      implementationType="default"
+                    />
+                  ) : null}
+                </>
+              )}
+            />
+            <Route
+              exact
+              path={IMPLEMENTATION_EDIT_AS_RAW}
+              render={() => (
+                <>
+                  {ruleImplementationLoaded ? (
+                    <ImplementationStructuresLoader
+                      structureIds={implementationStructures}
+                    />
+                  ) : null}
+                  {!structuresAliasesLoading &&
+                  ruleImplementationLoaded &&
+                  implementationStructuresLoaded ? (
+                    <NewRuleImplementation edition implementationType="raw" />
+                  ) : null}
+                </>
+              )}
+            />
             <Route
               exact
               path={IMPLEMENTATION_MOVE}

package/src/components/NewRuleImplementation.js

@@ -261,7 +261,7 @@ export const NewRuleImplementation = ({
   structuresFields,
   structuresSiblings,
   operators,
-  implementationType = "",
+  implementationType,
   rule,
 }) => {
   const precalculatedDataset = _.flow(
@@ -272,11 +272,17 @@ export const NewRuleImplementation = ({
     edition
       ? {
           id: clone ? null : ruleImplementationProps.id,
-          executable: ruleImplementationProps.executable,
+          executable:
+            ruleImplementationProps.implementation_type !== "basic"
+              ? ruleImplementationProps.executable
+              : true,
           implementationKey: clone
             ? ""
             : ruleImplementationProps.implementation_key,
-          implementationType: ruleImplementationProps.implementation_type,
+          implementationType:
+            ruleImplementationProps.implementation_type !== "basic"
+              ? ruleImplementationProps.implementation_type
+              : implementationType,
           dataset: precalculatedDataset,
           populations: _.flow(
             _.pathOr([], "populations"),
@@ -338,7 +344,7 @@ export const NewRuleImplementation = ({
       : {
           executable: true,
           implementationKey: "",
-          implementationType,
+          implementationType: implementationType || "",
           dataset: [{}],
           population: [],
           populations: [],
@@ -635,6 +641,7 @@ NewRuleImplementation.propTypes = {
   updateRuleImplementation: PropTypes.func,
   conceptDomainId: PropTypes.number,
   conceptDomainIds: PropTypes.array,
+  rule: PropTypes.object,
 };
 
 const mapStateToProps = (state) => ({

package/src/messages/en.js

@@ -267,6 +267,8 @@ export default {
     "Deprecate implementation",
   "ruleImplementation.actions.edit": "Edit implementation",
   "ruleImplementation.actions.move": "Move to another rule",
+  "ruleImplementation.actions.convert_default": "Edit as default implementation",
+  "ruleImplementation.actions.convert_raw": "Edit as raw implementation",
   "ruleImplementation.actions.restore": "Restore Implementation",
   "ruleImplementation.actions.restore.confirmation.content":
     "A deleted implementation will be restored. ¿Are you sure?",

package/src/messages/es.js

@@ -275,6 +275,8 @@ export default {
     "Archivar Implementación",
   "ruleImplementation.actions.edit": "Editar implementación",
   "ruleImplementation.actions.move": "Mover a otra regla",
+  "ruleImplementation.actions.convert_default": "Editar como implementación normal",
+  "ruleImplementation.actions.convert_raw": "Editar como implementación nativa",
   "ruleImplementation.actions.restore": "Restaurar Implementación",
   "ruleImplementation.actions.restore.confirmation.content":
     "Se va a restaurar una implementación que está borrada. ¿Estás seguro de continuar?",

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

@@ -2,13 +2,26 @@ import { getExecutionQuery } from "..";
 
 const ruleImplementationQuery = { query: "foo" };
 const ruleImplementationActiveFilters = { foo: "bar", bar: "baz" };
+const ruleImplementationDefaultFilters = { status: "some status" };
 
 describe("selectors: getExecutionQuery", () => {
   it("should return query", () => {
     const res = getExecutionQuery({
       ruleImplementationQuery,
-      ruleImplementationActiveFilters
+      ruleImplementationActiveFilters,
     });
     expect(res).toEqual({ query: "foo", filters: { foo: "bar", bar: "baz" } });
   });
+
+  it("should return query with default filters", () => {
+    const res = getExecutionQuery({
+      ruleImplementationQuery,
+      ruleImplementationActiveFilters,
+      ruleImplementationDefaultFilters,
+    });
+    expect(res).toEqual({
+      query: "foo",
+      filters: { foo: "bar", bar: "baz", status: "some status" },
+    });
+  });
 });

package/src/selectors/getExecutionQuery.js

@@ -4,9 +4,16 @@ import { createSelector } from "reselect";
 export const getExecutionQuery = createSelector(
   _.prop("ruleImplementationQuery"),
   _.prop("ruleImplementationActiveFilters"),
-  (implementationQuery, implementationActiveFilters) => {
+  _.prop("ruleImplementationDefaultFilters"),
+  (implementationQuery, implementationActiveFilters, defaultFilters) => {
     const query = _.trim(implementationQuery?.query);
     const filters = _.omitBy(_.isEmpty)(implementationActiveFilters);
-    return query ? { filters, query } : { filters };
+    const filtersWithDefaults = {
+      ...defaultFilters,
+      ...filters,
+    };
+    return query
+      ? { filters: filtersWithDefaults, query }
+      : { filters: filtersWithDefaults };
   }
 );