.devcontainer/Dockerfile

@@ -1,30 +1,25 @@
-FROM ubuntu:24.04
-LABEL maintainer="wekan"
-LABEL org.opencontainers.image.ref.name="ubuntu"
-LABEL org.opencontainers.image.version="24.04"
-LABEL org.opencontainers.image.source="https://github.com/wekan/wekan"
+FROM ubuntu:21.10
+LABEL maintainer="sgr"
 
 # 2022-04-25:
 # - gyp does not yet work with Ubuntu 22.04 ubuntu:rolling,
 #   so changing to 21.10. https://github.com/wekan/wekan/issues/4488
 
-ENV BUILD_DEPS="apt-utils gnupg gosu wget bzip2 g++ iproute2 apt-transport-https libarchive-tools"
-ENV DEV_DEPS="curl python3 ca-certificates build-essential git"
-ARG DEBIAN_FRONTEND=noninteractive
+ENV BUILD_DEPS="gnupg gosu libarchive-tools wget curl bzip2 g++ build-essential python3 git ca-certificates iproute2"
+ENV DEBIAN_FRONTEND=noninteractive
 
 ENV \
     DEBUG=false \
-    NODE_VERSION=v14.21.4 \
-    METEOR_RELEASE=METEOR@2.14 \
+    NODE_VERSION=v14.21.3 \
+    METEOR_RELEASE=1.10.2 \
     USE_EDGE=false \
     METEOR_EDGE=1.5-beta.17 \
-    NPM_VERSION=6.14.17 \
+    NPM_VERSION=latest \
     FIBERS_VERSION=4.0.1 \
     ARCHITECTURE=linux-x64 \
     SRC_PATH=./ \
     WITH_API=true \
     RESULTS_PER_PAGE="" \
-    DEFAULT_BOARD_ID="" \
     ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE=3 \
     ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD=60 \
     ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW=15 \
@@ -32,14 +27,15 @@ ENV \
     ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD=60 \
     ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW=15 \
     ACCOUNTS_COMMON_LOGIN_EXPIRATION_IN_DAYS=90 \
+    RICHER_CARD_COMMENT_EDITOR=false \
+    CARD_OPENED_WEBHOOK_ENABLED=false \
+    ATTACHMENTS_STORE_PATH="" \
     ATTACHMENTS_UPLOAD_EXTERNAL_PROGRAM="" \
     ATTACHMENTS_UPLOAD_MIME_TYPES="" \
     ATTACHMENTS_UPLOAD_MAX_SIZE=0 \
     AVATARS_UPLOAD_EXTERNAL_PROGRAM="" \
     AVATARS_UPLOAD_MIME_TYPES="" \
     AVATARS_UPLOAD_MAX_SIZE=0 \
-    RICHER_CARD_COMMENT_EDITOR=false \
-    CARD_OPENED_WEBHOOK_ENABLED=false \
     MAX_IMAGE_PIXEL="" \
     IMAGE_COMPRESS_RATIO="" \
     NOTIFICATION_TRAY_AFTER_READ_DAYS_BEFORE_REMOVE="" \
@@ -51,15 +47,12 @@ ENV \
     MATOMO_SITE_ID="" \
     MATOMO_DO_NOT_TRACK=true \
     MATOMO_WITH_USERNAME=false \
-    METRICS_ALLOWED_IP_ADDRESSES="" \
     BROWSER_POLICY_ENABLED=true \
     TRUSTED_URL="" \
     WEBHOOKS_ATTRIBUTES="" \
     OAUTH2_ENABLED=false \
-    OIDC_REDIRECTION_ENABLED=false \
     OAUTH2_CA_CERT="" \
     OAUTH2_ADFS_ENABLED=false \
-    OAUTH2_B2C_ENABLED=false \
     OAUTH2_LOGIN_STYLE=redirect \
     OAUTH2_CLIENT_ID="" \
     OAUTH2_SECRET="" \
@@ -76,9 +69,6 @@ ENV \
     LDAP_ENABLE=false \
     LDAP_PORT=389 \
     LDAP_HOST="" \
-    LDAP_AD_SIMPLE_AUTH="" \
-    LDAP_USER_AUTHENTICATION=false \
-    LDAP_USER_AUTHENTICATION_FIELD=uid \
     LDAP_BASEDN="" \
     LDAP_LOGIN_FALLBACK=false \
     LDAP_RECONNECT=true \
@@ -96,6 +86,8 @@ ENV \
     LDAP_ENCRYPTION=false \
     LDAP_CA_CERT="" \
     LDAP_REJECT_UNAUTHORIZED=false \
+    LDAP_USER_AUTHENTICATION=false \
+    LDAP_USER_AUTHENTICATION_FIELD=uid \
     LDAP_USER_SEARCH_FILTER="" \
     LDAP_USER_SEARCH_SCOPE="" \
     LDAP_USER_SEARCH_FIELD="" \
@@ -150,32 +142,65 @@ ENV \
     SAML_IDENTIFIER_FORMAT="" \
     SAML_LOCAL_PROFILE_MATCH_ATTRIBUTE="" \
     SAML_ATTRIBUTES="" \
-    ORACLE_OIM_ENABLED=false \
-    WAIT_SPINNER="" \
-    WRITABLE_PATH=/data \
+    DEFAULT_WAIT_SPINNER="" \
     S3=""
+# \
+#    NODE_OPTIONS="--max_old_space_size=4096"
 
-#   NODE_OPTIONS="--max_old_space_size=4096"
-
-#---------------------------------------------
-# == at docker-compose.yml: AUTOLOGIN WITH OIDC/OAUTH2 ====
-# https://github.com/wekan/wekan/wiki/autologin
-#- OIDC_REDIRECTION_ENABLED=true
 #---------------------------------------------------------------------
+# https://github.com/wekan/wekan/issues/3585#issuecomment-1021522132
+# Add more Node heap:
+#   NODE_OPTIONS="--max_old_space_size=4096"
+# Add more stack:
+#   bash -c "ulimit -s 65500; exec node --stack-size=65500 main.js"
+#---------------------------------------------------------------------
+
+# Install OS
+RUN set -o xtrace \
+  && useradd --user-group -m --system --home-dir /home/wekan wekan \
+  && apt-get update \
+  && apt-get install --assume-yes --no-install-recommends apt-utils apt-transport-https ca-certificates 2>&1 \
+  && apt-get install --assume-yes --no-install-recommends ${BUILD_DEPS}
+
+# Install NodeJS
+RUN set -o xtrace \
+  && cd /tmp \
+  && curl -fsSLO --compressed "https://nodejs.org/dist/$NODE_VERSION/node-$NODE_VERSION-$ARCHITECTURE.tar.xz" \
+  && curl -fsSLO --compressed "https://nodejs.org/dist/$NODE_VERSION/SHASUMS256.txt.asc" \
+  && grep " node-$NODE_VERSION-$ARCHITECTURE.tar.xz\$" SHASUMS256.txt.asc | sha256sum -c - \
+  && tar -xJf "node-$NODE_VERSION-$ARCHITECTURE.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \
+  && rm "node-$NODE_VERSION-$ARCHITECTURE.tar.xz" SHASUMS256.txt.asc \
+  && ln -s /usr/local/bin/node /usr/local/bin/nodejs \
+  && mkdir -p /usr/local/lib/node_modules/fibers/.node-gyp /root/.node-gyp/${NODE_VERSION} /home/wekan/.config \
+  && npm install -g npm@${NPM_VERSION} \
+  && chown wekan:wekan --recursive /home/wekan/.config
+
+ENV DEBIAN_FRONTEND=dialog
+
+USER wekan
+
+# Install Meteor
+RUN set -o xtrace \
+  && cd /home/wekan \
+  && curl https://install.meteor.com/?release=$METEOR_VERSION --output /home/wekan/install-meteor.sh \
+  # Replace tar with bsdtar in the install script; https://github.com/jshimko/meteor-launchpad/issues/39
+  && sed --in-place "s/tar -xzf.*/bsdtar -xf \"\$TARBALL_FILE\" -C \"\$INSTALL_TMPDIR\"/g" /home/wekan/install-meteor.sh \
+  && sed --in-place 's/VERBOSITY="--silent"/VERBOSITY="--progress-bar"/' /home/wekan/install-meteor.sh \
+  && printf "\n[-] Installing Meteor $METEOR_VERSION...\n\n" \
+  && sh /home/wekan/install-meteor.sh
 
 ENV PATH=$PATH:/home/wekan/.meteor/
 
-RUN <<EOR
-echo "export PATH=$PATH" >> /etc/environment
-EOR
+USER root
+
+RUN echo "export PATH=$PATH" >> /etc/environment
+
+USER wekan
 
 # Copy source dir
-RUN <<EOR
-set -o xtrace
-
-mkdir -p /home/wekan/app/.meteor
-mkdir -p /home/wekan/app/packages
-EOR
+RUN set -o xtrace \
+  && mkdir -p /home/wekan/app/.meteor \
+  && mkdir -p /home/wekan/app/packages
 
 COPY \
     .meteor/.finished-upgraders \
@@ -200,83 +225,44 @@ COPY \
     packages \
     /home/wekan/app/packages/
 
-# Install OS
-RUN <<EOR
-set -o xtrace
+USER root
 
-# Add non-root user wekan
-useradd --user-group --system --home-dir /home/wekan wekan
-# OS dependencies
-apt-get update --assume-yes
-apt-get install --assume-yes --no-install-recommends ${BUILD_DEPS} ${DEV_DEPS}
+RUN set -o xtrace \
+  && chown -R wekan:wekan /home/wekan/app /home/wekan/.meteor
 
-# Meteor installer doesn't work with the default tar binary, so using bsdtar while installing.
-# https://github.com/coreos/bugs/issues/1095#issuecomment-350574389
-cp $(which tar) $(which tar)~
-ln -sf $(which bsdtar) $(which tar)
+USER wekan
 
-# Install NodeJS
-cd /tmp
+RUN \
+    set -o xtrace && \
+    # Build app
+    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
 
-# Download nodejs
-wget "https://github.com/wekan/node-v14-esm/releases/download/${NODE_VERSION}/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz"
-wget "https://github.com/wekan/node-v14-esm/releases/download/${NODE_VERSION}/SHASUMS256.txt"
-
-# Verify nodejs authenticity
-grep "node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz" "SHASUMS256.txt" | shasum -a 256 -c -
-rm -f "SHASUMS256.txt"
-
-# Install Node
-tar xzf "node-$NODE_VERSION-$ARCHITECTURE.tar.gz" -C /usr/local --strip-components=1 --no-same-owner
-rm "node-$NODE_VERSION-$ARCHITECTURE.tar.gz" "SHASUMS256.txt"
-ln -s "/usr/local/bin/node" "/usr/local/bin/nodejs"
-mkdir -p "/opt/nodejs/lib/node_modules/fibers/.node-gyp" "/root/.node-gyp/${NODE_VERSION} /home/wekan/.config"
-
-# Install node dependencies
-npm install -g npm@${NPM_VERSION}
-chown --recursive wekan:wekan /home/wekan/.config
-
-# Install Meteor
-cd /home/wekan
-chown --recursive wekan:wekan /home/wekan
-echo "Starting meteor ${METEOR_RELEASE} installation...   \n"
-gosu wekan:wekan curl https://install.meteor.com/ | /bin/sh
-mv /root/.meteor /home/wekan/
-chown --recursive wekan:wekan /home/wekan/.meteor
-
-# sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' /home/wekan/app/packages/meteor-useraccounts-core/package.js
-cd /home/wekan/.meteor
-gosu wekan:wekan /home/wekan/.meteor/meteor -- help
-
-# Build app (Development)
-cd /home/wekan/app
-gosu wekan:wekan /home/wekan/.meteor/meteor add standard-minifier-js
-gosu wekan:wekan /home/wekan/.meteor/meteor npm install
-
-# Put back the original tar
-mv $(which tar)~ $(which tar)
+RUN \
+    set -o xtrace && \
+    cd /home/wekan/app_build/bundle/programs/server/ && \
+    chmod u+w package.json npm-shrinkwrap.json && \
+    npm install && \
+    cd node_modules/fibers && \
+    node build.js
 
+USER root
 # Cleanup
