From ca0791414adeab6786f8fc5df8bd8ef712cbfb5c Mon Sep 17 00:00:00 2001
From: Kurt Junghanns <tboonx@googlemail.com>
Date: Fri, 26 Oct 2018 18:02:41 +0200
Subject: [PATCH 01/19] [SWIK-907_delete_deck_and_transfer_ownership] Started
 to work on feature - first modal and structure.

---
 actions/deckedit/deckDeletion.js              |  14 ++
 .../DeckEditPanel/DeckPropertiesEditor.js     |  59 ++++++++
 .../DeckEditPanel/TransferOwnership.js        | 132 ++++++++++++++++++
 services/deck.js                              |  26 +++-
 stores/DeckEditStore.js                       |  21 ++-
 5 files changed, 249 insertions(+), 3 deletions(-)
 create mode 100644 actions/deckedit/deckDeletion.js
 create mode 100644 components/Deck/ContentPanel/DeckModes/DeckEditPanel/TransferOwnership.js

diff --git a/actions/deckedit/deckDeletion.js b/actions/deckedit/deckDeletion.js
new file mode 100644
index 000000000..b4a56953b
--- /dev/null
+++ b/actions/deckedit/deckDeletion.js
@@ -0,0 +1,14 @@
+const log = require('../log/clog');
+
+export default function deckDeletion(context, payload, done) {
+    log.info(context);
+    context.service.delete('deck.delete', payload, { timeout: 20 * 1000 }, (err, res) => {
+        if (err) {
+            context.dispatch('DELETE_DECK_ERROR', err);
+        }
+        else {
+            context.dispatch('DELETE_DECK_SUCCESS', res);
+        }
+        done();
+    });
+}
diff --git a/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
index 479ea2aee..de069476e 100644
--- a/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
+++ b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
@@ -21,6 +21,7 @@ import TagsStore from '../../../../../stores/TagsStore';
 import PermissionsStore from '../../../../../stores/PermissionsStore';
 import updateTheme from '../../../../../actions/updateTheme';
 import {showGroupDetailsModal} from '../../../../../actions/deckedit/functionsForGroupDetailsModal';
+import deckDeletion from '../../../../../actions/deckedit/deckDeletion';
 
 import {educationLevels} from '../../../../../lib/isced';
 import TagInput from '../../../ContentModulesPanel/TagsPanel/TagInput';
@@ -237,6 +238,60 @@ class DeckPropertiesEditor extends React.Component {
         }
     }
 
