@gooddata/sdk-ui-dashboard 10.16.0-alpha.9 → 10.16.0-beta.0

package/esm/model/commandHandlers/layout/moveSectionItemHandler.js

@@ -1,45 +1,87 @@
+import { batchActions } from "redux-batched-actions";
+import { put, select } from "redux-saga/effects";
 import { invalidArgumentsProvided } from "../../events/general.js";
 import { selectLayout } from "../../store/layout/layoutSelectors.js";
-import { put, select } from "redux-saga/effects";
-import { validateItemExists, validateItemPlacement, validateSectionExists, validateSectionPlacement, } from "./validation/layoutValidation.js";
 import { layoutActions } from "../../store/layout/index.js";
 import { layoutSectionItemMoved } from "../../events/layout.js";
 import { resolveIndexOfNewItem, resolveRelativeIndex } from "../../utils/arrayOps.js";
-import { batchActions } from "redux-batched-actions";
+import { findItem, serializeLayoutItemPath, findSections, findSection, getItemIndex, updateItem, getSectionIndex, areItemsInSameSection, asSectionPath, } from "../../../_staging/layout/coordinates.js";
+import { validateItemExists, validateItemPlacement, validateSectionExists, validateSectionPlacement, } from "./validation/layoutValidation.js";
 function validateAndResolve(commandCtx) {
-    const { ctx, layout, cmd: { payload: { sectionIndex, toSectionIndex, itemIndex, toItemIndex, removeOriginalSectionIfEmpty }, }, } = commandCtx;
-    if (!validateSectionExists(layout, sectionIndex)) {
-        throw invalidArgumentsProvided(ctx, commandCtx.cmd, `Attempting to move item from non-existent section at ${sectionIndex}. There are only ${layout.sections.length} sections.`);
-    }
-    const fromSection = layout.sections[sectionIndex];
-    if (!validateItemExists(fromSection, itemIndex)) {
-        throw invalidArgumentsProvided(ctx, commandCtx.cmd, `Attempting to move non-existent item from index ${itemIndex}. There are only ${fromSection.items.length} items.`);
-    }
-    const itemToMove = fromSection.items[itemIndex];
-    if (!validateSectionPlacement(layout, toSectionIndex)) {
-        throw invalidArgumentsProvided(ctx, commandCtx.cmd, `Attempting to move item to a wrong section at index ${toSectionIndex}. There are currently ${layout.sections.length} sections.`);
-    }
-    const targetSectionIndex = resolveRelativeIndex(layout.sections, toSectionIndex);
-    const targetSection = layout.sections[targetSectionIndex];
-    if (!validateItemPlacement(targetSection, toItemIndex)) {
-        throw invalidArgumentsProvided(ctx, commandCtx.cmd, `Attempting to move item to a wrong location at index ${toItemIndex}. Target section has ${targetSection.items.length} items.`);
+    const { ctx, layout, cmd: { payload: { sectionIndex, toSectionIndex, toItemIndex, itemIndex, fromPath, toPath, removeOriginalSectionIfEmpty, }, }, } = commandCtx;
+    if (fromPath === undefined && toPath === undefined) {
+        if (!validateSectionExists(layout, sectionIndex)) {
+            throw invalidArgumentsProvided(ctx, commandCtx.cmd, `Attempting to move item from non-existent section at ${sectionIndex}. There are only ${layout.sections.length} sections.`);
+        }
+        const fromSection = layout.sections[sectionIndex];
+        if (!validateItemExists(fromSection, itemIndex)) {
+            throw invalidArgumentsProvided(ctx, commandCtx.cmd, `Attempting to move non-existent item from index ${itemIndex}. There are only ${fromSection.items.length} items.`);
+        }
+        const itemToMove = fromSection.items[itemIndex];
+        if (!validateSectionPlacement(layout, toSectionIndex)) {
+            throw invalidArgumentsProvided(ctx, commandCtx.cmd, `Attempting to move item to a wrong section at index ${toSectionIndex}. There are currently ${layout.sections.length} sections.`);
+        }
+        const targetSectionIndex = resolveRelativeIndex(layout.sections, toSectionIndex);
+        const targetSection = layout.sections[targetSectionIndex];
+        if (!validateItemPlacement(targetSection, toItemIndex)) {
+            throw invalidArgumentsProvided(ctx, commandCtx.cmd, `Attempting to move item to a wrong location at index ${toItemIndex}. Target section has ${targetSection.items.length} items.`);
+        }
+        let targetItemIndex = 0;
+        if (sectionIndex === targetSectionIndex) {
+            targetItemIndex = resolveRelativeIndex(targetSection.items, toItemIndex);
+            if (itemIndex === targetItemIndex) {
+                throw invalidArgumentsProvided(ctx, commandCtx.cmd, `Attempting to move item to a same place where it already resides ${toItemIndex}.`);
+            }
+        }
+        else {
+            targetItemIndex = resolveIndexOfNewItem(targetSection.items, toItemIndex);
+        }
+        return {
+            targetSectionIndex,
+            targetItemIndex,
+            itemToMove,
+            shouldRemoveSection: Boolean(removeOriginalSectionIfEmpty) && fromSection.items.length === 1,
+        };
     }
-    let targetItemIndex = 0;
-    if (sectionIndex === targetSectionIndex) {
-        targetItemIndex = resolveRelativeIndex(targetSection.items, toItemIndex);
-        if (itemIndex === targetItemIndex) {
-            throw invalidArgumentsProvided(ctx, commandCtx.cmd, `Attempting to move item to a same place where it already resides ${toItemIndex}.`);
+    else if (fromPath !== undefined && toPath !== undefined) {
+        if (!validateSectionExists(layout, fromPath)) {
+            throw invalidArgumentsProvided(ctx, commandCtx.cmd, `Attempting to move item from non-existent section at ${serializeLayoutItemPath(fromPath)}.`);
+        }
+        const fromSection = findSection(layout, fromPath);
+        if (!validateItemExists(fromSection, fromPath)) {
+            throw invalidArgumentsProvided(ctx, commandCtx.cmd, `Attempting to move non-existent item from index ${serializeLayoutItemPath(fromPath)}. There are only ${fromSection.items.length} items.`);
         }
+        if (!validateSectionPlacement(layout, toPath)) {
+            throw invalidArgumentsProvided(ctx, commandCtx.cmd, `Attempting to move item to a wrong section at index ${serializeLayoutItemPath(toPath)}.`);
+        }
+        const itemToMove = findItem(layout, fromPath);
+        const targetSections = findSections(layout, toPath);
+        const absoluteTargetSectionIndex = resolveRelativeIndex(targetSections, getSectionIndex(toPath));
+        const targetSection = targetSections[absoluteTargetSectionIndex];
+        if (!validateItemPlacement(targetSection, toPath)) {
+            throw invalidArgumentsProvided(ctx, commandCtx.cmd, `Attempting to move item to a wrong location at index ${serializeLayoutItemPath(toPath)}. Target section has ${targetSection.items.length} items.`);
+        }
+        let absoluteTargetItemIndex;
+        if (areItemsInSameSection(fromPath, toPath) &&
+            getSectionIndex(fromPath) === absoluteTargetSectionIndex) {
+            absoluteTargetItemIndex = resolveRelativeIndex(targetSection.items, getItemIndex(toPath));
+            if (getItemIndex(fromPath) === absoluteTargetItemIndex) {
+                throw invalidArgumentsProvided(ctx, commandCtx.cmd, `Attempting to move item to a same place where it already resides ${serializeLayoutItemPath(toPath)}.`);
+            }
+        }
+        else {
+            absoluteTargetItemIndex = resolveIndexOfNewItem(targetSection.items, getItemIndex(toPath));
+        }
+        const targetIndex = updateItem(toPath, absoluteTargetSectionIndex, absoluteTargetItemIndex);
+        return {
+            targetIndex,
+            itemToMove,
+            shouldRemoveSection: Boolean(removeOriginalSectionIfEmpty) && fromSection.items.length === 1,
+        };
     }
     else {
-        targetItemIndex = resolveIndexOfNewItem(targetSection.items, toItemIndex);
+        throw invalidArgumentsProvided(ctx, commandCtx.cmd, "Both fromPath and toPath cannot be undefined at the same time.");
     }
-    return {
-        targetSectionIndex,
-        targetItemIndex,
-        itemToMove,
-        shouldRemoveSection: Boolean(removeOriginalSectionIfEmpty) && fromSection.items.length === 1,
-    };
 }
 export function* moveSectionItemHandler(ctx, cmd) {
     const commandCtx = {
@@ -47,14 +89,14 @@ export function* moveSectionItemHandler(ctx, cmd) {
         cmd,
         layout: yield select(selectLayout),
     };
-    const { targetSectionIndex, targetItemIndex, itemToMove, shouldRemoveSection } = validateAndResolve(commandCtx);
-    const { itemIndex, sectionIndex } = cmd.payload;
+    const { targetSectionIndex, targetItemIndex, targetIndex, itemToMove, shouldRemoveSection } = validateAndResolve(commandCtx);
+    const { fromPath, itemIndex, sectionIndex } = cmd.payload;
     yield put(batchActions([
         layoutActions.moveSectionItem({
-            sectionIndex,
-            itemIndex,
-            toSectionIndex: targetSectionIndex,
-            toItemIndex: targetItemIndex,
+            itemIndex: fromPath === undefined ? [{ sectionIndex, itemIndex }] : fromPath,
+            toItemIndex: targetIndex === undefined
+                ? [{ sectionIndex: targetSectionIndex, itemIndex: targetItemIndex }]
+                : targetIndex,
             undo: {
                 cmd,
             },
@@ -62,7 +104,9 @@ export function* moveSectionItemHandler(ctx, cmd) {
         ...(shouldRemoveSection
             ? [
                 layoutActions.removeSection({
-                    index: sectionIndex,
+                    index: fromPath === undefined
+                        ? { parent: undefined, sectionIndex }
+                        : asSectionPath(fromPath),
                     undo: {
                         cmd,
                     },
@@ -70,7 +114,13 @@ export function* moveSectionItemHandler(ctx, cmd) {
             ]
             : []),
     ]));
-    const targetSectionIndexUpdated = shouldRemoveSection && sectionIndex < targetSectionIndex ? sectionIndex - 1 : targetSectionIndex;
-    return layoutSectionItemMoved(ctx, itemToMove, sectionIndex, targetSectionIndexUpdated, itemIndex, targetItemIndex, shouldRemoveSection, cmd.correlationId);
+    const targetSectionIndexUpdated = targetSectionIndex === undefined
+        ? getSectionIndex(targetIndex)
+        : shouldRemoveSection && sectionIndex < targetSectionIndex
+            ? sectionIndex - 1
+            : targetSectionIndex;
+    return layoutSectionItemMoved(ctx, itemToMove, fromPath === undefined ? sectionIndex : getSectionIndex(fromPath), targetSectionIndexUpdated, fromPath === undefined ? itemIndex : getItemIndex(fromPath), targetIndex === undefined ? targetItemIndex : getItemIndex(targetIndex), fromPath === undefined ? [{ sectionIndex, itemIndex }] : fromPath, targetIndex === undefined
+        ? [{ sectionIndex: targetSectionIndexUpdated, itemIndex: targetIndex }]
+        : targetIndex, shouldRemoveSection, cmd.correlationId);
 }
 //# sourceMappingURL=moveSectionItemHandler.js.map

package/esm/model/commandHandlers/layout/moveSectionItemHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"moveSectionItemHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/layout/moveSectionItemHandler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"moveSectionItemHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/layout/moveSectionItemHandler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAIjD,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAmC,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AACjG,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AACtF,OAAO,EACH,QAAQ,EACR,uBAAuB,EACvB,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,UAAU,EACV,eAAe,EACf,qBAAqB,EACrB,aAAa,GAChB,MAAM,yCAAyC,CAAC;AAEjD,OAAO,EACH,kBAAkB,EAClB,qBAAqB,EACrB,qBAAqB,EACrB,wBAAwB,GAC3B,MAAM,kCAAkC,CAAC;AAQ1C,SAAS,kBAAkB,CAAC,UAAkC;IAC1D,MAAM,EACF,GAAG,EACH,MAAM,EACN,GAAG,EAAE,EACD,OAAO,EAAE,EACL,YAAY,EACZ,cAAc,EACd,WAAW,EACX,SAAS,EACT,QAAQ,EACR,MAAM,EACN,4BAA4B,GAC/B,GACJ,GACJ,GAAG,UAAU,CAAC;IACf,IAAI,QAAQ,KAAK,SAAS,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACjD,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC;YAC/C,MAAM,wBAAwB,CAC1B,GAAG,EACH,UAAU,CAAC,GAAG,EACd,wDAAwD,YAAY,oBAAoB,MAAM,CAAC,QAAQ,CAAC,MAAM,YAAY,CAC7H,CAAC;QACN,CAAC;QAED,MAAM,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAElD,IAAI,CAAC,kBAAkB,CAAC,WAAW,EAAE,SAAS,CAAC,EAAE,CAAC;YAC9C,MAAM,wBAAwB,CAC1B,GAAG,EACH,UAAU,CAAC,GAAG,EACd,mDAAmD,SAAS,oBAAoB,WAAW,CAAC,KAAK,CAAC,MAAM,SAAS,CACpH,CAAC;QACN,CAAC;QAED,MAAM,UAAU,GAAG,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAEhD,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,cAAc,CAAC,EAAE,CAAC;YACpD,MAAM,wBAAwB,CAC1B,GAAG,EACH,UAAU,CAAC,GAAG,EACd,uDAAuD,cAAc,yBAAyB,MAAM,CAAC,QAAQ,CAAC,MAAM,YAAY,CACnI,CAAC;QACN,CAAC;QAED,MAAM,kBAAkB,GAAG,oBAAoB,CAAC,MAAM,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;QACjF,MAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;QAE1D,IAAI,CAAC,qBAAqB,CAAC,aAAa,EAAE,WAAW,CAAC,EAAE,CAAC;YACrD,MAAM,wBAAwB,CAC1B,GAAG,EACH,UAAU,CAAC,GAAG,EACd,wDAAwD,WAAW,wBAAwB,aAAa,CAAC,KAAK,CAAC,MAAM,SAAS,CACjI,CAAC;QACN,CAAC;QAED,IAAI,eAAe,GAAG,CAAC,CAAC;QAExB,IAAI,YAAY,KAAK,kBAAkB,EAAE,CAAC;YACtC,eAAe,GAAG,oBAAoB,CAAC,aAAa,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;YAEzE,IAAI,SAAS,KAAK,eAAe,EAAE,CAAC;gBAChC,MAAM,wBAAwB,CAC1B,GAAG,EACH,UAAU,CAAC,GAAG,EACd,oEAAoE,WAAW,GAAG,CACrF,CAAC;YACN,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,eAAe,GAAG,qBAAqB,CAAC,aAAa,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAC9E,CAAC;QAED,OAAO;YACH,kBAAkB;YAClB,eAAe;YACf,UAAU;YACV,mBAAmB,EAAE,OAAO,CAAC,4BAA4B,CAAC,IAAI,WAAW,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC;SAC/F,CAAC;IACN,CAAC;SAAM,IAAI,QAAQ,KAAK,SAAS,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACxD,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC;YAC3C,MAAM,wBAAwB,CAC1B,GAAG,EACH,UAAU,CAAC,GAAG,EACd,wDAAwD,uBAAuB,CAAC,QAAQ,CAAC,GAAG,CAC/F,CAAC;QACN,CAAC;QAED,MAAM,WAAW,GAAG,WAAW,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAElD,IAAI,CAAC,kBAAkB,CAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,CAAC;YAC7C,MAAM,wBAAwB,CAC1B,GAAG,EACH,UAAU,CAAC,GAAG,EACd,mDAAmD,uBAAuB,CACtE,QAAQ,CACX,oBAAoB,WAAW,CAAC,KAAK,CAAC,MAAM,SAAS,CACzD,CAAC;QACN,CAAC;QAED,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;YAC5C,MAAM,wBAAwB,CAC1B,GAAG,EACH,UAAU,CAAC,GAAG,EACd,uDAAuD,uBAAuB,CAAC,MAAM,CAAC,GAAG,CAC5F,CAAC;QACN,CAAC;QAED,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC9C,MAAM,cAAc,GAAG,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACpD,MAAM,0BAA0B,GAAG,oBAAoB,CAAC,cAAc,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;QACjG,MAAM,aAAa,GAAG,cAAc,CAAC,0BAA0B,CAAC,CAAC;QAEjE,IAAI,CAAC,qBAAqB,CAAC,aAAa,EAAE,MAAM,CAAC,EAAE,CAAC;YAChD,MAAM,wBAAwB,CAC1B,GAAG,EACH,UAAU,CAAC,GAAG,EACd,wDAAwD,uBAAuB,CAC3E,MAAM,CACT,wBAAwB,aAAa,CAAC,KAAK,CAAC,MAAM,SAAS,CAC/D,CAAC;QACN,CAAC;QAED,IAAI,uBAA+B,CAAC;QAEpC,IACI,qBAAqB,CAAC,QAAQ,EAAE,MAAM,CAAC;YACvC,eAAe,CAAC,QAAQ,CAAC,KAAK,0BAA0B,EAC1D,CAAC;YACC,uBAAuB,GAAG,oBAAoB,CAAC,aAAa,CAAC,KAAK,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC;YAE1F,IAAI,YAAY,CAAC,QAAQ,CAAC,KAAK,uBAAuB,EAAE,CAAC;gBACrD,MAAM,wBAAwB,CAC1B,GAAG,EACH,UAAU,CAAC,GAAG,EACd,oEAAoE,uBAAuB,CACvF,MAAM,CACT,GAAG,CACP,CAAC;YACN,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,uBAAuB,GAAG,qBAAqB,CAAC,aAAa,CAAC,KAAK,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC;QAC/F,CAAC;QAED,MAAM,WAAW,GAAG,UAAU,CAAC,MAAM,EAAE,0BAA0B,EAAE,uBAAuB,CAAC,CAAC;QAE5F,OAAO;YACH,WAAW;YACX,UAAU;YACV,mBAAmB,EAAE,OAAO,CAAC,4BAA4B,CAAC,IAAI,WAAW,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC;SAC/F,CAAC;IACN,CAAC;SAAM,CAAC;QACJ,MAAM,wBAAwB,CAC1B,GAAG,EACH,UAAU,CAAC,GAAG,EACd,gEAAgE,CACnE,CAAC;IACN,CAAC;AACL,CAAC;AAED,MAAM,SAAS,CAAC,CAAC,sBAAsB,CACnC,GAAqB,EACrB,GAAoB;IAEpB,MAAM,UAAU,GAA2B;QACvC,GAAG;QACH,GAAG;QACH,MAAM,EAAE,MAAM,MAAM,CAAC,YAAY,CAAC;KACrC,CAAC;IAEF,MAAM,EAAE,kBAAkB,EAAE,eAAe,EAAE,WAAW,EAAE,UAAU,EAAE,mBAAmB,EAAE,GACvF,kBAAkB,CAAC,UAAU,CAAC,CAAC;IACnC,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC;IAE1D,MAAM,GAAG,CACL,YAAY,CAAC;QACT,aAAa,CAAC,eAAe,CAAC;YAC1B,SAAS,EAAE,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ;YAC5E,WAAW,EACP,WAAW,KAAK,SAAS;gBACrB,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,kBAAkB,EAAE,SAAS,EAAE,eAAe,EAAE,CAAC;gBACpE,CAAC,CAAC,WAAW;YACrB,IAAI,EAAE;gBACF,GAAG;aACN;SACJ,CAAC;QACF,GAAG,CAAC,mBAAmB;YACnB,CAAC,CAAC;gBACI,aAAa,CAAC,aAAa,CAAC;oBACxB,KAAK,EACD,QAAQ,KAAK,SAAS;wBAClB,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE;wBACrC,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC;oBACjC,IAAI,EAAE;wBACF,GAAG;qBACN;iBACJ,CAAC;aACL;YACH,CAAC,CAAC,EAAE,CAAC;KACZ,CAAC,CACL,CAAC;IAEF,MAAM,yBAAyB,GAC3B,kBAAkB,KAAK,SAAS;QAC5B,CAAC,CAAC,eAAe,CAAC,WAAW,CAAC;QAC9B,CAAC,CAAC,mBAAmB,IAAI,YAAY,GAAG,kBAAkB;YAC1D,CAAC,CAAC,YAAY,GAAG,CAAC;YAClB,CAAC,CAAC,kBAAkB,CAAC;IAE7B,OAAO,sBAAsB,CACzB,GAAG,EACH,UAAU,EACV,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,EACjE,yBAAyB,EACzB,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,EAC3D,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,YAAY,CAAC,WAAW,CAAC,EACvE,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,EACjE,WAAW,KAAK,SAAS;QACrB,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,yBAA0B,EAAE,SAAS,EAAE,WAAY,EAAE,CAAC;QACzE,CAAC,CAAC,WAAW,EACjB,mBAAmB,EACnB,GAAG,CAAC,aAAa,CACpB,CAAC;AACN,CAAC"}

package/esm/model/commandHandlers/layout/moveSectionItemToNewSectionHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"moveSectionItemToNewSectionHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/layout/moveSectionItemToNewSectionHandler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,OAAO,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AAEvE,OAAO,EACH,2CAA2C,EAE9C,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AA2D9D,wBAAiB,kCAAkC,CAC/C,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,2BAA2B,GACjC,YAAY,CAAC,2CAA2C,CAAC,CA6D3D"}
+{"version":3,"file":"moveSectionItemToNewSectionHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/layout/moveSectionItemToNewSectionHandler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,OAAO,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AAEvE,OAAO,EACH,2CAA2C,EAE9C,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AA+J9D,wBAAiB,kCAAkC,CAC/C,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,2BAA2B,GACjC,YAAY,CAAC,2CAA2C,CAAC,CAgF3D"}

package/esm/model/commandHandlers/layout/moveSectionItemToNewSectionHandler.js

@@ -1,4 +1,4 @@
-// (C) 2021-2022 GoodData Corporation
+// (C) 2021-2024 GoodData Corporation
 import { batchActions } from "redux-batched-actions";
 import { put, select } from "redux-saga/effects";
 import { invalidArgumentsProvided } from "../../events/general.js";
@@ -6,25 +6,76 @@ import { layoutSectionItemMovedToNewSection, } from "../../events/layout.js";
 import { layoutActions } from "../../store/layout/index.js";
 import { selectLayout } from "../../store/layout/layoutSelectors.js";
 import { validateItemExists, validateSectionExists, validateSectionPlacement, } from "./validation/layoutValidation.js";
+import { serializeLayoutItemPath, serializeLayoutSectionPath, findSection, findItem, asSectionPath, asLayoutItemPath, getSectionIndex, getItemIndex, } from "../../../_staging/layout/coordinates.js";
 function validateAndResolve(commandCtx) {
-    const { ctx, layout, cmd: { payload: { sectionIndex, toSectionIndex, itemIndex, removeOriginalSectionIfEmpty }, }, } = commandCtx;
-    if (!validateSectionExists(layout, sectionIndex)) {
-        throw invalidArgumentsProvided(ctx, commandCtx.cmd, `Attempting to move item from non-existent section at ${sectionIndex}. There are only ${layout.sections.length} sections.`);
+    const { ctx, layout, cmd: { payload: { itemPath, sectionIndex, itemIndex, toSectionIndex, toSection, removeOriginalSectionIfEmpty, }, }, } = commandCtx;
+    if (itemPath === undefined && toSection === undefined) {
+        if (!validateSectionExists(layout, sectionIndex)) {
+            throw invalidArgumentsProvided(ctx, commandCtx.cmd, `Attempting to move item from non-existent section at ${sectionIndex}. There are only ${layout.sections.length} sections.`);
+        }
+        const fromSection = layout.sections[sectionIndex];
+        if (!validateItemExists(fromSection, itemIndex)) {
+            throw invalidArgumentsProvided(ctx, commandCtx.cmd, `Attempting to move non-existent item from index ${itemIndex}. There are only ${fromSection.items.length} items.`);
+        }
+        const itemToMove = fromSection.items[itemIndex];
+        if (!validateSectionPlacement(layout, toSectionIndex)) {
+            throw invalidArgumentsProvided(ctx, commandCtx.cmd, `Attempting to move item to a wrong section at index ${toSectionIndex}. There are currently ${layout.sections.length} sections.`);
+        }
+        return {
+            targetSectionIndex: toSectionIndex,
+            targetItemIndex: 0,
+            itemToMove,
+            shouldRemoveSection: Boolean(removeOriginalSectionIfEmpty) && fromSection.items.length === 1,
+        };
     }
-    const fromSection = layout.sections[sectionIndex];
-    if (!validateItemExists(fromSection, itemIndex)) {
-        throw invalidArgumentsProvided(ctx, commandCtx.cmd, `Attempting to move non-existent item from index ${itemIndex}. There are only ${fromSection.items.length} items.`);
+    else if (itemPath !== undefined && toSection !== undefined) {
+        if (!validateSectionExists(layout, itemPath)) {
+            throw invalidArgumentsProvided(ctx, commandCtx.cmd, `Attempting to move item from non-existent section at ${serializeLayoutItemPath(itemPath)}.`);
+        }
+        const fromSection = findSection(layout, itemPath);
+        if (!validateItemExists(fromSection, itemPath)) {
+            throw invalidArgumentsProvided(ctx, commandCtx.cmd, `Attempting to move non-existent item from index ${serializeLayoutItemPath(itemPath)}. There are only ${fromSection.items.length} items.`);
+        }
+        const itemToMove = findItem(layout, itemPath);
+        if (!validateSectionPlacement(layout, toSection)) {
+            throw invalidArgumentsProvided(ctx, commandCtx.cmd, `Attempting to move item to a wrong section at index ${serializeLayoutSectionPath(toSection)}.`);
+        }
+        return {
+            itemToMove,
+            toItemIndex: asLayoutItemPath(toSection, 0),
+            shouldRemoveSection: Boolean(removeOriginalSectionIfEmpty) && fromSection.items.length === 1,
+        };
     }
-    const itemToMove = fromSection.items[itemIndex];
-    if (!validateSectionPlacement(layout, toSectionIndex)) {
-        throw invalidArgumentsProvided(ctx, commandCtx.cmd, `Attempting to move item to a wrong section at index ${toSectionIndex}. There are currently ${layout.sections.length} sections.`);
+    else {
+        throw invalidArgumentsProvided(ctx, commandCtx.cmd, "Both itemPath and toSection cannot be undefined at the same time.");
     }
-    return {
-        targetSectionIndex: toSectionIndex,
-        targetItemIndex: 0,
-        itemToMove,
-        shouldRemoveSection: Boolean(removeOriginalSectionIfEmpty) && fromSection.items.length === 1,
-    };
+}
+function toIsBeforeFrom(toItemPath, fromItemPath) {
+    return getSectionIndex(toItemPath) <= getSectionIndex(fromItemPath);
+}
+function hasSamePredPath(fromItemPath, toItemPath) {
+    for (let i = 0; i < toItemPath.length; i++) {
+        if (fromItemPath[i] !== toItemPath[i]) {
+            return false;
+        }
+    }
+    return true;
+}
+function requiresSectionShift(fromItemPath, toItemPath) {
+    const commonPath = fromItemPath.slice(0, toItemPath.length);
+    return (hasSamePredPath(commonPath.slice(0, -1), toItemPath.slice(0, -1)) &&
+        toIsBeforeFrom(toItemPath, commonPath));
+}
+function getItemPathWithSectionsShifted(fromItemPath, toItemPath) {
+    if (fromItemPath && toItemPath && requiresSectionShift(fromItemPath, toItemPath)) {
+        const fromItemPathCopy = fromItemPath.slice();
+        fromItemPathCopy[toItemPath.length - 1] = {
+            sectionIndex: fromItemPathCopy[toItemPath.length - 1].sectionIndex + 1,
+            itemIndex: fromItemPathCopy[toItemPath.length - 1].itemIndex,
+        };
+        return fromItemPathCopy;
+    }
+    return fromItemPath;
 }
 export function* moveSectionItemToNewSectionHandler(ctx, cmd) {
     const commandCtx = {
@@ -32,16 +83,23 @@ export function* moveSectionItemToNewSectionHandler(ctx, cmd) {
         cmd,
         layout: yield select(selectLayout),
     };
-    const { targetSectionIndex, targetItemIndex, itemToMove, shouldRemoveSection } = validateAndResolve(commandCtx);
-    const { itemIndex, sectionIndex, toSectionIndex } = cmd.payload;
-    const itemSectionIndex = toSectionIndex > sectionIndex ? sectionIndex : sectionIndex + 1;
+    const { targetSectionIndex, targetItemIndex, itemToMove, toItemIndex, shouldRemoveSection } = validateAndResolve(commandCtx);
+    const { itemIndex, sectionIndex, toSectionIndex, itemPath } = cmd.payload;
+    const itemSectionIndex = itemPath === undefined
+        ? toSectionIndex > sectionIndex
+            ? sectionIndex
+            : sectionIndex + 1
+        : getSectionIndex(itemPath);
     const section = {
         type: "IDashboardLayoutSection",
         items: [],
     };
+    const itemPathWithSectionsShifted = getItemPathWithSectionsShifted(itemPath, toItemIndex);
     yield put(batchActions([
         layoutActions.addSection({
-            index: targetSectionIndex,
+            index: toItemIndex === undefined
+                ? { parent: undefined, sectionIndex: targetSectionIndex }
+                : asSectionPath(toItemIndex),
             section,
             usedStashes: [],
             undo: {
@@ -49,10 +107,12 @@ export function* moveSectionItemToNewSectionHandler(ctx, cmd) {
             },
         }),
         layoutActions.moveSectionItem({
-            sectionIndex: itemSectionIndex,
-            itemIndex,
-            toSectionIndex: targetSectionIndex,
-            toItemIndex: targetItemIndex,
+            itemIndex: itemPathWithSectionsShifted === undefined
+                ? [{ sectionIndex: itemSectionIndex, itemIndex }]
+                : itemPathWithSectionsShifted,
+            toItemIndex: toItemIndex === undefined
+                ? [{ sectionIndex: targetSectionIndex, itemIndex: targetItemIndex }]
+                : toItemIndex,
             undo: {
                 cmd,
             },
@@ -60,7 +120,9 @@ export function* moveSectionItemToNewSectionHandler(ctx, cmd) {
         ...(shouldRemoveSection
             ? [
                 layoutActions.removeSection({
-                    index: itemSectionIndex,
+                    index: itemPathWithSectionsShifted === undefined
+                        ? { parent: undefined, sectionIndex: itemSectionIndex }
+                        : asSectionPath(itemPathWithSectionsShifted),
                     undo: {
                         cmd,
                     },
@@ -68,6 +130,8 @@ export function* moveSectionItemToNewSectionHandler(ctx, cmd) {
             ]
             : []),
     ]));
-    return layoutSectionItemMovedToNewSection(ctx, itemToMove, sectionIndex, targetSectionIndex, itemIndex, targetItemIndex, shouldRemoveSection, cmd.correlationId);
+    return layoutSectionItemMovedToNewSection(ctx, itemToMove, itemPath === undefined ? sectionIndex : getSectionIndex(itemPath), targetSectionIndex === undefined ? getSectionIndex(toItemIndex) : targetSectionIndex, itemPath === undefined ? itemIndex : getItemIndex(itemPath), targetItemIndex === undefined ? getItemIndex(toItemIndex) : targetItemIndex, itemPath === undefined ? [{ sectionIndex, itemIndex }] : itemPath, toItemIndex === undefined
+        ? [{ sectionIndex: targetSectionIndex, itemIndex: targetItemIndex }]
+        : toItemIndex, shouldRemoveSection, cmd.correlationId);
 }
 //# sourceMappingURL=moveSectionItemToNewSectionHandler.js.map

package/esm/model/commandHandlers/layout/moveSectionItemToNewSectionHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"moveSectionItemToNewSectionHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/layout/moveSectionItemToNewSectionHandler.ts"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEjD,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAEH,kCAAkC,GACrC,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AAGrE,OAAO,EACH,kBAAkB,EAClB,qBAAqB,EACrB,wBAAwB,GAC3B,MAAM,kCAAkC,CAAC;AAQ1C,SAAS,kBAAkB,CAAC,UAA8C;IACtE,MAAM,EACF,GAAG,EACH,MAAM,EACN,GAAG,EAAE,EACD,OAAO,EAAE,EAAE,YAAY,EAAE,cAAc,EAAE,SAAS,EAAE,4BAA4B,EAAE,GACrF,GACJ,GAAG,UAAU,CAAC;IAEf,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC;QAC/C,MAAM,wBAAwB,CAC1B,GAAG,EACH,UAAU,CAAC,GAAG,EACd,wDAAwD,YAAY,oBAAoB,MAAM,CAAC,QAAQ,CAAC,MAAM,YAAY,CAC7H,CAAC;IACN,CAAC;IAED,MAAM,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IAElD,IAAI,CAAC,kBAAkB,CAAC,WAAW,EAAE,SAAS,CAAC,EAAE,CAAC;QAC9C,MAAM,wBAAwB,CAC1B,GAAG,EACH,UAAU,CAAC,GAAG,EACd,mDAAmD,SAAS,oBAAoB,WAAW,CAAC,KAAK,CAAC,MAAM,SAAS,CACpH,CAAC;IACN,CAAC;IAED,MAAM,UAAU,GAAG,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAEhD,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,cAAc,CAAC,EAAE,CAAC;QACpD,MAAM,wBAAwB,CAC1B,GAAG,EACH,UAAU,CAAC,GAAG,EACd,uDAAuD,cAAc,yBAAyB,MAAM,CAAC,QAAQ,CAAC,MAAM,YAAY,CACnI,CAAC;IACN,CAAC;IAED,OAAO;QACH,kBAAkB,EAAE,cAAc;QAClC,eAAe,EAAE,CAAC;QAClB,UAAU;QACV,mBAAmB,EAAE,OAAO,CAAC,4BAA4B,CAAC,IAAI,WAAW,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC;KAC/F,CAAC;AACN,CAAC;AAED,MAAM,SAAS,CAAC,CAAC,kCAAkC,CAC/C,GAAqB,EACrB,GAAgC;IAEhC,MAAM,UAAU,GAAuC;QACnD,GAAG;QACH,GAAG;QACH,MAAM,EAAE,MAAM,MAAM,CAAC,YAAY,CAAC;KACrC,CAAC;IAEF,MAAM,EAAE,kBAAkB,EAAE,eAAe,EAAE,UAAU,EAAE,mBAAmB,EAAE,GAC1E,kBAAkB,CAAC,UAAU,CAAC,CAAC;IAEnC,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,cAAc,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC;IAEhE,MAAM,gBAAgB,GAAG,cAAc,GAAG,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,GAAG,CAAC,CAAC;IAEzF,MAAM,OAAO,GAAmC;QAC5C,IAAI,EAAE,yBAAyB;QAC/B,KAAK,EAAE,EAAE;KACZ,CAAC;IAEF,MAAM,GAAG,CACL,YAAY,CAAC;QACT,aAAa,CAAC,UAAU,CAAC;YACrB,KAAK,EAAE,kBAAkB;YACzB,OAAO;YACP,WAAW,EAAE,EAAE;YACf,IAAI,EAAE;gBACF,GAAG;aACN;SACJ,CAAC;QACF,aAAa,CAAC,eAAe,CAAC;YAC1B,YAAY,EAAE,gBAAgB;YAC9B,SAAS;YACT,cAAc,EAAE,kBAAkB;YAClC,WAAW,EAAE,eAAe;YAC5B,IAAI,EAAE;gBACF,GAAG;aACN;SACJ,CAAC;QACF,GAAG,CAAC,mBAAmB;YACnB,CAAC,CAAC;gBACI,aAAa,CAAC,aAAa,CAAC;oBACxB,KAAK,EAAE,gBAAgB;oBACvB,IAAI,EAAE;wBACF,GAAG;qBACN;iBACJ,CAAC;aACL;YACH,CAAC,CAAC,EAAE,CAAC;KACZ,CAAC,CACL,CAAC;IAEF,OAAO,kCAAkC,CACrC,GAAG,EACH,UAAU,EACV,YAAY,EACZ,kBAAkB,EAClB,SAAS,EACT,eAAe,EACf,mBAAmB,EACnB,GAAG,CAAC,aAAa,CACpB,CAAC;AACN,CAAC"}
+{"version":3,"file":"moveSectionItemToNewSectionHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/layout/moveSectionItemToNewSectionHandler.ts"],"names":[],"mappings":"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"}

package/esm/model/commandHandlers/layout/removeLayoutSectionHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"removeLayoutSectionHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/layout/removeLayoutSectionHandler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAK9D,OAAO,EAAE,6BAA6B,EAAwB,MAAM,wBAAwB,CAAC;AAK7F,wBAAiB,0BAA0B,CACvC,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,mBAAmB,GACzB,YAAY,CAAC,6BAA6B,CAAC,CA8B7C"}
+{"version":3,"file":"removeLayoutSectionHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/layout/removeLayoutSectionHandler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAK9D,OAAO,EAAE,6BAA6B,EAAwB,MAAM,wBAAwB,CAAC;AAU7F,wBAAiB,0BAA0B,CACvC,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,mBAAmB,GACzB,YAAY,CAAC,6BAA6B,CAAC,CA0D7C"}

package/esm/model/commandHandlers/layout/removeLayoutSectionHandler.js

@@ -6,24 +6,39 @@ import { layoutSectionRemoved } from "../../events/layout.js";
 import isEmpty from "lodash/isEmpty.js";
 import { validateSectionExists } from "./validation/layoutValidation.js";
 import { resolveRelativeIndex } from "../../utils/arrayOps.js";
+import { serializeLayoutSectionPath, findSections, updateSectionIndex, } from "../../../_staging/layout/coordinates.js";
 export function* removeLayoutSectionHandler(ctx, cmd) {
     const layout = yield select(selectLayout);
     const { index, stashIdentifier } = cmd.payload;
-    if (isEmpty(layout.sections)) {
+    const isLegacyCommand = typeof index === "number";
+    const sections = isLegacyCommand ? layout.sections : findSections(layout, index);
+    if (isEmpty(sections)) {
         throw invalidArgumentsProvided(ctx, cmd, `Attempting to remove a section from an empty layout.`);
     }
-    if (!validateSectionExists(layout, index)) {
-        throw invalidArgumentsProvided(ctx, cmd, `Attempting to remove non-existing layout section at index ${index}.`);
+    if (isLegacyCommand) {
+        if (!validateSectionExists(layout, index)) {
+            throw invalidArgumentsProvided(ctx, cmd, `Attempting to remove non-existing layout section at index ${index}.`);
+        }
     }
-    const absoluteIndex = resolveRelativeIndex(layout.sections, index);
-    const section = layout.sections[absoluteIndex];
+    else {
+        if (!validateSectionExists(layout, index)) {
+            throw invalidArgumentsProvided(ctx, cmd, `Attempting to remove non-existing layout section at index ${serializeLayoutSectionPath(index)}.`);
+        }
+    }
+    const absoluteIndex = isLegacyCommand
+        ? resolveRelativeIndex(layout.sections, index)
+        : resolveRelativeIndex(sections, index.sectionIndex);
+    const section = sections[absoluteIndex];
+    const targetSection = isLegacyCommand
+        ? { parent: undefined, sectionIndex: absoluteIndex }
+        : updateSectionIndex(index, absoluteIndex);
     yield put(layoutActions.removeSection({
-        index: absoluteIndex,
+        index: targetSection,
         stashIdentifier,
         undo: {
             cmd,
         },
     }));
-    return layoutSectionRemoved(ctx, section, absoluteIndex, false, stashIdentifier, cmd.correlationId);
+    return layoutSectionRemoved(ctx, section, absoluteIndex, targetSection, false, stashIdentifier, cmd.correlationId);
 }
 //# sourceMappingURL=removeLayoutSectionHandler.js.map

package/esm/model/commandHandlers/layout/removeLayoutSectionHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"removeLayoutSectionHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/layout/removeLayoutSectionHandler.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAiC,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC7F,OAAO,OAAO,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAE/D,MAAM,SAAS,CAAC,CAAC,0BAA0B,CACvC,GAAqB,EACrB,GAAwB;IAExB,MAAM,MAAM,GAAoC,MAAM,MAAM,CAAC,YAAY,CAAC,CAAC;IAC3E,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC;IAE/C,IAAI,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC3B,MAAM,wBAAwB,CAAC,GAAG,EAAE,GAAG,EAAE,sDAAsD,CAAC,CAAC;IACrG,CAAC;IAED,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC;QACxC,MAAM,wBAAwB,CAC1B,GAAG,EACH,GAAG,EACH,6DAA6D,KAAK,GAAG,CACxE,CAAC;IACN,CAAC;IAED,MAAM,aAAa,GAAG,oBAAoB,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACnE,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;IAE/C,MAAM,GAAG,CACL,aAAa,CAAC,aAAa,CAAC;QACxB,KAAK,EAAE,aAAa;QACpB,eAAe;QACf,IAAI,EAAE;YACF,GAAG;SACN;KACJ,CAAC,CACL,CAAC;IAEF,OAAO,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,eAAe,EAAE,GAAG,CAAC,aAAa,CAAC,CAAC;AACxG,CAAC"}
+{"version":3,"file":"removeLayoutSectionHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/layout/removeLayoutSectionHandler.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAiC,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC7F,OAAO,OAAO,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EACH,0BAA0B,EAC1B,YAAY,EACZ,kBAAkB,GACrB,MAAM,yCAAyC,CAAC;AAEjD,MAAM,SAAS,CAAC,CAAC,0BAA0B,CACvC,GAAqB,EACrB,GAAwB;IAExB,MAAM,MAAM,GAAoC,MAAM,MAAM,CAAC,YAAY,CAAC,CAAC;IAC3E,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC;IAC/C,MAAM,eAAe,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC;IAClD,MAAM,QAAQ,GAAG,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAEjF,IAAI,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QACpB,MAAM,wBAAwB,CAAC,GAAG,EAAE,GAAG,EAAE,sDAAsD,CAAC,CAAC;IACrG,CAAC;IAED,IAAI,eAAe,EAAE,CAAC;QAClB,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC;YACxC,MAAM,wBAAwB,CAC1B,GAAG,EACH,GAAG,EACH,6DAA6D,KAAK,GAAG,CACxE,CAAC;QACN,CAAC;IACL,CAAC;SAAM,CAAC;QACJ,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC;YACxC,MAAM,wBAAwB,CAC1B,GAAG,EACH,GAAG,EACH,6DAA6D,0BAA0B,CACnF,KAAK,CACR,GAAG,CACP,CAAC;QACN,CAAC;IACL,CAAC;IAED,MAAM,aAAa,GAAG,eAAe;QACjC,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC;QAC9C,CAAC,CAAC,oBAAoB,CAAC,QAAQ,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IACzD,MAAM,OAAO,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAC;IAExC,MAAM,aAAa,GAAG,eAAe;QACjC,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE;QACpD,CAAC,CAAC,kBAAkB,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;IAE/C,MAAM,GAAG,CACL,aAAa,CAAC,aAAa,CAAC;QACxB,KAAK,EAAE,aAAa;QACpB,eAAe;QACf,IAAI,EAAE;YACF,GAAG;SACN;KACJ,CAAC,CACL,CAAC;IAEF,OAAO,oBAAoB,CACvB,GAAG,EACH,OAAO,EACP,aAAa,EACb,aAAa,EACb,KAAK,EACL,eAAe,EACf,GAAG,CAAC,aAAa,CACpB,CAAC;AACN,CAAC"}

package/esm/model/commandHandlers/layout/removeSectionItemByWidgetRefHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"removeSectionItemByWidgetRefHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/layout/removeSectionItemByWidgetRefHandler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAG1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE9D,OAAO,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAC;AAKxE,wBAAiB,mCAAmC,CAChD,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,4BAA4B,GAClC,YAAY,CAAC,IAAI,CAAC,CA2BpB"}
+{"version":3,"file":"removeSectionItemByWidgetRefHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/layout/removeSectionItemByWidgetRefHandler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAG1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE9D,OAAO,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAC;AAKxE,wBAAiB,mCAAmC,CAChD,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,4BAA4B,GAClC,YAAY,CAAC,IAAI,CAAC,CA6BpB"}

package/esm/model/commandHandlers/layout/removeSectionItemByWidgetRefHandler.js

@@ -1,12 +1,12 @@
 import { call, select } from "redux-saga/effects";
-import { selectWidgetCoordinatesByRef } from "../../store/layout/layoutSelectors.js";
+import { selectWidgetPathByRef } from "../../store/layout/layoutSelectors.js";
 import { removeSectionItemSaga } from "./removeSectionItemHandler.js";
 import { invalidArgumentsProvided } from "../../events/general.js";
 import { objRefToString } from "@gooddata/sdk-model";
 export function* removeSectionItemByWidgetRefHandler(ctx, cmd) {
     let widgetCoordinates;
     try {
-        widgetCoordinates = yield select(selectWidgetCoordinatesByRef(cmd.payload.widgetRef));
+        widgetCoordinates = yield select(selectWidgetPathByRef(cmd.payload.widgetRef));
     }
     catch (e) {
         throw invalidArgumentsProvided(ctx, cmd, `Can't get widget coordinates for widget ref: ${objRefToString(cmd.payload.widgetRef)}, ${e.message}`);
@@ -14,7 +14,9 @@ export function* removeSectionItemByWidgetRefHandler(ctx, cmd) {
     return yield call(removeSectionItemSaga, ctx, {
         correlationId: cmd.correlationId,
         payload: {
-            ...widgetCoordinates,
+            itemPath: widgetCoordinates,
+            sectionIndex: -1, // just for compatibility purposes, information will be ignored
+            itemIndex: -1, // just for compatibility purposes, information will be ignored
             eager: cmd.payload.eager,
             stashIdentifier: cmd.payload.stashIdentifier,
         },

package/esm/model/commandHandlers/layout/removeSectionItemByWidgetRefHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"removeSectionItemByWidgetRefHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/layout/removeSectionItemByWidgetRefHandler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,4BAA4B,EAAE,MAAM,uCAAuC,CAAC;AAIrF,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,MAAM,SAAS,CAAC,CAAC,mCAAmC,CAChD,GAAqB,EACrB,GAAiC;IAEjC,IAAI,iBAA8E,CAAC;IACnF,IAAI,CAAC;QACD,iBAAiB,GAAG,MAAM,MAAM,CAAC,4BAA4B,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;IAC1F,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QACd,MAAM,wBAAwB,CAC1B,GAAG,EACH,GAAG,EACH,gDAAgD,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,KACjF,CAAC,CAAC,OACN,EAAE,CACL,CAAC;IACN,CAAC;IAED,OAAO,MAAM,IAAI,CACb,qBAAqB,EACrB,GAAG,EACH;QACI,aAAa,EAAE,GAAG,CAAC,aAAa;QAChC,OAAO,EAAE;YACL,GAAG,iBAAiB;YACpB,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC,KAAK;YACxB,eAAe,EAAE,GAAG,CAAC,OAAO,CAAC,eAAe;SAC/C;KACJ,EACD,GAAG,CACN,CAAC;AACN,CAAC"}
+{"version":3,"file":"removeSectionItemByWidgetRefHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/layout/removeSectionItemByWidgetRefHandler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAI9E,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,MAAM,SAAS,CAAC,CAAC,mCAAmC,CAChD,GAAqB,EACrB,GAAiC;IAEjC,IAAI,iBAAuE,CAAC;IAC5E,IAAI,CAAC;QACD,iBAAiB,GAAG,MAAM,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;IACnF,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QACd,MAAM,wBAAwB,CAC1B,GAAG,EACH,GAAG,EACH,gDAAgD,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,KACjF,CAAC,CAAC,OACN,EAAE,CACL,CAAC;IACN,CAAC;IAED,OAAO,MAAM,IAAI,CACb,qBAAqB,EACrB,GAAG,EACH;QACI,aAAa,EAAE,GAAG,CAAC,aAAa;QAChC,OAAO,EAAE;YACL,QAAQ,EAAE,iBAAiB;YAC3B,YAAY,EAAE,CAAC,CAAC,EAAE,+DAA+D;YACjF,SAAS,EAAE,CAAC,CAAC,EAAE,+DAA+D;YAC9E,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC,KAAK;YACxB,eAAe,EAAE,GAAG,CAAC,OAAO,CAAC,eAAe;SAC/C;KACJ,EACD,GAAG,CACN,CAAC;AACN,CAAC"}

package/esm/model/commandHandlers/layout/removeSectionItemHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"removeSectionItemHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/layout/removeSectionItemHandler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,4BAA4B,EAAE,MAAM,yBAAyB,CAAC;AAG1F,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AAOrE,KAAK,wBAAwB,GAAG;IAC5B,QAAQ,CAAC,GAAG,EAAE,gBAAgB,CAAC;IAC/B,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;IAC9C,WAAW,EAAE,iBAAiB,GAAG,4BAA4B,CAAC;IAC9D,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;CACpD,CAAC;AAqCF,wBAAiB,wBAAwB,CAAC,GAAG,EAAE,gBAAgB,EAAE,GAAG,EAAE,iBAAiB,GAAG,YAAY,CAAC,IAAI,CAAC,CAE3G;AAED,wBAAiB,qBAAqB,CAClC,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,iBAAiB,GAAG,wBAAwB,CAAC,KAAK,CAAC,EACxD,WAAW,GAAE,4BAAyC,GACvD,YAAY,CAAC,IAAI,CAAC,CAyEpB"}
+{"version":3,"file":"removeSectionItemHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/layout/removeSectionItemHandler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAG1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,4BAA4B,EAAE,MAAM,yBAAyB,CAAC;AAG1F,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AAerE,KAAK,wBAAwB,GAAG;IAC5B,QAAQ,CAAC,GAAG,EAAE,gBAAgB,CAAC;IAC/B,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;IAC9C,WAAW,EAAE,iBAAiB,GAAG,4BAA4B,CAAC;IAC9D,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;CACpD,CAAC;AAoEF,wBAAiB,wBAAwB,CAAC,GAAG,EAAE,gBAAgB,EAAE,GAAG,EAAE,iBAAiB,GAAG,YAAY,CAAC,IAAI,CAAC,CAE3G;AAED,wBAAiB,qBAAqB,CAClC,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,iBAAiB,GAAG,wBAAwB,CAAC,KAAK,CAAC,EACxD,WAAW,GAAE,4BAAyC,GACvD,YAAY,CAAC,IAAI,CAAC,CA2EpB"}

package/esm/model/commandHandlers/layout/removeSectionItemHandler.js

@@ -1,24 +1,41 @@
+import { call, put, select } from "redux-saga/effects";
 import { dispatchDashboardEvent } from "../../store/_infra/eventDispatcher.js";
 import { invalidArgumentsProvided } from "../../events/general.js";
 import { selectLayout } from "../../store/layout/layoutSelectors.js";
-import { call, put, select } from "redux-saga/effects";
-import { validateItemExists, validateSectionExists } from "./validation/layoutValidation.js";
 import { layoutSectionItemRemoved, layoutSectionRemoved } from "../../events/layout.js";
 import { layoutActions } from "../../store/layout/index.js";
+import { findSection, serializeLayoutItemPath, findItem, asSectionPath, getItemIndex, getSectionIndex, } from "../../../_staging/layout/coordinates.js";
+import { validateItemExists, validateSectionExists } from "./validation/layoutValidation.js";
 function validateAndResolve(commandCtx) {
-    const { ctx, cmd: { payload: { sectionIndex, itemIndex }, }, layout, } = commandCtx;
-    if (!validateSectionExists(layout, sectionIndex)) {
-        throw invalidArgumentsProvided(ctx, commandCtx.originalCmd, `Attempting to remove item from non-existent section at ${sectionIndex}. There are only ${layout.sections.length} sections.`);
+    const { ctx, cmd: { payload: { itemIndex, sectionIndex, itemPath }, }, layout, } = commandCtx;
+    if (itemPath === undefined) {
+        if (!validateSectionExists(layout, sectionIndex)) {
+            throw invalidArgumentsProvided(ctx, commandCtx.originalCmd, `Attempting to remove item from non-existent section at ${sectionIndex}. There are only ${layout.sections.length} sections.`);
+        }
+        const fromSection = layout.sections[sectionIndex];
+        if (!validateItemExists(fromSection, itemIndex)) {
+            throw invalidArgumentsProvided(ctx, commandCtx.originalCmd, `Attempting to remove non-existent item from index ${itemIndex} in section ${sectionIndex}. There are only ${fromSection.items.length} items in this section.`);
+        }
+        const itemToRemove = fromSection.items[itemIndex];
+        return {
+            fromSection,
+            itemToRemove,
+        };
     }
-    const fromSection = layout.sections[sectionIndex];
-    if (!validateItemExists(fromSection, itemIndex)) {
-        throw invalidArgumentsProvided(ctx, commandCtx.originalCmd, `Attempting to remove non-existent item from index ${itemIndex} in section ${sectionIndex}. There are only ${fromSection.items.length} items in this section.`);
+    else {
+        if (!validateSectionExists(layout, itemPath)) {
+            throw invalidArgumentsProvided(ctx, commandCtx.originalCmd, `Attempting to remove item from non-existent section at ${itemPath ? serializeLayoutItemPath(itemPath) : undefined}.`);
+        }
+        const fromSection = findSection(layout, itemPath);
+        if (!validateItemExists(fromSection, itemPath)) {
+            throw invalidArgumentsProvided(ctx, commandCtx.originalCmd, `Attempting to remove non-existent item from index ${serializeLayoutItemPath(itemPath)}. There are only ${fromSection.items.length} items in this section.`);
+        }
+        const itemToRemove = findItem(layout, itemPath);
+        return {
+            fromSection,
+            itemToRemove,
+        };
     }
-    const itemToRemove = fromSection.items[itemIndex];
-    return {
-        fromSection,
-        itemToRemove,
-    };
 }
 export function* removeSectionItemHandler(ctx, cmd) {
     return yield call(removeSectionItemSaga, ctx, cmd);
@@ -31,10 +48,10 @@ export function* removeSectionItemSaga(ctx, cmd, originalCmd = cmd) {
         layout: yield select(selectLayout),
     };
     const { fromSection, itemToRemove } = validateAndResolve(commandCtx);
-    const { sectionIndex, itemIndex, eager, stashIdentifier } = cmd.payload;
+    const { sectionIndex, itemIndex, itemPath, eager, stashIdentifier } = cmd.payload;
     if (eager && fromSection.items.length === 1) {
         yield put(layoutActions.removeSection({
-            index: sectionIndex,
+            index: itemPath === undefined ? { parent: undefined, sectionIndex } : asSectionPath(itemPath),
             stashIdentifier,
             undo: {
                 cmd: originalCmd,
@@ -46,19 +63,18 @@ export function* removeSectionItemSaga(ctx, cmd, originalCmd = cmd) {
             ...fromSection,
             items: [],
         };
-        yield dispatchDashboardEvent(layoutSectionItemRemoved(ctx, itemToRemove, itemIndex, sectionWithEmptyItems, stashIdentifier, cmd.correlationId));
-        yield dispatchDashboardEvent(layoutSectionRemoved(ctx, sectionWithEmptyItems, sectionIndex, true, undefined, cmd.correlationId));
+        yield dispatchDashboardEvent(layoutSectionItemRemoved(ctx, itemToRemove, itemPath === undefined ? itemIndex : getItemIndex(itemPath), itemPath === undefined ? [{ sectionIndex, itemIndex }] : itemPath, sectionWithEmptyItems, stashIdentifier, cmd.correlationId));
+        yield dispatchDashboardEvent(layoutSectionRemoved(ctx, sectionWithEmptyItems, itemPath === undefined ? sectionIndex : getSectionIndex(itemPath), itemPath === undefined ? { parent: undefined, sectionIndex } : asSectionPath(itemPath), true, undefined, cmd.correlationId));
     }
     else {
         yield put(layoutActions.removeSectionItem({
-            sectionIndex,
-            itemIndex,
+            itemIndex: itemPath === undefined ? [{ sectionIndex, itemIndex }] : itemPath,
             stashIdentifier,
             undo: {
                 cmd: originalCmd,
             },
         }));
-        yield dispatchDashboardEvent(layoutSectionItemRemoved(ctx, itemToRemove, itemIndex, undefined, stashIdentifier, cmd.correlationId));
+        yield dispatchDashboardEvent(layoutSectionItemRemoved(ctx, itemToRemove, itemPath === undefined ? itemIndex : getItemIndex(itemPath), itemPath === undefined ? [{ sectionIndex, itemIndex }] : itemPath, undefined, stashIdentifier, cmd.correlationId));
     }
 }
 //# sourceMappingURL=removeSectionItemHandler.js.map