Merge pull request #277 from Donders-Institute/new-core-api

New core api

Author: hurngchunlee

streamer-ui/DEV.md

@@ -114,6 +114,6 @@ In addition, `errorState` is used to capture any exception that might occur. An
 
 After the user has selected files, he/she selects the appropriate project, sets the subject label and session label, and selects the data type. If the data type is not in the list of allowed data types, the user can select "other" and set this value.
 
-When satisfied, the upload button can be pressed and an upload session is inititated. The upload modal is shown with the upload progress. After the initiating stage, each file that is to be uploaded is validated. Might any of the files already exist in the destination folder, then the user is prompted with a confirmation modal. If the user approves and presses the OK button, the actual upload is started. The files are transferred to the streamer UI buffer directory. When this operation was successful, the upload session is finalized.
+When satisfied, the upload button can be pressed and an upload session is initiated. The upload modal is shown with the upload progress. After the initiating stage, each file that is to be uploaded is validated. Might any of the files already exist in the destination folder, then the user is prompted with a confirmation modal. If the user approves and presses the OK button, the actual upload is started. The files are transferred to the streamer UI buffer directory. When this operation was successful, the upload session is finalized.
 
 A submit request is sent to the `service` which queues a streamer job. After some delay, an e-mail will be sent to the user with the result.

streamer-ui/Dockerfile

@@ -15,7 +15,7 @@ RUN yarn build
 # Create the server
 FROM node:16
 ENV NODE_ENV production
-RUN apt-get update && apt-get install -y cron curl supervisor
+RUN ulimit -n 1024 && apt-get update && apt-get install -y cron curl supervisor
 WORKDIR /opt/streamer-ui-server
 COPY $pwd/packages/server/package.json ./
 COPY $pwd/packages/server/yarn.lock ./
@@ -36,4 +36,4 @@ RUN ( chmod +x start-cron.sh )
 COPY $pwd/packages/server/cron/crontab /etc/cron.d/purge-db
 RUN ( chmod +x /etc/cron.d/purge-db && crontab /etc/cron.d/purge-db )
 COPY --from=build /opt/streamer-ui-client/build /opt/streamer-ui-server/frontend
-CMD [ "/usr/bin/supervisord", "-c", "/opt/streamer-ui-server/supervisord.conf" ]
+CMD [ "/usr/bin/supervisord", "-c", "/opt/streamer-ui-server/supervisord.conf" ]

streamer-ui/packages/client/yarn.lock

@@ -8947,9 +8947,9 @@ [email protected]:
   integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
 
 qs@~6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
-  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
+  version "6.5.3"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
+  integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
 
 query-string@^4.1.0:
   version "4.3.4"

streamer-ui/packages/server/routes/pdb.js

@@ -30,7 +30,7 @@ var _getProjectsV2 = function(req, res, next) {
     // GraphQL query to get user's projects
     const query = gql`
     query GetUser($username: ID!) {
-        user(username: $username) {
+        user(id: $username) {
             username
             projects {
                 role

streamer/Dockerfile

@@ -7,16 +7,16 @@ LABEL donders.ru.nl.app_maintainer "[email protected]"
 LABEL donders.ru.nl.app_code_repository "https://github.com/Donders-Institute/data-streamer"
 
 # install required packages from YUM repository
-RUN ( yum -y install wget gcc gcc-c++ \
-                     make autoconf git zlib zlib-devel \
-                     openssl openssl-devel openssl-libs \
-                     sssd-client which rsync \
-                     curl curl-devel libxml2-devel epel-release \
+RUN ( ulimit -n 1024 && yum -y install wget gcc gcc-c++ \
+      make autoconf git zlib zlib-devel \
+      openssl openssl-devel openssl-libs \
+      sssd-client which rsync \
+      curl curl-devel libxml2-devel epel-release \
    && yum clean all \
    && rm -rf /var/cache/yum/* \
    && rm -rf /tmp/* )
 
-RUN ( yum -y install supervisor sshpass pv expect \
+RUN ( ulimit -n 1024 && yum -y install supervisor sshpass pv expect \
    && yum clean all \
    && rm -rf /var/cache/yum/* \
    && rm -rf /tmp/* )
@@ -26,9 +26,14 @@ RUN ( mkdir -p /tmp )
 WORKDIR /tmp
 
 # install nodejs
-ADD https://nodejs.org/dist/v8.12.0/node-v8.12.0-linux-x64.tar.xz /tmp
-RUN ( if [ ! -d node-v8.12.0-linux-x64 ]; then tar xf node-v8.12.0-linux-x64.tar.xz; fi \
-      && mv node-v8.12.0-linux-x64 /opt/nodejs )
+#ADD https://nodejs.org/dist/v8.12.0/node-v8.12.0-linux-x64.tar.xz /tmp
+#RUN ( if [ ! -d node-v8.12.0-linux-x64 ]; then tar xf node-v8.12.0-linux-x64.tar.xz; fi \
+#      && mv node-v8.12.0-linux-x64 /opt/nodejs )
+
+ADD https://nodejs.org/dist/latest-v10.x/node-v10.24.1-linux-x64.tar.xz /tmp
+
+RUN ( if [ ! -d node-v10.24.1-linux-x64 ]; then tar xf node-v10.24.1-linux-x64.tar.xz; fi \
+      && mv node-v10.24.1-linux-x64 /opt/nodejs && rm -rf /tmp/node-*)
 
 # install streamer package
 RUN ( mkdir -p /opt/streamer )