From 37eee26bdff63e4e4b26080c272761ec84128cae Mon Sep 17 00:00:00 2001 From: AWolf81 Date: Sat, 29 Jun 2019 23:21:32 +0200 Subject: [PATCH] fix linting & routing --- browser/main/lib/dataApi/createNoteFromUrl.js | 31 +++++++++---------- .../main/modals/CreateMarkdownFromURLModal.js | 22 ++++++------- tests/dataApi/createNoteFromUrl-test.js | 5 +-- 3 files changed, 27 insertions(+), 31 deletions(-) diff --git a/browser/main/lib/dataApi/createNoteFromUrl.js b/browser/main/lib/dataApi/createNoteFromUrl.js index 10071135..dedeeefb 100644 --- a/browser/main/lib/dataApi/createNoteFromUrl.js +++ b/browser/main/lib/dataApi/createNoteFromUrl.js @@ -3,27 +3,27 @@ const https = require('https') const TurndownService = require('turndown') const createNote = require('./createNote') -import { hashHistory } from 'react-router' +import { push } from 'connected-react-router' import ee from 'browser/main/lib/eventEmitter' -function validateUrl(str) { - if(/^(?:(?:(?:https?|ftp):)?\/\/)(?:\S+(?::\S*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})).?)(?::\d{2,5})?(?:[/?#]\S*)?$/i.test(str)) { - return true; +function validateUrl (str) { + if (/^(?:(?:(?:https?|ftp):)?\/\/)(?:\S+(?::\S*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})).?)(?::\d{2,5})?(?:[/?#]\S*)?$/i.test(str)) { + return true } else { - return false; + return false } } function createNoteFromUrl (url, storage, folder, dispatch = null, location = null) { return new Promise((resolve, reject) => { - let td = new TurndownService(); + let td = new TurndownService() - if(!validateUrl(url)) { - reject({result: false, error: "Please check your URL is in correct format. (Example, https://www.google.com)"}) + if (!validateUrl(url)) { + reject({result: false, error: 'Please check your URL is in correct format. (Example, https://www.google.com)'}) } let request = http - if(url.includes('https')) { + if (url.includes('https')) { request = https } @@ -39,7 +39,7 @@ function createNoteFromUrl (url, storage, folder, dispatch = null, location = nu html.innerHTML = data let scripts = html.getElementsByTagName('script') - for(let i = scripts.length - 1; i >= 0; i--) { + for (let i = scripts.length - 1; i >= 0; i--) { scripts[i].parentNode.removeChild(scripts[i]) } @@ -48,7 +48,7 @@ function createNoteFromUrl (url, storage, folder, dispatch = null, location = nu html.innerHTML = '' - if(dispatch !== null) { + if (dispatch !== null) { createNote(storage, { type: 'MARKDOWN_NOTE', folder: folder, @@ -61,10 +61,10 @@ function createNoteFromUrl (url, storage, folder, dispatch = null, location = nu type: 'UPDATE_NOTE', note: note }) - hashHistory.push({ + dispatch(push({ pathname: location.pathname, query: {key: noteHash} - }) + })) ee.emit('list:jump', noteHash) ee.emit('detail:focus') resolve({result: true, error: null}) @@ -86,9 +86,8 @@ function createNoteFromUrl (url, storage, folder, dispatch = null, location = nu console.error('error in parsing URL', e) reject({result: false, error: e}) }) - req.end(); + req.end() }) - } -module.exports = createNoteFromUrl; +module.exports = createNoteFromUrl diff --git a/browser/main/modals/CreateMarkdownFromURLModal.js b/browser/main/modals/CreateMarkdownFromURLModal.js index 17bdfd90..f221251b 100644 --- a/browser/main/modals/CreateMarkdownFromURLModal.js +++ b/browser/main/modals/CreateMarkdownFromURLModal.js @@ -3,10 +3,7 @@ import React from 'react' import CSSModules from 'browser/lib/CSSModules' import styles from './CreateMarkdownFromURLModal.styl' import dataApi from 'browser/main/lib/dataApi' -import store from 'browser/main/store' -import consts from 'browser/lib/consts' import ModalEscButton from 'browser/components/ModalEscButton' -import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig' import i18n from 'browser/lib/i18n' class CreateMarkdownFromURLModal extends React.Component { @@ -18,7 +15,6 @@ class CreateMarkdownFromURLModal extends React.Component { showerror: false, errormessage: '' } - } componentDidMount () { @@ -57,7 +53,7 @@ class CreateMarkdownFromURLModal extends React.Component { this.setState({ showerror: true, errormessage: message - }); + }) } hideError () { @@ -68,14 +64,14 @@ class CreateMarkdownFromURLModal extends React.Component { } confirm () { - this.hideError() - const { storage, folder, dispatch, location } = this.props + this.hideError() + const { storage, folder, dispatch, location } = this.props - let note = dataApi.createNoteFromUrl(this.state.name, storage, folder, dispatch, location).then((result) => { - this.props.close() - }).catch((result) => { - this.showError(result.error); - }); + dataApi.createNoteFromUrl(this.state.name, storage, folder, dispatch, location).then((result) => { + this.props.close() + }).catch((result) => { + this.showError(result.error) + }) } render () { @@ -103,7 +99,7 @@ class CreateMarkdownFromURLModal extends React.Component { > {i18n.__('Import')} -
{this.state.errormessage}
+
{this.state.errormessage}
) diff --git a/tests/dataApi/createNoteFromUrl-test.js b/tests/dataApi/createNoteFromUrl-test.js index 09b73cc6..79a95ec9 100644 --- a/tests/dataApi/createNoteFromUrl-test.js +++ b/tests/dataApi/createNoteFromUrl-test.js @@ -27,7 +27,6 @@ test.serial('Create a note from URL', (t) => { const url = 'https://shapeshed.com/writing-cross-platform-node/' - return Promise.resolve() .then(function doTest () { return Promise.all([ @@ -37,10 +36,12 @@ test.serial('Create a note from URL', (t) => { .then(function assert (data) { const data1 = data[0] - console.log("STORM LOOK HERE", data1) + console.log('STORM LOOK HERE', data1) t.is(storageKey, data1.storage) const jsonData2 = CSON.readFileSync(path.join(storagePath, 'notes', data1.key + '.cson')) + + // <<<<<< fix me - input2 & data not defined t.is(input2.content, data2.content) t.is(input2.content, jsonData2.content) t.is(input2.tags.length, data2.tags.length)