Merge branch 'master' into SWIK-2103-Support-for-NV3D-charts-in-front…

…-end
slidewiki · Oct 24, 2018 · 502fa9c · 502fa9c
2 parents 0f7363b + e1b9814
commit 502fa9c
Show file tree

Hide file tree

Showing 415 changed files with 16,630 additions and 5,429 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,7 +23,7 @@ script:
 - npm run build:nostart
 after_success:
 - git reset --hard && rm configs/microservices.js configs/general.js configs/secrets.js
-- openssl aes-256-cbc -K $encrypted_ecdba13b2a41_key -iv $encrypted_ecdba13b2a41_iv -in deployment_keys.tar.enc -out deployment_keys.tar -d
+- openssl aes-256-cbc -K $encrypted_188f43b2b0d2_key -iv $encrypted_188f43b2b0d2_iv -in deployment_keys.tar.enc -out deployment_keys.tar -d
 - if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ] ; then ./travis_scripts/dockerhub.sh ; fi
 - if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ] ; then ./travis_scripts/deploy.sh ; fi
 - npm run coverall

diff --git a/Dockerfile b/Dockerfile
@@ -41,6 +41,8 @@ ENV SERVICE_URL_DECK= \
     SERVICE_URL_SIGNALING= \
     SERVICE_URL_QUESTION= \
     SERVICE_URL_NLP= \
+    SERVICE_LEARNINGLOCKER_API_URL= \
+    SERVICE_LEARNINGLOCKER_API_AUTH= \
     SERVICE_USER_PRIVATE_RECAPTCHA_KEY= \
     SERVICE_USER_PUBLIC_RECAPTCHA_KEY= \
     SERVICE_USER_APIKEY= \

