🐛 Take into account indirect libraries

This commit is contained in:
Andrés Moya 2020-11-05 11:56:09 +01:00 committed by Alonso Torres
parent 715b7ba13e
commit f4374c5046
4 changed files with 37 additions and 7 deletions

View file

@ -7,6 +7,7 @@
(ns app.main.ui.workspace.libraries
(:require
[app.common.data :as d]
[rumext.alpha :as mf]
[cuerdas.core :as str]
[okulary.core :as l]
@ -142,7 +143,6 @@
:value (tr "workspace.libraries.update")
:on-click #(update-library (:id library))}]])]])]))
(mf/defc libraries-dialog
{::mf/register modal/components
::mf/register-as :libraries-dialog}
@ -152,7 +152,9 @@
locale (mf/deref i18n/locale)
project (mf/deref refs/workspace-project)
file (mf/deref workspace-file)
libraries (mf/deref refs/workspace-libraries)
libraries (->> (mf/deref refs/workspace-libraries)
(d/removem (fn [[key val]]
(:is-indirect val))))
shared-files (mf/deref refs/workspace-shared-files)
change-tab #(reset! selected-tab %)

View file

@ -631,7 +631,9 @@
(mf/defc assets-toolbox
[]
(let [libraries (mf/deref refs/workspace-libraries)
(let [libraries (->> (mf/deref refs/workspace-libraries)
(vals)
(remove :is-indirect))
file (mf/deref refs/workspace-file)
locale (mf/deref i18n/locale)
team-id (mf/use-ctx ctx/current-team-id)
@ -697,7 +699,7 @@
:open? true
:filters @filters}]
(for [file (->> (vals libraries)
(for [file (->> libraries
(sort-by #(str/lower (:name %))))]
[:& file-library
{:key (:id file)