bencripps / react-redux-grid

>>>>>>> cc5039bab2db43dffc3dec6fd8fe7b5bc8c236a4

        data: data.insert(rowIndex, newRow),

        proxy: data,

        isEditing: true,

        total: updatedTotal + 1,

        lastUpdate: generateLastUpdate()

<<<<<<< HEAD

    }, 'mergeIn');

=======

    }, DataSource, 'mergeIn');

>>>>>>> cc5039bab2db43dffc3dec6fd8fe7b5bc8c236a4

};

export const moveNode = (state, {

    current, next, showTreeRootNode, stateKey

}) => {

    const nextPath = List(next.path);

    const tree = state.getIn([stateKey, 'treeData']);

    const currentPath = List(current.path);

    const newTreeMove = moveTreeNode(

        tree,

        current.index,

        currentPath,

        next.index,

        nextPath

    );

    let flatMove = treeToFlatList(newTreeMove);

    // remove root-node

    if (!showTreeRootNode) {

        flatMove = flatMove.shift();

    }

<<<<<<< HEAD

    return getUpdatedDataRecord(state, stateKey, {

    }

    return getUpdatedRecord(state, stateKey, {

        data: keyedData,

        proxy: keyedData,

        total: total || keyedData.count(),

        treeData: fromJS(treeData),

        gridType: gridType || 'grid',

        currentRecords: keyedCurr

            ? keyedCurr

            : keyedData,

        lastUpdate: generateLastUpdate()

    }, DataSource);

};

export const setPartialTreeData = (state, {

    data, parentId, showTreeRootNode, stateKey

}) => {

    const tree = state.getIn([stateKey, 'treeData']);

    const flat = state.getIn([stateKey, 'data']);

    const pathToNode = [

        -1, ...getTreePathFromId(flat, parentId)

    ];

    const updatedTree = setTreeValue(

        tree, pathToNode, { children: data }

    );

    let updatedFlat = treeToFlatList(updatedTree);

    if (!showTreeRootNode) {

        updatedFlat = updatedFlat.shift();