v7.06

Add attachment swiping

CHANGELOG.md

@@ -20,6 +20,26 @@ Note:
 
 [How to upgrade WeKan](https://github.com/wekan/wekan/issues/4585)
 
+# v7.06 2023-08-15 WeKan ® release
+
+This release adds the following updates:
+
+- [Updated exceljs and jszip](https://github.com/wekan/wekan/commit/f9823f67bd7ded44982298b15487f945e8216b60).
+  Thanks to developers of dependencies.
+- [Update building Windows bundle](https://github.com/wekan/wekan/commit/6d1705af344a36e1cd7846c3d41e486ae0200e2e).
+  Thanks to xet7.
+
+and fixes the following bugs:
+
+- [Alphabetic ordered member lists on assigne and member lists](https://github.com/wekan/wekan/pull/5071).
+  Thanks to chrisi51.
+- [Label drag/drop (reorder labels) works now again](https://github.com/wekan/wekan/pull/5075).
+  Thanks to mfilser.
+- [Add attachment swiping](https://github.com/wekan/wekan/pull/5080).
+  Thanks to VidVidex.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
 # v7.05 2023-08-08 WeKan ® release
 
 This release adds the following updates:
@@ -37,6 +57,8 @@ and fixes the following bugs:
   Thanks to mgdbbrt and xet7.
 - [Fixing positioning of opened cards](https://github.com/wekan/wekan/pull/5066).
   Thanks to chrisi51.
+- [Cleaner memberlist popups](https://github.com/wekan/wekan/issues/5068).
+  Thanks to chrisi51.
 
 Thanks to above GitHub users for their contributions and translators for their translations.
 

Stackerfile.yml

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

client/components/cards/attachments.js

@@ -11,6 +11,9 @@ 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;
@@ -151,7 +154,80 @@ 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
@@ -169,38 +245,12 @@ Template.attachmentViewer.events({
   'click #viewer-close'() {
     closeAttachmentViewer();
   },
-  'click #next-attachment'(event) {
-    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++;
-    }
+  'click #next-attachment'() {
+    openNextAttachment();
+  },
+  'click #prev-attachment'() {
+    openPrevAttachment();
   },
-  'click #prev-attachment'(event) {
-    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--;
-    }
-  }
 });
 
 Template.attachmentGallery.helpers({

client/components/cards/cardDetails.js

@@ -752,7 +752,7 @@ Template.cardMembersPopup.events({
 
 Template.cardMembersPopup.helpers({
   members() {
-    return Template.instance().members.get();
+    return _.sortBy(Template.instance().members.get(),'fullname');
   },
 });
 
@@ -1614,7 +1614,7 @@ Template.cardAssigneesPopup.helpers({
   },
 
   members() {
-    return Template.instance().members.get();
+    return _.sortBy(Template.instance().members.get(),'fullname');
   },
 
   user() {

client/components/cards/labels.js

@@ -52,7 +52,8 @@ BlazeComponent.extendComponent({
       appendTo: '.edit-labels-pop-over',
       helper(element, currentItem) {
         let ret = currentItem.clone();
-        if (currentItem.closest('.popup-container-depth-0').size() == 0) { // only set css transform at every sub-popup, not at the main popup
+        if (currentItem.closest('.popup-container-depth-0').length == 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;

imports/i18n/data/eu.i18n.json

@@ -85,14 +85,14 @@
   "add-card": "Gehitu txartela",
   "add-card-to-top-of-list": "Gehitu txartela zerrendaren goiko aldean",
   "add-card-to-bottom-of-list": "Gehitu txartela zerrendaren beheko aldean",
-  "setListWidthPopup-title": "Set List Width",
-  "set-list-width": "Set List Width",
-  "set-list-width-value": "List Width (pixels)",
-  "list-width-error-message": "List width must be a positive integer",
-  "setSwimlaneHeightPopup-title": "Set Swimlane Height",
-  "set-swimlane-height": "Set Swimlane Height",
-  "set-swimlane-height-value": "Swimlane Height (pixels)",
-  "swimlane-height-error-message": "Swimlane height must be a positive integer",
+  "setListWidthPopup-title": "Ezarri zerrendaren zabalera",
+  "set-list-width": "Ezarri zerrendaren zabalera",
+  "set-list-width-value": "Zerrendaren zabalera (pixelak)",
+  "list-width-error-message": "Zerrendaren zabalerak zenbaki oso positiboa izan behar du",
+  "setSwimlaneHeightPopup-title": "Errailaren altuera ezarri",
+  "set-swimlane-height": "Errailaren altuera ezarri",
+  "set-swimlane-height-value": "Errailaren altuera (pixelak)",
+  "swimlane-height-error-message": "Errailaren altuerak zenbaki oso positiboa izan behar du",
   "add-swimlane": "Gehitu erraila",
   "add-subtask": "Gehitu azpiataza",
   "add-checklist": "Gehitu kontrol-zerrenda",
@@ -1229,5 +1229,5 @@
   "allowed-avatar-filetypes": "Baimendutako avatar fitxategi motak:",
   "invalid-file": "Fitxategi-izena baliogabea bada, karga edo izena aldaketa bertan behera geratuko da.",
   "preview-pdf-not-supported": "Zure gailuak ez du onartzen PDF aurrebistarik. Saiatu deskargatzen.",
-  "drag-board": "Drag board"
+  "drag-board": "Arrastatu taula"
 }

imports/i18n/data/fr.i18n.json

@@ -85,14 +85,14 @@
   "add-card": "Ajouter une carte",
   "add-card-to-top-of-list": "Ajouter la carte en haut de la liste",
   "add-card-to-bottom-of-list": "Ajouter la carte en bas de la liste",
-  "setListWidthPopup-title": "Set List Width",
-  "set-list-width": "Set List Width",
-  "set-list-width-value": "List Width (pixels)",
-  "list-width-error-message": "List width must be a positive integer",
-  "setSwimlaneHeightPopup-title": "Set Swimlane Height",
-  "set-swimlane-height": "Set Swimlane Height",
-  "set-swimlane-height-value": "Swimlane Height (pixels)",
-  "swimlane-height-error-message": "Swimlane height must be a positive integer",
+  "setListWidthPopup-title": "Définir la largeur de la liste",
+  "set-list-width": "Définir la largeur de la liste",
+  "set-list-width-value": "Définir la largeur de la liste (pixels)",
+  "list-width-error-message": "La largeur de la liste doit être un entier positif",
+  "setSwimlaneHeightPopup-title": "Définir la hauteur du couloir",
+  "set-swimlane-height": "Définir la hauteur du couloir",
+  "set-swimlane-height-value": "Hauteur du couloir (pixels)",
+  "swimlane-height-error-message": "La hauteur du couloir doit être un entier positif",
   "add-swimlane": "Ajouter un couloir",
   "add-subtask": "Ajouter une sous-tâche",
   "add-checklist": "Ajouter une checklist",
@@ -1229,5 +1229,5 @@
   "allowed-avatar-filetypes": "Types de fichier autorisés pour l'avatar :",
   "invalid-file": "Si le nom de fichier est invalide, le téléchargement ou le renommage sera annulé.",
   "preview-pdf-not-supported": "Votre périphérique ne supporte pas la prévisualisation de PDF. Essayer plutôt le téléchargement.",
-  "drag-board": "Drag board"
+  "drag-board": "Glisser le tableau"
 }

imports/i18n/data/sv.i18n.json

@@ -1229,5 +1229,5 @@
   "allowed-avatar-filetypes": "Tillåtna filtyper för avatar:",
   "invalid-file": "Om filnamnet är ogiltigt avbryts uppladdningen eller omdöps filen.",
   "preview-pdf-not-supported": "Din enhet stöder inte förhandsgranskning av PDF. Försök istället att ladda ner.",
-  "drag-board": "Drag board"
+  "drag-board": "Dra tavla"
 }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v7.05.0",
+  "version": "v7.06.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -923,14 +923,13 @@
       "integrity": "sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA=="
     },
     "exceljs": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/exceljs/-/exceljs-4.3.0.tgz",
-      "integrity": "sha512-hTAeo5b5TPvf8Z02I2sKIT4kSfCnOO2bCxYX8ABqODCdAjppI3gI9VYiGCQQYVcBaBSKlFDMKlAQRqC+kV9O8w==",
+      "version": "git+https://github.com/exceljs/exceljs.git#ec92cb3b898bdf7f806ff9d7b8370c955ee8ba20",
+      "from": "git+https://github.com/exceljs/exceljs.git",
       "requires": {
         "archiver": "^5.0.0",
         "dayjs": "^1.8.34",
         "fast-csv": "^4.3.1",
-        "jszip": "^3.5.0",
+        "jszip": "^3.10.1",
         "readable-stream": "^3.6.0",
         "saxes": "^5.0.1",
         "tmp": "^0.2.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v7.05.0",
+  "version": "v7.06.0",
   "description": "Open-Source kanban",
   "private": true,
   "repository": {
@@ -33,7 +33,7 @@
     "dompurify": "^2.4.1",
     "es6-promise": "^4.2.4",
     "escape-string-regexp": "^5.0.0",
-    "exceljs": "^4.2.1",
+    "exceljs": "git+https://github.com/exceljs/exceljs.git",
     "fibers": "^5.0.3",
     "file-type": "^16.5.4",
     "filesize": "^8.0.7",

public/api/wekan.html

@@ -7,7 +7,7 @@
     <meta charset="utf-8">
     <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <title>Wekan REST API v7.05</title>
+    <title>Wekan REST API v7.06</title>
 
     <style>
     </style>
@@ -1548,7 +1548,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
 	  	<ul class="toc-list-h1">
         
           <li>
-            <a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v7.05">Wekan REST API v7.05</a>
+            <a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v7.06">Wekan REST API v7.06</a>
             
           </li>
         
@@ -2057,7 +2057,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
     <div class="page-wrapper">
       <div class="dark-box"></div>
       <div class="content">
-        <h1 id="wekan-rest-api">Wekan REST API v7.05</h1>
+        <h1 id="wekan-rest-api">Wekan REST API v7.06</h1>
 <blockquote>
 <p>Scroll down for code samples, example requests and responses. Select a language for code samples from the tabs above or the mobile navigation menu.</p>
 </blockquote>

public/api/wekan.yml

@@ -1,7 +1,7 @@
 swagger: '2.0'
 info:
   title: Wekan REST API
-  version: v7.05
+  version: v7.06
   description: |
     The REST API allows you to control and extend Wekan with ease.
 

releases/build-bundle-win64.bat

@@ -13,6 +13,9 @@ ECHO 3) Unarchiving new WeKan
 CALL 7z x wekan-%1-amd64.zip
 
 ECHO 4) Reinstalling bcrypt
+cmd /c "npm -g install @mapbox/node-pre-gyp node-gyp fibers"
+cmd /c "npm -g install node-gyp"
+cmd /c "npm -g install fibers"
 cmd /c "CD bundle\programs\server\npm\node_modules\meteor\accounts-password && npm remove bcrypt && npm install bcrypt"
 REM # Sometimes may require building from source https://github.com/meteor/meteor/issues/11682
 REM # cmd /c "bundle\programs\server\npm\node_modules\meteor\accounts-password && npm rebuild --build-from-source && npm --build-from-source install bcrypt"

sandstorm-pkgdef.capnp

@@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = (
     appTitle = (defaultText = "Wekan"),
     # The name of the app as it is displayed to the user.
 
-    appVersion = 705,
+    appVersion = 706,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "7.05.0~2023-08-08"),
+    appMarketingVersion = (defaultText = "7.06.0~2023-08-15"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,

snapcraft.yaml

@@ -1,5 +1,5 @@
 name: wekan
-version: '7.05'
+version: '7.06'
 base: core20
 summary: Open Source kanban
 description: |
@@ -170,9 +170,9 @@ parts:
             # Cleanup
             mkdir .build
             cd .build
-            wget https://github.com/wekan/wekan/releases/download/v7.05/wekan-7.05-amd64.zip
-            unzip wekan-7.05-amd64.zip
-            rm wekan-7.05-amd64.zip
+            wget https://github.com/wekan/wekan/releases/download/v7.06/wekan-7.06-amd64.zip
+            unzip wekan-7.06-amd64.zip
+            rm wekan-7.06-amd64.zip
             cd ..
             ##cd .build/bundle
             ##find . -type d -name '*-garbage*' | xargs rm -rf