Merge pull request #916 from ITISFoundation/master

Ueli Steck 07.03.2019

Author: sanderegg

.env-devel

@@ -1,3 +1,11 @@
+#
+# - Keep it alfphabetical order
+# - To expose:  export $(grep -v '^#' .env | xargs -0)
+#
+
+BF_API_KEY=none
+BF_API_SECRET=none
+
 DOCKER_IMAGE_TAG=latest
 
 PUBLISHED_HOST_NAME=localhost
@@ -35,7 +43,5 @@ SMTP_PORT=25
 
 VENV2=.venv27/
 
-BF_API_KEY=none
-BF_API_SECRET=none
-
-LOGIN_REGISTRATION_CONFIRMATION_REQUIRED=1
+# python3 -c "from cryptography.fernet import Fernet; print(Fernet.generate_key())"
+WEBSERVER_SESSION_SECRET_KEY=REPLACE ME with a key of at least length 32.

Makefile

@@ -161,7 +161,7 @@ down-swarm:
 # Cache
 
 .PHONY: pull-cache
-pull-cache:
+pull-cache: .env
 	${DOCKER_COMPOSE} -f services/docker-compose.yml -f services/docker-compose.cache.yml pull
 
 .PHONY: build-cache
@@ -204,7 +204,7 @@ push:
 	${DOCKER_COMPOSE} -f services/docker-compose.yml push ${SERVICES_LIST}
 
 # target: pull – Pulls images from a registry
-pull:
+pull: .env
 	${DOCKER_COMPOSE} -f services/docker-compose.yml pull ${SERVICES_LIST}
 
 # target: create-stack-file – use as 'make create-stack-file output_file=stack.yaml'

api/specs/webserver/v0/openapi-projects.yaml

@@ -49,6 +49,11 @@ paths:
           schema:
             type: string
           description: 'Option to create a project from existing template: from_template={template_uuid}'
+        - name: as_template
+          in: query
+          schema:
+            type: string
+          description: 'Option to create a template from existing project: as_template={study_uuid}'
       requestBody:
         content:
           application/json:

ops/travis/system-testing/tests/test_swarm_runs.py

