Merge branch 'master' of https://github.com/wekan/wekan

5 files changed, 42 insertions, 3 deletions

diff --git a/client/components/activities/activities.jade b/client/components/activities/activities.jade
index 5be953b6..deb73072 100644
--- a/client/components/activities/activities.jade
+++ b/client/components/activities/activities.jade
@@ -201,6 +201,7 @@ template(name="cardActivities")
           .activity-checklist(href="{{ card.absoluteUrl }}")
             +viewer
               = checklistItem.title
+        
         if(currentData.timeKey)
           | {{{_ activityType }}}
           = ' '
@@ -215,6 +216,10 @@ template(name="cardActivities")
           | {{{_ activityType currentData.timeValue}}}
         
 
+        if($eq activityType 'deleteComment')
+          | {{{_ 'activity-deleteComment' currentData.commentId}}}.
+        if($eq activityType 'editComment')
+          | {{{_ 'activity-editComment' currentData.commentId}}}.
         if($eq activityType 'addComment')
           +inlinedForm(classNames='js-edit-comment')
             +editor(autofocus=true)
diff --git a/client/components/boards/boardBody.jade b/client/components/boards/boardBody.jade
index fd094a93..76a85d87 100644
--- a/client/components/boards/boardBody.jade
+++ b/client/components/boards/boardBody.jade
@@ -7,8 +7,8 @@ template(name="board")
         +boardBody
     else
       //-- XXX We need a better error message in case the board has been archived
-      //-- +message(label="board-not-found")
-      | {{goHome}}
+      +message(label="board-not-found")
+      //-- | {{goHome}}
   else
     +spinner
 
diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js
index 781967ae..cd8813f5 100644
--- a/client/components/cards/cardDetails.js
+++ b/client/components/cards/cardDetails.js
@@ -117,6 +117,37 @@ BlazeComponent.extendComponent({
   },
 
   onRendered() {
+    if (Meteor.settings.public.CARD_OPENED_WEBHOOK_ENABLED) {
+      // Send Webhook but not create Activities records ---
+      const card = this.currentData();
+      const userId = Meteor.userId();
+      //console.log(`userId: ${userId}`);
+      //console.log(`cardId: ${card._id}`);
+      //console.log(`boardId: ${card.boardId}`);
+      //console.log(`listId: ${card.listId}`);
+      //console.log(`swimlaneId: ${card.swimlaneId}`);
+      const params = {
+        userId,
+        cardId: card._id,
+        boardId: card.boardId,
+        listId: card.listId,
+        user: Meteor.user().username,
+        url: '',
+      };
+      //console.log('looking for integrations...');
+      const integrations = Integrations.find({
+        boardId: card.boardId,
+        type: 'outgoing-webhooks',
+        enabled: true,
+        activities: { $in: ['CardDetailsRendered', 'all'] },
+      }).fetch();
+      //console.log(`Investigation length: ${integrations.length}`);
+      if (integrations.length > 0) {
+        Meteor.call('outgoingWebhooks', integrations, 'CardSelected', params);
+      }
+      //-------------
+    }
+
     if (!Utils.isMiniScreen()) {
       Meteor.setTimeout(() => {
         $('.card-details').mCustomScrollbar({
diff --git a/client/components/main/editor.js b/client/components/main/editor.js
index 82bda0a3..91403086 100755
--- a/client/components/main/editor.js
+++ b/client/components/main/editor.js
@@ -180,7 +180,7 @@ Template.editor.onRendered(() => {
                 fBtn.on('click', function() {
                   const $this = $(this),
                     isActive = $this.hasClass('active');
-                  $('.minicards').toggle(!isActive); // mini card is still showing when editor is in fullscreen mode, we hide here manually
+                  $('.minicards,#header-quick-access').toggle(!isActive); // mini card is still showing when editor is in fullscreen mode, we hide here manually
                 });
               }
             },
diff --git a/client/components/main/layouts.styl b/client/components/main/layouts.styl
index 06538554..0955a352 100644
--- a/client/components/main/layouts.styl
+++ b/client/components/main/layouts.styl
@@ -425,6 +425,9 @@ a
     height: 100%
     margin: 0px
 
+  .panel-default
+    width: 83vw
+
 .inline-input
   height: 37px
   margin: 8px 10px 0 0