QueryLibrary model and reducer

src/js/state/QueryLibrary/reducer.ts

@@ -1,6 +1,6 @@
 import {Group, Query, QueryLibraryAction, QueryLibraryState} from "./types"
 import produce from "immer"
-import {get, set, initial, last} from "lodash"
+import {get, set, initial, last, isEqual} from "lodash"
 import init from "./initial"
 
 export default produce(
@@ -71,7 +71,7 @@ const moveItem = (
   // cause an off by one issue since the destination index will be affected after
   // removal (e.g. an item cannot be moved to the end of its current group because of this).
   // For this situation we instead remove the item first, and then insert its copy
-  if (srcItemPath.length === destItemPath.length) {
+  if (isEqual(initial(srcItemPath), initial(destItemPath))) {
     removeItemFromGroup(draft, srcItemPath)
     addItemToGroup(
       draft,

src/js/state/QueryLibrary/test.ts

@@ -23,7 +23,7 @@ const testLib = {
           id: "testId2",
           name: "testName2",
           description: "testDescription2",
-          value: "testValue2",
+          zql: "testValue2",
           tags: ["testTag1", "testTag2"]
         },
         {
@@ -36,7 +36,7 @@ const testLib = {
               id: "testId4",
               name: "testName4",
               description: "testDescription4",
-              value: "testValue4",
+              zql: "testValue4",
               tags: ["testTag2"]
             }
           ]
@@ -46,7 +46,7 @@ const testLib = {
           id: "testId5",
           name: "testName5",
           description: "testDescription5",
-          value: "testValue5",
+          zql: "testValue5",
           tags: ["testTag1"]
         }
       ]
@@ -58,7 +58,7 @@ const newQuery = {
   id: "newQueryId",
   name: "newQueryName",
   description: "newQueryDescription",
-  value: "newQueryValue",
+  zql: "newQueryValue",
   tags: []
 }
 
@@ -138,7 +138,7 @@ test("remove query, group", () => {
   expect(getGroup(store.getState(), [0]).items).toEqual([testName1Group[2]])
 })
 
-test("move query, same group", () => {
+test("move query, same group, different group same depth", () => {
   store.dispatch(QueryLibrary.setAll(testLib))
 
   const testName1Group = getGroup(store.getState(), [0]).items
@@ -161,6 +161,20 @@ test("move query, same group", () => {
 
   expect(getGroup(store.getState(), [0]).items).toHaveLength(3)
   expect(getGroup(store.getState(), [0]).items).toEqual(testName1Group)
+
+  // move to "uncle's" group
+  store.dispatch(QueryLibrary.addItem(newGroup, [0]))
+
+  expect(getGroup(store.getState(), [0, 1]).items).toHaveLength(1)
+  expect(getGroup(store.getState(), [0, 3]).items).toHaveLength(0)
+
+  const testName4Query = getGroup(store.getState(), [0, 1]).items[0]
+
+  store.dispatch(QueryLibrary.moveItem([0, 1, 0], [0, 3, 0]))
+
+  expect(getGroup(store.getState(), [0, 1]).items).toHaveLength(0)
+  expect(getGroup(store.getState(), [0, 3]).items).toHaveLength(1)
+  expect(getGroup(store.getState(), [0, 3]).items[0]).toEqual(testName4Query)
 })
 
 test("move query, different group", () => {

src/js/state/QueryLibrary/types.ts

@@ -3,7 +3,7 @@ export type QueryLibraryState = Group
 export interface Query {
   id: string
   name: string
-  value: string
+  zql: string
   description: string
   tags: string[]
 }