-apt-get remove --purge --assume-yes ${BUILD_DEPS}
-apt-get install --assume-yes --no-install-recommends build-essential
-apt-get autoremove --assume-yes
-apt-get clean --assume-yes
-rm -Rf /tmp/*
-rm -Rf /var/lib/apt/lists/*
-rm -Rf /var/cache/apt
-rm -Rf /var/lib/apt/lists
-rm -Rf /home/wekan/app_build
-
-mkdir /data
-chown wekan --recursive /data
-EOR
+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
-
-STOPSIGNAL SIGKILL
 WORKDIR /home/wekan/app
 
 #---------------------------------------------------------------------
@@ -286,6 +272,7 @@ WORKDIR /home/wekan/app
 # Add more stack:
 #   bash -c "ulimit -s 65500; exec node --stack-size=65500 main.js"
 #---------------------------------------------------------------------
-#
+#TODO:
+#CMD ["bash", "-c", "ulimit -s 65500; exec node --stack-size=65500 /build/main.js"]
 
 CMD ["/home/wekan/.meteor/meteor", "run", "--verbose", "--settings", "settings.json"]

.github/ISSUE_TEMPLATE.md

@@ -1,26 +1,18 @@
 ## Issue
-
-Please report these issues elsewhere:
-
-- SECURITY ISSUES, PGP EMAIL: https://github.com/wekan/wekan/blob/main/SECURITY.md
-- UCS: https://github.com/wekan/univention/issues
-
-If WeKan Snap is slow, try this: https://github.com/wekan/wekan/wiki/Cron
-
-**[PLEASE UPGRADE](https://github.com/wekan/wekan/wiki/Backup)** to the newest
-WeKan ® before reporting an issue, if possible.
-
+<!--
+**[PLEASE UPGRADE](https://github.com/wekan/wekan/wiki/Backup)** to the newest WeKan ® before reporting an issue.
 Please search existing Open and Closed issues, most questions have already been answered.
 
 If you can not login for any reason: https://github.com/wekan/wekan/wiki/Forgot-Password
-Email settings, only SMTP MAIL_URL and MAIL_FROM are in use:
-https://github.com/wekan/wekan/wiki/Troubleshooting-Mail
+Email settings, only SMTP MAIL_URL and MAIL_FROM are in use: https://github.com/wekan/wekan/wiki/Troubleshooting-Mail
+
+The following types of issues should be reported separately:
+- SECURITY ISSUES: https://github.com/wekan/wekan/blob/master/SECURITY.md
+- UCS: https://github.com/wekan/univention/issues
+-->
 
 ### Server Setup Information
-
-Please anonymize info, and do not any of your Wekan board URLs, passwords,
-API tokens etc to this public issue.
-
+<!-- Please anonymize info, and do not any of your Wekan board URLs, passwords, API tokens etc to this public issue. -->
 * Did you test in newest Wekan?:
 * Did you configure root-url correctly so Wekan cards open correctly (see https://github.com/wekan/wekan/wiki/Settings)?
 * Operating System:
@@ -31,25 +23,13 @@ API tokens etc to this public issue.
 * What webbrowser version are you using (Wekan should work on all modern browsers that support Javascript)?
 
 ### Problem description
-
-Add a recorded animated gif (e.g. with https://github.com/phw/peek) about
-how it works currently, and screenshot mockups how it should work.
-
-
+<!-- Add a recorded animated gif (e.g. with https://github.com/phw/peek) about how it works currently, and screenshot mockups how it should work. -->
 #### Reproduction Steps
 
-
-
 #### Logs
+<!-- Check Right Click>Inspect>Console in you browser - generally Chrome shows more detailed info than Firefox. -->
 
-Check Right Click / Inspect / Console in you browser - generally Chromium
-based browsers show more detailed info than Firefox based browsers.
-
-Please anonymize logs.
-
+<!-- Please anonymize logs.
 Snap: sudo snap logs wekan.wekan
-
 Docker: sudo docker logs wekan-app
-
-If logs are very long, attach them in .zip file
-
+If logs are very long, attach them in .zip file -->

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,69 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [master]
+  schedule:
+    - cron: '0 16 * * 3'
+
+permissions:
+  contents: read
+
+jobs:
+  analyze:
+    permissions:
+      actions: read  # for github/codeql-action/init to get workflow details
+      contents: read  # for actions/checkout to fetch code
+      security-events: write  # for github/codeql-action/autobuild to send a status report
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        # Override automatic language detection by changing the below list
+        # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
+        language: ['javascript', 'python']
+        # Learn more...
+        # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 2
+
+    # If this run was triggered by a pull request event, then checkout
+    # the head of the pull request instead of the merge commit.
+    - run: git checkout HEAD^2
+      if: ${{ github.event_name == 'pull_request' }}
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2

.github/workflows/depsreview.yaml

@@ -9,6 +9,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout Repository'
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@v4
+        uses: actions/dependency-review-action@v3

.github/workflows/docker-publish.yml

@@ -9,11 +9,11 @@ on:
   schedule:
     - cron: '28 23 * * *'
   push:
-    branches: [ main ]
+    branches: [ master ]
     # Publish semver tags as releases.
     tags: [ 'v*.*.*' ]
   pull_request:
-    branches: [ main ]
+    branches: [ master ]
 
 env:
   # Use docker.io for Docker Hub if empty
@@ -32,13 +32,13 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       # Login against a Docker registry except on PR
       # https://github.com/docker/login-action
       - name: Log into registry ${{ env.REGISTRY }}
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772
+        uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -48,14 +48,14 @@ jobs:
       # https://github.com/docker/metadata-action
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804
+        uses: docker/metadata-action@818d4b7b91585d195f67373fd9cb0332e31a7175
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image
-        uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4
+        uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}

.github/workflows/dockerimage.yml

@@ -3,7 +3,7 @@ name: Docker Image CI
 on:
   push:
     branches:
-      - main
+      - master
 
 permissions:
   contents: read
@@ -15,6 +15,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
     - name: Build the Docker image
       run: docker build . --file Dockerfile --tag wekan:$(date +%s)

.github/workflows/release.yml

@@ -3,7 +3,7 @@ name: Release Charts
 on:
   push:
     branches:
-      - main
+      - master
 
 permissions:
   contents: read
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -25,6 +25,6 @@ jobs:
           git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
 
       - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.7.0
+        uses: helm/chart-releaser-action@v1.5.0
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/test_suite.yml

@@ -3,7 +3,7 @@ name: Test suite
 on:
   push:
     branches:
-      - main
+      - master
   pull_request:
 
 permissions:
@@ -18,7 +18,7 @@ jobs:
 #    runs-on: ubuntu-latest
 #    steps:
 #    - name: checkout
-#      uses: actions/checkout@v4
+#      uses: actions/checkout@v3
 #
 #    - name: setup node
 #      uses: actions/setup-node@v1
@@ -42,7 +42,7 @@ jobs:
 #    needs: [lintcode]
 #    steps:
 #    - name: checkout
-#      uses: actions/checkout@v4
+#      uses: actions/checkout@v3
 #
 #    - name: setup node
 #      uses: actions/setup-node@v1
@@ -65,7 +65,7 @@ jobs:
 #    needs: [lintcode,lintstyle]
 #    steps:
 #    - name: checkout
-#      uses: actions/checkout@v4
+#      uses: actions/checkout@v3
 #
 #    - name: setup node
 #      uses: actions/setup-node@v1
@@ -90,12 +90,12 @@ jobs:
 
       # CHECKOUTS
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       # CACHING
       - name: Install Meteor
         id: cache-meteor-install
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: ~/.meteor
           key: v1-meteor-${{ hashFiles('.meteor/versions') }}
@@ -104,7 +104,7 @@ jobs:
 
       - name: Cache NPM dependencies
         id: cache-meteor-npm
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: ~/.npm
           key: v1-npm-${{ hashFiles('package-lock.json') }}
@@ -113,7 +113,7 @@ jobs:
 
       - name: Cache Meteor build
         id: cache-meteor-build
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: |
             .meteor/local/resolver-result-cache.json
@@ -125,7 +125,7 @@ jobs:
             v1-meteor_build_cache-
 
       - name: Setup meteor
-        uses: meteorengineer/setup-meteor@v2
+        uses: meteorengineer/setup-meteor@v1
         with:
           meteor-release: '2.2'
 
@@ -136,7 +136,7 @@ jobs:
         run: sh ./test-wekan.sh -cv
 
       - name: Upload coverage
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: coverage-folder
           path: .coverage/
@@ -147,17 +147,17 @@ jobs:
     needs: [tests]
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Download coverage
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: coverage-folder
           path: .coverage/
 
 
       - name: Coverage Report
-        uses: VeryGoodOpenSource/very_good_coverage@v3.0.0
+        uses: VeryGoodOpenSource/very_good_coverage@v2.1.0
         with:
           path: ".coverage/lcov.info"
           min_coverage: 1 # TODO add tests and increase to 95!

.meteor/packages

@@ -6,7 +6,7 @@
 meteor-base@1.5.1
 
 # Build system
-ecmascript@0.16.8
+ecmascript@0.16.7
 standard-minifier-js@2.8.1
 mquandalle:jade
 coffeescript@2.4.1!
@@ -16,15 +16,16 @@ es5-shim@4.8.0
 
 # Collections
 aldeed:collection2
+cfs:standard-packages
 cottz:publish-relations
 dburles:collection-helpers
 idmontie:migrations
 easy:search
-mongo@1.16.8
+mongo@1.16.6
 mquandalle:collection-mutations
 
 # Account system
-accounts-password@2.4.0
+accounts-password@2.3.4
 useraccounts:core
 useraccounts:flow-routing
 useraccounts:unstyled
@@ -42,7 +43,7 @@ jquery@3.0.0!
 random@1.2.1
 reactive-dict@1.3.1
 session@1.2.1
-tracker@1.3.3
+tracker@1.3.2
 underscore@1.0.13
 arillo:flow-router-helpers
 audit-argument-checks@1.0.7
@@ -53,11 +54,91 @@ raix:handlebar-helpers
 http@2.0.0! # force new http package
 
 # Datepicker
-wekan-bootstrap-datepicker
+rajit:bootstrap3-datepicker
+rajit:bootstrap3-datepicker-de
+rajit:bootstrap3-datepicker-tr
+rajit:bootstrap3-datepicker-ja
+rajit:bootstrap3-datepicker-fr
+rajit:bootstrap3-datepicker-it
+rajit:bootstrap3-datepicker-th
+rajit:bootstrap3-datepicker-nl
+rajit:bootstrap3-datepicker-es
+rajit:bootstrap3-datepicker-lv
+rajit:bootstrap3-datepicker-sv
+rajit:bootstrap3-datepicker-gl
+rajit:bootstrap3-datepicker-eu
+rajit:bootstrap3-datepicker-vi
+rajit:bootstrap3-datepicker-no
+rajit:bootstrap3-datepicker-en-gb
+rajit:bootstrap3-datepicker-ro
+rajit:bootstrap3-datepicker-rs
+rajit:bootstrap3-datepicker-ru
+rajit:bootstrap3-datepicker-bs
+rajit:bootstrap3-datepicker-mn
+rajit:bootstrap3-datepicker-id
+rajit:bootstrap3-datepicker-fa
+rajit:bootstrap3-datepicker-ko
+rajit:bootstrap3-datepicker-pt
+rajit:bootstrap3-datepicker-sl
+rajit:bootstrap3-datepicker-sq
+rajit:bootstrap3-datepicker-cy
+rajit:bootstrap3-datepicker-ka
+rajit:bootstrap3-datepicker-sr
+rajit:bootstrap3-datepicker-az
+rajit:bootstrap3-datepicker-cs
+rajit:bootstrap3-datepicker-me
+rajit:bootstrap3-datepicker-ta
+rajit:bootstrap3-datepicker-eo
+rajit:bootstrap3-datepicker-oc
+rajit:bootstrap3-datepicker-he
+rajit:bootstrap3-datepicker-sw
+rajit:bootstrap3-datepicker-rs-latin
+rajit:bootstrap3-datepicker-da
+rajit:bootstrap3-datepicker-pt-br
+rajit:bootstrap3-datepicker-br
+rajit:bootstrap3-datepicker-it-ch
+rajit:bootstrap3-datepicker-en-za
+rajit:bootstrap3-datepicker-en-ie
+rajit:bootstrap3-datepicker-en-ca
+rajit:bootstrap3-datepicker-uz-latn
+rajit:bootstrap3-datepicker-ms
+rajit:bootstrap3-datepicker-uk
+rajit:bootstrap3-datepicker-hu
+rajit:bootstrap3-datepicker-fo
+rajit:bootstrap3-datepicker-kr
+rajit:bootstrap3-datepicker-hi
+rajit:bootstrap3-datepicker-km
+rajit:bootstrap3-datepicker-fi
+rajit:bootstrap3-datepicker-is
+rajit:bootstrap3-datepicker-kh
+rajit:bootstrap3-datepicker-bg
+rajit:bootstrap3-datepicker-bn
+rajit:bootstrap3-datepicker-pl
+rajit:bootstrap3-datepicker-et
+rajit:bootstrap3-datepicker-ar
+rajit:bootstrap3-datepicker-ca
+rajit:bootstrap3-datepicker-kk
+rajit:bootstrap3-datepicker-sk
+rajit:bootstrap3-datepicker-el
+rajit:bootstrap3-datepicker-hy
+rajit:bootstrap3-datepicker-hr
+rajit:bootstrap3-datepicker-tg
+rajit:bootstrap3-datepicker-nb
+rajit:bootstrap3-datepicker-mk
+rajit:bootstrap3-datepicker-nl-be
+rajit:bootstrap3-datepicker-zh-cn
+rajit:bootstrap3-datepicker-ar-tn
+rajit:bootstrap3-datepicker-en-au
+rajit:bootstrap3-datepicker-fr-ch
+rajit:bootstrap3-datepicker-zh-tw
+rajit:bootstrap3-datepicker-uz-cyrl
+rajit:bootstrap3-datepicker-sr-latin
+rajit:bootstrap3-datepicker-en-nz
 
 # UI components
 ostrio:i18n
 reactive-var@1.0.12
+fortawesome:fontawesome
 mousetrap:mousetrap
 mquandalle:jquery-textcomplete
 mquandalle:mousetrap-bindglobal
@@ -66,6 +147,8 @@ meteor-autosize
 shell-server@0.5.0
 email@2.2.5
 dynamic-import@0.7.3
+cfs:gridfs
+rzymek:fullcalendar
 msavin:usercache
 # Keep stylus in 1.1.0, because building v2 takes extra 52 minutes.
 meteorhacks:subs-manager
@@ -73,6 +156,7 @@ meteorhacks:aggregate@1.3.0
 wekan-markdown
 konecty:mongo-counter
 percolate:synced-cron
+cfs:filesystem
 ostrio:cookies
 ostrio:files@2.3.0
 pascoual:pdfkit
@@ -83,14 +167,9 @@ matb33:collection-hooks
 simple:json-routes
 kadira:flow-router
 spacebars
-service-configuration@1.3.2
+service-configuration@1.3.1
 communitypackages:picker
 minifier-css@1.6.4
 blaze
 kadira:blaze-layout
 peerlibrary:blaze-components
-ejson@1.1.3
-logging@1.3.3
-wekan-fullcalendar
-momentjs:moment@2.29.3
-wekan-fontawesome

.meteor/release

@@ -1 +1 @@
-METEOR@2.14
+METEOR@2.12

.meteor/versions

@@ -1,6 +1,6 @@
-accounts-base@2.2.10
-accounts-oauth@1.4.3
-accounts-password@2.4.0
+accounts-base@2.2.8
+accounts-oauth@1.4.2
+accounts-password@2.3.4
 aldeed:collection2@2.10.0
 aldeed:collection2-core@1.2.0
 aldeed:schema-deny@1.1.0
@@ -10,16 +10,34 @@ allow-deny@1.1.1
 arillo:flow-router-helpers@0.5.2
 audit-argument-checks@1.0.7
 autoupdate@1.8.0
-babel-compiler@7.10.5
+babel-compiler@7.10.4
 babel-runtime@1.5.1
 base64@1.0.12
 binary-heap@1.0.11
 blaze@2.7.1
 blaze-tools@1.1.3
-boilerplate-generator@1.7.2
+boilerplate-generator@1.7.1
 caching-compiler@1.2.2
 caching-html-compiler@1.2.1
 callback-hook@1.5.1
+cfs:access-point@0.1.49
+cfs:base-package@0.0.30
+cfs:collection@0.5.5
+cfs:collection-filters@0.2.4
+cfs:data-man@0.0.6
+cfs:file@0.1.17
+cfs:filesystem@0.1.2
+cfs:gridfs@0.0.34
+cfs:http-methods@0.0.32
+cfs:http-publish@0.0.13
+cfs:power-queue@0.9.11
+cfs:reactive-list@0.0.9
+cfs:reactive-property@0.0.4
+cfs:standard-packages@0.5.10
+cfs:storage-adapter@0.2.4
+cfs:tempstore@0.1.6
+cfs:upload-http@0.0.20
+cfs:worker@0.1.5
 check@1.3.2
 coffeescript@2.7.0
 coffeescript-compiler@2.4.1
@@ -29,22 +47,23 @@ dburles:collection-helpers@1.1.0
 ddp@1.4.1
 ddp-client@2.6.1
 ddp-common@1.4.0
-ddp-rate-limiter@1.2.1
-ddp-server@2.7.0
+ddp-rate-limiter@1.2.0
+ddp-server@2.6.1
 deps@1.0.12
 diff-sequence@1.1.2
 dynamic-import@0.7.3
 easy:search@2.2.1
 easysearch:components@2.2.2
 easysearch:core@2.2.2
-ecmascript@0.16.8
+ecmascript@0.16.7
 ecmascript-runtime@0.8.1
 ecmascript-runtime-client@0.12.1
 ecmascript-runtime-server@0.11.0
 ejson@1.1.3
 email@2.2.5
 es5-shim@4.8.0
-fetch@0.1.4
+fetch@0.1.3
+fortawesome:fontawesome@4.7.0
 geojson-utils@1.0.11
 hot-code-push@1.0.4
 html-tools@1.1.3
@@ -58,12 +77,13 @@ kadira:blaze-layout@2.3.0
 kadira:dochead@1.5.0
 kadira:flow-router@2.12.1
 konecty:mongo-counter@0.0.5_3
+livedata@1.0.18
 lmieulet:meteor-coverage@1.1.4
 localstorage@1.2.0
-logging@1.3.3
-matb33:collection-hooks@1.3.0
+logging@1.3.2
+matb33:collection-hooks@1.2.2
 mdg:validation-error@0.5.1
-meteor@1.11.5
+meteor@1.11.2
 meteor-autosize@5.0.1
 meteor-base@1.5.1
 meteorhacks:aggregate@1.3.0
@@ -77,11 +97,11 @@ minifier-css@1.6.4
 minifier-js@2.7.5
 minifiers@1.1.8-faster-rebuild.0
 minimongo@1.9.3
-modern-browsers@0.1.10
-modules@0.20.0
+modern-browsers@0.1.9
+modules@0.19.0
 modules-runtime@0.13.1
 momentjs:moment@2.29.3
-mongo@1.16.8
+mongo@1.16.6
 mongo-decimal@0.1.3
 mongo-dev-server@1.1.0
 mongo-id@1.0.8
@@ -94,8 +114,8 @@ mquandalle:jade-compiler@0.4.5
 mquandalle:jquery-textcomplete@0.8.0_1
 mquandalle:mousetrap-bindglobal@0.0.1
 msavin:usercache@1.8.0
-npm-mongo@4.17.2
-oauth@2.2.1
+npm-mongo@4.16.0
+oauth@2.2.0
 oauth2@1.3.2
 observe-sequence@1.0.21
 ongoworks:speakingurl@1.1.0
@@ -111,19 +131,100 @@ peerlibrary:blaze-components@0.23.0
 peerlibrary:computed-field@0.10.0
 peerlibrary:data-lookup@0.3.0
 peerlibrary:reactive-field@0.6.0
-percolate:synced-cron@1.5.2
+percolate:synced-cron@1.3.2
 promise@0.12.2
 raix:eventemitter@0.1.3
 raix:handlebar-helpers@0.2.5
+rajit:bootstrap3-datepicker@1.7.1_1
+rajit:bootstrap3-datepicker-ar@1.7.1
+rajit:bootstrap3-datepicker-ar-tn@1.7.1
+rajit:bootstrap3-datepicker-az@1.7.1
+rajit:bootstrap3-datepicker-bg@1.7.1
+rajit:bootstrap3-datepicker-bn@1.7.1
+rajit:bootstrap3-datepicker-br@1.7.1
+rajit:bootstrap3-datepicker-bs@1.7.1
+rajit:bootstrap3-datepicker-ca@1.7.1
+rajit:bootstrap3-datepicker-cs@1.7.1
+rajit:bootstrap3-datepicker-cy@1.7.1
+rajit:bootstrap3-datepicker-da@1.7.1
+rajit:bootstrap3-datepicker-de@1.7.1
+rajit:bootstrap3-datepicker-el@1.7.1
+rajit:bootstrap3-datepicker-en-au@1.7.1
+rajit:bootstrap3-datepicker-en-ca@1.7.1
+rajit:bootstrap3-datepicker-en-gb@1.7.1
+rajit:bootstrap3-datepicker-en-ie@1.7.1
+rajit:bootstrap3-datepicker-en-nz@1.7.1
+rajit:bootstrap3-datepicker-en-za@1.7.1
+rajit:bootstrap3-datepicker-eo@1.7.1
+rajit:bootstrap3-datepicker-es@1.7.1
+rajit:bootstrap3-datepicker-et@1.7.1
+rajit:bootstrap3-datepicker-eu@1.7.1
+rajit:bootstrap3-datepicker-fa@1.7.1
+rajit:bootstrap3-datepicker-fi@1.7.1
+rajit:bootstrap3-datepicker-fo@1.7.1
+rajit:bootstrap3-datepicker-fr@1.7.1
+rajit:bootstrap3-datepicker-fr-ch@1.7.1
+rajit:bootstrap3-datepicker-gl@1.7.1
+rajit:bootstrap3-datepicker-he@1.7.1
+rajit:bootstrap3-datepicker-hi@1.7.1
+rajit:bootstrap3-datepicker-hr@1.7.1
+rajit:bootstrap3-datepicker-hu@1.7.1
+rajit:bootstrap3-datepicker-hy@1.7.1
+rajit:bootstrap3-datepicker-id@1.7.1
+rajit:bootstrap3-datepicker-is@1.7.1
+rajit:bootstrap3-datepicker-it@1.7.1
+rajit:bootstrap3-datepicker-it-ch@1.7.1
+rajit:bootstrap3-datepicker-ja@1.7.1
+rajit:bootstrap3-datepicker-ka@1.7.1
+rajit:bootstrap3-datepicker-kh@1.7.1
+rajit:bootstrap3-datepicker-kk@1.7.1
+rajit:bootstrap3-datepicker-km@1.7.1
+rajit:bootstrap3-datepicker-ko@1.7.1
+rajit:bootstrap3-datepicker-kr@1.7.1
+rajit:bootstrap3-datepicker-lv@1.7.1
+rajit:bootstrap3-datepicker-me@1.7.1
+rajit:bootstrap3-datepicker-mk@1.7.1
+rajit:bootstrap3-datepicker-mn@1.7.1
+rajit:bootstrap3-datepicker-ms@1.7.1
+rajit:bootstrap3-datepicker-nb@1.7.1
+rajit:bootstrap3-datepicker-nl@1.7.1
+rajit:bootstrap3-datepicker-nl-be@1.7.1
+rajit:bootstrap3-datepicker-no@1.7.1
+rajit:bootstrap3-datepicker-oc@1.7.1
+rajit:bootstrap3-datepicker-pl@1.7.1
+rajit:bootstrap3-datepicker-pt@1.7.1
+rajit:bootstrap3-datepicker-pt-br@1.7.1
+rajit:bootstrap3-datepicker-ro@1.7.1
+rajit:bootstrap3-datepicker-rs@1.7.1
+rajit:bootstrap3-datepicker-rs-latin@1.7.1
+rajit:bootstrap3-datepicker-ru@1.7.1
+rajit:bootstrap3-datepicker-sk@1.7.1
+rajit:bootstrap3-datepicker-sl@1.7.1
+rajit:bootstrap3-datepicker-sq@1.7.1
+rajit:bootstrap3-datepicker-sr@1.7.1
+rajit:bootstrap3-datepicker-sr-latin@1.7.1
+rajit:bootstrap3-datepicker-sv@1.7.1
+rajit:bootstrap3-datepicker-sw@1.7.1
+rajit:bootstrap3-datepicker-ta@1.7.1
+rajit:bootstrap3-datepicker-tg@1.7.1
+rajit:bootstrap3-datepicker-th@1.7.1
+rajit:bootstrap3-datepicker-tr@1.7.1
+rajit:bootstrap3-datepicker-uk@1.7.1
+rajit:bootstrap3-datepicker-uz-cyrl@1.7.1
+rajit:bootstrap3-datepicker-uz-latn@1.7.1
+rajit:bootstrap3-datepicker-vi@1.7.1
+rajit:bootstrap3-datepicker-zh-cn@1.7.1
+rajit:bootstrap3-datepicker-zh-tw@1.7.1
 random@1.2.1
 rate-limit@1.1.1
-react-fast-refresh@0.2.8
+react-fast-refresh@0.2.7
 reactive-dict@1.3.1
 reactive-var@1.0.12
 reload@1.3.1
 retry@1.1.0
 routepolicy@1.1.1
-service-configuration@1.3.3
+rzymek:fullcalendar@3.8.0
+service-configuration@1.3.1
 session@1.2.1
 sha@1.0.9
 shell-server@0.5.0
@@ -132,7 +233,7 @@ simple:json-routes@2.3.1
 simple:rest-accounts-password@1.2.2
 simple:rest-bearer-token-parser@1.1.1
 simple:rest-json-error-handler@1.1.1
-socket-stream-client@0.5.2
+socket-stream-client@0.5.1
 spacebars@1.4.1
 spacebars-compiler@1.3.1
 standard-minifier-js@2.8.1
@@ -141,26 +242,22 @@ templating@1.4.1
 templating-compiler@1.4.1
 templating-runtime@1.5.0
 templating-tools@1.2.2
-tracker@1.3.3
-typescript@4.9.5
+tracker@1.3.2
 ui@1.0.13
 underscore@1.0.13
 url@1.3.2
 useraccounts:core@1.16.2
 useraccounts:flow-routing@1.15.0
 useraccounts:unstyled@1.14.2
-webapp@1.13.6
+webapp@1.13.5
 webapp-hashing@1.1.1
 wekan-accounts-cas@0.1.0
 wekan-accounts-lockout@1.0.0
 wekan-accounts-oidc@1.0.10
 wekan-accounts-sandstorm@0.8.0
-wekan-bootstrap-datepicker@1.10.0
-wekan-fontawesome@6.4.2
-wekan-fullcalendar@3.10.5
 wekan-ldap@0.0.2
 wekan-markdown@1.0.9
 wekan-oidc@1.0.12
 yasaricli:slugify@0.0.7
 zimme:active-route@2.3.2
-zodern:types@1.0.10
+zodern:types@1.0.9

.tx/config

@@ -1,6 +1,6 @@
 [main]
 host     = https://www.transifex.com
-lang_map = te_IN: te-IN, es_AR: es-AR, es_419: es-LA, es_TX: es-TX, he_IL: he-IL, zh_CN: zh-CN, ar_EG: ar-EG, cs_CZ: cs-CZ, fa_IR: fa-IR, ms_MY: ms-MY, nl_NL: nl-NL, de_CH: de-CH, en_IT: en-IT, uz_UZ: uz-UZ, fr_CH: fr-CH, hi_IN: hi-IN, et_EE: et-EE, es_PE: es-PE, es_MX: es-MX, gl_ES: gl-ES, mn_MN: mn, sl_SI: sl, zh_TW: zh-TW, ast_ES: ast-ES, es_CL: es-CL, ja_JP: ja, lv_LV: lv, ro_RO: ro-RO, az_AZ: az-AZ, cy_GB: cy-GB, gu_IN: gu-IN, pl_PL: pl-PL, vep: ve-PP, en_BR: en-BR, en@ysv: en-YS, hu_HU: hu, ko_KR: ko-KR, pt_BR: pt-BR, zh_HK: zh-HK, zu_ZA: zu-ZA, en_MY: en-MY, ja-Hira: ja-HI, fi_FI: fi, vec: ve-CC, vi_VN: vi-VN, fr_FR: fr-FR, id_ID: id, zh_Hans: zh-Hans, en_DE: en-DE, en_GB: en-GB, el_GR: el-GR, uk_UA: uk-UA, az@latin: az-LA, de_AT: de-AT, uz@Latn: uz-LA, vls: vl-SS, ar_DZ: ar-DZ, bg_BG: bg, es_PY: es-PY, fy_NL: fy-NL, uz@Arab: uz-AR, ru_UA: ru-UA, war: wa-RR, zh_CN.GB2312: zh-GB
+lang_map = es_AR: es-AR, es_419: es-LA, es_TX: es-TX, he_IL: he-IL, zh_CN: zh-CN, ar_EG: ar-EG, cs_CZ: cs-CZ, fa_IR: fa-IR, ms_MY: ms-MY, nl_NL: nl-NL, de_CH: de-CH, en_IT: en-IT, uz_UZ: uz-UZ, fr_CH: fr-CH, hi_IN: hi-IN, et_EE: et-EE, es_PE: es-PE, es_MX: es-MX, gl_ES: gl-ES, mn_MN: mn, sl_SI: sl, zh_TW: zh-TW, ast_ES: ast-ES, es_CL: es-CL, ja_JP: ja, lv_LV: lv, ro_RO: ro-RO, az_AZ: az-AZ, cy_GB: cy-GB, gu_IN: gu-IN, pl_PL: pl-PL, vep: ve-PP, en_BR: en-BR, en@ysv: en-YS, hu_HU: hu, ko_KR: ko-KR, pt_BR: pt-BR, zh_HK: zh-HK, zu_ZA: zu-ZA, en_MY: en-MY, ja-Hira: ja-HI, fi_FI: fi, vec: ve-CC, vi_VN: vi-VN, fr_FR: fr-FR, id_ID: id, zh_Hans: zh-Hans, en_DE: en-DE, en_GB: en-GB, el_GR: el-GR, uk_UA: uk-UA, az@latin: az-LA, de_AT: de-AT, uz@Latn: uz-LA, vls: vl-SS, ar_DZ: ar-DZ, bg_BG: bg, es_PY: es-PY, fy_NL: fy-NL, uz@Arab: uz-AR, ru_UA: ru-UA, war: wa-RR, zh_CN.GB2312: zh-GB
 
 [o:wekan:p:wekan:r:application]
 file_filter = imports/i18n/data/<lang>.i18n.json

.vscode/launch.json

@@ -1,57 +1,45 @@
 {
   "version": "0.2.0",
   "configurations": [
-    {
-      "type": "node",
-      "request": "launch",
-      "name": "Meteor: Node",
-      "runtimeExecutable": "meteor",
-      "runtimeArgs": [
-        "--port=4000",
-        "--exclude-archs=web.browser.legacy,web.cordova",
-        "--raw-logs"
-      ],
-      "env": {
-        "WRITABLE_PATH": "/tmp/uploads",
+      {
+          "type": "chrome",
+          "request": "launch",
+          "name": "Meteor: Chrome",
+          "url": "http://localhost:3000",
+          "webRoot": "${workspaceFolder}"
       },
-      "outputCapture": "std",
-      "restart": true,
-      "timeout": 60000
-    },
-    {
-      "type": "chrome",
-      "request": "launch",
-      "name": "Meteor: Chrome",
-      "url": "http://localhost:4000",
-      "sourceMapPathOverrides": {
-        "meteor://💻app/*": "${workspaceFolder}/*"
+      {
+          "type": "node",
+          "request": "launch",
+          "name": "Meteor: Node",
+          "runtimeExecutable": "/home/wekan/.meteor/meteor",
+          "runtimeArgs": ["run", "--inspect-brk=9229"],
+          "outputCapture": "std",
+          "port": 9229,
+          "timeout": 60000
       },
-      "userDataDir": "${env:HOME}/.vscode/chrome"
-    },
-    {
-      "type": "node",
-      "request": "launch",
-      "name": "Test: Node",
-      "runtimeExecutable": "meteor",
-      "runtimeArgs": [
-        "test",
-        "--port=4040",
-        "--exclude-archs=web.browser.legacy,web.cordova",
-        "--driver-package=meteortesting:mocha",
-        "--settings=settings.json",
-        "--raw-logs"
-      ],
-      "env": {
-        "TEST_WATCH": "1"
-      },
-      "outputCapture": "std",
-      "timeout": 60000
-    }
+      {
+          "type": "node",
+          "request": "launch",
+          "name": "Test: Node",
+          "runtimeExecutable": "meteor",
+          "runtimeArgs": [
+            "test",
+            "--inspect-brk=9229",
+            "--port=4040",
+            "--exclude-archs=web.browser.legacy,web.cordova",
+            "--driver-package=meteortesting:mocha",
+            "--settings=settings.json"
+          ],
+          "outputCapture": "std",
+          "port": 9229,
+          "timeout": 60000
+      }
   ],
   "compounds": [
-    {
-      "name": "Meteor: All",
-      "configurations": ["Meteor: Node", "Meteor: Chrome"]
-    }
+      {
+          "name": "Meteor: All",
+          "configurations": ["Meteor: Node", "Meteor: Chrome"]
+      }
   ]
 }

CODE_OF_CONDUCT.md

@@ -1,22 +0,0 @@
-# Code of Conduct
-
-For all code at WeKan GitHub Organization https://github.com/wekan
-
-- All code in pull requests need to have permission already to add it to WeKan with MIT license, and will become MIT license.
-- All code xet7 add is MIT license.
-- For any dependencies, permissive licenses like https://copyfree.org are preferred
-- For anything currently that is non-permissive (like GPL, AGPL, SSPL), those will be replaced with permissive-licensed alternatives
-
-# Reporting about violations or something else
-
-## Private reports
-
-- Email support@wekan.team
-- Security issues: [SECURITY.md](SECURITY.md)
-- License violations
-- Anything private, sensitive or negative
-
-## Public
-
-- Feature Requests and Bug Reports https://github.com/wekan/wekan/issues
-- Anything happy, positive, encouraging, helping, at friendly WeKan Global FOSS Community

CONTRIBUTING.md

@@ -1,35 +1,19 @@
-## About money
-
-Not paid:
-
-- Money is not paid for these, everyone uses their own time at their own cost:
-  - Security reports, see [SECURITY.md](SECURITY.md)
-  - Pull requests
-  - xet7 checking pull requests
-- Public Community Support
-  - https://github.com/wekan/wekan/issues
-
-Paid by customers of WeKan Team:
-
-- Commercial Support at https://wekan.team/commercial-support/
-  - Support
-  - Private Chat
-  - Features
-  - Fixes
-  - Hosting
-
 ## Contributing Security related
 
 For responsible security disclosure, please follow this process:
-https://github.com/wekan/wekan/blob/main/SECURITY.md
+https://github.com/wekan/wekan/blob/master/SECURITY.md
 
 CVE Hall of Fame is at https://wekan.github.io/hall-of-fame/
 
 ## Contributing to Documentation Wiki
 
-Fork WeKan repo https://github.com/wekan/wekan ,
-edit `docs` directory content at GitHub web interface,
-and click send PR.
+Please clone wiki:
+```
+git clone https://github.com/wekan/wekan.wiki
+```
+Edit .md files, and add changed files in .zip attachment
+directly to comment of new issue at
+https://github.com/wekan/wekan/issues 
 
 ## Contributing code
 
@@ -38,7 +22,7 @@ and click send PR.
 WeKan code contributors Hall of Fame is at ChangeLog, where
 GitHub usernames are mentioned with changes added:
 
-https://github.com/wekan/wekan/blob/main/CHANGELOG.md
+https://github.com/wekan/wekan/blob/master/CHANGELOG.md
 
 Changes can be like typo fixes, bugfixes, features, or anything else
 like for example at open GitHub issues https://github.com/wekan/wekan/issues .
@@ -58,7 +42,7 @@ About 300 persons have contributed to WeKan, stats at:
 
 https://www.openhub.net/p/wekan
 
-WeKan maintainer xet7 reviews PR for typos etc before accepting to WeKan,
+WeKan maintainer xet7 checks PR for typos etc before accepting to WeKan,
 so that WeKan code will still work OK.
 
 ## Contributing translations
@@ -69,7 +53,7 @@ https://transifex.com/wekan/wekan
 When adding new features, in your PR to
 https://github.com/wekan/wekan/pulls
 only add new English source language strings
-to https://github.com/wekan/wekan/blob/main/imports/i18n/data/en.i18n.json
+to https://github.com/wekan/wekan/blob/master/imports/i18n/data/en.i18n.json
 
 Maintainer of WeKan xet7 downloads all newest
 translations from Transifex and adds
@@ -78,10 +62,12 @@ new release.
 
 ## About WeKan Organization https://github.com/wekan
 
-Only xet7 has write access to WeKan Organization.
+xet7 rarely adds any new members to GitHub Organization,
+because xet7 prefers to check PRs.
 
-xet7 reviews all PRs before merging.
+For some repos (other than https://github.com/wekan/wekan ),
+some contributors have direct commit access.
 
-There has been over 300 contributors to WeKan, newest stats at:
+Some contributors are mentioned at this outdated page:
 
-https://www.openhub.net/p/wekan
+https://github.com/wekan/wekan/wiki/Team

Dockerfile

@@ -1,8 +1,10 @@
-FROM ubuntu:24.04
+FROM --platform=linux/amd64 ubuntu:23.04 as wekan
 LABEL maintainer="wekan"
-LABEL org.opencontainers.image.ref.name="ubuntu"
-LABEL org.opencontainers.image.version="24.04"
-LABEL org.opencontainers.image.source="https://github.com/wekan/wekan"
+
+# 2022-09-04:
+# - above "--platform=linux/amd64 ubuntu:22.04 as wekan" is needed to build Dockerfile
+#   correctly on Mac M1 etc, to not get this error:
+#   https://stackoverflow.com/questions/71040681/qemu-x86-64-could-not-open-lib64-ld-linux-x86-64-so-2-no-such-file-or-direc
 
 # 2022-04-25:
 # - gyp does not yet work with Ubuntu 22.04 ubuntu:rolling,
@@ -11,23 +13,24 @@ LABEL org.opencontainers.image.source="https://github.com/wekan/wekan"
 # 2021-09-18:
 # - Above Ubuntu base image copied from Docker Hub ubuntu:hirsute-20210825
 #   to Quay to avoid Docker Hub rate limits.
+
+# Set the environment variables (defaults where required)
+# DOES NOT WORK: paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303
+# ENV BUILD_DEPS="paxctl"
 ARG DEBIAN_FRONTEND=noninteractive
 
-ENV BUILD_DEPS="apt-utils gnupg gosu wget bzip2 g++ curl libarchive-tools build-essential git ca-certificates python3"
-
-ENV \
+ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-essential git ca-certificates python3" \
     DEBUG=false \
-    NODE_VERSION=v14.21.4 \
-    METEOR_RELEASE=METEOR@2.14 \
+    NODE_VERSION=v14.21.3 \
+    METEOR_RELEASE=METEOR@2.12-beta.2 \
     USE_EDGE=false \
     METEOR_EDGE=1.5-beta.17 \
-    NPM_VERSION=6.14.17 \
+    NPM_VERSION=latest \
     FIBERS_VERSION=4.0.1 \
     ARCHITECTURE=linux-x64 \
     SRC_PATH=./ \
     WITH_API=true \
     RESULTS_PER_PAGE="" \
-    DEFAULT_BOARD_ID="" \
     ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE=3 \
     ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD=60 \
     ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW=15 \
@@ -62,7 +65,6 @@ ENV \
     OIDC_REDIRECTION_ENABLED=false \
     OAUTH2_CA_CERT="" \
     OAUTH2_ADFS_ENABLED=false \
-    OAUTH2_B2C_ENABLED=false \
     OAUTH2_LOGIN_STYLE=redirect \
     OAUTH2_CLIENT_ID="" \
     OAUTH2_SECRET="" \
@@ -158,7 +160,7 @@ ENV \
     WRITABLE_PATH=/data \
     S3=""
 
-#   NODE_OPTIONS="--max_old_space_size=4096"
+#   NODE_OPTIONS="--max_old_space_size=4096" \
 
 #---------------------------------------------
 # == at docker-compose.yml: AUTOLOGIN WITH OIDC/OAUTH2 ====
@@ -169,98 +171,95 @@ ENV \
 # Copy the app to the image
 COPY ${SRC_PATH} /home/wekan/app
 
-# Install OS
-RUN <<EOR
-set -o xtrace
-
-# Add non-root user wekan
-useradd --user-group --system --home-dir /home/wekan wekan
-# OS dependencies
-apt-get update --assume-yes
-apt-get install --assume-yes --no-install-recommends ${BUILD_DEPS}
-
-# Meteor installer doesn't work with the default tar binary, so using bsdtar while installing.
-# https://github.com/coreos/bugs/issues/1095#issuecomment-350574389
-cp $(which tar) $(which tar)~
-ln -sf $(which bsdtar) $(which tar)
-
-# Install NodeJS
-cd /tmp
-
-# Download nodejs
-wget "https://github.com/wekan/node-v14-esm/releases/download/${NODE_VERSION}/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz"
-wget "https://github.com/wekan/node-v14-esm/releases/download/${NODE_VERSION}/SHASUMS256.txt"
-
-# Verify nodejs authenticity
-grep "node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz" "SHASUMS256.txt" | shasum -a 256 -c -
-rm -f "SHASUMS256.txt"
-
-# Install Node
-tar xzf "node-$NODE_VERSION-$ARCHITECTURE.tar.gz" -C /usr/local --strip-components=1 --no-same-owner
-rm "node-$NODE_VERSION-$ARCHITECTURE.tar.gz" "SHASUMS256.txt"
-ln -s "/usr/local/bin/node" "/usr/local/bin/nodejs"
-mkdir -p "/opt/nodejs/lib/node_modules/fibers/.node-gyp" "/root/.node-gyp/${NODE_VERSION} /home/wekan/.config"
-
-# Install node dependencies
-npm install -g npm@${NPM_VERSION} --production
-chown --recursive wekan:wekan /home/wekan/.config
-
-# Install Meteor
-cd /home/wekan
-chown --recursive wekan:wekan /home/wekan
-echo "Starting meteor ${METEOR_RELEASE} installation...   \n"
-gosu wekan:wekan curl https://install.meteor.com/ | /bin/sh
-mv /root/.meteor /home/wekan/
-chown --recursive wekan:wekan /home/wekan/.meteor
-
-sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' /home/wekan/app/packages/meteor-useraccounts-core/package.js
-cd /home/wekan/.meteor
-gosu wekan:wekan /home/wekan/.meteor/meteor -- help
-
-# Build app (Production)
-cd /home/wekan/app
-mkdir -p /home/wekan/.npm
-chown --recursive wekan:wekan /home/wekan/.npm
-chmod u+w *.json
-gosu wekan:wekan meteor npm install --production
-gosu wekan:wekan /home/wekan/.meteor/meteor build --directory /home/wekan/app_build
-cd /home/wekan/app_build/bundle/programs/server/
-chmod u+w *.json
-gosu wekan:wekan meteor npm install --production
-cd node_modules/fibers
-node build.js
-cd ../..
-# Remove legacy webbroser bundle, so that Wekan works also at Android Firefox, iOS Safari, etc.
-rm -rf /home/wekan/app_build/bundle/programs/web.browser.legacy
-mv /home/wekan/app_build/bundle /build
-
-# Put back the original tar
-mv $(which tar)~ $(which tar)
-
-# Cleanup
-apt-get remove --purge --assume-yes ${BUILD_DEPS}
-npm uninstall -g api2html
-apt-get autoremove --assume-yes
-apt-get clean --assume-yes
-rm -Rf /tmp/*
-rm -Rf /var/lib/apt/lists/*
-rm -Rf /var/cache/apt
-rm -Rf /var/lib/apt/lists
-rm -Rf /home/wekan/app_build
-rm -Rf /home/wekan/app
-rm -Rf /home/wekan/.meteor
-
-mkdir /data
-chown wekan --recursive /data
-EOR
-
-USER wekan
+RUN \
+    set -o xtrace && \
+    # Add non-root user wekan
+    useradd --user-group --system --home-dir /home/wekan wekan && \
+    \
+    # OS dependencies
+    apt-get update -y && apt-get install -y --no-install-recommends ${BUILD_DEPS} && \
+    \
+    # Meteor installer doesn't work with the default tar binary, so using bsdtar while installing.
+    # https://github.com/coreos/bugs/issues/1095#issuecomment-350574389
+    cp $(which tar) $(which tar)~ && \
+    ln -sf $(which bsdtar) $(which tar) && \
+    \
+    # Download nodejs
+    wget https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \
+    wget https://nodejs.org/dist/${NODE_VERSION}/SHASUMS256.txt.asc && \
+    #---------------------------------------------------------------------------------------------
+    \
+    # Verify nodejs authenticity
+    grep ${NODE_VERSION}-${ARCHITECTURE}.tar.gz SHASUMS256.txt.asc | shasum -a 256 -c - && \
+    rm -f SHASUMS256.txt.asc && \
+    \
+    # Install Node
+    tar xvzf node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \
+    rm node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \
+    mv node-${NODE_VERSION}-${ARCHITECTURE} /opt/nodejs && \
+    ln -s /opt/nodejs/bin/node /usr/bin/node && \
+    ln -s /opt/nodejs/bin/npm /usr/bin/npm && \
+    mkdir -p /opt/nodejs/lib/node_modules/fibers/.node-gyp /root/.node-gyp/${NODE_VERSION} /home/wekan/.config && \
+    chown wekan --recursive /home/wekan/.config && \
+    \
+    #DOES NOT WORK: paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303
+    #paxctl -mC `which node` && \
+    \
+    # Install Node dependencies. Python path for node-gyp.
+    npm install -g npm@${NPM_VERSION} && \
+    \
+    # Change user to wekan and install meteor
+    cd /home/wekan/ && \
+    chown wekan --recursive /home/wekan && \
+    echo "Starting meteor ${METEOR_RELEASE} installation...   \n" && \
+    gosu wekan:wekan curl https://install.meteor.com/ | /bin/sh && \
+    mv /root/.meteor /home/wekan/ && \
+    chown wekan --recursive /home/wekan/.meteor && \
+    \
+    sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' /home/wekan/app/packages/meteor-useraccounts-core/package.js && \
+    cd /home/wekan/.meteor && \
+    gosu wekan:wekan /home/wekan/.meteor/meteor -- help; \
+    \
+    # Build app
+    cd /home/wekan/app && \
+    mkdir -p /home/wekan/.npm && \
+    chown wekan --recursive /home/wekan/.npm /home/wekan/.config /home/wekan/.meteor && \
+    chmod u+w *.json && \
+    gosu wekan:wekan npm install && \
+    gosu wekan:wekan /home/wekan/.meteor/meteor build --directory /home/wekan/app_build && \
+    cd /home/wekan/app_build/bundle/programs/server/ && \
+    chmod u+w *.json && \
+    gosu wekan:wekan npm install && \
+    cd node_modules/fibers && \
+    node build.js && \
+    cd ../.. && \
+    # Remove legacy webbroser bundle, so that Wekan works also at Android Firefox, iOS Safari, etc.
+    rm -rf /home/wekan/app_build/bundle/programs/web.browser.legacy && \
+    mv /home/wekan/app_build/bundle /build && \
+    \
+    # Put back the original tar
+    mv $(which tar)~ $(which tar) && \
+    \
+    # Cleanup
+    apt-get remove --purge -y ${BUILD_DEPS} && \
+    apt-get autoremove -y && \
+    npm uninstall -g api2html &&\
+    rm -R /tmp/* && \
+    rm -R /var/lib/apt/lists/* && \
+    rm -R /home/wekan/.meteor && \
+    rm -R /home/wekan/app && \
+    rm -R /home/wekan/app_build && \
+    mkdir /data && \
+    chown wekan --recursive /data
+    #cat /home/wekan/python/esprima-python/files.txt | xargs rm -R && \
+    #rm -R /home/wekan/python
+    #rm /home/wekan/install_meteor.sh
 
 ENV PORT=8080
 EXPOSE $PORT
+USER wekan
 
 STOPSIGNAL SIGKILL
-WORKDIR /home/wekan/app
 
 #---------------------------------------------------------------------
 # https://github.com/wekan/wekan/issues/3585#issuecomment-1021522132
@@ -271,6 +270,6 @@ WORKDIR /home/wekan/app
 #---------------------------------------------------------------------
 #
 # CMD ["node", "/build/main.js"]
-# CMD ["bash", "-c", "ulimit -s 65500; exec node --stack-size=65500 /build/main.js"]
-# CMD ["bash", "-c", "ulimit -s 65500; exec node --stack-size=65500 --max-old-space-size=8192 /build/main.js"]
+
+#CMD ["bash", "-c", "ulimit -s 65500; exec node --stack-size=65500 /build/main.js"]
 CMD ["bash", "-c", "ulimit -s 65500; exec node /build/main.js"]

Dockerfile.arm64v8

@@ -1,18 +1,24 @@
-FROM arm64v8/ubuntu:23.04 AS builder
-#FROM amd64/alpine:latest AS builder
+FROM amd64/alpine:3.7 AS builder
 
 # Set the environment variables for builder
-ENV QEMU_VERSION=v7.2.0-1 \
+ENV QEMU_VERSION=v4.2.0-6 \
     QEMU_ARCHITECTURE=aarch64 \
     NODE_ARCHITECTURE=linux-arm64 \
-    NODE_VERSION=v14.21.4 \
+    NODE_VERSION=v14.21.3 \
     WEKAN_VERSION=latest  \
-    WEKAN_ARCHITECTURE=arm64
+    WEKAN_ARCHITECTURE=arm64 \
+    NODE_OPTIONS="--max_old_space_size=4096"
+
+#---------------------------------------------------------------------
+# https://github.com/wekan/wekan/issues/3585#issuecomment-1021522132
+# Add more Node heap:
+#   NODE_OPTIONS="--max_old_space_size=4096"
+# Add more stack:
+#   bash -c "ulimit -s 65500; exec node --stack-size=65500 main.js"
+#---------------------------------------------------------------------
 
     # Install dependencies
-#RUN apk update && apk add ca-certificates outils-sha1 && \
-RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
-RUN apt update && apt install ca-certificates wget unzip -y && \
+RUN apk update && apk add ca-certificates outils-sha1 && \
     \
     # Download qemu static for our architecture
     wget https://github.com/multiarch/qemu-user-static/releases/download/${QEMU_VERSION}/qemu-${QEMU_ARCHITECTURE}-static.tar.gz -O - | tar -xz && \
@@ -27,27 +33,23 @@ RUN apt update && apt install ca-certificates wget unzip -y && \
     unzip wekan-${WEKAN_VERSION}-${WEKAN_ARCHITECTURE}.zip && \
     \
     # Download node and shasums
-    wget https://github.com/wekan/node-v14-esm/releases/download/${NODE_VERSION}/node-${NODE_VERSION}-${NODE_ARCHITECTURE}.tar.gz && \
-    wget https://github.com/wekan/node-v14-esm/releases/download/${NODE_VERSION}/SHASUMS256.txt && \
-    #wget https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-${NODE_ARCHITECTURE}.tar.gz && \
-    #wget https://nodejs.org/dist/${NODE_VERSION}/SHASUMS256.txt.asc && \
-    #wget https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-${NODE_ARCHITECTURE}.tar.gz && \
-    #wget https://nodejs.org/dist/${NODE_VERSION}/SHASUMS256.txt.asc && \
+    wget https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-${NODE_ARCHITECTURE}.tar.gz && \
+    wget https://nodejs.org/dist/${NODE_VERSION}/SHASUMS256.txt.asc && \
     \
     # Verify nodejs authenticity
-    grep node-${NODE_VERSION}-${NODE_ARCHITECTURE}.tar.gz SHASUMS256.txt | sha256sum -c - && \
+    grep node-${NODE_VERSION}-${NODE_ARCHITECTURE}.tar.gz SHASUMS256.txt.asc | sha256sum -c - && \
     \
     # Extract node and remove tar.gz
     tar xvzf node-${NODE_VERSION}-${NODE_ARCHITECTURE}.tar.gz
 
 # Build wekan dockerfile
-FROM --platform=linux/arm64 arm64v8/ubuntu:23.04
+FROM arm64v8/ubuntu:19.10
 LABEL maintainer="wekan"
 
 # Set the environment variables (defaults where required)
 ENV QEMU_ARCHITECTURE=aarch64 \
     NODE_ARCHITECTURE=linux-arm64 \
-    NODE_VERSION=v14.21.4 \
+    NODE_VERSION=v14.21.3 \
     NODE_ENV=production \
     NPM_VERSION=latest \
     WITH_API=true \
@@ -73,21 +75,30 @@ RUN \
     ln -s /opt/nodejs/bin/node /usr/bin/node && \
     ln -s /opt/nodejs/bin/npm /usr/bin/npm && \
     mkdir -p /opt/nodejs/lib/node_modules/fibers/.node-gyp /root/.node-gyp/8.16.1 /home/wekan/.config && \
-    chown wekan --recursive /home/wekan/.config
+    chown wekan --recursive /home/wekan/.config && \
+    \
+    # Install Node dependencies
+    npm install -g npm@${NPM_VERSION} && \
+    \
+    # Install Health Check dependencies
+    apk add curl
 
-#    \
-#    # Install Node dependencies
-#    #npm install -g npm@${NPM_VERSION} && \
-#    \
-#    # Install Health Check dependencies
-#    #apk add curl
-#
-#HEALTHCHECK --start-period=30s --interval=30s --timeout=10s --retries=3 \
-#  CMD curl --fail "http://localhost:$PORT" || exit 1
+HEALTHCHECK --start-period=30s --interval=30s --timeout=10s --retries=3 \
+  CMD curl --fail "http://localhost:$PORT" || exit 1
 
 EXPOSE $PORT
 USER wekan
 
-# CMD ["bash", "-c", "ulimit -s 65500; exec node --stack-size=65500 --max-old-space-size=8192 /home/wekan/bundle/main.js"]
+#---------------------------------------------------------------------
+# https://github.com/wekan/wekan/issues/3585#issuecomment-1021522132
+# Add more Node heap:
+#   NODE_OPTIONS="--max_old_space_size=4096"
+# Add more stack:
+#   bash -c "ulimit -s 65500; exec node --stack-size=65500 main.js"
+#---------------------------------------------------------------------
+#
+#CMD ["node", "/home/wekan/bundle/main.js"]
+
+#CMD ["bash", "-c", "ulimit -s 65500; exec node --stack-size=65500 /home/wekan/bundle/main.js"]
 CMD ["bash", "-c", "ulimit -s 65500; exec node /home/wekan/bundle/main.js"]
 

Dockerfile.s390x

@@ -1,94 +0,0 @@
-FROM arm64v8/ubuntu:23.04 AS builder
-#FROM --platform=linux/amd64 amd64/ubuntu:23.04 AS builder
-#FROM --platform=linux/amd64 ghcr.io/wekan/wekan:main AS builder
-#FROM arm64v8/ubuntu:23.04 AS builder
-#FROM amd64/alpine:latest AS builder
-
-# Set the environment variables for builder
-ENV QEMU_VERSION=v7.2.0-1 \
-    QEMU_ARCHITECTURE=s390x \
-    NODE_ARCHITECTURE=linux-s390x \
-    NODE_VERSION=v14.21.4 \
-    WEKAN_VERSION=latest  \
-    WEKAN_ARCHITECTURE=s390x
-
-    # Install dependencies
-#RUN apk update && apk add ca-certificates outils-sha1 && \
-RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
-RUN apt update && apt install ca-certificates wget unzip -y && \
-    \
-    # Download qemu static for our architecture
-    wget https://github.com/multiarch/qemu-user-static/releases/download/${QEMU_VERSION}/qemu-${QEMU_ARCHITECTURE}-static.tar.gz -O - | tar -xz && \
-    \
-    # Download wekan and shasum
-    wget https://releases.wekan.team/${WEKAN_ARCHITECTURE}/wekan-${WEKAN_VERSION}-${WEKAN_ARCHITECTURE}.zip && \
-    wget https://releases.wekan.team/${WEKAN_ARCHITECTURE}/SHA256SUMS.txt && \
-    # Verify wekan
-    grep wekan-${WEKAN_VERSION}-${WEKAN_ARCHITECTURE}.zip SHA256SUMS.txt | sha256sum -c - && \
-    \
-    # Unzip wekan
-    unzip wekan-${WEKAN_VERSION}-${WEKAN_ARCHITECTURE}.zip && \
-    \
-    # Download node and shasums
-    wget https://github.com/wekan/node-v14-esm/releases/download/${NODE_VERSION}/node-${NODE_VERSION}-${NODE_ARCHITECTURE}.tar.gz && \
-    wget https://github.com/wekan/node-v14-esm/releases/download/${NODE_VERSION}/SHASUMS256.txt && \
-    #wget https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-${NODE_ARCHITECTURE}.tar.gz && \
-    #wget https://nodejs.org/dist/${NODE_VERSION}/SHASUMS256.txt.asc && \
-    #wget https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-${NODE_ARCHITECTURE}.tar.gz && \
-    #wget https://nodejs.org/dist/${NODE_VERSION}/SHASUMS256.txt.asc && \
-    \
-    # Verify nodejs authenticity
-    grep node-${NODE_VERSION}-${NODE_ARCHITECTURE}.tar.gz SHASUMS256.txt | sha256sum -c - && \
-    \
-    # Extract node and remove tar.gz
-    tar xvzf node-${NODE_VERSION}-${NODE_ARCHITECTURE}.tar.gz
-
-# Build wekan dockerfile
-FROM --platform=linux/s390x s390x/ubuntu:23.04
-LABEL maintainer="wekan"
-
-# Set the environment variables (defaults where required)
-ENV QEMU_ARCHITECTURE=s390x \
-    NODE_ARCHITECTURE=linux-s390x \
-    NODE_VERSION=v14.21.4 \
-    NODE_ENV=production \
-    NPM_VERSION=latest \
-    WITH_API=true \
-    PORT=8080 \
-    ROOT_URL=http://localhost \
-    MONGO_URL=mongodb://127.0.0.1:27017/wekan
-
-# Copy qemu-static to image
-COPY --from=builder qemu-${QEMU_ARCHITECTURE}-static /usr/bin
-
-# Copy the app to the image
-COPY --from=builder bundle /home/wekan/bundle
-
-# Copy
-COPY --from=builder node-${NODE_VERSION}-${NODE_ARCHITECTURE} /opt/nodejs
-
-RUN \
-    set -o xtrace && \
-    # Add non-root user wekan
-    useradd --user-group --system --home-dir /home/wekan wekan && \
-    \
-    # Install Node
-    ln -s /opt/nodejs/bin/node /usr/bin/node && \
-    ln -s /opt/nodejs/bin/npm /usr/bin/npm && \
-    mkdir -p /opt/nodejs/lib/node_modules/fibers/.node-gyp /root/.node-gyp/8.16.1 /home/wekan/.config && \
-    chown wekan --recursive /home/wekan/.config
-
-#    \
-#    # Install Node dependencies
-#    #npm install -g npm@${NPM_VERSION} && \
-#    \
-#    # Install Health Check dependencies
-#    #apk add curl
-#
-#HEALTHCHECK --start-period=30s --interval=30s --timeout=10s --retries=3 \
-#  CMD curl --fail "http://localhost:$PORT" || exit 1
-
-EXPOSE $PORT
-USER wekan
-
-CMD ["bash", "-c", "ulimit -s 65500; exec node /home/wekan/bundle/main.js"]

FUTURE.md

@@ -1,40 +0,0 @@
-# Future
-
-## Moved Import/Export/Sync issues to Big Picture Roadmap wiki page
-
-This change is limited to only Import/Export/Sync issues, while those are In Progress of being fixed.
-
-2023-11-21 xet7 closed 261 issues that are linked at https://github.com/wekan/wekan/wiki/Sync ,
-that is Roadmap of Import/Export/Sync in WeKan. It means, that those issues progress will be
-updated at that wiki page, when xet7 and other WeKan contributors fix those.
-Many of those issues are In Progress of being fixed and added.
-
-## Platform Updates
-
-Issues related to platforms are being closed, because only list of working platforms is mentioned now
-at WeKan website https://wekan.github.io Install section and at [ChangeLog](https://github.com/wekan/wekan/blob/main/CHANGELOG.md)
-where is this new text:
-
-> Newest WeKan at amd64 platforms: Linux bundle, Snap Candidate, Docker, Kubernetes. Fixing other platforms In Progress. 
-
-Platform support changes often, because:
-
-- There are many dependencies, that update or break or change often
-- Node.js segfaults at some CPU/OS
-- Some platforms have build errors
-
-Roadmap is to update all existing platforms, and add more platforms.
-
-Upcoming platform upgrades:
-
-- Fix migrations, so that newest WeKan can be released to Snap Stable. (Currently newest is at Snap Candidate).
-
-## WeKan features
-
-Most Meteor WeKan features are listed here:
-
-https://github.com/wekan/wekan/wiki/Deep-Dive-Into-WeKan
-
-Remaining features and all changes are listed here:
-
-https://github.com/wekan/wekan/blob/main/CHANGELOG.md

GOVERNANCE.md

@@ -1,10 +0,0 @@
-# Governance
-
-Anyone can send pull request to https://github.com/wekan/wekan/wiki/pulls ,
-if there is permission to add code to WeKan with MIT license.
-
-As maintainer, xet7 checks all pull requests and merges them.
-
-Only xet7 has write access to repo https://github.com/wekan/wekan
-
-

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2024 The Wekan Team
+Copyright (c) 2014-2019 The Wekan Team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -2,34 +2,23 @@
 
 # WeKan ® - Open Source kanban
 
-## Downloads
-
-https://wekan.github.io / Install WeKan ® Server
-
 ## Docker Containers
 
-- [GitHub](https://github.com/wekan/wekan/pkgs/container/wekan)
 - [Quay](https://quay.io/repository/wekan/wekan)
 - [Docker Hub](https://hub.docker.com/r/wekanteam/wekan)
 
-docker-compose.yml at https://github.com/wekan/wekan/blob/main/docker-compose.yml
-
-## Standards
-
-- [WeKan and Standard for Public Code](https://wekan.github.io/standard-for-public-code/) assessment was made at 2023-11.
-  Currently Wekan meets 8 out of 16 criteria out of the box.
-  Some others could be met with small changes.
+Other platforms and compatible software versions at https://wekan.github.io Download section.
 
 ## Code stats
 
-- [CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/4619)
 - [Code Climate](https://codeclimate.com/github/wekan/wekan)
 - [Open Hub](https://www.openhub.net/p/wekan)
 - [OSS Insight](https://ossinsight.io/analyze/wekan/wekan)
+- [CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/4619)
 
 ## [Translate WeKan ® at Transifex](https://app.transifex.com/wekan/)
 
-Translations to non-English languages are accepted only at [Transifex](https://app.transifex.com/wekan/wekan) using webbrowser.
+Translations to non-English languages are accepted only at [Transifex](https://app.transifex.com/wekan/) using webbrowser.
 New English strings of new features can be added as PRs to master branch file wekan/imports/i18n/data/en.i18n.json .
 
 ## [WeKan ® feature requests and bugs](https://github.com/wekan/wekan/issues)
@@ -81,14 +70,14 @@ that by providing one-click installation on various platforms.
   [Mac](https://github.com/wekan/wekan/wiki/Mac) / [Windows](https://github.com/wekan/wekan/wiki/Install-Wekan-from-source-on-Windows).
   [More Platforms](https://github.com/wekan/wekan/wiki/Platforms), bundle for RasPi3 ARM and other CPUs where Node.js and MongoDB exists.
 - 1 GB RAM minimum free for WeKan ®. Production server should have minimum total 4 GB RAM.
-  For thousands of users, for example with [Docker](https://github.com/wekan/wekan/blob/main/docker-compose.yml): 3 frontend servers,
+  For thousands of users, for example with [Docker](https://github.com/wekan/wekan/blob/master/docker-compose.yml): 3 frontend servers,
   each having 2 CPU and 2 wekan-app containers. One backend wekan-db server with many CPUs.
 - Enough disk space and alerts about low disk space. If you run out disk space, MongoDB database gets corrupted.
 - SECURITY: Updating to newest WeKan ® version very often. Please check you do not have automatic updates of Sandstorm or Snap turned off.
   Old versions have security issues because of old versions Node.js etc. Only newest WeKan ® is supported.
   WeKan ® on Sandstorm is not usually affected by any Standalone WeKan ® (Snap/Docker/Source) security issues.
 - [Reporting all new bugs immediately](https://github.com/wekan/wekan/issues).
-  New features and fixes are added to WeKan ® [many times a day](https://github.com/wekan/wekan/blob/main/CHANGELOG.md).
+  New features and fixes are added to WeKan ® [many times a day](https://github.com/wekan/wekan/blob/master/CHANGELOG.md).
 - [Backups](https://github.com/wekan/wekan/wiki/Backup) of WeKan ® database once a day miminum.
   Bugs, updates, users deleting list or card, harddrive full, harddrive crash etc can eat your data. There is no undo yet.
   Some bug can cause WeKan ® board to not load at all, requiring manual fixing of database content.
@@ -100,21 +89,13 @@ that by providing one-click installation on various platforms.
 [Developer Documentation][dev_docs]
 
 - There is many companies and individuals contributing code to WeKan ®, to add features and bugfixes
-  [many times a day](https://github.com/wekan/wekan/blob/main/CHANGELOG.md).
+  [many times a day](https://github.com/wekan/wekan/blob/master/CHANGELOG.md).
 - [Please add Add new Feature Requests and Bug Reports immediately](https://github.com/wekan/wekan/issues).
 - [Commercial Support](https://wekan.team/commercial-support/).
 
 We also welcome sponsors for features and bugfixes.
 By working directly with WeKan ® you get the benefit of active maintenance and new features added by growing WeKan ® developer community.
 
-## Getting Started with Development
-
-The default branch uses [Meteor 2 with Node.js 14](https://wekan.github.io/install/).
-
-To contribute, [create a fork](https://github.com/wekan/wekan/wiki/Emoji#2-create-fork-of-httpsgithubcomwekanwekan-at-github-web-page) and run `./rebuild-wekan.sh` (or `./rebuild-wekan.bat` on Windows) as detailed [here](https://github.com/wekan/wekan/wiki/Emoji#3-select-option-1-to-install-dependencies-and-then-enter). Once you're ready, please test your code and [submit a pull request (PR)](https://github.com/wekan/wekan/wiki/Emoji#7-test).
-
-Please refer to the [developer documentation](https://github.com/wekan/wekan/wiki/Developer-Documentation) for more information.
-
 ## Screenshot
 
 [More screenshots at Features page](https://github.com/wekan/wekan/wiki/Features)
@@ -128,7 +109,7 @@ with [Meteor](https://www.meteor.com).
 
 [platforms]: https://github.com/wekan/wekan/wiki/Platforms
 [dev_docs]: https://github.com/wekan/wekan/wiki/Developer-Documentation
-[screenshot_wekan]: https://wekan.github.io/wekan-dark-mode.png
+[screenshot_wekan]: https://wekan.github.io/wekan-markdown.png
 [features]: https://github.com/wekan/wekan/wiki/Features
 [roadmap_wekan]: https://boards.wekan.team/b/D2SzJKZDS4Z48yeQH/wekan-open-source-kanban-board-with-mit-license
 [wekan_issues]: https://github.com/wekan/wekan/issues

READMELoginSignUp.md

@@ -1,113 +0,0 @@
-# 🔐 WeKan — Login System Overview
-
-This document provides a detailed overview of WeKan’s **login and authentication system**, covering client-side UI, server-side logic, external authentication methods, and potential upgrade paths.
-
----
-
-## 🖥️ Login Web UI
-
-WeKan's login interface is implemented using a combination of:
-
-- `layouts.jade` – Login HTML structure
-- `layouts.js` – Login logic and interactivity
-- `layouts.css` – Styling and layout
-
-📁 Source: [`client/components/main`](https://github.com/wekan/wekan/tree/main/client/components/main)
-
----
-
-## ⚙️ Server-Side Authentication
-
-Server-side login functionality is handled in:
-
-- [`server/authentication.js`](https://github.com/wekan/wekan/blob/main/server/authentication.js)
-
-Other related configurations:
-
-- 🔧 Account config: [`config/accounts.js`](https://github.com/wekan/wekan/blob/main/config/accounts.js)
-- 📨 Sign-up invitations: [`models/settings.js#L275`](https://github.com/wekan/wekan/blob/main/models/settings.js#L275)
-- 👤 User creation logic: [`models/users.js#L1339`](https://github.com/wekan/wekan/blob/main/models/users.js#L1339)
-
----
-
-## 👥 Meteor User Accounts
-
-WeKan utilizes Meteor’s `accounts` system. Relevant resources:
-
-- 📚 Meteor 2.x Accounts Docs: [v2-docs.meteor.com/api/accounts](https://v2-docs.meteor.com/api/accounts)
-- 🔍 Meteor Packages:
-  - [`packages`](https://github.com/wekan/wekan/blob/main/.meteor/packages)
-  - [`versions`](https://github.com/wekan/wekan/blob/main/.meteor/versions)
-- 📦 Meteor 2.14 core packages: [Meteor 2.14 packages](https://github.com/meteor/meteor/tree/release/METEOR%402.14/packages)
-
----
-
-## 🔐 External Authentication (OIDC, LDAP, etc.)
-
-WeKan supports external authentication methods via internal packages.
-
-📁 See [`packages/`](https://github.com/wekan/wekan/tree/main/packages) for:
-- OpenID Connect (OIDC)
-- LDAP
-- OAuth and other integrations
-
----
-
-## 📦 NPM & AtmosphereJS Dependencies
-
-- 🔗 `package.json`: [Dependencies list](https://github.com/wekan/wekan/blob/main/package.json)
-- 🧩 WekanTeam scoped NPM packages: [@wekanteam on npm](https://www.npmjs.com/search?q=%40wekanteam)
-- ☁️ AtmosphereJS Meteor packages: [atmospherejs.com](https://atmospherejs.com)
-
----
-
-## 🚧 Meteor Version & Upgrade Notes
-
-- 📌 Current Version: **Meteor 2.14**
-  - [`.meteor/release`](https://github.com/wekan/wekan/blob/main/.meteor/release)
-- 🔧 Maintained with only **critical fixes** until ~Summer 2025
-- 🚀 Migration to **Meteor 3** or a new framework is under consideration
-
-📘 Meteor 3 API: [docs.meteor.com/api/accounts](https://docs.meteor.com/api/accounts)
-
----
-
-## 🧪 Prototypes & Examples
-
-### 🐘 PHP Prototype Sign-Up
-
-Used in experimental versions:
-
-- Step 1: [`sign-up1.php`](https://github.com/wekan/php/blob/main/page/sign-up1.php)
-- Step 2: [`sign-up2.php`](https://github.com/wekan/php/blob/main/page/sign-up2.php)
-- Main entry: [`index.php#L72-L83`](https://github.com/wekan/php/blob/main/public/index.php#L72-L83)
-
----
-
-### 🎨 WeKan Studio Prototype
-
-Sign-up logic in the **WeKan Studio** version:
-
-- [`signUp.fmt`](https://github.com/wekan/wekanstudio/blob/main/srv/templates/login/signUp.fmt)
-
----
-
-## 📎 Future Considerations
-
-- Upgrading to **Meteor 3.x**
-- Refactoring frontend logic to fix translation rendering order
-- Exploring **simplified authentication systems** in future prototypes
-
----
-
-## 🔗 Project Links
-
-- 🔧 Main Repo: [github.com/wekan/wekan](https://github.com/wekan/wekan)
-- 🌐 Website: [wekan.github.io](https://wekan.github.io)
-- 📚 Documentation: [Wekan Wiki](https://github.com/wekan/wekan/wiki)
-
----
-
-
-
----

SECURITY.md

@@ -1,7 +1,6 @@
-About money, see [CONTRIBUTING.md](CONTRIBUTING.md)
-
 Security is very important to us. If you discover any issue regarding security, please disclose
-the information responsibly by sending an email to security@wekan.team and not by
+the information responsibly by sending an email to support (at) wekan.team using
+[this PGP public key](support-at-wekan.team_pgp-publickey.asc) and not by
 creating a GitHub issue. We will respond swiftly to fix verifiable security issues.
 
 We thank you with a place at our hall of fame page, that is
@@ -30,7 +29,7 @@ added to the Wekan Hall of Fame.
 ## Which domains are in scope?
 
 No public domains, because all those are donated to Wekan Open Source project,
-and we don't have any permissions to do security scans on those donated servers.
+and we don't have any permissions to do security scans on those donated servers
 
 Please don't perform research that could impact other users. Secondly, please keep
 the reports short and succinct. If we fail to understand the logics of your bug, we will tell you.
@@ -49,132 +48,31 @@ like Snap and Docker have their own specific sandboxing etc features.
 
 Standalone Wekan by default does not load any files from Internet, like fonts, CSS, etc.
 This also means all Standalone Wekan functionality works in offline local networks.
-WeKan is used at most countries of the world https://snapcraft.io/wekan
-and by by companies that have 30k users.
+Wekan is used by companies that have [thousands of users](https://github.com/wekan/wekan/wiki/AWS) and at healthcare.
 
-- Wekan private board attachments are not accessible without logging in.
-- There is feature to set board public, so that board is visible without logging in in readonly mode, with realtime updates.
-- Admin Panel has feature to disable all public boards, so all boards are private.
+Wekan uses xss package for input fields like cards, as you can see from
+[package.json](https://github.com/wekan/wekan/blob/master/package.json). Other used versions can be seen from
+[Meteor versions file](https://github.com/wekan/wekan/blob/master/.meteor/versions).
+Forms can include markdown links, html, image tags etc like you see at https://wekan.github.io .
+It's possible to add attachments to cards, and markdown/html links to files.
 
-## SSL/TLS
+Wekan attachments are not accessible without logging in. Import from Trello works by copying
+Trello export JSON to Wekan Trello import page, and in Trello JSON file there is direct links to all publicly
+accessible Trello attachment files, that Standalone Wekan downloads directly to Wekan MongoDB database in
+[CollectionFS](https://github.com/wekan/wekan/pull/875) format. When Wekan board is exported in
+Wekan JSON format, all board attachments are included in Wekan JSON file as base64 encoded text.
+That Wekan JSON format file can be imported to Sandstorm Wekan with all the attachments, when we get
+latest Wekan version working on Sandstorm, only couple of bugs are left before that. In Sandstorm it's not
+possible yet to import from Trello with attachments, because Wekan does not implement Sandstorm-compatible
+access to outside of Wekan grain.
 
-- SSL/TLS encrypts traffic between webbrowser and webserver.
-- If you are thinking about TLS MITM, look at https://github.com/caddyserver/caddy/issues/2530
-- Let's Encrypt TLS requires publicly accessible webserver, that Let's Encrypt TLS validation servers check.
-- If firewall limits to only allowed IP addresses, you may need non-Let's Encrypt TLS cert.
-- For On Premise:
-  - https://caddyserver.com/docs/automatic-https#local-https
-  - https://github.com/wekan/wekan/wiki/Caddy-Webserver-Config
-  - https://github.com/wekan/wekan/wiki/Azure
-  - https://github.com/wekan/wekan/wiki/Traefik-and-self-signed-SSL-certs
+Standalone Wekan only has password auth currently, there is work in progress to add
+[oauth2](https://github.com/wekan/wekan/pull/1578), [Openid](https://github.com/wekan/wekan/issues/538),
+[LDAP](https://github.com/wekan/wekan/issues/119) etc. If you need more login security for Standalone Wekan now,
+it's possible add additional [Google Auth proxybouncer](https://github.com/wekan/wekan/wiki/Let's-Encrypt-and-Google-Auth) in front of password auth, and then use Google Authenticator for Google Auth. Standalone Wekan does have [brute force protection with eluck:accounts-lockout and browser-policy clickjacking protection](https://github.com/wekan/wekan/blob/master/CHANGELOG.md#v080-2018-04-04-wekan-release). You can also optionally use some [WAF](https://en.wikipedia.org/wiki/Web_application_firewall)
+like for example [AWS WAF](https://aws.amazon.com/waf/).
 
-## XSS
-
-- Dompurify https://www.npmjs.com/package/dompurify
-  - WeKan uses dompurify npm package to filter for XSS at fields like cards, as you can see from
-    [package.json](https://github.com/wekan/wekan/blob/main/package.json). Other used versions can be seen from
-    [Meteor versions file](https://github.com/wekan/wekan/blob/main/.meteor/versions).
-  - Forms can include markdown links, html, image tags etc like you see at https://wekan.github.io .
-  - It's possible to add attachments to cards, and markdown/html links to files.
-  - Dompurify cleans up viewed code, so Javascript in input fields does not execute
-    - https://wekan.github.io/hall-of-fame/fieldbleed/
-- Reaction in comment is now checked, that it does not have extra added code
-  - https://wekan.github.io/hall-of-fame/reactionbleed/
-- https://github.com/wekan/wekan/blob/main/packages/markdown/src/template-integration.js#L76
-
-## QA about PubSub
-
-Q:
-
-Hello,
-I have just seen the Meteor DevTools Evolved extension and was wondering if anyone had asked themselves the question of security.
-Insofar as all data is shown in the minimongo tab in plain text.
-How can data be hidden from this extension?
-
-A:
-
-## PubSub
-
-- It is not security issue to show some text or image, that user has permission to see. It is a security issue, if browserside is some text or image that user should not see.
-- Meteor has browserside minimongo database, made with Javascript, updated with Publish/Subscribe, PubSub.
-- Publish/Subscribe means, that realtime web framework reads database changes stream, and then immediately updates webpage,
-  like like dashboards, chat, kanban. That is the point in any realtime web framework in any programming language.
-- Yes, you should check with Meteor DevTools Evolved Chromium/Firefox extension that at minimongo is only text that user has permission to see.
-- Do checking as logged in user, and logged out user.
-- Check permissions and sanitize before allowing some change, because someone could modify content of input field,
-  PubSub/websocket data (for example with Burp Suite Community Edition), etc.
-- If you have REST API, also check that only those that have login token, and have permission, can view or edit text
-- You should not include any data user is not allowed to see. Not to webpage text, not to websockets/PubSub, etc.
-- Minimongo should not have password hashes PubSub https://wekan.github.io/hall-of-fame/userbleed/
-- PubSub uses Websockets, so you need those to be enabled at webserver like Caddy/Nginx/Apache etc, examples of settings
-  at right menu of https://github.com/wekan/wekan/wiki
-- Clientside https://github.com/wekan/wekan/tree/main/client/components subscribes to 
-  PubSub https://github.com/wekan/wekan/tree/main/server/publications or calls meteor methods at https://github.com/wekan/wekan/tree/main/models
-- For Admin:
-  - You can have input field for password https://github.com/wekan/wekan/blob/main/client/components/cards/attachments.js#L303-L312
-  - You can save password to database https://github.com/wekan/wekan/blob/main/client/components/cards/attachments.js#L303-L312
-  - Check that only current user or Admin can change password https://github.com/wekan/wekan/blob/main/client/components/cards/attachments.js#L303-L312
-    - Note that currentUser uses code like Meteor.user() in .js file
-  - Do not have password hashes in PubSub https://github.com/wekan/wekan/blob/main/server/publications/users.js
-  - Only show Admin Panel to Admin https://github.com/wekan/wekan/blob/main/client/components/settings/settingBody.jade#L3
-- If there is a lot of data, use pagination https://github.com/wekan/wekan/blob/main/client/components/settings/peopleBody.js
-- Only have limited amount of data published in PubSub. Limit in MongoDB query in publications how much is published. Too much could make browser too slow.
-- Use Environment variables for any email etc passwords.
-- But what if you would like to remove minimongo? And only use Meteor methods for saving? In that case, you don't have realtime updates,
-  and you need to write much more code to load and save data yourself, handle any multi user data saving conflicts yourself,
-  and many Meteor Atmospherejs.com PubSub using packages would not work anymore https://github.com/wekan/we
-
-## PubSub: Fix that user can not change to Admin
-
-- With PubSub, there is checking, that someone modifying Websockets content, like permission isAdmin, can not change to Admin.
-- https://github.com/wekan/wekan/commit/cbad4cf5943d47b916f64b4582f8ca76a9dfd743
-- https://wekan.github.io/hall-of-fame/adminbleed/
-
-## Permissions and Roles
-
-- For any user permissions, it's best to use Meteor package package https://github.com/Meteor-Community-Packages/meteor-roles .
-- Currently WeKan has custom hardcoded permissions, WeKan does not yet use that meteor-roles package.
-  - Using permissions at WeKan sidebar https://github.com/wekan/wekan/blob/main/client/components/sidebar/sidebar.js#L1854-L1875
-  - List of roles https://github.com/wekan/wekan/wiki/REST-API-Role . Change at board or Admin Panel. Also Organizations/Teams.
-  - Worker role: https://github.com/wekan/wekan/issues/2788
-  - Not implemented yet: Granular Roles https://github.com/wekan/wekan/issues/3022
-- Check is user logged in, with `if (Meteor.user()) {`
-- Check is code running at server `if (Meteor.isServer()) {` or client `if Meteor.isClient()) {` .
-- Here is some authentication code https://github.com/wekan/wekan/blob/main/server/authentication.js
-
-## Environment variables
-
-- For any passwords, use environment variables, those are serverside
-- Do not copy environment variable to public variable that is visible browserside https://github.com/wekan/wekan/blob/main/server/max-size.js
-
-```
-Meteor.startup(() => {
-  if (process.env.HEADER_LOGIN_ID) {
-    Meteor.settings.public.attachmentsUploadMaxSize   = process.env.ATTACHMENTS_UPLOAD_MAX_SIZE;
-    Meteor.settings.public.attachmentsUploadMimeTypes = process.env.ATTACHMENTS_UPLOAD_MIME_TYPES;
-    Meteor.settings.public.avatarsUploadMaxSize       = process.env.AVATARS_UPLOAD_MAX_SIZE;
-```
-
-- For serverside, you can set Meteor.settings.variablename, without text public
-- For WeKan kanban, there is feature for setting board public, it can be viewed by anyone, there is realtime updates. But 
-- Some of those permissions are checked at users.js models at https://github.com/wekan/wekan/tree/main/models
-- Environment variables are used for email server passwords, etc, at all platforms https://github.com/wekan/wekan/commit/a781c0e7dcfdbe34c1483ee83cec12455b7026f7
-
-## Escape HTML comment tags so that HTML comments are visible
-
-- Someone reported, that it is problem that content of HTML comments in edit mode, are not visible at at view mode, so this makes HTML comments visible.
-- https://github.com/wekan/wekan/commit/167863d95711249e69bb3511175d73b34acbbdb3
-- https://wekan.github.io/hall-of-fame/invisiblebleed/
-
-## Attachments: XSS in filename is sanitized
-
-- https://github.com/wekan/wekan/blob/main/client/components/cards/attachments.js#L303-L312
-- https://wekan.github.io/hall-of-fame/filebleed/
-
-## Brute force login protection
-
-- https://github.com/wekan/wekan/commit/23e5e1e3bd081699ce39ce5887db7e612616014d
-- https://github.com/wekan/wekan/tree/main/packages/wekan-accounts-lockout
+[All Wekan Platforms](https://github.com/wekan/wekan/wiki/Platforms)
 
 ### Sandstorm Wekan Security
 
@@ -207,6 +105,12 @@ a security issue, we'd like to know about it, and also how to fix it:
 
 Typical already known or "no impact" bugs such as:
 
+- Brute force password guessing. Currently there is
+  [brute force protection with eluck:accounts-lockout](https://github.com/wekan/wekan/blob/master/CHANGELOG.md#v080-2018-04-04-wekan-release).
+- Security issues related to that Wekan uses Meteor 1.6.0.1 related packages, and upgrading to newer
+  Meteor 1.6.1 is complicated process that requires lots of changes to many dependency packages.
+  Upgrading [has been tried many times, spending a lot of time](https://github.com/meteor/meteor/issues/9609)
+  but there still is issues. Helping with package upgrades is very welcome.
 - [Wekan API old tokens not replaced correctly](https://github.com/wekan/wekan/issues/1437)
 - Missing Cookie flags on non-session cookies or 3rd party cookies
 - Logout CSRF
@@ -217,7 +121,7 @@ Typical already known or "no impact" bugs such as:
 - Email spoofing, SPF, DMARC & DKIM. Wekan does not include email server.
 
 Wekan is Open Source with MIT license, and free to use also for commercial use.
-We welcome all fixes to improve security by email to security@wekan.team
+We welcome all fixes to improve security by email to security (at) wekan.team .
 
 ## Bonus Points
 

Stackerfile.yml

@@ -1,5 +1,5 @@
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v7.85.0"
+appVersion: "v6.99.6"
 files:
   userUploads:
     - README.md

api.py

@@ -37,24 +37,9 @@ If *nix:  chmod +x api.py => ./api.py users
     python3 api.py customfields BOARDID # Custom Fields of BOARDID
     python3 api.py customfield BOARDID CUSTOMFIELDID # Info of CUSTOMFIELDID
     python3 api.py addcustomfieldtoboard AUTHORID BOARDID NAME TYPE SETTINGS SHOWONCARD AUTOMATICALLYONCARD SHOWLABELONMINICARD SHOWSUMATTOPOFLIST # Add Custom Field to Board
-    python3 api.py editcustomfield BOARDID LISTID CARDID CUSTOMFIELDID NEWCUSTOMFIELDVALUE # Edit Custom Field
+    python3 api.py editcustomfield BOARDID LISTID CARDID CUSTOMFIELDID NEWCUSTOMFIELDVALUE
     python3 api.py listattachments BOARDID # List attachments
-    python3 api.py cardsbyswimlane SWIMLANEID LISTID # Retrieve cards list on a swimlane
-    python3 api.py getcard BOARDID LISTID CARDID # Get card info
-    python3 api.py addlabel BOARDID LISTID CARDID LABELID # Add label to a card
-    python3 api.py addcardwithlabel AUTHORID BOARDID SWIMLANEID LISTID CARDTITLE CARDDESCRIPTION LABELIDS # Add a card and a label
-    python3 api.py editboardtitle BOARDID NEWBOARDTITLE # Edit board title
-    python3 api.py copyboard BOARDID NEWBOARDTITLE # Copy a board
-    python3 api.py createlabel BOARDID LABELCOLOR LABELNAME (Color available: `white`, `green`, `yellow`, `orange`, `red`, `purple`, `blue`, `sky`, `lime`, `pink`, `black`, `silver`, `peachpuff`, `crimson`, `plum`, `darkgreen`, `slateblue`, `magenta`, `gold`, `navy`, `gray`, `saddlebrown`, `paleturquoise`, `mistyrose`, `indigo`) # Create a new label
-    python3 api.py editcardcolor BOARDID LISTID CARDID COLOR (Color available: `white`, `green`, `yellow`, `orange`, `red`, `purple`, `blue`, `sky`, `lime`, `pink`, `black`, `silver`, `peachpuff`, `crimson`, `plum`, `darkgreen`, `slateblue`, `magenta`, `gold`, `navy`, `gray`, `saddlebrown`, `paleturquoise`, `mistyrose`, `indigo`) # Edit card color
-    python3 api.py addchecklist BOARDID CARDID TITLE ITEM1 ITEM2 ITEM3 ITEM4 (You can add multiple items or just one, or also without any item, just TITLE works as well. * If items or Title contains spaces, you should add ' between them.) # Add checklist + item on a card
-    python3 api.py deleteallcards BOARDID SWIMLANEID ( * Be careful will delete ALL CARDS INSIDE the swimlanes automatically in every list * ) # Delete all cards on a swimlane
-    python3 api.py checklistid BOARDID CARDID # Retrieve Checklist ID attached to a card
-    python3 api.py checklistinfo BOARDID CARDID CHECKLISTID # Get checklist info
-    python3 api.py get_list_cards_count BOARDID LISTID # Retrieve how many cards in a list
-    python3 api.py get_board_cards_count BOARDID # Retrieve how many cards in a board
 
-    
   Admin API:
     python3 api.py users                # All users
     python3 api.py boards               # All Public Boards
@@ -194,52 +179,6 @@ if arguments == 10:
         print(body.text)
         # ------- ADD CUSTOM FIELD TO BOARD END -----------
 
-if arguments == 8:
-
-    if sys.argv[1] == 'addcardwithlabel':
-        # ------- ADD CARD WITH LABEL START -----------
-        authorid = sys.argv[2]
-        boardid = sys.argv[3]
-        swimlaneid = sys.argv[4]
-        listid = sys.argv[5]
-        cardtitle = sys.argv[6]
-        carddescription = sys.argv[7]
-        labelIds = sys.argv[8]  # Aggiunto labelIds
-
-        cardtolist = wekanurl + apiboards + boardid + s + l + s + listid + s + cs
-        # Add card
-        headers = {'Accept': 'application/json', 'Authorization': 'Bearer {}'.format(apikey)}
-        post_data = {
-            'authorId': '{}'.format(authorid),
-            'title': '{}'.format(cardtitle),
-            'description': '{}'.format(carddescription),
-            'swimlaneId': '{}'.format(swimlaneid),
-            'labelIds': labelIds
-        }
-
-        body = requests.post(cardtolist, data=post_data, headers=headers)
-        print(body.text)
-
-        # If ok id card
-        if body.status_code == 200:
-            card_data = body.json()
-            new_card_id = card_data.get('_id')
-
-            # Updating card
-            if new_card_id:
-                edcard = wekanurl + apiboards + boardid + s + l + s + listid + s + cs + s + new_card_id
-                put_data = {'labelIds': labelIds}
-                body = requests.put(edcard, data=put_data, headers=headers)
-                print("=== EDIT CARD ===\n")
-                body = requests.get(edcard, headers=headers)
-                data2 = body.text.replace('}', "}\n")
-                print(data2)
-            else:
-                print("Error obraining ID.")
-        else:
-            print("Error adding card.")
-        # ------- ADD CARD WITH LABEL END -----------
-
 if arguments == 7:
 
     if sys.argv[1] == 'addcard':
@@ -298,53 +237,7 @@ if arguments == 6:
         print(data2)
         # ------- EDIT CUSTOMFIELD END -----------
 
-if arguments == 5:
-
-    if sys.argv[1] == 'addlabel':
-
-        # ------- EDIT CARD ADD LABEL START -----------
-        boardid = sys.argv[2]
-        listid = sys.argv[3]
-        cardid = sys.argv[4]
-        labelIds = sys.argv[5]
-        edcard = wekanurl + apiboards + boardid + s + l + s + listid + s + cs + s + cardid
-        print(edcard)
-        headers = {'Accept': 'application/json', 'Authorization': 'Bearer {}'.format(apikey)}
-        put_data = {'labelIds': labelIds}
-        body = requests.put(edcard, data=put_data, headers=headers)
-        print("=== ADD LABEL ===\n")
-        body = requests.get(edcard, headers=headers)
-        data2 = body.text.replace('}',"}\n")
-        print(data2)
-        # ------- EDIT CARD ADD LABEL END -----------
-
-    if sys.argv[1] == 'editcardcolor':
-        # ------- EDIT CARD COLOR START -----------
-        boardid = sys.argv[2]
-        listid = sys.argv[3]
-        cardid = sys.argv[4]
-        newcolor = sys.argv[5]  
-
-        valid_colors = ['white', 'green', 'yellow', 'orange', 'red', 'purple', 'blue', 'sky', 'lime', 'pink', 'black',
-                    'silver', 'peachpuff', 'crimson', 'plum', 'darkgreen', 'slateblue', 'magenta', 'gold', 'navy',
-                    'gray', 'saddlebrown', 'paleturquoise', 'mistyrose', 'indigo']
-
-        if newcolor not in valid_colors:
-            print("Invalid color. Choose a color from the list.")
-            sys.exit(1)
-
-        edcard = wekanurl + apiboards + boardid + s + l + s + listid + s + cs + s + cardid
-        print(edcard)
-        headers = {'Accept': 'application/json', 'Authorization': 'Bearer {}'.format(apikey)}
-        put_data = {'color': '{}'.format(newcolor)}  
-        body = requests.put(edcard, data=put_data, headers=headers)
-        print("=== EDIT CARD COLOR ===\n")
-        body = requests.get(edcard, headers=headers)
-        data2 = body.text.replace('}', "}\n")
-        print(data2)
-        # ------- EDIT CARD COLOR END -----------
-
-if arguments >= 4:
+if arguments == 4:
 
     if sys.argv[1] == 'newuser':
 
@@ -358,155 +251,9 @@ if arguments >= 4:
         print("=== CREATE NEW USER ===\n")
         print(body.text)
         # ------- CREATE NEW USER END -----------
-        
-    if sys.argv[1] == 'getcard':
-
-        # ------- LIST OF CARD START -----------
-        boardid = sys.argv[2]
-        listid = sys.argv[3]
-        cardid = sys.argv[4]
-        listone = wekanurl + apiboards + boardid + s + l + s + listid + s + cs + s + cardid
-        headers = {'Accept': 'application/json', 'Authorization': 'Bearer {}'.format(apikey)}
-        print("=== INFO OF ONE LIST ===\n")
-        print("URL:", listone)  # Stampa l'URL per debug
-        try:
-            response = requests.get(listone, headers=headers)
-            print("=== RESPONSE ===\n")
-            print("Status Code:", response.status_code)  # Stampa il codice di stato per debug
-
-            if response.status_code == 200:
-                data2 = response.text.replace('}', "}\n")
-                print(data2)
-            else:
-                print(f"Error: {response.status_code}")
-                print(f"Response: {response.text}")
-        except Exception as e:
-            print(f"Error in the GET request: {e}")
-        # ------- LISTS OF CARD END -----------
-
-    if sys.argv[1] == 'createlabel':
-
-        # ------- CREATE LABEL START -----------
-        boardid = sys.argv[2]
-        labelcolor = sys.argv[3]
-        labelname = sys.argv[4]
-        label_url = wekanurl + apiboards + boardid + s + 'labels'
-        print(label_url)
-        headers = {'Accept': 'application/json', 'Authorization': 'Bearer {}'.format(apikey)}
-        # Object to send
-        put_data = {'label': {'color': labelcolor, 'name': labelname}}
-        print("URL:", label_url)
-        print("Headers:", headers)
-        print("Data:", put_data)
-        try:
-          response = requests.put(label_url, json=put_data, headers=headers)
-          print("=== CREATE LABELS ===\n")
-          print("Response Status Code:", response.status_code)
-          print("Response Text:", response.text)
-        except Exception as e:
-          print("Error:", e)
-        # ------- CREATE LABEL END -----------
-
-    if sys.argv[1] == 'addchecklist':
-
-        # ------- ADD CHECKLIST START -----------
-        board_id = sys.argv[2]
-        card_id = sys.argv[3]
-        checklist_title = sys.argv[4]
-
-        # Aggiungi la checklist
-        checklist_url = wekanurl + apiboards + board_id + s + cs + s + card_id + '/checklists'
-        headers = {'Accept': 'application/json', 'Authorization': 'Bearer {}'.format(apikey)}
-        data = {'title': checklist_title}
-
-        response = requests.post(checklist_url, data=data, headers=headers)
-        response.raise_for_status()
-
-        result = json.loads(response.text)
-        checklist_id = result.get('_id')
-
-        print(f"Checklist '{checklist_title}' created. ID: {checklist_id}")
-
-        # Aggiungi gli items alla checklist
-        items_to_add = sys.argv[5:]  
-        for item_title in items_to_add:
-            checklist_item_url = wekanurl + apiboards + board_id + s + cs + s + card_id + s + 'checklists' + s + checklist_id + '/items'
-            item_data = {'title': item_title}
-
-            item_response = requests.post(checklist_item_url, data=item_data, headers=headers)
-            item_response.raise_for_status()
-
-            item_result = json.loads(item_response.text)
-            checklist_item_id = item_result.get('_id')
-
-            print(f"Item '{item_title}' added. ID: {checklist_item_id}")
-
-    if sys.argv[1] == 'checklistinfo':
-
-        # ------- ADD CHECKLIST START -----------
-        board_id = sys.argv[2]
-        card_id = sys.argv[3]
-        checklist_id = sys.argv[4]
-        checklist_url = wekanurl + apiboards + board_id + s + cs + s + card_id + '/checklists' + s + checklist_id
-        headers = {'Accept': 'application/json', 'Authorization': 'Bearer {}'.format(apikey)}
-        response = requests.get(checklist_url, headers=headers)
-
-        response.raise_for_status()
-
-        checklist_info = response.json()
-        print("Checklist Info:")
-        print(checklist_info)
 
 if arguments == 3:
 
-    if sys.argv[1] == 'editboardtitle':
-
-        # ------- EDIT BOARD TITLE START -----------
-        boardid = sys.argv[2]
-        boardtitle = sys.argv[3]
-        edboardtitle = wekanurl + apiboards + boardid + s + 'title'
-        print(edboardtitle)
-        headers = {'Accept': 'application/json', 'Authorization': 'Bearer {}'.format(apikey)}
-
-        post_data = {'title': boardtitle}
-
-        body = requests.put(edboardtitle, json=post_data, headers=headers)
-        print("=== EDIT BOARD TITLE ===\n")
-        #body = requests.get(edboardtitle, headers=headers)
-        data2 = body.text.replace('}',"}\n")
-        print(data2)
-        if body.status_code == 200:
-            print("Succesfull!")
-        else:
-            print(f"Error: {body.status_code}")
-            print(body.text)
-
-        # ------- EDIT BOARD TITLE END -----------
-
-    if sys.argv[1] == 'copyboard':
-
-        # ------- COPY BOARD START -----------
-        boardid = sys.argv[2]
-        boardtitle = sys.argv[3]
-        edboardcopy = wekanurl + apiboards + boardid + s + 'copy'
-        print(edboardcopy)
-        headers = {'Accept': 'application/json', 'Authorization': 'Bearer {}'.format(apikey)}
-
-        post_data = {'title': boardtitle}
-
-        body = requests.post(edboardcopy, json=post_data, headers=headers)
-        print("=== COPY BOARD ===\n")
-        #body = requests.get(edboardcopy, headers=headers)
-        data2 = body.text.replace('}',"}\n")
-        print(data2)
-        if body.status_code == 200:
-            print("Succesfull!")
-        else:
-            print(f"Error: {body.status_code}")
-            print(body.text)
-
-        # ------- COPY BOARD END -----------
-
     if sys.argv[1] == 'createlist':
 
         # ------- CREATE LIST START -----------
@@ -546,90 +293,6 @@ if arguments == 3:
         print(data2)
         # ------- INFO OF CUSTOM FIELD END -----------
 
-    if sys.argv[1] == 'cardsbyswimlane':
-    # ------- RETRIEVE CARDS BY SWIMLANE ID START -----------
-        boardid = sys.argv[2]
-        swimlaneid = sys.argv[3]
-        cardsbyswimlane = wekanurl + apiboards + boardid + s + sws + s + swimlaneid + s + cs
-        headers = {'Accept': 'application/json', 'Authorization': 'Bearer {}'.format(apikey)}
-        print("=== CARDS BY SWIMLANE ID ===\n")
-        print("URL:", cardsbyswimlane)  # Debug
-        try:
-            body = requests.get(cardsbyswimlane, headers=headers)
-            print("Status Code:", body.status_code)  # Debug
-            data = body.text.replace('}', "}\n")
-            print("Data:", data)
-        except Exception as e:
-            print("Error GET:", e)
-    # ------- RETRIEVE CARDS BY SWIMLANE ID END -----------
-
-    if sys.argv[1] == 'deleteallcards':
-        boardid = sys.argv[2]
-        swimlaneid = sys.argv[3]
-
-        # ------- GET SWIMLANE CARDS START -----------
-        get_swimlane_cards_url = wekanurl + apiboards + boardid + s + "swimlanes" + s + swimlaneid + s + "cards"
-        headers = {'Accept': 'application/json', 'Authorization': 'Bearer {}'.format(apikey)}
-
-        try:
-            response = requests.get(get_swimlane_cards_url, headers=headers)
-            response.raise_for_status()
-            cards_data = response.json()
-
-            # Print the details of each card
-            for card in cards_data:
-                # ------- DELETE CARD START -----------
-                delete_card_url = wekanurl + apiboards + boardid + s + "lists" + s + card['listId'] + s + "cards" + s + card['_id']
-                try:
-                    response = requests.delete(delete_card_url, headers=headers)
-                    if response.status_code == 404:
-                        print(f"Card not found: {card['_id']}")
-                    else:
-                        response.raise_for_status()
-                        deleted_card_data = response.json()
-                        print(f"Card Deleted Successfully. Card ID: {deleted_card_data['_id']}")
-                except requests.exceptions.RequestException as e:
-                    print(f"Error deleting card: {e}")
-                # ------- DELETE CARD END -----------
-
-        except requests.exceptions.RequestException as e:
-            print(f"Error getting swimlane cards: {e}")
-            sys.exit(1)
-        # ------- GET SWIMLANE CARDS END -----------
-
-    if sys.argv[1] == 'get_list_cards_count':
-        # ------- GET LIST CARDS COUNT START -----------
-        boardid = sys.argv[2]
-        listid = sys.argv[3]
-
-        get_list_cards_count_url = wekanurl + apiboards + boardid +  s + l + s + listid + s + "cards_count"
-        headers = {'Accept': 'application/json', 'Authorization': 'Bearer {}'.format(apikey)}
-
-        try:
-            response = requests.get(get_list_cards_count_url, headers=headers)
-            response.raise_for_status()
-            data = response.json()
-            print(f"List Cards Count: {data['list_cards_count']}")
-        except requests.exceptions.RequestException as e:
-            print(f"Error: {e}")
-        # ------- GET LIST CARDS COUNT END -----------
-
-    if sys.argv[1] == 'checklistid':
-
-        # ------- ADD CHECKLIST START -----------
-        board_id = sys.argv[2]
-        card_id = sys.argv[3]
-
-        checklist_url = wekanurl + apiboards + board_id + s + cs + s + card_id + '/checklists'
-        headers = {'Accept': 'application/json', 'Authorization': 'Bearer {}'.format(apikey)}
-        response = requests.get(checklist_url, headers=headers)
-
-        response.raise_for_status()
-        checklists = response.json()
-        print("Checklists:")
-        for checklist in checklists:
-          print(checklist)
-
 if arguments == 2:
 
     # ------- BOARDS LIST START -----------
@@ -701,22 +364,6 @@ if arguments == 2:
         print(data2)
         # ------- LISTS OF ATTACHMENTS END -----------
 
-    if sys.argv[1] == 'get_board_cards_count':
-        # ------- GET BOARD CARDS COUNT START -----------
-        boardid = sys.argv[2]
-
-        get_board_cards_count_url = wekanurl + apiboards + boardid + s + "cards_count"
-        headers = {'Accept': 'application/json', 'Authorization': 'Bearer {}'.format(apikey)}
-
-        try:
-            response = requests.get(get_board_cards_count_url, headers=headers)
-            response.raise_for_status()
-            data = response.json()
-            print(f"Board Cards Count: {data['board_cards_count']}")
-        except requests.exceptions.RequestException as e:
-            print(f"Error: {e}")
-        # ------- GET BOARD CARDS COUNT END -----------
-
 if arguments == 1:
 
     if sys.argv[1] == 'users':

client/components/activities/activities.css

@@ -49,6 +49,43 @@
   margin-top: 5px;
   padding: 5px;
 }
+.activities .activity .activity-desc .reactions {
+  display: flex;
+  margin-top: 5px;
+  gap: 5px;
+}
+.activities .activity .activity-desc .reactions .open-comment-reaction-popup {
+  display: flex;
+  align-items: center;
+  text-decoration: none;
+  height: 24px;
+}
+.activities .activity .activity-desc .reactions .open-comment-reaction-popup i.fa.fa-smile-o {
+  font-size: 17px;
+  font-weight: 500;
+  margin-left: 2px;
+}
+.activities .activity .activity-desc .reactions .open-comment-reaction-popup i.fa.fa-plus {
+  font-size: 8px;
+  margin-top: -7px;
+  margin-left: 1px;
+}
+.activities .activity .activity-desc .reactions .reaction {
+  cursor: pointer;
+  border: 1px solid #808080;
+  border-radius: 15px;
+  display: flex;
+  padding: 2px 5px;
+}
+.activities .activity .activity-desc .reactions .reaction.selected {
+  background-color: #b0c4de;
+}
+.activities .activity .activity-desc .reactions .reaction:hover {
+  background-color: #b0c4de;
+}
+.activities .activity .activity-desc .reactions .reaction .reaction-count {
+  font-size: 12px;
+}
 .activities .activity .activity-desc .activity-checklist {
   display: block;
   border-radius: 3px;

client/components/activities/activities.jade

@@ -1,12 +1,11 @@
 template(name="activities")
-  if showActivities
-    .activities.js-sidebar-activities
-      //- We should use Template.dynamic here but there is a bug with
-      //- blaze-components: https://github.com/peerlibrary/meteor-blaze-components/issues/30
-      if $eq mode "board"
-        +boardActivities
-      else
-        +cardActivities
+  .activities.js-sidebar-activities
+    //- We should use Template.dynamic here but there is a bug with
+    //- blaze-components: https://github.com/peerlibrary/meteor-blaze-components/issues/30
+    if $eq mode "board"
+      +boardActivities
+    else
+      +cardActivities
 
 template(name="boardActivities")
   each activityData in currentBoard.activities
@@ -16,6 +15,32 @@ template(name="cardActivities")
   each activityData in activities
     +activity(activity=activityData card=card mode=mode)
 
+template(name="editOrDeleteComment")
+  = ' - '
+  a.js-open-inlined-form {{_ "edit"}}
+  = ' - '
+  a.js-delete-comment {{_ "delete"}}
+
+template(name="deleteCommentPopup")
+  p {{_ "comment-delete"}}
+  button.js-confirm.negate.full(type="submit") {{_ 'delete'}}
+
+template(name="commentReactions")
+  .reactions
+    each reaction in reactions
+      span.reaction(class="{{#if isSelected reaction.userIds}}selected{{/if}}" data-codepoint="#{reaction.reactionCodepoint}" title="{{userNames reaction.userIds}}")
+        span.reaction-codepoint !{reaction.reactionCodepoint}
+        span.reaction-count #{reaction.userIds.length}
+    if (currentUser.isBoardMember)
+      a.open-comment-reaction-popup(title="{{_ 'addReactionPopup-title'}}")
+        i.fa.fa-smile-o
+        i.fa.fa-plus
+
+template(name="addReactionPopup")
+  .reactions-popup
+    each codepoint in codepoints
+      span.add-comment-reaction(data-codepoint="#{codepoint}") !{codepoint}
+
 template(name="activity")
   .activity(data-id=activity._id)
     +userAvatar(userId=activity.user._id)
@@ -105,17 +130,39 @@ template(name="activity")
         | {{{_ 'activity-checklist-item-removed' (sanitize activity.checklist.title) cardLink}}}.
 
       //- comment activity ----------------------------------------------------
-      if($eq activity.activityType 'deleteComment')
-        | {{{_ 'activity-deleteComment' activity.commentId}}}.
+      if($eq mode 'card')
+        //- if we are in card mode we display the comment in a way that it
+        //- can be edited by the owner
+        if($eq activity.activityType 'addComment')
+          +inlinedForm(classNames='js-edit-comment')
+            +editor(autofocus=true)
+              = activity.comment.text
+            .edit-controls
+              button.primary(type="submit") {{_ 'edit'}}
+              .fa.fa-times-thin.js-close-inlined-form
+          else
+            .activity-comment
+              +viewer
+                = activity.comment.text
+            +commentReactions(reactions=activity.comment.reactions commentId=activity.comment._id)
+            span(title=activity.createdAt).activity-meta {{ moment activity.createdAt }}
+              if($eq currentUser._id activity.comment.userId)
+                +editOrDeleteComment
+              else if currentUser.isBoardAdmin
+                +editOrDeleteComment
 
-      if($eq activity.activityType 'editComment')
-        | {{{_ 'activity-editComment' activity.commentId}}}.
+        if($eq activity.activityType 'deleteComment')
+          | {{{_ 'activity-deleteComment' activity.commentId}}}.
 
-      if($eq activity.activityType 'addComment')
-        | {{{_ 'activity-on' cardLink}}}
-        a.activity-comment(href="{{ activity.card.originRelativeUrl }}")
-          +viewer
-            = activity.comment.text
+        if($eq activity.activityType 'editComment')
+          | {{{_ 'activity-editComment' activity.commentId}}}.
+      else
+        //- if we are not in card mode we only display a summary of the comment
+        if($eq activity.activityType 'addComment')
+          | {{{_ 'activity-on' cardLink}}}
+          a.activity-comment(href="{{ activity.card.originRelativeUrl }}")
+            +viewer
+              = activity.comment.text
 
       //- date activity ------------------------------------------------
       if($eq activity.activityType 'a-receivedAt')
@@ -161,9 +208,6 @@ template(name="activity")
         if($eq activity.activityType 'archivedList')
           | {{_ 'activity-archived' (sanitize listLabel)}}.
 
-        if($eq activity.activityType 'changedListTitle')
-          | {{_ 'activity-changedListTitle' (sanitize listLabel) boardLabelLink}}
-
       //- member activity ----------------------------------------------------
       if($eq activity.activityType 'joinMember')
         if($eq user._id activity.member._id)
@@ -199,4 +243,4 @@ template(name="activity")
       else if(currentData.timeValue)
         | {{_ activity.activityType currentData.timeValue}}
 
-      div(title=activity.createdAt).activity-meta {{ moment activity.createdAt }}
+      span(title=activity.createdAt).activity-meta {{ moment activity.createdAt }}

client/components/activities/activities.js

@@ -1,4 +1,3 @@
-import { ReactiveCache } from '/imports/reactiveCache';
 import DOMPurify from 'dompurify';
 import { TAPi18n } from '/imports/i18n';
 
@@ -13,41 +12,39 @@ BlazeComponent.extendComponent({
     const sidebar = Sidebar;
     sidebar && sidebar.callFirstWith(null, 'resetNextPeak');
     this.autorun(() => {
-      let mode = this.data()?.mode;
-      if (mode) {
-        const capitalizedMode = Utils.capitalize(mode);
-        let searchId;
-        const showActivities = this.showActivities();
-        if (mode === 'linkedcard' || mode === 'linkedboard') {
-          const currentCard = Utils.getCurrentCard();
-          searchId = currentCard.linkedId;
-          mode = mode.replace('linked', '');
-        } else if (mode === 'card') {
-          searchId = Utils.getCurrentCardId();
-        } else {
-          searchId = Session.get(`current${capitalizedMode}`);
-        }
-        const limit = this.page.get() * activitiesPerPage;
-        if (searchId === null) return;
-
-        this.subscribe('activities', mode, searchId, limit, showActivities, () => {
-          this.loadNextPageLocked = false;
-
-          // TODO the guard can be removed as soon as the TODO above is resolved
-          if (!sidebar) return;
-          // If the sibear peak hasn't increased, that mean that there are no more
-          // activities, and we can stop calling new subscriptions.
-          // XXX This is hacky! We need to know excatly and reactively how many
-          // activities there are, we probably want to denormalize this number
-          // dirrectly into card and board documents.
-          const nextPeakBefore = sidebar.callFirstWith(null, 'getNextPeak');
-          sidebar.calculateNextPeak();
-          const nextPeakAfter = sidebar.callFirstWith(null, 'getNextPeak');
-          if (nextPeakBefore === nextPeakAfter) {
-            sidebar.callFirstWith(null, 'resetNextPeak');
-          }
-        });
+      let mode = this.data().mode;
+      const capitalizedMode = Utils.capitalize(mode);
+      let searchId;
+      if (mode === 'linkedcard' || mode === 'linkedboard') {
+        searchId = Utils.getCurrentCard().linkedId;
+        mode = mode.replace('linked', '');
+      } else if (mode === 'card') {
+        searchId = Utils.getCurrentCardId();
+      } else {
+        searchId = Session.get(`current${capitalizedMode}`);
       }
+      const limit = this.page.get() * activitiesPerPage;
+      const user = Meteor.user();
+      const hideSystem = user ? user.hasHiddenSystemMessages() : false;
+      if (searchId === null) return;
+
+      this.subscribe('activities', mode, searchId, limit, hideSystem, () => {
+        this.loadNextPageLocked = false;
+
+        // TODO the guard can be removed as soon as the TODO above is resolved
+        if (!sidebar) return;
+        // If the sibear peak hasn't increased, that mean that there are no more
+        // activities, and we can stop calling new subscriptions.
+        // XXX This is hacky! We need to know excatly and reactively how many
+        // activities there are, we probably want to denormalize this number
+        // dirrectly into card and board documents.
+        const nextPeakBefore = sidebar.callFirstWith(null, 'getNextPeak');
+        sidebar.calculateNextPeak();
+        const nextPeakAfter = sidebar.callFirstWith(null, 'getNextPeak');
+        if (nextPeakBefore === nextPeakAfter) {
+          sidebar.callFirstWith(null, 'resetNextPeak');
+        }
+      });
     });
   },
   loadNextPage() {
@@ -56,31 +53,19 @@ BlazeComponent.extendComponent({
       this.loadNextPageLocked = true;
     }
   },
-  showActivities() {
-    let ret = false;
-    let mode = this.data()?.mode;
-    if (mode) {
-      if (mode === 'linkedcard' || mode === 'linkedboard') {
-        const currentCard = Utils.getCurrentCard();
-        ret = currentCard.showActivities ?? false;
-      } else if (mode === 'card') {
-        ret = this.data()?.card?.showActivities ?? false;
-      } else {
-        ret = Utils.getCurrentBoard().showActivities ?? false;
-      }
-    }
-    return ret;
-  },
-  activities() {
-    const ret = this.data().card.activities();
-    return ret;
-  },
 }).register('activities');
 
+Template.activities.helpers({
+  activities() {
+    const ret = this.card.activities();
+    return ret;
+  },
+});
+
 BlazeComponent.extendComponent({
   checkItem() {
     const checkItemId = this.currentData().activity.checklistItemId;
-    const checkItem = ReactiveCache.getChecklistItem(checkItemId);
+    const checkItem = ChecklistItems.findOne({ _id: checkItemId });
     return checkItem && checkItem.title;
   },
 
@@ -160,7 +145,7 @@ BlazeComponent.extendComponent({
   lastLabel() {
     const lastLabelId = this.currentData().activity.labelId;
     if (!lastLabelId) return null;
-    const lastLabel = ReactiveCache.getBoard(
+    const lastLabel = Boards.findOne(
       this.currentData().activity.boardId,
     ).getLabelById(lastLabelId);
     if (lastLabel && (lastLabel.name === undefined || lastLabel.name === '')) {
@@ -173,7 +158,7 @@ BlazeComponent.extendComponent({
   },
 
   lastCustomField() {
-    const lastCustomField = ReactiveCache.getCustomField(
+    const lastCustomField = CustomFields.findOne(
       this.currentData().activity.customFieldId,
     );
     if (!lastCustomField) return null;
@@ -181,7 +166,7 @@ BlazeComponent.extendComponent({
   },
 
   lastCustomFieldValue() {
-    const lastCustomField = ReactiveCache.getCustomField(
+    const lastCustomField = CustomFields.findOne(
       this.currentData().activity.customFieldId,
     );
     if (!lastCustomField) return null;
@@ -261,6 +246,32 @@ BlazeComponent.extendComponent({
     return customField.name;
   },
 
+  events() {
+    return [
+      {
+        // XXX We should use Popup.afterConfirmation here
+        'click .js-delete-comment': Popup.afterConfirm('deleteComment', () => {
+          const commentId = this.data().activity.commentId;
+          CardComments.remove(commentId);
+          Popup.back();
+        }),
+        'submit .js-edit-comment'(evt) {
+          evt.preventDefault();
+          const commentText = this.currentComponent()
+            .getValue()
+            .trim();
+          const commentId = Template.parentData().activity.commentId;
+          if (commentText) {
+            CardComments.update(commentId, {
+              $set: {
+                text: commentText,
+              },
+            });
+          }
+        },
+      },
+    ];
+  },
 }).register('activity');
 
 Template.activity.helpers({
@@ -271,10 +282,10 @@ Template.activity.helpers({
 
 Template.commentReactions.events({
   'click .reaction'(event) {
-    if (ReactiveCache.getCurrentUser().isBoardMember()) {
+    if (Meteor.user().isBoardMember()) {
       const codepoint = event.currentTarget.dataset['codepoint'];
       const commentId = Template.instance().data.commentId;
-      const cardComment = ReactiveCache.getCardComment(commentId);
+      const cardComment = CardComments.findOne({_id: commentId});
       cardComment.toggleReaction(codepoint);
     }
   },
@@ -283,10 +294,10 @@ Template.commentReactions.events({
 
 Template.addReactionPopup.events({
   'click .add-comment-reaction'(event) {
-    if (ReactiveCache.getCurrentUser().isBoardMember()) {
+    if (Meteor.user().isBoardMember()) {
       const codepoint = event.currentTarget.dataset['codepoint'];
       const commentId = Template.instance().data.commentId;
-      const cardComment = ReactiveCache.getCardComment(commentId);
+      const cardComment = CardComments.findOne({_id: commentId});
       cardComment.toggleReaction(codepoint);
     }
     Popup.back();
@@ -314,13 +325,12 @@ Template.addReactionPopup.helpers({
 
 Template.commentReactions.helpers({
   isSelected(userIds) {
-    return Meteor.userId() && userIds.includes(Meteor.userId());
+    return userIds.includes(Meteor.user()._id);
   },
   userNames(userIds) {
-    const ret = ReactiveCache.getUsers({_id: {$in: userIds}})
-      .map(user => user.profile.fullname)
-      .join(', ');
-    return ret;
+    return Users.find({_id: {$in: userIds}})
+                .map(user => user.profile.fullname)
+                .join(', ');
   }
 })
 

client/components/activities/comments.css

@@ -63,78 +63,3 @@
   display: block;
   margin: auto;
 }
-.comments {
-  clear: both;
-}
-.comments .comment {
-  margin: 0.5px 0;
-  padding: 6px 0;
-  display: flex;
-}
-.comments .comment .member {
-  width: 32px;
-  height: 32px;
-}
-.comments .comment .comment-member {
-  font-weight: 700;
-}
-.comments .comment .comment-desc {
-  word-wrap: break-word;
-  overflow: hidden;
-  flex: 1;
-  align-self: center;
-  margin: 0;
-  margin-left: 3px;
-  overflow: hidden;
-  word-break: break-word;
-}
-.comments .comment .comment-desc .comment-text {
-  display: block;
-  border-radius: 3px;
-  background: #fff;
-  text-decoration: none;
-  box-shadow: 0 1px 2px rgba(0,0,0,0.2);
-  margin-top: 5px;
-  padding: 5px;
-}
-.comments .comment .comment-desc .reactions {
-  display: flex;
-  margin-top: 5px;
-  gap: 5px;
-}
-.comments .comment .comment-desc .reactions .open-comment-reaction-popup {
-  display: flex;
-  align-items: center;
-  text-decoration: none;
-  height: 24px;
-}
-.comments .comment .comment-desc .reactions .open-comment-reaction-popup i.fa.fa-smile-o {
-  font-size: 17px;
-  font-weight: 500;
-  margin-left: 2px;
-}
-.comments .comment .comment-desc .reactions .open-comment-reaction-popup i.fa.fa-plus {
-  font-size: 8px;
-  margin-top: -7px;
-  margin-left: 1px;
-}
-.comments .comment .comment-desc .reactions .reaction {
-  cursor: pointer;
-  border: 1px solid #808080;
-  border-radius: 15px;
-  display: flex;
-  padding: 2px 5px;
-}
-.comments .comment .comment-desc .reactions .reaction.selected {
-  background-color: #b0c4de;
-}
-.comments .comment .comment-desc .reactions .reaction:hover {
-  background-color: #b0c4de;
-}
-.comments .comment .comment-desc .reactions .reaction .reaction-count {
-  font-size: 12px;
-}
-.comments .comment .comment-desc .comment-meta {
-  font-size: 0.8em;
-  color: #999;
-}

client/components/activities/comments.jade

@@ -7,59 +7,3 @@ template(name="commentForm")
         | {{getUnsavedValue 'cardComment' currentCard._id}}
       .add-controls
         button.primary.confirm.clear.js-add-comment(type="submit") {{_ 'comment'}}
-
-template(name="comments")
-  .comments
-    each commentData in getComments
-      +comment(commentData)
-
-template(name="comment")
-  .comment
-    +userAvatar(userId=userId)
-    p.comment-desc
-      span.comment-member
-        +memberName(user=user)
-
-      +inlinedForm(classNames='js-edit-comment')
-        +editor(autofocus=true)
-          = text
-        .edit-controls
-          button.primary(type="submit") {{_ 'edit'}}
-          .fa.fa-times-thin.js-close-inlined-form
-      else
-        .comment-text
-          +viewer
-            = text
-        +commentReactions(reactions=reactions commentId=_id)
-        span(title=createdAt).comment-meta {{ moment createdAt }}
-          if($eq currentUser._id userId)
-            +editOrDeleteComment
-          else if currentUser.isBoardAdmin
-            +editOrDeleteComment
-
-template(name="editOrDeleteComment")
-  = ' - '
-  a.js-open-inlined-form {{_ "edit"}}
-  = ' - '
-  a.js-delete-comment {{_ "delete"}}
-
-template(name="deleteCommentPopup")
-  p {{_ "comment-delete"}}
-  button.js-confirm.negate.full(type="submit") {{_ 'delete'}}
-
-template(name="commentReactions")
-  .reactions
-    each reaction in reactions
-      span.reaction(class="{{#if isSelected reaction.userIds}}selected{{/if}}" data-codepoint="#{reaction.reactionCodepoint}" title="{{userNames reaction.userIds}}")
-        span.reaction-codepoint !{reaction.reactionCodepoint}
-        span.reaction-count #{reaction.userIds.length}
-    if (currentUser.isBoardMember)
-      a.open-comment-reaction-popup(title="{{_ 'addReactionPopup-title'}}")
-        i.fa.fa-smile-o
-        i.fa.fa-plus
-
-template(name="addReactionPopup")
-  .reactions-popup
-    each codepoint in codepoints
-      span.add-comment-reaction(data-codepoint="#{codepoint}") !{codepoint}
-

client/components/activities/comments.js

@@ -1,5 +1,3 @@
-import { ReactiveCache } from '/imports/reactiveCache';
-
 const commentFormIsOpen = new ReactiveVar(false);
 
 BlazeComponent.extendComponent({
@@ -26,7 +24,7 @@ BlazeComponent.extendComponent({
           let boardId = card.boardId;
           let cardId = card._id;
           if (card.isLinkedCard()) {
-            boardId = ReactiveCache.getCard(card.linkedId).boardId;
+            boardId = Cards.findOne(card.linkedId).boardId;
             cardId = card.linkedId;
           } else if (card.isLinkedBoard()) {
             boardId = card.linkedId;
@@ -55,41 +53,6 @@ BlazeComponent.extendComponent({
   },
 }).register('commentForm');
 
-BlazeComponent.extendComponent({
-  getComments() {
-    const ret = this.data().comments();
-    return ret;
-  },
-}).register("comments");
-
-BlazeComponent.extendComponent({
-  events() {
-    return [
-      {
-        'click .js-delete-comment': Popup.afterConfirm('deleteComment', () => {
-          const commentId = this.data()._id;
-          CardComments.remove(commentId);
-          Popup.back();
-        }),
-        'submit .js-edit-comment'(evt) {
-          evt.preventDefault();
-          const commentText = this.currentComponent()
-            .getValue()
-            .trim();
-          const commentId = this.data()._id;
-          if (commentText) {
-            CardComments.update(commentId, {
-              $set: {
-                text: commentText,
-              },
-            });
-          }
-        },
-      },
-    ];
-  },
-}).register("comment");
-
 // XXX This should be a static method of the `commentForm` component
 function resetCommentInput(input) {
   input.val(''); // without manually trigger, input event won't be fired

client/components/boards/boardArchive.js

@@ -1,22 +1,19 @@
-import { ReactiveCache } from '/imports/reactiveCache';
-
 BlazeComponent.extendComponent({
   onCreated() {
     this.subscribe('archivedBoards');
   },
 
   isBoardAdmin() {
-    return ReactiveCache.getCurrentUser().isBoardAdmin();
+    return Meteor.user().isBoardAdmin();
   },
 
   archivedBoards() {
-    const ret = ReactiveCache.getBoards(
+    return Boards.find(
       { archived: true },
       {
         sort: { archivedAt: -1, modifiedAt: -1 },
       },
     );
-    return ret;
   },
 
   events() {
@@ -28,8 +25,8 @@ BlazeComponent.extendComponent({
             Meteor.settings &&
             Meteor.settings.public &&
             Meteor.settings.public.sandstorm;
-          if (isSandstorm && Utils.getCurrentBoardId()) {
-            const currentBoard = Utils.getCurrentBoard();
+          if (isSandstorm && Session.get('currentBoard')) {
+            const currentBoard = Boards.findOne(Session.get('currentBoard'));
             currentBoard.archive();
           }
           const board = this.currentData();
@@ -42,8 +39,8 @@ BlazeComponent.extendComponent({
             Meteor.settings &&
             Meteor.settings.public &&
             Meteor.settings.public.sandstorm;
-          if (isSandstorm && Utils.getCurrentBoardId()) {
-            const currentBoard = Utils.getCurrentBoard();
+          if (isSandstorm && Session.get('currentBoard')) {
+            const currentBoard = Boards.findOne(Session.get('currentBoard'));
             Boards.remove(currentBoard._id);
           }
           Boards.remove(this._id);

client/components/boards/boardBody.css

@@ -16,6 +16,9 @@
   transition: margin 0.1s;
   overflow-y: auto;
 }
+.board-wrapper .board-canvas.is-sibling-sidebar-open {
+  margin-right: 248px;
+}
 .board-wrapper .board-canvas .board-overlay {
   position: fixed;
   left: 0;
@@ -165,28 +168,11 @@
   color: #fff !important;
 }
 /* Modal Styles */
