Added feature options to settings view

oliverschwendener · Oct 3, 2018 · 3982f7c · 3982f7c
1 parent f2e4b71
commit 3982f7c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/main.html b/main.html
@@ -102,7 +102,7 @@ <h1 class="setting-section-title">User Settings</h1>
                             <input type="checkbox" v-model="config.alwaysShowOnPrimaryDisplay" v-on:change="updateUserConfig">
                         </div>
                     </div>
-                    <div class="setting-group">
+                    <div class="setting-group" v-if="config.features.programs">
                         <div class="setting-title">Application file extensions</div>
                         <div class="setting">
                             <div class="sub-setting" v-for="(applicationFileExtension, index) in config.applicationFileExtensions">
@@ -121,7 +121,7 @@ <h1 class="setting-section-title">User Settings</h1>
                             </div>
                         </div>
                     </div>
-                    <div class="setting-group">
+                    <div class="setting-group" v-if="config.features.programs">
                         <div class="setting-title">Application folders</div>
                         <div class="setting">
                             <div class="sub-setting" v-for="(applicationFolder, index) in config.applicationFolders">
@@ -154,7 +154,7 @@ <h1 class="setting-section-title">User Settings</h1>
                             </select>
                         </div>
                     </div>
-                    <div class="setting-group">
+                    <div class="setting-group" v-if="config.features.customCommands">
                         <div class="setting-title">Custom commands</div>
                         <div class="setting">
                             <table class="setting-table">
@@ -199,7 +199,7 @@ <h1 class="setting-section-title">User Settings</h1>
                             </table>
                         </div>
                     </div>
-                    <div class="setting-group">
+                    <div class="setting-group" v-if="config.features.webSearch">
                         <div class="setting-title">Fallback web searches</div>
                         <div class="setting">
                             <div class="sub-setting" v-for="fallbackWebSearch in config.fallbackWebSearches">
@@ -291,7 +291,7 @@ <h1 class="setting-section-title">User Settings</h1>
                             </div>
                         </div>
                     </div>
-                    <div class="setting-group">
+                    <div class="setting-group" v-if="config.features.fileSearch">
                         <div class="setting-title">File search black list</div>
                         <div class="setting">
                             <div class="sub-setting" v-for="(blackListEntry, index) in config.fileSearchBlackList">
@@ -310,7 +310,7 @@ <h1 class="setting-section-title">User Settings</h1>
                             </div>
                         </div>
                     </div>
-                    <div class="setting-group" v-if="config.searchFiles">
+                    <div class="setting-group" v-if="config.features.fileSearch">
                         <div class="setting-title">File search options</div>
                         <div class="setting">
                             <table class="setting-table">
@@ -466,7 +466,7 @@ <h1 class="setting-section-title">User Settings</h1>
                             <input class="setting-text-input" type="number" v-model="config.searchResultNameFontSize" min="0" v-on:blur="updateUserConfig">
                         </div>
                     </div>
-                    <div class="setting-group">
+                    <div class="setting-group" v-if="config.features.shortcuts">
                         <div class="setting-title">Shortcuts</div>
                         <div class="setting">
                             <table class="setting-table">
@@ -538,7 +538,7 @@ <h1 class="setting-section-title">User Settings</h1>
                             <input class="setting-text-input" type="text" v-model="config.userStylesheet" placeholder="Add a file path to your custom stylesheet" v-on:blur="updateUserConfig">
                         </div>
                     </div>
-                    <div class="setting-group">
+                    <div class="setting-group" v-if="config.features.webSearch">
                         <div class="setting-title">Web search engines</div>
                         <div class="setting">
                             <table class="setting-table">

diff --git a/src/ts/search-plugins/file-search-plugin.ts b/src/ts/search-plugins/file-search-plugin.ts
@@ -33,9 +33,6 @@ export class FileSearchPlugin implements SearchPlugin {
                     ? FileHelpers.getFilesFromFolderRecursively(option.folderPath, this.blackList)
                     : FileHelpers.getFilesFromFolder(option.folderPath);
 
-                // tslint:disable-next-line:no-console
-                console.log(filePaths.length);
-
                 for (const filePath of filePaths) {
                     const stats = lstatSync(filePath);
                     const fileName = basename(filePath);

diff --git a/src/ts/searcher/search-plugins-searcher.ts b/src/ts/searcher/search-plugins-searcher.ts
@@ -18,9 +18,9 @@ export class SearchPluginsSearcher implements Searcher {
         const searchPluginManager = new SearchPluginManager(config, iconSet, environmentVariableCollection);
         const plugins = searchPluginManager.getPlugins();
 
-        this.items = plugins
-            .map((plugin) => plugin.getAllItems()).
-            reduce((acc, pluginItems) => acc.concat(pluginItems));
+        this.items = plugins.length > 0
+            ? plugins.map((plugin) => plugin.getAllItems()).reduce((acc, pluginItems) => acc.concat(pluginItems))
+            : [];
     }
 
     public getSearchResult(userInput: string): SearchResultItem[] {