@truedat/qx 6.13.1 → 6.13.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/qx",
-  "version": "6.13.1",
+  "version": "6.13.3",
   "description": "Truedat Web Quality Experience package",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -84,7 +84,7 @@
     ]
   },
   "dependencies": {
-    "@truedat/core": "6.13.1",
+    "@truedat/core": "6.13.3",
     "prop-types": "^15.8.1",
     "react-hook-form": "^7.45.4",
     "react-intl": "^5.20.10",
@@ -97,5 +97,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "3803d8c4a416f1e1f56d88989c6c7503a08467d8"
+  "gitHead": "2665e3bb640febd00aa49dd06e37b4d391164e74"
 }

package/src/components/dataViews/__tests__/queryableFunctions.spec.js

@@ -1,6 +1,3 @@
-import React from "react";
-import { render } from "@truedat/test/render";
-
 import {
   calculateGroupByFieldId,
   reduceQueryableFields,
@@ -127,7 +124,13 @@ describe("reduceQueryableFields", () => {
       {
         type: "select",
         properties: {
-          fields: [{ id: 3, alias: "field2" }],
+          fields: [
+            {
+              id: 3,
+              alias: "field2",
+              expression: { value: { type: "string" } },
+            },
+          ],
         },
         alias: "qrySelect",
         id: 6,
@@ -140,6 +143,7 @@ describe("reduceQueryableFields", () => {
         id: 3,
         name: "field2",
         parent_id: 6,
+        type: "string",
       },
     ];
     expect(reduceQueryableFields(formatMessage)(queryables)).toStrictEqual(
@@ -164,8 +168,16 @@ describe("reduceQueryableFields", () => {
       {
         type: "group_by",
         properties: {
-          group_fields: [{ id: 3, alias: "field2" }],
-          aggregate_fields: [{ id: 4, alias: "field4" }],
+          group_fields: [
+            {
+              id: 3,
+              alias: "field2",
+              expression: { value: { type: "number" } },
+            },
+          ],
+          aggregate_fields: [
+            { id: 4, alias: "field4", expression: { value: { type: "any" } } },
+          ],
         },
         id: 6,
       },
@@ -177,6 +189,7 @@ describe("reduceQueryableFields", () => {
         id: 3,
         name: "field2",
         parent_id: 6,
+        type: "number",
       },
       {
         alias: "dataViews.form.queryable.group_by",
@@ -184,6 +197,7 @@ describe("reduceQueryableFields", () => {
         id: 4,
         name: "field4",
         parent_id: 6,
+        type: "any",
       },
     ];
     expect(reduceQueryableFields(formatMessage)(queryables)).toStrictEqual(

package/src/components/dataViews/queryableFunctions.js

@@ -26,10 +26,11 @@ const queryableToFields =
   (formatMessage) =>
   ({ type, properties, alias, id: parent_id }) => {
     const selectFieldsMap = _.map.convert({ cap: false })((field) => ({
-      ...field,
+      id: field.id,
       alias: alias || formatMessage({ id: `dataViews.form.queryable.${type}` }),
       name: field.alias,
       parent_id,
+      type: _.prop("expression.value.type")(field),
       color: getColorById(parent_id),
     }));
 

package/src/components/qualityControls/QualityControlEditor.js

@@ -85,8 +85,6 @@ export default function QualityControlEditor({
 
   const formData = watch();
 
-  console.log("formData", formData);
-
   const {
     resource,
     name,