fix: take settings for private and template entities into account whe…

…n using "link all"
eXaminator · Jul 25, 2021 · 0655b37 · 0655b37
1 parent 63135f8
commit 0655b37
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 27 deletions.
diff --git a/src/KankaBrowser/KankaBrowserApplication.hbs b/src/KankaBrowser/KankaBrowserApplication.hbs
@@ -55,31 +55,29 @@
                 {{#if data}}
                     {{#each (kankaGroupBy (kankaSortBy data 'type' 'name') 'type') as |entities type|}}
                         {{#with (lookup ../typeConfig type) as |typeConfig|}}
-                            {{#with (kankaFilterAccessible entities ignore=../../settings.showPrivate) as |entities| }}
-                                <details class="kanka-details" data-type="{{ type }}" {{#if typeConfig.isOpen}}open{{/if}}>
-                                    <summary class="action-row">
-                                        <i class="fas {{ typeConfig.icon }}"></i>
-                                        <div>
-                                            {{#kankaLinkEntity type }}{{ kankaLocalize 'entityType' type }}{{/kankaLinkEntity}}
-                                        </div>
-                                        <div class="actions">
-                                            <button type="button" data-action="link-type" data-type="{{ type }}">
-                                                <i class="fas fa-link fa-fw"></i>
-                                                {{ kankaLocalize 'browser' 'action' 'linkAll' }}
-                                            </button>
-                                            <button type="button" data-action="update-outdated" data-type="{{ type }}">
-                                                <i class="fas fa-sync fa-fw"></i>
-                                                {{ kankaLocalize 'browser' 'action' 'updateOutdated' }}
-                                            </button>
-                                        </div>
-                                    </summary>
-                                    {{#if (kankaIsOneOf ../../../settings.view 'grid')}}
-                                        {{>entities/grid entities=entities}}
-                                    {{else}}
-                                        {{>entities/list entities=entities}}
-                                    {{/if}}
-                                </details>
-                            {{/with}}
+                            <details class="kanka-details" data-type="{{ type }}" {{#if typeConfig.isOpen}}open{{/if}}>
+                                <summary class="action-row">
+                                    <i class="fas {{ typeConfig.icon }}"></i>
+                                    <div>
+                                        {{#kankaLinkEntity type }}{{ kankaLocalize 'entityType' type }}{{/kankaLinkEntity}}
+                                    </div>
+                                    <div class="actions">
+                                        <button type="button" data-action="link-type" data-type="{{ type }}">
+                                            <i class="fas fa-link fa-fw"></i>
+                                            {{ kankaLocalize 'browser' 'action' 'linkAll' }}
+                                        </button>
+                                        <button type="button" data-action="update-outdated" data-type="{{ type }}">
+                                            <i class="fas fa-sync fa-fw"></i>
+                                            {{ kankaLocalize 'browser' 'action' 'updateOutdated' }}
+                                        </button>
+                                    </div>
+                                </summary>
+                                {{#if (kankaIsOneOf ../../../settings.view 'grid')}}
+                                    {{>entities/grid entities=entities}}
+                                {{else}}
+                                    {{>entities/list entities=entities}}
+                                {{/if}}
+                            </details>
                         {{/with}}
                     {{/each}}
                 {{else}}

diff --git a/src/KankaBrowser/KankaBrowserApplication.ts b/src/KankaBrowser/KankaBrowserApplication.ts
@@ -117,7 +117,7 @@ export default class KankaBrowserApplication extends Application {
             kankaCampaignId: this.campaign.id,
             currentFilter: this.#currentFilter,
             typeConfig,
-            data: this.#entities?.filter(e => !e.is_template || kanka.settings.importTemplateEntities),
+            data: this.#entities,
             deletedEntries: this.deletedSnapshots,
             settings: {
                 showPrivate: kanka.settings.importPrivateEntities,
@@ -288,7 +288,7 @@ export default class KankaBrowserApplication extends Application {
     }
 
     protected async loadEntities(): Promise<void> {
-        this.#entities = await kanka.api.getAllEntities(
+        const entities = await kanka.api.getAllEntities(
             this.campaign.id,
             [
                 'ability',
@@ -304,6 +304,18 @@ export default class KankaBrowserApplication extends Application {
             ],
         );
 
+        this.#entities = entities?.filter((entity) => {
+            if (!kanka.settings.importTemplateEntities && entity.is_template) {
+                return false;
+            }
+
+            if (!kanka.settings.importPrivateEntities && entity.is_private) {
+                return false;
+            }
+
+            return true;
+        });
+
         this.render();
     }