-.modal {
-  display: none;
-  position: fixed;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  z-index: 9999;
-  background-color: rgba(0, 0, 0, 0.5);
-  width: 100%;
-  height: 100%;
-}
 .modal-dialog {
   display: flex;
   justify-content: center;
   align-items: center;
-  height: 25%; /* Adjust the height to make it smaller */
-  position: relative;
-  margin: 10% auto; /* This margin will help center the modal vertically */
-  max-width: 400px; /* Adjust the max-width to make it smaller */
-  background-color: #fff;
-  border-radius: 5px;
-  box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
+  height: 70%;
 }
 .modal-header {
   display: flex;
@@ -217,5 +203,4 @@
   top: 5px;
   right: 5px;
   font-size: 25px;
-  cursor: pointer;
 }

client/components/boards/boardBody.jade

@@ -17,32 +17,25 @@ template(name="boardBody")
    | {{_ 'tableVisibilityMode-allowPrivateOnly'}}
   else
     .board-wrapper(class=currentBoard.colorClass)
+      +sidebar
       .board-canvas.js-swimlanes(
-        class="{{#if hasSwimlanes}}dragscroll{{/if}}"
         class="{{#if Sidebar.isOpen}}is-sibling-sidebar-open{{/if}}"
         class="{{#if MultiSelection.isActive}}is-multiselection-active{{/if}}"
-        class="{{#if draggingActive.get}}is-dragging-active{{/if}}"
-        class="{{#unless isVerticalScrollbars}}no-scrollbars{{/unless}}")
+        class="{{#if draggingActive.get}}is-dragging-active{{/if}}")
         if showOverlay.get
           .board-overlay
         if currentBoard.isTemplatesBoard
           each currentBoard.swimlanes
             +swimlane(this)
         else if isViewSwimlanes
