From 91e81823a5030e545b811a0aa47694a4b7837ed8 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Fri, 24 Mar 2023 09:15:09 +0100 Subject: [PATCH] :bug: Fix deleted files appear in search results --- .../src/app/main/ui/dashboard/file_menu.cljs | 43 ++++++++++--------- .../src/app/main/ui/dashboard/search.cljs | 1 + 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/frontend/src/app/main/ui/dashboard/file_menu.cljs b/frontend/src/app/main/ui/dashboard/file_menu.cljs index 7317a1947..33ae85486 100644 --- a/frontend/src/app/main/ui/dashboard/file_menu.cljs +++ b/frontend/src/app/main/ui/dashboard/file_menu.cljs @@ -59,7 +59,8 @@ (assert (fn? on-edit) "missing `on-edit` prop") (assert (fn? on-menu-close) "missing `on-menu-close` prop") (assert (boolean? navigate?) "missing `navigate?` prop") - (let [is-lib-page? (= :libraries origin) + (let [is-lib-page? (= :libraries origin) + is-search-page? (= :search origin) top (or top 0) left (or left 0) @@ -264,28 +265,30 @@ [{:option-name (tr "dashboard.open-in-new-tab") :id "file-open-new-tab" :option-handler on-new-tab} - {:option-name (tr "labels.rename") - :id "file-rename" - :option-handler on-edit - :data-test "file-rename"} - {:option-name (tr "dashboard.duplicate") - :id "file-duplicate" - :option-handler on-duplicate - :data-test "file-duplicate"} - (when (and (not is-lib-page?) (or (seq current-projects) (seq other-teams))) + (when (not is-search-page?) + {:option-name (tr "labels.rename") + :id "file-rename" + :option-handler on-edit + :data-test "file-rename"} + {:option-name (tr "dashboard.duplicate") + :id "file-duplicate" + :option-handler on-duplicate + :data-test "file-duplicate"}) + (when (and (not is-lib-page?) (not is-search-page?) (or (seq current-projects) (seq other-teams))) {:option-name (tr "dashboard.move-to") :id "file-move-to" :sub-options sub-options :data-test "file-move-to"}) - (if (:is-shared file) - {:option-name (tr "dashboard.unpublish-shared") - :id "file-del-shared" - :option-handler on-del-shared - :data-test "file-del-shared"} - {:option-name (tr "dashboard.add-shared") - :id "file-add-shared" - :option-handler on-add-shared - :data-test "file-add-shared"}) + (when (not is-search-page?) + (if (:is-shared file) + {:option-name (tr "dashboard.unpublish-shared") + :id "file-del-shared" + :option-handler on-del-shared + :data-test "file-del-shared"} + {:option-name (tr "dashboard.add-shared") + :id "file-add-shared" + :option-handler on-add-shared + :data-test "file-add-shared"})) {:option-name :separator} {:option-name (tr "dashboard.download-binary-file") :id "file-download-binary" @@ -295,7 +298,7 @@ :id "file-download-standard" :option-handler on-export-standard-files :data-test "download-standard-file"} - (when (not is-lib-page?) + (when (and (not is-lib-page?) (not is-search-page?)) {:option-name :separator} {:option-name (tr "labels.delete") :id "file-delete" diff --git a/frontend/src/app/main/ui/dashboard/search.cljs b/frontend/src/app/main/ui/dashboard/search.cljs index 8d5bf9fb3..bcbcfd710 100644 --- a/frontend/src/app/main/ui/dashboard/search.cljs +++ b/frontend/src/app/main/ui/dashboard/search.cljs @@ -87,4 +87,5 @@ :else [:& grid {:files result :hide-new? true + :origin :search :limit limit}])]]))