Merge branch 'master' into feature/env-manager

This commit is contained in:
Jacob Anavisca
2020-02-23 11:39:44 -05:00
committed by GitHub
18 changed files with 465 additions and 126 deletions

View File

@@ -57,11 +57,11 @@ export const SETTINGS_KEYS = [
* e.g. 'auth'
*/
"URL_EXCLUDES",
/**
* A boolean value indicating whether to use the browser extensions
* to run the requests
*/
*/
"EXTENSIONS_ENABLED"
];
@@ -180,7 +180,9 @@ export const mutations = {
addNewCollection({ collections }, collection) {
const { name } = collection;
const duplicateCollection = collections.some(item => item.name.toLowerCase() === name.toLowerCase());
const duplicateCollection = collections.some(
item => item.name.toLowerCase() === name.toLowerCase()
);
if (duplicateCollection) {
this.$toast.info("Duplicate collection");
return;
@@ -199,9 +201,10 @@ export const mutations = {
},
editCollection({ collections }, payload) {
const { collection, collectionIndex } = payload;
const { name } = collection;
const duplicateCollection = collections.some(item => item.name.toLowerCase() === name.toLowerCase());
const { collection: { name }, collectionIndex } = payload;
const duplicateCollection = collections.some(
item => item.name.toLowerCase() === name.toLowerCase()
);
if (duplicateCollection) {
this.$toast.info("Duplicate collection");
return;