From 9d4306d7f37ea33ecb5b7d0981c3d79b71e52a2b Mon Sep 17 00:00:00 2001 From: uosl Date: Tue, 15 Feb 2022 12:23:26 +0000 Subject: [PATCH] portal.do: Accept externalid as alternative to externalids Required for proper backwards compatibility of legacy API. --- src/cljs/bluegenes/events/boot.cljs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/cljs/bluegenes/events/boot.cljs b/src/cljs/bluegenes/events/boot.cljs index 340d107b..ed56f1ac 100644 --- a/src/cljs/bluegenes/events/boot.cljs +++ b/src/cljs/bluegenes/events/boot.cljs @@ -572,17 +572,18 @@ (reg-event-fx :handle-link-in (fn [{db :db} [_ {:keys [target data]}]] - (let [{:keys [default-object-types]} (get-in db [:mines (:current-mine db)])] - (case target - :upload {:dispatch - (if (str/blank? (:externalids data)) + (case target + :upload (let [{:keys [default-object-types]} (get-in db [:mines (:current-mine db)]) + identifiers (or (:externalids data) (:externalid data))] + {:dispatch + (if (str/blank? identifiers) [:messages/add {:markup [:span "No identifiers specified when linking in to upload page. You have been redirected to the home page."] :style "warning" :timeout 0}] [:bluegenes.components.idresolver.events/parse-staged-files nil - (:externalids data) + identifiers {:case-sensitive false :type (or (:class data) (-> default-object-types first name))