btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Merge pull request #344 from athul/athul-patch

Browse Source 
♻️ Refactor Functions
This commit is contained in:
Liyas Thomas
2019-11-27 17:22:30 +05:30
committed by GitHub
parent 37c41086d2 d739af3d4b
commit 4f5788fe31
4 changed files with 86 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
assets/js/curlparser.js
View File

@@ -7,19 +7,19 @@ import * as querystring from "querystring";
* output this: 'msg1=value1&msg2=value2' * output this: 'msg1=value1&msg2=value2'
* @param dataArguments * @param dataArguments
*/ */
function joinDataArguments(dataArguments) { const joinDataArguments = (dataArguments) => {
let data = ""; let data = "";
dataArguments.forEach((argument, i) => { dataArguments.forEach((argument, i) => {
if (i === 0) { if (i === 0) {
data += argument; data += argument;
} else { } else {
data += "&" + argument; data += `&${argument}`;
} }
}); });
return data; return data;
} }
function parseCurlCommand(curlCommand) { const parseCurlCommand = (curlCommand) => {
let newlineFound = /\r|\n/.exec(curlCommand); let newlineFound = /\r|\n/.exec(curlCommand);
if (newlineFound) { if (newlineFound) {
// remove newlines // remove newlines
@@ -47,7 +47,7 @@ function parseCurlCommand(curlCommand) {
} }
let headers; let headers;
let parseHeaders = function (headerFieldName) { const parseHeaders = (headerFieldName) => {
if (parsedArguments[headerFieldName]) { if (parsedArguments[headerFieldName]) {
if (!headers) { if (!headers) {
headers = {}; headers = {};
@@ -102,10 +102,8 @@ function parseCurlCommand(curlCommand) {
}); });
} }
if (cookieString) { if (cookieString) {
let cookieParseOptions = { const cookieParseOptions = {
decode: function (s) { decode: s => s
return s;
}
}; };
// separate out cookie headers into separate data structure // separate out cookie headers into separate data structure
// note: cookie is case insensitive // note: cookie is case insensitive
@@ -174,8 +172,8 @@ function parseCurlCommand(curlCommand) {
}); });
urlObject.search = null; // Clean out the search/query portion. urlObject.search = null; // Clean out the search/query portion.
let request = { const request = {
url: url, url,
urlWithoutQuery: URL.format(urlObject) urlWithoutQuery: URL.format(urlObject)
}; };
if (compressed) { if (compressed) {

6
directives/textareaAutoHeight.js
View File

@@ -1,8 +1,8 @@
export default { export default {
name: "textareaAutoHeight", name: "textareaAutoHeight",
update(element) { update({scrollHeight, clientHeight, style}) {
if (element.scrollHeight !== element.clientHeight) { if (scrollHeight !== clientHeight) {
element.style.minHeight = `${element.scrollHeight}px`; style.minHeight = `${scrollHeight}px`;
} }
} }
} }

72
store/mutations.js
View File

@@ -1,73 +1,73 @@
export default { export default {
setState(state, object) { setState({request}, {attribute, value}) {
state.request[object.attribute] = object.value request[attribute] = value
}, },
setGQLState(state, object) { setGQLState({gql}, {attribute, value}) {
state.gql[object.attribute] = object.value; gql[attribute] = value;
}, },
addGQLHeader(state, object) { addGQLHeader({gql}, object) {
state.gql.headers.push(object); gql.headers.push(object);
}, },
removeGQLHeader(state, index) { removeGQLHeader({gql}, index) {
state.gql.headers.splice(index, 1); gql.headers.splice(index, 1);
}, },
setGQLHeaderKey(state, object) { setGQLHeaderKey({gql}, {index, value}) {
state.gql.headers[object.index].key = object.value; gql.headers[index].key = value;
}, },
setGQLHeaderValue(state, object) { setGQLHeaderValue({gql}, {index, value}) {
state.gql.headers[object.index].value = object.value; gql.headers[index].value = value;
}, },
addHeaders(state, value) { addHeaders({request}, value) {
state.request.headers.push(value); request.headers.push(value);
}, },
removeHeaders(state, index) { removeHeaders({request}, index) {
state.request.headers.splice(index, 1) request.headers.splice(index, 1)
}, },
setKeyHeader(state, object) { setKeyHeader({request}, {index, value}) {
state.request.headers[object.index].key = object.value request.headers[index].key = value
}, },
setValueHeader(state, object) { setValueHeader({request}, {index, value}) {
state.request.headers[object.index].value = object.value request.headers[index].value = value
}, },
addParams(state, value) { addParams({request}, value) {
state.request.params.push(value); request.params.push(value);
}, },
removeParams(state, index) { removeParams({request}, index) {
state.request.params.splice(index, 1) request.params.splice(index, 1)
}, },
setKeyParams(state, object) { setKeyParams({request}, {index, value}) {
state.request.params[object.index].key = object.value request.params[index].key = value
}, },
setValueParams(state, object) { setValueParams({request}, {index, value}) {
state.request.params[object.index].value = object.value request.params[index].value = value
}, },
addBodyParams(state, value) { addBodyParams({request}, value) {
state.request.bodyParams.push(value); request.bodyParams.push(value);
}, },
removeBodyParams(state, index) { removeBodyParams({request}, index) {
state.request.bodyParams.splice(index, 1) request.bodyParams.splice(index, 1)
}, },
setKeyBodyParams(state, object) { setKeyBodyParams({request}, {index, value}) {
state.request.bodyParams[object.index].key = object.value request.bodyParams[index].key = value
}, },
setValueBodyParams(state, object) { setValueBodyParams({request}, {index, value}) {
state.request.bodyParams[object.index].value = object.value request.bodyParams[index].value = value
}, },
}; };

78
store/postwoman.js
View File

@@ -72,7 +72,7 @@ export const state = () => ({
export const mutations = { export const mutations = {
applySetting(state, setting) { applySetting({settings}, setting) {
if (setting == null || !(setting instanceof Array) || setting.length !== 2) { if (setting == null || !(setting instanceof Array) || setting.length !== 2) {
throw new Error("You must provide a setting (array in the form [key, value])"); throw new Error("You must provide a setting (array in the form [key, value])");
} }
@@ -83,10 +83,10 @@ export const mutations = {
// top of the file. // top of the file.
// This is to ensure that application settings remain documented. // This is to ensure that application settings remain documented.
if (!SETTINGS_KEYS.includes(key)) { if (!SETTINGS_KEYS.includes(key)) {
throw new Error("The settings structure does not include the key " + key); throw new Error(`The settings structure does not include the key ${key}`);
} }
state.settings[key] = value; settings[key] = value;
}, },
replaceCollections(state, collections) { replaceCollections(state, collections) {
@@ -103,8 +103,8 @@ export const mutations = {
} }
}, },
addNewCollection(state, collection) { addNewCollection({collections}, collection) {
state.collections.push({ collections.push({
name: '', name: '',
folders: [], folders: [],
requests: [], requests: [],
@@ -112,65 +112,65 @@ export const mutations = {
}) })
}, },
removeCollection(state, payload) { removeCollection({collections}, payload) {
const { const {
collectionIndex collectionIndex
} = payload; } = payload;
state.collections.splice(collectionIndex, 1) collections.splice(collectionIndex, 1)
}, },
editCollection(state, payload) { editCollection({collections}, payload) {
const { const {
collection, collection,
collectionIndex collectionIndex
} = payload } = payload
state.collections[collectionIndex] = collection collections[collectionIndex] = collection
}, },
addNewFolder(state, payload) { addNewFolder({collections}, payload) {
const { const {
collectionIndex, collectionIndex,
folder folder
} = payload; } = payload;
state.collections[collectionIndex].folders.push({ collections[collectionIndex].folders.push({
name: '', name: '',
requests: [], requests: [],
...folder, ...folder,
}); });
}, },
editFolder(state, payload) { editFolder({collections}, payload) {
const { const {
collectionIndex, collectionIndex,
folder, folder,
folderIndex folderIndex
} = payload; } = payload;
Vue.set(state.collections[collectionIndex].folders, folderIndex, folder) Vue.set(collections[collectionIndex].folders, folderIndex, folder)
}, },
removeFolder(state, payload) { removeFolder({collections}, payload) {
const { const {
collectionIndex, collectionIndex,
folderIndex folderIndex
} = payload; } = payload;
state.collections[collectionIndex].folders.splice(folderIndex, 1) collections[collectionIndex].folders.splice(folderIndex, 1)
}, },
addRequest(state, payload) { addRequest({collections}, payload) {
const { const {
request request
} = payload; } = payload;
// Request that is directly attached to collection // Request that is directly attached to collection
if (request.folder === -1) { if (request.folder === -1) {
state.collections[request.collection].requests.push(request); collections[request.collection].requests.push(request);
return return
} }
state.collections[request.collection].folders[request.folder].requests.push(request); collections[request.collection].folders[request.folder].requests.push(request);
}, },
editRequest(state, payload) { editRequest({collections}, payload) {
const { const {
requestOldCollectionIndex, requestOldCollectionIndex,
requestOldFolderIndex, requestOldFolderIndex,
@@ -186,24 +186,24 @@ export const mutations = {
// set new request // set new request
if (requestNewFolderIndex !== undefined) { if (requestNewFolderIndex !== undefined) {
Vue.set(state.collections[requestNewCollectionIndex].folders[requestNewFolderIndex].requests, requestOldIndex, requestNew) Vue.set(collections[requestNewCollectionIndex].folders[requestNewFolderIndex].requests, requestOldIndex, requestNew)
} }
else { else {
Vue.set(state.collections[requestNewCollectionIndex].requests, requestOldIndex, requestNew) Vue.set(collections[requestNewCollectionIndex].requests, requestOldIndex, requestNew)
} }
// remove old request // remove old request
if (changedPlace) { if (changedPlace) {
if (requestOldFolderIndex !== undefined) { if (requestOldFolderIndex !== undefined) {
state.collections[requestOldCollectionIndex].folders[requestOldFolderIndex].requests.splice(requestOldIndex, 1) collections[requestOldCollectionIndex].folders[requestOldFolderIndex].requests.splice(requestOldIndex, 1)
} }
else { else {
state.collections[requestOldCollectionIndex].requests.splice(requestOldIndex, 1) collections[requestOldCollectionIndex].requests.splice(requestOldIndex, 1)
} }
} }
}, },
saveRequestAs(state, payload) { saveRequestAs({collections}, payload) {
const { const {
request, request,
collectionIndex, collectionIndex,
@@ -216,24 +216,24 @@ export const mutations = {
const specifiedRequest = requestIndex !== undefined const specifiedRequest = requestIndex !== undefined
if (specifiedCollection && specifiedFolder && specifiedRequest) { if (specifiedCollection && specifiedFolder && specifiedRequest) {
Vue.set(state.collections[collectionIndex].folders[folderIndex].requests, requestIndex, request) Vue.set(collections[collectionIndex].folders[folderIndex].requests, requestIndex, request)
} }
else if (specifiedCollection && specifiedFolder && !specifiedRequest) { else if (specifiedCollection && specifiedFolder && !specifiedRequest) {
const requests = state.collections[collectionIndex].folders[folderIndex].requests const requests = collections[collectionIndex].folders[folderIndex].requests
const lastRequestIndex = requests.length - 1; const lastRequestIndex = requests.length - 1;
Vue.set(requests, lastRequestIndex + 1, request) Vue.set(requests, lastRequestIndex + 1, request)
} else if (specifiedCollection && !specifiedFolder && specifiedRequest) { } else if (specifiedCollection && !specifiedFolder && specifiedRequest) {
const requests = state.collections[collectionIndex].requests const requests = collections[collectionIndex].requests
Vue.set(requests, requestIndex, request) Vue.set(requests, requestIndex, request)
} else if (specifiedCollection && !specifiedFolder && !specifiedRequest) { } else if (specifiedCollection && !specifiedFolder && !specifiedRequest) {
const requests = state.collections[collectionIndex].requests const requests = collections[collectionIndex].requests
const lastRequestIndex = requests.length - 1; const lastRequestIndex = requests.length - 1;
Vue.set(requests, lastRequestIndex + 1, request) Vue.set(requests, lastRequestIndex + 1, request)
} }
}, },
saveRequest(state, payload) { saveRequest({collections}, payload) {
const { const {
request request
} = payload; } = payload;
@@ -242,12 +242,12 @@ export const mutations = {
if (request.hasOwnProperty('oldCollection') && request.oldCollection > -1) { if (request.hasOwnProperty('oldCollection') && request.oldCollection > -1) {
const folder = request.hasOwnProperty('oldFolder') && request.oldFolder >= -1 ? request.oldFolder : request.folder; const folder = request.hasOwnProperty('oldFolder') && request.oldFolder >= -1 ? request.oldFolder : request.folder;
if (folder > -1) { if (folder > -1) {
state.collections[request.oldCollection].folders[folder].requests.splice(request.requestIndex, 1) collections[request.oldCollection].folders[folder].requests.splice(request.requestIndex, 1)
} else { } else {
state.collections[request.oldCollection].requests.splice(request.requestIndex, 1) collections[request.oldCollection].requests.splice(request.requestIndex, 1)
} }
} else if (request.hasOwnProperty('oldFolder') && request.oldFolder !== -1) { } else if (request.hasOwnProperty('oldFolder') && request.oldFolder !== -1) {
state.collections[request.collection].folders[folder].requests.splice(request.requestIndex, 1) collections[request.collection].folders[folder].requests.splice(request.requestIndex, 1)
} }
delete request.oldCollection; delete request.oldCollection;
@@ -255,14 +255,14 @@ export const mutations = {
// Request that is directly attached to collection // Request that is directly attached to collection
if (request.folder === -1) { if (request.folder === -1) {
Vue.set(state.collections[request.collection].requests, request.requestIndex, request) Vue.set(collections[request.collection].requests, request.requestIndex, request)
return return
} }
Vue.set(state.collections[request.collection].folders[request.folder].requests, request.requestIndex, request) Vue.set(collections[request.collection].folders[request.folder].requests, request.requestIndex, request)
}, },
removeRequest(state, payload) { removeRequest({collections}, payload) {
const { const {
collectionIndex, collectionIndex,
folderIndex, folderIndex,
@@ -271,15 +271,15 @@ export const mutations = {
// Request that is directly attached to collection // Request that is directly attached to collection
if (folderIndex === -1) { if (folderIndex === -1) {
state.collections[collectionIndex].requests.splice(requestIndex, 1) collections[collectionIndex].requests.splice(requestIndex, 1)
return return
} }
state.collections[collectionIndex].folders[folderIndex].requests.splice(requestIndex, 1) collections[collectionIndex].folders[folderIndex].requests.splice(requestIndex, 1)
}, },
selectRequest(state, payload) { selectRequest(state, {request}) {
state.selectedRequest = Object.assign({}, payload.request); state.selectedRequest = Object.assign({}, request);
}, },
}; };