@@ -118,9 +118,14 @@ def test_all_services_up(docker_client, services_docker_compose, tools_docker_co
     """
     running_services = docker_client.services.list()
 
-    assert (len(services_docker_compose["services"]) + len(tools_docker_compose["services"])) == len(running_services)
+    service_names = []
+    service_names += services_docker_compose["services"]
+    service_names += tools_docker_compose["services"]
+
+    assert len(service_names) == len(running_services)
 
-    # TODO: check names instead
+    for name in service_names:
+        assert any( name in s.name for s in running_services ), f"{name} not in {running_services}"
 
 
 async def test_core_service_running(core_service_name, docker_client, loop):
@@ -187,4 +192,3 @@ async def test_check_serve_root(docker_client, services_docker_compose, tools_do
         pytest.fail("The server could not fulfill the request.\nError code {}".format(err.code))
     except urllib.error.URLError as e:
         pytest.fail("Failed reaching the server..\nError reason {}".format(err.reason))
-

services/docker-compose.yml

@@ -114,25 +114,8 @@ services:
       - DIRECTOR_PORT=8080
       - STORAGE_HOST=storage
       - STORAGE_PORT=8080
-      - LOGIN_REGISTRATION_CONFIRMATION_REQUIRED=${LOGIN_REGISTRATION_CONFIRMATION_REQUIRED:-1}
-      - POSTGRES_ENDPOINT=${POSTGRES_ENDPOINT}
-      - POSTGRES_USER=${POSTGRES_USER}
-      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-      - POSTGRES_DB=${POSTGRES_DB}
-      - POSTGRES_HOST=${POSTGRES_HOST}
-      - POSTGRES_PORT=${POSTGRES_PORT}
-      - RABBIT_HOST=${RABBIT_HOST}
-      - RABBIT_PORT=${RABBIT_PORT}
-      - RABBITMQ_USER=${RABBITMQ_USER}
-      - RABBITMQ_PASSWORD=${RABBITMQ_PASSWORD}
-      - RABBITMQ_PROGRESS_CHANNEL=${RABBITMQ_PROGRESS_CHANNEL}
-      - RABBITMQ_LOG_CHANNEL=${RABBITMQ_LOG_CHANNEL}
-      - S3_ENDPOINT=${S3_ENDPOINT}
-      - S3_ACCESS_KEY=${S3_ACCESS_KEY}
-      - S3_SECRET_KEY=${S3_SECRET_KEY}
-      - S3_BUCKET_NAME=${S3_BUCKET_NAME}
-      - SMTP_HOST=${SMTP_HOST}
-      - SMTP_PORT=${SMTP_PORT}
+    env_file:
+      - ../.env
     stdin_open: true
     tty: true
     depends_on:

services/web/client/source/class/qxapp/data/Permissions.js

@@ -83,6 +83,7 @@ qx.Class.define("qxapp.data.Permissions", {
 
   members: {
     __userRole: null,
+    __userLogin: null,
 
     getRole() {
       return this.__userRole;
@@ -95,6 +96,10 @@ qx.Class.define("qxapp.data.Permissions", {
       this.__userRole = role;
     },
 
+    getLogin() {
+      return this.__userLogin;
+    },
+
     getChildrenRoles(role) {
       role = role.toLowerCase();
       const childrenRoles = [];
@@ -151,7 +156,10 @@ qx.Class.define("qxapp.data.Permissions", {
           "preferences.role.update",
           "study.nodestree.uuid.read",
           "study.filestree.uuid.read",
-          "study.logger.debug.read"
+          "study.logger.debug.read",
+          "studies.template.create",
+          "studies.template.update",
+          "studies.template.delete"
         ],
         "admin": []
       };
@@ -215,6 +223,7 @@ qx.Class.define("qxapp.data.Permissions", {
       profile.addListenerOnce("getSuccess", e => {
         let profileData = e.getRequest().getResponse().data;
         this.__userRole = profileData.role;
+        this.__userLogin = profileData.login;
         this.fireDataEvent("userProfileRecieved", true);
       }, this);
       profile.addListenerOnce("getError", e => {

services/web/client/source/class/qxapp/desktop/StudyBrowser.js

@@ -389,13 +389,19 @@ qx.Class.define("qxapp.desktop.StudyBrowser", {
       return list;
     },
 
+    __uuidToNumber: function(uuid) {
+      const nThumbnails = 25;
+      const lastCharacters = uuid.substr(uuid.length-10);
+      const aNumber = parseInt(lastCharacters, 16);
+      return aNumber%nThumbnails;
+    },
+
     /**
      * Delegates appearance and binding of each study item
      */
     __getDelegate: function(fromTemplate, list) {
       const thumbnailWidth = 200;
       const thumbnailHeight = 120;
-      const nThumbnails = 25;
       let that = this;
       let delegate = {
         // Item's Layout
@@ -433,12 +439,15 @@ qx.Class.define("qxapp.desktop.StudyBrowser", {
         },
         // Item's data binding
         bindItem: function(controller, item, id) {
-          controller.bindProperty("uuid", "icon", {
+          controller.bindProperty("uuid", "model", null, item, id);
+          controller.bindProperty("thumbnail", "icon", {
             converter: function(data) {
-              if (data) {
-                const lastCharacters = data.substr(data.length-10);
-                const aNumber = parseInt(lastCharacters, 16);
-                const thumbnailId = aNumber%nThumbnails;
+              const uuid = item.getModel();
+              if (uuid) {
+                if (data) {
+                  return data;
+                }
+                const thumbnailId = that.__uuidToNumber(uuid); // eslint-disable-line no-underscore-dangle
                 return "qxapp/img"+ thumbnailId +".jpg";
               }
               return "@FontAwesome5Solid/plus-circle/80";
@@ -459,11 +468,6 @@ qx.Class.define("qxapp.desktop.StudyBrowser", {
               return data ? new Date(data) : null;
             }
           }, item, id);
-          controller.bindProperty("uuid", "model", {
-            converter: function(data) {
-              return data;
-            }
-          }, item, id);
         },
         configureItem: item => {
           item.getChildControl("icon").set({
@@ -509,13 +513,19 @@ qx.Class.define("qxapp.desktop.StudyBrowser", {
       });
     },
 
-    __createForm: function(studyData, fromTemplate) {
+    __createForm: function(studyData, isTemplate) {
       while (this.__editStudyLayout.getChildren().length > 1) {
         this.__editStudyLayout.removeAt(1);
       }
 
-      const itemsToBeDisplayed = ["name", "description", "prjOwner", "creationDate", "lastChangeDate"];
-      const itemsToBeModified = fromTemplate ? [] : ["name", "description"];
+      const canCreateTemplate = qxapp.data.Permissions.getInstance().canDo("studies.template.create");
+      const canUpdateTemplate = qxapp.data.Permissions.getInstance().canDo("studies.template.update");
+      const canDeleteTemplate = qxapp.data.Permissions.getInstance().canDo("studies.template.delete");
+      const isMyTemplate = studyData["prjOwner"] === qxapp.data.Permissions.getInstance().getLogin();
+
+      const itemsToBeDisplayed = ["name", "description", "thumbnail", "prjOwner", "creationDate", "lastChangeDate"];
+      const itemsToBeModified = (isTemplate && !(canUpdateTemplate && isMyTemplate)) ? [] : ["name", "description", "thumbnail"];
+
       let form = new qx.ui.form.Form();
       let control;
       for (const dataId in studyData) {
@@ -529,6 +539,10 @@ qx.Class.define("qxapp.desktop.StudyBrowser", {
               control = new qx.ui.form.TextField();
               form.add(control, this.tr("Description"));
               break;
+            case "thumbnail":
+              control = new qx.ui.form.TextField();
+              form.add(control, this.tr("Thumbnail"));
+              break;
             case "prjOwner":
               control = new qx.ui.form.TextField();
               form.add(control, this.tr("Owner"));
@@ -563,7 +577,7 @@ qx.Class.define("qxapp.desktop.StudyBrowser", {
       // buttons
       let saveButton = new qx.ui.form.Button(this.tr("Save"));
       saveButton.setMinWidth(70);
-      saveButton.setEnabled(!fromTemplate);
+      saveButton.setEnabled(!isTemplate || (canUpdateTemplate && isMyTemplate));
       saveButton.addListener("execute", e => {
         for (let i=0; i<itemsToBeModified.length; i++) {
           const key = itemsToBeModified[i];
@@ -574,7 +588,11 @@ qx.Class.define("qxapp.desktop.StudyBrowser", {
         let resource = this.__studyResources.project;
 
         resource.addListenerOnce("putSuccess", ev => {
-          this.reloadUserStudies();
+          if (isTemplate) {
+            this.reloadTemplateStudies();
+          } else {
+            this.reloadUserStudies();
+          }
         }, this);
 
         resource.put({
@@ -585,6 +603,35 @@ qx.Class.define("qxapp.desktop.StudyBrowser", {
       }, this);
       form.addButton(saveButton);
 
+      if (!isTemplate && canCreateTemplate) {
+        const saveAsButton = new qx.ui.form.Button(this.tr("Save As Template"));
+        saveAsButton.setMinWidth(70);
+
+        saveAsButton.addListener("execute", e => {
+          for (let i=0; i<itemsToBeModified.length; i++) {
+            const key = itemsToBeModified[i];
+            let getter = "get" + qx.lang.String.firstUp(key);
+            let newVal = model[getter]();
+            studyData[key] = newVal;
+          }
+
+          const resources = this.__studyResources.projects;
+
+          resources.addListenerOnce("postSaveAsTemplateSuccess", ev => {
+            console.log(ev);
+            this.reloadTemplateStudies();
+          }, this);
+          resources.addListenerOnce("postSaveAsTemplateError", ev => {
+            console.error(ev);
+          });
+          resources.postSaveAsTemplate({
+            "study_id": studyData["uuid"]
+          }, studyData);
+        }, this);
+
+        form.addButton(saveAsButton);
+      }
+
       let cancelButton = new qx.ui.form.Button(this.tr("Cancel"));
       cancelButton.setMinWidth(70);
       cancelButton.addListener("execute", e => {
@@ -594,14 +641,14 @@ qx.Class.define("qxapp.desktop.StudyBrowser", {
 
       let deleteButton = new qx.ui.form.Button(this.tr("Delete"));
       deleteButton.setMinWidth(70);
-      deleteButton.setEnabled(!fromTemplate);
+      deleteButton.setEnabled(!isTemplate || (canDeleteTemplate && isMyTemplate));
       deleteButton.addListener("execute", e => {
         let win = this.__createConfirmWindow();
         win.center();
         win.open();
         win.addListener("close", () => {
           if (win["value"] === 1) {
-            this.__deleteStudy(studyData);
+            this.__deleteStudy(studyData, isTemplate);
           }
         }, this);
       }, this);
@@ -610,13 +657,17 @@ qx.Class.define("qxapp.desktop.StudyBrowser", {
       this.__editStudyLayout.add(new qx.ui.form.renderer.Single(form));
     },
 
-    __deleteStudy: function(studyData) {
+    __deleteStudy: function(studyData, isTemplate = false) {
       this.__stopInteractiveServicesInStudy(studyData);
 
       let resource = this.__studyResources.project;
 
       resource.addListenerOnce("delSuccess", ev => {
-        this.reloadUserStudies();
+        if (isTemplate) {
+          this.reloadTemplateStudies();
+        } else {
+          this.reloadUserStudies();
+        }
       }, this);
 
       resource.del({

services/web/client/source/class/qxapp/io/rest/ResourceFactory.js

@@ -126,6 +126,11 @@ qx.Class.define("qxapp.io.rest.ResourceFactory", {
         postFromTemplate: {
           method: "POST",
           url: basePath+"/projects?from_template={template_id}"
+        },
+
+        postSaveAsTemplate: {
+          method: "POST",
+          url: basePath+"/projects?as_template={study_id}"
         }
       });
 

services/web/server/src/simcore_service_webserver/config/host-dev-config.yaml

@@ -56,4 +56,5 @@ storage:
   host: storage
   port: 11111
 session:
-  secret_key: "TODO: Replace with a key of at least length 32"
+  secret_key: ${WEBSERVER_SESSION_SECRET_KEY}
+...

services/web/server/src/simcore_service_webserver/config/server-docker-dev.yaml

@@ -37,7 +37,7 @@ rabbit:
 login:
   enabled: True
   registration_invitation_required: False
-  registration_confirmation_required: ${LOGIN_REGISTRATION_CONFIRMATION_REQUIRED}
+  registration_confirmation_required: True
 smtp:
   sender: 'OSPARC support <[email protected]>'
   host: ${SMTP_HOST}
@@ -56,5 +56,5 @@ storage:
   port: ${STORAGE_PORT}
   version: v0
 session:
-  secret_key: "TODO: Replace with a key of at least length 32"
+  secret_key: ${WEBSERVER_SESSION_SECRET_KEY}
 ...