Remember last opened / created folder

closes #107
mjmlio · Apr 28, 2017 · f2248ac · f2248ac
1 parent 52a4271
commit f2248ac
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 2 deletions.
diff --git a/app/actions/projects.js b/app/actions/projects.js
@@ -1,10 +1,12 @@
 import fs from 'fs'
+import os from 'os'
 import path from 'path'
 import { replace } from 'react-router-redux'
 
 import {
  saveSettings,
  cleanBadProjects,
+ saveLastOpenedFolder,
 } from 'actions/settings'
 
 import {
@@ -18,10 +20,14 @@ import {
 
 import mjml2html from 'helpers/mjml'
 
+const HOME_DIR = os.homedir()
+
 export function addProject (p) {
- return async dispatch => {
+ return async (dispatch, getState) => {
  if (!p) {
+ const state = getState()
  p = fileDialog({
+ defaultPath: state.settings.get('lastOpenedFolder') || HOME_DIR,
  properties: [
  'openDirectory',
  'createDirectory',
@@ -32,6 +38,7 @@ export function addProject (p) {
 
  await fsAccess(p, fs.constants.R_OK | fs.constants.W_OK)
 
+ dispatch(saveLastOpenedFolder(p))
  dispatch(openProject(p))
  }
 }

diff --git a/app/actions/settings.js b/app/actions/settings.js
@@ -8,6 +8,7 @@ export function loadSettings () {
  return async dispatch => {
  const res = await storageGet('settings')
  const settings = defaultsDeep(res, {
+ lastOpenedFolder: null,
  editor: {},
  projects: [],
  api: {},
@@ -58,3 +59,11 @@ export function updateSettings (updater) {
  dispatch(saveSettings())
  }
 }
+
+export function saveLastOpenedFolder (path) {
+ return (dispatch) => {
+ dispatch(updateSettings(settings => {
+ return settings.set('lastOpenedFolder', path)
+ }))
+ }
+}
diff --git a/app/components/Application/index.js b/app/components/Application/index.js
@@ -48,8 +48,8 @@ class Application extends Component {
  {projects && this.props.children}
 
  {settings && <SettingsModal />}
+ {settings && <NewProjectModal />}
 
- <NewProjectModal />
  <Alerts />
  <NotifsPanel />
 

diff --git a/app/components/NewProjectModal/index.js b/app/components/NewProjectModal/index.js
@@ -45,6 +45,7 @@ const defaultState = {
 
 @connect(state => ({
  isOpened: isModalOpened(state, 'newProject'),
+ lastOpenedFolder: state.settings.get('lastOpenedFolder'),
 }), dispatch => ({
  closeModal: () => dispatch(closeModal('newProject')),
  ...bindActionCreators({
@@ -57,6 +58,11 @@ class NewProjectModal extends Component {
  state = defaultState
 
  componentWillReceiveProps (nextProps) {
+ if (!this.props.isOpened && nextProps.isOpened) {
+ this.setState({
+ projectLocation: this.props.lastOpenedFolder || HOME_DIR,
+ })
+ }
  if (this.props.isOpened && !nextProps.isOpened) {
 
  // prevent flashing the resetted content
@@ -80,7 +86,9 @@ class NewProjectModal extends Component {
  }
 
  handleBrowse = () => {
+ const { lastOpenedFolder } = this.props
  const p = fileDialog({
+ defaultPath: lastOpenedFolder || undefined,
  properties: [
  'openDirectory',
  'createDirectory',

diff --git a/app/reducers/settings.js b/app/reducers/settings.js
@@ -7,6 +7,7 @@ export default handleActions({
 
  SETTINGS_LOAD_SUCCESS: (state, { payload }) => {
  return Map({
+ lastOpenedFolder: payload.lastOpenedFolder,
  projects: List(payload.projects),
  editor: Map(payload.editor),
  api: Map(payload.api),