diff --git a/actions/attachSubdeck/loadRecentDecks.js b/actions/attachSubdeck/loadRecentDecks.js
@@ -4,6 +4,9 @@ import methodNotAllowedError  from '../error/methodNotAllowedError';
 
 export default function loadRecentDecks(context,payload,done){
     log.info(context);
+
+    context.dispatch('ATTACHSUBDECK_LOAD_RECENTDECKS_LOADING', []);
+
     context.service.read('deck.recent', payload, {timeout: 20 * 1000}, (err, res) => {
         if (err) {
 
@@ -20,7 +23,6 @@ export default function loadRecentDecks(context,payload,done){
                 context.dispatch('ATTACHSUBDECK_LOAD_RECENTDECKS', []);
             }
         } else { //Normal action
-
             context.dispatch('ATTACHSUBDECK_LOAD_RECENTDECKS', res);
         }
         done();

diff --git a/actions/attachSubdeck/loadSearchedDecks.js b/actions/attachSubdeck/loadSearchedDecks.js
@@ -2,9 +2,19 @@ import log from '../log/clog';
 import notFoundError from '../error/notFoundError';
 import methodNotAllowedError  from '../error/methodNotAllowedError';
 import searchSyntaxError from '../error/searchSyntaxError';
+import updateModalSubtitle from '../collections/updateModalSubtitle';
 
 export default function loadSearchedDecks(context,payload,done){
     log.info(context);
+
+    context.dispatch('ATTACHSUBDECK_LOAD_SEARCHDECKS_LOADING');
+    context.executeAction(updateModalSubtitle, 'Search Results');
+
+    payload.query.expand = false;
+    payload.query.spellcheck = false;
+    payload.query.pageSize = 50;
+    payload.query.facets = false;
+
     context.service.read('searchresults.list', payload, {timeout: 20 * 1000}, (err, res) => {
         if (err) {
             if (err.statusCode === 404) {
@@ -27,8 +37,6 @@ export default function loadSearchedDecks(context,payload,done){
                 return;
             }
         } else { //Normal action
-
-            log.info(context,res);
             context.dispatch('ATTACHSUBDECK_LOAD_SEARCHDECKS', res);
         }
 

diff --git a/actions/collections/addDeckToCollection.js b/actions/collections/addDeckToCollection.js
@@ -0,0 +1,24 @@
+const log = require('../log/clog');
+import serviceUnavailable from '../error/serviceUnavailable';
+import UserProfileStore from '../../stores/UserProfileStore';
+
+export default function addDeckToCollection(context, payload, done) {
+    log.info(context);
+
+    // enrich payload with jwt
+    payload.jwt = context.getStore(UserProfileStore).jwt;
+
+    // define operation
+    payload.op = 'add';
+
+    context.service.update('deckgroups.updateDecksOfCollection', payload, {timeout: 20 * 1000}, (err, res) => {
+        if (err) {
+            log.error(context, {filepath: __filename, message: err.message});
+            context.dispatch('ADD_DECK_TO_COLLECTION_FAILURE', err);
+        } else {
+            context.dispatch('ADD_DECK_TO_COLLECTION_SUCCESS', payload.collection);
+        }
+
+        done();
+    });
+}
diff --git a/actions/collections/addNewCollection.js b/actions/collections/addNewCollection.js
@@ -1,6 +1,7 @@
 const log = require('../log/clog');
 import serviceUnavailable from '../error/serviceUnavailable';
 import UserProfileStore from '../../stores/UserProfileStore';
+import addDeckToCollection from './addDeckToCollection';
 
 export default function addNewCollection(context, payload, done) {
     log.info(context);
@@ -12,10 +13,27 @@ export default function addNewCollection(context, payload, done) {
         if (err) {
             log.error(context, {filepath: __filename});
             context.dispatch('ADD_COLLECTION_FAILURE', err);
+            done();
         } else {
-            context.dispatch('ADD_COLLECTION_SUCCESS', res);
-        }
 
-        done();
+            // also add new collection to a deck
+            if (payload.deckId) {
+                context.executeAction(addDeckToCollection, {
+                    deckId: payload.deckId, 
+                    collection: res, 
+                    collectionId: res._id,
+                }).then( () => {
+                    context.dispatch('ADD_COLLECTION_SUCCESS', res);
+                    done();
+                }).catch( (err) => {
+                    log.error(context, {filepath: __filename});
+                    context.dispatch('ADD_COLLECTION_FAILURE', err);
+                    done();
+                });
+            } else {
+                context.dispatch('ADD_COLLECTION_SUCCESS', res);
+                done();
+            }
+        }
     });
 }
diff --git a/actions/collections/addSelectedCollection.js b/actions/collections/addSelectedCollection.js
diff --git a/actions/collections/loadCollection.js b/actions/collections/loadCollection.js
@@ -4,12 +4,12 @@ import serviceUnavailable from '../error/serviceUnavailable';
 import notFoundError from '../error/notFoundError';
 import loadCollectionDetails from './loadCollectionDetails';
 import fetchUser from '../../actions/user/userprofile/fetchUser';
+import getFollowing from '../../actions/following/getFollowing';
 import UserProfileStore from '../../stores/UserProfileStore';
 
 // loads deck collection details and user info
 export default function loadCollection(context, payload, done) {
     log.info(context);
-
     // load required actions in parallel
     async.parallel([
         (callback) => {
@@ -21,6 +21,14 @@ export default function loadCollection(context, payload, done) {
         },
         (callback) => {
             context.executeAction(loadCollectionDetails, payload, callback);
+        },
+        (callback) => {
+            const userId = context.getStore(UserProfileStore).getState().userid;
+            if (userId !== undefined && userId !== null && userId !== '') {
+                context.executeAction(getFollowing, {playlistId: payload.params.id, userId: userId, followed_type: 'playlist'}, callback);
+            } else {
+                callback();
+            }
         }
     ], (err, results) => {
         if (err) {

diff --git a/actions/collections/loadCollectionDetails.js b/actions/collections/loadCollectionDetails.js
@@ -2,6 +2,7 @@ const log = require('../log/clog');
 import serviceUnavailable from '../error/serviceUnavailable';
 import UserProfileStore from '../../stores/UserProfileStore';
 import notFoundError from '../error/notFoundError';
+import { shortTitle } from '../../configs/general';
 
 // loads a deck collection
 export default function loadCollectionDetails(context, payload, done) {
@@ -22,6 +23,11 @@ export default function loadCollectionDetails(context, payload, done) {
         } else {
             res.sortBy = (payload.query.sort) ? payload.query.sort : 'order';
             context.dispatch('LOAD_COLLECTION_DETAILS_SUCCESS', res);
+
+            let pageTitle = shortTitle + ' | Playlist | ' + res.title;
+            context.dispatch('UPDATE_PAGE_TITLE', {
+                pageTitle: pageTitle
+            });
         }
 
         done();

diff --git a/actions/collections/loadCollectionsTab.js b/actions/collections/loadCollectionsTab.js
@@ -0,0 +1,36 @@
+import async from 'async';
+const log = require('../log/clog');
+import serviceUnavailable from '../error/serviceUnavailable';
+import notFoundError from '../error/notFoundError';
+import loadDeckCollections from './loadDeckCollections';
+import loadUserCollections from './loadUserCollections';
+import UserProfileStore from '../../stores/UserProfileStore';
+
+// loads collection for a deck and the user collection options
+export default function loadCollectionsTab(context, payload, done) {
+    log.info(context);
+
+    // load required actions in parallel
+    async.parallel([
+        (callback) => {
+            context.executeAction(loadDeckCollections, payload, callback);
+        },
+        (callback) => {
+            // if logged in, then request collections that the user has edit rights
+            if (context.getStore(UserProfileStore).userid) {
+                context.executeAction(loadUserCollections, payload, callback);
+            } else {
+                callback();
+            }
+        }
+    ], (err, results) => {
+        if (err) {
+            log.error(context, {filepath: __filename});
+            context.executeAction(serviceUnavailable, payload, done);
+            return;
+        }
+
+        done();
+    });
+
+}
diff --git a/actions/collections/loadDeckCollections.js b/actions/collections/loadDeckCollections.js
@@ -1,43 +1,28 @@
-const log = require('../log/clog');
+import log from '../log/clog';
 import serviceUnavailable from '../error/serviceUnavailable';
-import UserProfileStore from '../../stores/UserProfileStore';
 
-// loads deck groups assigned by the current user to a deck
+// loads deck collections assigned to a deck
 export default function loadDeckCollections(context, payload, done) {
     log.info(context);
-
-    // enrich payload with user id
-    if(payload.params){
-        payload.params.userId = context.getStore(UserProfileStore).userid;
-        payload.params.jwt = context.getStore(UserProfileStore).jwt;
-    } else {
-        payload.userId = context.getStore(UserProfileStore).userid;
-        payload.jwt = context.getStore(UserProfileStore).jwt;
-    }
 
-    context.dispatch('UPDATE_COLLECTIONS_LOADING', true);
+    let args = (payload.params) ? payload.params : payload;
+    args.countOnly = false;
 
-    // first get user groups that the user is member of 
-    context.service.read('usergroup.member', payload, {timeout: 20 * 1000}, (err, usergroups) => {
-        if(err){
-            log.error(context, {filepath: __filename});
-            done();
+    // then get deck collection options
+    context.service.read('deckgroups.forDeck', args, {timeout: 20 * 1000}, (err, res) => {
+        if (err) {
+            log.error(context, {filepath: __filename, message: err.message});
+            context.dispatch('LOAD_DECK_COLLECTIONS_FAILURE', err);
         } else {
-
-            // then get deck collection options
-            payload.usergroups = usergroups;
-            context.service.read('deckgroups.forDeck', payload, {timeout: 20 * 1000}, (err, res) => {
-                if (err) {
-                    log.error(context, {filepath: __filename});
-                    context.dispatch('LOAD_COLLECTIONS_FAILURE', err);
-                } else {
-                    context.dispatch('LOAD_COLLECTIONS_SUCCESS', res);
-                }
-
-                context.dispatch('UPDATE_COLLECTIONS_LOADING', false);
-
-                done();
+            context.dispatch('LOAD_DECK_COLLECTIONS_SUCCESS', {
+                selector: payload.params, 
+                collections: res
             });
+            context.dispatch('LOAD_PLAYLISTS_COUNT', res.length);
+            context.dispatch('UPDATE_MODULE_TYPE_SUCCESS', { moduleType: 'playlists' });
         }
-    }); 
+
+        done();
+    });
+
 }
diff --git a/actions/collections/loadGroupCollections.js b/actions/collections/loadGroupCollections.js
@@ -0,0 +1,20 @@
+const log = require('../log/clog');
+
+// loads user group collections
+export default function loadGroupCollections(context, payload, done) {
+    log.info(context);
+
+    context.dispatch('SET_COLLECTIONS_LOADING'); // show loading indicator
+    let params = (payload.params) ? payload.params : payload;
+
+    context.service.read('deckgroups.forGroup', params, {timeout: 20 * 1000}, (err, res) => {
+        if (err) {
+            log.error(context, {filepath: __filename, message: err.message});
+            context.dispatch('LOAD_USER_COLLECTIONS_FAILURE', err);
+        } else {
+            context.dispatch('LOAD_USER_COLLECTIONS_SUCCESS', res);
+        }
+
+        done();
+    });
+}
diff --git a/actions/collections/loadPlaylistsCount.js b/actions/collections/loadPlaylistsCount.js
@@ -0,0 +1,22 @@
+import log from '../log/clog';
+import serviceUnavailable from '../error/serviceUnavailable';
+
+// loads count of deck collections assigned to a deck
+export default function loadPlaylistsCount(context, payload, done) {
+    log.info(context);
+
+    let args = (payload.params) ? payload.params : payload;
+    args.countOnly = true;
+
+    context.service.read('deckgroups.forDeck', args, {timeout: 20 * 1000}, (err, res) => {
+        if (err) {
+            log.error(context, {filepath: __filename, message: err.message});
+            context.dispatch('LOAD_PLAYLISTS_COUNT_FAILURE', err);
+        } else {
+            context.dispatch('LOAD_PLAYLISTS_COUNT', res);
+        }
+
+        done();
+    });
+
+}