-          if hasSwimlanes
-            each currentBoard.swimlanes
-              +swimlane(this)
-          else
-            a.js-empty-board-add-swimlane(title="{{_ 'add-swimlane'}}")
-              h1.big-message.quiet
-                | {{_ 'add-swimlane'}} +
+          each currentBoard.swimlanes
+            +swimlane(this)
         else if isViewLists
           +listsGroup(currentBoard)
         else if isViewCalendar
           +calendarView
         else
           +listsGroup(currentBoard)
-      +sidebar
 
 template(name="calendarView")
   if isViewCalendar

client/components/boards/boardBody.js

@@ -1,6 +1,4 @@
-import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';
-import dragscroll from '@wekanteam/dragscroll';
 
 const subManager = new SubsManager();
 const { calculateIndex } = Utils;
@@ -45,9 +43,9 @@ BlazeComponent.extendComponent({
     this.mouseHasEnterCardDetails = false;
 
     // fix swimlanes sort field if there are null values
-    const currentBoardData = Utils.getCurrentBoard();
+    const currentBoardData = Boards.findOne(Session.get('currentBoard'));
     const nullSortSwimlanes = currentBoardData.nullSortSwimlanes();
-    if (nullSortSwimlanes.length > 0) {
+    if (nullSortSwimlanes.count() > 0) {
       const swimlanes = currentBoardData.swimlanes();
       let count = 0;
       swimlanes.forEach(s => {
@@ -62,7 +60,7 @@ BlazeComponent.extendComponent({
 
     // fix lists sort field if there are null values
     const nullSortLists = currentBoardData.nullSortLists();
-    if (nullSortLists.length > 0) {
+    if (nullSortLists.count() > 0) {
       const lists = currentBoardData.lists();
       let count = 0;
       lists.forEach(l => {
@@ -195,9 +193,6 @@ BlazeComponent.extendComponent({
     });
 
     this.autorun(() => {
-      // Always reset dragscroll on view switch
-      dragscroll.reset();
-
       if (Utils.isTouchScreenOrShowDesktopDragHandles()) {
         $swimlanesDom.sortable({
           handle: '.js-swimlane-header-handle',
@@ -209,27 +204,25 @@ BlazeComponent.extendComponent({
       }
 
       // Disable drag-dropping if the current user is not a board member
+      //$swimlanesDom.sortable('option', 'disabled', !userIsMember());
       $swimlanesDom.sortable(
         'option',
         'disabled',
-        !ReactiveCache.getCurrentUser()?.isBoardAdmin(),
+        !Meteor.user() || !Meteor.user().isBoardAdmin(),
       );
     });
 
     // If there is no data in the board (ie, no lists) we autofocus the list
     // creation form by clicking on the corresponding element.
-    const currentBoard = Utils.getCurrentBoard();
-    if (Utils.canModifyBoard() && currentBoard.lists().length === 0) {
+    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    if (Utils.canModifyBoard() && currentBoard.lists().count() === 0) {
       boardComponent.openNewListForm();
     }
-
-    dragscroll.reset();
-    Utils.setBackgroundImage();
   },
 
   notDisplayThisBoard() {
     let allowPrivateVisibilityOnly = TableVisibilityModeSettings.findOne('tableVisibilityMode-allowPrivateOnly');
-    let currentBoard = Utils.getCurrentBoard();
+    let currentBoard = Boards.findOne(Session.get('currentBoard'));
     if (allowPrivateVisibilityOnly !== undefined && allowPrivateVisibilityOnly.booleanValue && currentBoard.permission == 'public') {
       return true;
     }
@@ -238,7 +231,7 @@ BlazeComponent.extendComponent({
   },
 
   isViewSwimlanes() {
-    const currentUser = ReactiveCache.getCurrentUser();
+    currentUser = Meteor.user();
     if (currentUser) {
       return (currentUser.profile || {}).boardView === 'board-view-swimlanes';
     } else {
@@ -248,12 +241,8 @@ BlazeComponent.extendComponent({
     }
   },
 
-  hasSwimlanes() {
-    return Utils.getCurrentBoard().swimlanes().length > 0;
-  },
-
   isViewLists() {
-    const currentUser = ReactiveCache.getCurrentUser();
+    currentUser = Meteor.user();
     if (currentUser) {
       return (currentUser.profile || {}).boardView === 'board-view-lists';
     } else {
@@ -262,7 +251,7 @@ BlazeComponent.extendComponent({
   },
 
   isViewCalendar() {
-    const currentUser = ReactiveCache.getCurrentUser();
+    currentUser = Meteor.user();
     if (currentUser) {
       return (currentUser.profile || {}).boardView === 'board-view-cal';
     } else {
@@ -270,11 +259,6 @@ BlazeComponent.extendComponent({
     }
   },
 
-  isVerticalScrollbars() {
-    const user = ReactiveCache.getCurrentUser();
-    return user && user.isVerticalScrollbars();
-  },
-
   openNewListForm() {
     if (this.isViewSwimlanes()) {
       // The form had been removed in 416b17062e57f215206e93a85b02ef9eb1ab4902
@@ -297,7 +281,6 @@ BlazeComponent.extendComponent({
             this._isDragging = false;
           }
         },
-        'click .js-empty-board-add-swimlane': Popup.open('swimlaneAdd'),
       },
     ];
   },
@@ -335,7 +318,7 @@ BlazeComponent.extendComponent({
   calendarOptions() {
     return {
       id: 'calendar-view',
-      defaultView: 'month',
+      defaultView: 'agendaDay',
       editable: true,
       selectable: true,
       timezone: 'local',
@@ -359,7 +342,7 @@ BlazeComponent.extendComponent({
       },
       locale: TAPi18n.getLanguage(),
       events(start, end, timezone, callback) {
-        const currentBoard = Utils.getCurrentBoard();
+        const currentBoard = Boards.findOne(Session.get('currentBoard'));
         const events = [];
         const pushEvent = function (card, title, start, end, extraCls) {
           start = start || card.startAt;
@@ -405,7 +388,7 @@ BlazeComponent.extendComponent({
       },
       eventResize(event, delta, revertFunc) {
         let isOk = false;
-        const card = ReactiveCache.getCard(event.id);
+        const card = Cards.findOne(event.id);
 
         if (card) {
           card.setEnd(event.end.toDate());
@@ -417,7 +400,7 @@ BlazeComponent.extendComponent({
       },
       eventDrop(event, delta, revertFunc) {
         let isOk = false;
-        const card = ReactiveCache.getCard(event.id);
+        const card = Cards.findOne(event.id);
         if (card) {
           // TODO: add a flag for allDay events
           if (!event.allDay) {
@@ -432,37 +415,35 @@ BlazeComponent.extendComponent({
           revertFunc();
         }
       },
-      select: function (startDate) {
-        const currentBoard = Utils.getCurrentBoard();
-        const currentUser = ReactiveCache.getCurrentUser();
-        const modalElement = document.createElement('div');
-        modalElement.classList.add('modal', 'fade');
-        modalElement.setAttribute('tabindex', '-1');
-        modalElement.setAttribute('role', 'dialog');
-        modalElement.innerHTML = `
-        <div class="modal-dialog justify-content-center align-items-center" role="document">
-          <div class="modal-content">
-            <div class="modal-header">
-              <h5 class="modal-title">${TAPi18n.__('r-create-card')}</h5>
-              <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                <span aria-hidden="true">&times;</span>
-              </button>
-            </div>
-            <div class="modal-body text-center">
-              <input type="text" class="form-control" id="card-title-input" placeholder="">
-            </div>
-            <div class="modal-footer">
-              <button type="button" class="btn btn-primary" id="create-card-button">${TAPi18n.__('add-card')}</button>
+      select: function(startDate) {
+        const currentBoard = Boards.findOne(Session.get('currentBoard'));
+        const currentUser = Meteor.user();
+        const $modal = $(`
+          <div class="modal fade" tabindex="-1" role="dialog">
+            <div class="modal-dialog justify-content-center align-items-center" role="document">
+              <div class="modal-content">
+                <div class="modal-header">
+                  <h5 class="modal-title">${TAPi18n.__('r-create-card')}</h5>
+                  <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                  </button>
+                </div>
+                <div class="modal-body text-center">
+                  <input type="text" class="form-control" id="card-title-input" placeholder="">
+                </div>
+                <div class="modal-footer">
+                  <button type="button" class="btn btn-primary" id="create-card-button">${TAPi18n.__('add-card')}</button>
+                </div>
+              </div>
             </div>
           </div>
-        </div>
-        `;
-        const createCardButton = modalElement.querySelector('#create-card-button');
-        createCardButton.addEventListener('click', function () {
-          const myTitle = modalElement.querySelector('#card-title-input').value;
+        `);
+        $modal.modal('show');
+        $modal.find('#create-card-button').click(function() {
+          const myTitle = $modal.find('#card-title-input').val();
           if (myTitle) {
-            const firstList = currentBoard.draggableLists()[0];
-            const firstSwimlane = currentBoard.swimlanes()[0];
+            const firstList = currentBoard.draggableLists().fetch()[0];
+            const firstSwimlane = currentBoard.swimlanes().fetch()[0];
             Meteor.call('createCardWithDueDate', currentBoard._id, firstList._id, myTitle, startDate.toDate(), firstSwimlane._id, function(error, result) {
               if (error) {
                 console.log(error);
@@ -470,24 +451,14 @@ BlazeComponent.extendComponent({
                 console.log("Card Created", result);
               }
             });
-            closeModal();
+            $modal.modal('hide');
           }
         });
-        document.body.appendChild(modalElement);
-        const openModal = function() {
-          modalElement.style.display = 'flex';
-        };
-        const closeModal = function() {
-          modalElement.style.display = 'none';
-        };
-        const closeButton = modalElement.querySelector('[data-dismiss="modal"]');
-        closeButton.addEventListener('click', closeModal);
-        openModal();
-      }
+      },
     };
   },
   isViewCalendar() {
-    const currentUser = ReactiveCache.getCurrentUser();
+    currentUser = Meteor.user();
     if (currentUser) {
       return (currentUser.profile || {}).boardView === 'board-view-cal';
     } else {

client/components/boards/boardHeader.jade

@@ -12,9 +12,8 @@ template(name="boardHeaderBar")
       if currentBoard
         if currentUser
           with currentBoard
-            if currentUser.isBoardAdmin
-              a.board-header-btn(class="{{#if currentUser.isBoardAdmin}}js-edit-board-title{{else}}is-disabled{{/if}}" title="{{_ 'edit'}}" value=title)
-                i.fa.fa-pencil-square-o
+            a.board-header-btn(class="{{#if currentUser.isBoardAdmin}}js-edit-board-title{{else}}is-disabled{{/if}}" title="{{_ 'edit'}}" value=title)
+              i.fa.fa-pencil-square-o
 
           a.board-header-btn.js-star-board(class="{{#if isStarred}}is-active{{/if}}"
             title="{{#if isStarred}}{{_ 'click-to-unstar'}}{{else}}{{_ 'click-to-star'}}{{/if}} {{_ 'starred-boards-description'}}")

client/components/boards/boardHeader.js

@@ -1,12 +1,41 @@
-import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';
-import dragscroll from '@wekanteam/dragscroll';
 
 /*
 const DOWNCLS = 'fa-sort-down';
 const UPCLS = 'fa-sort-up';
 */
 const sortCardsBy = new ReactiveVar('');
+Template.boardMenuPopup.events({
+  'click .js-rename-board': Popup.open('boardChangeTitle'),
+  'click .js-custom-fields'() {
+    Sidebar.setView('customFields');
+    Popup.back();
+  },
+  'click .js-open-archives'() {
+    Sidebar.setView('archives');
+    Popup.back();
+  },
+  'click .js-change-board-color': Popup.open('boardChangeColor'),
+  'click .js-change-language': Popup.open('changeLanguage'),
+  'click .js-archive-board ': Popup.afterConfirm('archiveBoard', function() {
+    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    currentBoard.archive();
+    // XXX We should have some kind of notification on top of the page to
+    // confirm that the board was successfully archived.
+    FlowRouter.go('home');
+  }),
+  'click .js-delete-board': Popup.afterConfirm('deleteBoard', function() {
+    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    Popup.back();
+    Boards.remove(currentBoard._id);
+    FlowRouter.go('home');
+  }),
+  'click .js-outgoing-webhooks': Popup.open('outgoingWebhooks'),
+  'click .js-import-board': Popup.open('chooseBoardSource'),
+  'click .js-subtask-settings': Popup.open('boardSubtaskSettings'),
+  'click .js-card-settings': Popup.open('boardCardSettings'),
+  'click .js-minicard-settings': Popup.open('boardMinicardSettings'),
+});
 
 Template.boardChangeTitlePopup.events({
   submit(event, templateInstance) {
@@ -29,24 +58,24 @@ Template.boardChangeTitlePopup.events({
 
 BlazeComponent.extendComponent({
   watchLevel() {
-    const currentBoard = Utils.getCurrentBoard();
+    const currentBoard = Boards.findOne(Session.get('currentBoard'));
     return currentBoard && currentBoard.getWatchLevel(Meteor.userId());
   },
 
   isStarred() {
     const boardId = Session.get('currentBoard');
-    const user = ReactiveCache.getCurrentUser();
+    const user = Meteor.user();
     return user && user.hasStarred(boardId);
   },
 
   // Only show the star counter if the number of star is greater than 2
   showStarCounter() {
-    const currentBoard = Utils.getCurrentBoard();
+    const currentBoard = Boards.findOne(Session.get('currentBoard'));
     return currentBoard && currentBoard.stars >= 2;
   },
   /*
   showSort() {
-    return ReactiveCache.getCurrentUser().hasSortBy();
+    return Meteor.user().hasSortBy();
   },
   directionClass() {
     return this.currentDirection() === -1 ? DOWNCLS : UPCLS;
@@ -56,10 +85,10 @@ BlazeComponent.extendComponent({
     Meteor.call('setListSortBy', direction + this.currentListSortBy());
   },
   currentDirection() {
-    return ReactiveCache.getCurrentUser().getListSortByDirection();
+    return Meteor.user().getListSortByDirection();
   },
   currentListSortBy() {
-    return ReactiveCache.getCurrentUser().getListSortBy();
+    return Meteor.user().getListSortBy();
   },
   listSortShortDesc() {
     return `list-label-short-${this.currentListSortBy()}`;
@@ -70,7 +99,7 @@ BlazeComponent.extendComponent({
       {
         'click .js-edit-board-title': Popup.open('boardChangeTitle'),
         'click .js-star-board'() {
-          ReactiveCache.getCurrentUser().toggleBoardStar(Session.get('currentBoard'));
+          Meteor.user().toggleBoardStar(Session.get('currentBoard'));
         },
         'click .js-open-board-menu': Popup.open('boardMenu'),
         'click .js-change-visibility': Popup.open('boardChangeVisibility'),
@@ -277,7 +306,7 @@ const CreateBoard = BlazeComponent.extendComponent({
   onSubmit(event) {
     super.onSubmit(event);
     // Immediately star boards crated with the headerbar popup.
-    ReactiveCache.getCurrentUser().toggleBoardStar(this.boardId.get());
+    Meteor.user().toggleBoardStar(this.boardId.get());
   }
 }.register('headerBarCreateBoardPopup'));
 
@@ -286,12 +315,12 @@ BlazeComponent.extendComponent({
     return !TableVisibilityModeSettings.findOne('tableVisibilityMode-allowPrivateOnly').booleanValue;
   },
   visibilityCheck() {
-    const currentBoard = Utils.getCurrentBoard();
+    const currentBoard = Boards.findOne(Session.get('currentBoard'));
     return this.currentData() === currentBoard.permission;
   },
 
   selectBoardVisibility() {
-    const currentBoard = Utils.getCurrentBoard();
+    const currentBoard = Boards.findOne(Session.get('currentBoard'));
     const visibility = this.currentData();
     currentBoard.setVisibility(visibility);
     Popup.back();
@@ -308,7 +337,7 @@ BlazeComponent.extendComponent({
 
 BlazeComponent.extendComponent({
   watchLevel() {
-    const currentBoard = Utils.getCurrentBoard();
+    const currentBoard = Boards.findOne(Session.get('currentBoard'));
     return currentBoard.getWatchLevel(Meteor.userId());
   },
 
@@ -348,7 +377,7 @@ BlazeComponent.extendComponent({
   allowedSortValues() {
     const types = [];
     const pushed = {};
-    ReactiveCache.getCurrentUser()
+    Meteor.user()
       .getListSortTypes()
       .forEach(type => {
         const key = type.replace(/^-/, '');
@@ -364,16 +393,16 @@ BlazeComponent.extendComponent({
     return types;
   },
   Direction() {
-    return ReactiveCache.getCurrentUser().getListSortByDirection() === -1
+    return Meteor.user().getListSortByDirection() === -1
       ? this.downClass
       : this.upClass;
   },
   sortby() {
-    return ReactiveCache.getCurrentUser().getListSortBy();
+    return Meteor.user().getListSortBy();
   },
 
   setSortBy(type = null) {
-    const user = ReactiveCache.getCurrentUser();
+    const user = Meteor.user();
     if (type === null) {
       type = user._getListSortBy();
     } else {

client/components/boards/boardsList.jade

@@ -65,7 +65,7 @@ template(name="boardList")
                   if isTouchScreenOrShowDesktopDragHandles
                     i.fa.board-handle(
                         class="fa-arrows"
-                        title="{{_ 'drag-board'}}")
+                        title="{{_ 'Drag board'}}")
                   else
                     if isSandstorm
                       i.fa.js-clone-board(
@@ -119,7 +119,7 @@ template(name="boardList")
                   if isTouchScreenOrShowDesktopDragHandles
                     i.fa.board-handle(
                         class="fa-arrows"
-                        title="{{_ 'drag-board'}}")
+                        title="{{_ 'Drag board'}}")
                   else
                     if isSandstorm
                       i.fa.js-clone-board(

client/components/boards/boardsList.js

@@ -1,9 +1,11 @@
-import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';
 
 const subManager = new SubsManager();
 
 Template.boardList.helpers({
+  currentSetting() {
+    return Settings.findOne();
+  },
   hideCardCounterList() {
     /* Bug Board icons random dance https://github.com/wekan/wekan/issues/4214
        return Utils.isMiniScreen() && Session.get('currentBoard'); */
@@ -31,10 +33,10 @@ Template.boardListHeaderBar.helpers({
     //}
   },
   templatesBoardId() {
-    return ReactiveCache.getCurrentUser()?.getTemplatesBoardId();
+    return Meteor.user() && Meteor.user().getTemplatesBoardId();
   },
   templatesBoardSlug() {
-    return ReactiveCache.getCurrentUser()?.getTemplatesBoardSlug();
+    return Meteor.user() && Meteor.user().getTemplatesBoardSlug();
   },
 });
 
@@ -42,7 +44,7 @@ BlazeComponent.extendComponent({
   onCreated() {
     Meteor.subscribe('setting');
     Meteor.subscribe('tableVisibilityModeSettings');
-    let currUser = ReactiveCache.getCurrentUser();
+    let currUser = Meteor.user();
     let userLanguage;
     if (currUser && currUser.profile) {
       userLanguage = currUser.profile.language
@@ -100,34 +102,51 @@ BlazeComponent.extendComponent({
     });
   },
   userHasTeams() {
-    if (ReactiveCache.getCurrentUser()?.teams?.length > 0)
+    if (Meteor.user() != null && Meteor.user().teams && Meteor.user().teams.length > 0)
       return true;
     else
       return false;
   },
   teamsDatas() {
-    const teams = ReactiveCache.getCurrentUser()?.teams
-    if (teams)
-      return teams.sort((a, b) => a.teamDisplayName.localeCompare(b.teamDisplayName));
+    if (Meteor.user().teams)
+      return Meteor.user().teams.sort((a, b) => a.teamDisplayName.localeCompare(b.teamDisplayName));
     else
       return [];
   },
   userHasOrgs() {
-    if (ReactiveCache.getCurrentUser()?.orgs?.length > 0)
+    if (Meteor.user() != null && Meteor.user().orgs && Meteor.user().orgs.length > 0)
       return true;
     else
       return false;
   },
+  /*
+    userHasTemplates(){
+      if(Meteor.user() != null && Meteor.user().orgs && Meteor.user().orgs.length > 0)
+        return true;
+      else
+        return false;
+    },
+  */
   orgsDatas() {
-    const orgs = ReactiveCache.getCurrentUser()?.orgs;
-    if (orgs)
-      return orgs.sort((a, b) => a.orgDisplayName.localeCompare(b.orgDisplayName));
+    if (Meteor.user().orgs)
+      return Meteor.user().orgs.sort((a, b) => a.orgDisplayName.localeCompare(b.orgDisplayName));
     else
       return [];
   },
   userHasOrgsOrTeams() {
-    const ret = this.userHasOrgs() || this.userHasTeams();
-    return ret;
+    let boolUserHasOrgs;
+    if (Meteor.user() != null && Meteor.user().orgs && Meteor.user().orgs.length > 0)
+      boolUserHasOrgs = true;
+    else
+      boolUserHasOrgs = false;
+
+    let boolUserHasTeams;
+    if (Meteor.user() != null && Meteor.user().teams && Meteor.user().teams.length > 0)
+      boolUserHasTeams = true;
+    else
+      boolUserHasTeams = false;
+
+    return (boolUserHasOrgs || boolUserHasTeams);
   },
   boards() {
     let query = {
@@ -149,10 +168,17 @@ BlazeComponent.extendComponent({
       if (allowPrivateVisibilityOnly !== undefined && allowPrivateVisibilityOnly.booleanValue) {
         query.$and.push({ 'permission': 'private' });
       }
-      const currUser = ReactiveCache.getCurrentUser();
+      const currUser = Users.findOne(Meteor.userId());
 
-      let orgIdsUserBelongs = currUser?.orgIdsUserBelongs() || '';
-      if (orgIdsUserBelongs) {
+      // const currUser = Users.findOne(Meteor.userId(), {
+      //   fields: {
+      //     orgs: 1,
+      //     teams: 1,
+      //   },
+      // });
+
+      let orgIdsUserBelongs = currUser !== undefined && currUser.teams !== 'undefined' ? currUser.orgIdsUserBelongs() : '';
+      if (orgIdsUserBelongs && orgIdsUserBelongs != '') {
         let orgsIds = orgIdsUserBelongs.split(',');
         // for(let i = 0; i < orgsIds.length; i++){
         //   query.$and[2].$or.push({'orgs.orgId': orgsIds[i]});
@@ -162,8 +188,8 @@ BlazeComponent.extendComponent({
         query.$and[2].$or.push({ 'orgs.orgId': { $in: orgsIds } });
       }
 
-      let teamIdsUserBelongs = currUser?.teamIdsUserBelongs() || '';
-      if (teamIdsUserBelongs) {
+      let teamIdsUserBelongs = currUser !== undefined && currUser.teams !== 'undefined' ? currUser.teamIdsUserBelongs() : '';
+      if (teamIdsUserBelongs && teamIdsUserBelongs != '') {
         let teamsIds = teamIdsUserBelongs.split(',');
         // for(let i = 0; i < teamsIds.length; i++){
         //   query.$or[2].$or.push({'teams.teamId': teamsIds[i]});
@@ -181,51 +207,55 @@ BlazeComponent.extendComponent({
       };
     }
 
-    const ret = ReactiveCache.getBoards(query, {
+    return Boards.find(query, {
       sort: { sort: 1 /* boards default sorting */ },
     });
-    return ret;
   },
   boardLists(boardId) {
+    let boardLists = [];
+    const lists = Lists.find({ 'boardId': boardId, 'archived': false },{sort: ['sort','asc']});
     /* Bug Board icons random dance https://github.com/wekan/wekan/issues/4214
-    const lists = ReactiveCache.getLists({ 'boardId': boardId, 'archived': false },{sort: ['sort','asc']});
-    const ret = lists.map(list => {
-      let cardCount = ReactiveCache.getCards({ 'boardId': boardId, 'listId': list._id }).length;
-      return `${list.title}: ${cardCount}`;
+    lists.forEach(list => {
+      let cardCount = Cards.find({ 'boardId': boardId, 'listId': list._id }).count()
+      boardLists.push(`${list.title}: ${cardCount}`);
     });
-    return ret;
     */
-    return [];
+    return boardLists;
   },
 
   boardMembers(boardId) {
+    let boardMembers = [];
     /* Bug Board icons random dance https://github.com/wekan/wekan/issues/4214
-    const lists = ReactiveCache.getBoard(boardId)
-    const boardMembers = lists?.members.map(member => member.userId);
-    return boardMembers;
+    const lists = Boards.findOne({ '_id': boardId })
+    let members = lists.members;
+    members.forEach(member => {
+      boardMembers.push(member.userId);
+    });
     */
-    return [];
+    return boardMembers;
   },
 
   isStarred() {
-    const user = ReactiveCache.getCurrentUser();
+    const user = Meteor.user();
     return user && user.hasStarred(this.currentData()._id);
   },
   isAdministrable() {
-    const user = ReactiveCache.getCurrentUser();
+    const user = Meteor.user();
     return user && user.isBoardAdmin(this.currentData()._id);
   },
 
   hasOvertimeCards() {
+    subManager.subscribe('board', this.currentData()._id, false);
     return this.currentData().hasOvertimeCards();
   },
 
   hasSpentTimeCards() {
+    subManager.subscribe('board', this.currentData()._id, false);
     return this.currentData().hasSpentTimeCards();
   },
 
   isInvited() {
-    const user = ReactiveCache.getCurrentUser();
+    const user = Meteor.user();
     return user && user.isInvitedTo(this.currentData()._id);
   },
 
@@ -235,18 +265,18 @@ BlazeComponent.extendComponent({
         'click .js-add-board': Popup.open('createBoard'),
         'click .js-star-board'(evt) {
           const boardId = this.currentData()._id;
-          ReactiveCache.getCurrentUser().toggleBoardStar(boardId);
+          Meteor.user().toggleBoardStar(boardId);
           evt.preventDefault();
         },
         'click .js-clone-board'(evt) {
-          let title = getSlug(ReactiveCache.getBoard(this.currentData()._id).title) || 'cloned-board';
+          let title = getSlug(Boards.findOne(this.currentData()._id).title) || 'cloned-board';
           Meteor.call(
             'copyBoard',
             this.currentData()._id,
             {
-              sort: ReactiveCache.getBoards({ archived: false }).length,
+              sort: Boards.find({ archived: false }).count(),
               type: 'board',
-              title: ReactiveCache.getBoard(this.currentData()._id).title,
+              title: Boards.findOne(this.currentData()._id).title,
             },
             (err, res) => {
               if (err) {
@@ -320,7 +350,7 @@ BlazeComponent.extendComponent({
               query.$and[2].$or.push({ 'orgs.orgId': { $in: selectedOrgsValues } });
             }
 
-            let filteredBoards = ReactiveCache.getBoards(query, {});
+            let filteredBoards = Boards.find(query, {}).fetch();
             let allBoards = document.getElementsByClassName("js-board");
             let currBoard;
             if (filteredBoards.length > 0) {

client/components/cards/attachments.css

@@ -24,6 +24,7 @@
   min-width: 150px;
   max-height: 150px;
   padding-right: 16px;
+
 }
 .attachment-thumbnail {
   max-width: 150px;
@@ -77,10 +78,10 @@
   width: 100%;
   height: 100vh;
   position: fixed;
-  top: 0;
+  top: 48px;  /* height of the navbar */
   left: 0;
   z-index: 9999 !important;
-  background: rgba(13, 13, 13, 0.95);
+  background: rgba(13,13,13,0.95);
 }
 #viewer-container {
   display: flex;
@@ -98,12 +99,10 @@
 #attachment-name {
   color: white;
   font-size: 1.5em;
-  max-width: calc(
-    100% - 50px
-  ); /* Make sure the name does not overlap the close button */
+  max-width: calc(100% - 50px); /* Make sure the name does not overlap the close button */
 }
 #viewer-close {
-  color: white;
+  color:white;
   cursor: pointer;
   font-size: 4em;
   top: 0;
@@ -112,32 +111,25 @@
 }
 .attachment-arrow {
   font-size: 4em;
-  color: white;
+  color:white;
   cursor: pointer;
   align-self: center;
   margin: 0 20px;
 }
-#viewer-content {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 100%;
-  height: calc(100% - 50px);
-}
 #image-viewer {
-  background: repeating-conic-gradient(#808080 0% 25%, transparent 0% 50%) 50% /
-    20px 20px; /* Checkerboard background for transparent images */
+  background:
+    repeating-conic-gradient(#808080 0% 25%, transparent 0% 50%)
+      50% / 20px 20px; /* Checkerboard background for transparent images */
   max-width: 100%;
-  max-height: 100%;
 }
 #pdf-viewer {
   width: 40vw;
-  height: 100%;
+  height: 100vh;
 }
-#txt-viewer {
+#txt-viewer{
   background-color: white;
   width: 40vw;
-  height: 100%;
+  height: 100vh;
 }
 .pdf-preview-error {
   margin-top: 20vh;
@@ -156,29 +148,25 @@
   #viewer-container {
     display: block;
   }
-  .attachment-arrow {
+  .attachment-arrow{
     position: absolute;
     bottom: 2.2em;
     font-size: 1.6em;
     padding: 16px;
   }
-  #prev-attachment {
+  #prev-attachment{
     left: 0;
   }
-  #next-attachment {
+  #next-attachment{
     right: 0;
   }
   #pdf-viewer {
     width: 100%;
-    height: calc(
-      100vh - 155px
-    ); /* Full height - height of top and bottom bars */
+    height: calc(100vh - 155px);  /* Full height - height of top and bottom bars */
   }
   #txt-viewer {
     width: 100%;
-    height: calc(
-      100vh - 155px
-    ); /* Full height - height of top and bottom bars */
+    height: calc(100vh - 155px);  /* Full height - height of top and bottom bars */
   }
   #audio-viewer {
     margin-top: 20%;

client/components/cards/attachments.jade

@@ -51,9 +51,8 @@ template(name="attachmentGallery")
 
   .attachment-gallery
 
-    if canModifyCard
-      a.attachment-item.add-attachment.js-add-attachment
-        i.fa.fa-plus.icon
+    a.attachment-item.add-attachment.js-add-attachment
+      i.fa.fa-plus.icon
 
     each attachments
 
@@ -88,13 +87,14 @@ template(name="attachmentGallery")
             .attachment-actions
               a.js-download(href="{{link}}?download=true", download="{{name}}")
                 i.fa.fa-download.icon(title="{{_ 'download'}}")
+              if currentUser.isBoardAdmin
+                a.js-rename
+                  i.fa.fa-pencil-square-o.icon(title="{{_ 'rename'}}")
+                a.js-confirm-delete
+                  i.fa.fa-trash.icon(title="{{_ 'delete'}}")
               if currentUser.isBoardMember
                 unless currentUser.isCommentOnly
                   unless currentUser.isWorker
-                    a.js-rename
-                      i.fa.fa-pencil-square-o.icon(title="{{_ 'rename'}}")
-                    a.js-confirm-delete
-                      i.fa.fa-trash.icon(title="{{_ 'delete'}}")
                     a.fa.fa-navicon.icon.js-open-attachment-menu(data-attachment-link="{{link}}" title="{{_ 'attachmentActionsPopup-title'}}")
 
 
@@ -117,6 +117,8 @@ template(name="attachmentActionsPopup")
               | {{_ 'remove-background-image'}}
             else
               | {{_ 'add-background-image'}}
+        p.attachment-storage
+          | {{versions.original.storage}}
 
         if $neq versions.original.storage "fs"
           a.js-move-storage-fs

client/components/cards/attachments.js

@@ -1,4 +1,3 @@
-import { ReactiveCache } from '/imports/reactiveCache';
 import { ObjectID } from 'bson';
 import DOMPurify from 'dompurify';
 
@@ -11,9 +10,6 @@ const prettyMilliseconds = require('pretty-ms');
 let cardId = null;
 let openAttachmentId = null;
 
-// Used to store the start and end coordinates of a touch event for attachment swiping
-let touchStartCoords = null;
-let touchEndCoords = null;
 
 // Stores link to the attachment for which attachment actions popup was opened
 attachmentActionsLink = null;
@@ -38,13 +34,25 @@ Template.attachmentGallery.events({
   },
   'click .js-rename': Popup.open('attachmentRename'),
   'click .js-confirm-delete': Popup.afterConfirm('attachmentDelete', function() {
-      Attachments.remove(this._id);
-      Popup.back();
+    Attachments.remove(this._id);
+    Popup.back(2);
   }),
 });
 
-function getNextAttachmentId(currentAttachmentId, offset = 0) {
-    const attachments = ReactiveCache.getAttachments({'meta.cardId': cardId});
+function getNextAttachmentId(currentAttachmentId) {
+    const attachments = Attachments.find({'meta.cardId': cardId}).get();
+
+    let i = 0;
+    for (; i < attachments.length; i++) {
+      if (attachments[i]._id === currentAttachmentId) {
+        break;
+      }
+    }
+    return attachments[(i + 1 + attachments.length) % attachments.length]._id;
+}
+
+function getPrevAttachmentId(currentAttachmentId) {
+  const attachments = Attachments.find({'meta.cardId': cardId}).get();
 
   let i = 0;
   for (; i < attachments.length; i++) {
@@ -52,82 +60,52 @@ function getNextAttachmentId(currentAttachmentId, offset = 0) {
       break;
     }
   }
-  return attachments[(i + offset + 1 + attachments.length) % attachments.length]._id;
+  return attachments[(i - 1 + attachments.length) % attachments.length]._id;
 }
 
-function getPrevAttachmentId(currentAttachmentId, offset = 0) {
-  const attachments = ReactiveCache.getAttachments({'meta.cardId': cardId});
+function openAttachmentViewer(attachmentId){
 
-  let i = 0;
-  for (; i < attachments.length; i++) {
-    if (attachments[i]._id === currentAttachmentId) {
-      break;
+    const attachment = Attachments.findOne({_id: attachmentId});
+
+    $("#attachment-name").text(attachment.name);
+
+    // IMPORTANT: if you ever add a new viewer, make sure you also implement
+    // cleanup in the closeAttachmentViewer() function
+    switch(true){
+      case (attachment.isImage):
+        $("#image-viewer").attr("src", attachment.link());
+        $("#image-viewer").removeClass("hidden");
+        break;
+      case (attachment.isPDF):
+        $("#pdf-viewer").attr("data", attachment.link());
+        $("#pdf-viewer").removeClass("hidden");
+        break;
+      case (attachment.isVideo):
+        // We have to create a new <source> DOM element and append it to the video
+        // element, otherwise the video won't load
+        let videoSource = document.createElement('source');
+        videoSource.setAttribute('src', attachment.link());
+        $("#video-viewer").append(videoSource);
+
+        $("#video-viewer").removeClass("hidden");
+        break;
+      case (attachment.isAudio):
+        // We have to create a new <source> DOM element and append it to the audio
+        // element, otherwise the audio won't load
+        let audioSource = document.createElement('source');
+        audioSource.setAttribute('src', attachment.link());
+        $("#audio-viewer").append(audioSource);
+
+        $("#audio-viewer").removeClass("hidden");
+        break;
+      case (attachment.isText):
+      case (attachment.isJSON):
+        $("#txt-viewer").attr("data", attachment.link());
+        $("#txt-viewer").removeClass("hidden");
+        break;
     }
-  }
-  return attachments[(i + offset - 1 + attachments.length) % attachments.length]._id;
-}
 
-function attachmentCanBeOpened(attachment) {
-  return (
-    attachment.isImage ||
-    attachment.isPDF ||
-    attachment.isText ||
-    attachment.isJSON ||
-    attachment.isVideo ||
-    attachment.isAudio
-  );
-}
-
-function openAttachmentViewer(attachmentId) {
-  const attachment = ReactiveCache.getAttachment(attachmentId);
-
-  // Check if we can open the attachment (if we have a viewer for it) and exit if not
-  if (!attachmentCanBeOpened(attachment)) {
-    return;
-  }
-
-  /*
-  Instructions for adding a new viewer:
-    - add a new case to the switch statement below
-    - implement cleanup in the closeAttachmentViewer() function, if necessary
-    - mark attachment type as openable by adding a new condition to the attachmentCanBeOpened function
-  */
-  switch(true){
-    case (attachment.isImage):
-      $("#image-viewer").attr("src", attachment.link());
-      $("#image-viewer").removeClass("hidden");
-      break;
-    case (attachment.isPDF):
-      $("#pdf-viewer").attr("data", attachment.link());
-      $("#pdf-viewer").removeClass("hidden");
-      break;
-    case (attachment.isVideo):
-      // We have to create a new <source> DOM element and append it to the video
-      // element, otherwise the video won't load
-      let videoSource = document.createElement('source');
-      videoSource.setAttribute('src', attachment.link());
-      $("#video-viewer").append(videoSource);
-
-      $("#video-viewer").removeClass("hidden");
-      break;
-    case (attachment.isAudio):
-      // We have to create a new <source> DOM element and append it to the audio
-      // element, otherwise the audio won't load
-      let audioSource = document.createElement('source');
-      audioSource.setAttribute('src', attachment.link());
-      $("#audio-viewer").append(audioSource);
-
-      $("#audio-viewer").removeClass("hidden");
-      break;
-    case (attachment.isText):
-    case (attachment.isJSON):
-      $("#txt-viewer").attr("data", attachment.link());
-      $("#txt-viewer").removeClass("hidden");
-      break;
-  }
-
-  $('#attachment-name').text(attachment.name);
-  $('#viewer-overlay').removeClass('hidden');
+    $("#viewer-overlay").removeClass("hidden");
 }
 
 function closeAttachmentViewer() {
@@ -154,114 +132,41 @@ function closeAttachmentViewer() {
   $("#audio-viewer").addClass("hidden");
 }
 
-function openNextAttachment() {
-  closeAttachmentViewer();
-
-    let i = 0;
-    // Find an attachment that can be opened
-    while (true) {
-      const id = getNextAttachmentId(openAttachmentId, i);
-      const attachment = ReactiveCache.getAttachment(id);
-      if (attachmentCanBeOpened(attachment)) {
-        openAttachmentId = id;
-        openAttachmentViewer(id);
-        break;
-      }
-      i++;
-    }
-}
-
-function openPrevAttachment() {
-  closeAttachmentViewer();
-
-    let i = 0;
-    // Find an attachment that can be opened
-    while (true) {
-      const id = getPrevAttachmentId(openAttachmentId, i);
-      const attachment = ReactiveCache.getAttachment(id);
-      if (attachmentCanBeOpened(attachment)) {
-        openAttachmentId = id;
-        openAttachmentViewer(id);
-        break;
-      }
-      i--;
-    }
-}
-
-function processTouch(){
-
-  xDist = touchEndCoords.x - touchStartCoords.x;
-  yDist = touchEndCoords.y - touchStartCoords.y;
-
-  console.log("xDist: " + xDist);
-
-  // Left swipe
-  if (Math.abs(xDist) > Math.abs(yDist) && xDist < 0) {
-    openNextAttachment();
-  }
-
-  // Right swipe
-  if (Math.abs(xDist) > Math.abs(yDist) && xDist > 0) {
-    openPrevAttachment();
-  }
-
-  // Up swipe
-  if (Math.abs(yDist) > Math.abs(xDist) && yDist < 0) {
-    closeAttachmentViewer();
-  }
-
-}
-
 Template.attachmentViewer.events({
-  'touchstart #viewer-container'(event) {
-    console.log("touchstart")
-    touchStartCoords = {
-      x: event.changedTouches[0].screenX,
-      y: event.changedTouches[0].screenY
-    }
-  },
-  'touchend #viewer-container'(event) {
-    console.log("touchend")
-    touchEndCoords = {
-      x: event.changedTouches[0].screenX,
-      y: event.changedTouches[0].screenY
-    }
-    processTouch();
-  },
   'click #viewer-container'(event) {
 
     // Make sure the click was on #viewer-container and not on any of its children
-    if(event.target !== event.currentTarget) {
-      event.stopPropagation();
-      return;
-    }
+    if(event.target !== event.currentTarget) return;
 
     closeAttachmentViewer();
   },
   'click #viewer-content'(event) {
 
     // Make sure the click was on #viewer-content and not on any of its children
-    if(event.target !== event.currentTarget) {
-      event.stopPropagation();
-      return;
-    }
+    if(event.target !== event.currentTarget) return;
 
     closeAttachmentViewer();
   },
   'click #viewer-close'() {
     closeAttachmentViewer();
   },
-  'click #next-attachment'() {
-    openNextAttachment();
-  },
-  'click #prev-attachment'() {
-    openPrevAttachment();
+  'click #next-attachment'(event) {
+    closeAttachmentViewer()
+    const id = getNextAttachmentId(openAttachmentId);
+    openAttachmentId = id;
+    openAttachmentViewer(id);
   },
+  'click #prev-attachment'(event) {
+    closeAttachmentViewer()
+    const id = getPrevAttachmentId(openAttachmentId);
+    openAttachmentId = id;
+    openAttachmentViewer(id);
+  }
 });
 
 Template.attachmentGallery.helpers({
   isBoardAdmin() {
-    return ReactiveCache.getCurrentUser().isBoardAdmin();
+    return Meteor.user().isBoardAdmin();
   },
   fileSize(size) {
     const ret = filesize(size);
@@ -298,23 +203,13 @@ Template.cardAttachmentsPopup.events({
       let uploads = [];
       for (const file of files) {
         const fileId = new ObjectID().toString();
-        let fileName = DOMPurify.sanitize(file.name);
-
-        // If sanitized filename is not same as original filename,
-        // it could be XSS that is already fixed with sanitize,
-        // or just normal mistake, so it is not a problem.
-        // That is why here is no warning.
-        if (fileName !== file.name) {
-          // If filename is empty, only in that case add some filename
-          if (fileName.length === 0) {
-            fileName = 'Empty-filename-after-sanitize.txt';
-          }
+        // If filename is not same as sanitized filename, has XSS, then cancel upload
+        if (file.name !== DOMPurify.sanitize(file.name)) {
+          return false;
         }
-
         const config = {
           file: file,
           fileId: fileId,
-          fileName: fileName,
           meta: Utils.getCommonAttachmentMetaFrom(card),
           chunkSize: 'dynamic',
         };
@@ -427,11 +322,11 @@ Template.previewClipboardImagePopup.events({
 
 BlazeComponent.extendComponent({
   isCover() {
-    const ret = ReactiveCache.getCard(this.data().meta.cardId).coverId == this.data()._id;
+    const ret = Cards.findOne(this.data().meta.cardId).coverId == this.data()._id;
     return ret;
   },
   isBackgroundImage() {
-    //const currentBoard = Utils.getCurrentBoard();
+    //const currentBoard = Boards.findOne(Session.get('currentBoard'));
     //return currentBoard.backgroundImageURL === $(".attachment-thumbnail-img").attr("src");
     return false;
   },
@@ -439,22 +334,22 @@ BlazeComponent.extendComponent({
     return [
       {
         'click .js-add-cover'() {
-          ReactiveCache.getCard(this.data().meta.cardId).setCover(this.data()._id);
+          Cards.findOne(this.data().meta.cardId).setCover(this.data()._id);
           Popup.back();
         },
         'click .js-remove-cover'() {
-          ReactiveCache.getCard(this.data().meta.cardId).unsetCover();
+          Cards.findOne(this.data().meta.cardId).unsetCover();
           Popup.back();
         },
         'click .js-add-background-image'() {
-          const currentBoard = Utils.getCurrentBoard();
+          const currentBoard = Boards.findOne(Session.get('currentBoard'));
           currentBoard.setBackgroundImageURL(attachmentActionsLink);
           Utils.setBackgroundImage(attachmentActionsLink);
           Popup.back();
           event.preventDefault();
         },
         'click .js-remove-background-image'() {
-          const currentBoard = Utils.getCurrentBoard();
+          const currentBoard = Boards.findOne(Session.get('currentBoard'));
           currentBoard.setBackgroundImageURL("");
           Utils.setBackgroundImage("");
           Popup.back();
@@ -501,7 +396,7 @@ BlazeComponent.extendComponent({
           if (name === DOMPurify.sanitize(name)) {
             Meteor.call('renameAttachment', this.data()._id, name);
           }
-          Popup.back();
+          Popup.back(2);
         },
       }
     ]

client/components/cards/cardCustomFields.jade

@@ -79,14 +79,13 @@ template(name="cardCustomField-currency")
 
 template(name="cardCustomField-date")
     if canModifyCard
-      a.js-edit-date(title="{{showTitle}} {{_ 'predicate-week'}} {{#if showWeekOfYear}}{{showWeek}}{{/if}}" class="{{classes}}")
+      a.js-edit-date(title="{{showTitle}} {{_ 'predicate-week'}} {{showWeek}}" class="{{classes}}")
         if value
           div.card-date
             time(datetime="{{showISODate}}")
               | {{showDate}}
-              if showWeekOfYear
-                b
-                  | {{showWeek}}
+              b
+                | {{showWeek}}
         else
           | {{_ 'edit'}}
     else
@@ -94,9 +93,8 @@ template(name="cardCustomField-date")
         div.card-date
           time(datetime="{{showISODate}}")
             | {{showDate}}
-            if showWeekOfYear
-                b
-                | {{showWeek}}
+            b
+              | {{showWeek}}
 
 template(name="cardCustomField-dropdown")
     if canModifyCard

client/components/cards/cardCustomFields.js

@@ -148,10 +148,6 @@ CardCustomField.register('cardCustomField');
     return this.date.get().week().toString();
   }
 
-  showWeekOfYear() {
-    return ReactiveCache.getCurrentUser().isShowWeekOfYear();
-  }
-
   showDate() {
     // this will start working once mquandalle:moment
     // is updated to at least moment.js 2.10.5

client/components/cards/cardDate.jade

@@ -1,23 +1,20 @@
 template(name="dateBadge")
   if canModifyCard
-    a.js-edit-date.card-date(title="{{showTitle}} {{_ 'predicate-week'}} {{#if showWeekOfYear}}{{showWeek}}{{/if}}" class="{{classes}}")
+    a.js-edit-date.card-date(title="{{showTitle}} {{_ 'predicate-week'}} {{showWeek}}" class="{{classes}}")
       time(datetime="{{showISODate}}")
         | {{showDate}}
-        if showWeekOfYear
-          b
-            | {{showWeek}}
-  else
-    a.card-date(title="{{showTitle}} {{_ 'predicate-week'}} {{#if showWeekOfYear}}{{showWeek}}{{/if}}" class="{{classes}}")
-      time(datetime="{{showISODate}}")
-        | {{showDate}}
-        if showWeekOfYear
-          b
-            | {{showWeek}}
-
-template(name="dateCustomField")
-  a(title="{{showTitle}} {{_ 'predicate-week'}} {{#if showWeekOfYear}}{{showWeek}}{{/if}}" class="{{classes}}")
-    time(datetime="{{showISODate}}")
-      | {{showDate}}
-      if showWeekOfYear
         b
           | {{showWeek}}
+  else
+    a.card-date(title="{{showTitle}} {{_ 'predicate-week'}} {{showWeek}}" class="{{classes}}")
+      time(datetime="{{showISODate}}")
+        | {{showDate}}
+        b
+          | {{showWeek}}
+
+template(name="dateCustomField")
+  a(title="{{showTitle}} {{_ 'predicate-week'}} {{showWeek}}" class="{{classes}}")
+    time(datetime="{{showISODate}}")
+      | {{showDate}}
+      b
+        | {{showWeek}}

client/components/cards/cardDate.js

@@ -11,7 +11,7 @@ import { DatePicker } from '/client/lib/datepicker';
   }
 
   _storeDate(date) {
-    this.card.setReceived(moment(date).format('YYYY-MM-DD HH:mm'));
+    this.card.setReceived(date);
   }
 
   _deleteDate() {
@@ -37,7 +37,7 @@ import { DatePicker } from '/client/lib/datepicker';
   }
 
   _storeDate(date) {
-    this.card.setStart(moment(date).format('YYYY-MM-DD HH:mm'));
+    this.card.setStart(date);
   }
 
   _deleteDate() {
@@ -60,7 +60,7 @@ import { DatePicker } from '/client/lib/datepicker';
   }
 
   _storeDate(date) {
-    this.card.setDue(moment(date).format('YYYY-MM-DD HH:mm'));
+    this.card.setDue(date);
   }
 
   _deleteDate() {
@@ -83,7 +83,7 @@ import { DatePicker } from '/client/lib/datepicker';
   }
 
   _storeDate(date) {
-    this.card.setEnd(moment(date).format('YYYY-MM-DD HH:mm'));
+    this.card.setEnd(date);
   }
 
   _deleteDate() {
@@ -110,10 +110,6 @@ const CardDate = BlazeComponent.extendComponent({
     return this.date.get().week().toString();
   },
 
-  showWeekOfYear() {
-    return ReactiveCache.getCurrentUser().isShowWeekOfYear();
-  },
-
   showDate() {
     // this will start working once mquandalle:moment
     // is updated to at least moment.js 2.10.5
@@ -287,10 +283,6 @@ class CardCustomFieldDate extends CardDate {
     return this.date.get().week().toString();
   }
 
-  showWeekOfYear() {
-    return ReactiveCache.getCurrentUser().isShowWeekOfYear();
-  }
-
   showDate() {
     // this will start working once mquandalle:moment
     // is updated to at least moment.js 2.10.5
@@ -322,19 +314,19 @@ CardCustomFieldDate.register('cardCustomFieldDate');
 
 (class extends CardStartDate {
   showDate() {
-    return this.date.get().format('YYYY-MM-DD HH:mm');
+    return this.date.get().format('L');
   }
 }.register('minicardStartDate'));
 
 (class extends CardDueDate {
   showDate() {
-    return this.date.get().format('YYYY-MM-DD HH:mm');
+    return this.date.get().format('L');
   }
 }.register('minicardDueDate'));
 
 (class extends CardEndDate {
   showDate() {
-    return this.date.get().format('YYYY-MM-DD HH:mm');
+    return this.date.get().format('L');
   }
 }.register('minicardEndDate'));
 

client/components/cards/cardDetails.css

@@ -5,7 +5,7 @@
   float: left;
   height: 30px;
   width: 30px;
-  margin: .3vh;
+  margin: 0 4px 4px 0;
   cursor: pointer;
   user-select: none;
   z-index: 1;
@@ -196,9 +196,6 @@
   margin-right: 10px;
   padding: 10px;
 }
-.card-details .card-description i.fa.fa-pencil-square-o {
-  float: right;
-}
 .card-details .card-description textarea {
   min-height: 100px;
 }
@@ -250,7 +247,7 @@
 @media screen and (min-width: 801px) {
   .card-details {
     top: 97px;
-    left: calc(50% - (600px / 2));
+    left: 0;
     width: 600px;
     bottom: 0;
     position: fixed;
@@ -270,9 +267,10 @@
     box-shadow: 0 0 7px 0 #b3b3b3;
     transition: flex-basis 0.1s;
     box-sizing: border-box;
-    top: 97px;
-    left: 0px;
-    height: calc(100% - 100px);
+    position: absolute;
+    top: 0;
+    left: 0;
+    height: calc(100% - 20px);
     width: calc(100% - 20px);
     float: left;
   }

client/components/cards/cardDetails.jade

@@ -2,10 +2,7 @@ template(name="cardDetailsPopup")
   +cardDetails(popupCard)
 
 template(name="cardDetails")
-
-  +attachmentViewer
-
-  section.card-details.js-card-details.nodragscroll(class='{{#if cardMaximized}}card-details-maximized{{/if}}' class='{{#if isPopup}}card-details-popup{{/if}}' class='{{#unless isVerticalScrollbars}}no-scrollbars{{/unless}}'): .card-details-canvas
+  section.card-details.js-card-details(class='{{#if cardMaximized}}card-details-maximized{{/if}}' class='{{#if isPopup}}card-details-popup{{/if}}'): .card-details-canvas
     .card-details-header(class='{{#if colorClass}}card-details-{{colorClass}}{{/if}}')
       +inlinedForm(classNames="js-card-details-title")
         +editCardTitleForm
@@ -13,12 +10,11 @@ template(name="cardDetails")
         unless isMiniScreen
           unless isPopup
             a.fa.fa-times-thin.close-card-details.js-close-card-details(title="{{_ 'close-card'}}")
-            if canModifyCard
-              if cardMaximized
-                a.fa.fa-window-minimize.minimize-card-details.js-minimize-card-details(title="{{_ 'minimize-card'}}")
-              else
-                a.fa.fa-window-maximize.maximize-card-details.js-maximize-card-details(title="{{_ 'maximize-card'}}")
-          if canModifyCard
+            if cardMaximized
+              a.fa.fa-window-minimize.minimize-card-details.js-minimize-card-details(title="{{_ 'minimize-card'}}")
+            else
+              a.fa.fa-window-maximize.maximize-card-details.js-maximize-card-details(title="{{_ 'maximize-card'}}")
+          if currentUser.isBoardMember
             a.fa.fa-navicon.card-details-menu.js-open-card-details-menu(title="{{_ 'cardDetailsActionsPopup-title'}}")
             a.fa.fa-link.card-copy-button.js-copy-link(
               id="cardURL_copy"
@@ -30,7 +26,7 @@ template(name="cardDetails")
         else
           unless isPopup
             a.fa.fa-times-thin.close-card-details.js-close-card-details(title="{{_ 'close-card'}}")
-          if canModifyCard
+          if currentUser.isBoardMember
             a.fa.fa-navicon.card-details-menu-mobile-web.js-open-card-details-menu(title="{{_ 'cardDetailsActionsPopup-title'}}")
             a.fa.fa-link.card-copy-mobile-button.js-copy-link(
               id="cardURL_copy"
@@ -525,12 +521,12 @@ template(name="cardDetails")
                 a.fa.fa-times-thin.js-close-inlined-form
             else
               if currentBoard.allowsDescriptionText
-                a.js-open-inlined-form(title="{{_ 'edit'}}" value=title)
-                  i.fa.fa-pencil-square-o
-                a.js-open-inlined-form(title="{{_ 'edit'}}" value=title)
+                a.js-open-inlined-form
                   if getDescription
                     +viewer
                       = getDescription
+                  else
+                    | {{_ 'edit'}}
                 if (hasUnsavedValue 'cardDescription' _id)
                   p.quiet
                     | {{_ 'unsaved-description'}}
@@ -549,7 +545,7 @@ template(name="cardDetails")
         .card-checklist-attachmentGallery.card-checklists
           if currentBoard.allowsChecklists
             hr
-            +checklists(cardId = _id card = this)
+            +checklists(cardId = _id)
           if currentBoard.allowsSubtasks
             hr
             +subtasks(cardId = _id)
@@ -566,37 +562,29 @@ template(name="cardDetails")
             br
           | {{_ 'invalid-file'}}
           .card-checklist-attachmentGallery.card-attachmentGallery
+            +attachmentViewer
             +attachmentGallery
       hr
 
-      unless currentUser.isNoComments
-        .comment-title
-          h3.card-details-item-title
-            i.fa.fa-comment-o
-            | {{_ 'comments'}}
-
-        if currentBoard.allowsComments
-          if currentUser.isBoardMember
-            unless currentUser.isNoComments
-              +commentForm
-              +comments
-      hr
-
     .card-details-right
 
       unless currentUser.isNoComments
         .activity-title
           h3.card-details-item-title
             i.fa.fa-history
-            | {{ _ 'activities'}}
+            | {{ _ 'activity'}}
           if currentUser.isBoardMember
-            .material-toggle-switch(title="{{_ 'show-activities'}}")
-              if showActivities
-                input.toggle-switch(type="checkbox" id="toggleShowActivitiesCard" checked="checked")
+            .material-toggle-switch(title="{{_ 'hide-system-messages'}}")
+              //span.toggle-switch-title
+              if hiddenSystemMessages
+                input.toggle-switch(type="checkbox" id="toggleButton" checked="checked")
               else
-                input.toggle-switch(type="checkbox" id="toggleShowActivitiesCard")
-              label.toggle-label(for="toggleShowActivitiesCard")
-
+                input.toggle-switch(type="checkbox" id="toggleButton")
+              label.toggle-label(for="toggleButton")
+      if currentBoard.allowsComments
+        if currentUser.isBoardMember
+          unless currentUser.isNoComments
+            +commentForm
       unless currentUser.isNoComments
         if isLoaded.get
           if isLinkedCard

client/components/cards/cardDetails.js

@@ -1,4 +1,3 @@
-import { ReactiveCache } from '/imports/reactiveCache';
 import moment from 'moment/min/moment-with-locales';
 import { TAPi18n } from '/imports/i18n';
 import { DatePicker } from '/client/lib/datepicker';
@@ -63,13 +62,73 @@ BlazeComponent.extendComponent({
     return card.findWatcher(Meteor.userId());
   },
 
+  hiddenSystemMessages() {
+    return Meteor.user().hasHiddenSystemMessages();
+  },
+
   customFieldsGrid() {
-    return ReactiveCache.getCurrentUser().hasCustomFieldsGrid();
+    return Meteor.user().hasCustomFieldsGrid();
   },
 
 
   cardMaximized() {
-    return !Utils.getPopupCardId() && ReactiveCache.getCurrentUser().hasCardMaximized();
+    return !Utils.getPopupCardId() && Meteor.user().hasCardMaximized();
+  },
+
+  scrollParentContainer() {
+    const cardPanelWidth = 600;
+    const parentComponent = this.parentComponent();
+
+    /*
+        // Incomplete fix about bug where opening card scrolls to wrong place
+        // https://github.com/wekan/wekan/issues/4572#issuecomment-1184149395
+        // TODO sometimes parentComponent is not available, maybe because it's not
+        // yet created?!
+        if (!parentComponent) return;
+        const bodyBoardComponent = parentComponent.parentComponent();
+    */
+
+    //On Mobile View Parent is Board, Not Board Body. I cant see how this funciton should work then.
+    if (bodyBoardComponent === null) return;
+    const $cardView = this.$(this.firstNode());
+    const $cardContainer = bodyBoardComponent.$('.js-swimlanes');
+
+    /*
+        // Incomplete fix about bug where opening card scrolls to wrong place
+        // https://github.com/wekan/wekan/issues/4572#issuecomment-1184149395
+        // TODO sometimes cardContainer is not available, maybe because it's not yet
+        // created?!
+        if (!$cardContainer) return;
+    */
+
+    const cardContainerScroll = $cardContainer.scrollLeft();
+    const cardContainerWidth = $cardContainer.width();
+
+    const cardViewStart = $cardView.offset().left;
+    const cardViewEnd = cardViewStart + cardPanelWidth;
+
+    let offset = false;
+    if (cardViewStart < 0) {
+      offset = cardViewStart;
+    } else if (cardViewEnd > cardContainerWidth) {
+      offset = cardViewEnd - cardContainerWidth;
+    }
+
+    if (offset) {
+      bodyBoardComponent.scrollLeft(cardContainerScroll + offset);
+    }
+
+    //Scroll top
+    const cardViewStartTop = $cardView.offset().top;
+    const cardContainerScrollTop = $cardContainer.scrollTop();
+
+    let topOffset = false;
+    if (cardViewStartTop !== 100) {
+      topOffset = cardViewStartTop - 100;
+    }
+    if (topOffset !== false) {
+      bodyBoardComponent.scrollTop(cardContainerScrollTop + topOffset);
+    }
   },
 
   presentParentTask() {
@@ -84,7 +143,7 @@ BlazeComponent.extendComponent({
     const card = this.currentData();
     let result = '#';
     if (card) {
-      const board = ReactiveCache.getBoard(card.boardId);
+      const board = Boards.findOne(card.boardId);
       if (board) {
         result = FlowRouter.path('card', {
           boardId: card.boardId,
@@ -114,11 +173,6 @@ BlazeComponent.extendComponent({
     );
   },
 
-  isVerticalScrollbars() {
-    const user = ReactiveCache.getCurrentUser();
-    return user && user.isVerticalScrollbars();
-  },
-
   /** returns if the list id is the current list id
    * @param listId list id to check
    * @return is the list id the current list id ?
@@ -138,15 +192,15 @@ BlazeComponent.extendComponent({
         cardId: card._id,
         boardId: card.boardId,
         listId: card.listId,
-        user: ReactiveCache.getCurrentUser().username,
+        user: Meteor.user().username,
         url: '',
       };
 
-      const integrations = ReactiveCache.getIntegrations({
+      const integrations = Integrations.find({
         boardId: { $in: [card.boardId, Integrations.Const.GLOBAL_WEBHOOK_ID] },
         enabled: true,
         activities: { $in: ['CardDetailsRendered', 'all'] },
-      });
+      }).fetch();
 
       if (integrations.length > 0) {
         integrations.forEach((integration) => {
@@ -233,7 +287,7 @@ BlazeComponent.extendComponent({
     });
 
     function userIsMember() {
-      return ReactiveCache.getCurrentUser()?.isBoardMember();
+      return Meteor.user() && Meteor.user().isBoardMember();
     }
 
     // Disable sorting if the current user is not a board member
@@ -378,11 +432,8 @@ BlazeComponent.extendComponent({
           Session.set('cardDetailsIsDragging', false);
           Session.set('cardDetailsIsMouseDown', false);
         },
-        'click #toggleShowActivitiesCard'() {
-          this.data().toggleShowActivities();
-        },
-        'click #toggleHideCheckedChecklistItems'() {
-          this.data().toggleHideCheckedChecklistItems();
+        'click #toggleButton'() {
+          Meteor.call('toggleSystemMessages');
         },
         'click #toggleCustomFieldsGridButton'() {
           Meteor.call('toggleCustomFieldsGrid');
@@ -390,10 +441,20 @@ BlazeComponent.extendComponent({
         'click .js-maximize-card-details'() {
           Meteor.call('toggleCardMaximized');
           autosize($('.card-details'));
+          if (!Utils.isMiniScreen()) {
+            Meteor.setTimeout(() => {
+              this.scrollParentContainer();
+            }, 500);
+          }
         },
         'click .js-minimize-card-details'() {
           Meteor.call('toggleCardMaximized');
           autosize($('.card-details'));
+          if (!Utils.isMiniScreen()) {
+            Meteor.setTimeout(() => {
+              this.scrollParentContainer();
+            }, 500);
+          }
         },
         'click .js-vote'(e) {
           const forIt = $(e.target).hasClass('js-vote-positive');
@@ -590,7 +651,7 @@ Template.cardDetailsActionsPopup.helpers({
   },
 
   isBoardAdmin() {
-    return ReactiveCache.getCurrentUser().isBoardAdmin();
+    return Meteor.user().isBoardAdmin();
   },
 });
 
@@ -666,8 +727,19 @@ BlazeComponent.extendComponent({
 }).register('editCardTitleForm');
 
 Template.cardMembersPopup.onCreated(function () {
-  let currBoard = Utils.getCurrentBoard();
+  let currBoard = Boards.findOne(Session.get('currentBoard'));
   let members = currBoard.activeMembers();
+
+  // let query = {
+  //   "teams.teamId": { $in: currBoard.teams.map(t => t.teamId) },
+  // };
+
+  // let boardTeamUsers = Users.find(query, {
+  //   sort: { sort: 1 },
+  // });
+
+  // members = currBoard.activeMembers2(members, boardTeamUsers);
+
   this.members = new ReactiveVar(members);
 });
 
@@ -680,19 +752,29 @@ Template.cardMembersPopup.events({
 
 Template.cardMembersPopup.helpers({
   members() {
-    return _.sortBy(Template.instance().members.get(),'fullname');
+    return Template.instance().members.get();
   },
 });
 
 const filterMembers = (filterTerm) => {
-  let currBoard = Utils.getCurrentBoard();
+  let currBoard = Boards.findOne(Session.get('currentBoard'));
   let members = currBoard.activeMembers();
 
+  // let query = {
+  //   "teams.teamId": { $in: currBoard.teams.map(t => t.teamId) },
+  // };
+
+  // let boardTeamUsers = Users.find(query, {
+  //   sort: { sort: 1 },
+  // });
+
+  // members = currBoard.activeMembers2(members, boardTeamUsers);
+
   if (filterTerm) {
     members = members
       .map(member => ({
         member,
-        user: ReactiveCache.getUser(member.userId)
+        user: Users.findOne(member.userId)
       }))
       .filter(({ user }) =>
         (user.profile.fullname !== undefined && user.profile.fullname.toLowerCase().indexOf(filterTerm.toLowerCase()) !== -1)
@@ -731,11 +813,11 @@ Template.editCardAssignerForm.events({
 /** Move Card Dialog */
 (class extends DialogWithBoardSwimlaneList {
   getDialogOptions() {
-    const ret = ReactiveCache.getCurrentUser().getMoveAndCopyDialogOptions();
+    const ret = Meteor.user().getMoveAndCopyDialogOptions();
     return ret;
   }
   setDone(boardId, swimlaneId, listId, options) {
-    ReactiveCache.getCurrentUser().setMoveAndCopyDialogOption(this.currentBoardId, options);
+    Meteor.user().setMoveAndCopyDialogOption(this.currentBoardId, options);
     const card = this.data();
     const minOrder = card.getMinSort(listId, swimlaneId);
     card.move(boardId, swimlaneId, listId, minOrder - 1);
@@ -745,11 +827,11 @@ Template.editCardAssignerForm.events({
 /** Copy Card Dialog */
 (class extends DialogWithBoardSwimlaneList {
   getDialogOptions() {
-    const ret = ReactiveCache.getCurrentUser().getMoveAndCopyDialogOptions();
+    const ret = Meteor.user().getMoveAndCopyDialogOptions();
     return ret;
   }
   setDone(boardId, swimlaneId, listId, options) {
-    ReactiveCache.getCurrentUser().setMoveAndCopyDialogOption(this.currentBoardId, options);
+    Meteor.user().setMoveAndCopyDialogOption(this.currentBoardId, options);
     const card = this.data();
 
     // const textarea = $('#copy-card-title');
@@ -772,11 +854,11 @@ Template.editCardAssignerForm.events({
 /** Convert Checklist-Item to card dialog */
 (class extends DialogWithBoardSwimlaneList {
   getDialogOptions() {
-    const ret = ReactiveCache.getCurrentUser().getMoveAndCopyDialogOptions();
+    const ret = Meteor.user().getMoveAndCopyDialogOptions();
     return ret;
   }
   setDone(boardId, swimlaneId, listId, options) {
-    ReactiveCache.getCurrentUser().setMoveAndCopyDialogOption(this.currentBoardId, options);
+    Meteor.user().setMoveAndCopyDialogOption(this.currentBoardId, options);
     const card = this.data();
 
     const textarea = this.$('#copy-card-title');
@@ -790,7 +872,7 @@ Template.editCardAssignerForm.events({
         swimlaneId: swimlaneId,
         sort: 0,
       });
-      const card = ReactiveCache.getCard(_id);
+      const card = Cards.findOne(_id);
       const minOrder = card.getMinSort();
       card.move(card.boardId, card.swimlaneId, card.listId, minOrder - 1);
 
@@ -802,11 +884,11 @@ Template.editCardAssignerForm.events({
 /** Copy many cards dialog */
 (class extends DialogWithBoardSwimlaneList {
   getDialogOptions() {
-    const ret = ReactiveCache.getCurrentUser().getMoveAndCopyDialogOptions();
+    const ret = Meteor.user().getMoveAndCopyDialogOptions();
     return ret;
   }
   setDone(boardId, swimlaneId, listId, options) {
-    ReactiveCache.getCurrentUser().setMoveAndCopyDialogOption(this.currentBoardId, options);
+    Meteor.user().setMoveAndCopyDialogOption(this.currentBoardId, options);
     const card = this.data();
 
     const textarea = this.$('#copy-card-title');
@@ -850,15 +932,13 @@ BlazeComponent.extendComponent({
         'click .js-palette-color'() {
           this.currentColor.set(this.currentData().color);
         },
-        'click .js-submit'(event) {
-          event.preventDefault();
+        'click .js-submit'() {
           this.currentCard.setColor(this.currentColor.get());
-          Popup.back();
+          Popup.close();
         },
-        'click .js-remove-color'(event) {
-          event.preventDefault();
+        'click .js-remove-color'() {
           this.currentCard.setColor(null);
-          Popup.back();
+          Popup.close();
         },
       },
     ];
@@ -880,27 +960,27 @@ BlazeComponent.extendComponent({
   },
 
   boards() {
-    const ret = ReactiveCache.getBoards(
+    return Boards.find(
       {
         archived: false,
         'members.userId': Meteor.userId(),
-        _id: { $ne: ReactiveCache.getCurrentUser().getTemplatesBoardId() },
+        _id: {
+          $ne: Meteor.user().getTemplatesBoardId(),
+        },
       },
       {
         sort: { sort: 1 /* boards default sorting */ },
       },
     );
-    return ret;
   },
 
   cards() {
     const currentId = Utils.getCurrentCardId();
     if (this.parentBoard.get()) {
-      const ret = ReactiveCache.getCards({
+      return Cards.find({
         boardId: this.parentBoard.get(),
         _id: { $ne: currentId },
       });
-      return ret;
     } else {
       return [];
     }
@@ -924,7 +1004,7 @@ BlazeComponent.extendComponent({
 
   setParentCardId(cardId) {
     if (cardId) {
-      this.parentCard = ReactiveCache.getCard(cardId);
+      this.parentCard = Cards.findOne(cardId);
     } else {
       this.parentCard = null;
     }
@@ -943,7 +1023,7 @@ BlazeComponent.extendComponent({
         'click .js-delete': Popup.afterConfirm('cardDelete', function () {
           Popup.close();
           // verify that there are no linked cards
-          if (ReactiveCache.getCards({ linkedId: this._id }).length === 0) {
+          if (Cards.find({ linkedId: this._id }).count() === 0) {
             Cards.remove(this._id);
           } else {
             // TODO: Maybe later we can list where the linked cards are.
@@ -1482,8 +1562,8 @@ EscapeActions.register(
   () => {
     // if card description diverges from database due to editing
     // ask user whether changes should be applied
-    if (ReactiveCache.getCurrentUser()) {
-      if (ReactiveCache.getCurrentUser().profile.rescueCardDescription == true) {
+    if (Meteor.user()) {
+      if (Meteor.user().profile.rescueCardDescription == true) {
         currentDescription = document.getElementsByClassName("editor js-new-description-input").item(0)
         if (currentDescription?.value && !(currentDescription.value === Utils.getCurrentCard().getDescription())) {
           if (confirm(TAPi18n.__('rescue-card-description-dialogue'))) {
@@ -1517,8 +1597,19 @@ EscapeActions.register(
 );
 
 Template.cardAssigneesPopup.onCreated(function () {
-  let currBoard = Utils.getCurrentBoard();
+  let currBoard = Boards.findOne(Session.get('currentBoard'));
   let members = currBoard.activeMembers();
+
+  // let query = {
+  //   "teams.teamId": { $in: currBoard.teams.map(t => t.teamId) },
+  // };
+
+  // let boardTeamUsers = Users.find(query, {
+  //   sort: { sort: 1 },
+  // });
+
+  // members = currBoard.activeMembers2(members, boardTeamUsers);
+
   this.members = new ReactiveVar(members);
 });
 
@@ -1544,17 +1635,17 @@ Template.cardAssigneesPopup.helpers({
   },
 
   members() {
-    return _.sortBy(Template.instance().members.get(),'fullname');
+    return Template.instance().members.get();
   },
 
   user() {
-    return ReactiveCache.getUser(this.userId);
+    return Users.findOne(this.userId);
   },
 });
 
 Template.cardAssigneePopup.helpers({
   userData() {
-    return ReactiveCache.getUser(this.userId, {
+    return Users.findOne(this.userId, {
       fields: {
         profile: 1,
         username: 1,
@@ -1563,10 +1654,21 @@ Template.cardAssigneePopup.helpers({
   },
 
   memberType() {
-    const user = ReactiveCache.getUser(this.userId);
+    const user = Users.findOne(this.userId);
     return user && user.isBoardAdmin() ? 'admin' : 'normal';
   },
 
+  /*
+    presenceStatusClassName() {
+      const user = Users.findOne(this.userId);
+      const userPresence = presences.findOne({ userId: this.userId });
+      if (user && user.isInvitedTo(Session.get('currentBoard'))) return 'pending';
+      else if (!userPresence) return 'disconnected';
+      else if (Session.equals('currentBoard', userPresence.state.currentBoardId))
+        return 'active';
+      else return 'idle';
+    },
+  */
   isCardAssignee() {
     const card = Template.parentData();
     const cardAssignees = card.getAssignees();
@@ -1575,13 +1677,13 @@ Template.cardAssigneePopup.helpers({
   },
 
   user() {
-    return ReactiveCache.getUser(this.userId);
+    return Users.findOne(this.userId);
   },
 });
 
 Template.cardAssigneePopup.events({
   'click .js-remove-assignee'() {
-    ReactiveCache.getCard(this.cardId).unassignAssignee(this.userId);
+    Cards.findOne(this.cardId).unassignAssignee(this.userId);
     Popup.back();
   },
   'click .js-edit-profile': Popup.open('editProfile'),

client/components/cards/checklists.css

@@ -45,9 +45,6 @@ textarea.js-edit-checklist-item {
   border-radius: 16px;
   height: 100%;
 }
-.checklist-title {
-  padding: 10px;
-}
 .checklist-title .checkbox {
   float: left;
   width: 30px;

client/components/cards/checklists.jade

@@ -10,18 +10,17 @@ template(name="checklists")
           a.add-checklist-top.js-open-inlined-form(title="{{_ 'add-checklist'}}")
             i.fa.fa-plus
     if currentUser.isBoardMember
-      .material-toggle-switch(title="{{_ 'hide-finished-checklist'}}")
+      .material-toggle-switch(title="{{_ 'hide-checked-items'}}")
         //span.toggle-switch-title
-        if card.hideFinishedChecklistIfItemsAreHidden
-          input.toggle-switch(type="checkbox" id="toggleHideFinishedChecklist" checked="checked")
+        if hideCheckedItems
+          input.toggle-switch(type="checkbox" id="toggleHideCheckedItemsButton" checked="checked")
         else
-          input.toggle-switch(type="checkbox" id="toggleHideFinishedChecklist")
-        label.toggle-label(for="toggleHideFinishedChecklist")
+          input.toggle-switch(type="checkbox" id="toggleHideCheckedItemsButton")
+        label.toggle-label(for="toggleHideCheckedItemsButton")
 
   .card-checklist-items
     each checklist in checklists
-      if checklist.showChecklist card.hideFinishedChecklistIfItemsAreHidden
-        +checklistDetail(checklist = checklist card = card)
+      +checklistDetail(checklist = checklist)
 
   if canModifyCard
     +inlinedForm(autoclose=false classNames="js-add-checklist" cardId = cardId)
@@ -31,7 +30,7 @@ template(name="checklists")
         i.fa.fa-plus
 
 template(name="checklistDetail")
-  .js-checklist.checklist.nodragscroll
+  .js-checklist.checklist
     +inlinedForm(classNames="js-edit-checklist-title" checklist = checklist)
       +editChecklistItemForm(checklist = checklist)
     else
@@ -56,7 +55,7 @@ template(name="checklistDetail")
         .checklist-progress-text {{finishedPercent}}%
         .checklist-progress-bar
           .checklist-progress(style="width:{{finishedPercent}}%")
-    +checklistItems(checklist = checklist card = card)
+    +checklistItems(checklist = checklist)
 
 template(name="checklistDeletePopup")
   p {{_ 'confirm-checklist-delete-popup'}}
@@ -73,12 +72,6 @@ template(name="addChecklistItemForm")
       .material-toggle-switch(title="{{_ 'newlineBecomesNewChecklistItem'}}")
         input.toggle-switch(type="checkbox" id="toggleNewlineBecomesNewChecklistItem")
         label.toggle-label(for="toggleNewlineBecomesNewChecklistItem")
-        | {{_ 'newLineNewItem'}}
-      if $eq position 'top'
-        .material-toggle-switch(title="{{_ 'newlineBecomesNewChecklistItemOriginOrder'}}")
-          input.toggle-switch(type="checkbox" id="toggleNewlineBecomesNewChecklistItemOriginOrder")
-          label.toggle-label(for="toggleNewlineBecomesNewChecklistItemOriginOrder")
-          | {{_ 'originOrder'}}
 
 template(name="editChecklistItemForm")
   a.fa.fa-copy(title="{{_ 'copy-text-to-clipboard'}}")
@@ -99,10 +92,10 @@ template(name="editChecklistItemForm")
         | {{_ 'convertChecklistItemToCardPopup-title'}}
 
 template(name="checklistItems")
-  if checklist.items.length
+  if checklist.items.count
     if canModifyCard
       +inlinedForm(autoclose=false classNames="js-add-checklist-item" checklist = checklist position="top")
-        +addChecklistItemForm(checklist=checklist showNewlineBecomesNewChecklistItem=true position="top")
+        +addChecklistItemForm(checklist=checklist showNewlineBecomesNewChecklistItem=true)
       else
         a.add-checklist-item.js-open-inlined-form(title="{{_ 'add-checklist-item'}}")
           i.fa.fa-plus
@@ -111,7 +104,7 @@ template(name="checklistItems")
       +inlinedForm(classNames="js-edit-checklist-item" item = item checklist = checklist)
         +editChecklistItemForm(type = 'item' item = item checklist = checklist)
       else
-        +checklistItemDetail(item = item checklist = checklist card = card)
+        +checklistItemDetail(item = item checklist = checklist)
     if canModifyCard
       +inlinedForm(autoclose=false classNames="js-add-checklist-item" checklist = checklist)
         +addChecklistItemForm(checklist=checklist showNewlineBecomesNewChecklistItem=true)
@@ -120,7 +113,7 @@ template(name="checklistItems")
           i.fa.fa-plus
 
 template(name='checklistItemDetail')
-  .js-checklist-item.checklist-item(class="{{#if item.isFinished }}is-checked{{#if checklist.hideCheckedChecklistItems}} invisible{{/if}}{{/if}}{{#if checklist.hideAllChecklistItems}} is-checked invisible{{/if}}"
+  .js-checklist-item.checklist-item(class="{{#if item.isFinished }}is-checked{{#if hideCheckedItems}} invisible{{/if}}{{/if}}"
     role="checkbox" aria-checked="{{#if item.isFinished }}true{{else}}false{{/if}}" tabindex="0")
     if canModifyCard
       .check-box-container
@@ -148,24 +141,6 @@ template(name="checklistActionsPopup")
       a.js-copy-checklist.copy-checklist
         i.fa.fa-copy
         | {{_ "copyChecklist"}} ...
-      a.js-hide-checked-checklist-items
-        i.fa.fa-eye-slash
-        | {{_ "hideCheckedChecklistItems"}} ...
-        .material-toggle-switch(title="{{_ 'hide-checked-items'}}")
-          if checklist.hideCheckedChecklistItems
-            input.toggle-switch(type="checkbox" id="toggleHideCheckedChecklistItems_{{checklist._id}}" checked="checked")
-          else
-            input.toggle-switch(type="checkbox" id="toggleHideCheckedChecklistItems_{{checklist._id}}")
-          label.toggle-label(for="toggleHideCheckedChecklistItems_{{checklist._id}}")
-      a.js-hide-all-checklist-items
-        i.fa.fa-ban
-        | {{_ "hideAllChecklistItems"}} ...
-        .material-toggle-switch(title="{{_ 'hideAllChecklistItems'}}")
-          if checklist.hideAllChecklistItems
-            input.toggle-switch(type="checkbox" id="toggleHideAllChecklistItems_{{checklist._id}}" checked="checked")
-          else
-            input.toggle-switch(type="checkbox" id="toggleHideAllChecklistItems_{{checklist._id}}")
-          label.toggle-label(for="toggleHideAllChecklistItems_{{checklist._id}}")
 
 template(name="copyChecklistPopup")
   +copyAndMoveChecklist

client/components/cards/checklists.js

@@ -1,4 +1,3 @@
-import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';
 import Cards from '/models/cards';
 import Boards from '/models/boards';
@@ -55,7 +54,7 @@ BlazeComponent.extendComponent({
     });
 
     function userIsMember() {
-      return ReactiveCache.getCurrentUser()?.isBoardMember();
+      return Meteor.user() && Meteor.user().isBoardMember();
     }
 
     // Disable sorting if the current user is not a board member
@@ -85,11 +84,9 @@ BlazeComponent.extendComponent({
     const textarea = this.find('textarea.js-add-checklist-item');
     const title = textarea.value.trim();
     let cardId = this.currentData().cardId;
-    const card = ReactiveCache.getCard(cardId);
+    const card = Cards.findOne(cardId);
     //if (card.isLinked()) cardId = card.linkedId;
-    if (card.isLinkedCard()) {
-      cardId = card.linkedId;
-    }
+    if (card.isLinkedCard()) cardId = card.linkedId;
 
     let sortIndex;
     let checklistItemIndex;
@@ -119,7 +116,6 @@ BlazeComponent.extendComponent({
     event.preventDefault();
     const textarea = this.find('textarea.js-add-checklist-item');
     const newlineBecomesNewChecklistItem = this.find('input#toggleNewlineBecomesNewChecklistItem');
-    const newlineBecomesNewChecklistItemOriginOrder = this.find('input#toggleNewlineBecomesNewChecklistItemOriginOrder');
     const title = textarea.value.trim();
     const checklist = this.currentData().checklist;
 
@@ -128,28 +124,22 @@ BlazeComponent.extendComponent({
       if (newlineBecomesNewChecklistItem.checked) {
         checklistItems = title.split('\n').map(_value => _value.trim());
         if (this.currentData().position === 'top') {
-          if (newlineBecomesNewChecklistItemOriginOrder.checked === false) {
-            checklistItems = checklistItems.reverse();
-          }
+          checklistItems = checklistItems.reverse();
         }
       }
-      let addIndex;
-      let sortIndex;
-      if (this.currentData().position === 'top') {
-        sortIndex = Utils.calculateIndexData(null, checklist.firstItem()).base;
-        addIndex = -1;
-      } else {
-        sortIndex = Utils.calculateIndexData(checklist.lastItem(), null).base;
-        addIndex = 1;
-      }
       for (let checklistItem of checklistItems) {
+        let sortIndex;
+        if (this.currentData().position === 'top') {
+          sortIndex = Utils.calculateIndexData(null, checklist.firstItem()).base;
+        } else {
+          sortIndex = Utils.calculateIndexData(checklist.lastItem(), null).base;
+        }
         ChecklistItems.insert({
           title: checklistItem,
           checklistId: checklist._id,
           cardId: checklist.cardId,
           sort: sortIndex,
         });
-        sortIndex += addIndex;
       }
     }
     // We keep the form opened, empty it.
@@ -208,8 +198,15 @@ BlazeComponent.extendComponent({
   },
 
   events() {
+    const events = {
+      'click #toggleHideCheckedItemsButton'() {
+        Meteor.call('toggleHideCheckedItems');
+      },
+    };
+
     return [
       {
+        ...events,
         'click .js-open-checklist-details-menu': Popup.open('checklistActions'),
         'submit .js-add-checklist': this.addChecklist,
         'submit .js-edit-checklist-title': this.editChecklist,
@@ -220,10 +217,6 @@ BlazeComponent.extendComponent({
         'focus .js-add-checklist-item': this.focusChecklistItem,
         // add and delete checklist / checklist-item
         'click .js-open-inlined-form': this.closeAllInlinedForms,
-        'click #toggleHideFinishedChecklist'(event) {
-          event.preventDefault();
-          this.data().card.toggleHideFinishedChecklist();
-        },
         keydown: this.pressKey,
       },
     ];
@@ -237,26 +230,25 @@ BlazeComponent.extendComponent({
   },
 
   boards() {
-    const ret = ReactiveCache.getBoards(
+    return Boards.find(
       {
         archived: false,
         'members.userId': Meteor.userId(),
-        _id: { $ne: ReactiveCache.getCurrentUser().getTemplatesBoardId() },
+        _id: { $ne: Meteor.user().getTemplatesBoardId() },
       },
       {
         sort: { sort: 1 /* boards default sorting */ },
       },
     );
-    return ret;
   },
 
   swimlanes() {
-    const board = ReactiveCache.getBoard(this.selectedBoardId.get());
+    const board = Boards.findOne(this.selectedBoardId.get());
     return board.swimlanes();
   },
 
   aBoardLists() {
-    const board = ReactiveCache.getBoard(this.selectedBoardId.get());
+    const board = Boards.findOne(this.selectedBoardId.get());
     return board.lists();
   },
 
@@ -274,10 +266,15 @@ BlazeComponent.extendComponent({
 
 Template.checklists.helpers({
   checklists() {
-    const card = ReactiveCache.getCard(this.cardId);
+    const card = Cards.findOne(this.cardId);
     const ret = card.checklists();
     return ret;
   },
+  hideCheckedItems() {
+    const currentUser = Meteor.user();
+    if (currentUser) return currentUser.hasHideCheckedItems();
+    return false;
+  },
 });
 
 BlazeComponent.extendComponent({
@@ -312,16 +309,6 @@ BlazeComponent.extendComponent({
         }),
         'click .js-move-checklist': Popup.open('moveChecklist'),
         'click .js-copy-checklist': Popup.open('copyChecklist'),
-        'click .js-hide-checked-checklist-items'(event) {
-          event.preventDefault();
-          this.data().checklist.toggleHideCheckedChecklistItems();
-          Popup.back();
-        },
-        'click .js-hide-all-checklist-items'(event) {
-          event.preventDefault();
-          this.data().checklist.toggleHideAllChecklistItems();
-          Popup.back();
-        },
       }
     ]
   }
@@ -347,6 +334,11 @@ BlazeComponent.extendComponent({
 }).register('editChecklistItemForm');
 
 Template.checklistItemDetail.helpers({
+  hideCheckedItems() {
+    const user = Meteor.user();
+    if (user) return user.hasHideCheckedItems();
+    return false;
+  },
 });
 
 BlazeComponent.extendComponent({
@@ -369,11 +361,11 @@ BlazeComponent.extendComponent({
 /** Move Checklist Dialog */
 (class extends DialogWithBoardSwimlaneListCard {
   getDialogOptions() {
-    const ret = ReactiveCache.getCurrentUser().getMoveChecklistDialogOptions();
+    const ret = Meteor.user().getMoveChecklistDialogOptions();
     return ret;
   }
   setDone(cardId, options) {
-    ReactiveCache.getCurrentUser().setMoveChecklistDialogOption(this.currentBoardId, options);
+    Meteor.user().setMoveChecklistDialogOption(this.currentBoardId, options);
     this.data().checklist.move(cardId);
   }
 }).register('moveChecklistPopup');
@@ -381,11 +373,11 @@ BlazeComponent.extendComponent({
 /** Copy Checklist Dialog */
 (class extends DialogWithBoardSwimlaneListCard {
   getDialogOptions() {
-    const ret = ReactiveCache.getCurrentUser().getCopyChecklistDialogOptions();
+    const ret = Meteor.user().getCopyChecklistDialogOptions();
     return ret;
   }
   setDone(cardId, options) {
-    ReactiveCache.getCurrentUser().setCopyChecklistDialogOption(this.currentBoardId, options);
+    Meteor.user().setCopyChecklistDialogOption(this.currentBoardId, options);
     this.data().checklist.copy(cardId);
   }
 }).register('copyChecklistPopup');

client/components/cards/labels.jade

@@ -37,4 +37,5 @@ template(name="cardLabelsPopup")
               = name
             if(isLabelSelected ../_id)
               i.card-label-selectable-icon.fa.fa-check
-  a.quiet-button.full.js-add-label {{_ 'label-create'}}
+  if currentUser.isBoardAdmin
+    a.quiet-button.full.js-add-label {{_ 'label-create'}}

client/components/cards/labels.js

@@ -1,5 +1,3 @@
-import { ReactiveCache } from '/imports/reactiveCache';
-
 let labelColors;
 Meteor.startup(() => {
   labelColors = Boards.simpleSchema()._schema['labels.$.color'].allowedValues;
@@ -34,7 +32,7 @@ Template.createLabelPopup.helpers({
   // is not already used in the board (although it's not a problem if two
   // labels have the same color).
   defaultColor() {
-    const labels = Utils.getCurrentBoard().labels;
+    const labels = Boards.findOne(Session.get('currentBoard')).labels;
     const usedColors = _.pluck(labels, 'color');
     const availableColors = _.difference(labelColors, usedColors);
     return availableColors.length > 1 ? availableColors[0] : labelColors[0];
@@ -52,8 +50,7 @@ BlazeComponent.extendComponent({
       appendTo: '.edit-labels-pop-over',
       helper(element, currentItem) {
         let ret = currentItem.clone();
-        if (currentItem.closest('.popup-container-depth-0').length == 0)
-        { // only set css transform at every sub-popup, not at the main popup
+        if (currentItem.closest('.popup-container-depth-0').size() == 0) { // only set css transform at every sub-popup, not at the main popup
           const content = currentItem.closest('.content')[0]
           const offsetLeft = content.offsetLeft;
           const offsetTop = $('.pop-over > .header').height() * -1;
@@ -120,7 +117,7 @@ Template.createLabelPopup.events({
   // Create the new label
   'submit .create-label'(event, templateInstance) {
     event.preventDefault();
-    const board = Utils.getCurrentBoard();
+    const board = Boards.findOne(Session.get('currentBoard'));
     const name = templateInstance
       .$('#labelName')
       .val()
@@ -133,13 +130,13 @@ Template.createLabelPopup.events({
 
 Template.editLabelPopup.events({
   'click .js-delete-label': Popup.afterConfirm('deleteLabel', function () {
-    const board = Utils.getCurrentBoard();
+    const board = Boards.findOne(Session.get('currentBoard'));
     board.removeLabel(this._id);
     Popup.back(2);
   }),
   'submit .edit-label'(event, templateInstance) {
     event.preventDefault();
-    const board = Utils.getCurrentBoard();
+    const board = Boards.findOne(Session.get('currentBoard'));
     const name = templateInstance
       .$('#labelName')
       .val()
@@ -152,6 +149,6 @@ Template.editLabelPopup.events({
 
 Template.cardLabelsPopup.helpers({
   isLabelSelected(cardId) {
-    return _.contains(ReactiveCache.getCard(cardId).labelIds, this._id);
+    return _.contains(Cards.findOne(cardId).labelIds, this._id);
   },
 });

client/components/cards/minicard.css

@@ -47,12 +47,10 @@
   float: right;
   font-size: 18px;
   padding-right: 30px;
-  padding-left: 5px;
 }
 .minicard-details-menu {
   float: right;
   font-size: 18px;
-  padding-left: 5px;
 }
 @media print {
   .minicard-details-menu,
@@ -92,7 +90,7 @@
   background-size: contain;
   height: 145px;
   user-select: none;
-  margin: 6px -8px 6px -8px;
+  margin: -6px -8px 6px -8px;
   border-radius: top 2px;
 }
 .minicard .minicard-labels {
@@ -158,6 +156,7 @@
   .minicard .minicard-title .viewer {
     display: block;
     word-wrap: break-word;
+    max-width: 230px;
   }
 }
 .minicard .dates {
@@ -249,7 +248,6 @@
 }
 .minicard .minicard-description {
   padding: 6px 0 0 8px;
-  color: #000;
   background-color: #eee;
   width: 100%;
   margin-bottom: 2px;

client/components/cards/minicard.jade

@@ -1,15 +1,14 @@
 template(name="minicard")
-  .minicard.nodragscroll(
+  .minicard(
     class="{{#if isLinkedCard}}linked-card{{/if}}"
     class="{{#if isLinkedBoard}}linked-board{{/if}}"
     class="{{#if colorClass}}minicard-{{colorClass}}{{/if}}")
-    if canModifyCard
-      if isTouchScreenOrShowDesktopDragHandles
-        a.fa.fa-navicon.minicard-details-menu-with-handle.js-open-minicard-details-menu(title="{{_ 'cardDetailsActionsPopup-title'}}")
-        .handle
-          .fa.fa-arrows
-      else
-        a.fa.fa-navicon.minicard-details-menu.js-open-minicard-details-menu(title="{{_ 'cardDetailsActionsPopup-title'}}")
+    if isTouchScreenOrShowDesktopDragHandles
+      a.fa.fa-navicon.minicard-details-menu-with-handle.js-open-minicard-details-menu(title="{{_ 'cardDetailsActionsPopup-title'}}")
+      .handle
+        .fa.fa-arrows
+    else
+      a.fa.fa-navicon.minicard-details-menu.js-open-minicard-details-menu(title="{{_ 'cardDetailsActionsPopup-title'}}")
     .dates
       if getReceived
         unless getStart
@@ -124,17 +123,17 @@ template(name="minicard")
           each getMembers
             +userAvatar(userId=this)
 
-    if showCreatorOnMinicard
+    if showCreator
       .minicard-creator
         +userAvatar(userId=this.userId noRemove=true)
 
     .badges
-      if canModifyCard
-        if comments.length
-          .badge(title="{{_ 'card-comments-title' comments.length }}")
-            span.badge-icon.fa.fa-comment-o.badge-comment.badge-text
+      unless currentUser.isNoComments
+        if comments.count
+          .badge(title="{{_ 'card-comments-title' comments.count }}")
+            span.badge-icon.fa.fa-comment-o.badge-comment
               = ' '
-              = comments.length
+              = comments.count
             //span.badge-comment.badge-text
             //|  {{_ 'comment'}}
       if getDescription
@@ -157,7 +156,7 @@ template(name="minicard")
           .badge
             span.badge-icon.fa.fa-paperclip
             span.badge-text= attachments.length
-      if checklists.length
+      if checklists.count
         .badge(class="{{#if checklistFinished}}is-finished{{/if}}")
           span.badge-icon.fa.fa-check-square-o
           span.badge-text.check-list-text {{checklistFinishedCount}}/{{checklistItemCount}}
@@ -184,11 +183,12 @@ template(name="editCardSortOrderPopup")
 
 template(name="minicardDetailsActionsPopup")
   ul.pop-over-list
-    if canModifyCard
+    if currentUser.isBoardAdmin
       li
         a.js-move-card
           i.fa.fa-arrow-right
           | {{_ 'moveCardPopup-title'}}
+    unless currentUser.isWorker
       li
         a.js-copy-card
           i.fa.fa-copy

client/components/cards/minicard.js

@@ -1,4 +1,3 @@
-import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';
 import { CustomFieldStringTemplate } from '/client/lib/customFields'
 
@@ -37,42 +36,38 @@ BlazeComponent.extendComponent({
     return ret;
   },
 
-  showCreatorOnMinicard() {
-    // cache "board" to reduce the mini-mongodb access
-    const board = this.data().board();
-    let ret = false;
-    if (board) {
-      ret = board.allowsCreatorOnMinicard ?? false;
+  showCreator() {
+    if (this.data().board()) {
+      return (
+        this.data().board.allowsCreator === null ||
+        this.data().board().allowsCreator === undefined ||
+        this.data().board().allowsCreator
+      );
+      // return this.data().board().allowsCreator;
     }
-    return ret;
+    return false;
   },
 
   showMembers() {
-    // cache "board" to reduce the mini-mongodb access
-    const board = this.data().board();
-    let ret = false;
-    if (board) {
-      ret =
-        board.allowsMembers === null ||
-        board.allowsMembers === undefined ||
-        board.allowsMembers
-      ;
+    if (this.data().board()) {
+      return (
+        this.data().board.allowsMembers === null ||
+        this.data().board().allowsMembers === undefined ||
+        this.data().board().allowsMembers
+      );
     }
-    return ret;
+    return false;
   },
 
   showAssignee() {
-    // cache "board" to reduce the mini-mongodb access
-    const board = this.data().board();
-    let ret = false;
-    if (board) {
-      ret =
-        board.allowsAssignee === null ||
-        board.allowsAssignee === undefined ||
-        board.allowsAssignee
-      ;
+    if (this.data().board()) {
+      return (
+        this.data().board.allowsAssignee === null ||
+        this.data().board().allowsAssignee === undefined ||
+        this.data().board().allowsAssignee
+      );
     }
-    return ret;
+    return false;
   },
 
   /** opens the card label popup only if clicked onto a label
@@ -110,7 +105,7 @@ BlazeComponent.extendComponent({
 
 Template.minicard.helpers({
   hiddenMinicardLabelText() {
-    const currentUser = ReactiveCache.getCurrentUser();
+    currentUser = Meteor.user();
     if (currentUser) {
       return (currentUser.profile || {}).hiddenMinicardLabelText;
     } else if (window.localStorage.getItem('hiddenMinicardLabelText')) {

client/components/cards/subtasks.jade

@@ -26,7 +26,8 @@ template(name="subtaskDetail")
       .subtask-title
         span
         if canModifyCard
-          a.fa.fa-navicon.subtask-details-menu.js-open-subtask-details-menu(title="{{_ 'subtaskActionsPopup-title'}}")
+          if currentUser.isBoardAdmin
+            a.fa.fa-navicon.subtask-details-menu.js-open-subtask-details-menu(title="{{_ 'subtaskActionsPopup-title'}}")
         if canModifyCard
           h2.title.js-open-inlined-form.is-editable
             +viewer
@@ -94,8 +95,7 @@ template(name="subtaskActionsPopup")
       a.js-view-subtask(title="{{ subtask.title }}")
         i.fa.fa-eye
         | {{_ "view-it"}}
-      if currentUser.isBoardAdmin
-        a.js-delete-subtask.delete-subtask
-          i.fa.fa-trash
-          | {{_ "delete"}} ...
+      a.js-delete-subtask.delete-subtask
+        i.fa.fa-trash
+        | {{_ "delete"}} ...
 

client/components/cards/subtasks.js

@@ -1,24 +1,22 @@
-import { ReactiveCache } from '/imports/reactiveCache';
-
 BlazeComponent.extendComponent({
   addSubtask(event) {
     event.preventDefault();
     const textarea = this.find('textarea.js-add-subtask-item');
     const title = textarea.value.trim();
     const cardId = this.currentData().cardId;
-    const card = ReactiveCache.getCard(cardId);
+    const card = Cards.findOne(cardId);
     const sortIndex = -1;
-    const crtBoard = ReactiveCache.getBoard(card.boardId);
+    const crtBoard = Boards.findOne(card.boardId);
     const targetBoard = crtBoard.getDefaultSubtasksBoard();
     const listId = targetBoard.getDefaultSubtasksListId();
 
     //Get the full swimlane data for the parent task.
-    const parentSwimlane = ReactiveCache.getSwimlane({
+    const parentSwimlane = Swimlanes.findOne({
       boardId: crtBoard._id,
       _id: card.swimlaneId,
     });
     //find the swimlane of the same name in the target board.
-    const targetSwimlane = ReactiveCache.getSwimlane({
+    const targetSwimlane = Swimlanes.findOne({
       boardId: targetBoard._id,
       title: parentSwimlane.title,
     });
@@ -68,10 +66,6 @@ BlazeComponent.extendComponent({
     }
   },
 
-  isBoardAdmin() {
-    return ReactiveCache.getCurrentUser().isBoardAdmin();
-  },
-
   editSubtask(event) {
     event.preventDefault();
     const textarea = this.find('textarea.js-edit-subtask-item');
@@ -108,9 +102,6 @@ BlazeComponent.extendComponent({
 }).register('subtaskItemDetail');
 
 BlazeComponent.extendComponent({
-  isBoardAdmin() {
-    return ReactiveCache.getCurrentUser().isBoardAdmin();
-  },
   events() {
     return [
       {
@@ -136,14 +127,3 @@ BlazeComponent.extendComponent({
     ]
   }
 }).register('subtaskActionsPopup');
-
-Template.editSubtaskItemForm.helpers({
-  user() {
-    return ReactiveCache.getUser(this.userId);
-  },
-  isBoardAdmin() {
-    return ReactiveCache.getCurrentUser().isBoardAdmin();
-  },
-});
-
-

client/components/import/csvMembersMapper.js

@@ -1,5 +1,3 @@
-import { ReactiveCache } from '/imports/reactiveCache';
-
 export function csvGetMembersToMap(data) {
   // we will work on the list itself (an ordered array of objects) when a
   // mapping is done, we add a 'wekan' field to the object representing the
@@ -30,7 +28,7 @@ export function csvGetMembersToMap(data) {
       username: importedMember,
       id: importedMember,
     };
-    const wekanUser = ReactiveCache.getUser({ username: importedMember.username });
+    const wekanUser = Users.findOne({ username: importedMember.username });
     if (wekanUser) importedMember.wekanId = wekanUser._id;
     membersToMap.push(importedMember);
   }

client/components/import/import.js

@@ -1,4 +1,3 @@
-import { ReactiveCache } from '/imports/reactiveCache';
 import { trelloGetMembersToMap } from './trelloMembersMapper';
 import { wekanGetMembersToMap } from './wekanMembersMapper';
 import { csvGetMembersToMap } from './csvMembersMapper';
@@ -175,9 +174,9 @@ BlazeComponent.extendComponent({
             this._refreshMembers(
               this.members().map(member => {
                 if (!member.wekanId) {
-                  let user = ReactiveCache.getUser({ username: member.username });
+                  let user = Users.findOne({ username: member.username });
                   if (!user) {
-                    user = ReactiveCache.getUser({ importUsernames: member.username });
+                    user = Users.findOne({ importUsernames: member.username });
                   }
                   if (user) {
                     // eslint-disable-next-line no-console

client/components/import/trelloMembersMapper.js

@@ -1,5 +1,3 @@
-import { ReactiveCache } from '/imports/reactiveCache';
-
 export function trelloGetMembersToMap(data) {
   // we will work on the list itself (an ordered array of objects) when a
   // mapping is done, we add a 'wekan' field to the object representing the
@@ -7,7 +5,7 @@ export function trelloGetMembersToMap(data) {
   const membersToMap = data.members;
   // auto-map based on username
   membersToMap.forEach(importedMember => {
-    const wekanUser = ReactiveCache.getUser({ username: importedMember.username });
+    const wekanUser = Users.findOne({ username: importedMember.username });
     if (wekanUser) {
       importedMember.wekanId = wekanUser._id;
     }

client/components/import/wekanMembersMapper.js

@@ -1,5 +1,3 @@
-import { ReactiveCache } from '/imports/reactiveCache';
-
 export function wekanGetMembersToMap(data) {
   // we will work on the list itself (an ordered array of objects) when a
   // mapping is done, we add a 'wekan' field to the object representing the
@@ -17,7 +15,7 @@ export function wekanGetMembersToMap(data) {
       importedMember.fullName = user.profile.fullname;
     }
     importedMember.username = user.username;
-    const wekanUser = ReactiveCache.getUser({ username: importedMember.username });
+    const wekanUser = Users.findOne({ username: importedMember.username });
     if (wekanUser) {
       importedMember.wekanId = wekanUser._id;
     }

client/components/lists/list.css

@@ -7,16 +7,18 @@
   border-left: 1px solid #ccc;
   padding: 0;
   float: left;
-}
-[id^="swimlane-"] .list:first-child {
-  min-width: 20px;
-}
-.list.list-auto-width {
-  flex: 1;
+  min-width: 270px;
+  max-width: 270px;
+  /* Reverted incomplete change list width: */
+  /* https://github.com/wekan/wekan/issues/4558 */
+  /* Orinal width: 270px. Changes not saved yet: */
+  /*resize: both;  - List width and height resizeable */
+  /* overflow: auto; - List width and height resizeable */
 }
 .list:first-child {
+  min-width: 20px;
+  margin-left: 5px;
   border-left: none;
-  flex: none;
 }
 .card-details + .list {
   border-left: none;
@@ -35,9 +37,6 @@
   box-shadow: none;
   height: 100px;
 }
-.list.list-collapsed {
-  flex: none;
-}
 .list.list-composer .open-list-composer,
 .list .list-composer .open-list-composer {
   color: #8c8c8c;
@@ -49,7 +48,7 @@
 }
 .list-header-add {
   flex: 0 0 auto;
-  padding: 12px;
+  padding: 20px 12px 4px;
   position: relative;
   min-height: 20px;
 }
@@ -82,20 +81,6 @@
   overflow: hidden;
   text-overflow: ellipsis;
   word-wrap: break-word;
-}
-.list-rotated {
-  width: 10px;
-  height: 250px;
-  margin-top: -90px;
-  margin-left: -110px;
-  margin-right: 0;
-  transform: rotate(90deg);
-  position: relative;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.list-header .list-rotated {
-
 }
 .list-header .list-header-watch-icon {
   padding-left: 10px;
@@ -114,23 +99,6 @@
   color: #a6a6a6;
   margin-right: 15px;
 }
-.list-header .list-header-collapse-right {
-  color: #a6a6a6;
-}
-.list-header .list-header-collapse-left {
-  color: #a6a6a6;
-  margin-right: 15px;
-}
-.list-header .list-header-uncollapse-left {
-  color: #a6a6a6;
-}
-.list-header .list-header-uncollapse-right {
-  color: #a6a6a6;
-}
-.list-header .list-header-collapse {
-  color: #a6a6a6;
-  margin-right: 15px;
-}
 .list-header .highlight {
   color: #ce1414;
 }
@@ -211,9 +179,6 @@
 #js-wip-limit-edit div {
   float: left;
 }
-#js-list-width-edit .list-width-error {
-  display: none;
-}
 @media screen and (max-width: 800px) {
   .mini-list {
     flex: 0 0 60px;
@@ -252,11 +217,11 @@
     padding: 15px 19px;
   }
   .list-header {
-	  /*Updated padding values for mobile devices, this should fix text grouping issue*/
-    padding: 20px 0px 20px 0px;
+    padding: 0 12px 0px;
     border-bottom: 0px solid #e4e4e4;
-    min-height: 30px;
+    height: 60px;
     margin-top: 10px;
+    display: flex;
     align-items: center;
   }
   .list-header .list-header-left-icon {
@@ -329,6 +294,7 @@
 }
 .list-header-white {
   border-bottom: 6px solid #fff;
+  border: 1px solid #eee;
 }
 .list-header-green {
   border-bottom: 6px solid #3cb500;
@@ -361,7 +327,7 @@
   border-bottom: 6px solid #51e898;
 }
 .list-header-silver {
-  border-bottom: 6px solid #e4e4e4;
+  border-bottom: 6px solid unset;
 }
 .list-header-peachpuff {
   border-bottom: 6px solid #ffdab9;

client/components/lists/list.jade

@@ -1,7 +1,5 @@
 template(name='list')
-  .list.js-list(id="js-list-{{_id}}"
-                style="{{#unless collapsed}}min-width:{{listWidth}}px;max-width:{{listConstraint}}px;{{/unless}}"
-                class="{{#if collapsed}}list-collapsed{{/if}} {{#if autoWidth}}list-auto-width{{/if}}")
+  .list.js-list(id="js-list-{{_id}}")
     +listHeader
     +listBody
 

client/components/lists/list.js

@@ -1,4 +1,3 @@
-import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';
 require('/client/lib/jquery-ui.js')
 
@@ -24,6 +23,14 @@ BlazeComponent.extendComponent({
   onRendered() {
     const boardComponent = this.parentComponent().parentComponent();
 
+    function userIsMember() {
+      return (
+        Meteor.user() &&
+        Meteor.user().isBoardMember() &&
+        !Meteor.user().isCommentOnly()
+      );
+    }
+
     const itemsSelector = '.js-minicard:not(.placeholder, .js-card-composer)';
     const $cards = this.$('.js-minicards');
 
@@ -68,7 +75,7 @@ BlazeComponent.extendComponent({
         const nCards = MultiSelection.isActive() ? MultiSelection.count() : 1;
         const sortIndex = calculateIndex(prevCardDom, nextCardDom, nCards);
         const listId = Blaze.getData(ui.item.parents('.list').get(0))._id;
-        const currentBoard = Utils.getCurrentBoard();
+        const currentBoard = Boards.findOne(Session.get('currentBoard'));
         const defaultSwimlaneId = currentBoard.getDefaultSwimline()._id;
         let targetSwimlaneId = null;
 
@@ -90,7 +97,7 @@ BlazeComponent.extendComponent({
         $cards.sortable('cancel');
 
         if (MultiSelection.isActive()) {
-          ReactiveCache.getCards(MultiSelection.getMongoSelector(), { sort: ['sort'] }).forEach((card, i) => {
+          Cards.find(MultiSelection.getMongoSelector(), { sort: ['sort'] }).forEach((card, i) => {
             const newSwimlaneId = targetSwimlaneId
               ? targetSwimlaneId
               : card.swimlaneId || defaultSwimlaneId;
@@ -162,9 +169,9 @@ BlazeComponent.extendComponent({
           'option',
           'disabled',
           // Disable drag-dropping when user is not member
-          !Utils.canModifyBoard(),
+          !userIsMember(),
           // Not disable drag-dropping while in multi-selection mode
-          // MultiSelection.isActive() || !Utils.canModifyBoard(),
+          // MultiSelection.isActive() || !userIsMember(),
         );
       }
     });
@@ -174,13 +181,14 @@ BlazeComponent.extendComponent({
       const currentBoardId = Tracker.nonreactive(() => {
         return Session.get('currentBoard');
       });
+      Cards.find({ boardId: currentBoardId }).fetch();
       Tracker.afterFlush(() => {
         $cards.find(itemsSelector).droppable({
           hoverClass: 'draggable-hover-card',
           accept: '.js-member,.js-label',
           drop(event, ui) {
             const cardId = Blaze.getData(this)._id;
-            const card = ReactiveCache.getCard(cardId);
+            const card = Cards.findOne(cardId);
 
             if (ui.draggable.hasClass('js-member')) {
               const memberId = Blaze.getData(ui.draggable.get(0)).userId;
@@ -194,24 +202,6 @@ BlazeComponent.extendComponent({
       });
     });
   },
-
-  listWidth() {
-    const user = ReactiveCache.getCurrentUser();
-    const list = Template.currentData();
-    return user.getListWidth(list.boardId, list._id);
-  },
-
-  listConstraint() {
-    const user = ReactiveCache.getCurrentUser();
-    const list = Template.currentData();
-    return user.getListConstraint(list.boardId, list._id);
-  },
-
-  autoWidth() {
-    const user = ReactiveCache.getCurrentUser();
-    const list = Template.currentData();
-    return user.isAutoWidth(list.boardId);
-  },
 }).register('list');
 
 Template.miniList.events({

client/components/lists/listBody.jade

@@ -1,38 +1,37 @@
 template(name="listBody")
-  unless collapsed
-    .list-body(class="{{#unless isVerticalScrollbars}}no-scrollbars{{/unless}}")
-      .minicards.clearfix.js-minicards(class="{{#if reachedWipLimit}}js-list-full{{/if}}")
-        if cards.length
-          +inlinedForm(autoclose=false position="top")
-            +addCardForm(listId=_id position="top")
-        ul.sidebar-list
-          each customFieldsSum
-            li
+  .list-body
+    .minicards.clearfix.js-minicards(class="{{#if reachedWipLimit}}js-list-full{{/if}}")
+      if cards.count
+        +inlinedForm(autoclose=false position="top")
+          +addCardForm(listId=_id position="top")
+      ul.sidebar-list
+        each customFieldsSum
+          li
+            +viewer
+              = name
+            if $eq customFieldsSum.type "number"
               +viewer
-                = name
-              if $eq customFieldsSum.type "number"
-                +viewer
-                  = value
-              if $eq customFieldsSum.type "currency"
-                +viewer
-                  = formattedCurrencyCustomFieldValue(value)
-        each (cardsWithLimit (idOrNull ../../_id))
-          a.minicard-wrapper.js-minicard(href=originRelativeUrl
-            class="{{#if cardIsSelected}}is-selected{{/if}}"
-            class="{{#if MultiSelection.isSelected _id}}is-checked{{/if}}")
-            if MultiSelection.isActive
-              .materialCheckBox.multi-selection-checkbox.js-toggle-multi-selection(
-                class="{{#if MultiSelection.isSelected _id}}is-checked{{/if}}")
-            +minicard(this)
-        if (showSpinner (idOrNull ../../_id))
-          +spinnerList
+                = value
+            if $eq customFieldsSum.type "currency"
+              +viewer
+                = formattedCurrencyCustomFieldValue(value)
+      each (cardsWithLimit (idOrNull ../../_id))
+        a.minicard-wrapper.js-minicard(href=originRelativeUrl
+          class="{{#if cardIsSelected}}is-selected{{/if}}"
+          class="{{#if MultiSelection.isSelected _id}}is-checked{{/if}}")
+          if MultiSelection.isActive
+            .materialCheckBox.multi-selection-checkbox.js-toggle-multi-selection(
+              class="{{#if MultiSelection.isSelected _id}}is-checked{{/if}}")
+          +minicard(this)
+      if (showSpinner (idOrNull ../../_id))
+        +spinnerList
 
-        if canSeeAddCard
-          +inlinedForm(autoclose=false position="bottom")
-            +addCardForm(listId=_id position="bottom")
-          else
-            a.open-minicard-composer.js-card-composer.js-open-inlined-form(title="{{_ 'add-card-to-bottom-of-list'}}")
-              i.fa.fa-plus
+      if canSeeAddCard
+        +inlinedForm(autoclose=false position="bottom")
+          +addCardForm(listId=_id position="bottom")
+        else
+          a.open-minicard-composer.js-card-composer.js-open-inlined-form(title="{{_ 'add-card-to-bottom-of-list'}}")
+            i.fa.fa-plus
 
 template(name="spinnerList")
   .sk-spinner.sk-spinner-list(
@@ -80,23 +79,23 @@ template(name="linkCardPopup")
     select.js-select-boards
       option(value="")
       each boards
-        option(value="{{_id}}") {{isTitleDefault title}}
+        option(value="{{_id}}") {{title}}
     input.primary.confirm.js-link-board(type="button" value="{{_ 'link'}}")
 
   label {{_ 'swimlanes'}}:
   select.js-select-swimlanes
     each swimlanes
-      option(value="{{_id}}") {{isTitleDefault title}}
+      option(value="{{_id}}") {{title}}
 
   label {{_ 'lists'}}:
   select.js-select-lists
     each lists
-      option(value="{{_id}}") {{isTitleDefault title}}
+      option(value="{{_id}}") {{title}}
 
   label {{_ 'cards'}}:
   select.js-select-cards
     each cards
-      option(value="{{getRealId}}") {{getTitle}}
+      option(value="{{getId}}") {{getTitle}}
 
   .edit-controls.clearfix
     input.primary.confirm.js-done(type="button" value="{{_ 'link'}}")

client/components/lists/listBody.js

@@ -1,4 +1,3 @@
-import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';
 import { Spinner } from '/client/lib/spinner';
 
@@ -16,11 +15,10 @@ BlazeComponent.extendComponent({
   },
 
   customFieldsSum() {
-    const ret = ReactiveCache.getCustomFields({
+    return CustomFields.find({
       boardIds: { $in: [Session.get('currentBoard')] },
       showSumAtTopOfList: true,
     });
-    return ret;
   },
 
   openForm(options) {
@@ -66,7 +64,7 @@ BlazeComponent.extendComponent({
         swimlaneId = this.parentComponent()
           .parentComponent()
           .data()._id; // Always swimlanes view
-        const swimlane = ReactiveCache.getSwimlane(swimlaneId);
+        const swimlane = Swimlanes.findOne(swimlaneId);
         // If this is the card templates swimlane, insert a card template
         if (swimlane.isCardTemplatesSwimlane()) cardType = 'template-card';
         // If this is the board templates swimlane, insert a board template and a linked card
@@ -114,7 +112,7 @@ BlazeComponent.extendComponent({
       // to appear
       const cardCount = this.data()
         .cards(this.idOrNull(swimlaneId))
-        .length;
+        .count();
       if (this.cardlimit.get() < cardCount) {
         this.cardlimit.set(this.cardlimit.get() + InfiniteScrollIter);
       }
@@ -202,23 +200,25 @@ BlazeComponent.extendComponent({
       archived: false,
     };
     if (swimlaneId) selector.swimlaneId = swimlaneId;
-    const ret = ReactiveCache.getCards(Filter.mongoSelector(selector), {
+    return Cards.find(Filter.mongoSelector(selector), {
       // sort: ['sort'],
       sort: sortBy,
       limit,
-    }, true);
-    return ret;
+    });
   },
 
   showSpinner(swimlaneId) {
     const list = Template.currentData();
-    return list.cards(swimlaneId).length > this.cardlimit.get();
+    return list.cards(swimlaneId).count() > this.cardlimit.get();
   },
 
   canSeeAddCard() {
     return (
       !this.reachedWipLimit() &&
-      Utils.canModifyCard()
+      Meteor.user() &&
+      Meteor.user().isBoardMember() &&
+      !Meteor.user().isCommentOnly() &&
+      !Meteor.user().isWorker()
     );
   },
 
@@ -227,15 +227,10 @@ BlazeComponent.extendComponent({
     return (
       !list.getWipLimit('soft') &&
       list.getWipLimit('enabled') &&
-      list.getWipLimit('value') <= list.cards().length
+      list.getWipLimit('value') <= list.cards().count()
     );
   },
 
-  isVerticalScrollbars() {
-    const user = ReactiveCache.getCurrentUser();
-    return user && user.isVerticalScrollbars();
-  },
-
   cardDetailsPopup(event) {
     if (!Popup.isOpen()) {
       Popup.open("cardDetails")(event);
@@ -274,8 +269,9 @@ BlazeComponent.extendComponent({
     const currentBoardId = Session.get('currentBoard');
     arr = [];
     _.forEach(
-      ReactiveCache.getBoard(currentBoardId)
-        .customFields(),
+      Boards.findOne(currentBoardId)
+        .customFields()
+        .fetch(),
       function (field) {
         if (field.automaticallyOnCard || field.alwaysOnCard)
           arr.push({ _id: field._id, value: null });
@@ -292,8 +288,8 @@ BlazeComponent.extendComponent({
 
   getLabels() {
     const currentBoardId = Session.get('currentBoard');
-    if (ReactiveCache.getBoard(currentBoardId).labels) {
-      return ReactiveCache.getBoard(currentBoardId).labels.filter(label => {
+    if (Boards.findOne(currentBoardId).labels) {
+      return Boards.findOne(currentBoardId).labels.filter(label => {
         return this.labels.get().indexOf(label._id) > -1;
       });
     }
@@ -353,10 +349,10 @@ BlazeComponent.extendComponent({
         {
           match: /\B@([\w.-]*)$/,
           search(term, callback) {
-            const currentBoard = Utils.getCurrentBoard();
+            const currentBoard = Boards.findOne(Session.get('currentBoard'));
             callback(
               $.map(currentBoard.activeMembers(), member => {
-                const user = ReactiveCache.getUser(member.userId);
+                const user = Users.findOne(member.userId);
                 return user.username.indexOf(term) === 0 ? user : null;
               }),
             );
@@ -378,7 +374,7 @@ BlazeComponent.extendComponent({
         {
           match: /\B#(\w*)$/,
           search(term, callback) {
-            const currentBoard = Utils.getCurrentBoard();
+            const currentBoard = Boards.findOne(Session.get('currentBoard'));
             callback(
               $.map(currentBoard.labels, label => {
                 if (label.name == undefined) {
@@ -434,10 +430,10 @@ BlazeComponent.extendComponent({
     this.boardId = Session.get('currentBoard');
     // In order to get current board info
     subManager.subscribe('board', this.boardId, false);
-    this.board = ReactiveCache.getBoard(this.boardId);
+    this.board = Boards.findOne(this.boardId);
     // List where to insert card
-    this.list = $(Popup._getTopStack().openerElement).closest('.js-list');
-    this.listId = Blaze.getData(this.list[0])._id;
+    const list = $(Popup._getTopStack().openerElement).closest('.js-list');
+    this.listId = Blaze.getData(list[0])._id;
     // Swimlane where to insert card
     const swimlane = $(Popup._getTopStack().openerElement).closest(
       '.js-swimlane',
@@ -446,11 +442,11 @@ BlazeComponent.extendComponent({
     if (Utils.boardView() === 'board-view-swimlanes')
       this.swimlaneId = Blaze.getData(swimlane[0])._id;
     else if (Utils.boardView() === 'board-view-lists' || !Utils.boardView)
-      this.swimlaneId = ReactiveCache.getSwimlane({ boardId: this.boardId })._id;
+      this.swimlaneId = Swimlanes.findOne({ boardId: this.boardId })._id;
   },
 
   boards() {
-    const ret = ReactiveCache.getBoards(
+    const boards = Boards.find(
       {
         archived: false,
         'members.userId': Meteor.userId(),
@@ -461,22 +457,16 @@ BlazeComponent.extendComponent({
         sort: { sort: 1 /* boards default sorting */ },
       },
     );
-    return ret;
+    return boards;
   },
 
   swimlanes() {
     if (!this.selectedBoardId.get()) {
       return [];
     }
-    const swimlanes = ReactiveCache.getSwimlanes(
-    {
-      boardId: this.selectedBoardId.get()
-    },
-    {
-      sort: { sort: 1 },
-    });
-    if (swimlanes.length)
-      this.selectedSwimlaneId.set(swimlanes[0]._id);
+    const swimlanes = Swimlanes.find({ boardId: this.selectedBoardId.get() });
+    if (swimlanes.count())
+      this.selectedSwimlaneId.set(swimlanes.fetch()[0]._id);
     return swimlanes;
   },
 
@@ -484,14 +474,8 @@ BlazeComponent.extendComponent({
     if (!this.selectedBoardId.get()) {
       return [];
     }
-    const lists = ReactiveCache.getLists(
-    {
-      boardId: this.selectedBoardId.get()
-    },
-    {
-      sort: { sort: 1 },
-    });
-    if (lists.length) this.selectedListId.set(lists[0]._id);
+    const lists = Lists.find({ boardId: this.selectedBoardId.get() });
+    if (lists.count()) this.selectedListId.set(lists.fetch()[0]._id);
     return lists;
   },
 
@@ -499,9 +483,10 @@ BlazeComponent.extendComponent({
     if (!this.board) {
       return [];
     }
-    const ownCardsIds = this.board.cards().map(card => card.getRealId());
-    const ret = ReactiveCache.getCards(
-    {
+    const ownCardsIds = this.board.cards().map(card => {
+      return card.linkedId || card._id;
+    });
+    return Cards.find({
       boardId: this.selectedBoardId.get(),
       swimlaneId: this.selectedSwimlaneId.get(),
       listId: this.selectedListId.get(),
@@ -509,24 +494,7 @@ BlazeComponent.extendComponent({
       linkedId: { $nin: ownCardsIds },
       _id: { $nin: ownCardsIds },
       type: { $nin: ['template-card'] },
-    },
-    {
-      sort: { sort: 1 },
     });
-    return ret;
-  },
-
-  getSortIndex() {
-    const position = this.currentData().position;
-    let ret;
-    if (position === 'top') {
-      const firstCardDom = this.list.find('.js-minicard:first')[0];
-      ret = Utils.calculateIndex(null, firstCardDom).base;
-    } else if (position === 'bottom') {
-      const lastCardDom = this.list.find('.js-minicard:last')[0];
-      ret = Utils.calculateIndex(lastCardDom, null).base;
-    }
-    return ret;
   },
 
   events() {
@@ -551,17 +519,16 @@ BlazeComponent.extendComponent({
             Popup.back();
             return;
           }
-          const nextCardNumber = this.board.getNextCardNumber();
-          const sortIndex = this.getSortIndex();
           const _id = Cards.insert({
             title: $('.js-select-cards option:selected').text(), //dummy
             listId: this.listId,
             swimlaneId: this.swimlaneId,
             boardId: this.boardId,
-            sort: sortIndex,
+            sort: Lists.findOne(this.listId)
+              .cards()
+              .count(),
             type: 'cardType-linkedCard',
             linkedId,
-            cardNumber: nextCardNumber,
           });
           Filter.addException(_id);
           Popup.back();
@@ -573,22 +540,21 @@ BlazeComponent.extendComponent({
           const impBoardId = $('.js-select-boards option:selected').val();
           if (
             !impBoardId ||
-            ReactiveCache.getCard({ linkedId: impBoardId, archived: false })
+            Cards.findOne({ linkedId: impBoardId, archived: false })
           ) {
             Popup.back();
             return;
           }
-          const nextCardNumber = this.board.getNextCardNumber();
-          const sortIndex = this.getSortIndex();
           const _id = Cards.insert({
             title: $('.js-select-boards option:selected').text(), //dummy
             listId: this.listId,
             swimlaneId: this.swimlaneId,
             boardId: this.boardId,
-            sort: sortIndex,
+            sort: Lists.findOne(this.listId)
+              .cards()
+              .count(),
             type: 'cardType-linkedBoard',
             linkedId: impBoardId,
-            cardNumber: nextCardNumber,
           });
           Filter.addException(_id);
           Popup.back();
@@ -598,31 +564,6 @@ BlazeComponent.extendComponent({
   },
 }).register('linkCardPopup');
 
-Template.linkCardPopup.helpers({
-  isTitleDefault(title) {
-    // https://github.com/wekan/wekan/issues/4763
-    // https://github.com/wekan/wekan/issues/4742
-    // Translation text for "default" does not work, it returns an object.
-    // When that happens, try use translation "defaultdefault" that has same content of default, or return text "Default".
-    // This can happen, if swimlane does not have name.
-    // Yes, this is fixing the symptom (Swimlane title does not have title)
-    // instead of fixing the problem (Add Swimlane title when creating swimlane)
-    // because there could be thousands of swimlanes, adding name Default to all of them
-    // would be very slow.
-    if (title.startsWith("key 'default") && title.endsWith('returned an object instead of string.')) {
-      if (`${TAPi18n.__('defaultdefault')}`.startsWith("key 'default") && `${TAPi18n.__('defaultdefault')}`.endsWith('returned an object instead of string.')) {
-        return 'Default';
-      } else  {
-        return `${TAPi18n.__('defaultdefault')}`;
-      }
-    } else if (title === 'Default') {
-      return `${TAPi18n.__('defaultdefault')}`;
-    } else  {
-      return title;
-    }
-  },
-});
-
 BlazeComponent.extendComponent({
   mixins() {
     return [];
@@ -646,28 +587,36 @@ BlazeComponent.extendComponent({
       this.isListTemplateSearch ||
       this.isSwimlaneTemplateSearch ||
       this.isBoardTemplateSearch;
-
-    this.board = {};
+    let board = {};
     if (this.isTemplateSearch) {
-      const boardId = (ReactiveCache.getCurrentUser().profile || {}).templatesBoardId;
-      if (boardId) {
-        subManager.subscribe('board', boardId, false);
-        this.board = ReactiveCache.getBoard(boardId);
-      }
+      //board = Boards.findOne((Meteor.user().profile || {}).templatesBoardId);
+      board._id = (Meteor.user().profile || {}).templatesBoardId;
     } else {
-      this.board = Utils.getCurrentBoard();
+      // Prefetch first non-current board id
+      board = Boards.find({
+        archived: false,
+        'members.userId': Meteor.userId(),
+        _id: {
+          $nin: [
+            Session.get('currentBoard'),
+            (Meteor.user().profile || {}).templatesBoardId,
+          ],
+        },
+      });
     }
-    if (!this.board) {
+    if (!board) {
       Popup.back();
       return;
     }
-    this.boardId = this.board._id;
+    const boardId = board._id;
     // Subscribe to this board
-    subManager.subscribe('board', this.boardId, false);
-    this.selectedBoardId = new ReactiveVar(this.boardId);
-    this.list = $(Popup._getTopStack().openerElement).closest('.js-list');
+    subManager.subscribe('board', boardId, false);
+    this.selectedBoardId = new ReactiveVar(boardId);
 
     if (!this.isBoardTemplateSearch) {
+      this.boardId = Session.get('currentBoard');
+      // In order to get current board info
+      subManager.subscribe('board', this.boardId, false);
       this.swimlaneId = '';
       // Swimlane where to insert card
       const swimlane = $(Popup._getTopStack().openerElement).parents(
@@ -675,15 +624,16 @@ BlazeComponent.extendComponent({
       );
       if (Utils.boardView() === 'board-view-swimlanes')
         this.swimlaneId = Blaze.getData(swimlane[0])._id;
-      else this.swimlaneId = ReactiveCache.getSwimlane({ boardId: this.boardId })._id;
+      else this.swimlaneId = Swimlanes.findOne({ boardId: this.boardId })._id;
       // List where to insert card
-      this.listId = Blaze.getData(this.list[0])._id;
+      const list = $(Popup._getTopStack().openerElement).closest('.js-list');
+      this.listId = Blaze.getData(list[0])._id;
     }
     this.term = new ReactiveVar('');
   },
 
   boards() {
-    const ret = ReactiveCache.getBoards(
+    const boards = Boards.find(
       {
         archived: false,
         'members.userId': Meteor.userId(),
@@ -694,14 +644,14 @@ BlazeComponent.extendComponent({
         sort: { sort: 1 /* boards default sorting */ },
       },
     );
-    return ret;
+    return boards;
   },
 
   results() {
     if (!this.selectedBoardId) {
       return [];
     }
-    const board = ReactiveCache.getBoard(this.selectedBoardId.get());
+    const board = Boards.findOne(this.selectedBoardId.get());
     if (!this.isTemplateSearch || this.isCardTemplateSearch) {
       return board.searchCards(this.term.get(), false);
     } else if (this.isListTemplateSearch) {
@@ -719,19 +669,6 @@ BlazeComponent.extendComponent({
     }
   },
 
-  getSortIndex() {
-    const position = this.data().position;
-    let ret;
-    if (position === 'top') {
-      const firstCardDom = this.list.find('.js-minicard:first')[0];
-      ret = Utils.calculateIndex(null, firstCardDom).base;
-    } else if (position === 'bottom') {
-      const lastCardDom = this.list.find('.js-minicard:last')[0];
-      ret = Utils.calculateIndex(lastCardDom, null).base;
-    }
-    return ret;
-  },
-
   events() {
     return [
       {
@@ -755,8 +692,9 @@ BlazeComponent.extendComponent({
           if (!this.isTemplateSearch || this.isCardTemplateSearch) {
             // Card insertion
             // 1. Common
-            element.cardNumber = this.board.getNextCardNumber();
-            element.sort = this.getSortIndex();
+            element.sort = Lists.findOne(this.listId)
+              .cards()
+              .count();
             // 1.A From template
             if (this.isTemplateSearch) {
               element.type = 'cardType-card';
@@ -769,15 +707,15 @@ BlazeComponent.extendComponent({
             Filter.addException(_id);
             // List insertion
           } else if (this.isListTemplateSearch) {
-            element.sort = ReactiveCache.getSwimlane(this.swimlaneId)
+            element.sort = Swimlanes.findOne(this.swimlaneId)
               .lists()
-              .length;
+              .count();
             element.type = 'list';
             _id = element.copy(this.boardId, this.swimlaneId);
           } else if (this.isSwimlaneTemplateSearch) {
-            element.sort = ReactiveCache.getBoard(this.boardId)
+            element.sort = Boards.findOne(this.boardId)
               .swimlanes()
-              .length;
+              .count();
             element.type = 'swimlane';
             _id = element.copy(this.boardId);
           } else if (this.isBoardTemplateSearch) {
@@ -785,7 +723,7 @@ BlazeComponent.extendComponent({
               'copyBoard',
               element.linkedId,
               {
-                sort: ReactiveCache.getBoards({ archived: false }).length,
+                sort: Boards.find({ archived: false }).count(),
                 type: 'board',
                 title: element.title,
               },
@@ -819,7 +757,7 @@ BlazeComponent.extendComponent({
       Meteor.settings.public.sandstorm;
 
     if (isSandstorm) {
-      const user = ReactiveCache.getCurrentUser();
+      const user = Meteor.user();
       if (user) {
         if (Utils.boardView() === 'board-view-swimlanes') {
           this.swimlaneId = this.parentComponent()

client/components/lists/listHeader.jade

@@ -1,5 +1,5 @@
 template(name="listHeader")
-  .list-header.js-list-header.nodragscroll(
+  .list-header.js-list-header(
     class="{{#if limitToShowCardsCount}}list-header-card-count{{/if}}"
     class=colorClass)
     +inlinedForm
@@ -8,40 +8,19 @@ template(name="listHeader")
       if isMiniScreen
         if currentList
           a.list-header-left-icon.fa.fa-angle-left.js-unselect-list
-      else
-        if collapsed
-          a.js-collapse(title="{{_ 'uncollapse'}}")
-            i.fa.fa-arrow-left.list-header-uncollapse-left
-            i.fa.fa-arrow-right.list-header-uncollapse-right
-          if showCardsCountForList cards.length
-            br
-            span.cardCount {{cardsCount}}
-      if isMiniScreen
-        h2.list-header-name(
-          title="{{ moment modifiedAt 'LLL' }}"
-          class="{{#if currentUser.isBoardMember}}{{#unless currentUser.isCommentOnly}}{{#unless currentUser.isWorker}}js-open-inlined-form is-editable{{/unless}}{{/unless}}{{/if}}")
-          +viewer
-            = title
-          if wipLimit.enabled
-           | (
-           span(class="{{#if exceededWipLimit}}highlight{{/if}}") {{cards.length}}
-           |/#{wipLimit.value})
-        if showCardsCountForList cards.length
-          span.cardCount {{cardsCount}} {{cardsCountForListIsOne cards.length}}
-      else
-        div(class="{{#if collapsed}}list-rotated{{/if}}")
-          h2.list-header-name(
-            title="{{ moment modifiedAt 'LLL' }}"
-            class="{{#if currentUser.isBoardMember}}{{#unless currentUser.isCommentOnly}}{{#unless currentUser.isWorker}}js-open-inlined-form is-editable{{/unless}}{{/unless}}{{/if}}")
-            +viewer
-              = title
-            if wipLimit.enabled
-             | (
-             span(class="{{#if exceededWipLimit}}highlight{{/if}}") {{cards.length}}
-             |/#{wipLimit.value})
-        unless collapsed
-          if showCardsCountForList cards.length
-            span.cardCount {{cardsCount}} {{cardsCountForListIsOne cards.length}}
+      h2.list-header-name(
+        title="{{ moment modifiedAt 'LLL' }}"
+        class="{{#if currentUser.isBoardMember}}{{#unless currentUser.isCommentOnly}}{{#unless currentUser.isWorker}}js-open-inlined-form is-editable{{/unless}}{{/unless}}{{/if}}")
+        +viewer
+          = title
+        if wipLimit.enabled
+         | (
+         span(class="{{#if exceededWipLimit}}highlight{{/if}}") {{cards.count}}
+         |/#{wipLimit.value})
+
+      if showCardsCountForList cards.count
+        span.cardCount {{cardsCount}} {{cardsCountForListIsOne cards.count}}
+
       if isMiniScreen
         if currentList
           if isWatching
@@ -57,20 +36,16 @@ template(name="listHeader")
       else if currentUser.isBoardMember
         if isWatching
           i.list-header-watch-icon.fa.fa-eye
-        unless collapsed
-          div.list-header-menu
-            unless currentUser.isCommentOnly
-              //if isBoardAdmin
-              //  a.fa.js-list-star.list-header-plus-top(class="fa-star{{#unless starred}}-o{{/unless}}")
-              if canSeeAddCard
-                a.js-add-card.fa.fa-plus.list-header-plus-top(title="{{_ 'add-card-to-top-of-list'}}")
-                a.js-collapse(title="{{_ 'collapse'}}")
-                  i.fa.fa-arrow-right.list-header-collapse-right
-                  i.fa.fa-arrow-left.list-header-collapse-left
-                a.fa.fa-navicon.js-open-list-menu(title="{{_ 'listActionPopup-title'}}")
-            if currentUser.isBoardAdmin
-              if isTouchScreenOrShowDesktopDragHandles
-                a.list-header-handle.handle.fa.fa-arrows.js-list-handle
+        div.list-header-menu
+          unless currentUser.isCommentOnly
+            //if isBoardAdmin
+            //  a.fa.js-list-star.list-header-plus-top(class="fa-star{{#unless starred}}-o{{/unless}}")
+            if canSeeAddCard
+              a.js-add-card.fa.fa-plus.list-header-plus-top(title="{{_ 'add-card-to-top-of-list'}}")
+            a.fa.fa-navicon.js-open-list-menu(title="{{_ 'listActionPopup-title'}}")
+          if currentUser.isBoardAdmin
+            if isTouchScreenOrShowDesktopDragHandles
+              a.list-header-handle.handle.fa.fa-arrows.js-list-handle
 
 template(name="editListTitleForm")
   .list-composer
@@ -87,11 +62,6 @@ template(name="listActionPopup")
         i.fa.fa-arrow-down
         | {{_ 'add-card-to-bottom-of-list'}}
   hr
-  ul.pop-over-list
-    li
-      a.js-set-list-width
-        i.fa.fa-arrows-h
-        |  {{_ 'set-list-width'}}
   ul.pop-over-list
     li
       a.js-toggle-watch-list
@@ -109,7 +79,7 @@ template(name="listActionPopup")
             i.fa.fa-paint-brush
             | {{_ 'set-color-list'}}
     ul.pop-over-list
-      if cards.length
+      if cards.count
         li
           a.js-select-cards
             i.fa.fa-check-square
@@ -186,25 +156,6 @@ template(name="wipLimitErrorPopup")
     p {{_ 'wipLimitErrorPopup-dialog-pt2'}}
     button.full.js-back-view(type="submit") {{_ 'cancel'}}
 
-template(name="setListWidthPopup")
-  #js-list-width-edit
-    label {{_ 'set-list-width-value'}}
-      p
-        input.list-width-value(type="number" value="{{ listWidthValue }}" min="100")
-        input.list-constraint-value(type="number" value="{{ listConstraintValue }}" min="100")
-        input.list-width-apply(type="submit" value="{{_ 'apply'}}")
-        input.list-width-error
-        br
-        a.js-auto-width-board(
-          title="{{#if isAutoWidth}}{{_ 'click-to-disable-auto-width'}}{{else}}{{_ 'click-to-enable-auto-width'}}{{/if}}")
-          i.fa(class="fa-solid fa-{{#if isAutoWidth}}compress{{else}}expand{{/if}}")
-          span {{_ 'auto-list-width'}}
-
-template(name="listWidthErrorPopup")
-  .list-width-invalid
-    p {{_ 'list-width-error-message'}} '>=100'
-    button.full.js-back-view(type="submit") {{_ 'cancel'}}
-
 template(name="setListColorPopup")
   form.edit-label
     .palette-colors: each colors

client/components/lists/listHeader.js

@@ -1,6 +1,4 @@
-import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';
-import dragscroll from '@wekanteam/dragscroll';
 
 let listsColors;
 Meteor.startup(() => {
@@ -14,12 +12,12 @@ BlazeComponent.extendComponent({
       (!list.getWipLimit('enabled') ||
         list.getWipLimit('soft') ||
         !this.reachedWipLimit()) &&
-      !ReactiveCache.getCurrentUser().isWorker()
+      !Meteor.user().isWorker()
     );
   },
 
   isBoardAdmin() {
-    return ReactiveCache.getCurrentUser().isBoardAdmin();
+    return Meteor.user().isBoardAdmin();
   },
   starred(check = undefined) {
     const list = Template.currentData();
@@ -32,17 +30,6 @@ BlazeComponent.extendComponent({
       return !status;
     }
   },
-  collapsed(check = undefined) {
-    const list = Template.currentData();
-    const status = list.isCollapsed();
-    if (check === undefined) {
-      // just check
-      return status;
-    } else {
-      list.collapse(!status);
-      return !status;
-    }
-  },
   editTitle(event) {
     event.preventDefault();
     const newTitle = this.childComponents('inlinedForm')[0]
@@ -60,9 +47,9 @@ BlazeComponent.extendComponent({
   },
 
   limitToShowCardsCount() {
-    const currentUser = ReactiveCache.getCurrentUser();
+    const currentUser = Meteor.user();
     if (currentUser) {
-      return currentUser.getLimitToShowCardsCount();
+      return Meteor.user().getLimitToShowCardsCount();
     } else {
       return false;
     }
@@ -76,15 +63,14 @@ BlazeComponent.extendComponent({
         .parentComponent()
         .data()._id;
 
-    const ret = list.cards(swimlaneId).length;
-    return ret;
+    return list.cards(swimlaneId).count();
   },
 
   reachedWipLimit() {
     const list = Template.currentData();
     return (
       list.getWipLimit('enabled') &&
-      list.getWipLimit('value') <= list.cards().length
+      list.getWipLimit('value') <= list.cards().count()
     );
   },
 
@@ -92,7 +78,7 @@ BlazeComponent.extendComponent({
     const list = Template.currentData();
     return (
       list.getWipLimit('enabled') &&
-      list.getWipLimit('value') < list.cards().length
+      list.getWipLimit('value') < list.cards().count()
     );
   },
 
@@ -116,10 +102,6 @@ BlazeComponent.extendComponent({
           event.preventDefault();
           this.starred(!this.starred());
         },
-        'click .js-collapse'(event) {
-          event.preventDefault();
-          this.collapsed(!this.collapsed());
-        },
         'click .js-open-list-menu': Popup.open('listAction'),
         'click .js-add-card.list-header-plus-top'(event) {
           const listDom = $(event.target).parents(
@@ -141,13 +123,13 @@ BlazeComponent.extendComponent({
 
 Template.listHeader.helpers({
   isBoardAdmin() {
-    return ReactiveCache.getCurrentUser().isBoardAdmin();
+    return Meteor.user().isBoardAdmin();
   }
 });
 
 Template.listActionPopup.helpers({
   isBoardAdmin() {
-    return ReactiveCache.getCurrentUser().isBoardAdmin();
+    return Meteor.user().isBoardAdmin();
   },
 
   isWipLimitEnabled() {
@@ -156,7 +138,7 @@ Template.listActionPopup.helpers({
 
   isWatching() {
     return this.findWatcher(Meteor.userId());
-  }
+  },
 });
 
 Template.listActionPopup.events({
@@ -169,7 +151,6 @@ Template.listActionPopup.events({
     });
     Popup.back();
   },
-  'click .js-set-list-width': Popup.open('setListWidth'),
   'click .js-set-color-list': Popup.open('setListColor'),
   'click .js-select-cards'() {
     const cardIds = this.allCards().map(card => card._id);
@@ -202,7 +183,7 @@ BlazeComponent.extendComponent({
       10,
     );
 
-    if (limit < list.cards().length && !list.getWipLimit('soft')) {
+    if (limit < list.cards().count() && !list.getWipLimit('soft')) {
       Template.instance()
         .$('.wip-limit-error')
         .click();
@@ -217,9 +198,9 @@ BlazeComponent.extendComponent({
 
     if (
       list.getWipLimit('soft') &&
-      list.getWipLimit('value') < list.cards().length
+      list.getWipLimit('value') < list.cards().count()
     ) {
-      list.setWipLimit(list.cards().length);
+      list.setWipLimit(list.cards().count());
     }
     Meteor.call('enableSoftLimit', Template.currentData()._id);
   },
@@ -229,9 +210,9 @@ BlazeComponent.extendComponent({
     // Prevent user from using previously stored wipLimit.value if it is less than the current number of cards in the list
     if (
       !list.getWipLimit('enabled') &&
-      list.getWipLimit('value') < list.cards().length
+      list.getWipLimit('value') < list.cards().count()
     ) {
-      list.setWipLimit(list.cards().length);
+      list.setWipLimit(list.cards().count());
     }
     Meteor.call('enableWipLimit', list._id);
   },
@@ -263,16 +244,17 @@ BlazeComponent.extendComponent({
 Template.listMorePopup.events({
   'click .js-delete': Popup.afterConfirm('listDelete', function() {
     Popup.back();
-    const allCards = this.allCards();
+    // TODO how can we avoid the fetch call?
+    const allCards = this.allCards().fetch();
     const allCardIds = _.pluck(allCards, '_id');
     // it's okay if the linked cards are on the same list
     if (
-      ReactiveCache.getCards({
+      Cards.find({
         $and: [
           { listId: { $ne: this._id } },
           { linkedId: { $in: allCardIds } },
         ],
-      }).length === 0
+      }).count() === 0
     ) {
       allCardIds.map(_id => Cards.remove(_id));
       Lists.remove(this._id);
@@ -297,7 +279,7 @@ Template.listMorePopup.events({
 
 Template.listHeader.helpers({
   isBoardAdmin() {
-    return ReactiveCache.getCurrentUser().isBoardAdmin();
+    return Meteor.user().isBoardAdmin();
   },
 });
 
@@ -337,63 +319,3 @@ BlazeComponent.extendComponent({
     ];
   },
 }).register('setListColorPopup');
-
-BlazeComponent.extendComponent({
-  applyListWidth() {
-    const list = Template.currentData();
-    const board = list.boardId;
-    const width = parseInt(
-      Template.instance()
-        .$('.list-width-value')
-        .val(),
-      10,
-    );
-    const constraint = parseInt(
-      Template.instance()
-        .$('.list-constraint-value')
-        .val(),
-      10,
-    );
-
-    // FIXME(mark-i-m): where do we put constants?
-    if (width < 100 || !width || constraint < 100 || !constraint) {
-      Template.instance()
-        .$('.list-width-error')
-        .click();
-    } else {
-      Meteor.call('applyListWidth', board, list._id, width, constraint);
-      Popup.back();
-    }
-  },
-
-  listWidthValue() {
-    const list = Template.currentData();
-    const board = list.boardId;
-    return ReactiveCache.getCurrentUser().getListWidth(board, list._id);
-  },
-
-  listConstraintValue() {
-    const list = Template.currentData();
-    const board = list.boardId;
-    return ReactiveCache.getCurrentUser().getListConstraint(board, list._id);
-  },
-
-  isAutoWidth() {
-    const boardId = Utils.getCurrentBoardId();
-    const user = ReactiveCache.getCurrentUser();
-    return user && user.isAutoWidth(boardId);
-  },
-
-  events() {
-    return [
-      {
-        'click .js-auto-width-board'() {
-          dragscroll.reset();
-          ReactiveCache.getCurrentUser().toggleAutoWidth(Utils.getCurrentBoardId());
-        },
-        'click .list-width-apply': this.applyListWidth,
-        'click .list-width-error': Popup.open('listWidthError'),
-      },
-    ];
-  },
-}).register('setListWidthPopup');

client/components/main/accessibility.css

@@ -1,74 +0,0 @@
-.my-cards-board-wrapper {
-  border-radius: 0 0 4px 4px;
-  min-width: 400px;
-  margin-bottom: 2rem;
-  margin-right: auto;
-  margin-left: auto;
-  border-width: 2px;
-  border-style: solid;
-  border-color: #a2a2a2;
-}
-.my-cards-board-title {
-  font-size: 1.4rem;
-  font-weight: bold;
-  padding: 0.5rem;
-  background-color: #808080;
-  color: #fff;
-}
-.my-cards-swimlane-title {
-  font-size: 1.1rem;
-  font-weight: bold;
-  padding: 0.5rem;
-  padding-bottom: 0.4rem;
-  margin-top: 0;
-  margin-bottom: 0.5rem;
-  text-align: center;
-}
-.swimlane-default-color {
-  background-color: #d3d3d3;
-}
-.my-cards-list-title {
-  font-weight: bold;
-  font-size: 1.1rem;
-  text-align: center;
-  margin-bottom: 0.7rem;
-}
-.my-cards-list-wrapper {
-  margin: 1rem;
-  border-radius: 5px;
-  display: inline-grid;
-  min-width: 250px;
-  max-width: 350px;
-}
-.my-cards-card-wrapper {
-  margin-top: 0;
-  margin-bottom: 10px;
-}
-.my-cards-dueat-list-wrapper {
-  max-width: 500px;
-  margin-right: auto;
-  margin-left: auto;
-}
-.my-cards-board-table thead {
-  border-bottom: 3px solid #4d4d4d;
-  background-color: transparent;
-}
-.my-cards-board-table th,
-.my-cards-board-table td {
-  border: 0;
-}
-.my-cards-board-table tr {
-  border-bottom: 2px solid #a2a2a2;
-}
-.my-cards-card-title-table {
-  font-weight: bold;
-  padding-left: 2px;
-  max-width: 243px;
-}
-.my-cards-board-badge {
-  width: 36px;
-  height: 24px;
-  float: left;
-  border-radius: 5px;
-  margin-right: 5px;
-}

client/components/main/accessibility.jade

@@ -1,8 +0,0 @@
-template(name="accessibilityHeaderBar")
-  if currentUser
-    h1
-      | {{_ 'accessibility-title'}}
-
-template(name="accessibility")
-  if currentUser
-    | {{_ 'accessibility-content'}}

client/components/main/accessibility.js

@@ -1,11 +0,0 @@
-import { ReactiveCache } from '/imports/reactiveCache';
-import { TAPi18n } from '/imports/i18n';
-
-BlazeComponent.extendComponent({
-  onCreated() {
-    this.error = new ReactiveVar('');
-    this.loading = new ReactiveVar(false);
-
-    Meteor.subscribe('setting');
-  },
-}).register('accessibility');

client/components/main/dueCards.js

@@ -1,4 +1,3 @@
-import { ReactiveCache } from '/imports/reactiveCache';
 import { CardSearchPagedComponent } from '../../lib/cardSearch';
 import {
   OPERATOR_HAS,
@@ -67,7 +66,7 @@ class DueCardsComponent extends CardSearchPagedComponent {
     });
 
     if (Utils.dueCardsView() !== 'all') {
-      queryParams.addPredicate(OPERATOR_USER, ReactiveCache.getCurrentUser().username);
+      queryParams.addPredicate(OPERATOR_USER, Meteor.user().username);
     }
 
     this.runGlobalSearch(queryParams);

client/components/main/editor.css

@@ -1,19 +1,7 @@
-.new-comment a.fa.fa-brands.fa-markdown,
-.inlined-form a.fa.fa-brands.fa-markdown {
-  float: right;
-  position: absolute;
-  top: -10px;
-  right: 60px;
-}
 .new-comment a.fa.fa-copy,
 .inlined-form a.fa.fa-copy {
   float: right;
   position: relative;
-  top: -10px;
-  right: 5px;
-}
-.js-inlined-form.viewer.btn-sm {
-  position: absolute;
   top: 20px;
   right: 6px;
 }

client/components/main/editor.jade

@@ -1,5 +1,4 @@
 template(name="editor")
-  a.fa.fa-brands.fa-markdown(title="{{_ 'convert-to-markdown'}}")
   a.fa.fa-copy(title="{{_ 'copy-text-to-clipboard'}}")
   span.copied-tooltip {{_ 'copied'}}
   textarea.editor(

client/components/main/editor.js

@@ -1,7 +1,3 @@
-import { ReactiveCache } from '/imports/reactiveCache';
-import { TAPi18n } from '/imports/i18n';
-var converter = require('@wekanteam/html-to-markdown');
-
 const specialHandles = [
   {userId: 'board_members', username: 'board_members'},
   {userId: 'card_members', username: 'card_members'}
@@ -11,46 +7,19 @@ const specialHandleNames = specialHandles.map(m => m.username);
 
 BlazeComponent.extendComponent({
   onRendered() {
-    // Start: Copy <pre> code https://github.com/wekan/wekan/issues/5149
-    // TODO: Try to make copyPre visible at Card Details after editing or closing editor or Card Details.
-    //       - Also this same TODO below at event, if someone gets it working.
-    var copy = function(target) {
-      var textArea = document.createElement('textarea');
-      textArea.setAttribute('style','width:1px;border:0;opacity:0;');
-      document.body.appendChild(textArea);
-      textArea.value = target.innerHTML;
-      textArea.select();
-      document.execCommand('copy');
-      document.body.removeChild(textArea);
-    }
-    var pres = document.querySelectorAll(".viewer > pre");
-    pres.forEach(function(pre){
-      var button = document.createElement("a");
-      button.className = "fa fa-copy btn btn-sm right";
-      // TODO: Translate text 'Copy text to clipboard'
-      button.setAttribute('title','Copy text to clipboard');
-      button.innerHTML = '';
-      pre.parentNode.insertBefore(button, pre);
-      button.addEventListener('click', function(e){
-        e.preventDefault();
-        copy(pre.childNodes[0]);
-      })
-    })
-    // End: Copy <pre> code
-
     const textareaSelector = 'textarea';
     const mentions = [
       // User mentions
       {
         match: /\B@([\w.-]*)$/,
         search(term, callback) {
-          const currentBoard = Utils.getCurrentBoard();
+          const currentBoard = Boards.findOne(Session.get('currentBoard'));
           callback(
             _.union(
             currentBoard
               .activeMembers()
               .map(member => {
-                const user = ReactiveCache.getUser(member.userId);
+                const user = Users.findOne(member.userId);
                 const username = user.username;
                 const fullName = user.profile && user.profile !== undefined && user.profile.fullname ? user.profile.fullname : "";
                 return username.includes(term) || fullName.includes(term) ? user : null;
@@ -73,14 +42,12 @@ BlazeComponent.extendComponent({
         index: 1,
       },
     ];
-
     const enableTextarea = function() {
       const $textarea = this.$(textareaSelector);
       autosize($textarea);
       $textarea.escapeableTextComplete(mentions);
     };
-/*
-    if (Meteor.settings.public.RICHER_CARD_COMMENT_EDITOR === true || Meteor.settings.public.RICHER_CARD_COMMENT_EDITOR === 'true') {
+    if (Meteor.settings.public.RICHER_CARD_COMMENT_EDITOR !== false) {
       const isSmall = Utils.isMiniScreen();
       const toolbar = isSmall
         ? [
@@ -300,8 +267,6 @@ BlazeComponent.extendComponent({
     } else {
       enableTextarea();
     }
-*/
-    enableTextarea();
   },
   events() {
     return [
@@ -313,14 +278,6 @@ BlazeComponent.extendComponent({
           const $tooltip = this.$('.copied-tooltip');
           Utils.showCopied(promise, $tooltip);
         },
-        'click a.fa.fa-brands.fa-markdown'(event) {
-          const $editor = this.$('textarea.editor');
-          $editor[0].value = converter.convert($editor[0].value);
-        },
-        // TODO: Try to make copyPre visible at Card Details after editing or closing editor or Card Details.
-        //'click .js-close-inlined-form'(event) {
-        //  Utils.copyPre();
-        //},
       }
     ]
   }
@@ -371,13 +328,13 @@ Blaze.Template.registerHelper(
   new Template('mentions', function() {
     const view = this;
     let content = Blaze.toHTML(view.templateContentBlock);
-    const currentBoard = Utils.getCurrentBoard();
+    const currentBoard = Boards.findOne(Session.get('currentBoard'));
     if (!currentBoard)
       return HTML.Raw(
         DOMPurify.sanitize(content, { ALLOW_UNKNOWN_PROTOCOLS: true }),
       );
     const knowedUsers = _.union(currentBoard.members.map(member => {
-      const u = ReactiveCache.getUser(member.userId);
+      const u = Users.findOne(member.userId);
       if (u) {
         member.username = u.username;
       }

client/components/main/header.js

@@ -1,5 +1,3 @@
-import { ReactiveCache } from '/imports/reactiveCache';
-
 Meteor.subscribe('user-admin');
 Meteor.subscribe('boards');
 Meteor.subscribe('setting');
@@ -11,7 +9,7 @@ Template.header.onCreated(function(){
 
   Meteor.subscribe('setting', {
     onReady() {
-      templateInstance.currentSetting.set(ReactiveCache.getCurrentSetting());
+      templateInstance.currentSetting.set(Settings.findOne());
       let currSetting = templateInstance.currentSetting.curValue;
       if(currSetting && currSetting !== undefined && currSetting.customLoginLogoImageUrl !== undefined && document.getElementById("headerIsSettingDatabaseCallDone") != null)
         document.getElementById("headerIsSettingDatabaseCallDone").style.display = 'none';
@@ -26,6 +24,10 @@ Template.header.helpers({
     return !Session.get('currentBoard');
   },
 
+  currentSetting() {
+    return Settings.findOne();
+  },
+
   hideLogo() {
     return Utils.isMiniScreen() && Session.get('currentBoard');
   },

client/components/main/layouts.css

@@ -446,12 +446,6 @@ a:not(.disabled).is-active i.fa {
   padding: 0;
   padding-top: 15px;
 }
-.no-scrollbars {
-  scrollbar-width: none;
-}
-.no-scrollbars::-webkit-scrollbar {
-  display: none !important;
-}
 @media screen and (max-width: 800px) {
   #content {
     margin: 1px 0px 0px 0px;
@@ -476,7 +470,6 @@ a:not(.disabled).is-active i.fa {
 .select-authentication {
   width: 100%;
 }
-.textBelowCustomLoginLogo,
 .auth-layout {
   display: flex;
   flex-direction: column;
@@ -566,14 +559,14 @@ a:not(.disabled).is-active i.fa {
   top: 45px;
   left: 10px;
 }
+#isSettingDatabaseCallDone {
+  display: none;
+}
 .at-link {
   color: #17683a;
   text-decoration: underline;
   text-decoration-color: #17683a;
 }
-.at-pwd-form, .at-sep, .at-oauth {
-  display: none;
-}
 @-moz-keyframes fadeIn {
   from {
     opacity: 0;

client/components/main/layouts.jade

@@ -34,16 +34,14 @@ template(name="userFormsLayout")
         unless currentSetting.customLoginLogoLinkUrl
           img(src="{{currentSetting.customLoginLogoImageUrl}}" width="300" height="auto")
           br
-      else
-        img(src="{{pathFor '/wekan-logo.svg'}}" alt="" width="300" height="auto")
+      unless currentSetting.customLoginLogoImageUrl
+        div#isSettingDatabaseCallDone
+          img(src="{{pathFor '/wekan-logo.svg'}}" alt="" width="300" height="auto")
+          br
+      if currentSetting.textBelowCustomLoginLogo
+        +viewer
+          | {{currentSetting.textBelowCustomLoginLogo}}
         br
-  if currentSetting.textBelowCustomLoginLogo
-    hr
-    section.textBelowCustomLoginLogo
-      +viewer
-        | {{currentSetting.textBelowCustomLoginLogo}}
-    hr
-  section.auth-layout
     section.auth-dialog
       if isLoading
         +loader

client/components/main/layouts.js

@@ -1,4 +1,3 @@
-import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';
 
 BlazeLayout.setRoot('body');
@@ -20,76 +19,80 @@ const validator = {
   },
 };
 
+// let isSettingDatabaseFctCallDone = false;
+
 Template.userFormsLayout.onCreated(function () {
   const templateInstance = this;
   templateInstance.currentSetting = new ReactiveVar();
   templateInstance.isLoading = new ReactiveVar(false);
 
-  if (!ReactiveCache.getCurrentUser()?.profile) {
-    Meteor.call('isOidcRedirectionEnabled', (_, result) => {
-      if (result) {
-        AccountsTemplates.options.socialLoginStyle = 'redirect';
-        options = {
-          loginStyle: AccountsTemplates.options.socialLoginStyle,
-        };
-        Meteor.loginWithOidc(options);
+  Meteor.subscribe('setting', {
+    onReady() {
+      templateInstance.currentSetting.set(Settings.findOne());
+      let currSetting = templateInstance.currentSetting.curValue;
+      let oidcBtnElt = $("#at-oidc");
+      if(currSetting && currSetting !== undefined && currSetting.oidcBtnText !== undefined && oidcBtnElt != null && oidcBtnElt != undefined){
+        let htmlvalue = "<i class='fa fa-oidc'></i>" + currSetting.oidcBtnText;
+        oidcBtnElt.html(htmlvalue);
       }
-    });
 
-    Meteor.subscribe('setting', {
-      onReady() {
-        templateInstance.currentSetting.set(ReactiveCache.getCurrentSetting());
-        return this.stop();
-      },
-    });
+      // isSettingDatabaseFctCallDone = true;
+      if (currSetting && currSetting !== undefined && currSetting.customLoginLogoImageUrl !== undefined)
+        document.getElementById("isSettingDatabaseCallDone").style.display = 'none';
+      else
+        document.getElementById("isSettingDatabaseCallDone").style.display = 'block';
+      return this.stop();
+    },
+  });
+  Meteor.call('isPasswordLoginDisabled', (_, result) => {
+    if (result) {
+      $('.at-pwd-form').hide();
+    }
+  });
+
+  if (!Meteor.user()?.profile) {
+      Meteor.call('isOidcRedirectionEnabled', (_, result) => {
+        if (result) {
+          AccountsTemplates.options.socialLoginStyle = 'redirect';
+          options = {
+            loginStyle: AccountsTemplates.options.socialLoginStyle,
+          };
+          Meteor.loginWithOidc(options);
+        }
+        //else console.log("oidc redirect not set");
+      });
   }
+  Meteor.call('isDisableRegistration', (_, result) => {
+    if (result) {
+      $('.at-signup-link').hide();
+    }
+  });
+
+  Meteor.call('isDisableForgotPassword', (_, result) => {
+    if (result) {
+      $('.at-pwd-link').hide();
+    }
+  });
+
 });
 
 Template.userFormsLayout.onRendered(() => {
-  Meteor.call('getAuthenticationsEnabled', (_, result) => {
-    let enabledAuthenticationMethods = [ 'password' ]; // we show/hide this based on isPasswordLoginEnabled
-
-    if (result) {
-      Object.keys(result).forEach((m) => {
-        if (result[m]) enabledAuthenticationMethods.push(m);
-      });
-    }
-
-    Meteor.call('isPasswordLoginEnabled', (_, result) => {
-      if (result) {
-        $('.at-pwd-form').show();
-      }
-    });
-
-    Meteor.call('isDisableRegistration', (_, result) => {
-      if (result) {
-        $('.at-signup-link').hide();
-      }
-    });
-
-    Meteor.call('isDisableForgotPassword', (_, result) => {
-      if (result) {
-        $('.at-pwd-link').hide();
-      }
-    });
-
-    if (enabledAuthenticationMethods.indexOf('oauth2') !== -1) {
-      // TODO find better way to run this code once the oauth2 UI is injected in the DOM
-      (function waitForElementAndShow() {
-        if (!$('.at-oauth')[0]) return setTimeout(waitForElementAndShow, 100);
-        $('.at-oauth').show();
-      })();
-    }
-
-    AccountsTemplates.state.form.keys = new Proxy(
-      AccountsTemplates.state.form.keys,
-      validator,
-    );
-    EscapeActions.executeAll();
-  });
+  AccountsTemplates.state.form.keys = new Proxy(
+    AccountsTemplates.state.form.keys,
+    validator,
+  );
+  EscapeActions.executeAll();
 });
 
 Template.userFormsLayout.helpers({
+  currentSetting() {
+    return Template.instance().currentSetting.get();
+  },
+
+  // isSettingDatabaseCallDone(){
+  //   return isSettingDatabaseFctCallDone;
+  // },
+
   isLegalNoticeLinkExist() {
     const currSet = Template.instance().currentSetting.get();
     if (currSet && currSet !== undefined && currSet != null) {
@@ -161,7 +164,7 @@ Template.userFormsLayout.events({
   },
   'DOMSubtreeModified #at-oidc'(event) {
     if (alreadyCheck <= 2) {
-      let currSetting = ReactiveCache.getCurrentSetting();
+      let currSetting = Settings.findOne();
       let oidcBtnElt = $("#at-oidc");
       if (currSetting && currSetting !== undefined && currSetting.oidcBtnText !== undefined && oidcBtnElt != null && oidcBtnElt != undefined) {
         let htmlvalue = "<i class='fa fa-oidc'></i>" + currSetting.oidcBtnText;
@@ -182,7 +185,7 @@ Template.userFormsLayout.events({
   'DOMSubtreeModified .at-form'(event) {
     if (alreadyCheck <= 2 && !isCheckDone) {
       if (document.getElementById("at-oidc") != null) {
-        let currSetting = ReactiveCache.getCurrentSetting();
+        let currSetting = Settings.findOne();
         let oidcBtnElt = $("#at-oidc");
         if (currSetting && currSetting !== undefined && currSetting.oidcBtnText !== undefined && oidcBtnElt != null && oidcBtnElt != undefined) {
           let htmlvalue = "<i class='fa fa-oidc'></i>" + currSetting.oidcBtnText;

client/components/main/myCards.jade

@@ -70,14 +70,13 @@ template(name="myCards")
                                 unless isMiniScreen
                                   .my-cards-board-badge(class=board.colorClass, id="header")
                                 .my-cards-card-title-table
-                                  | {{card.title}}
-                                  //a.minicard-wrapper(href=card.originRelativeUrl)
-                                  //  | {{card.title}}
+                                  a.minicard-wrapper(href=card.originRelativeUrl)
+                                    | {{card.title}}
                               td
                                 | {{list.title}}
                               td
+                                a(href=board.originRelativeUrl)
                                 | {{board.title}}
-                                //a(href=board.originRelativeUrl)
                               td
                                 | {{swimlane.title}}
 

client/components/main/popup.css

@@ -88,7 +88,7 @@
   height: 20px;
 }
 .pop-over .quiet {
-/*  padding: 6px 6px 4px;*/
+  padding: 6px 6px 4px;
 }
 .pop-over.search-over {
   background: #f0f0f0;
@@ -152,14 +152,6 @@
   text-decoration: none;
   overflow: hidden;
   line-height: 33px;
-  display:flex;
-/*  flex-wrap:wrap;*/
-  gap:5px;
-  align-items: center;
-}
-.pop-over-list li > a > .member{
-  align-self: flex-start;
-  flex:0 0 auto;
 }
 .pop-over-list li > a .item-name {
   display: block;

client/components/notifications/notification.js

@@ -1,5 +1,3 @@
-import { ReactiveCache } from '/imports/reactiveCache';
-
 Template.notification.events({
   'click .read-status .materialCheckBox'() {
     const update = {};
@@ -9,22 +7,22 @@ Template.notification.events({
     Users.update(Meteor.userId(), { $set: update });
   },
   'click .remove a'() {
-    ReactiveCache.getCurrentUser().removeNotification(this.activityData._id);
+    Meteor.user().removeNotification(this.activityData._id);
   },
 });
 
 Template.notification.helpers({
   mode: 'board',
   isOfActivityType(activityId, type) {
-    const activity = ReactiveCache.getActivity(activityId);
+    const activity = Activities.findOne(activityId);
     return activity && activity.activityType === type;
   },
   activityType(activityId) {
-    const activity = ReactiveCache.getActivity(activityId);
+    const activity = Activities.findOne(activityId);
     return activity ? activity.activityType : '';
   },
   activityUser(activityId) {
-    const activity = ReactiveCache.getActivity(activityId);
+    const activity = Activities.findOne(activityId);
     return activity && activity.userId;
   },
 });

client/components/notifications/notifications.js

@@ -1,5 +1,3 @@
-import { ReactiveCache } from '/imports/reactiveCache';
-
 // this hides the notifications drawer if anyone clicks off of the panel
 Template.body.events({
   click(event) {
@@ -14,7 +12,7 @@ Template.body.events({
 
 Template.notifications.helpers({
   unreadNotifications() {
-    const notifications = ReactiveCache.getCurrentUser().notifications();
+    const notifications = Users.findOne(Meteor.userId()).notifications();
     const unreadNotifications = _.filter(notifications, v => !v.read);
     return unreadNotifications.length;
   },

client/components/notifications/notificationsDrawer.jade

@@ -11,7 +11,7 @@ template(name='notificationsDrawer')
       a.fa.fa-times-thin.close
     ul.notifications
       each transformedProfile.notifications
-        +notification(activityData=activityObj index=dbIndex read=read)
+        +notification(activityData=activity index=dbIndex read=read)
     if($gt unreadNotifications 0)
       a.all-read {{_ 'mark-all-as-read'}}
     if ($and ($.Session.get 'showReadNotifications') ($gt readNotifications 0))

client/components/notifications/notificationsDrawer.js

@@ -1,4 +1,3 @@
-import { ReactiveCache } from '/imports/reactiveCache';
 import { toggleNotificationsDrawer } from './notifications.js';
 
 Template.notificationsDrawer.onCreated(function() {
@@ -15,11 +14,11 @@ Template.notificationsDrawer.onCreated(function() {
 
 Template.notificationsDrawer.helpers({
   transformedProfile() {
-    return ReactiveCache.getCurrentUser();
+    return Users.findOne(Meteor.userId());
   },
   readNotifications() {
     const readNotifications = _.filter(
-      ReactiveCache.getCurrentUser().profile.notifications,
+      Meteor.user().profile.notifications,
       v => !!v.read,
     );
     return readNotifications.length;
@@ -28,7 +27,7 @@ Template.notificationsDrawer.helpers({
 
 Template.notificationsDrawer.events({
   'click .all-read'() {
-    const notifications = ReactiveCache.getCurrentUser().profile.notifications;
+    const notifications = Meteor.user().profile.notifications;
     for (const index in notifications) {
       if (notifications.hasOwnProperty(index) && !notifications[index].read) {
         const update = {};
@@ -44,7 +43,7 @@ Template.notificationsDrawer.events({
     Session.set('showReadNotifications', !Session.get('showReadNotifications'));
   },
   'click .remove-read'() {
-    const user = ReactiveCache.getCurrentUser();
+    const user = Meteor.user();
     for (const notification of user.profile.notifications) {
       if (notification.read) {
         user.removeNotification(notification.activity);

client/components/rules/actions/boardActions.js

@@ -1,22 +1,20 @@
-import { ReactiveCache } from '/imports/reactiveCache';
-
 BlazeComponent.extendComponent({
   onCreated() {},
 
   boards() {
-    const ret = ReactiveCache.getBoards(
+    const boards = Boards.find(
       {
         archived: false,
         'members.userId': Meteor.userId(),
         _id: {
-          $ne: ReactiveCache.getCurrentUser().getTemplatesBoardId(),
+          $ne: Meteor.user().getTemplatesBoardId(),
         },
       },
       {
         sort: { sort: 1 /* boards default sorting */ },
       },
     );
-    return ret;
+    return boards;
   },
 
   events() {

client/components/rules/actions/cardActions.js

@@ -18,7 +18,7 @@ BlazeComponent.extendComponent({
   },
 
   labels() {
-    const labels = Utils.getCurrentBoard().labels;
+    const labels = Boards.findOne(Session.get('currentBoard')).labels;
     for (let i = 0; i < labels.length; i++) {
       if (labels[i].name === '' || labels[i].name === undefined) {
         labels[i].name = labels[i].color.toUpperCase();

client/components/rules/ruleDetails.js

@@ -1,5 +1,3 @@
-import { ReactiveCache } from '/imports/reactiveCache';
-
 BlazeComponent.extendComponent({
   onCreated() {
     this.subscribe('allRules');
@@ -9,16 +7,24 @@ BlazeComponent.extendComponent({
 
   trigger() {
     const ruleId = this.data().ruleId;
-    const rule = ReactiveCache.getRule(ruleId.get());
-    const trigger = ReactiveCache.getTrigger(rule.triggerId);
+    const rule = Rules.findOne({
+      _id: ruleId.get(),
+    });
+    const trigger = Triggers.findOne({
+      _id: rule.triggerId,
+    });
     const desc = trigger.description();
     const upperdesc = desc.charAt(0).toUpperCase() + desc.substr(1);
     return upperdesc;
   },
   action() {
     const ruleId = this.data().ruleId;
-    const rule = ReactiveCache.getRule(ruleId.get());
-    const action = ReactiveCache.getAction(rule.actionId);
+    const rule = Rules.findOne({
+      _id: ruleId.get(),
+    });
+    const action = Actions.findOne({
+      _id: rule.actionId,
+    });
     const desc = action.description();
     const upperdesc = desc.charAt(0).toUpperCase() + desc.substr(1);
     return upperdesc;

client/components/rules/rulesActions.js

@@ -1,5 +1,3 @@
-import { ReactiveCache } from '/imports/reactiveCache';
-
 BlazeComponent.extendComponent({
   onCreated() {
     this.currentActions = new ReactiveVar('board');
@@ -35,8 +33,7 @@ BlazeComponent.extendComponent({
   },
 
   rules() {
-    const ret = ReactiveCache.getRules({});
-    return ret;
+    return Rules.find({});
   },
 
   name() {

client/components/rules/rulesList.js

@@ -1,5 +1,3 @@
-import { ReactiveCache } from '/imports/reactiveCache';
-
 BlazeComponent.extendComponent({
   onCreated() {
     this.subscribe('allRules');
@@ -7,10 +5,9 @@ BlazeComponent.extendComponent({
 
   rules() {
     const boardId = Session.get('currentBoard');
-    const ret = ReactiveCache.getRules({
+    return Rules.find({
       boardId,
     });
-    return ret;
   },
   events() {
     return [{}];

client/components/rules/rulesMain.js

@@ -1,5 +1,3 @@
-import { ReactiveCache } from '/imports/reactiveCache';
-
 BlazeComponent.extendComponent({
   onCreated() {
     this.rulesCurrentTab = new ReactiveVar('rulesList');
@@ -57,7 +55,7 @@ BlazeComponent.extendComponent({
           let trigger = this.triggerVar.get();
           trigger.userId = '*';
           if (username !== undefined) {
-            const userFound = ReactiveCache.getUser({ username });
+            const userFound = Users.findOne({ username });
             if (userFound !== undefined) {
               trigger.userId = userFound._id;
               this.triggerVar.set(trigger);