From d7479c742fad0153e6dd36ff0f00ef1b762afde5 Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Wed, 13 Oct 2021 08:42:08 +0200 Subject: [PATCH 1/5] docker-compose, set localization in docker containers /etc/localtime and /etc/timezone are used for localization --- .devcontainer/docker-compose.yml | 6 ++++-- docker-compose.yml | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index d1e91b858..af38558c0 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -12,9 +12,10 @@ services: expose: - 27017 volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro - ./volumes/wekan-db:/data/db - ./volumes/wekan-db-dump:/dump - - /etc/localtime:/etc/localtime:ro wekan-dev: container_name: wekan-dev-app @@ -36,13 +37,14 @@ services: depends_on: - wekandb-dev volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro - ../client:/home/wekan/app/client - ../models:/home/wekan/app/models - ../config:/home/wekan/app/config - ../i18n:/home/wekan/app/i18n - ../server:/home/wekan/app/server - ../public:/home/wekan/app/public - - /etc/localtime:/etc/localtime:ro volumes: wekan-dev-db: diff --git a/docker-compose.yml b/docker-compose.yml index ce0b47677..9d92b5321 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -111,6 +111,8 @@ services: expose: - 27017 volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro - wekan-db:/data/db - wekan-db-dump:/dump @@ -657,6 +659,9 @@ services: #--------------------------------------------------------------------- depends_on: - wekandb + volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro #--------------------------------------------------------------------------------- # ==== OPTIONAL: SHARE DATABASE TO OFFICE LAN AND REMOTE VPN ==== From f76b466fc47ecfbce5da3cebbcd340be6a5ef361 Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Wed, 13 Oct 2021 08:47:41 +0200 Subject: [PATCH 2/5] docker-compose build failed of .devcontainer, folder tests is missing output of docker-compose build before this change: + /home/wekan/.meteor/meteor build --directory /home/wekan/app_build Errors prevented bundling: While building the application: error: Could not resolve meteor.mainModule "tests/main.js" in package.json (os) error: Could not resolve meteor.mainModule "tests/main.js" in package.json (web.browser) error: Could not resolve meteor.mainModule "tests/main.js" in package.json (web.browser.legacy) The command '/bin/sh -c set -o xtrace && cd /home/wekan/app && /home/wekan/.meteor/meteor add standard-minifier-js && /home/wekan/.meteor/meteor npm install && /home/wekan/.meteor/meteor build --directory /home/wekan/app_build' returned a non-zero code: 1 --- .devcontainer/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index c2e17e602..8990285ef 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -195,6 +195,10 @@ COPY \ settings.json \ /home/wekan/app/ +COPY \ + tests \ + /home/wekan/app/tests/ + COPY \ packages \ /home/wekan/app/packages/ From 458ec4c9a50811f09da59d7e967e002066e5b916 Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Wed, 13 Oct 2021 12:51:03 +0200 Subject: [PATCH 3/5] devcontainer, added cleanup files --- .devcontainer/Dockerfile | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 8990285ef..031fe5da3 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -230,6 +230,19 @@ RUN \ chmod u+w package.json npm-shrinkwrap.json && \ npm install +USER root +# Cleanup +RUN \ + set -o xtrace && \ + apt-get clean -y && \ + apt-get autoremove -y && \ + rm -Rf /tmp* && \ + rm -Rf /home/wekan/app_build && \ + rm -Rf /var/cache/apt /var/lib/apt/lists && \ + rm -Rf /var/lib/apt/lists/* + +USER wekan + ENV PORT=3000 EXPOSE $PORT WORKDIR /home/wekan/app From 1b06997001b7f20fd22880229ebacd3b113d29da Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Tue, 12 Oct 2021 18:31:20 +0200 Subject: [PATCH 4/5] Public boards loaded incompletly seen at: #4024 Console: Meteor.user().isBoardAdmin() is undefined --- client/components/boards/boardBody.js | 2 +- client/components/swimlanes/swimlanes.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/components/boards/boardBody.js b/client/components/boards/boardBody.js index b0a9e2050..0195bb545 100644 --- a/client/components/boards/boardBody.js +++ b/client/components/boards/boardBody.js @@ -216,7 +216,7 @@ BlazeComponent.extendComponent({ $swimlanesDom.sortable( 'option', 'disabled', - !Meteor.user().isBoardAdmin(), + !Meteor.user() || !Meteor.user().isBoardAdmin(), ); }); diff --git a/client/components/swimlanes/swimlanes.js b/client/components/swimlanes/swimlanes.js index 6d72fbfef..b6fe744b5 100644 --- a/client/components/swimlanes/swimlanes.js +++ b/client/components/swimlanes/swimlanes.js @@ -123,7 +123,7 @@ function initSortable(boardComponent, $listsDom) { 'disabled', // Disable drag-dropping when user is not member/is worker //!userIsMember() || Meteor.user().isWorker(), - !Meteor.user().isBoardAdmin(), + !Meteor.user() || !Meteor.user().isBoardAdmin(), // Not disable drag-dropping while in multi-selection mode // MultiSelection.isActive() || !userIsMember(), ); From a47c0dd51235a34e5de2338ffede2a14530d4bea Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Tue, 12 Oct 2021 18:34:40 +0200 Subject: [PATCH 5/5] Infinite cards loading on public boards Fixes: #4024 --- client/components/lists/listBody.js | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/client/components/lists/listBody.js b/client/components/lists/listBody.js index f29ba74ca..fcd28b644 100644 --- a/client/components/lists/listBody.js +++ b/client/components/lists/listBody.js @@ -789,17 +789,12 @@ BlazeComponent.extendComponent({ return false; } + const spinnerViewPosition = this.spinner.offsetTop - this.container.offsetTop + this.spinner.clientHeight; + const parentViewHeight = this.container.clientHeight; const bottomViewPosition = this.container.scrollTop + parentViewHeight; - let spinnerOffsetTop = this.spinner.offsetTop; - - const addCard = $(this.container).find("a.open-minicard-composer").first()[0]; - if (addCard !== undefined) { - spinnerOffsetTop -= addCard.clientHeight; - } - - return bottomViewPosition > spinnerOffsetTop; + return bottomViewPosition > spinnerViewPosition; } getSkSpinnerName() {