From 350e4a1d1bfcc42235f6bfa6dd93f24055daa124 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 14 Dec 2022 14:15:42 +0100 Subject: [PATCH] :sparkles: Improve default update-file webhook batch timeout --- backend/src/app/loggers/audit.clj | 1 - backend/src/app/rpc/commands/files/update.clj | 2 +- frontend/src/app/main/ui/workspace/context_menu.cljs | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/backend/src/app/loggers/audit.clj b/backend/src/app/loggers/audit.clj index 0d692c275..853e9709c 100644 --- a/backend/src/app/loggers/audit.clj +++ b/backend/src/app/loggers/audit.clj @@ -152,7 +152,6 @@ :props (:props event)}] (when (contains? cf/flags :audit-log) - ;; NOTE: this operation may cause primary key conflicts on inserts ;; because of the timestamp precission (two concurrent requests), in ;; this case we just retry the operation. diff --git a/backend/src/app/rpc/commands/files/update.clj b/backend/src/app/rpc/commands/files/update.clj index 520df2897..264d29615 100644 --- a/backend/src/app/rpc/commands/files/update.clj +++ b/backend/src/app/rpc/commands/files/update.clj @@ -131,7 +131,7 @@ {::climit/queue :update-file ::climit/key-fn :id ::webhooks/event? true - ::webhooks/batch-timeout (dt/duration "2s") + ::webhooks/batch-timeout (dt/duration "2m") ::webhooks/batch-key webhook-batch-keyfn ::doc/added "1.17"} [{:keys [pool] :as cfg} {:keys [id profile-id] :as params}] diff --git a/frontend/src/app/main/ui/workspace/context_menu.cljs b/frontend/src/app/main/ui/workspace/context_menu.cljs index b2f89ff10..eda6e725b 100644 --- a/frontend/src/app/main/ui/workspace/context_menu.cljs +++ b/frontend/src/app/main/ui/workspace/context_menu.cljs @@ -386,7 +386,7 @@ [:& menu-entry {:title (tr "workspace.shape.menu.add-flex") :shortcut (sc/get-tooltip :toogle-layout-flex) :on-click add-flex}]] - + is-flex-container? [:* [:& menu-separator]