#132 - Persist the last opened folder location

src/commands/Article.ts

@@ -1,7 +1,6 @@
-import { SETTING_AUTO_UPDATE_DATE, SETTING_MODIFIED_FIELD, SETTING_SLUG_UPDATE_FILE_NAME, SETTING_TEMPLATES_PREFIX } from './../constants/settings';
+import { SETTING_AUTO_UPDATE_DATE, SETTING_MODIFIED_FIELD, SETTING_SLUG_UPDATE_FILE_NAME, SETTING_TEMPLATES_PREFIX, CONFIG_KEY, SETTING_DATE_FORMAT, SETTING_SLUG_PREFIX, SETTING_SLUG_SUFFIX } from './../constants';
 import * as vscode from 'vscode';
 import { TaxonomyType } from "../models";
-import { CONFIG_KEY, SETTING_DATE_FORMAT, SETTING_SLUG_PREFIX, SETTING_SLUG_SUFFIX } from "../constants/settings";
 import { format } from "date-fns";
 import { ArticleHelper, Settings, SlugHelper } from '../helpers';
 import matter = require('gray-matter');

src/commands/Dashboard.ts

@@ -1,4 +1,4 @@
-import { SETTINGS_CONTENT_STATIC_FOLDER, SETTING_DATE_FIELD, SETTING_SEO_DESCRIPTION_FIELD, SETTINGS_DASHBOARD_OPENONSTART, SETTINGS_DASHBOARD_MEDIA_SNIPPET, SETTING_TAXONOMY_CONTENT_TYPES } from './../constants/settings';
+import { SETTINGS_CONTENT_STATIC_FOLDER, SETTING_DATE_FIELD, SETTING_SEO_DESCRIPTION_FIELD, SETTINGS_DASHBOARD_OPENONSTART, SETTINGS_DASHBOARD_MEDIA_SNIPPET, SETTING_TAXONOMY_CONTENT_TYPES, DefaultFields, HOME_PAGE_NAVIGATION_ID, ExtensionState, COMMAND_NAME } from '../constants';
 import { ArticleHelper } from './../helpers/ArticleHelper';
 import { basename, dirname, extname, join } from "path";
 import { existsSync, readdirSync, statSync, unlinkSync, writeFileSync } from "fs";
@@ -10,7 +10,6 @@ import { DashboardCommand } from '../dashboardWebView/DashboardCommand';
 import { DashboardMessage } from '../dashboardWebView/DashboardMessage';
 import { Page } from '../dashboardWebView/models/Page';
 import { openFileInEditor } from '../helpers/openFileInEditor';
-import { COMMAND_NAME, EXTENSION_STATE_PAGES_VIEW } from '../constants/Extension';
 import { Template } from './Template';
 import { Notifications } from '../helpers/Notifications';
 import { Settings } from '../dashboardWebView/models/Settings';
@@ -20,7 +19,6 @@ import { ViewType } from '../dashboardWebView/state';
 import { EditorHelper, WebviewHelper } from '@estruyf/vscode';
 import { MediaInfo, MediaPaths } from './../models/MediaPaths';
 import { decodeBase64Image } from '../helpers/decodeBase64Image';
-import { DefaultFields } from '../constants';
 import { DashboardData } from '../models/DashboardData';
 import { ExplorerView } from '../explorerView/ExplorerView';
 import { MediaLibrary } from '../helpers/MediaLibrary';
@@ -161,7 +159,7 @@ export class Dashboard {
           }
           break;
         case DashboardMessage.setPageViewType:
-          Extension.getInstance().setState(EXTENSION_STATE_PAGES_VIEW, msg.data);
+          Extension.getInstance().setState(ExtensionState.PagesView, msg.data);
           break;
         case DashboardMessage.getMedia:
           Dashboard.getMedia(msg?.data?.page, msg?.data?.folder);
