Swik 907 delete deck and transfer ownership

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();
+        });
     });
 }

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();

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(() => {

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,19 +52,27 @@ 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() {
         $('#app').attr('aria-hidden','false');
         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>

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
             })