From 56fb763f1a35febffed1e3637fea09730b8c1286 Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Thu, 24 Dec 2020 09:30:24 -0500 Subject: [PATCH 1/4] Sleep instead of waiting --- .github/workflows/test-docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-docker.yml b/.github/workflows/test-docker.yml index b7ba0fdd..27e46789 100644 --- a/.github/workflows/test-docker.yml +++ b/.github/workflows/test-docker.yml @@ -13,5 +13,5 @@ jobs: - 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" - docker-compose exec -T webapp /webodm/webodm.sh test \ No newline at end of file + sleep 30 + docker-compose exec -T webapp /webodm/webodm.sh test From 6af975c180f25775e389c305b1dcc305db2dd908 Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Thu, 24 Dec 2020 15:46:48 -0500 Subject: [PATCH 2/4] Recurse submodules --- .github/workflows/test-docker.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test-docker.yml b/.github/workflows/test-docker.yml index 27e46789..9fff3b02 100644 --- a/.github/workflows/test-docker.yml +++ b/.github/workflows/test-docker.yml @@ -8,6 +8,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + with: + submodules: 'recursive' name: Checkout - name: Build and Test From b4488ef582766c3521af63943c9ae0976cd57ef3 Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Mon, 28 Dec 2020 11:08:02 -0500 Subject: [PATCH 3/4] Translate task options, fix tooltip alignment --- app/static/app/js/classes/PresetUtils.js | 8 ++++++++ app/static/app/js/css/ProcessingNodeOption.scss | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/app/static/app/js/classes/PresetUtils.js b/app/static/app/js/classes/PresetUtils.js index 7ce2058b..a25c4d7a 100644 --- a/app/static/app/js/classes/PresetUtils.js +++ b/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 diff --git a/app/static/app/js/css/ProcessingNodeOption.scss b/app/static/app/js/css/ProcessingNodeOption.scss index 762dbb6a..af9db034 100644 --- a/app/static/app/js/css/ProcessingNodeOption.scss +++ b/app/static/app/js/css/ProcessingNodeOption.scss @@ -20,4 +20,8 @@ position: absolute; left: -99999px; } + + .tooltip .tooltip-inner{ + padding: 3px 16px; + } } From 3484986ec1053feb4ea80868a362b883cbe8fc08 Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Mon, 28 Dec 2020 11:22:50 -0500 Subject: [PATCH 4/4] Pin webpack cli --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3a0bf40c..c7513c4e 100644 --- a/Dockerfile +++ b/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