@truedat/dq 7.2.9 → 7.2.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dq",
-  "version": "7.2.9",
+  "version": "7.2.11",
   "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": "7.2.9",
+    "@truedat/test": "7.2.11",
     "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": "7.2.9",
-    "@truedat/df": "7.2.9",
+    "@truedat/core": "7.2.11",
+    "@truedat/df": "7.2.11",
     "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": "208c632f7f18e209553299cfe267fbe43d1de285"
+  "gitHead": "74eb04f81dd49275229cf3050b56b897ff78410e"
 }

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

@@ -93,7 +93,7 @@ describe("reducers: ruleImplementationQuery", () => {
         })
       ).toMatchObject({
         query,
-        sort: [{ _score: "desc" }, { "implementation_key.sort": "asc" }],
+        sort: [{ _score: "desc" }],
       });
     });
 

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

@@ -5,7 +5,7 @@ import {
   toggleRuleFilterValue,
   searchRules,
   selectRulePage,
-  sortRules
+  sortRules,
 } from "../../routines";
 import { ruleQuery } from "..";
 
@@ -27,14 +27,14 @@ describe("reducers: ruleQuery", () => {
   it("should handle the clearRuleFilters.TRIGGER action", () => {
     expect(ruleQuery(fooState, { type: clearRuleFilters.TRIGGER })).toEqual({
       ...fooState,
-      page: 1
+      page: 1,
     });
   });
 
   it("should return default page when filter is removed", () => {
     expect(ruleQuery(fooState, { type: removeRuleFilter.TRIGGER })).toEqual({
       ...fooState,
-      page: 1
+      page: 1,
     });
   });
 
@@ -43,7 +43,7 @@ describe("reducers: ruleQuery", () => {
       ruleQuery(fooState, { type: toggleRuleFilterValue.TRIGGER })
     ).toEqual({
       ...fooState,
-      page: 1
+      page: 1,
     });
   });
 
@@ -65,13 +65,13 @@ describe("reducers: ruleQuery", () => {
       ).toMatchObject({ query });
     });
 
-    it("when query is not empty it should order by relevance and name", () => {
+    it("when query is not empty it should order by relevance", () => {
       const payload = { query };
       expect(
         ruleQuery(fooState, { type: searchRules.TRIGGER, payload })
       ).toMatchObject({
         query,
-        sort: [{ _score: "desc" }, { "name.raw": "asc" }]
+        sort: [{ _score: "desc" }],
       });
     });
 
@@ -81,7 +81,7 @@ describe("reducers: ruleQuery", () => {
         ruleQuery(fooState, { type: searchRules.TRIGGER, payload })
       ).toMatchObject({
         query: "",
-        sort: [{ "name.raw": "asc" }]
+        sort: [{ "name.raw": "asc" }],
       });
     });
   });

package/src/reducers/ruleImplementationQuery.js

@@ -10,17 +10,14 @@ import {
 
 const defaultPage = 1;
 const defaultSize = 20;
-const defaultSearchSort = [
-  { _score: "desc" },
-  { "implementation_key.sort": "asc" },
-];
-const byKeySort = [{ "implementation_key.sort": "asc" }];
+const defaultSearchSort = [{ "implementation_key.sort": "asc" }];
+const scoreSort = [{ _score: "desc" }];
 
 export const initialState = {
   query: "",
   page: defaultPage,
   size: defaultSize,
-  sort: byKeySort,
+  sort: defaultSearchSort,
 };
 
 const ruleImplementationQuery = (state = initialState, { type, payload }) => {
@@ -39,7 +36,7 @@ const ruleImplementationQuery = (state = initialState, { type, payload }) => {
     case searchImplementations.TRIGGER: {
       const page = defaultPage;
       const query = _.propOr("", "query")(payload);
-      const sort = query != "" ? defaultSearchSort : byKeySort;
+      const sort = query != "" ? scoreSort : defaultSearchSort;
       return { ...state, query, page, sort };
     }
     case selectImplementationPage.TRIGGER: {

package/src/reducers/ruleQuery.js

@@ -5,19 +5,19 @@ import {
   toggleRuleFilterValue,
   searchRules,
   selectRulePage,
-  sortRules
+  sortRules,
 } from "../routines";
 
 const defaultPage = 1;
 const defaultSize = 20;
-const defaultSearchSort = [{ _score: "desc" }, { "name.raw": "asc" }];
-const byNameSort = [{ "name.raw": "asc" }];
+const defaultSearchSort = [{ "name.raw": "asc" }];
+const scoreSort = [{ _score: "desc" }];
 
 export const initialState = {
   query: "",
   page: defaultPage,
   size: defaultSize,
-  sort: byNameSort
+  sort: defaultSearchSort,
 };
 
 const ruleQuery = (state = initialState, { type, payload }) => {
@@ -36,7 +36,7 @@ const ruleQuery = (state = initialState, { type, payload }) => {
     case searchRules.TRIGGER: {
       const page = defaultPage;
       const query = _.propOr("", "query")(payload);
-      const sort = query != "" ? defaultSearchSort : byNameSort;
+      const sort = query != "" ? scoreSort : defaultSearchSort;
       return { ...state, query, page, sort };
     }
     case selectRulePage.TRIGGER: {