Merge pull request #947 from pierotofy/fixci

Fix CI

.github/workflows/test-docker.yml

@@ -8,10 +8,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
       name: Checkout
      
     - name: Build and Test
       run: |
         docker-compose -f docker-compose.yml -f docker-compose.build.yml up --build -d
-        ./wait-for-it.sh localhost:8000 -t 60 -- echo "WebODM is up"
+        sleep 30
-        docker-compose exec -T webapp /webodm/webodm.sh test
+        docker-compose exec -T webapp /webodm/webodm.sh test

Dockerfile

@@ -37,7 +37,7 @@ WORKDIR /webodm/nodeodm/external/NodeODM
 RUN npm install --quiet
 
 WORKDIR /webodm
-RUN npm install --quiet -g webpack@4.16.5 && npm install --quiet -g webpack-cli && npm install --quiet && webpack --mode production
+RUN npm install --quiet -g webpack@4.16.5 && npm install --quiet -g webpack-cli@4.2.0 && npm install --quiet && webpack --mode production
 RUN echo "UTC" > /etc/timezone
 RUN python manage.py collectstatic --noinput
 RUN bash app/scripts/plugin_cleanup.sh && echo "from app.plugins import build_plugins;build_plugins()" | python manage.py shell

app/static/app/js/classes/PresetUtils.js

@@ -1,4 +1,5 @@
 import Utils from './Utils';
+import { _, interpolate } from './gettext';
 
 class PresetUtils{
 
@@ -24,6 +25,13 @@ class PresetUtils{
               delete(opt.value);
             }
         }
+
+        if (typeof opt.help === "string"){
+            opt.help = interpolate(_(opt.help), {
+                choices: Array.isArray(opt.domain) ? opt.domain.join(", ") : opt.domain,
+                'default': opt.defaultValue === "" ? "\"\"" : opt.defaultValue
+            });
+        }
     });
 
     // Sort by name ascending

app/static/app/js/css/ProcessingNodeOption.scss

@@ -20,4 +20,8 @@
         position: absolute;
         left: -99999px;
     }
+
+    .tooltip .tooltip-inner{
+        padding: 3px 16px;
+    }
 }