+    handleDelete(evt) {
+        evt.preventDefault();
+
+        if ( this.props.DeckEditStore.roots && this.props.DeckEditStore.roots.length < 1 ) {
+            // not used in other decks
+
+            if (this.state.editors.length < 1 && this.state.groups.length < 1) {
+                // no editors - could just be deleted
+                this.context.executeAction(deckDeletion, {id: this.props.DeckEditStore.deckProps.sid.split('-')[0]});
+            }
+            else {
+                // transfer ownership
+
+            }
+        }
+        else {
+            // is included as subdeck in one other deck and could not just deleted
+            // show modal with 2 options: delete and remove
+
+            const parentRootDecks = this.props.DeckEditStore.roots.map(deck => `<a href="${location.origin}/deck/${deck.id}" target="_blank">${deck.id}</a>`);
+            swal({
+                title: 'Deck is in use',
+                html: 'The deck you want to delete is used as a subdeck in the following decks: <br>'
+                    + parentRootDecks.join('<br>')
+                    + '<br><br>You could remove your deck as a subdeck from the listed ones or delete the deck complete which also removes it as subdeck.',
+                type: 'question',
+                showCancelButton: true,
+                confirmButtonText: 'Remove as subdeck',
+                confirmButtonClass: 'ui button',
+                cancelButtonText: 'Delete whole deck',
+                cancelButtonClass: 'negative ui button',
+                allowEscapeKey: true,
+                allowOutsideClick: false,
+                buttonsStyling: false
+            })
+                .then((result) => {
+                    console.log(result);
+                    // confirm btn
+                    // remove deck as node from the parent deck
+                })
+                .catch(() => {
+                    // cancel btn
+                    if (this.state.editors.length < 1 && this.state.groups.length < 1) {
+                        // no editors - could just be deleted
+                        this.context.executeAction(deckDeletion, {id: this.props.DeckEditStore.deckProps.sid.split('-')[0]});
+                    }
+                    else {
+                        // transfer ownership
+
+                    }
+                });
+        }
+    }
+
     handleChange(fieldName, event) {
         let stateChange = {};
         stateChange[fieldName] = event.target.value;
@@ -392,6 +447,7 @@ class DeckPropertiesEditor extends React.Component {
     }
 
     render() {
+        console.log('render edit: published and roots', this.state.published, this.props.DeckEditStore.roots);
         //CSS
         let titleFieldClass = classNames({
             'required': true,
@@ -485,6 +541,9 @@ class DeckPropertiesEditor extends React.Component {
                 <button className='ui primary button'
                     onClick={this.handleSave.bind(this)}>Save
                 </button>
+                <button className='negative ui button'
+                    onClick={this.handleDelete.bind(this)}>Delete
+                </button>
                 <button className="ui secondary button"
                     onClick={this.handleCancel.bind(this)}>
                     Cancel
diff --git a/components/Deck/ContentPanel/DeckModes/DeckEditPanel/TransferOwnership.js b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/TransferOwnership.js
new file mode 100644
index 000000000..1d9a0edda
--- /dev/null
+++ b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/TransferOwnership.js
@@ -0,0 +1,132 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import ReactDOM from 'react-dom';
+import FocusTrap from 'focus-trap-react';
+import {Button, Icon, Modal, Header, TextArea, Segment, Container} from 'semantic-ui-react';
+import {hideGroupDetailsModal} from '../../../../../actions/deckedit/functionsForGroupDetailsModal';
+import { FormattedMessage, defineMessages } from 'react-intl';
+
+class TransferOwnership extends React.Component {
+    constructor(props) {
+        super(props);
+        this.handleClose = this.handleClose.bind(this);
+        this.unmountTrap = this.unmountTrap.bind(this);
+
+        this.messages = defineMessages({
+            modalHeading: {
+                id: 'TransferOwnership.modalHeading',
+                defaultMessage: 'Group details'
+            },
+        });
+    }
+
+    handleClose() {
+	      $('#app').attr('aria-hidden','false');
+	      this.context.executeAction(hideGroupDetailsModal, {});
+    }
+
+    unmountTrap() {
+        this.handleClose();
+    }
+
+    render() {
+        let members = [];
+        //first the creator
+        let optionalText = (this.props.group.creator.organization || this.props.group.creator.country) ?
+            (this.props.group.creator.organization || this.context.intl.formatMessage(this.messages.unknownOrganization)) + ', ' + (this.props.group.creator.country || this.context.intl.formatMessage(this.messages.unknownCountry)) :
+            '';
+        members.push(
+          (
+            <div className="item" key={this.props.group.creator.userid}>
+              <div className="ui grid">
+                <div className="one wide column middle aligned">
+                  <UserPicture picture={ this.props.group.creator.picture } username={ this.props.group.creator.username } avatar={ true } width= { 24 } />
+                </div>
+                <div className="fifteen wide column">
+                  <TextArea className="sr-only" id={'usernameIsALinkHint' + this.props.group.creator.userid} value={this.context.intl.formatMessage(this.messages.linkHint)} tabIndex ='-1'/>
+                  <a className="header" href={'/user/' + this.props.group.creator.username} target="_blank">{this.props.group.creator.displayName || this.props.group.creator.username}</a>
+                  <div className="description">
+                    {this.context.intl.formatMessage(this.messages.groupCreator)}
+                  </div>
+                  {optionalText}
+                </div>
+              </div>
+            </div>
+          )
+        );
+        if (this.props.group.members !== undefined && this.props.group.members.length > 0) {
+            this.props.group.members.forEach((user) => {
+                optionalText = (user.organization || user.country) ?
+                    (user.organization || this.context.intl.formatMessage(this.messages.unknownOrganization)) + ', ' + (user.country || this.context.intl.formatMessage(this.messages.unknownCountry)) :
+                    '';
+                members.push(
+                  (
+                    <div className="item" key={user.userid}>
+                      <div className="ui grid">
+                        <div className="one wide column">
+                          <UserPicture picture={ user.picture } username={ user.username } avatar={ true } width= { 24 } />
+                        </div>
+                        <div className="fifteen wide column">
+                          <TextArea className="sr-only" id={'usernameIsALinkHint' + user.userid} value={this.context.intl.formatMessage(this.messages.linkHint)} tabIndex ='-1'/>
+                          <a className="header" href={'/user/' + user.username} target="_blank">{user.displayName || user.username}</a>
+                          {optionalText}
+                        </div>
+                      </div>
+                    </div>
+                  )
+                );
+            });
+        }
+
+        let showModal = this.props.show;
+
+        return (
+          <Modal dimmer='blurring'
+            ref="modal1"
+            role='dialog'
+            aria-labelledby='groupdetailsmodal_header'
+						aria-describedby='groupdetailsmodal_content'
+            open={showModal}
+            tabIndex="0" >
+              <FocusTrap focusTrapOptions={{
+                  clickOutsideDeactivates: true,
+                  onDeactivate: this.unmountTrap,
+                  initialFocus:'#groupdetailsmodal_content'
+              }}
+                active={showModal}
+                id="focusTrapGroupDetailsModal"
+                className="header">
+								<Modal.Header as="h1" content={this.context.intl.formatMessage(this.messages.modalHeading)} id='groupdetailsmodal_header'/>
+								<Modal.Content id='groupdetailsmodal_content' tabIndex="0">
+                  <Container>
+                    <Segment color="blue" textAlign="center" padded>
+                      <Segment attached="bottom" textAlign="left">
+      									<h3 className="header" >{this.props.group.name}</h3>
+      									<p>There are {this.props.group.members.length+1} member{(this.props.group.members.length !== 0) ? 's': ''} in this group.</p>
+      									<div className="ui very relaxed  list">
+      											{members}
+      									</div>
+                      </Segment>
+                      <Modal.Actions>
+  											<Button onClick={ this.handleClose } role="button" tabIndex="0" aria-label={this.context.intl.formatMessage(this.messages.close)}>
+  													{this.context.intl.formatMessage(this.messages.close)}
+  											</Button>
+      								</Modal.Actions>
+                    </Segment>
+                  </Container>
+								</Modal.Content>
+
+              </FocusTrap>
+						</Modal>
+        );
+
+        window.scrollTo(0, 0);
+    }
+}
+
+GroupDetailsModal.contextTypes = {
+    executeAction: PropTypes.func.isRequired,
+    intl: PropTypes.object.isRequired
+};
+
+export default TransferOwnership;
diff --git a/services/deck.js b/services/deck.js
index 34b50e029..bf044eefd 100644
--- a/services/deck.js
+++ b/services/deck.js
@@ -258,7 +258,13 @@ export default {
             // fetch the tags data
             let tagsPromise = deckPromise.then((deck) => fetchTagInfo(deck.tags));
 
-            Promise.all([deckPromise, tagsPromise]).then(([deck, tags]) => {
+            //fetch root decks
+            let rootsPromise = rp.get({
+                uri: Microservices.deck.uri + '/deck/' + args.sid.split('-')[0] + '/rootDecks',
+                json:true,
+            });
+
+            Promise.all([deckPromise, tagsPromise, rootsPromise]).then(([deck, tags, roots]) => {
                 // prepare users and groups from editors object
                 let {users, groups} = deck.editors || {};
                 if (!users) users = [];
@@ -291,6 +297,7 @@ export default {
 
                     callback(null, {
                         deckProps: deckProps,
+                        roots
                     });
                 });
             }).catch((err) => {
@@ -554,8 +561,23 @@ export default {
             })
             .catch((err) => callback(err));
         }
+    },
+    delete: (req, resource, params, config, callback) => {
+        req.reqId = req.reqId ? req.reqId : -1;
+        log.info({Id: req.reqId, Service: __filename.split('/').pop(), Resource: resource, Operation: 'delete', Method: req.method});
+        if (resource === 'deck.delete') {
+            rp({
+                method: 'DELETE',
+                uri: Microservices.deck.uri + '/deck/' + params.id,
+                headers: { '----jwt----': params.jwt },
+                json: true
+            })
+            .then((body) => {
+                callback(null, body);
+            })
+            .catch((err) => callback(err));
+        }
     }
-    // delete: (req, resource, params, config, callback) => {}
 };
 
 function addSlugs(decks) {
diff --git a/stores/DeckEditStore.js b/stores/DeckEditStore.js
index 98f191ca2..3ab94f450 100644
--- a/stores/DeckEditStore.js
+++ b/stores/DeckEditStore.js
@@ -25,6 +25,8 @@ class DeckEditStore extends BaseStore {
         this.showGroupModal = false;
 
         this.queryParams = {};
+
+        this.roots = [];
     }
 
     updateProperties(payload) {
@@ -37,6 +39,9 @@ class DeckEditStore extends BaseStore {
         this.originalEditors = JSON.parse(JSON.stringify(payload.deckProps.editors));
         // console.log('Now we have new origin editors:', this.originalEditors);
 
+        this.roots = payload.roots.filter(deck => parseInt(deck.id, 10) !== parseInt(this.deckProps.sid.split('-')[0], 10));
+        // console.log('DeckEditStore roots', payload.roots, this.roots, this.deckProps.sid, this.deckProps.sid.split('-')[0]);
+
         this.emitChange();
     }
 
@@ -61,6 +66,7 @@ class DeckEditStore extends BaseStore {
             showGroupModal: this.showGroupModal,
             queryParams: this.queryParams,
             showGroupModal: this.showGroupModal,
+            roots: this.roots,
         };
     }
 
@@ -78,6 +84,7 @@ class DeckEditStore extends BaseStore {
         this.originalEditors = state.originalEditors;
         this.showGroupModal = state.showGroupModal;
         this.queryParams = state.queryParams;
+        this.roots = state.roots;
     }
 
     updateAuthorizedUsers(users) {
@@ -112,6 +119,14 @@ class DeckEditStore extends BaseStore {
         this.showGroupModal = false;
         this.emitChange();
     }
+
+    deleteDeckError(error) {
+
+    }
+
+    deleteDeck(data) {
+
+    }
 }
 
 DeckEditStore.storeName = 'DeckEditStore';
@@ -125,7 +140,11 @@ DeckEditStore.handlers = {
     'DECKEDIT_START_QUERY_PARAMS': 'setQueryParams',
 
     //Group details modal
-    'HIDE_GROUP_DETAILS_MODAL': 'hideGroupsDetailsModal'
+    'HIDE_GROUP_DETAILS_MODAL': 'hideGroupsDetailsModal',
+
+    // Deck deletion/removable
+    'DELETE_DECK_ERROR': 'deleteDeckError',
+    'DELETE_DECK_SUCCESS': 'deleteDeck'
 };
 
 export default DeckEditStore;

From c45ab8a541629c0cc77fa619aebc7bf50e2944ae Mon Sep 17 00:00:00 2001
From: Kurt Junghanns <tboonx@googlemail.com>
Date: Mon, 29 Oct 2018 10:27:36 +0100
Subject: [PATCH 02/19] [SWIK-907_delete_deck_and_transfer_ownership] Add of
 remove deck action and calls

---
 actions/deckedit/deckDeletion.js              |  1 +
 .../DeckEditPanel/DeckPropertiesEditor.js     | 76 ++++++++++++++++++-
 services/deck.js                              | 12 +++
 stores/DeckEditStore.js                       | 31 +++++++-
 4 files changed, 115 insertions(+), 5 deletions(-)

diff --git a/actions/deckedit/deckDeletion.js b/actions/deckedit/deckDeletion.js
index b4a56953b..6c2bc4d0b 100644
--- a/actions/deckedit/deckDeletion.js
+++ b/actions/deckedit/deckDeletion.js
@@ -2,6 +2,7 @@ const log = require('../log/clog');
 
 export default function deckDeletion(context, payload, done) {
     log.info(context);
+    context.dispatch('START_DELETE_DECK');
     context.service.delete('deck.delete', payload, { timeout: 20 * 1000 }, (err, res) => {
         if (err) {
             context.dispatch('DELETE_DECK_ERROR', err);
diff --git a/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
index de069476e..2a7e5c9bf 100644
--- a/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
+++ b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
@@ -22,6 +22,7 @@ import PermissionsStore from '../../../../../stores/PermissionsStore';
 import updateTheme from '../../../../../actions/updateTheme';
 import {showGroupDetailsModal} from '../../../../../actions/deckedit/functionsForGroupDetailsModal';
 import deckDeletion from '../../../../../actions/deckedit/deckDeletion';
+import deckRemove from '../../../../../actions/deckedit/deckRemove';
 
 import {educationLevels} from '../../../../../lib/isced';
 import TagInput from '../../../ContentModulesPanel/TagsPanel/TagInput';
@@ -94,6 +95,76 @@ class DeckPropertiesEditor extends React.Component {
                     })
                     .catch();
             }
+            else if (newProps.DeckEditStore.viewstate === 'errorDelete') {
+                swal({
+                    title: 'Error',
+                    text: 'Unknown error while deleting.',
+                    type: 'error',
+                    confirmButtonText: 'Close',
+                    confirmButtonClass: 'negative ui button',
+                    allowEscapeKey: true,
+                    allowOutsideClick: true,
+                    buttonsStyling: false
+                })
+                    .then(() => {
+                        return true;
+                    })
+                    .catch();
+            }
+            else if (newProps.DeckEditStore.viewstate === 'successDelete') {
+                swal({
+                    title: 'Success',
+                    text: 'The deck was deleted.',
+                    type: 'success',
+                    confirmButtonText: 'Confirm',
+                    confirmButtonClass: 'positive ui button',
+                    allowEscapeKey: true,
+                    allowOutsideClick: true,
+                    buttonsStyling: false
+                })
+                    .then(() => {
+                        this.context.executeAction(navigateAction, {
+                            url: '/'
+                        });
+                    })
+                    .catch(() => {
+                        this.context.executeAction(navigateAction, {
+                            url: '/'
+                        });
+                    });
+            }
+            else if (newProps.DeckEditStore.viewstate === 'errorRemove') {
+                swal({
+                    title: 'Error',
+                    text: 'Unknown error while removing.',
+                    type: 'error',
+                    confirmButtonText: 'Close',
+                    confirmButtonClass: 'negative ui button',
+                    allowEscapeKey: true,
+                    allowOutsideClick: true,
+                    buttonsStyling: false
+                })
+                    .then(() => {
+                        return true;
+                    })
+                    .catch();
+            }
+            else if (newProps.DeckEditStore.viewstate === 'successRemove') {
+                swal({
+                    title: 'Success',
+                    text: 'The deck was removed from its parents.',
+                    type: 'success',
+                    confirmButtonText: 'Confirm',
+                    confirmButtonClass: 'positive ui button',
+                    allowEscapeKey: true,
+                    allowOutsideClick: true,
+                    buttonsStyling: false
+                })
+                    .then(() => {
+                        return true;
+                    })
+                    .catch();
+            }
         }
     }
     componentDidUpdate() {
@@ -241,7 +312,7 @@ class DeckPropertiesEditor extends React.Component {
     handleDelete(evt) {
         evt.preventDefault();
 
-        if ( this.props.DeckEditStore.roots && this.props.DeckEditStore.roots.length < 1 ) {
+        if ( this.props.DeckEditStore.roots.length < 1 ) {
             // not used in other decks
 
             if (this.state.editors.length < 1 && this.state.groups.length < 1) {
@@ -257,7 +328,7 @@ class DeckPropertiesEditor extends React.Component {
             // is included as subdeck in one other deck and could not just deleted
             // show modal with 2 options: delete and remove
 
-            const parentRootDecks = this.props.DeckEditStore.roots.map(deck => `<a href="${location.origin}/deck/${deck.id}" target="_blank">${deck.id}</a>`);
+            const parentRootDecks = this.props.DeckEditStore.roots.map((deck) => `<a href="${location.origin}/deck/${deck.id}" target="_blank">${deck.id}</a>`);
             swal({
                 title: 'Deck is in use',
                 html: 'The deck you want to delete is used as a subdeck in the following decks: <br>'
@@ -277,6 +348,7 @@ class DeckPropertiesEditor extends React.Component {
                     console.log(result);
                     // confirm btn
                     // remove deck as node from the parent deck
+                    this.context.executeAction(deckRemove, {id: this.props.DeckEditStore.deckProps.sid.split('-')[0]});
                 })
                 .catch(() => {
                     // cancel btn
diff --git a/services/deck.js b/services/deck.js
index bf044eefd..25710dbbe 100644
--- a/services/deck.js
+++ b/services/deck.js
@@ -577,6 +577,18 @@ export default {
             })
             .catch((err) => callback(err));
         }
+        else if (resource === 'deck.delete') {
+            rp({
+                method: 'DELETE',
+                uri: Microservices.deck.uri + '/deck/' + params.id + '/links',
+                headers: { '----jwt----': params.jwt },
+                json: true
+            })
+            .then((body) => {
+                callback(null, body);
+            })
+            .catch((err) => callback(err));
+        }
     }
 };
 
diff --git a/stores/DeckEditStore.js b/stores/DeckEditStore.js
index 3ab94f450..118651bd2 100644
--- a/stores/DeckEditStore.js
+++ b/stores/DeckEditStore.js
@@ -39,7 +39,7 @@ class DeckEditStore extends BaseStore {
         this.originalEditors = JSON.parse(JSON.stringify(payload.deckProps.editors));
         // console.log('Now we have new origin editors:', this.originalEditors);
 
-        this.roots = payload.roots.filter(deck => parseInt(deck.id, 10) !== parseInt(this.deckProps.sid.split('-')[0], 10));
+        this.roots = payload.roots.filter((deck) => parseInt(deck.id, 10) !== parseInt(this.deckProps.sid.split('-')[0], 10));
         // console.log('DeckEditStore roots', payload.roots, this.roots, this.deckProps.sid, this.deckProps.sid.split('-')[0]);
 
         this.emitChange();
@@ -121,11 +121,33 @@ class DeckEditStore extends BaseStore {
     }
 
     deleteDeckError(error) {
-
+        this.viewstate = 'errorDelete';
+        this.emitChange();
+        this.viewstate = '';
     }
 
     deleteDeck(data) {
+        this.viewstate = 'successDelete';
+        this.emitChange();
+        this.viewstate = '';
+    }
+
+    startDeleteDeck() {
+        this.viewstate = 'loading';
+        this.emitChange();
+        this.viewstate = '';
+    }
+
+    removeDeckError(error) {
+        this.viewstate = 'errorRemove';
+        this.emitChange();
+        this.viewstate = '';
+    }
 
+    removeDeck(data) {
+        this.viewstate = 'successRemove';
+        this.emitChange();
+        this.viewstate = '';
     }
 }
 
@@ -144,7 +166,10 @@ DeckEditStore.handlers = {
 
     // Deck deletion/removable
     'DELETE_DECK_ERROR': 'deleteDeckError',
-    'DELETE_DECK_SUCCESS': 'deleteDeck'
+    'DELETE_DECK_SUCCESS': 'deleteDeck',
+    'START_DELETE_DECK': 'startDeleteDeck',
+    'REMOVE_DECK_ERROR': 'removeDeckError',
+    'REMOVE_DECK_SUCCESS': 'removeDeck'
 };
 
 export default DeckEditStore;

From c8a8c191e44016b37e21fd08039166e499b4c278 Mon Sep 17 00:00:00 2001
From: Kurt Junghanns <tboonx@googlemail.com>
Date: Mon, 29 Oct 2018 17:02:58 +0100
Subject: [PATCH 03/19] [SWIK-907_delete_deck_and_transfer_ownership] Did the
 transfer ownership modal and the missing actions and stuff

---
 actions/deckedit/deckRemove.js                |  15 +++
 .../deckedit/hideTransferOwnershipModal.js    |   7 ++
 actions/deckedit/loadEditors.js               |  36 ++++++
 actions/deckedit/transferOwnership.js         |  15 +++
 .../DeckEditPanel/DeckPropertiesEditor.js     |  74 ++++++++++--
 .../DeckEditPanel/TransferOwnership.js        | 113 ++++++++++--------
 services/deck.js                              |  17 +++
 services/usergroup.js                         |  16 ++-
 stores/DeckEditStore.js                       |  58 ++++++++-
 9 files changed, 291 insertions(+), 60 deletions(-)
 create mode 100644 actions/deckedit/deckRemove.js
 create mode 100644 actions/deckedit/hideTransferOwnershipModal.js
 create mode 100644 actions/deckedit/loadEditors.js
 create mode 100644 actions/deckedit/transferOwnership.js

diff --git a/actions/deckedit/deckRemove.js b/actions/deckedit/deckRemove.js
new file mode 100644
index 000000000..7937e7e5f
--- /dev/null
+++ b/actions/deckedit/deckRemove.js
@@ -0,0 +1,15 @@
+const log = require('../log/clog');
+
+export default function deckRemove(context, payload, done) {
+    log.info(context);
+    context.dispatch('START_DELETE_DECK');
+    context.service.delete('deck.remove', payload, { timeout: 20 * 1000 }, (err, res) => {
+        if (err) {
+            context.dispatch('REMOVE_DECK_ERROR', err);
+        }
+        else {
+            context.dispatch('REMOVE_DECK_SUCCESS', res);
+        }
+        done();
+    });
+}
diff --git a/actions/deckedit/hideTransferOwnershipModal.js b/actions/deckedit/hideTransferOwnershipModal.js
new file mode 100644
index 000000000..e8d6df6c1
--- /dev/null
+++ b/actions/deckedit/hideTransferOwnershipModal.js
@@ -0,0 +1,7 @@
+const log = require('../log/clog');
+
+export default function hideTransferOwnershipModal(context, payload, done) {
+    log.info(context);
+    context.dispatch('HIDE_TRANSFER_OWNERSHIP_MODAL', {});
+    done();
+}
diff --git a/actions/deckedit/loadEditors.js b/actions/deckedit/loadEditors.js
new file mode 100644
index 000000000..55f797566
--- /dev/null
+++ b/actions/deckedit/loadEditors.js
@@ -0,0 +1,36 @@
+const log = require('../log/clog');
+
+export default function loadEditors(context, payload, done) {
+    log.info(context);
+    context.dispatch('START_TRANSFER_OWNERSHIP');
+    const groupids = payload.groups.map((group) => parseInt(group.id, 10));
+
+    if (groupids.length < 1) {
+        context.dispatch('LOAD_EDITORS_LIST_SUCCESS', payload.users);
+        return done();
+    }
+
+    context.service.read('usergroup.getList', {groupids}, { timeout: 20 * 1000 }, (err, res) => { // payload needs groupids
+        if (err) {
+            context.dispatch('LOAD_EDITORS_LIST_ERROR', err);
+        }
+        else {
+            let users = payload.users;
+            users = users.concat(res.reduce((ret, group) => {
+                ret.push(group.creator);
+                return ret.concat(group.members);
+            }, []));
+            //remove duplicates
+            users = users.reduce((ret, user) => {
+                let found = ret.find((u) => ((u.id || u.userid) === (user.id || user.userid)));
+                if (!found) {
+                    ret.push(user);
+                }
+                return ret;
+            }, []);
+            console.log('got all editors', users);
+            context.dispatch('LOAD_EDITORS_LIST_SUCCESS', users);
+        }
+        done();
+    });
+}
diff --git a/actions/deckedit/transferOwnership.js b/actions/deckedit/transferOwnership.js
new file mode 100644
index 000000000..3b434d089
--- /dev/null
+++ b/actions/deckedit/transferOwnership.js
@@ -0,0 +1,15 @@
+const log = require('../log/clog');
+
+export default function transferOwnership(context, payload, done) {
+    log.info(context);
+    context.dispatch('TRY_TRANSFER_OWNERSHIP');
+    context.service.update('deck.transferOwnership', payload, { timeout: 20 * 1000 }, (err, res) => {
+        if (err) {
+            context.dispatch('TRANSFER_OWNERSHIP_ERROR', err);
+        }
+        else {
+            context.dispatch('TRANSFER_OWNERSHIP_SUCCESS', res);
+        }
+        done();
+    });
+}
diff --git a/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
index 2a7e5c9bf..cc7d3f1d6 100644
--- a/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
+++ b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
@@ -23,6 +23,8 @@ import updateTheme from '../../../../../actions/updateTheme';
 import {showGroupDetailsModal} from '../../../../../actions/deckedit/functionsForGroupDetailsModal';
 import deckDeletion from '../../../../../actions/deckedit/deckDeletion';
 import deckRemove from '../../../../../actions/deckedit/deckRemove';
+import TransferOwnership from './TransferOwnership';
+import loadEditors from '../../../../../actions/deckedit/loadEditors';
 
 import {educationLevels} from '../../../../../lib/isced';
 import TagInput from '../../../ContentModulesPanel/TagsPanel/TagInput';
@@ -47,8 +49,8 @@ class DeckPropertiesEditor extends React.Component {
             theme: props.deckProps.theme || '',
             //license: props.deckProps.license || '',
             license: 'CC BY-SA',
-            users: editors.users,
-            groups: editors.groups,
+            users: editors.users || [],
+            groups: editors.groups || [],
             published: !props.deckProps.hidden,
             educationLevel: props.deckProps.educationLevel,
             tags: props.deckProps.tags || [],
@@ -119,7 +121,7 @@ class DeckPropertiesEditor extends React.Component {
                     confirmButtonText: 'Confirm',
                     confirmButtonClass: 'positive ui button',
                     allowEscapeKey: true,
-                    allowOutsideClick: true,
+                    allowOutsideClick: false,
                     buttonsStyling: false
                 })
                     .then(() => {
@@ -165,6 +167,60 @@ class DeckPropertiesEditor extends React.Component {
                     })
                     .catch();
             }
+            else if (newProps.DeckEditStore.viewstate === 'errorEditors') {
+                swal({
+                    title: 'Error',
+                    text: 'Unknown error while loading editors.',
+                    type: 'error',
+                    confirmButtonText: 'Close',
+                    confirmButtonClass: 'negative ui button',
+                    allowEscapeKey: true,
+                    allowOutsideClick: true,
+                    buttonsStyling: false
+                })
+                    .then(() => {
+                        return true;
+                    })
+                    .catch();
+            }
+            else if (newProps.DeckEditStore.viewstate === 'errorTransfer') {
+                swal({
+                    title: 'Error',
+                    text: 'Unknown error while transfering ownership.',
+                    type: 'error',
+                    confirmButtonText: 'Close',
+                    confirmButtonClass: 'negative ui button',
+                    allowEscapeKey: true,
+                    allowOutsideClick: true,
+                    buttonsStyling: false
+                })
+                    .then(() => {
+                        return true;
+                    })
+                    .catch();
+            }
+            else if (newProps.DeckEditStore.viewstate === 'successTransfer') {
+                swal({
+                    title: 'Success',
+                    text: 'The ownership was transfered.',
+                    type: 'success',
+                    confirmButtonText: 'Confirm',
+                    confirmButtonClass: 'positive ui button',
+                    allowEscapeKey: true,
+                    allowOutsideClick: false,
+                    buttonsStyling: false
+                })
+                    .then(() => {
+                        this.context.executeAction(navigateAction, {
+                            url: '/'
+                        });
+                    })
+                    .catch(() => {
+                        this.context.executeAction(navigateAction, {
+                            url: '/'
+                        });
+                    });
+            }
         }
     }
     componentDidUpdate() {
@@ -311,17 +367,18 @@ class DeckPropertiesEditor extends React.Component {
 
     handleDelete(evt) {
         evt.preventDefault();
+        // console.log('handleDelete', this.state.users, this.state.groups, this.props.DeckEditStore.roots);
 
         if ( this.props.DeckEditStore.roots.length < 1 ) {
             // not used in other decks
 
-            if (this.state.editors.length < 1 && this.state.groups.length < 1) {
+            if (this.state.users.length < 1 && this.state.groups.length < 1) {
                 // no editors - could just be deleted
                 this.context.executeAction(deckDeletion, {id: this.props.DeckEditStore.deckProps.sid.split('-')[0]});
             }
             else {
                 // transfer ownership
-
+                this.context.executeAction(loadEditors, {users: this.state.users, groups: this.state.groups});
             }
         }
         else {
@@ -352,13 +409,13 @@ class DeckPropertiesEditor extends React.Component {
                 })
                 .catch(() => {
                     // cancel btn
-                    if (this.state.editors.length < 1 && this.state.groups.length < 1) {
+                    if (this.state.users.length < 1 && this.state.groups.length < 1) {
                         // no editors - could just be deleted
                         this.context.executeAction(deckDeletion, {id: this.props.DeckEditStore.deckProps.sid.split('-')[0]});
                     }
                     else {
                         // transfer ownership
-
+                        this.context.executeAction(loadEditors, {users: this.state.users, groups: this.state.groups});
                     }
                 });
         }
@@ -519,7 +576,7 @@ class DeckPropertiesEditor extends React.Component {
     }
 
     render() {
-        console.log('render edit: published and roots', this.state.published, this.props.DeckEditStore.roots);
+        // console.log('render edit: published and roots', this.state.published, this.props.DeckEditStore.roots);
         //CSS
         let titleFieldClass = classNames({
             'required': true,
@@ -721,6 +778,7 @@ class DeckPropertiesEditor extends React.Component {
                                         <div className="ui hidden divider">
                                         </div>
                                         <GroupDetailsModal ref="groupdetailsmodal_" group={this.props.DeckEditStore.detailedGroup} show={this.props.DeckEditStore.showGroupModal} />
+                                        <TransferOwnership ref="transferownershipmodal_" users={this.props.DeckEditStore.allEditors} show={this.props.DeckEditStore.showTransferOwnershipModal} deckid={this.props.selector.id} />
                                     </div>
                                 </div>
                             ) : ''}
diff --git a/components/Deck/ContentPanel/DeckModes/DeckEditPanel/TransferOwnership.js b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/TransferOwnership.js
index 1d9a0edda..fe2328333 100644
--- a/components/Deck/ContentPanel/DeckModes/DeckEditPanel/TransferOwnership.js
+++ b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/TransferOwnership.js
@@ -2,9 +2,11 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import FocusTrap from 'focus-trap-react';
-import {Button, Icon, Modal, Header, TextArea, Segment, Container} from 'semantic-ui-react';
-import {hideGroupDetailsModal} from '../../../../../actions/deckedit/functionsForGroupDetailsModal';
+import {Button, Icon, Modal, Header, TextArea, Segment, Container, Menu} from 'semantic-ui-react';
 import { FormattedMessage, defineMessages } from 'react-intl';
+import UserPicture from '../../../../common/UserPicture';
+import hideTransferOwnershipModal from '../../../../../actions/deckedit/hideTransferOwnershipModal';
+import transferOwnership from '../../../../../actions/deckedit/transferOwnership';
 
 class TransferOwnership extends React.Component {
     constructor(props) {
@@ -15,64 +17,72 @@ class TransferOwnership extends React.Component {
         this.messages = defineMessages({
             modalHeading: {
                 id: 'TransferOwnership.modalHeading',
-                defaultMessage: 'Group details'
+                defaultMessage: 'Transfer Ownership'
             },
+            close: {
+                id: 'TransferOwnership.close',
+                defaultMessage: 'Close'
+            },
+            unknownCountry: {
+                id: 'TransferOwnership.unknownCountry',
+                defaultMessage: 'unknown country'
+            },
+            unknownOrganization: {
+                id: 'TransferOwnership.unknownOrganization',
+                defaultMessage: 'Unknown organization'
+            },
+            linkHint: {
+                id: 'TransferOwnership.linkHint',
+                defaultMessage: 'The username is a link which will open a new browser tab. Close it when you want to go back to this page.'
+            },
+            continue: {
+                id: 'TransferOwnership.continue',
+                defaultMessage: 'Transfer ownership'
+            }
         });
+
+        this.state = {
+            selectedUser: ''
+        };
     }
 
     handleClose() {
 	      $('#app').attr('aria-hidden','false');
-	      this.context.executeAction(hideGroupDetailsModal, {});
+	      this.context.executeAction(hideTransferOwnershipModal, {});
     }
 
     unmountTrap() {
         this.handleClose();
     }
 
+    handleContinue() {
+        $('#app').attr('aria-hidden','false');
+        this.context.executeAction(transferOwnership, {deckid: this.props.deckid, userid: this.state.selectedUser});
+    }
+
     render() {
-        let members = [];
-        //first the creator
-        let optionalText = (this.props.group.creator.organization || this.props.group.creator.country) ?
-            (this.props.group.creator.organization || this.context.intl.formatMessage(this.messages.unknownOrganization)) + ', ' + (this.props.group.creator.country || this.context.intl.formatMessage(this.messages.unknownCountry)) :
-            '';
-        members.push(
-          (
-            <div className="item" key={this.props.group.creator.userid}>
-              <div className="ui grid">
-                <div className="one wide column middle aligned">
-                  <UserPicture picture={ this.props.group.creator.picture } username={ this.props.group.creator.username } avatar={ true } width= { 24 } />
-                </div>
-                <div className="fifteen wide column">
-                  <TextArea className="sr-only" id={'usernameIsALinkHint' + this.props.group.creator.userid} value={this.context.intl.formatMessage(this.messages.linkHint)} tabIndex ='-1'/>
-                  <a className="header" href={'/user/' + this.props.group.creator.username} target="_blank">{this.props.group.creator.displayName || this.props.group.creator.username}</a>
-                  <div className="description">
-                    {this.context.intl.formatMessage(this.messages.groupCreator)}
-                  </div>
-                  {optionalText}
-                </div>
-              </div>
-            </div>
-          )
-        );
-        if (this.props.group.members !== undefined && this.props.group.members.length > 0) {
-            this.props.group.members.forEach((user) => {
-                optionalText = (user.organization || user.country) ?
+        let editors = [];
+
+        if (this.props.users !== undefined && this.props.users.length > 0) {
+            this.props.users.forEach((user) => {
+                const optionalText = (user.organization || user.country) ?
                     (user.organization || this.context.intl.formatMessage(this.messages.unknownOrganization)) + ', ' + (user.country || this.context.intl.formatMessage(this.messages.unknownCountry)) :
                     '';
-                members.push(
+                editors.push(
                   (
-                    <div className="item" key={user.userid}>
+                    <Menu.Item name={'item_' + user.username} key={user.id || user.userid} active={this.state.selectedUser === (user.id || user.userid)} onClick={() => {console.log('onItemClicked'); this.setState({selectedUser: user.id || user.userid});}}>
                       <div className="ui grid">
-                        <div className="one wide column">
-                          <UserPicture picture={ user.picture } username={ user.username } avatar={ true } width= { 24 } />
+                        <div className="two wide column">
+                          <UserPicture picture={ user.picture } username={ user.username } avatar={ true } width= { 30 } size="tiny" />
                         </div>
-                        <div className="fifteen wide column">
-                          <TextArea className="sr-only" id={'usernameIsALinkHint' + user.userid} value={this.context.intl.formatMessage(this.messages.linkHint)} tabIndex ='-1'/>
+                        <div className="fourten wide column">
+                          <TextArea className="sr-only" id={'usernameIsALinkHint' + (user.id || user.userid)} value={this.context.intl.formatMessage(this.messages.linkHint)} tabIndex ='-1'/>
                           <a className="header" href={'/user/' + user.username} target="_blank">{user.displayName || user.username}</a>
+                          <br/>
                           {optionalText}
                         </div>
                       </div>
-                    </div>
+                    </Menu.Item>
                   )
                 );
             });
@@ -84,31 +94,34 @@ class TransferOwnership extends React.Component {
           <Modal dimmer='blurring'
             ref="modal1"
             role='dialog'
-            aria-labelledby='groupdetailsmodal_header'
-						aria-describedby='groupdetailsmodal_content'
+            aria-labelledby='transferownershipmodal_header'
+						aria-describedby='transferownershipmodal_content'
             open={showModal}
             tabIndex="0" >
               <FocusTrap focusTrapOptions={{
                   clickOutsideDeactivates: true,
                   onDeactivate: this.unmountTrap,
-                  initialFocus:'#groupdetailsmodal_content'
+                  initialFocus:'#transferownershipmodal_content'
               }}
                 active={showModal}
                 id="focusTrapGroupDetailsModal"
                 className="header">
-								<Modal.Header as="h1" content={this.context.intl.formatMessage(this.messages.modalHeading)} id='groupdetailsmodal_header'/>
-								<Modal.Content id='groupdetailsmodal_content' tabIndex="0">
+								<Modal.Header as="h1" content={this.context.intl.formatMessage(this.messages.modalHeading)} id='transferownershipmodal_header'/>
+								<Modal.Content id='transferownershipmodal_content' tabIndex="0">
                   <Container>
                     <Segment color="blue" textAlign="center" padded>
                       <Segment attached="bottom" textAlign="left">
-      									<h3 className="header" >{this.props.group.name}</h3>
-      									<p>There are {this.props.group.members.length+1} member{(this.props.group.members.length !== 0) ? 's': ''} in this group.</p>
-      									<div className="ui very relaxed  list">
-      											{members}
-      									</div>
+      									<h3 className="header" ></h3>
+      									<p>There are {this.props.users.length} users which have edit rights to the deck. Select one to transfer the ownership as precondition for deleting the deck.</p>
+      									<Menu size='small' vertical style={{width: "100%"}}>
+      											{editors}
+      									</Menu>
                       </Segment>
                       <Modal.Actions>
-  											<Button onClick={ this.handleClose } role="button" tabIndex="0" aria-label={this.context.intl.formatMessage(this.messages.close)}>
+  											<Button onClick={ this.handleContinue.bind(this) } role="button" tabIndex="0" aria-label={this.context.intl.formatMessage(this.messages.continue)} disabled={this.state.selectedUser === ''} positive>
+  													{this.context.intl.formatMessage(this.messages.continue)}
+  											</Button>
+                        <Button onClick={ this.handleClose } role="button" tabIndex="0" aria-label={this.context.intl.formatMessage(this.messages.close)}>
   													{this.context.intl.formatMessage(this.messages.close)}
   											</Button>
       								</Modal.Actions>
@@ -124,7 +137,7 @@ class TransferOwnership extends React.Component {
     }
 }
 
-GroupDetailsModal.contextTypes = {
+TransferOwnership.contextTypes = {
     executeAction: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired
 };
diff --git a/services/deck.js b/services/deck.js
index 25710dbbe..5e25da8b4 100644
--- a/services/deck.js
+++ b/services/deck.js
@@ -561,6 +561,23 @@ export default {
             })
             .catch((err) => callback(err));
         }
+        else if (resource === 'deck.transferOwnership') {
+            return callback(null, {});
+            //TODO
+            rp({
+                method: 'POST',
+                uri: Microservices.deck.uri + '/deck/' + params.deckid + '/transferOwnership',
+                headers: { '----jwt----': params.jwt },
+                json: true,
+                body: {
+                    user: params.userid
+                }
+            })
+            .then((body) => {
+                callback(null, body);
+            })
+            .catch((err) => callback(err));
+        }
     },
     delete: (req, resource, params, config, callback) => {
         req.reqId = req.reqId ? req.reqId : -1;
diff --git a/services/usergroup.js b/services/usergroup.js
index 91342ec2c..29d05f512 100644
--- a/services/usergroup.js
+++ b/services/usergroup.js
@@ -19,6 +19,21 @@ export default {
                 json: true
             }).then( (response) => callback(null, response.groups))
             .catch( (err) => callback(err));
+        } else if (resource === 'usergroup.getList') {
+            // console.log('service usergroup try to get group with id', params.groupid);
+            rp.post({
+                uri: Microservices.user.uri + '/usergroups',
+                body: params.groupids,
+                json: true
+            })
+            .then((res) => {
+                // console.log('Service got usergroups:', res);
+                callback(null, res);
+            })
+            .catch((err) => {
+                // console.warn('Error', err);
+                callback(err, null);
+            });
         } else {
             // usergroup.read got here
             // console.log('service usergroup try to get group with id', params.groupid);
@@ -36,6 +51,5 @@ export default {
                 callback(err, null);
             });
         }
-
     }
 };
diff --git a/stores/DeckEditStore.js b/stores/DeckEditStore.js
index 118651bd2..be1d36071 100644
--- a/stores/DeckEditStore.js
+++ b/stores/DeckEditStore.js
@@ -27,6 +27,8 @@ class DeckEditStore extends BaseStore {
         this.queryParams = {};
 
         this.roots = [];
+        this.showTransferOwnershipModal = false;
+        this.allEditors = [];
     }
 
     updateProperties(payload) {
@@ -67,6 +69,8 @@ class DeckEditStore extends BaseStore {
             queryParams: this.queryParams,
             showGroupModal: this.showGroupModal,
             roots: this.roots,
+            showTransferOwnershipModal: this.showTransferOwnershipModal,
+            allEditors: this.allEditors
         };
     }
 
@@ -85,6 +89,8 @@ class DeckEditStore extends BaseStore {
         this.showGroupModal = state.showGroupModal;
         this.queryParams = state.queryParams;
         this.roots = state.roots;
+        this.showTransferOwnershipModal = state.showTransferOwnershipModal;
+        this.allEditors = state.allEditors;
     }
 
     updateAuthorizedUsers(users) {
@@ -149,6 +155,49 @@ class DeckEditStore extends BaseStore {
         this.emitChange();
         this.viewstate = '';
     }
+
+    startTransferOwnership() {
+        this.viewstate = 'loading';
+        this.emitChange();
+        this.viewstate = '';
+    }
+
+    editorsLoaded(editors) {
+        this.allEditors = editors;
+        this.viewstate = '';
+        this.showTransferOwnershipModal = true;
+        this.emitChange();
+    }
+
+    errorLoadingEditors(error) {
+        this.viewstate = 'errorEditors';
+        this.emitChange();
+        this.viewstate = '';
+    }
+
+    hideTOModal() {
+        this.showTransferOwnershipModal = false;
+        this.emitChange();
+    }
+
+    errorTO(error) {
+        this.viewstate = 'errorTransfer';
+        this.emitChange();
+        this.viewstate = '';
+    }
+
+    successTO() {
+        this.viewstate = 'successTransfer';
+        this.emitChange();
+        this.viewstate = '';
+    }
+
+    tryTransferOwnership() {
+      this.viewstate = 'loading';
+      this.showTransferOwnershipModal = false;
+      this.emitChange();
+      this.viewstate = '';
+    }
 }
 
 DeckEditStore.storeName = 'DeckEditStore';
@@ -169,7 +218,14 @@ DeckEditStore.handlers = {
     'DELETE_DECK_SUCCESS': 'deleteDeck',
     'START_DELETE_DECK': 'startDeleteDeck',
     'REMOVE_DECK_ERROR': 'removeDeckError',
-    'REMOVE_DECK_SUCCESS': 'removeDeck'
+    'REMOVE_DECK_SUCCESS': 'removeDeck',
+    'START_TRANSFER_OWNERSHIP': 'startTransferOwnership',
+    'LOAD_EDITORS_LIST_SUCCESS': 'editorsLoaded',
+    'LOAD_EDITORS_LIST_ERROR': 'errorLoadingEditors',
+    'HIDE_TRANSFER_OWNERSHIP_MODAL': 'hideTOModal',
+    'TRY_TRANSFER_OWNERSHIP': 'tryTransferOwnership',
+    'TRANSFER_OWNERSHIP_ERROR': 'errorTO',
+    'TRANSFER_OWNERSHIP_SUCCESS': 'successTO'
 };
 
 export default DeckEditStore;

From 0f6ef0a0a9b29d6890d7a8186ab7c73e467941c5 Mon Sep 17 00:00:00 2001
From: Kostis Pristouris <kprist@gmail.com>
Date: Tue, 30 Oct 2018 02:15:24 +0200
Subject: [PATCH 04/19] Add some API calls code for new deck service
 delete/change owner APIs

---
 actions/deckedit/deckDeletion.js      | 7 ++++++-
 actions/deckedit/transferOwnership.js | 7 ++++++-
 services/deck.js                      | 6 ++----
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/actions/deckedit/deckDeletion.js b/actions/deckedit/deckDeletion.js
index 6c2bc4d0b..3e0495fee 100644
--- a/actions/deckedit/deckDeletion.js
+++ b/actions/deckedit/deckDeletion.js
@@ -1,8 +1,13 @@
-const log = require('../log/clog');
+import log from '../log/clog';
+
+import UserProfileStore from '../../stores/UserProfileStore';
 
 export default function deckDeletion(context, payload, done) {
     log.info(context);
     context.dispatch('START_DELETE_DECK');
+
+    payload.jwt = context.getStore(UserProfileStore).jwt;
+
     context.service.delete('deck.delete', payload, { timeout: 20 * 1000 }, (err, res) => {
         if (err) {
             context.dispatch('DELETE_DECK_ERROR', err);
diff --git a/actions/deckedit/transferOwnership.js b/actions/deckedit/transferOwnership.js
index 3b434d089..3a718cbcd 100644
--- a/actions/deckedit/transferOwnership.js
+++ b/actions/deckedit/transferOwnership.js
@@ -1,8 +1,13 @@
-const log = require('../log/clog');
+import log from '../log/clog';
+
+import UserProfileStore from '../../stores/UserProfileStore';
 
 export default function transferOwnership(context, payload, done) {
     log.info(context);
     context.dispatch('TRY_TRANSFER_OWNERSHIP');
+
+    payload.jwt = context.getStore(UserProfileStore).jwt;
+
     context.service.update('deck.transferOwnership', payload, { timeout: 20 * 1000 }, (err, res) => {
         if (err) {
             context.dispatch('TRANSFER_OWNERSHIP_ERROR', err);
diff --git a/services/deck.js b/services/deck.js
index 5e25da8b4..9c00fcbd9 100644
--- a/services/deck.js
+++ b/services/deck.js
@@ -562,11 +562,9 @@ export default {
             .catch((err) => callback(err));
         }
         else if (resource === 'deck.transferOwnership') {
-            return callback(null, {});
-            //TODO
             rp({
-                method: 'POST',
-                uri: Microservices.deck.uri + '/deck/' + params.deckid + '/transferOwnership',
+                method: 'PATCH',
+                uri: Microservices.deck.uri + '/deck/' + parseInt(params.deckid),
                 headers: { '----jwt----': params.jwt },
                 json: true,
                 body: {

From 1f410920b37516ad8d4e3af447d9ebeb17336d2d Mon Sep 17 00:00:00 2001
From: Kurt Junghanns <tboonx@googlemail.com>
Date: Tue, 30 Oct 2018 10:46:34 +0100
Subject: [PATCH 05/19] [SWIK-907_delete_deck_and_transfer_ownership] First
 improvements

---
 .../DeckEditPanel/DeckPropertiesEditor.js     | 56 ++++++++++++++-----
 .../DeckEditPanel/TransferOwnership.js        |  2 +-
 services/deck.js                              |  2 +-
 stores/DeckEditStore.js                       |  8 +--
 4 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
index cc7d3f1d6..b4598471d 100644
--- a/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
+++ b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
@@ -126,7 +126,7 @@ class DeckPropertiesEditor extends React.Component {
                 })
                     .then(() => {
                         this.context.executeAction(navigateAction, {
-                            url: '/'
+                            url: '/user/' + this.context.getUser().username
                         });
                     })
                     .catch(() => {
@@ -374,7 +374,19 @@ class DeckPropertiesEditor extends React.Component {
 
             if (this.state.users.length < 1 && this.state.groups.length < 1) {
                 // no editors - could just be deleted
-                this.context.executeAction(deckDeletion, {id: this.props.DeckEditStore.deckProps.sid.split('-')[0]});
+                swal({
+                    title: 'Delete this deck?',
+                    text: `Do you really want to delete the deck ${this.props.DeckEditStore.deckProps.title} (${this.props.DeckEditStore.deckProps.sid})?`,
+                    type: 'question',
+                    showCloseButton: false,
+                    showCancelButton: true,
+                    allowEscapeKey: true,
+                    showConfirmButton: true
+                })
+                .then(() => {
+                    this.context.executeAction(deckDeletion, {id: this.props.DeckEditStore.deckProps.sid.split('-')[0]});
+                }, (reason) => { // canceled
+                });
             }
             else {
                 // transfer ownership
@@ -398,7 +410,7 @@ class DeckPropertiesEditor extends React.Component {
                 cancelButtonText: 'Delete whole deck',
                 cancelButtonClass: 'negative ui button',
                 allowEscapeKey: true,
-                allowOutsideClick: false,
+                allowOutsideClick: true,
                 buttonsStyling: false
             })
                 .then((result) => {
@@ -406,17 +418,32 @@ class DeckPropertiesEditor extends React.Component {
                     // confirm btn
                     // remove deck as node from the parent deck
                     this.context.executeAction(deckRemove, {id: this.props.DeckEditStore.deckProps.sid.split('-')[0]});
-                })
-                .catch(() => {
-                    // cancel btn
-                    if (this.state.users.length < 1 && this.state.groups.length < 1) {
-                        // no editors - could just be deleted
-                        this.context.executeAction(deckDeletion, {id: this.props.DeckEditStore.deckProps.sid.split('-')[0]});
-                    }
-                    else {
-                        // transfer ownership
-                        this.context.executeAction(loadEditors, {users: this.state.users, groups: this.state.groups});
+                }, (action) => {
+                    if (action === 'cancel') {
+                        if (this.state.users.length < 1 && this.state.groups.length < 1) {
+                            // no editors - could just be deleted
+                            swal({
+                                title: 'Delete this deck?',
+                                text: `Do you really want to delete the deck ${this.props.DeckEditStore.deckProps.title} (${this.props.DeckEditStore.deckProps.sid})?`,
+                                type: 'question',
+                                showCloseButton: false,
+                                showCancelButton: true,
+                                allowEscapeKey: true,
+                                showConfirmButton: true
+                            })
+                            .then(() => {
+                                this.context.executeAction(deckDeletion, {id: this.props.DeckEditStore.deckProps.sid.split('-')[0]});
+                            }, (reason) => { // canceled
+                            });
+                        }
+                        else {
+                            // transfer ownership
+                            this.context.executeAction(loadEditors, {users: this.state.users, groups: this.state.groups});
+                        }
                     }
+                })
+                .catch((e) => {
+                    console.log(e);
                 });
         }
     }
@@ -799,7 +826,8 @@ class DeckPropertiesEditor extends React.Component {
 }
 
 DeckPropertiesEditor.contextTypes = {
-    executeAction: PropTypes.func.isRequired
+    executeAction: PropTypes.func.isRequired,
+    getUser: PropTypes.func
 };
 
 DeckPropertiesEditor = connectToStores(DeckPropertiesEditor, [DeckEditStore, TagsStore, PermissionsStore], (context, props) => {
diff --git a/components/Deck/ContentPanel/DeckModes/DeckEditPanel/TransferOwnership.js b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/TransferOwnership.js
index fe2328333..36756c715 100644
--- a/components/Deck/ContentPanel/DeckModes/DeckEditPanel/TransferOwnership.js
+++ b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/TransferOwnership.js
@@ -113,7 +113,7 @@ class TransferOwnership extends React.Component {
                       <Segment attached="bottom" textAlign="left">
       									<h3 className="header" ></h3>
       									<p>There are {this.props.users.length} users which have edit rights to the deck. Select one to transfer the ownership as precondition for deleting the deck.</p>
-      									<Menu size='small' vertical style={{width: "100%"}}>
+      									<Menu size='small' vertical style={{width: '100%'}}>
       											{editors}
       									</Menu>
                       </Segment>
diff --git a/services/deck.js b/services/deck.js
index 9c00fcbd9..f2f2c6205 100644
--- a/services/deck.js
+++ b/services/deck.js
@@ -592,7 +592,7 @@ export default {
             })
             .catch((err) => callback(err));
         }
-        else if (resource === 'deck.delete') {
+        else if (resource === 'deck.remove') {
             rp({
                 method: 'DELETE',
                 uri: Microservices.deck.uri + '/deck/' + params.id + '/links',
diff --git a/stores/DeckEditStore.js b/stores/DeckEditStore.js
index be1d36071..fe7f3676b 100644
--- a/stores/DeckEditStore.js
+++ b/stores/DeckEditStore.js
@@ -193,10 +193,10 @@ class DeckEditStore extends BaseStore {
     }
 
     tryTransferOwnership() {
-      this.viewstate = 'loading';
-      this.showTransferOwnershipModal = false;
-      this.emitChange();
-      this.viewstate = '';
+        this.viewstate = 'loading';
+        this.showTransferOwnershipModal = false;
+        this.emitChange();
+        this.viewstate = '';
     }
 }
 

From 359ea46c8d3bc168b35e0d45e713fb19eb805cea Mon Sep 17 00:00:00 2001
From: Kurt Junghanns <tboonx@googlemail.com>
Date: Tue, 30 Oct 2018 16:49:28 +0100
Subject: [PATCH 06/19] [SWIK-907_delete_deck_and_transfer_ownership] SHowing
 delete buton in deck edit only on roots and added modal when removing a
 subdeck as node.

---
 actions/decktree/deleteTreeNode.js            | 10 ++-
 actions/decktree/deleteTreeNodeAndNavigate.js | 63 ++++++++++---------
 .../ContentActions/ContentActionsHeader.js    | 33 ++++++++--
 .../DeckEditPanel/DeckPropertiesEditor.js     | 14 +++--
 services/decktree.js                          |  3 +-
 5 files changed, 84 insertions(+), 39 deletions(-)

diff --git a/actions/decktree/deleteTreeNode.js b/actions/decktree/deleteTreeNode.js
index 1e394f155..e4d21f044 100644
--- a/actions/decktree/deleteTreeNode.js
+++ b/actions/decktree/deleteTreeNode.js
@@ -8,6 +8,14 @@ import serviceUnavailable from '../error/serviceUnavailable';
 export default function deleteTreeNode(context, payload, done) {
     log.info(context);
     let userid = context.getStore(UserProfileStore).userid;
+
+    let purge = false;
+    if (payload.selector) {
+        purge = payload.purge ? payload.purge : false;
+        payload = payload.selector
+    }
+    payload.purge = purge;
+
     if (userid != null && userid !== '') {
         //enrich with jwt
         payload.jwt = context.getStore(UserProfileStore).jwt;
@@ -51,7 +59,7 @@ export default function deleteTreeNode(context, payload, done) {
                 if (!isEmpty(contentRootId)) {
                     activity.content_root_id = contentRootId;
                 }
-                
+
                 context.executeAction(addActivity, {activity: activity});
             }
             done(null, res);
diff --git a/actions/decktree/deleteTreeNodeAndNavigate.js b/actions/decktree/deleteTreeNodeAndNavigate.js
index 855cae747..ec014087b 100644
--- a/actions/decktree/deleteTreeNodeAndNavigate.js
+++ b/actions/decktree/deleteTreeNodeAndNavigate.js
@@ -9,6 +9,39 @@ import serviceUnavailable from '../error/serviceUnavailable';
 export default function deleteTreeNodeAndNavigate(context, payload, done) {
     log.info(context);
 
+    let callback = (accepted) => {
+        //load all required actions in parallel
+        async.parallel([
+            (callback) => {
+               context.executeAction(deleteTreeNode, payload, callback);
+            }
+        ],
+           // final callback
+        (err, results) => {
+            if (!err) {
+               //the logic for retrieving the parent node is handles in the stores
+               //therefore, we need to get access to the selector from the store
+               let currentState = context.getStore(DeckTreeStore).getState();
+               let selector = {
+                   id: currentState.selector.get('id'),
+                   stype: currentState.selector.get('stype'),
+                   sid: currentState.selector.get('sid'),
+                   spath: currentState.selector.get('spath')
+               };
+               context.executeAction(navigateAction, {
+                   url: Util.makeNodeURL(selector, 'deck', 'view', undefined, undefined, true)
+               });
+           } else {
+               log.error(context, {filepath: __filename});
+             //context.executeAction(serviceUnavailable, payload, done);
+           }
+           done();
+       });
+    };
+
+    if (payload.selector && !payload.id) {
+        return callback(true);
+    }
 
     let elementTitle = payload.stype;
     if(elementTitle === 'deck')
@@ -21,33 +54,5 @@ export default function deleteTreeNodeAndNavigate(context, payload, done) {
         cancelButtonColor: '#d33',
         confirmButtonText: 'Yes, delete it!'
 
-    }).then((accepted) => {
-       //load all required actions in parallel
-        async.parallel([
-            (callback) => {
-                context.executeAction(deleteTreeNode, payload, callback);
-            }
-        ],
-            // final callback
-        (err, results) => {
-            if (!err) {
-              //the logic for retrieving the parent node is handles in the stores
-              //therefore, we need to get access to the selector from the store
-                let currentState = context.getStore(DeckTreeStore).getState();
-                let selector = {
-                    id: currentState.selector.get('id'),
-                    stype: currentState.selector.get('stype'),
-                    sid: currentState.selector.get('sid'),
-                    spath: currentState.selector.get('spath')
-                };
-                context.executeAction(navigateAction, {
-                    url: Util.makeNodeURL(selector, 'deck', 'view', undefined, undefined, true)
-                });
-            } else {
-                log.error(context, {filepath: __filename});
-              //context.executeAction(serviceUnavailable, payload, done);
-            }
-            done();
-        });
-    }, (reason) => {/*do nothing*/}).catch(swal.noop);
+    }).then(callback, (reason) => {/*do nothing*/}).catch(swal.noop);
 }
diff --git a/components/Deck/ContentPanel/ContentActions/ContentActionsHeader.js b/components/Deck/ContentPanel/ContentActions/ContentActionsHeader.js
index cd334543c..10107b76f 100644
--- a/components/Deck/ContentPanel/ContentActions/ContentActionsHeader.js
+++ b/components/Deck/ContentPanel/ContentActions/ContentActionsHeader.js
@@ -96,7 +96,32 @@ class ContentActionsHeader extends React.Component {
     }
 
     handleDeleteNode(selector) {
-        this.context.executeAction(deleteTreeNodeAndNavigate, selector);
+        swal({
+            title: 'Deletion of subdeck',
+            html: 'You could remove this subdeck from its parent and keep it as your own deck or delete the deck complete which also removes it as subdeck.',
+            type: 'question',
+            showCancelButton: true,
+            confirmButtonText: 'Remove as subdeck',
+            confirmButtonClass: 'ui button',
+            cancelButtonText: 'Delete whole deck',
+            cancelButtonClass: 'negative ui button',
+            allowEscapeKey: true,
+            allowOutsideClick: true,
+            buttonsStyling: false
+        })
+            .then((result) => {
+                console.log(result);
+                // confirm btn
+                // remove deck as node from the parent deck
+                this.context.executeAction(deleteTreeNodeAndNavigate, {selector});
+            }, (action) => {
+                if (action === 'cancel') {
+                    this.context.executeAction(deleteTreeNodeAndNavigate, {selector, purge: true});
+                }
+            })
+            .catch((e) => {
+                console.log(e);
+            });
     }
 
     handleSaveButtonClick(){
@@ -322,12 +347,12 @@ class ContentActionsHeader extends React.Component {
 
 
         }
-        
+
         const leftButtonsClass = classNames({
             'ui left floated top attached buttons': true,
-            'basic': editButton !== '' 
+            'basic': editButton !== ''
         });
-        
+
         /*
         <button className={viewClass} onClick={this.handleViewButton.bind(this,selector)}
           type="button"
diff --git a/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
index aec2c429a..2de49dc88 100644
--- a/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
+++ b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
@@ -370,7 +370,8 @@ class DeckPropertiesEditor extends React.Component {
 
     handleDelete(evt) {
         evt.preventDefault();
-        // console.log('handleDelete', this.state.users, this.state.groups, this.props.DeckEditStore.roots);
+        console.log('handleDelete', this.state.users, this.state.groups, this.props.DeckEditStore.roots);
+        console.log('handleDelete more data', this.props.selector, this.props.DeckEditStore);
 
         if ( this.props.DeckEditStore.roots.length < 1 ) {
             // not used in other decks
@@ -700,9 +701,14 @@ class DeckPropertiesEditor extends React.Component {
                 <button className='ui primary button'
                     onClick={this.handleSave.bind(this)}>Save
                 </button>
-                <button className='negative ui button'
-                    onClick={this.handleDelete.bind(this)}>Delete
-                </button>
+                {
+                  (this.props.selector.spath) ?
+                    ''
+                    :
+                    <button className='negative ui button'
+                        onClick={this.handleDelete.bind(this)}>Delete
+                    </button>
+                }
                 <button className="ui secondary button"
                     onClick={this.handleCancel.bind(this)}>
                     Cancel
diff --git a/services/decktree.js b/services/decktree.js
index 22d1e279e..7ba975a7f 100644
--- a/services/decktree.js
+++ b/services/decktree.js
@@ -156,7 +156,8 @@ export default {
                 uri: Microservices.deck.uri + '/decktree/node/delete',
                 headers: {'----jwt----': args.jwt},
                 body: JSON.stringify({
-                    selector: selector
+                    selector: selector,
+                    purge: args.purge ? true : false
                 })
             };
             rp(options).then((res) => {

From 191ea37699807136a0142f7a207bd5d72cd7c135 Mon Sep 17 00:00:00 2001
From: Kurt Junghanns <tboonx@googlemail.com>
Date: Tue, 30 Oct 2018 16:57:52 +0100
Subject: [PATCH 07/19] [SWIK-907_delete_deck_and_transfer_ownership] Fixed
 indentation

---
 actions/decktree/deleteTreeNode.js            |  2 +-
 actions/decktree/deleteTreeNodeAndNavigate.js | 56 ++++++++++---------
 2 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/actions/decktree/deleteTreeNode.js b/actions/decktree/deleteTreeNode.js
index e4d21f044..4a7803f98 100644
--- a/actions/decktree/deleteTreeNode.js
+++ b/actions/decktree/deleteTreeNode.js
@@ -12,7 +12,7 @@ export default function deleteTreeNode(context, payload, done) {
     let purge = false;
     if (payload.selector) {
         purge = payload.purge ? payload.purge : false;
-        payload = payload.selector
+        payload = payload.selector;
     }
     payload.purge = purge;
 
diff --git a/actions/decktree/deleteTreeNodeAndNavigate.js b/actions/decktree/deleteTreeNodeAndNavigate.js
index ec014087b..25ddebd19 100644
--- a/actions/decktree/deleteTreeNodeAndNavigate.js
+++ b/actions/decktree/deleteTreeNodeAndNavigate.js
@@ -2,7 +2,9 @@ import async from 'async';
 import DeckTreeStore from '../../stores/DeckTreeStore';
 import deleteTreeNode from './deleteTreeNode';
 const log = require('../log/clog');
-import {navigateAction} from 'fluxible-router';
+import {
+    navigateAction
+} from 'fluxible-router';
 import Util from '../../components/common/Util';
 import serviceUnavailable from '../error/serviceUnavailable';
 
@@ -13,30 +15,32 @@ export default function deleteTreeNodeAndNavigate(context, payload, done) {
         //load all required actions in parallel
         async.parallel([
             (callback) => {
-               context.executeAction(deleteTreeNode, payload, callback);
+                context.executeAction(deleteTreeNode, payload, callback);
             }
         ],
-           // final callback
-        (err, results) => {
-            if (!err) {
-               //the logic for retrieving the parent node is handles in the stores
-               //therefore, we need to get access to the selector from the store
-               let currentState = context.getStore(DeckTreeStore).getState();
-               let selector = {
-                   id: currentState.selector.get('id'),
-                   stype: currentState.selector.get('stype'),
-                   sid: currentState.selector.get('sid'),
-                   spath: currentState.selector.get('spath')
-               };
-               context.executeAction(navigateAction, {
-                   url: Util.makeNodeURL(selector, 'deck', 'view', undefined, undefined, true)
-               });
-           } else {
-               log.error(context, {filepath: __filename});
-             //context.executeAction(serviceUnavailable, payload, done);
-           }
-           done();
-       });
+            // final callback
+            (err, results) => {
+                if (!err) {
+                    //the logic for retrieving the parent node is handles in the stores
+                    //therefore, we need to get access to the selector from the store
+                    let currentState = context.getStore(DeckTreeStore).getState();
+                    let selector = {
+                        id: currentState.selector.get('id'),
+                        stype: currentState.selector.get('stype'),
+                        sid: currentState.selector.get('sid'),
+                        spath: currentState.selector.get('spath')
+                    };
+                    context.executeAction(navigateAction, {
+                        url: Util.makeNodeURL(selector, 'deck', 'view', undefined, undefined, true)
+                    });
+                } else {
+                    log.error(context, {
+                        filepath: __filename
+                    });
+                    //context.executeAction(serviceUnavailable, payload, done);
+                }
+                done();
+            });
     };
 
     if (payload.selector && !payload.id) {
@@ -44,15 +48,15 @@ export default function deleteTreeNodeAndNavigate(context, payload, done) {
     }
 
     let elementTitle = payload.stype;
-    if(elementTitle === 'deck')
+    if (elementTitle === 'deck')
         elementTitle = 'sub' + elementTitle;
     swal({
-        title: 'Delete '+elementTitle+'. Are you sure?',
+        title: 'Delete ' + elementTitle + '. Are you sure?',
         type: 'warning',
         showCancelButton: true,
         confirmButtonColor: '#3085d6',
         cancelButtonColor: '#d33',
         confirmButtonText: 'Yes, delete it!'
 
-    }).then(callback, (reason) => {/*do nothing*/}).catch(swal.noop);
+    }).then(callback, (reason) => { /*do nothing*/ }).catch(swal.noop);
 }

From 45e4c90334a724a1aebdf7a071aeae58d259b66d Mon Sep 17 00:00:00 2001
From: Kurt Junghanns <tboonx@googlemail.com>
Date: Tue, 30 Oct 2018 17:29:34 +0100
Subject: [PATCH 08/19] [SWIK-907_delete_deck_and_transfer_ownership] Removed
 removeDeck action and related code. Change of precondition to be able to
 delete/remove a deck

---
 actions/deckedit/deckRemove.js                |  15 ---
 .../ContentActions/ContentActionsHeader.js    |  13 +-
 .../DeckEditPanel/DeckPropertiesEditor.js     | 122 +++---------------
 services/deck.js                              |  20 +--
 stores/DeckEditStore.js                       |  14 --
 5 files changed, 33 insertions(+), 151 deletions(-)
 delete mode 100644 actions/deckedit/deckRemove.js

diff --git a/actions/deckedit/deckRemove.js b/actions/deckedit/deckRemove.js
deleted file mode 100644
index 7937e7e5f..000000000
--- a/actions/deckedit/deckRemove.js
+++ /dev/null
@@ -1,15 +0,0 @@
-const log = require('../log/clog');
-
-export default function deckRemove(context, payload, done) {
-    log.info(context);
-    context.dispatch('START_DELETE_DECK');
-    context.service.delete('deck.remove', payload, { timeout: 20 * 1000 }, (err, res) => {
-        if (err) {
-            context.dispatch('REMOVE_DECK_ERROR', err);
-        }
-        else {
-            context.dispatch('REMOVE_DECK_SUCCESS', res);
-        }
-        done();
-    });
-}
diff --git a/components/Deck/ContentPanel/ContentActions/ContentActionsHeader.js b/components/Deck/ContentPanel/ContentActions/ContentActionsHeader.js
index 10107b76f..c35439bdf 100644
--- a/components/Deck/ContentPanel/ContentActions/ContentActionsHeader.js
+++ b/components/Deck/ContentPanel/ContentActions/ContentActionsHeader.js
@@ -24,6 +24,7 @@ import {getLanguageName, getLanguageNativeName} from '../../../../common';
 import DeckTranslationsModal from '../Translation/DeckTranslationsModal';
 import addDeckTranslation from '../../../../actions/translation/addDeckTranslation';
 import addSlideTranslation from '../../../../actions/translation/addSlideTranslation';
+import DeckViewStore from '../../../../stores/DeckViewStore';
 
 class ContentActionsHeader extends React.Component {
     constructor(props){
@@ -96,6 +97,13 @@ class ContentActionsHeader extends React.Component {
     }
 
     handleDeleteNode(selector) {
+        if (this.props.DeckViewStore.deckData.usage.length > 0) {
+            const otherParents = this.props.DeckViewStore.deckData.usage.filter((deck) => parseInt(deck.id, 10) !== parseInt(this.props.selector.id, 10));
+            if (otherParents && otherParents.length > 0) {
+                return this.context.executeAction(deleteTreeNodeAndNavigate, selector);
+            }
+        }
+
         swal({
             title: 'Deletion of subdeck',
             html: 'You could remove this subdeck from its parent and keep it as your own deck or delete the deck complete which also removes it as subdeck.',
@@ -458,13 +466,14 @@ ContentActionsHeader.contextTypes = {
     intl: PropTypes.object.isRequired
 };
 //it should listen to decktree store in order to handle adding slides/decks
-ContentActionsHeader = connectToStores(ContentActionsHeader, [DeckTreeStore, UserProfileStore, PermissionsStore, ContentStore, TranslationStore], (context, props) => {
+ContentActionsHeader = connectToStores(ContentActionsHeader, [DeckTreeStore, UserProfileStore, PermissionsStore, ContentStore, TranslationStore, DeckViewStore], (context, props) => {
     return {
         DeckTreeStore: context.getStore(DeckTreeStore).getState(),
         UserProfileStore: context.getStore(UserProfileStore).getState(),
         PermissionsStore: context.getStore(PermissionsStore).getState(),
         ContentStore: context.getStore(ContentStore).getState(),
-        TranslationStore: context.getStore(TranslationStore).getState()
+        TranslationStore: context.getStore(TranslationStore).getState(),
+        DeckViewStore: context.getStore(DeckViewStore).getState()
     };
 });
 export default ContentActionsHeader;
diff --git a/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
index 2de49dc88..d27bad79c 100644
--- a/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
+++ b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
@@ -22,7 +22,6 @@ import PermissionsStore from '../../../../../stores/PermissionsStore';
 import updateTheme from '../../../../../actions/updateTheme';
 import {showGroupDetailsModal} from '../../../../../actions/deckedit/functionsForGroupDetailsModal';
 import deckDeletion from '../../../../../actions/deckedit/deckDeletion';
-import deckRemove from '../../../../../actions/deckedit/deckRemove';
 import TransferOwnership from './TransferOwnership';
 import loadEditors from '../../../../../actions/deckedit/loadEditors';
 
@@ -138,38 +137,6 @@ class DeckPropertiesEditor extends React.Component {
                         });
                     });
             }
-            else if (newProps.DeckEditStore.viewstate === 'errorRemove') {
-                swal({
-                    title: 'Error',
-                    text: 'Unknown error while removing.',
-                    type: 'error',
-                    confirmButtonText: 'Close',
-                    confirmButtonClass: 'negative ui button',
-                    allowEscapeKey: true,
-                    allowOutsideClick: true,
-                    buttonsStyling: false
-                })
-                    .then(() => {
-                        return true;
-                    })
-                    .catch();
-            }
-            else if (newProps.DeckEditStore.viewstate === 'successRemove') {
-                swal({
-                    title: 'Success',
-                    text: 'The deck was removed from its parents.',
-                    type: 'success',
-                    confirmButtonText: 'Confirm',
-                    confirmButtonClass: 'positive ui button',
-                    allowEscapeKey: true,
-                    allowOutsideClick: true,
-                    buttonsStyling: false
-                })
-                    .then(() => {
-                        return true;
-                    })
-                    .catch();
-            }
             else if (newProps.DeckEditStore.viewstate === 'errorEditors') {
                 swal({
                     title: 'Error',
@@ -373,83 +340,30 @@ class DeckPropertiesEditor extends React.Component {
         console.log('handleDelete', this.state.users, this.state.groups, this.props.DeckEditStore.roots);
         console.log('handleDelete more data', this.props.selector, this.props.DeckEditStore);
 
-        if ( this.props.DeckEditStore.roots.length < 1 ) {
-            // not used in other decks
+        // this.props.DeckEditStore.roots.length < 1
+        // not used in other decks
 
-            if (this.state.users.length < 1 && this.state.groups.length < 1) {
-                // no editors - could just be deleted
-                swal({
-                    title: 'Delete this deck?',
-                    text: `Do you really want to delete the deck ${this.props.DeckEditStore.deckProps.title} (${this.props.DeckEditStore.deckProps.sid})?`,
-                    type: 'question',
-                    showCloseButton: false,
-                    showCancelButton: true,
-                    allowEscapeKey: true,
-                    showConfirmButton: true
-                })
-                .then(() => {
-                    this.context.executeAction(deckDeletion, {id: this.props.DeckEditStore.deckProps.sid.split('-')[0]});
-                }, (reason) => { // canceled
-                });
-            }
-            else {
-                // transfer ownership
-                this.context.executeAction(loadEditors, {users: this.state.users, groups: this.state.groups});
-            }
-        }
-        else {
-            // is included as subdeck in one other deck and could not just deleted
-            // show modal with 2 options: delete and remove
-
-            const parentRootDecks = this.props.DeckEditStore.roots.map((deck) => `<a href="${location.origin}/deck/${deck.id}" target="_blank">${deck.id}</a>`);
+        if (this.state.users.length < 1 && this.state.groups.length < 1) {
+            // no editors - could just be deleted
             swal({
-                title: 'Deck is in use',
-                html: 'The deck you want to delete is used as a subdeck in the following decks: <br>'
-                    + parentRootDecks.join('<br>')
-                    + '<br><br>You could remove your deck as a subdeck from the listed ones or delete the deck complete which also removes it as subdeck.',
+                title: 'Delete this deck?',
+                text: `Do you really want to delete the deck ${this.props.DeckEditStore.deckProps.title} (${this.props.DeckEditStore.deckProps.sid})?`,
                 type: 'question',
+                showCloseButton: false,
                 showCancelButton: true,
-                confirmButtonText: 'Remove as subdeck',
-                confirmButtonClass: 'ui button',
-                cancelButtonText: 'Delete whole deck',
-                cancelButtonClass: 'negative ui button',
                 allowEscapeKey: true,
-                allowOutsideClick: true,
-                buttonsStyling: false
+                showConfirmButton: true
             })
-                .then((result) => {
-                    console.log(result);
-                    // confirm btn
-                    // remove deck as node from the parent deck
-                    this.context.executeAction(deckRemove, {id: this.props.DeckEditStore.deckProps.sid.split('-')[0]});
-                }, (action) => {
-                    if (action === 'cancel') {
-                        if (this.state.users.length < 1 && this.state.groups.length < 1) {
-                            // no editors - could just be deleted
-                            swal({
-                                title: 'Delete this deck?',
-                                text: `Do you really want to delete the deck ${this.props.DeckEditStore.deckProps.title} (${this.props.DeckEditStore.deckProps.sid})?`,
-                                type: 'question',
-                                showCloseButton: false,
-                                showCancelButton: true,
-                                allowEscapeKey: true,
-                                showConfirmButton: true
-                            })
-                            .then(() => {
-                                this.context.executeAction(deckDeletion, {id: this.props.DeckEditStore.deckProps.sid.split('-')[0]});
-                            }, (reason) => { // canceled
-                            });
-                        }
-                        else {
-                            // transfer ownership
-                            this.context.executeAction(loadEditors, {users: this.state.users, groups: this.state.groups});
-                        }
-                    }
-                })
-                .catch((e) => {
-                    console.log(e);
-                });
+            .then(() => {
+                this.context.executeAction(deckDeletion, {id: this.props.DeckEditStore.deckProps.sid.split('-')[0]});
+            }, (reason) => { // canceled
+            });
         }
+        else {
+            // transfer ownership
+            this.context.executeAction(loadEditors, {users: this.state.users, groups: this.state.groups});
+        }
+
     }
 
     handleChange(fieldName, event) {
@@ -702,7 +616,7 @@ class DeckPropertiesEditor extends React.Component {
                     onClick={this.handleSave.bind(this)}>Save
                 </button>
                 {
-                  (this.props.selector.spath) ?
+                  (this.props.selector.spath || this.props.DeckEditStore.roots.length > 0) ?
                     ''
                     :
                     <button className='negative ui button'
diff --git a/services/deck.js b/services/deck.js
index 3cbccc896..3957b44a3 100644
--- a/services/deck.js
+++ b/services/deck.js
@@ -58,12 +58,12 @@ export default {
                         likes[deckId] = 0;
                     }));
                 }
-                
-                return Promise.all(likePromises).then( () => { 
+
+                return Promise.all(likePromises).then( () => {
                     res.forEach((deck) => {
                         deck.likes = likes[deck._id];
                     });
-                    return res; 
+                    return res;
                 });
             }).then((res) => {
                 callback(null, {featured: addSlugs(res)});
@@ -91,7 +91,7 @@ export default {
 
                 let deckIds = res.map( (deck) => deck._id);
                 let questionsPromise = (args.showQuestionCounts === true) ? getQuestionsCount(deckIds) : Promise.resolve();
-                
+
                 return Promise.all([usersPromise, questionsPromise]).then( ([users, questionCounts]) => {
                     let usernames = users.reduce((acc, user) => ({...acc, [user._id]: user.username}), {});
                     res.forEach((deck) => {
@@ -621,18 +621,6 @@ export default {
             })
             .catch((err) => callback(err));
         }
-        else if (resource === 'deck.remove') {
-            rp({
-                method: 'DELETE',
-                uri: Microservices.deck.uri + '/deck/' + params.id + '/links',
-                headers: { '----jwt----': params.jwt },
-                json: true
-            })
-            .then((body) => {
-                callback(null, body);
-            })
-            .catch((err) => callback(err));
-        }
     }
 };
 
diff --git a/stores/DeckEditStore.js b/stores/DeckEditStore.js
index fe7f3676b..81d9d6677 100644
--- a/stores/DeckEditStore.js
+++ b/stores/DeckEditStore.js
@@ -144,18 +144,6 @@ class DeckEditStore extends BaseStore {
         this.viewstate = '';
     }
 
-    removeDeckError(error) {
-        this.viewstate = 'errorRemove';
-        this.emitChange();
-        this.viewstate = '';
-    }
-
-    removeDeck(data) {
-        this.viewstate = 'successRemove';
-        this.emitChange();
-        this.viewstate = '';
-    }
-
     startTransferOwnership() {
         this.viewstate = 'loading';
         this.emitChange();
@@ -217,8 +205,6 @@ DeckEditStore.handlers = {
     'DELETE_DECK_ERROR': 'deleteDeckError',
     'DELETE_DECK_SUCCESS': 'deleteDeck',
     'START_DELETE_DECK': 'startDeleteDeck',
-    'REMOVE_DECK_ERROR': 'removeDeckError',
-    'REMOVE_DECK_SUCCESS': 'removeDeck',
     'START_TRANSFER_OWNERSHIP': 'startTransferOwnership',
     'LOAD_EDITORS_LIST_SUCCESS': 'editorsLoaded',
     'LOAD_EDITORS_LIST_ERROR': 'errorLoadingEditors',

From ffe23a2c88767cdce22a9794e5b4704a0574e59e Mon Sep 17 00:00:00 2001
From: Kostis Pristouris <kprist@gmail.com>
Date: Wed, 31 Oct 2018 09:57:38 +0200
Subject: [PATCH 09/19] Fix some delete subdeck flows and messages

---
 actions/decktree/deleteTreeNode.js            |  7 ----
 actions/decktree/deleteTreeNodeAndNavigate.js | 17 ++++++----
 .../ContentActions/ContentActionsHeader.js    | 33 ++++++++++++++-----
 services/decktree.js                          | 16 ++++-----
 4 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/actions/decktree/deleteTreeNode.js b/actions/decktree/deleteTreeNode.js
index 4a7803f98..b9e42f39c 100644
--- a/actions/decktree/deleteTreeNode.js
+++ b/actions/decktree/deleteTreeNode.js
@@ -9,13 +9,6 @@ export default function deleteTreeNode(context, payload, done) {
     log.info(context);
     let userid = context.getStore(UserProfileStore).userid;
 
-    let purge = false;
-    if (payload.selector) {
-        purge = payload.purge ? payload.purge : false;
-        payload = payload.selector;
-    }
-    payload.purge = purge;
-
     if (userid != null && userid !== '') {
         //enrich with jwt
         payload.jwt = context.getStore(UserProfileStore).jwt;
diff --git a/actions/decktree/deleteTreeNodeAndNavigate.js b/actions/decktree/deleteTreeNodeAndNavigate.js
index 25ddebd19..ff627f7b2 100644
--- a/actions/decktree/deleteTreeNodeAndNavigate.js
+++ b/actions/decktree/deleteTreeNodeAndNavigate.js
@@ -43,20 +43,25 @@ export default function deleteTreeNodeAndNavigate(context, payload, done) {
             });
     };
 
-    if (payload.selector && !payload.id) {
+    // skip swal as a previous modal already got approval
+    console.log(payload);
+    if (payload.confirmed) {
         return callback(true);
     }
 
-    let elementTitle = payload.stype;
-    if (elementTitle === 'deck')
-        elementTitle = 'sub' + elementTitle;
+    let elementTitle = payload.stype, html;
+    if (elementTitle === 'deck') {
+        elementTitle = 'subdeck';
+        html = 'You will still be able to find this deck "My Decks" after removing it. You can only delete non-shared subdecks that have no subdecks of their own.';
+    }
     swal({
-        title: 'Delete ' + elementTitle + '. Are you sure?',
+        title: 'Remove ' + elementTitle + '. Are you sure?',
+        html,
         type: 'warning',
         showCancelButton: true,
         confirmButtonColor: '#3085d6',
         cancelButtonColor: '#d33',
-        confirmButtonText: 'Yes, delete it!'
+        confirmButtonText: 'Yes, remove it!'
 
     }).then(callback, (reason) => { /*do nothing*/ }).catch(swal.noop);
 }
diff --git a/components/Deck/ContentPanel/ContentActions/ContentActionsHeader.js b/components/Deck/ContentPanel/ContentActions/ContentActionsHeader.js
index c35439bdf..7de5627aa 100644
--- a/components/Deck/ContentPanel/ContentActions/ContentActionsHeader.js
+++ b/components/Deck/ContentPanel/ContentActions/ContentActionsHeader.js
@@ -97,34 +97,49 @@ class ContentActionsHeader extends React.Component {
     }
 
     handleDeleteNode(selector) {
+        // plain remove for slides 
+        if (selector.stype !== 'deck') {
+            return this.context.executeAction(deleteTreeNodeAndNavigate, selector);
+        }
+
+        // plain remove for decks with subdecks
+        if (this.props.DeckViewStore.deckData.contentItems.find((i) => i.kind === 'deck')) {
+            return this.context.executeAction(deleteTreeNodeAndNavigate, selector);
+        }
+
+        // plain remove for shared subdecks
         if (this.props.DeckViewStore.deckData.usage.length > 0) {
-            const otherParents = this.props.DeckViewStore.deckData.usage.filter((deck) => parseInt(deck.id, 10) !== parseInt(this.props.selector.id, 10));
-            if (otherParents && otherParents.length > 0) {
+            // TODO make this test more strict: check for actual ids in usage matching current deck parent
+            const otherParents = this.props.DeckViewStore.deckData.usage;
+            if (otherParents.length > 1) {
                 return this.context.executeAction(deleteTreeNodeAndNavigate, selector);
             }
         }
 
         swal({
-            title: 'Deletion of subdeck',
-            html: 'You could remove this subdeck from its parent and keep it as your own deck or delete the deck complete which also removes it as subdeck.',
+            title: 'Remove subdeck',
+            html: 'You have the option to simply remove this subdeck and keep it in "My Decks" or delete this subdeck completely.',
             type: 'question',
             showCancelButton: true,
-            confirmButtonText: 'Remove as subdeck',
+            confirmButtonText: 'Remove',
             confirmButtonClass: 'ui button',
-            cancelButtonText: 'Delete whole deck',
+            cancelButtonText: 'Delete',
             cancelButtonClass: 'negative ui button',
             allowEscapeKey: true,
             allowOutsideClick: true,
             buttonsStyling: false
         })
             .then((result) => {
-                console.log(result);
                 // confirm btn
                 // remove deck as node from the parent deck
-                this.context.executeAction(deleteTreeNodeAndNavigate, {selector});
+                selector.confirmed = true;
+                selector.purge = false;
+                this.context.executeAction(deleteTreeNodeAndNavigate, selector);
             }, (action) => {
                 if (action === 'cancel') {
-                    this.context.executeAction(deleteTreeNodeAndNavigate, {selector, purge: true});
+                    selector.confirmed = true;
+                    selector.purge = true;
+                    this.context.executeAction(deleteTreeNodeAndNavigate, selector);
                 }
             })
             .catch((e) => {
diff --git a/services/decktree.js b/services/decktree.js
index 7ba975a7f..6c6fcd68b 100644
--- a/services/decktree.js
+++ b/services/decktree.js
@@ -30,7 +30,7 @@ export default {
             }).then((res) => {
                 callback(null, {translations: res, selector: selector, language: args.language});
             }).catch((err) => {
-                console.log(err);
+                console.log(err.message);
                 callback(null, {translations: [], selector: selector, language: args.language});
             });
         }
@@ -54,7 +54,7 @@ export default {
             }).then((res) => {
                 callback(null, {node: JSON.parse(res), selector: args.selector});
             }).catch((err) => {
-                console.log(err);
+                console.log(err.message);
                 callback(null, {node: {}, selector: args.selector});
             });
         }
@@ -71,7 +71,7 @@ export default {
             }).then((res) => {
                 callback(null, {node: res, selector: selector, language: args.language});
             }).catch((err) => {
-                console.log(err);
+                console.log(err.message);
                 callback(null, {node: {}, selector: selector, language: args.language});
             });
         }
@@ -107,7 +107,7 @@ export default {
                 }
                 callback(null, res);
             }).catch((err) => {
-                console.log(err);
+                console.log(err.message);
                 callback(err, params);
             });
         } else if (resource === 'decktree.move'){
@@ -123,7 +123,7 @@ export default {
             }).then((res) => {
                 callback(null, JSON.parse(res));
             }).catch((err) => {
-                console.log(err);
+                console.log(err.message);
                 callback(err);
             });
         } else if (resource === 'decktree.translation'){
@@ -139,7 +139,7 @@ export default {
             }).then((res) => {
                 callback(null, res);
             }).catch((err) => {
-                console.log(err);
+                console.log(err.message);
                 callback(err);
             });
         }
@@ -163,7 +163,7 @@ export default {
             rp(options).then((res) => {
                 callback(null, JSON.parse(res));
             }).catch((err) => {
-                console.log(err);
+                console.log(err.message);
                 callback(null, params);
             });
         }
@@ -181,7 +181,7 @@ export default {
             rp(options).then((res) => {
                 callback(null, JSON.parse(res));
             }).catch((err) => {
-                console.log(err);
+                console.log(err.message);
                 callback(null, params);
             });
         }

From f10d4a6d5945973df387101cd18b69a657d3ada5 Mon Sep 17 00:00:00 2001
From: Kostis Pristouris <kprist@gmail.com>
Date: Tue, 13 Nov 2018 20:16:29 +0200
Subject: [PATCH 10/19] Simplify subdeck remove flow: don't provide option to
 delete

---
 actions/decktree/deleteTreeNodeAndNavigate.js             | 8 +++-----
 .../ContentPanel/ContentActions/ContentActionsHeader.js   | 5 +++++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/actions/decktree/deleteTreeNodeAndNavigate.js b/actions/decktree/deleteTreeNodeAndNavigate.js
index ff627f7b2..7175c3ae4 100644
--- a/actions/decktree/deleteTreeNodeAndNavigate.js
+++ b/actions/decktree/deleteTreeNodeAndNavigate.js
@@ -1,10 +1,8 @@
 import async from 'async';
 import DeckTreeStore from '../../stores/DeckTreeStore';
 import deleteTreeNode from './deleteTreeNode';
-const log = require('../log/clog');
-import {
-    navigateAction
-} from 'fluxible-router';
+import log from '../log/clog';
+import {navigateAction} from 'fluxible-router';
 import Util from '../../components/common/Util';
 import serviceUnavailable from '../error/serviceUnavailable';
 
@@ -52,7 +50,7 @@ export default function deleteTreeNodeAndNavigate(context, payload, done) {
     let elementTitle = payload.stype, html;
     if (elementTitle === 'deck') {
         elementTitle = 'subdeck';
-        html = 'You will still be able to find this deck "My Decks" after removing it. You can only delete non-shared subdecks that have no subdecks of their own.';
+        html = 'This subdeck will become a proper deck after removing it. It will be available in its creator\'s "My Decks" page.';
     }
     swal({
         title: 'Remove ' + elementTitle + '. Are you sure?',
diff --git a/components/Deck/ContentPanel/ContentActions/ContentActionsHeader.js b/components/Deck/ContentPanel/ContentActions/ContentActionsHeader.js
index 7de5627aa..652066bb6 100644
--- a/components/Deck/ContentPanel/ContentActions/ContentActionsHeader.js
+++ b/components/Deck/ContentPanel/ContentActions/ContentActionsHeader.js
@@ -97,6 +97,11 @@ class ContentActionsHeader extends React.Component {
     }
 
     handleDeleteNode(selector) {
+        this.context.executeAction(deleteTreeNodeAndNavigate, selector);
+    }
+
+    // TODO Remove this unused code once it is decided we don't ever need to provide this option
+    handleDeleteNodeWithCheck(selector) {
         // plain remove for slides 
         if (selector.stype !== 'deck') {
             return this.context.executeAction(deleteTreeNodeAndNavigate, selector);

From e6b695d031835fd38539f8aa9d28435218474eb3 Mon Sep 17 00:00:00 2001
From: Kostis Pristouris <kprist@gmail.com>
Date: Tue, 13 Nov 2018 20:38:34 +0200
Subject: [PATCH 11/19] Move deck delete button to the right; add checks after
 it's clicked

---
 .../DeckEditPanel/DeckPropertiesEditor.js     | 48 ++++++++++++++-----
 services/deck.js                              |  3 +-
 2 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
index d27bad79c..1d1347b97 100644
--- a/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
+++ b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
@@ -340,14 +340,39 @@ class DeckPropertiesEditor extends React.Component {
         console.log('handleDelete', this.state.users, this.state.groups, this.props.DeckEditStore.roots);
         console.log('handleDelete more data', this.props.selector, this.props.DeckEditStore);
 
-        // this.props.DeckEditStore.roots.length < 1
-        // not used in other decks
+        let isSubdeck = this.props.selector.spath || this.props.DeckEditStore.roots.length > 0;
+        let hasSubdecks = this.props.DeckEditStore.deckProps.contentItems.filter((n) => n.kind === 'deck').length > 0;
+
+        if (isSubdeck) {
+            swal({
+                title: 'Deck cannot be deleted',
+                text: 'This deck appears to be used as a subdeck in some other deck. You can only delete decks when they are not used as subdecks.',
+                type: 'warning',
+                allowEscapeKey: true,
+                showConfirmButton: true,
+            });
+
+            return;
+        }
+
+        if (hasSubdecks) {
+            swal({
+                title: 'Deck cannot be deleted',
+                text: 'You can only delete decks when they have no subdecks. Please remove any subdecks first and try again',
+                type: 'warning',
+                allowEscapeKey: true,
+                showConfirmButton: true,
+            });
+
+            return;
+        }
 
         if (this.state.users.length < 1 && this.state.groups.length < 1) {
+            let deckId = this.props.DeckEditStore.deckProps.sid.split('-')[0];
             // no editors - could just be deleted
             swal({
                 title: 'Delete this deck?',
-                text: `Do you really want to delete the deck ${this.props.DeckEditStore.deckProps.title} (${this.props.DeckEditStore.deckProps.sid})?`,
+                text: `Do you really want to delete the deck: "${this.props.DeckEditStore.deckProps.title}" (ID: ${deckId})?`,
                 type: 'question',
                 showCloseButton: false,
                 showCancelButton: true,
@@ -355,7 +380,7 @@ class DeckPropertiesEditor extends React.Component {
                 showConfirmButton: true
             })
             .then(() => {
-                this.context.executeAction(deckDeletion, {id: this.props.DeckEditStore.deckProps.sid.split('-')[0]});
+                this.context.executeAction(deckDeletion, {id: deckId});
             }, (reason) => { // canceled
             });
         }
@@ -610,19 +635,18 @@ class DeckPropertiesEditor extends React.Component {
                 </div>
             </div>;
 
+        let deleteButton = (this.props.PermissionsStore.permissions.admin && (this.props.DeckEditStore.deckProps.sid === this.props.DeckEditStore.deckProps.localRootDeck)) ? 
+            <button className='ui negative right floated button'
+                onClick={this.handleDelete.bind(this)}>Delete
+            </button>
+            : '';
+
         let buttons = (
             <div>
+                {deleteButton}
                 <button className='ui primary button'
                     onClick={this.handleSave.bind(this)}>Save
                 </button>
-                {
-                  (this.props.selector.spath || this.props.DeckEditStore.roots.length > 0) ?
-                    ''
-                    :
-                    <button className='negative ui button'
-                        onClick={this.handleDelete.bind(this)}>Delete
-                    </button>
-                }
                 <button className="ui secondary button"
                     onClick={this.handleCancel.bind(this)}>
                     Cancel
diff --git a/services/deck.js b/services/deck.js
index 26e8ce39f..0e6681b3d 100644
--- a/services/deck.js
+++ b/services/deck.js
@@ -337,7 +337,8 @@ export default {
                         revisionOwner: deck.revisionUser,
                         sid: args.sid,
                         localRootDeck: args.id,
-                        translations: deck.translations || []
+                        translations: deck.translations || [],
+                        contentItems: deck.contentItems,
                     };
 
                     callback(null, {

From 2941b4f163122725a3e4cd2cb0f3de1bede58bcf Mon Sep 17 00:00:00 2001
From: Kostis Pristouris <kprist@gmail.com>
Date: Tue, 13 Nov 2018 20:58:25 +0200
Subject: [PATCH 12/19] Include "Delete" button in Transfer Ownership; close
 modal on delete

---
 actions/deckedit/deckDeletion.js              | 25 +++++----
 actions/deckedit/loadEditors.js               | 13 +++--
 .../DeckEditPanel/DeckPropertiesEditor.js     |  2 +-
 .../DeckEditPanel/TransferOwnership.js        | 54 ++++++++++++-------
 services/deck.js                              |  4 +-
 5 files changed, 64 insertions(+), 34 deletions(-)

diff --git a/actions/deckedit/deckDeletion.js b/actions/deckedit/deckDeletion.js
index 3e0495fee..ba55173f4 100644
--- a/actions/deckedit/deckDeletion.js
+++ b/actions/deckedit/deckDeletion.js
@@ -1,20 +1,25 @@
 import log from '../log/clog';
 
+import hideTransferOwnershipModal from './hideTransferOwnershipModal';
+
 import UserProfileStore from '../../stores/UserProfileStore';
 
 export default function deckDeletion(context, payload, done) {
     log.info(context);
-    context.dispatch('START_DELETE_DECK');
 
-    payload.jwt = context.getStore(UserProfileStore).jwt;
+    context.executeAction(hideTransferOwnershipModal, {} , () => {
+        context.dispatch('START_DELETE_DECK');
+
+        payload.jwt = context.getStore(UserProfileStore).jwt;
 
-    context.service.delete('deck.delete', payload, { timeout: 20 * 1000 }, (err, res) => {
-        if (err) {
-            context.dispatch('DELETE_DECK_ERROR', err);
-        }
-        else {
-            context.dispatch('DELETE_DECK_SUCCESS', res);
-        }
-        done();
+        context.service.delete('deck.delete', payload, { timeout: 20 * 1000 }, (err, res) => {
+            if (err) {
+                context.dispatch('DELETE_DECK_ERROR', err);
+            }
+            else {
+                context.dispatch('DELETE_DECK_SUCCESS', res);
+            }
+            done();
+        });
     });
 }
diff --git a/actions/deckedit/loadEditors.js b/actions/deckedit/loadEditors.js
index 55f797566..ef2e06ee9 100644
--- a/actions/deckedit/loadEditors.js
+++ b/actions/deckedit/loadEditors.js
@@ -1,8 +1,11 @@
-const log = require('../log/clog');
+import log from '../log/clog';
+import UserProfileStore from '../../stores/UserProfileStore';
 
 export default function loadEditors(context, payload, done) {
     log.info(context);
     context.dispatch('START_TRANSFER_OWNERSHIP');
+
+    let userid = context.getStore(UserProfileStore).userid;
     const groupids = payload.groups.map((group) => parseInt(group.id, 10));
 
     if (groupids.length < 1) {
@@ -20,15 +23,17 @@ export default function loadEditors(context, payload, done) {
                 ret.push(group.creator);
                 return ret.concat(group.members);
             }, []));
-            //remove duplicates
+
+            // purge duplicates and current user
             users = users.reduce((ret, user) => {
                 let found = ret.find((u) => ((u.id || u.userid) === (user.id || user.userid)));
-                if (!found) {
+                if (!found && (user.id || user.userid) !== userid) {
                     ret.push(user);
                 }
                 return ret;
             }, []);
-            console.log('got all editors', users);
+
+            // console.log('got all editors', users);
             context.dispatch('LOAD_EDITORS_LIST_SUCCESS', users);
         }
         done();
diff --git a/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
index 1d1347b97..b99170287 100644
--- a/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
+++ b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
@@ -182,7 +182,7 @@ class DeckPropertiesEditor extends React.Component {
                 })
                     .then(() => {
                         this.context.executeAction(navigateAction, {
-                            url: '/'
+                            url: '/user/' + this.context.getUser().username
                         });
                     })
                     .catch(() => {
diff --git a/components/Deck/ContentPanel/DeckModes/DeckEditPanel/TransferOwnership.js b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/TransferOwnership.js
index 36756c715..cce7bb685 100644
--- a/components/Deck/ContentPanel/DeckModes/DeckEditPanel/TransferOwnership.js
+++ b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/TransferOwnership.js
@@ -7,6 +7,7 @@ import { FormattedMessage, defineMessages } from 'react-intl';
 import UserPicture from '../../../../common/UserPicture';
 import hideTransferOwnershipModal from '../../../../../actions/deckedit/hideTransferOwnershipModal';
 import transferOwnership from '../../../../../actions/deckedit/transferOwnership';
+import deckDeletion from '../../../../../actions/deckedit/deckDeletion';
 
 class TransferOwnership extends React.Component {
     constructor(props) {
@@ -20,8 +21,8 @@ class TransferOwnership extends React.Component {
                 defaultMessage: 'Transfer Ownership'
             },
             close: {
-                id: 'TransferOwnership.close',
-                defaultMessage: 'Close'
+                id: 'TransferOwnership.cancel',
+                defaultMessage: 'Cancel'
             },
             unknownCountry: {
                 id: 'TransferOwnership.unknownCountry',
@@ -38,7 +39,11 @@ class TransferOwnership extends React.Component {
             continue: {
                 id: 'TransferOwnership.continue',
                 defaultMessage: 'Transfer ownership'
-            }
+            },
+            delete: {
+                id: 'TransferOwnership.delete',
+                defaultMessage: 'Delete'
+            },
         });
 
         this.state = {
@@ -47,12 +52,15 @@ class TransferOwnership extends React.Component {
     }
 
     handleClose() {
-	      $('#app').attr('aria-hidden','false');
-	      this.context.executeAction(hideTransferOwnershipModal, {});
+        $('#app').attr('aria-hidden','false');
+        this.context.executeAction(hideTransferOwnershipModal, {});
     }
 
     unmountTrap() {
-        this.handleClose();
+        // TODO commented this out as it appeared to cause trouble with flux and cascading updates,
+        // and it was impossible to get the transfer success dialog up
+        // this.handleClose();
+        $('#app').attr('aria-hidden','false');
     }
 
     handleContinue() {
@@ -60,6 +68,11 @@ class TransferOwnership extends React.Component {
         this.context.executeAction(transferOwnership, {deckid: this.props.deckid, userid: this.state.selectedUser});
     }
 
+    handleDelete() {
+        $('#app').attr('aria-hidden','false');
+        this.context.executeAction(deckDeletion, { id: this.props.deckid });
+    }
+
     render() {
         let editors = [];
 
@@ -109,22 +122,27 @@ class TransferOwnership extends React.Component {
 								<Modal.Header as="h1" content={this.context.intl.formatMessage(this.messages.modalHeading)} id='transferownershipmodal_header'/>
 								<Modal.Content id='transferownershipmodal_content' tabIndex="0">
                   <Container>
-                    <Segment color="blue" textAlign="center" padded>
-                      <Segment attached="bottom" textAlign="left">
-      									<h3 className="header" ></h3>
-      									<p>There are {this.props.users.length} users which have edit rights to the deck. Select one to transfer the ownership as precondition for deleting the deck.</p>
+                    <Segment color="blue">
+                      <Segment basic>
+      									<p>There are {this.props.users.length} users which have edit rights to this deck. You can make one of them the new deck owner, or delete the deck altogether.
+                        </p>
       									<Menu size='small' vertical style={{width: '100%'}}>
       											{editors}
       									</Menu>
                       </Segment>
-                      <Modal.Actions>
-  											<Button onClick={ this.handleContinue.bind(this) } role="button" tabIndex="0" aria-label={this.context.intl.formatMessage(this.messages.continue)} disabled={this.state.selectedUser === ''} positive>
-  													{this.context.intl.formatMessage(this.messages.continue)}
-  											</Button>
-                        <Button onClick={ this.handleClose } role="button" tabIndex="0" aria-label={this.context.intl.formatMessage(this.messages.close)}>
-  													{this.context.intl.formatMessage(this.messages.close)}
-  											</Button>
-      								</Modal.Actions>
+                      <Segment basic textAlign="center">
+                        <Modal.Actions>
+    											<Button onClick={ this.handleContinue.bind(this) } role="button" tabIndex="0" aria-label={this.context.intl.formatMessage(this.messages.continue)} disabled={this.state.selectedUser === ''} positive>
+    													{this.context.intl.formatMessage(this.messages.continue)}
+    											</Button>
+                          <Button onClick={ this.handleDelete.bind(this) } role="button" tabIndex="0" aria-label={this.context.intl.formatMessage(this.messages.delete)} negative>
+                              {this.context.intl.formatMessage(this.messages.delete)}
+                          </Button>
+                          <Button onClick={ this.handleClose } role="button" tabIndex="0" aria-label={this.context.intl.formatMessage(this.messages.close)}>
+    													{this.context.intl.formatMessage(this.messages.close)}
+    											</Button>
+        								</Modal.Actions>
+                      </Segment>
                     </Segment>
                   </Container>
 								</Modal.Content>
diff --git a/services/deck.js b/services/deck.js
index 0e6681b3d..f3387f894 100644
--- a/services/deck.js
+++ b/services/deck.js
@@ -616,10 +616,12 @@ export default {
     delete: (req, resource, params, config, callback) => {
         req.reqId = req.reqId ? req.reqId : -1;
         log.info({Id: req.reqId, Service: __filename.split('/').pop(), Resource: resource, Operation: 'delete', Method: req.method});
+
+        let deckId = parseInt(params.id);
         if (resource === 'deck.delete') {
             rp({
                 method: 'DELETE',
-                uri: Microservices.deck.uri + '/deck/' + params.id,
+                uri: Microservices.deck.uri + '/deck/' + deckId,
                 headers: { '----jwt----': params.jwt },
                 json: true
             })

From 41bdb719e83141427984c96996f6d4570bcc9abc Mon Sep 17 00:00:00 2001
From: Kurt Junghanns <tboonx@googlemail.com>
Date: Fri, 23 Nov 2018 16:10:40 +0100
Subject: [PATCH 13/19] [SWIK-907_delete_deck_and_transfer_ownership] Changed
 texts like Abi proposed.

---
 .../DeckEditPanel/DeckPropertiesEditor.js         | 15 +++++++++------
 .../DeckModes/DeckEditPanel/TransferOwnership.js  |  6 +++---
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
index b99170287..8e81b8229 100644
--- a/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
+++ b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
@@ -120,7 +120,7 @@ class DeckPropertiesEditor extends React.Component {
                     title: 'Success',
                     text: 'The deck was deleted.',
                     type: 'success',
-                    confirmButtonText: 'Confirm',
+                    confirmButtonText: 'OK',
                     confirmButtonClass: 'positive ui button',
                     allowEscapeKey: true,
                     allowOutsideClick: false,
@@ -350,6 +350,7 @@ class DeckPropertiesEditor extends React.Component {
                 type: 'warning',
                 allowEscapeKey: true,
                 showConfirmButton: true,
+                buttonsStyling: false
             });
 
             return;
@@ -358,10 +359,11 @@ class DeckPropertiesEditor extends React.Component {
         if (hasSubdecks) {
             swal({
                 title: 'Deck cannot be deleted',
-                text: 'You can only delete decks when they have no subdecks. Please remove any subdecks first and try again',
+                text: 'You can only delete decks with no sub-decks. Please remove the sub-decks first and try again.',
                 type: 'warning',
                 allowEscapeKey: true,
                 showConfirmButton: true,
+                buttonsStyling: false
             });
 
             return;
@@ -372,12 +374,13 @@ class DeckPropertiesEditor extends React.Component {
             // no editors - could just be deleted
             swal({
                 title: 'Delete this deck?',
-                text: `Do you really want to delete the deck: "${this.props.DeckEditStore.deckProps.title}" (ID: ${deckId})?`,
+                text: `Do you want to delete the deck "${this.props.DeckEditStore.deckProps.title}"? his action can not be reverted.`,
                 type: 'question',
                 showCloseButton: false,
                 showCancelButton: true,
                 allowEscapeKey: true,
-                showConfirmButton: true
+                showConfirmButton: true,
+                buttonsStyling: false
             })
             .then(() => {
                 this.context.executeAction(deckDeletion, {id: deckId});
@@ -635,9 +638,9 @@ class DeckPropertiesEditor extends React.Component {
                 </div>
             </div>;
 
-        let deleteButton = (this.props.PermissionsStore.permissions.admin && (this.props.DeckEditStore.deckProps.sid === this.props.DeckEditStore.deckProps.localRootDeck)) ? 
+        let deleteButton = (this.props.PermissionsStore.permissions.admin && (this.props.DeckEditStore.deckProps.sid === this.props.DeckEditStore.deckProps.localRootDeck)) ?
             <button className='ui negative right floated button'
-                onClick={this.handleDelete.bind(this)}>Delete
+                onClick={this.handleDelete.bind(this)}>Delete Deck
             </button>
             : '';
 
diff --git a/components/Deck/ContentPanel/DeckModes/DeckEditPanel/TransferOwnership.js b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/TransferOwnership.js
index cce7bb685..fadc291c9 100644
--- a/components/Deck/ContentPanel/DeckModes/DeckEditPanel/TransferOwnership.js
+++ b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/TransferOwnership.js
@@ -38,11 +38,11 @@ class TransferOwnership extends React.Component {
             },
             continue: {
                 id: 'TransferOwnership.continue',
-                defaultMessage: 'Transfer ownership'
+                defaultMessage: 'Transfer deck'
             },
             delete: {
                 id: 'TransferOwnership.delete',
-                defaultMessage: 'Delete'
+                defaultMessage: 'Delete deck'
             },
         });
 
@@ -124,7 +124,7 @@ class TransferOwnership extends React.Component {
                   <Container>
                     <Segment color="blue">
                       <Segment basic>
-      									<p>There are {this.props.users.length} users which have edit rights to this deck. You can make one of them the new deck owner, or delete the deck altogether.
+      									<p>Other users have rights to edit this deck. You can transfer the deck to another editor or delete the deck for everyone.
                         </p>
       									<Menu size='small' vertical style={{width: '100%'}}>
       											{editors}

From 778291569d8cdf46f89a13cc410212d8d2cbf3d9 Mon Sep 17 00:00:00 2001
From: Kostis Pristouris <kprist@gmail.com>
Date: Thu, 29 Nov 2018 18:48:21 +0200
Subject: [PATCH 14/19] Update delete deck buttons; add trash icon to delete,
 make "OK" green

---
 .../DeckEditPanel/DeckPropertiesEditor.js       | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
index 8e81b8229..944d93a94 100644
--- a/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
+++ b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
@@ -350,7 +350,8 @@ class DeckPropertiesEditor extends React.Component {
                 type: 'warning',
                 allowEscapeKey: true,
                 showConfirmButton: true,
-                buttonsStyling: false
+                confirmButtonClass: "positive ui button",
+                buttonsStyling: false,
             });
 
             return;
@@ -363,7 +364,8 @@ class DeckPropertiesEditor extends React.Component {
                 type: 'warning',
                 allowEscapeKey: true,
                 showConfirmButton: true,
-                buttonsStyling: false
+                confirmButtonClass: "positive ui button",
+                buttonsStyling: false,
             });
 
             return;
@@ -374,13 +376,16 @@ class DeckPropertiesEditor extends React.Component {
             // no editors - could just be deleted
             swal({
                 title: 'Delete this deck?',
-                text: `Do you want to delete the deck "${this.props.DeckEditStore.deckProps.title}"? his action can not be reverted.`,
+                text: `Do you want to delete the deck "${this.props.DeckEditStore.deckProps.title}"? This action can not be reverted.`,
                 type: 'question',
+
                 showCloseButton: false,
                 showCancelButton: true,
                 allowEscapeKey: true,
                 showConfirmButton: true,
-                buttonsStyling: false
+                confirmButtonClass: "positive ui button",
+                cancelButtonClass: "ui button",
+                buttonsStyling: false,
             })
             .then(() => {
                 this.context.executeAction(deckDeletion, {id: deckId});
@@ -639,8 +644,8 @@ class DeckPropertiesEditor extends React.Component {
             </div>;
 
         let deleteButton = (this.props.PermissionsStore.permissions.admin && (this.props.DeckEditStore.deckProps.sid === this.props.DeckEditStore.deckProps.localRootDeck)) ?
-            <button className='ui negative right floated button'
-                onClick={this.handleDelete.bind(this)}>Delete Deck
+            <button className='ui negative right floated left labeled icon button'
+                onClick={this.handleDelete.bind(this)}><i className='ui icon trash' aria-hidden />Delete Deck
             </button>
             : '';
 

From 9ae3f310595da628d971b8d19e1861355bdd56c6 Mon Sep 17 00:00:00 2001
From: Kostis Pristouris <kprist@gmail.com>
Date: Thu, 29 Nov 2018 19:19:08 +0200
Subject: [PATCH 15/19] Make indication of user to transfer deck to more
 visible; use keyboard

---
 .../DeckEditPanel/TransferOwnership.js         | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/components/Deck/ContentPanel/DeckModes/DeckEditPanel/TransferOwnership.js b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/TransferOwnership.js
index fadc291c9..66d671dbf 100644
--- a/components/Deck/ContentPanel/DeckModes/DeckEditPanel/TransferOwnership.js
+++ b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/TransferOwnership.js
@@ -83,17 +83,25 @@ class TransferOwnership extends React.Component {
                     '';
                 editors.push(
                   (
-                    <Menu.Item name={'item_' + user.username} key={user.id || user.userid} active={this.state.selectedUser === (user.id || user.userid)} onClick={() => {console.log('onItemClicked'); this.setState({selectedUser: user.id || user.userid});}}>
-                      <div className="ui grid">
-                        <div className="two wide column">
-                          <UserPicture picture={ user.picture } username={ user.username } avatar={ true } width= { 30 } size="tiny" />
+                    <Menu.Item name={'item_' + user.username} key={user.id || user.userid} tabIndex={0}
+                      active={this.state.selectedUser === (user.id || user.userid)}
+                      onClick={() => this.setState({selectedUser: user.id || user.userid})}
+                      onKeyPress={(e) => e.key === 'Enter' && this.setState({selectedUser: user.id || user.userid})} >
+                      <div className="ui grid middle aligned">
+                        <div className="two wide column center aligned">
+                          <UserPicture picture={ user.picture } username={ user.username } avatar={ true } width= { 30 } />
                         </div>
-                        <div className="fourten wide column">
+                        <div className="twelve wide column">
                           <TextArea className="sr-only" id={'usernameIsALinkHint' + (user.id || user.userid)} value={this.context.intl.formatMessage(this.messages.linkHint)} tabIndex ='-1'/>
                           <a className="header" href={'/user/' + user.username} target="_blank">{user.displayName || user.username}</a>
                           <br/>
                           {optionalText}
                         </div>
+                        <div className="two wide column center aligned">
+                        { this.state.selectedUser === (user.id || user.userid) && 
+                          <i className="big check circle green icon"></i>
+                        }
+                        </div>
                       </div>
                     </Menu.Item>
                   )

From 9902fe8612c31797e82660ff97f9cbab8db20a85 Mon Sep 17 00:00:00 2001
From: Kostis Pristouris <kprist@gmail.com>
Date: Thu, 29 Nov 2018 19:38:36 +0200
Subject: [PATCH 16/19] Fix linting errors

---
 .../DeckModes/DeckEditPanel/DeckPropertiesEditor.js       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
index 944d93a94..afcca70fe 100644
--- a/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
+++ b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
@@ -350,7 +350,7 @@ class DeckPropertiesEditor extends React.Component {
                 type: 'warning',
                 allowEscapeKey: true,
                 showConfirmButton: true,
-                confirmButtonClass: "positive ui button",
+                confirmButtonClass: 'positive ui button',
                 buttonsStyling: false,
             });
 
@@ -364,7 +364,7 @@ class DeckPropertiesEditor extends React.Component {
                 type: 'warning',
                 allowEscapeKey: true,
                 showConfirmButton: true,
-                confirmButtonClass: "positive ui button",
+                confirmButtonClass: 'positive ui button',
                 buttonsStyling: false,
             });
 
@@ -383,8 +383,8 @@ class DeckPropertiesEditor extends React.Component {
                 showCancelButton: true,
                 allowEscapeKey: true,
                 showConfirmButton: true,
-                confirmButtonClass: "positive ui button",
-                cancelButtonClass: "ui button",
+                confirmButtonClass: 'positive ui button',
+                cancelButtonClass: 'ui button',
                 buttonsStyling: false,
             })
             .then(() => {

From 9d059c1bee55ac02165175b025f38b11f83eea31 Mon Sep 17 00:00:00 2001
From: Kostis Pristouris <kprist@gmail.com>
Date: Thu, 29 Nov 2018 20:26:00 +0200
Subject: [PATCH 17/19] Improve how checking for deck usage before deleting
 works

---
 .../DeckEditPanel/DeckPropertiesEditor.js          |  6 ++----
 services/deck.js                                   |  8 ++++----
 stores/DeckEditStore.js                            | 14 +++++---------
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
index afcca70fe..c6bb8bba8 100644
--- a/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
+++ b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
@@ -337,10 +337,8 @@ class DeckPropertiesEditor extends React.Component {
 
     handleDelete(evt) {
         evt.preventDefault();
-        console.log('handleDelete', this.state.users, this.state.groups, this.props.DeckEditStore.roots);
-        console.log('handleDelete more data', this.props.selector, this.props.DeckEditStore);
 
-        let isSubdeck = this.props.selector.spath || this.props.DeckEditStore.roots.length > 0;
+        let isSubdeck = this.props.selector.spath || this.props.DeckEditStore.usage.length > 0;
         let hasSubdecks = this.props.DeckEditStore.deckProps.contentItems.filter((n) => n.kind === 'deck').length > 0;
 
         if (isSubdeck) {
@@ -554,7 +552,7 @@ class DeckPropertiesEditor extends React.Component {
     }
 
     render() {
-        // console.log('render edit: published and roots', this.state.published, this.props.DeckEditStore.roots);
+
         //CSS
         let titleFieldClass = classNames({
             'required': true,
diff --git a/services/deck.js b/services/deck.js
index f3387f894..0dcdb30a9 100644
--- a/services/deck.js
+++ b/services/deck.js
@@ -304,12 +304,12 @@ export default {
             let tagsPromise = deckPromise.then((deck) => fetchTagInfo(deck.tags));
 
             //fetch root decks
-            let rootsPromise = rp.get({
-                uri: Microservices.deck.uri + '/deck/' + args.sid.split('-')[0] + '/rootDecks',
+            let usagePromise = rp.get({
+                uri: Microservices.deck.uri + '/deck/' + args.sid + '/usage',
                 json:true,
             });
 
-            Promise.all([deckPromise, tagsPromise, rootsPromise]).then(([deck, tags, roots]) => {
+            Promise.all([deckPromise, tagsPromise, usagePromise]).then(([deck, tags, usage]) => {
                 // prepare users and groups from editors object
                 let {users, groups} = deck.editors || {};
                 if (!users) users = [];
@@ -343,7 +343,7 @@ export default {
 
                     callback(null, {
                         deckProps: deckProps,
-                        roots
+                        usage
                     });
                 });
             }).catch((err) => {
diff --git a/stores/DeckEditStore.js b/stores/DeckEditStore.js
index 81d9d6677..a483b3d24 100644
--- a/stores/DeckEditStore.js
+++ b/stores/DeckEditStore.js
@@ -5,7 +5,7 @@ class DeckEditStore extends BaseStore {
     constructor(dispatcher) {
         super(dispatcher);
         this.deckProps = {};
-        this.editors = [];
+
         this.authorizedUsers = [];
         this.authorizedGroups = [];
         this.viewstate = '';
@@ -26,14 +26,13 @@ class DeckEditStore extends BaseStore {
 
         this.queryParams = {};
 
-        this.roots = [];
+        this.usage = [];
         this.showTransferOwnershipModal = false;
         this.allEditors = [];
     }
 
     updateProperties(payload) {
         this.deckProps = payload.deckProps;
-        this.editors = payload.editors;
 
         //edit rights adoptions
         this.authorizedUsers = JSON.parse(JSON.stringify(payload.deckProps.editors.users));
@@ -41,8 +40,7 @@ class DeckEditStore extends BaseStore {
         this.originalEditors = JSON.parse(JSON.stringify(payload.deckProps.editors));
         // console.log('Now we have new origin editors:', this.originalEditors);
 
-        this.roots = payload.roots.filter((deck) => parseInt(deck.id, 10) !== parseInt(this.deckProps.sid.split('-')[0], 10));
-        // console.log('DeckEditStore roots', payload.roots, this.roots, this.deckProps.sid, this.deckProps.sid.split('-')[0]);
+        this.usage = payload.usage;
 
         this.emitChange();
     }
@@ -59,7 +57,6 @@ class DeckEditStore extends BaseStore {
     getState() {
         return {
             deckProps: this.deckProps,
-            editors: this.editors,
             authorizedUsers: this.authorizedUsers,
             authorizedGroups: this.authorizedGroups,
             viewstate: this.viewstate,
@@ -68,7 +65,7 @@ class DeckEditStore extends BaseStore {
             showGroupModal: this.showGroupModal,
             queryParams: this.queryParams,
             showGroupModal: this.showGroupModal,
-            roots: this.roots,
+            usage: this.usage,
             showTransferOwnershipModal: this.showTransferOwnershipModal,
             allEditors: this.allEditors
         };
@@ -80,7 +77,6 @@ class DeckEditStore extends BaseStore {
 
     rehydrate(state) {
         this.deckProps = state.deckProps;
-        this.editors = state.editors;
         this.authorizedUsers = state.authorizedUsers;
         this.viewstate = state.viewstate;
         this.authorizedGroups = state.authorizedGroups;
@@ -88,7 +84,7 @@ class DeckEditStore extends BaseStore {
         this.originalEditors = state.originalEditors;
         this.showGroupModal = state.showGroupModal;
         this.queryParams = state.queryParams;
-        this.roots = state.roots;
+        this.usage = state.usage;
         this.showTransferOwnershipModal = state.showTransferOwnershipModal;
         this.allEditors = state.allEditors;
     }

From 2afa9d5f19dc80174504600a9ad238dbbc754da1 Mon Sep 17 00:00:00 2001
From: Kurt Junghanns <tboonx@googlemail.com>
Date: Fri, 30 Nov 2018 15:07:40 +0100
Subject: [PATCH 18/19] [SWIK-907_delete_deck_and_transfer_ownership] Tooltip
 of deck deletion button is now dynamic.

---
 .../ContentPanel/ContentActions/ContentActionsHeader.js   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/components/Deck/ContentPanel/ContentActions/ContentActionsHeader.js b/components/Deck/ContentPanel/ContentActions/ContentActionsHeader.js
index d37a79a58..db6206dbd 100644
--- a/components/Deck/ContentPanel/ContentActions/ContentActionsHeader.js
+++ b/components/Deck/ContentPanel/ContentActions/ContentActionsHeader.js
@@ -66,6 +66,10 @@ class ContentActionsHeader extends React.Component {
                 id: 'ContentActionsHeader.deleteAriaText',
                 defaultMessage:'Delete slide'
             },
+            deleteDeckAriaText:{
+                id: 'ContentActionsHeader.deleteDeckAriaText',
+                defaultMessage:'Delete deck'
+            },
             language:{
                 id: 'ContentActionsHeader.language',
                 defaultMessage:'Language'
@@ -109,7 +113,7 @@ class ContentActionsHeader extends React.Component {
 
     // TODO Remove this unused code once it is decided we don't ever need to provide this option
     handleDeleteNodeWithCheck(selector) {
-        // plain remove for slides 
+        // plain remove for slides
         if (selector.stype !== 'deck') {
             return this.context.executeAction(deleteTreeNodeAndNavigate, selector);
         }
@@ -463,7 +467,7 @@ class ContentActionsHeader extends React.Component {
                         <button className={deleteItemClass} onClick={this.handleDeleteNode.bind(this, selector)}
                             type="button" key="deleteItem"
                             aria-label={this.context.intl.formatMessage(this.messages.deleteAriaText)}
-                            data-tooltip={this.context.intl.formatMessage(this.messages.deleteAriaText)}
+                            data-tooltip={this.context.intl.formatMessage((contentDetails.selector.stype==='deck') ? this.messages.deleteDeckAriaText : this.messages.deleteAriaText)}
                             tabIndex={contentDetails.selector.id === contentDetails.selector.sid || this.props.PermissionsStore.permissions.readOnly || !this.props.PermissionsStore.permissions.edit || contentDetails.mode ==='edit' || contentDetails.mode ==='markdownEdit' ?-1:0}>
                             <i className="large icons">
                                 <i className="red trash alternate icon"></i>

From bfa4b0cca4987fcf985c5c10af8f6602461a2be5 Mon Sep 17 00:00:00 2001
From: Kostis Pristouris <kprist@gmail.com>
Date: Fri, 30 Nov 2018 17:49:50 +0200
Subject: [PATCH 19/19] Fix fork origin info when origin was deleted or its
 owner has changed

---
 .../DeckModes/DeckViewPanel/DeckViewPanel.js  | 19 ++++-
 components/Deck/DeckLandingPage.js            | 27 ++++---
 components/Deck/DeckStatsPage.js              | 27 ++++---
 services/deck.js                              | 81 ++++++++++---------
 4 files changed, 96 insertions(+), 58 deletions(-)

diff --git a/components/Deck/ContentPanel/DeckModes/DeckViewPanel/DeckViewPanel.js b/components/Deck/ContentPanel/DeckModes/DeckViewPanel/DeckViewPanel.js
index 52a3021d1..0c73fc12e 100644
--- a/components/Deck/ContentPanel/DeckModes/DeckViewPanel/DeckViewPanel.js
+++ b/components/Deck/ContentPanel/DeckModes/DeckViewPanel/DeckViewPanel.js
@@ -136,9 +136,22 @@ class DeckViewPanel extends React.Component {
         const user = this.props.UserProfileStore.userid;
         const deckTopics = deckData.topics || [];
 
-        let originInfo = deckData.origin != null ? <div className="meta" tabIndex="0"><strong>Origin:&nbsp;</strong>
-                <NavLink href={['/deck', deckData.origin.id + '-' + deckData.origin.revision, deckData.origin.slug].join('/')}>{deckData.origin.title}</NavLink> by <a href={'/user/' + originCreator}>{originCreator}</a>{/* TODO check if this URL is working with languages! */}
-        </div> : '';
+        let originInfo = null;
+        if (deckData.origin) {
+            if (deckData.origin.id) {
+                originInfo = (<div className="meta" tabIndex="0">
+                    <strong>Origin:&nbsp;</strong>
+                    <NavLink href={['/deck', deckData.origin.id + '-' + deckData.origin.revision, deckData.origin.slug].join('/')}>{deckData.origin.title}</NavLink>
+                    by
+                    <NavLink href={'/user/' + originCreator}>{originCreator}</NavLink>
+                </div>);
+            } else {
+                originInfo = (<div className="meta" tabIndex="0">
+                    <strong>Origin:&nbsp;</strong>
+                    {deckData.origin.title}
+                </div>);
+            }
+        }
 
         return (
             <div ref="deckViewPanel" id='deckViewPanel' className="ui bottom attached" style={heightStyle}>
diff --git a/components/Deck/DeckLandingPage.js b/components/Deck/DeckLandingPage.js
index 11fdd0e5b..e2e672701 100644
--- a/components/Deck/DeckLandingPage.js
+++ b/components/Deck/DeckLandingPage.js
@@ -93,15 +93,24 @@ class DeckLandingPage extends React.Component {
         let originInfo = null;
         let originCreator = this.props.DeckViewStore.originCreatorData;
         if (deckData.origin) {
-            originInfo = (
-                <div className="meta" tabIndex="0">
-                    <strong>Origin: </strong>
-                    <NavLink href={['/deck', deckData.origin.id + '-' + deckData.origin.revision, deckData.origin.slug].join('/')}>{deckData.origin.title}</NavLink>
-                    {originCreator ? ' by ' : ''}
-                    {originCreator && <a href={'/user/' + originCreator.username}>{originCreator.displayName || originCreator.username}</a>}
-                    {/* TODO check if this URL is working with languages! */}
-                </div>
-            );
+            if (deckData.origin.id) {
+                originInfo = (
+                    <div className="meta" tabIndex="0">
+                        <strong>Origin: </strong>
+                        <NavLink href={['/deck', deckData.origin.id + '-' + deckData.origin.revision, deckData.origin.slug].join('/')}>{deckData.origin.title}</NavLink>
+                        {originCreator ? ' by ' : ''}
+                        {originCreator && <NavLink href={'/user/' + originCreator.username}>{originCreator.displayName || originCreator.username}</NavLink>}
+                        {/* TODO check if this URL is working with languages! */}
+                    </div>
+                );
+            } else {
+                originInfo = (
+                    <div className="meta" tabIndex="0">
+                        <strong>Origin: </strong>
+                        {deckData.origin.title}
+                    </div>
+                );
+            }
         }
 
         const ColPadding = {
diff --git a/components/Deck/DeckStatsPage.js b/components/Deck/DeckStatsPage.js
index 488a3a5c5..949549baa 100644
--- a/components/Deck/DeckStatsPage.js
+++ b/components/Deck/DeckStatsPage.js
@@ -34,15 +34,24 @@ class DeckStatsPage extends React.Component {
         let originInfo = null;
         let originCreator = this.props.DeckViewStore.originCreatorData;
         if (deckData.origin) {
-            originInfo = (
-                <div className="meta" tabIndex="0">
-                    <strong>Origin: </strong>
-                    <NavLink href={['/deck', deckData.origin.id + '-' + deckData.origin.revision, deckData.origin.slug].join('/')}>{deckData.origin.title}</NavLink>
-                    {originCreator ? ' by ' : ''}
-                    {originCreator && <a href={'/user/' + originCreator.username}>{originCreator.displayName || originCreator.username}</a>}
-                    {/* TODO check if this URL is working with languages! */}
-                </div>
-            );
+            if (deckData.origin.id) {
+                originInfo = (
+                    <div className="meta" tabIndex="0">
+                        <strong>Origin: </strong>
+                        <NavLink href={['/deck', deckData.origin.id + '-' + deckData.origin.revision, deckData.origin.slug].join('/')}>{deckData.origin.title}</NavLink>
+                        {originCreator ? ' by ' : ''}
+                        {originCreator && <NavLink href={'/user/' + originCreator.username}>{originCreator.displayName || originCreator.username}</NavLink>}
+                        {/* TODO check if this URL is working with languages! */}
+                    </div>
+                );
+            } else {
+                originInfo = (
+                    <div className="meta" tabIndex="0">
+                        <strong>Origin: </strong>
+                        {deckData.origin.title}
+                    </div>
+                );
+            }
         }
 
         let summaryElement = (
diff --git a/services/deck.js b/services/deck.js
index 0dcdb30a9..ea2e0b236 100644
--- a/services/deck.js
+++ b/services/deck.js
@@ -137,25 +137,28 @@ export default {
                 qs: { root: args.id, language: args.language },
                 json: true,
             }).then((deck) => {
-                if (deck.revisions) {
-                    // support old style api response
-                    // TODO remove this
-                    let currentRevision = deck.revisions.length === 1 ? deck.revisions[0] : deck.revisions.find((rev) => {
-                        return rev.id === deck.active;
-                    });
-
-                    currentRevision.revisionUser = currentRevision.user;
-                    delete currentRevision.user;
-
-                    deck.revision = currentRevision.id;
-                    delete deck.revisions;
-
-                    // override everything else
-                    Object.assign(deck, currentRevision);
-                    deck.id = deck._id;
-                }
-
-                return deck;
+                // support old style api response
+                // TODO remove this
+                return toDeckRevision(deck);
+            }).then((deck) => {
+                // also check if the origin exists still
+                if (!deck.origin) return deck;
+                return rp.get({
+                    uri: `${Microservices.deck.uri}/deck/${deck.origin.id}`,
+                    json: true,
+                }).catch((err) => {
+                    if (err.statusCode === 404) {
+                        // deck origin is missing, remove user and id
+                        delete deck.origin.id;
+                        delete deck.origin.user;
+                    }
+                    // ignore any other error retrieving the origin data
+                }).then((origin) => {
+                    // update the user in case the origin was transferred at some point after the fork
+                    if (origin) deck.origin.user = origin.user;
+                    // always forward the current deck (not the origin)
+                    return deck;
+                });
             });
 
             /* Create promise for slides data success */
@@ -280,24 +283,7 @@ export default {
                 json:true,
             }).then((deck) => {
                 // TODO remove this
-                if (deck.revisions) {
-                    // support old style api response
-                    // TODO remove this
-                    let currentRevision = deck.revisions.length === 1 ? deck.revisions[0] : deck.revisions.find((rev) => {
-                        return rev.id === deck.active;
-                    });
-
-                    currentRevision.revisionUser = currentRevision.user;
-                    delete currentRevision.user;
-
-                    deck.revision = currentRevision.id;
-                    delete deck.revisions;
-
-                    // override everything else
-                    Object.assign(deck, currentRevision);
-                    deck.id = deck._id;
-                }
-                return deck;
+                return toDeckRevision(deck);
             });
 
             // fetch the tags data
@@ -633,6 +619,27 @@ export default {
     }
 };
 
+function toDeckRevision(deck) {
+    if (deck.revisions) {
+        // support old style api response
+        // TODO remove this
+        let currentRevision = deck.revisions.length === 1 ? deck.revisions[0] : deck.revisions.find((rev) => {
+            return rev.id === deck.active;
+        });
+
+        currentRevision.revisionUser = currentRevision.user;
+        delete currentRevision.user;
+
+        deck.revision = currentRevision.id;
+        delete deck.revisions;
+
+        // override everything else
+        Object.assign(deck, currentRevision);
+        deck.id = deck._id;
+    }
+    return deck;
+}
+
 function getActivity(activityType, deckIds) {
     let activities = {};