Remove all instances of inject, replace with VueX store

This commit is contained in:
Alicia Sykes
2021-10-09 19:24:51 +01:00
parent 8a8166bb47
commit b55f96c839
16 changed files with 97 additions and 75 deletions

View File

@@ -35,7 +35,6 @@ import {
export default {
name: 'MinimalSearch',
inject: ['config'],
props: {
active: Boolean,
},
@@ -47,10 +46,12 @@ export default {
};
},
computed: {
appConfig() {
return this.$store.getters.appConfig;
},
webSearchEnabled() {
const { appConfig } = this.config;
if (appConfig && appConfig.webSearch) {
return !appConfig.webSearch.disableWebSearch;
if (this.appConfig && this.appConfig.webSearch) {
return !this.appConfig.webSearch.disableWebSearch;
}
return true;
},
@@ -117,8 +118,7 @@ export default {
/* If web search enabled, then launch search results when enter is pressed */
searchSubmitted() {
// Get search preferences from appConfig
const { appConfig } = this.config;
const searchPrefs = appConfig.webSearch || {};
const searchPrefs = this.appConfig.webSearch || {};
if (this.webSearchEnabled) { // Only proceed if user hasn't disabled web search
const openingMethod = searchPrefs.openingMethod || defaultSearchOpeningMethod;
// Get search engine, and make URL

View File

@@ -37,7 +37,6 @@ import IframeModal from '@/components/LinkItems/IframeModal.vue';
export default {
name: 'ItemGroup',
inject: ['config'],
props: {
groupId: String,
title: String,
@@ -50,6 +49,11 @@ export default {
selected: Boolean,
showAll: Boolean,
},
computed: {
appConfig() {
return this.$store.getters.appConfig;
},
},
components: {
Item,
IframeModal,
@@ -70,11 +74,11 @@ export default {
this.$emit('change-modal-visibility', changedTo);
},
shouldEnableStatusCheck(itemPreference) {
const globalPreference = this.config.appConfig.statusCheck || false;
const globalPreference = this.appConfig.statusCheck || false;
return itemPreference !== undefined ? itemPreference : globalPreference;
},
getStatusCheckInterval() {
let interval = this.config.appConfig.statusCheckInterval;
let interval = this.appConfig.statusCheckInterval;
if (!interval) return 0;
if (interval > 60) interval = 60;
if (interval < 1) interval = 0;