@@ -254,7 +252,7 @@ export class Dashboard {
         categories: SettingsHelper.getTaxonomy(TaxonomyType.Category),
         openOnStart: SettingsHelper.get(SETTINGS_DASHBOARD_OPENONSTART),
         versionInfo: ext.getVersion(),
-        pageViewType: await ext.getState<ViewType | undefined>(EXTENSION_STATE_PAGES_VIEW),
+        pageViewType: await ext.getState<ViewType | undefined>(ExtensionState.PagesView),
         mediaSnippet: SettingsHelper.get<string[]>(SETTINGS_DASHBOARD_MEDIA_SNIPPET) || [],
         contentTypes: SettingsHelper.get(SETTING_TAXONOMY_CONTENT_TYPES) || [],
         contentFolders: Folders.get().map(f => f.path),
@@ -278,6 +276,19 @@ export class Dashboard {
     const staticFolder = SettingsHelper.get<string>(SETTINGS_CONTENT_STATIC_FOLDER);
     const contentFolders = Folders.get();
 
+    // If the static folder is not set, retreive the last opened location
+    if (!selectedFolder) {
+      const stateValue = await Extension.getInstance().getState<string | undefined>(ExtensionState.SelectedFolder);
+      if (stateValue) {
+        selectedFolder = stateValue;
+      }
+    }
+
+    // Go to the home folder
+    if (selectedFolder === HOME_PAGE_NAVIGATION_ID) {
+      selectedFolder = '';
+    }
+
     const relSelectedFolderPath = selectedFolder ? selectedFolder.substring((wsFolder?.fsPath || "").length + 1) : '';
 
     let allMedia: MediaInfo[] = [];
@@ -371,6 +382,9 @@ export class Dashboard {
       }
     }
 
+    // Store the last opened folder
+    await Extension.getInstance().setState(ExtensionState.SelectedFolder, selectedFolder);
+
     Dashboard.postWebviewMessage({
       command: DashboardCommand.media,
       data: {

src/commands/Folders.ts

@@ -1,5 +1,5 @@
 import { Questions } from './../helpers/Questions';
-import { SETTINGS_CONTENT_PAGE_FOLDERS, SETTINGS_CONTENT_STATIC_FOLDER } from './../constants/settings';
+import { SETTINGS_CONTENT_PAGE_FOLDERS, SETTINGS_CONTENT_STATIC_FOLDER } from './../constants';
 import { commands, Uri, workspace, window } from "vscode";
 import { basename, join } from "path";
 import { ContentFolder, FileInfo, FolderInfo } from "../models";

src/commands/Preview.ts

@@ -1,11 +1,10 @@
-import { SETTING_PREVIEW_HOST, SETTING_PREVIEW_PATHNAME } from './../constants/settings';
+import { SETTING_PREVIEW_HOST, SETTING_PREVIEW_PATHNAME, CONTEXT } from './../constants';
 import { ArticleHelper } from './../helpers/ArticleHelper';
 import { join } from "path";
 import { commands, env, Uri, ViewColumn, window } from "vscode";
 import { Settings } from '../helpers';
 import { PreviewSettings } from '../models';
 import { format } from 'date-fns';
-import { CONTEXT } from '../constants/context';
 
 
 export class Preview {

src/commands/StatusListener.ts

@@ -1,4 +1,4 @@
-import { SETTING_SEO_DESCRIPTION_FIELD, SETTING_SEO_DESCRIPTION_LENGTH, SETTING_SEO_TITLE_LENGTH } from './../constants/settings';
+import { SETTING_SEO_DESCRIPTION_FIELD, SETTING_SEO_DESCRIPTION_LENGTH, SETTING_SEO_TITLE_LENGTH } from './../constants';
 import * as vscode from 'vscode';
 import { ArticleHelper, SeoHelper, Settings } from '../helpers';
 import { ExplorerView } from '../explorerView/ExplorerView';

src/commands/Template.ts

@@ -8,7 +8,7 @@ import sanitize from '../helpers/Sanitize';
 import { ArticleHelper, Settings } from '../helpers';
 import { Article } from '.';
 import { Notifications } from '../helpers/Notifications';
-import { CONTEXT } from '../constants/context';
+import { CONTEXT } from '../constants';
 import { Project } from './Project';
 import { Folders } from './Folders';
 

src/constants/Extension.ts

@@ -3,9 +3,6 @@ const extensionName = "frontMatter";
 export const EXTENSION_ID = 'eliostruyf.vscode-front-matter';
 export const EXTENSION_BETA_ID = 'eliostruyf.vscode-front-matter-beta';
 
-export const EXTENSION_STATE_VERSION = 'frontMatter:Version';
-export const EXTENSION_STATE_PAGES_VIEW = 'frontMatter:Pages:ViewType';
-
 export const getCommandName = (command: string) => {
   return `${extensionName}.${command}`;
 };

src/constants/ExtensionState.ts

@@ -0,0 +1,6 @@
+
+export const ExtensionState = {
+  PagesView: `frontMatter:Pages:ViewType`,
+  SelectedFolder: `frontMatter:SelectedFolder`,
+  Version: `frontMatter:Version`
+};

src/constants/Navigation.ts

@@ -0,0 +1 @@
+export const HOME_PAGE_NAVIGATION_ID = "FrontMatter:RootFolder";

src/constants/index.ts

@@ -1,6 +1,9 @@
+export * from './ContentType';
 export * from './DefaultFields';
 export * from './Extension';
+export * from './ExtensionState';
 export * from './Links';
+export * from './Navigation';
 export * from './charMap';
 export * from './context';
 export * from './settings';

src/dashboardWebView/DashboardCommand.ts

@@ -3,5 +3,5 @@ export enum DashboardCommand {
   pages = "pages",
   settings = "settings",
   media = "media",
-  viewData = "viewData",
+  viewData = "viewData"
 }

src/dashboardWebView/DashboardMessage.ts

@@ -17,5 +17,5 @@ export enum DashboardMessage {
   deleteMedia = 'deleteMedia',
   insertPreviewImage = 'insertPreviewImage',
   updateMediaMetadata = 'updateMediaMetadata',
-  createMediaFolder = 'createMediaFolder',
+  createMediaFolder = 'createMediaFolder'
 }

src/dashboardWebView/components/Header/Breadcrumb.tsx

@@ -1,7 +1,8 @@
-import { HomeIcon } from '@heroicons/react/solid';
+import { CollectionIcon } from '@heroicons/react/outline';
 import { basename, join } from 'path';
 import * as React from 'react';
 import { useRecoilState, useRecoilValue } from 'recoil';
+import { HOME_PAGE_NAVIGATION_ID } from '../../../constants';
 import { SelectedMediaFolderAtom, SettingsAtom } from '../../state';
 
 export interface IBreadcrumbProps {}
@@ -63,8 +64,8 @@ export const Breadcrumb: React.FunctionComponent<IBreadcrumbProps> = (props: Rea
       <ol role="list" className="w-full mx-auto flex space-x-4 px-5">
         <li className="flex">
           <div className="flex items-center">
-            <button onClick={() => setSelectedFolder(null)} className="text-gray-500 hover:text-gray-600 dark:text-whisper-900 dark:hover:text-whisper-500">
-              <HomeIcon className="flex-shrink-0 h-5 w-5" aria-hidden="true" />
+            <button onClick={() => setSelectedFolder(HOME_PAGE_NAVIGATION_ID)} className="text-gray-500 hover:text-gray-600 dark:text-whisper-900 dark:hover:text-whisper-500">
+              <CollectionIcon className="flex-shrink-0 h-5 w-5" aria-hidden="true" />
               <span className="sr-only">Home</span>
             </button>
           </div>

src/dashboardWebView/components/Media/Media.tsx

@@ -55,13 +55,14 @@ export const Media: React.FunctionComponent<IMediaProps> = (props: React.PropsWi
     accept: 'image/*'
   });
 
-  const messageListener = (message: MessageEvent<EventData<MediaPaths>>) => {
+  const messageListener = (message: MessageEvent<EventData<MediaPaths | { key: string, value: any }>>) => {
     if (message.data.command === DashboardCommand.media) {
+      const data: MediaPaths = message.data.data as MediaPaths;
       setLoading(false);
-      setMedia(message.data.data.media);
-      setTotal(message.data.data.total);
-      setFolders(message.data.data.folders);
-      setSelectedFolder(message.data.data.selectedFolder);
+      setMedia(data.media);
+      setTotal(data.total);
+      setFolders(data.folders);
+      setSelectedFolder(data.selectedFolder);
     }
   };
 

src/dashboardWebView/components/SponsorMsg.tsx

@@ -1,6 +1,6 @@
 import { HeartIcon, StarIcon } from '@heroicons/react/outline';
 import * as React from 'react';
-import { REVIEW_LINK, SPONSOR_LINK } from '../../constants/Links';
+import { REVIEW_LINK, SPONSOR_LINK } from '../../constants';
 import { VersionInfo } from '../../models';
 
 export interface ISponsorMsgProps {

src/dashboardWebView/components/WelcomeScreen.tsx

@@ -1,6 +1,6 @@
 import { HeartIcon, StarIcon } from '@heroicons/react/outline';
 import * as React from 'react';
-import { GITHUB_LINK, REVIEW_LINK, SPONSOR_LINK } from '../../constants/Links';
+import { GITHUB_LINK, REVIEW_LINK, SPONSOR_LINK } from '../../constants';
 import { Messenger } from '@estruyf/vscode/dist/client';
 import { FrontMatterIcon } from '../../panelWebView/components/Icons/FrontMatterIcon';
 import { GitHubIcon } from '../../panelWebView/components/Icons/GitHubIcon';

src/extension.ts

@@ -6,7 +6,7 @@ import { Folders } from './commands/Folders';
 import { Preview } from './commands/Preview';
 import { Project } from './commands/Project';
 import { Template } from './commands/Template';
-import { COMMAND_NAME } from './constants/Extension';
+import { COMMAND_NAME } from './constants';
 import { TaxonomyType } from './models';
 import { MarkdownFoldingProvider } from './providers/MarkdownFoldingProvider';
 import { TagType } from './panelWebView/TagType';

src/helpers/Extension.ts

@@ -1,9 +1,7 @@
 import { basename } from "path";
 import { extensions, Uri, ExtensionContext, window, workspace, commands } from "vscode";
 import { Folders, WORKSPACE_PLACEHOLDER } from "../commands/Folders";
-import { EXTENSION_NAME, GITHUB_LINK, SETTINGS_CONTENT_FOLDERS, SETTINGS_CONTENT_PAGE_FOLDERS, SETTING_DATE_FIELD, SETTING_MODIFIED_FIELD, SETTING_SEO_DESCRIPTION_FIELD, SETTING_TAXONOMY_CONTENT_TYPES } from "../constants";
-import { DEFAULT_CONTENT_TYPE_NAME } from "../constants/ContentType";
-import { EXTENSION_BETA_ID, EXTENSION_ID, EXTENSION_STATE_VERSION } from "../constants/Extension";
+import { EXTENSION_NAME, GITHUB_LINK, SETTINGS_CONTENT_FOLDERS, SETTINGS_CONTENT_PAGE_FOLDERS, SETTING_DATE_FIELD, SETTING_MODIFIED_FIELD, SETTING_SEO_DESCRIPTION_FIELD, SETTING_TAXONOMY_CONTENT_TYPES, DEFAULT_CONTENT_TYPE_NAME, EXTENSION_BETA_ID, EXTENSION_ID, ExtensionState } from "../constants";
 import { ContentType } from "../models";
 import { Notifications } from "./Notifications";
 import { Settings } from "./SettingsHelper";
@@ -32,7 +30,7 @@ export class Extension {
   public getVersion(): { usedVersion: string | undefined, installedVersion: string } {
     const frontMatter = extensions.getExtension(this.isBetaVersion() ? EXTENSION_BETA_ID : EXTENSION_ID)!;
     let installedVersion = frontMatter.packageJSON.version;
-    const usedVersion = this.ctx.globalState.get<string>(EXTENSION_STATE_VERSION);
+    const usedVersion = this.ctx.globalState.get<string>(ExtensionState.Version);
     
     if (this.isBetaVersion()) {
       installedVersion = `${installedVersion}-beta`;
@@ -78,7 +76,7 @@ export class Extension {
    * Set the current version information for the extension
    */
   public setVersion(installedVersion: string): void {
-    this.ctx.globalState.update(EXTENSION_STATE_VERSION, installedVersion);
+    this.ctx.globalState.update(ExtensionState.Version, installedVersion);
   }
 
   /**
@@ -156,12 +154,20 @@ export class Extension {
     }
   }
 
-  public async setState(propKey: string, propValue: string): Promise<void> {
-    await this.ctx.globalState.update(propKey, propValue);
+  public async setState(propKey: string, propValue: string, type: "workspace" | "global" = "global"): Promise<void> {
+    if (type === "global") {
+      await this.ctx.globalState.update(propKey, propValue);
+    } else {
+      await this.ctx.workspaceState.update(propKey, propValue);
+    }
   }
 
-  public async getState<T>(propKey: string): Promise<T | undefined> {
-    return await this.ctx.globalState.get(propKey);
+  public async getState<T>(propKey: string, type: "workspace" | "global" = "global"): Promise<T | undefined> {
+    if (type === "global") {
+      return await this.ctx.globalState.get(propKey);
+    } else {
+      return await this.ctx.workspaceState.get(propKey);
+    }
   }
 
   public isBetaVersion() {

src/helpers/SlugHelper.ts

@@ -1,5 +1,4 @@
-import { stopWords } from '../constants/stopwords-en';
-import { charMap } from '../constants/charMap';
+import { stopWords, charMap } from '../constants';
 
 export class SlugHelper {