From d62d9071b08290834a82edc491bd1d5fc2c634ca Mon Sep 17 00:00:00 2001
From: Tibor Postek <tibor.postek@m2ms.sk>
Date: Wed, 18 Mar 2020 11:37:39 +0100
Subject: [PATCH] add docker configuration for localhost development

---
 docker-compose.dev.yml                        |  0
 docker-compose.localhost.yml                  | 31 +++++++++++++------
 js/components/projects/projectModal/index.js  |  9 ++++--
 .../snapshot/redux/dispatchActions.js         |  9 ++----
 package.json                                  |  0
 5 files changed, 30 insertions(+), 19 deletions(-)
 mode change 100644 => 100755 docker-compose.dev.yml
 mode change 100644 => 100755 package.json

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
old mode 100644
new mode 100755
diff --git a/docker-compose.localhost.yml b/docker-compose.localhost.yml
index 9f31a165e..2a1094ac1 100644
--- a/docker-compose.localhost.yml
+++ b/docker-compose.localhost.yml
@@ -16,7 +16,7 @@ services:
     container_name: neo4j
     image: neo4j
     ports:
-# Comment these two out in produciton
+# Comment these two out in production
       - "7474:7474"
       - "7687:7687"
     ulimits:
@@ -36,7 +36,7 @@ services:
     volumes:
       - ../data/logs:/code/logs/
       - ../data/media:/code/media/
-      - ../fragalysis-frontend:/code/frontend
+      - ../fragalysis-frontend:/code/frontend/
       - ../fragalysis-backend:/code/
     ports:
       - "8080:80"
@@ -45,15 +45,26 @@ services:
       - graph
   loader:
     container_name: loader
-    image: loader:latest
+    image: xchem/fragalysis-stack:latest
+    command: /bin/bash /code/docker-entrypoint.sh
     volumes:
-      - ../data/input:/fragalysis
-      - ../data/media:/code/media
+      - ../data/input:/fragalysis/
+      - ../data/media:/code/media/
+      - ../fragalysis-frontend:/code/frontend/
+      - ../fragalysis-backend:/code/
+      - ../dls-fragalysis-stack-openshift/images/loader/docker-entrypoint.sh:/code/docker-entrypoint.sh
+      - ../fragalysis-loader/run_loader.sh:/code/run_loader.sh
+      - ../fragalysis-loader/loader.py:/code/loader.py
+      - ../fragalysis-loader/test_entry.sh:/code/test_entry.sh
+      - ../fragalysis-loader/wait-for-it.sh:/code/wait-for-it.sh
+      - ../fragalysis-loader/database_check.py:/code/database_check.py
+      - ../fragalysis-loader/tests:/code/tests
+      - ../fragalysis-loader/loader:/code/loader
     environment:
-      MYSQL_ROOT_PASSWORD: password
-      MYSQL_DATABASE: django_db
-      MYSQL_PASSWORD: django_password
-      MYSQL_USER: django
-      DATA_ORIGIN: EXAMPLE
+        MYSQL_ROOT_PASSWORD: password
+        MYSQL_DATABASE: django_db
+        MYSQL_PASSWORD: django_password
+        MYSQL_USER: django
+        DATA_ORIGIN: EXAMPLE
     depends_on:
       - mysql
diff --git a/js/components/projects/projectModal/index.js b/js/components/projects/projectModal/index.js
index 86bd4c0cb..cffb6bf1d 100644
--- a/js/components/projects/projectModal/index.js
+++ b/js/components/projects/projectModal/index.js
@@ -88,14 +88,17 @@ export const ProjectModal = memo(({ history }) => {
         }}
         onSubmit={values => {
           const data = {
-            ...values,
-            authorID: DJANGO_CONTEXT['pt'],
+            title: values.title,
+            description: values.description,
+            targetID: values.targetId,
+            author: DJANGO_CONTEXT['pk'],
             tags
           };
           dispatch(setProjectModalIsLoading(true));
-          api({ url: `${base_url}/api/project`, method: METHOD.POST, data })
+          api({ url: `${base_url}/api/projects`, method: METHOD.POST, data })
             .then(response => {
               const projectID = response.data.id;
+              // create project_target relationShip on BE
               history.push(`${URLS.projects}${projectID}`);
             })
             .catch(error => {
diff --git a/js/components/snapshot/redux/dispatchActions.js b/js/components/snapshot/redux/dispatchActions.js
index 35f30d77d..ecae30e29 100644
--- a/js/components/snapshot/redux/dispatchActions.js
+++ b/js/components/snapshot/redux/dispatchActions.js
@@ -105,12 +105,9 @@ export const createInitialSnapshot = projectId => async (dispatch, getState) =>
   const snapshot = { objectsInView, nglOrientations, viewParams };
   const snapshotDetail = {
     type: SnapshotType.INIT,
-    name: 'Initial Snapshot',
-    author: {
-      username: DJANGO_CONTEXT.username,
-      email: DJANGO_CONTEXT.email
-    },
-    message: 'Auto generated initial snapshot',
+    title: 'Initial Snapshot',
+    authorID: DJANGO_CONTEXT.pk,
+    description: 'Auto generated initial snapshot',
     children: null,
     parent: null,
     created: moment()
diff --git a/package.json b/package.json
old mode 100644
new mode 100755