-
+
- Copy media path
-
-
- Delete media
-
+ onClick={insertToArticle}>
+ Insert into your article
+
+ {
+ (viewData?.data?.position && settings?.mediaSnippet && settings?.mediaSnippet.length > 0) && (
+
+ Insert your media snippet
+
+ )
+ }
+
+ ) : (
+ <>
+
+ Copy media path
+
+
+ Delete media
+
+
+ )
+ }
{basename(parseWinPath(media.fsPath) || "")}
diff --git a/src/pagesView/components/Media/Lightbox.tsx b/src/dashboardWebView/components/Media/Lightbox.tsx
similarity index 100%
rename from src/pagesView/components/Media/Lightbox.tsx
rename to src/dashboardWebView/components/Media/Lightbox.tsx
diff --git a/src/pagesView/components/Media/List.tsx b/src/dashboardWebView/components/Media/List.tsx
similarity index 100%
rename from src/pagesView/components/Media/List.tsx
rename to src/dashboardWebView/components/Media/List.tsx
diff --git a/src/pagesView/components/Media/Media.tsx b/src/dashboardWebView/components/Media/Media.tsx
similarity index 87%
rename from src/pagesView/components/Media/Media.tsx
rename to src/dashboardWebView/components/Media/Media.tsx
index e18a5eab..4069b10d 100644
--- a/src/pagesView/components/Media/Media.tsx
+++ b/src/dashboardWebView/components/Media/Media.tsx
@@ -5,7 +5,7 @@ import * as React from 'react';
import { useRecoilState, useRecoilValue } from 'recoil';
import { MediaInfo, MediaPaths } from '../../../models/MediaPaths';
import { DashboardCommand } from '../../DashboardCommand';
-import { LoadingAtom, MediaFoldersAtom, MediaTotalAtom, SelectedMediaFolderSelector, SettingsSelector } from '../../state';
+import { LoadingAtom, MediaFoldersAtom, MediaTotalAtom, SelectedMediaFolderSelector, SettingsSelector, ViewDataSelector } from '../../state';
import { Header } from '../Header';
import { Spinner } from '../Spinner';
import { SponsorMsg } from '../SponsorMsg';
@@ -27,6 +27,7 @@ export const Media: React.FunctionComponent = (props: React.PropsWi
const [ , setTotal ] = useRecoilState(MediaTotalAtom);
const [ , setFolders ] = useRecoilState(MediaFoldersAtom);
const [ loading, setLoading ] = useRecoilState(LoadingAtom);
+ const viewData = useRecoilValue(ViewDataSelector);
const onDrop = useCallback((acceptedFiles: File[]) => {
acceptedFiles.forEach((file) => {
@@ -73,6 +74,15 @@ export const Media: React.FunctionComponent = (props: React.PropsWi
+
+ {
+ viewData?.data?.filePath && (
+
+
Select the image you want to use for your article.
+
You can also drag and drop images from your desktop and select that once uploaded.
+
+ )
+ }
{
isDragActive && (
diff --git a/src/pagesView/components/Media/Pagination.tsx b/src/dashboardWebView/components/Media/Pagination.tsx
similarity index 100%
rename from src/pagesView/components/Media/Pagination.tsx
rename to src/dashboardWebView/components/Media/Pagination.tsx
diff --git a/src/pagesView/components/Media/PaginationButton.tsx b/src/dashboardWebView/components/Media/PaginationButton.tsx
similarity index 100%
rename from src/pagesView/components/Media/PaginationButton.tsx
rename to src/dashboardWebView/components/Media/PaginationButton.tsx
diff --git a/src/pagesView/components/Menu/MenuButton.tsx b/src/dashboardWebView/components/Menu/MenuButton.tsx
similarity index 100%
rename from src/pagesView/components/Menu/MenuButton.tsx
rename to src/dashboardWebView/components/Menu/MenuButton.tsx
diff --git a/src/pagesView/components/Menu/MenuItem.tsx b/src/dashboardWebView/components/Menu/MenuItem.tsx
similarity index 100%
rename from src/pagesView/components/Menu/MenuItem.tsx
rename to src/dashboardWebView/components/Menu/MenuItem.tsx
diff --git a/src/pagesView/components/Menu/MenuItems.tsx b/src/dashboardWebView/components/Menu/MenuItems.tsx
similarity index 100%
rename from src/pagesView/components/Menu/MenuItems.tsx
rename to src/dashboardWebView/components/Menu/MenuItems.tsx
diff --git a/src/pagesView/components/Menu/index.ts b/src/dashboardWebView/components/Menu/index.ts
similarity index 100%
rename from src/pagesView/components/Menu/index.ts
rename to src/dashboardWebView/components/Menu/index.ts
diff --git a/src/pagesView/components/Modals/Alert.tsx b/src/dashboardWebView/components/Modals/Alert.tsx
similarity index 100%
rename from src/pagesView/components/Modals/Alert.tsx
rename to src/dashboardWebView/components/Modals/Alert.tsx
diff --git a/src/pagesView/components/Navigation.tsx b/src/dashboardWebView/components/Navigation.tsx
similarity index 100%
rename from src/pagesView/components/Navigation.tsx
rename to src/dashboardWebView/components/Navigation.tsx
diff --git a/src/pagesView/components/Spinner.tsx b/src/dashboardWebView/components/Spinner.tsx
similarity index 100%
rename from src/pagesView/components/Spinner.tsx
rename to src/dashboardWebView/components/Spinner.tsx
diff --git a/src/pagesView/components/SponsorMsg.tsx b/src/dashboardWebView/components/SponsorMsg.tsx
similarity index 100%
rename from src/pagesView/components/SponsorMsg.tsx
rename to src/dashboardWebView/components/SponsorMsg.tsx
diff --git a/src/pagesView/components/Startup.tsx b/src/dashboardWebView/components/Startup.tsx
similarity index 100%
rename from src/pagesView/components/Startup.tsx
rename to src/dashboardWebView/components/Startup.tsx
diff --git a/src/pagesView/components/Status.tsx b/src/dashboardWebView/components/Status.tsx
similarity index 100%
rename from src/pagesView/components/Status.tsx
rename to src/dashboardWebView/components/Status.tsx
diff --git a/src/pagesView/components/Steps/Step.tsx b/src/dashboardWebView/components/Steps/Step.tsx
similarity index 100%
rename from src/pagesView/components/Steps/Step.tsx
rename to src/dashboardWebView/components/Steps/Step.tsx
diff --git a/src/pagesView/components/Steps/StepsToGetStarted.tsx b/src/dashboardWebView/components/Steps/StepsToGetStarted.tsx
similarity index 100%
rename from src/pagesView/components/Steps/StepsToGetStarted.tsx
rename to src/dashboardWebView/components/Steps/StepsToGetStarted.tsx
diff --git a/src/pagesView/components/WelcomeScreen.tsx b/src/dashboardWebView/components/WelcomeScreen.tsx
similarity index 96%
rename from src/pagesView/components/WelcomeScreen.tsx
rename to src/dashboardWebView/components/WelcomeScreen.tsx
index aecb321c..ef5cdd1f 100644
--- a/src/pagesView/components/WelcomeScreen.tsx
+++ b/src/dashboardWebView/components/WelcomeScreen.tsx
@@ -2,8 +2,8 @@ import { HeartIcon, StarIcon } from '@heroicons/react/outline';
import * as React from 'react';
import { GITHUB_LINK, REVIEW_LINK, SPONSOR_LINK } from '../../constants/Links';
import { Messenger } from '@estruyf/vscode/dist/client';
-import { FrontMatterIcon } from '../../viewpanel/components/Icons/FrontMatterIcon';
-import { GitHubIcon } from '../../viewpanel/components/Icons/GitHubIcon';
+import { FrontMatterIcon } from '../../panelWebView/components/Icons/FrontMatterIcon';
+import { GitHubIcon } from '../../panelWebView/components/Icons/GitHubIcon';
import { DashboardMessage } from '../DashboardMessage';
import { Settings } from '../models/Settings';
import { StepsToGetStarted } from './Steps/StepsToGetStarted';
diff --git a/src/pagesView/constants/GroupOption.ts b/src/dashboardWebView/constants/GroupOption.ts
similarity index 100%
rename from src/pagesView/constants/GroupOption.ts
rename to src/dashboardWebView/constants/GroupOption.ts
diff --git a/src/pagesView/constants/SortOption.ts b/src/dashboardWebView/constants/SortOption.ts
similarity index 100%
rename from src/pagesView/constants/SortOption.ts
rename to src/dashboardWebView/constants/SortOption.ts
diff --git a/src/pagesView/constants/Storage.ts b/src/dashboardWebView/constants/Storage.ts
similarity index 100%
rename from src/pagesView/constants/Storage.ts
rename to src/dashboardWebView/constants/Storage.ts
diff --git a/src/pagesView/constants/Tab.ts b/src/dashboardWebView/constants/Tab.ts
similarity index 100%
rename from src/pagesView/constants/Tab.ts
rename to src/dashboardWebView/constants/Tab.ts
diff --git a/src/pagesView/hooks/useMessages.tsx b/src/dashboardWebView/hooks/useMessages.tsx
similarity index 71%
rename from src/pagesView/hooks/useMessages.tsx
rename to src/dashboardWebView/hooks/useMessages.tsx
index e20bf0c1..2f7fcccb 100644
--- a/src/pagesView/hooks/useMessages.tsx
+++ b/src/dashboardWebView/hooks/useMessages.tsx
@@ -3,7 +3,7 @@ import { useRecoilState } from 'recoil';
import { DashboardCommand } from '../DashboardCommand';
import { DashboardMessage } from '../DashboardMessage';
import { Page } from '../models/Page';
-import { SettingsAtom } from '../state';
+import { DashboardViewAtom, SettingsAtom, ViewDataAtom } from '../state';
import { Messenger } from '@estruyf/vscode/dist/client';
import { EventData } from '@estruyf/vscode/dist/models';
@@ -11,12 +11,20 @@ export default function useMessages() {
const [loading, setLoading] = useState
(false);
const [pages, setPages] = useState([]);
const [settings, setSettings] = useRecoilState(SettingsAtom);
+ const [viewData, setViewData] = useRecoilState(ViewDataAtom);
+ const [, setView] = useRecoilState(DashboardViewAtom);
Messenger.listen((message: MessageEvent>) => {
switch (message.data.command) {
case DashboardCommand.loading:
setLoading(message.data.data);
break;
+ case DashboardCommand.viewData:
+ setViewData(message.data.data);
+ if (message.data.data?.type === 'media') {
+ setView('media');
+ }
+ break;
case DashboardCommand.settings:
setSettings(message.data.data);
break;
@@ -27,8 +35,9 @@ export default function useMessages() {
}
});
- useEffect(() => {
+ useEffect(() => {
setLoading(true);
+ Messenger.send(DashboardMessage.getViewType);
Messenger.send(DashboardMessage.getTheme);
Messenger.send(DashboardMessage.getData);
}, ['']);
@@ -36,6 +45,7 @@ export default function useMessages() {
return {
loading,
pages,
+ viewData,
settings
};
}
\ No newline at end of file
diff --git a/src/pagesView/hooks/usePages.tsx b/src/dashboardWebView/hooks/usePages.tsx
similarity index 100%
rename from src/pagesView/hooks/usePages.tsx
rename to src/dashboardWebView/hooks/usePages.tsx
diff --git a/src/pagesView/index.tsx b/src/dashboardWebView/index.tsx
similarity index 100%
rename from src/pagesView/index.tsx
rename to src/dashboardWebView/index.tsx
diff --git a/src/pagesView/models/Page.ts b/src/dashboardWebView/models/Page.ts
similarity index 100%
rename from src/pagesView/models/Page.ts
rename to src/dashboardWebView/models/Page.ts
diff --git a/src/pagesView/models/Settings.ts b/src/dashboardWebView/models/Settings.ts
similarity index 81%
rename from src/pagesView/models/Settings.ts
rename to src/dashboardWebView/models/Settings.ts
index e3335b15..59ddaa31 100644
--- a/src/pagesView/models/Settings.ts
+++ b/src/dashboardWebView/models/Settings.ts
@@ -1,6 +1,6 @@
import { VersionInfo } from '../../models/VersionInfo';
import { ViewType } from '../state';
-import { ContentFolder } from './../../models/ContentFolder';
+import { ContentFolder } from '../../models/ContentFolder';
export interface Settings {
beta: boolean;
@@ -13,4 +13,5 @@ export interface Settings {
openOnStart: boolean | null;
versionInfo: VersionInfo;
pageViewType: ViewType | undefined;
+ mediaSnippet: string[];
}
\ No newline at end of file
diff --git a/src/pagesView/models/Status.ts b/src/dashboardWebView/models/Status.ts
similarity index 100%
rename from src/pagesView/models/Status.ts
rename to src/dashboardWebView/models/Status.ts
diff --git a/src/pagesView/models/index.ts b/src/dashboardWebView/models/index.ts
similarity index 100%
rename from src/pagesView/models/index.ts
rename to src/dashboardWebView/models/index.ts
diff --git a/src/pagesView/state/atom/CategoryAtom.ts b/src/dashboardWebView/state/atom/CategoryAtom.ts
similarity index 100%
rename from src/pagesView/state/atom/CategoryAtom.ts
rename to src/dashboardWebView/state/atom/CategoryAtom.ts
diff --git a/src/pagesView/state/atom/DashboardViewAtom.ts b/src/dashboardWebView/state/atom/DashboardViewAtom.ts
similarity index 100%
rename from src/pagesView/state/atom/DashboardViewAtom.ts
rename to src/dashboardWebView/state/atom/DashboardViewAtom.ts
diff --git a/src/pagesView/state/atom/FolderAtom.ts b/src/dashboardWebView/state/atom/FolderAtom.ts
similarity index 100%
rename from src/pagesView/state/atom/FolderAtom.ts
rename to src/dashboardWebView/state/atom/FolderAtom.ts
diff --git a/src/pagesView/state/atom/GroupingAtom.ts b/src/dashboardWebView/state/atom/GroupingAtom.ts
similarity index 100%
rename from src/pagesView/state/atom/GroupingAtom.ts
rename to src/dashboardWebView/state/atom/GroupingAtom.ts
diff --git a/src/pagesView/state/atom/LightboxAtom.ts b/src/dashboardWebView/state/atom/LightboxAtom.ts
similarity index 100%
rename from src/pagesView/state/atom/LightboxAtom.ts
rename to src/dashboardWebView/state/atom/LightboxAtom.ts
diff --git a/src/pagesView/state/atom/LoadingAtom.ts b/src/dashboardWebView/state/atom/LoadingAtom.ts
similarity index 100%
rename from src/pagesView/state/atom/LoadingAtom.ts
rename to src/dashboardWebView/state/atom/LoadingAtom.ts
diff --git a/src/pagesView/state/atom/MediaFoldersAtom.ts b/src/dashboardWebView/state/atom/MediaFoldersAtom.ts
similarity index 100%
rename from src/pagesView/state/atom/MediaFoldersAtom.ts
rename to src/dashboardWebView/state/atom/MediaFoldersAtom.ts
diff --git a/src/pagesView/state/atom/MediaTotalAtom.ts b/src/dashboardWebView/state/atom/MediaTotalAtom.ts
similarity index 100%
rename from src/pagesView/state/atom/MediaTotalAtom.ts
rename to src/dashboardWebView/state/atom/MediaTotalAtom.ts
diff --git a/src/pagesView/state/atom/PageAtom.ts b/src/dashboardWebView/state/atom/PageAtom.ts
similarity index 100%
rename from src/pagesView/state/atom/PageAtom.ts
rename to src/dashboardWebView/state/atom/PageAtom.ts
diff --git a/src/pagesView/state/atom/SearchAtom.ts b/src/dashboardWebView/state/atom/SearchAtom.ts
similarity index 100%
rename from src/pagesView/state/atom/SearchAtom.ts
rename to src/dashboardWebView/state/atom/SearchAtom.ts
diff --git a/src/pagesView/state/atom/SelectedMediaFolderAtom.ts b/src/dashboardWebView/state/atom/SelectedMediaFolderAtom.ts
similarity index 100%
rename from src/pagesView/state/atom/SelectedMediaFolderAtom.ts
rename to src/dashboardWebView/state/atom/SelectedMediaFolderAtom.ts
diff --git a/src/pagesView/state/atom/SettingsAtom.ts b/src/dashboardWebView/state/atom/SettingsAtom.ts
similarity index 100%
rename from src/pagesView/state/atom/SettingsAtom.ts
rename to src/dashboardWebView/state/atom/SettingsAtom.ts
diff --git a/src/pagesView/state/atom/SortingAtom.ts b/src/dashboardWebView/state/atom/SortingAtom.ts
similarity index 100%
rename from src/pagesView/state/atom/SortingAtom.ts
rename to src/dashboardWebView/state/atom/SortingAtom.ts
diff --git a/src/pagesView/state/atom/TabAtom.ts b/src/dashboardWebView/state/atom/TabAtom.ts
similarity index 100%
rename from src/pagesView/state/atom/TabAtom.ts
rename to src/dashboardWebView/state/atom/TabAtom.ts
diff --git a/src/pagesView/state/atom/TagAtom.ts b/src/dashboardWebView/state/atom/TagAtom.ts
similarity index 100%
rename from src/pagesView/state/atom/TagAtom.ts
rename to src/dashboardWebView/state/atom/TagAtom.ts
diff --git a/src/pagesView/state/atom/ViewAtom.ts b/src/dashboardWebView/state/atom/ViewAtom.ts
similarity index 100%
rename from src/pagesView/state/atom/ViewAtom.ts
rename to src/dashboardWebView/state/atom/ViewAtom.ts
diff --git a/src/dashboardWebView/state/atom/ViewDataAtom.ts b/src/dashboardWebView/state/atom/ViewDataAtom.ts
new file mode 100644
index 00000000..c05bad0d
--- /dev/null
+++ b/src/dashboardWebView/state/atom/ViewDataAtom.ts
@@ -0,0 +1,7 @@
+import { atom } from 'recoil';
+import { DashboardData } from '../../../models/DashboardData';
+
+export const ViewDataAtom = atom({
+ key: 'ViewDataAtom',
+ default: undefined
+});
\ No newline at end of file
diff --git a/src/pagesView/state/atom/index.ts b/src/dashboardWebView/state/atom/index.ts
similarity index 94%
rename from src/pagesView/state/atom/index.ts
rename to src/dashboardWebView/state/atom/index.ts
index a8d30209..2dcf5824 100644
--- a/src/pagesView/state/atom/index.ts
+++ b/src/dashboardWebView/state/atom/index.ts
@@ -14,3 +14,4 @@ export * from './SortingAtom';
export * from './TabAtom';
export * from './TagAtom';
export * from './ViewAtom';
+export * from './ViewDataAtom';
diff --git a/src/pagesView/state/index.ts b/src/dashboardWebView/state/index.ts
similarity index 100%
rename from src/pagesView/state/index.ts
rename to src/dashboardWebView/state/index.ts
diff --git a/src/pagesView/state/selectors/CategorySelector.ts b/src/dashboardWebView/state/selectors/CategorySelector.ts
similarity index 100%
rename from src/pagesView/state/selectors/CategorySelector.ts
rename to src/dashboardWebView/state/selectors/CategorySelector.ts
diff --git a/src/pagesView/state/selectors/DashboardViewSelector.ts b/src/dashboardWebView/state/selectors/DashboardViewSelector.ts
similarity index 100%
rename from src/pagesView/state/selectors/DashboardViewSelector.ts
rename to src/dashboardWebView/state/selectors/DashboardViewSelector.ts
diff --git a/src/pagesView/state/selectors/FolderSelector.ts b/src/dashboardWebView/state/selectors/FolderSelector.ts
similarity index 100%
rename from src/pagesView/state/selectors/FolderSelector.ts
rename to src/dashboardWebView/state/selectors/FolderSelector.ts
diff --git a/src/pagesView/state/selectors/GroupingSelector.ts b/src/dashboardWebView/state/selectors/GroupingSelector.ts
similarity index 100%
rename from src/pagesView/state/selectors/GroupingSelector.ts
rename to src/dashboardWebView/state/selectors/GroupingSelector.ts
diff --git a/src/pagesView/state/selectors/LoadingSelector.ts b/src/dashboardWebView/state/selectors/LoadingSelector.ts
similarity index 100%
rename from src/pagesView/state/selectors/LoadingSelector.ts
rename to src/dashboardWebView/state/selectors/LoadingSelector.ts
diff --git a/src/pagesView/state/selectors/MediaFoldersSelector.ts b/src/dashboardWebView/state/selectors/MediaFoldersSelector.ts
similarity index 100%
rename from src/pagesView/state/selectors/MediaFoldersSelector.ts
rename to src/dashboardWebView/state/selectors/MediaFoldersSelector.ts
diff --git a/src/pagesView/state/selectors/MediaTotalSelector.ts b/src/dashboardWebView/state/selectors/MediaTotalSelector.ts
similarity index 100%
rename from src/pagesView/state/selectors/MediaTotalSelector.ts
rename to src/dashboardWebView/state/selectors/MediaTotalSelector.ts
diff --git a/src/pagesView/state/selectors/SearchSelector.ts b/src/dashboardWebView/state/selectors/SearchSelector.ts
similarity index 100%
rename from src/pagesView/state/selectors/SearchSelector.ts
rename to src/dashboardWebView/state/selectors/SearchSelector.ts
diff --git a/src/pagesView/state/selectors/SelectedMediaFolderSelector.ts b/src/dashboardWebView/state/selectors/SelectedMediaFolderSelector.ts
similarity index 100%
rename from src/pagesView/state/selectors/SelectedMediaFolderSelector.ts
rename to src/dashboardWebView/state/selectors/SelectedMediaFolderSelector.ts
diff --git a/src/pagesView/state/selectors/SettingsSelector.ts b/src/dashboardWebView/state/selectors/SettingsSelector.ts
similarity index 100%
rename from src/pagesView/state/selectors/SettingsSelector.ts
rename to src/dashboardWebView/state/selectors/SettingsSelector.ts
diff --git a/src/pagesView/state/selectors/SortingSelector.ts b/src/dashboardWebView/state/selectors/SortingSelector.ts
similarity index 100%
rename from src/pagesView/state/selectors/SortingSelector.ts
rename to src/dashboardWebView/state/selectors/SortingSelector.ts
diff --git a/src/pagesView/state/selectors/TabSelector.ts b/src/dashboardWebView/state/selectors/TabSelector.ts
similarity index 100%
rename from src/pagesView/state/selectors/TabSelector.ts
rename to src/dashboardWebView/state/selectors/TabSelector.ts
diff --git a/src/pagesView/state/selectors/TagSelector.ts b/src/dashboardWebView/state/selectors/TagSelector.ts
similarity index 100%
rename from src/pagesView/state/selectors/TagSelector.ts
rename to src/dashboardWebView/state/selectors/TagSelector.ts
diff --git a/src/dashboardWebView/state/selectors/ViewDataSelector.ts b/src/dashboardWebView/state/selectors/ViewDataSelector.ts
new file mode 100644
index 00000000..b1596594
--- /dev/null
+++ b/src/dashboardWebView/state/selectors/ViewDataSelector.ts
@@ -0,0 +1,9 @@
+import { selector } from 'recoil';
+import { ViewDataAtom } from '..';
+
+export const ViewDataSelector = selector({
+ key: 'ViewDataSelector',
+ get: ({get}) => {
+ return get(ViewDataAtom);
+ }
+});
\ No newline at end of file
diff --git a/src/pagesView/state/selectors/ViewSelector.ts b/src/dashboardWebView/state/selectors/ViewSelector.ts
similarity index 100%
rename from src/pagesView/state/selectors/ViewSelector.ts
rename to src/dashboardWebView/state/selectors/ViewSelector.ts
diff --git a/src/pagesView/state/selectors/index.ts b/src/dashboardWebView/state/selectors/index.ts
similarity index 93%
rename from src/pagesView/state/selectors/index.ts
rename to src/dashboardWebView/state/selectors/index.ts
index 3c52ec37..a694a579 100644
--- a/src/pagesView/state/selectors/index.ts
+++ b/src/dashboardWebView/state/selectors/index.ts
@@ -11,4 +11,5 @@ export * from './SettingsSelector';
export * from './SortingSelector';
export * from './TabSelector';
export * from './TagSelector';
+export * from './ViewDataSelector';
export * from './ViewSelector';
diff --git a/src/pagesView/styles.css b/src/dashboardWebView/styles.css
similarity index 100%
rename from src/pagesView/styles.css
rename to src/dashboardWebView/styles.css
diff --git a/src/webview/ExplorerView.ts b/src/explorerView/ExplorerView.ts
similarity index 72%
rename from src/webview/ExplorerView.ts
rename to src/explorerView/ExplorerView.ts
index 29695cc8..30ecfa11 100644
--- a/src/webview/ExplorerView.ts
+++ b/src/explorerView/ExplorerView.ts
@@ -1,14 +1,14 @@
-import { Template } from './../commands/Template';
-import { SETTINGS_CONTENT_FRONTMATTER_HIGHLIGHT, SETTING_AUTO_UPDATE_DATE, SETTING_CUSTOM_SCRIPTS, SETTING_SEO_CONTENT_MIN_LENGTH, SETTING_SEO_DESCRIPTION_FIELD, SETTING_SLUG_UPDATE_FILE_NAME, SETTING_PREVIEW_HOST } from './../constants/settings';
+import { DashboardData } from '../models/DashboardData';
+import { Template } from '../commands/Template';
+import { DefaultFields, SETTINGS_CONTENT_FRONTMATTER_HIGHLIGHT, SETTING_AUTO_UPDATE_DATE, SETTING_CUSTOM_SCRIPTS, SETTING_SEO_CONTENT_MIN_LENGTH, SETTING_SEO_DESCRIPTION_FIELD, SETTING_SLUG_UPDATE_FILE_NAME, SETTING_PREVIEW_HOST, SETTING_DATE_FORMAT, SETTING_COMMA_SEPARATED_FIELDS, SETTINGS_CONTENT_STATIC_FOLDERS, SETTING_TAXONOMY_CONTENT_TYPES, SETTING_PANEL_FREEFORM, SETTING_SEO_DESCRIPTION_LENGTH, SETTING_SEO_TITLE_LENGTH, SETTING_SLUG_PREFIX, SETTING_SLUG_SUFFIX, SETTING_TAXONOMY_CATEGORIES, SETTING_TAXONOMY_TAGS } from '../constants';
import * as os from 'os';
-import { PanelSettings, CustomScript } from './../models/PanelSettings';
+import { PanelSettings, CustomScript } from '../models/PanelSettings';
import { CancellationToken, Disposable, Uri, Webview, WebviewView, WebviewViewProvider, WebviewViewResolveContext, window, workspace, commands, env as vscodeEnv } from "vscode";
-import { SETTING_PANEL_FREEFORM, SETTING_SEO_DESCRIPTION_LENGTH, SETTING_SEO_TITLE_LENGTH, SETTING_SLUG_PREFIX, SETTING_SLUG_SUFFIX, SETTING_TAXONOMY_CATEGORIES, SETTING_TAXONOMY_TAGS } from "../constants";
-import { ArticleHelper, SettingsHelper } from "../helpers";
-import { Command } from "../viewpanel/Command";
-import { CommandToCode } from '../viewpanel/CommandToCode';
+import { ArticleHelper, Settings } from "../helpers";
+import { Command } from "../panelWebView/Command";
+import { CommandToCode } from '../panelWebView/CommandToCode';
import { Article } from '../commands';
-import { TagType } from '../viewpanel/TagType';
+import { TagType } from '../panelWebView/TagType';
import { TaxonomyType } from '../models';
import { exec } from 'child_process';
import * as path from 'path';
@@ -21,6 +21,9 @@ import { Preview } from '../commands/Preview';
import { openFileInEditor } from '../helpers/openFileInEditor';
import { WebviewHelper } from '@estruyf/vscode';
import { Extension } from '../helpers/Extension';
+import { dirname, join } from 'path';
+import { existsSync } from 'fs';
+import { Dashboard } from '../commands/Dashboard';
const FILE_LIMIT = 10;
@@ -73,8 +76,7 @@ export class ExplorerView implements WebviewViewProvider, Disposable {
webviewView.webview.options = {
enableScripts: true,
- enableCommandUris: true,
- localResourceRoots: [this.extPath]
+ enableCommandUris: true
};
webviewView.webview.html = this.getWebviewContent(webviewView.webview);
@@ -93,9 +95,6 @@ export class ExplorerView implements WebviewViewProvider, Disposable {
case CommandToCode.updateSlug:
Article.generateSlug();
break;
- case CommandToCode.updateDate:
- Article.setDate();
- break;
case CommandToCode.updateLastMod:
Article.setLastModifiedDate();
break;
@@ -182,6 +181,13 @@ export class ExplorerView implements WebviewViewProvider, Disposable {
case CommandToCode.updateMetadata:
this.updateMetadata(msg.data);
break;
+ case CommandToCode.selectImage:
+ await commands.executeCommand(COMMAND_NAME.dashboard, {
+ type: "media",
+ data: msg.data
+ } as DashboardData);
+ this.getMediaSelection();
+ break;
}
});
@@ -198,7 +204,7 @@ export class ExplorerView implements WebviewViewProvider, Disposable {
}
}, this);
- workspace.onDidChangeConfiguration(() => {
+ Settings.onConfigChange((global?: any) => {
this.getSettings();
});
}
@@ -208,14 +214,62 @@ export class ExplorerView implements WebviewViewProvider, Disposable {
* @param metadata
*/
public pushMetadata(metadata: any) {
+ const wsFolder = Folders.getWorkspaceFolder();
+ const filePath = window.activeTextEditor?.document.uri.fsPath;
+ const commaSeparated = Settings.get(SETTING_COMMA_SEPARATED_FIELDS);
+ const staticFolder = Settings.get(SETTINGS_CONTENT_STATIC_FOLDERS);
+ const contentTypes = Settings.get(SETTING_TAXONOMY_CONTENT_TYPES);
+
const articleDetails = this.getArticleDetails();
if (articleDetails) {
metadata.articleDetails = articleDetails;
}
+ let updatedMetadata = Object.assign({}, metadata);
+ if (commaSeparated) {
+ for (const key of commaSeparated) {
+ if (updatedMetadata[key] && typeof updatedMetadata[key] === "string") {
+ updatedMetadata[key] = updatedMetadata[key].split(",").map((s: string) => s.trim());
+ }
+ }
+ }
+
+ const keys = Object.keys(updatedMetadata);
+ if (keys.length > 0) {
+ updatedMetadata.filePath = filePath;
+ }
+
+ if (keys.length > 0 && contentTypes && wsFolder) {
+ // Get the current content type
+ const contentType = ArticleHelper.getContentType(updatedMetadata);
+ if (contentType) {
+ const imageFields = contentType.fields.filter((field) => field.type === "image");
+ for (const field of imageFields) {
+ if (updatedMetadata[field.name]) {
+ const staticPath = join(wsFolder.fsPath, staticFolder || "", updatedMetadata[field.name]);
+ const contentFolderPath = filePath ? join(dirname(filePath), updatedMetadata[field.name]) : null;
+
+ let previewUri = null;
+ if (existsSync(staticPath)) {
+ previewUri = Uri.file(staticPath);
+ } else if (contentFolderPath && existsSync(contentFolderPath)) {
+ previewUri = Uri.file(contentFolderPath);
+ }
+
+ if (previewUri) {
+ const preview = this.panel?.webview.asWebviewUri(previewUri);
+ updatedMetadata[field.name]= preview?.toString() || "";
+ } else {
+ updatedMetadata[field.name] = "";
+ }
+ }
+ }
+ }
+ }
+
this.postWebviewMessage({ command: Command.metadata, data: {
- ...metadata
+ ...updatedMetadata
}});
}
@@ -241,7 +295,7 @@ export class ExplorerView implements WebviewViewProvider, Disposable {
/**
* Update the metadata of the article
*/
- private updateMetadata({field, value}: { field: string, value: string }) {
+ public async updateMetadata({field, value}: { field: string, value: string }) {
if (!field) {
return;
}
@@ -256,8 +310,19 @@ export class ExplorerView implements WebviewViewProvider, Disposable {
return;
}
- article.data[field] = value;
+ const contentType = ArticleHelper.getContentType(article.data);
+ const dateFields = contentType.fields.filter((field) => field.type === "datetime");
+
+ for (const dateField of dateFields) {
+ if ((field === dateField.name) && value) {
+ article.data[field] = Article.formatDate(new Date(value));
+ } else {
+ article.data[field] = value;
+ }
+ }
+
ArticleHelper.update(editor, article);
+ this.pushMetadata(article.data);
}
/**
@@ -265,8 +330,7 @@ export class ExplorerView implements WebviewViewProvider, Disposable {
* @param msg
*/
private runCustomScript(msg: { command: string, data: any}) {
- const config = SettingsHelper.getConfig();
- const scripts: CustomScript[] | undefined = config.get(SETTING_CUSTOM_SCRIPTS);
+ const scripts: CustomScript[] | undefined = Settings.get(SETTING_CUSTOM_SCRIPTS);
if (msg?.data?.title && msg?.data?.script && scripts) {
const customScript = scripts.find((s: CustomScript) => s.title === msg.data.title);
@@ -302,35 +366,49 @@ export class ExplorerView implements WebviewViewProvider, Disposable {
}
}
+ /**
+ * Return the media selection
+ */
+ public async getMediaSelection() {
+ this.postWebviewMessage({
+ command: Command.mediaSelectionData,
+ data: Dashboard.viewData
+ });
+ }
+
/**
* Retrieve the extension settings
*/
public async getSettings() {
- const config = SettingsHelper.getConfig();
-
this.postWebviewMessage({
command: Command.settings,
data: {
seo: {
- title: config.get(SETTING_SEO_TITLE_LENGTH) as number || -1,
- description: config.get(SETTING_SEO_DESCRIPTION_LENGTH) as number || -1,
- content: config.get(SETTING_SEO_CONTENT_MIN_LENGTH) as number || -1,
- descriptionField: config.get(SETTING_SEO_DESCRIPTION_FIELD) as string || "description"
+ title: Settings.get(SETTING_SEO_TITLE_LENGTH) as number || -1,
+ description: Settings.get(SETTING_SEO_DESCRIPTION_LENGTH) as number || -1,
+ content: Settings.get(SETTING_SEO_CONTENT_MIN_LENGTH) as number || -1,
+ descriptionField: Settings.get(SETTING_SEO_DESCRIPTION_FIELD) as string || DefaultFields.Description
},
slug: {
- prefix: config.get(SETTING_SLUG_PREFIX) || "",
- suffix: config.get(SETTING_SLUG_SUFFIX) || "",
- updateFileName: !!config.get(SETTING_SLUG_UPDATE_FILE_NAME),
+ prefix: Settings.get(SETTING_SLUG_PREFIX) || "",
+ suffix: Settings.get(SETTING_SLUG_SUFFIX) || "",
+ updateFileName: !!Settings.get(SETTING_SLUG_UPDATE_FILE_NAME),
},
- tags: config.get(SETTING_TAXONOMY_TAGS) || [],
- categories: config.get(SETTING_TAXONOMY_CATEGORIES) || [],
- freeform: config.get(SETTING_PANEL_FREEFORM),
- scripts: config.get(SETTING_CUSTOM_SCRIPTS),
+ date: {
+ format: Settings.get(SETTING_DATE_FORMAT)
+ },
+ tags: Settings.get(SETTING_TAXONOMY_TAGS, true) || [],
+ categories: Settings.get(SETTING_TAXONOMY_CATEGORIES, true) || [],
+ freeform: Settings.get(SETTING_PANEL_FREEFORM),
+ scripts: Settings.get(SETTING_CUSTOM_SCRIPTS),
isInitialized: await Template.isInitialized(),
- modifiedDateUpdate: config.get(SETTING_AUTO_UPDATE_DATE) || false,
+ modifiedDateUpdate: Settings.get(SETTING_AUTO_UPDATE_DATE) || false,
writingSettingsEnabled: this.isWritingSettingsEnabled() || false,
- fmHighlighting: config.get(SETTINGS_CONTENT_FRONTMATTER_HIGHLIGHT),
+ fmHighlighting: Settings.get(SETTINGS_CONTENT_FRONTMATTER_HIGHLIGHT),
preview: Preview.getSettings(),
+ commaSeparatedFields: Settings.get(SETTING_COMMA_SEPARATED_FIELDS) || [],
+ contentTypes: Settings.get(SETTING_TAXONOMY_CONTENT_TYPES) || [],
+ dashboardViewData: Dashboard.viewData
} as PanelSettings
});
}
@@ -384,8 +462,7 @@ export class ExplorerView implements WebviewViewProvider, Disposable {
*/
private async addTags(tagType: TagType, value: string) {
if (value) {
- const config = SettingsHelper.getConfig();
- let options = tagType === TagType.tags ? config.get(SETTING_TAXONOMY_TAGS) : config.get(SETTING_TAXONOMY_CATEGORIES);
+ let options = tagType === TagType.tags ? Settings.get(SETTING_TAXONOMY_TAGS, true) : Settings.get(SETTING_TAXONOMY_CATEGORIES, true);
if (!options) {
options = [];
@@ -393,7 +470,7 @@ export class ExplorerView implements WebviewViewProvider, Disposable {
options.push(value);
const taxType = tagType === TagType.tags ? TaxonomyType.Tag : TaxonomyType.Category;
- await SettingsHelper.update(taxType, options);
+ await Settings.updateTaxonomy(taxType, options);
}
}
@@ -492,8 +569,7 @@ export class ExplorerView implements WebviewViewProvider, Disposable {
* Update the preview URL
*/
private async updatePreviewUrl(previewUrl: string) {
- const config = SettingsHelper.getConfig();
- await config.update(SETTING_PREVIEW_HOST, previewUrl);
+ await Settings.update(SETTING_PREVIEW_HOST, previewUrl);
this.getSettings();
}
@@ -501,8 +577,7 @@ export class ExplorerView implements WebviewViewProvider, Disposable {
* Toggle the Front Matter highlighting
*/
private async updateFmHighlight(autoUpdate: boolean) {
- const config = SettingsHelper.getConfig();
- await config.update(SETTINGS_CONTENT_FRONTMATTER_HIGHLIGHT, autoUpdate);
+ await Settings.update(SETTINGS_CONTENT_FRONTMATTER_HIGHLIGHT, autoUpdate);
this.getSettings();
}
@@ -510,8 +585,7 @@ export class ExplorerView implements WebviewViewProvider, Disposable {
* Toggle the modified auto-update setting
*/
private async updateModifiedUpdating(autoUpdate: boolean) {
- const config = SettingsHelper.getConfig();
- await config.update(SETTING_AUTO_UPDATE_DATE, autoUpdate);
+ await Settings.update(SETTING_AUTO_UPDATE_DATE, autoUpdate);
this.getSettings();
}
@@ -541,7 +615,7 @@ export class ExplorerView implements WebviewViewProvider, Disposable {
- | null = matter(editor.document.getText(), {
- ...TomlEngine,
- ...langOpts
- });
-
- if (article && article.data) {
- return article;
- }
- return null;
+ public static getFrontMatter(editor: vscode.TextEditor) {
+ const fileContents = editor.document.getText();
+ return ArticleHelper.parseFile(fileContents);
}
/**
@@ -34,19 +29,7 @@ export class ArticleHelper {
*/
public static getFrontMatterByPath(filePath: string) {
const file = fs.readFileSync(filePath, { encoding: "utf-8" });
- if (file) {
- const language: string = getFmLanguage();
- const langOpts = getFormatOpts(language);
- let article: matter.GrayMatterFile | null = matter(file, {
- ...TomlEngine,
- ...langOpts
- });
-
- if (article && article.data) {
- return article;
- }
- }
- return null;
+ return ArticleHelper.parseFile(file);
}
/**
@@ -56,17 +39,23 @@ export class ArticleHelper {
* @param article
*/
public static async update(editor: vscode.TextEditor, article: matter.GrayMatterFile) {
- const config = SettingsHelper.getConfig();
- const removeQuotes = config.get(SETTING_REMOVE_QUOTES) as string[];
+ const removeQuotes = Settings.get(SETTING_REMOVE_QUOTES) as string[];
+ const commaSeparated = Settings.get(SETTING_COMMA_SEPARATED_FIELDS);
- let newMarkdown = this.stringifyFrontMatter(article.content, article.data);
+ let newMarkdown = this.stringifyFrontMatter(article.content, Object.assign({}, article.data));
// Check for field where quotes need to be removed
if (removeQuotes && removeQuotes.length) {
for (const toRemove of removeQuotes) {
if (article && article.data && article.data[toRemove]) {
- newMarkdown = newMarkdown.replace(`'${article.data[toRemove]}'`, article.data[toRemove]);
- newMarkdown = newMarkdown.replace(`"${article.data[toRemove]}"`, article.data[toRemove]);
+ if (commaSeparated?.includes(toRemove)) {
+ const textToReplace = article.data[toRemove].join(", ");
+ newMarkdown = newMarkdown.replace(`'${textToReplace}'`, textToReplace);
+ newMarkdown = newMarkdown.replace(`"${textToReplace}"`, textToReplace);
+ } else {
+ newMarkdown = newMarkdown.replace(`'${article.data[toRemove]}'`, article.data[toRemove]);
+ newMarkdown = newMarkdown.replace(`"${article.data[toRemove]}"`, article.data[toRemove]);
+ }
}
}
}
@@ -82,14 +71,22 @@ export class ArticleHelper {
* @param data
*/
public static stringifyFrontMatter(content: string, data: any) {
- const config = SettingsHelper.getConfig();
- const indentArray = config.get(SETTING_INDENT_ARRAY) as boolean;
+ const indentArray = Settings.get(SETTING_INDENT_ARRAY) as boolean;
+ const commaSeparated = Settings.get(SETTING_COMMA_SEPARATED_FIELDS);
const language = getFmLanguage();
const langOpts = getFormatOpts(language);
const spaces = vscode.window.activeTextEditor?.options?.tabSize;
+ if (commaSeparated) {
+ for (const key of commaSeparated) {
+ if (data[key] && typeof data[key] === "object") {
+ data[key] = data[key].join(", ");
+ }
+ }
+ }
+
return matter.stringify(content, data, ({
...TomlEngine,
...langOpts,
@@ -115,9 +112,8 @@ export class ArticleHelper {
return;
}
- const config = SettingsHelper.getConfig();
- const dateFormat = config.get(SETTING_DATE_FORMAT) as string;
- const dateField = config.get(SETTING_DATE_FIELD) as string || "date";
+ const dateFormat = Settings.get(SETTING_DATE_FORMAT) as string;
+ const dateField = Settings.get(SETTING_DATE_FIELD) as string || DefaultFields.PublishingDate;
if (typeof article.data[dateField] !== "undefined") {
if (dateFormat && typeof dateFormat === "string") {
@@ -130,4 +126,74 @@ export class ArticleHelper {
}
return;
}
+
+ /**
+ * Retrieve the content type of the current file
+ * @param updatedMetadata
+ */
+ public static getContentType(metadata: { [field: string]: string; }): ContentType {
+ const contentTypes = Settings.get(SETTING_TAXONOMY_CONTENT_TYPES);
+
+ if (!contentTypes || !metadata) {
+ return DEFAULT_CONTENT_TYPE;
+ }
+
+ let contentType = contentTypes.find(ct => ct.name === (metadata.type || DEFAULT_CONTENT_TYPE_NAME));
+ if (!contentType) {
+ contentType = contentTypes.find(ct => ct.name === DEFAULT_CONTENT_TYPE_NAME);
+ }
+ return contentType || DEFAULT_CONTENT_TYPE;
+ }
+
+ /**
+ * Update all dates in the metadata
+ * @param metadata
+ */
+ public static updateDates(metadata: { [field: string]: string; }) {
+ const contentType = ArticleHelper.getContentType(metadata);
+ const dateFields = contentType.fields.filter((field) => field.type === "datetime");
+
+ for (const dateField of dateFields) {
+ if (typeof metadata[dateField.name] !== "undefined") {
+ metadata[dateField.name] = Article.formatDate(new Date());
+ }
+ }
+
+ return metadata;
+ }
+
+ /**
+ * Parse a markdown file and its front matter
+ * @param fileContents
+ * @returns
+ */
+ private static parseFile(fileContents: string): matter.GrayMatterFile | null {
+ try {
+ const commaSeparated = Settings.get(SETTING_COMMA_SEPARATED_FIELDS);
+
+ if (fileContents) {
+ const language: string = getFmLanguage();
+ const langOpts = getFormatOpts(language);
+ let article: matter.GrayMatterFile | null = matter(fileContents, {
+ ...TomlEngine,
+ ...langOpts
+ });
+
+ if (article?.data) {
+ if (commaSeparated) {
+ for (const key of commaSeparated) {
+ if (article?.data[key] && typeof article.data[key] === "string") {
+ article.data[key] = article.data[key].split(",").map((s: string) => s.trim());
+ }
+ }
+ }
+
+ return article;
+ }
+ }
+ } catch (error: any) {
+ Notifications.error(`There seems to be an issue parsing your Front Matter. ERROR: ${error.message || error}`);
+ }
+ return null;
+ }
}
\ No newline at end of file
diff --git a/src/helpers/Extension.ts b/src/helpers/Extension.ts
index 2236dad1..2f5f0e93 100644
--- a/src/helpers/Extension.ts
+++ b/src/helpers/Extension.ts
@@ -1,10 +1,12 @@
import { basename } from "path";
import { extensions, Uri, ExtensionContext } from "vscode";
import { Folders, WORKSPACE_PLACEHOLDER } from "../commands/Folders";
-import { SETTINGS_CONTENT_FOLDERS, SETTINGS_CONTENT_PAGE_FOLDERS } from "../constants";
+import { 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 { ContentType } from "../models";
import { Notifications } from "./Notifications";
-import { SettingsHelper } from "./SettingsHelper";
+import { Settings } from "./SettingsHelper";
export class Extension {
@@ -36,9 +38,10 @@ export class Extension {
installedVersion = `${installedVersion}-beta`;
}
- if (!usedVersion) {
+ if (usedVersion !== installedVersion) {
+ Notifications.info(`Find out what is new at [v${installedVersion} release notes](https://${this.isBetaVersion() ? 'beta.' : ''}frontmatter.codes/updates)`);
this.setVersion(installedVersion);
- };
+ }
return {
usedVersion,
@@ -64,8 +67,8 @@ export class Extension {
* Migrate old settings to new settings
*/
public async migrateSettings(): Promise {
- const config = SettingsHelper.getConfig();
- const folders = config.get(SETTINGS_CONTENT_FOLDERS);
+ // Migration to version 3.1.0
+ const folders = Settings.get(SETTINGS_CONTENT_FOLDERS);
if (folders && folders.length > 0) {
const workspace = Folders.getWorkspaceFolder();
const projectFolder = basename(workspace?.fsPath || "");
@@ -75,7 +78,56 @@ export class Extension {
path: `${WORKSPACE_PLACEHOLDER}${folder.fsPath.split(projectFolder).slice(1).join('')}`.split('\\').join('/')
}));
- await config.update(`${SETTINGS_CONTENT_PAGE_FOLDERS}`, paths);
+ await Settings.update(SETTINGS_CONTENT_PAGE_FOLDERS, paths);
+ }
+
+ // Create team settings
+ if (Settings.hasSettings()) {
+ Settings.createTeamSettings();
+ }
+
+ // Migration to version 4.0.0
+ const dateField = Settings.get(SETTING_DATE_FIELD);
+ const lastModField = Settings.get(SETTING_MODIFIED_FIELD);
+ const description = Settings.get(SETTING_SEO_DESCRIPTION_FIELD);
+ const contentTypes = Settings.get(SETTING_TAXONOMY_CONTENT_TYPES);
+
+ if (contentTypes) {
+ let needsUpdate = false;
+ let defaultContentType = contentTypes.find(ct => ct.name === DEFAULT_CONTENT_TYPE_NAME);
+
+ if (defaultContentType) {
+ if (dateField && dateField !== "date") {
+ defaultContentType.fields = defaultContentType.fields.filter(f => f.name !== "date");
+ defaultContentType.fields.push({
+ name: dateField,
+ type: "datetime"
+ });
+ needsUpdate = true;
+ }
+
+ if (lastModField && lastModField !== "lastmod") {
+ defaultContentType.fields = defaultContentType.fields.filter(f => f.name !== "lastmod");
+ defaultContentType.fields.push({
+ name: lastModField,
+ type: "datetime"
+ });
+ needsUpdate = true;
+ }
+
+ if (description && description !== "description") {
+ defaultContentType.fields = defaultContentType.fields.filter(f => f.name !== "lastmod");
+ defaultContentType.fields.push({
+ name: description,
+ type: "string"
+ });
+ needsUpdate = true;
+ }
+
+ if (needsUpdate) {
+ await Settings.update(SETTING_TAXONOMY_CONTENT_TYPES, contentTypes);
+ }
+ }
}
}
@@ -103,4 +155,9 @@ export class Extension {
return true;
}
+
+ public get packageJson() {
+ const frontMatter = extensions.getExtension(this.isBetaVersion() ? EXTENSION_BETA_ID : EXTENSION_ID)!;
+ return frontMatter.packageJSON;
+ }
}
\ No newline at end of file
diff --git a/src/helpers/MessageHelper.ts b/src/helpers/MessageHelper.ts
index d95e8936..64597d19 100644
--- a/src/helpers/MessageHelper.ts
+++ b/src/helpers/MessageHelper.ts
@@ -1,5 +1,5 @@
-import { DashboardMessage } from './../pagesView/DashboardMessage';
-import { CommandToCode } from "../viewpanel/CommandToCode";
+import { DashboardMessage } from '../dashboardWebView/DashboardMessage';
+import { CommandToCode } from "../panelWebView/CommandToCode";
interface ClientVsCode {
diff --git a/src/helpers/SettingsHelper.ts b/src/helpers/SettingsHelper.ts
index 20dee8fb..2c328535 100644
--- a/src/helpers/SettingsHelper.ts
+++ b/src/helpers/SettingsHelper.ts
@@ -1,16 +1,137 @@
+import { Notifications } from './Notifications';
+import { workspace } from 'vscode';
import * as vscode from 'vscode';
import { TaxonomyType } from '../models';
import { SETTING_TAXONOMY_TAGS, SETTING_TAXONOMY_CATEGORIES, CONFIG_KEY } from '../constants';
+import { Folders } from '../commands/Folders';
+import { join, basename } from 'path';
+import { existsSync, readFileSync, writeFileSync } from 'fs';
+import { Extension } from './Extension';
-export class SettingsHelper {
+export class Settings {
+ private static config: vscode.WorkspaceConfiguration;
+ private static globalFile = "frontmatter.json";
+ private static globalConfig: any;
+
+ public static init() {
+ const fmConfig = Settings.projectConfigPath;
+ if (fmConfig && existsSync(fmConfig)) {
+ const localConfig = readFileSync(fmConfig, 'utf8');
+ Settings.globalConfig = JSON.parse(localConfig);
+ } else {
+ Settings.globalConfig = undefined;
+ }
- public static getConfig(): vscode.WorkspaceConfiguration {
- return vscode.workspace.getConfiguration(CONFIG_KEY);
+ Settings.config = vscode.workspace.getConfiguration(CONFIG_KEY);
+
+ Settings.onConfigChange((global?: any) => {
+ if (global) {
+ Settings.globalConfig = Object.assign({}, global);
+ } else {
+ Settings.config = vscode.workspace.getConfiguration(CONFIG_KEY);
+ }
+ });
}
- public static async updateSetting(name: string, value: any) {
- const config = vscode.workspace.getConfiguration(CONFIG_KEY);
- await config.update(name, value);
+ /**
+ * Check for config changes on global and local settings
+ * @param callback
+ */
+ public static onConfigChange(callback: (global?: any) => void) {
+ workspace.onDidChangeConfiguration(() => {
+ callback();
+ });
+
+ workspace.onDidSaveTextDocument(async (e) => {
+ const filename = e.uri.fsPath;
+ if (Settings.checkProjectConfig(filename)) {
+ const file = await workspace.openTextDocument(e.uri);
+ if (file) {
+ const fileContents = file.getText();
+ const json = JSON.parse(fileContents);
+ callback(json);
+ }
+ }
+ });
+
+ workspace.onDidDeleteFiles((e) => {
+ const needCallback = e?.files.find(f => Settings.checkProjectConfig(f.fsPath));
+ if (needCallback) {
+ callback();
+ }
+ });
+ }
+
+ /**
+ * Retrieve a setting from global and local config
+ */
+ public static get(name: string, merging: boolean = false): T | undefined{
+ const configInpection = Settings.config.inspect(name);
+
+ let setting = undefined;
+ const settingKey = `${CONFIG_KEY}.${name}`;
+
+ if (Settings.globalConfig && typeof Settings.globalConfig[settingKey] !== "undefined") {
+ setting = Settings.globalConfig[settingKey];
+ }
+
+ // Local overrides global
+ if (configInpection && typeof configInpection.workspaceValue !== "undefined") {
+ if (merging && setting && typeof setting === "object") {
+ setting = Object.assign([], setting, configInpection.workspaceValue);
+ } else {
+ setting = configInpection.workspaceValue;
+ }
+ }
+
+ if (setting === undefined) {
+ setting = Settings.config.get(name);
+ }
+
+ return setting;
+ }
+
+ /**
+ * String update config setting
+ * @param name
+ * @param value
+ */
+ public static async update(name: string, value: T, updateGlobal: boolean = false) {
+ const fmConfig = Settings.projectConfigPath;
+
+ if (updateGlobal) {
+ if (fmConfig && existsSync(fmConfig)) {
+ const localConfig = readFileSync(fmConfig, 'utf8');
+ Settings.globalConfig = JSON.parse(localConfig);
+ Settings.globalConfig[`${CONFIG_KEY}.${name}`] = value;
+ writeFileSync(fmConfig, JSON.stringify(Settings.globalConfig, null, 2), 'utf8');
+ return;
+ }
+ } else {
+ await Settings.config.update(name, value);
+ return;
+ }
+
+ // Fallback to the local settings
+ await Settings.config.update(name, value);
+ }
+
+ /**
+ * Create team settings
+ */
+ public static createTeamSettings() {
+ const wsFolder = Folders.getWorkspaceFolder();
+
+ const initialConfig = {
+ "$schema": `https://${Extension.getInstance().isBetaVersion() ? `beta.` : ``}frontmatter.codes/frontmatter.schema.json`
+ };
+
+ if (wsFolder) {
+ const configPath = join(wsFolder.fsPath, Settings.globalFile);
+ if (!existsSync(configPath)) {
+ writeFileSync(configPath, JSON.stringify(initialConfig, null, 2), 'utf8');
+ }
+ }
}
/**
@@ -19,10 +140,9 @@ export class SettingsHelper {
* @param type
*/
public static getTaxonomy(type: TaxonomyType): string[] {
- const config = vscode.workspace.getConfiguration(CONFIG_KEY);
// Add all the known options to the selection list
const configSetting = type === TaxonomyType.Tag ? SETTING_TAXONOMY_TAGS : SETTING_TAXONOMY_CATEGORIES;
- const crntOptions = config.get(configSetting) as string[];
+ const crntOptions = Settings.get(configSetting, true) as string[];
if (crntOptions && crntOptions.length > 0) {
return crntOptions;
}
@@ -36,11 +156,86 @@ export class SettingsHelper {
* @param type
* @param options
*/
- static async update(type: TaxonomyType, options: string[]) {
- const config = vscode.workspace.getConfiguration(CONFIG_KEY);
+ public static async updateTaxonomy(type: TaxonomyType, options: string[]) {
const configSetting = type === TaxonomyType.Tag ? SETTING_TAXONOMY_TAGS : SETTING_TAXONOMY_CATEGORIES;
options = [...new Set(options)];
options = options.sort().filter(o => !!o);
- await config.update(configSetting, options);
+ await Settings.update(configSetting, options, true);
+ }
+
+ /**
+ * Promote settings from local to team level
+ */
+ public static async promote() {
+ const pkg = Extension.getInstance().packageJson;
+ if (pkg?.contributes?.configuration?.properties) {
+ const settingNames = Object.keys(pkg.contributes.configuration.properties);
+
+ for (const name of settingNames) {
+ const settingName = name.replace(`${CONFIG_KEY}.`, '');
+ const setting = Settings.config.inspect(settingName);
+
+ if (setting && typeof setting.workspaceValue !== "undefined") {
+ await Settings.update(settingName, setting.workspaceValue, true);
+ await Settings.update(settingName, undefined);
+ }
+ }
+ }
+
+ Notifications.info(`All settings promoted to team level.`);
+ }
+
+ /**
+ * Check if there are any Front Matter settings in the workspace
+ * @returns
+ */
+ public static hasSettings() {
+ let hasSetting = false;
+
+ const pkg = Extension.getInstance().packageJson;
+ if (pkg?.contributes?.configuration?.properties) {
+ const settingNames = Object.keys(pkg.contributes.configuration.properties);
+
+ for (const name of settingNames) {
+ const settingName = name.replace(`${CONFIG_KEY}.`, '');
+ const setting = Settings.config.inspect(settingName);
+
+ if (setting && typeof setting.workspaceValue !== "undefined") {
+ hasSetting = true;
+ }
+ }
+ }
+
+ return hasSetting;
+ }
+
+
+ /**
+ * Check if its the project config
+ * @param filePath
+ * @returns
+ */
+ private static checkProjectConfig(filePath: string) {
+ const fmConfig = Settings.projectConfigPath;
+ if (fmConfig && existsSync(fmConfig)) {
+ return filePath &&
+ basename(filePath).toLowerCase() === Settings.globalFile.toLowerCase() &&
+ fmConfig.toLowerCase() === filePath.toLowerCase();
+ }
+
+ return false;
+ }
+
+ /**
+ * Get the project config path
+ * @returns
+ */
+ private static get projectConfigPath() {
+ const wsFolder = Folders.getWorkspaceFolder();
+ if (wsFolder) {
+ const fmConfig = join(wsFolder.fsPath, Settings.globalFile);
+ return fmConfig;
+ }
+ return undefined;
}
}
\ No newline at end of file
diff --git a/src/helpers/TomlEngine.ts b/src/helpers/TomlEngine.ts
index f0bcc240..99839e6d 100644
--- a/src/helpers/TomlEngine.ts
+++ b/src/helpers/TomlEngine.ts
@@ -1,11 +1,9 @@
-import * as vscode from 'vscode';
import * as toml from '@iarna/toml';
import { SETTING_FRONTMATTER_TYPE } from '../constants';
-import { SettingsHelper } from '.';
+import { Settings } from './SettingsHelper';
export const getFmLanguage = (): string => {
- const config = SettingsHelper.getConfig();
- const language = config.get(SETTING_FRONTMATTER_TYPE) as string || "YAML";
+ const language = Settings.get(SETTING_FRONTMATTER_TYPE) as string || "YAML";
return language.toLowerCase();
};
diff --git a/src/models/DashboardData.ts b/src/models/DashboardData.ts
new file mode 100644
index 00000000..27318fea
--- /dev/null
+++ b/src/models/DashboardData.ts
@@ -0,0 +1,4 @@
+export interface DashboardData {
+ type: "contents" | "media";
+ data?: any;
+}
\ No newline at end of file
diff --git a/src/models/PanelSettings.ts b/src/models/PanelSettings.ts
index b40da5e4..51043dfb 100644
--- a/src/models/PanelSettings.ts
+++ b/src/models/PanelSettings.ts
@@ -1,9 +1,11 @@
import { FileType } from "vscode";
+import { DashboardData } from "./DashboardData";
export interface PanelSettings {
seo: SEO;
slug: Slug;
tags: string[];
+ date: DateInfo;
categories: string[];
freeform: boolean;
scripts: CustomScript[];
@@ -12,6 +14,24 @@ export interface PanelSettings {
writingSettingsEnabled: boolean;
fmHighlighting: boolean;
preview: PreviewSettings;
+ contentTypes: ContentType[];
+ dashboardViewData: DashboardData | undefined;
+}
+
+export interface ContentType {
+ name: string;
+ fields: Field[];
+}
+
+export interface Field {
+ title?: string;
+ name: string;
+ type: "string" | "number" | "datetime" | "boolean" | "image" | "choice" | "tags" | "categories";
+ choices?: string[];
+}
+
+export interface DateInfo {
+ format: string;
}
export interface SEO {
diff --git a/src/viewpanel/Command.ts b/src/panelWebView/Command.ts
similarity index 83%
rename from src/viewpanel/Command.ts
rename to src/panelWebView/Command.ts
index 7e4145c1..7236f776 100644
--- a/src/viewpanel/Command.ts
+++ b/src/panelWebView/Command.ts
@@ -6,4 +6,5 @@ export enum Command {
focusOnCategories = "focusOnCategories",
closeSections = "closeSections",
folderInfo = "folderInfo",
+ mediaSelectionData = "mediaSelectionData"
}
\ No newline at end of file
diff --git a/src/viewpanel/CommandToCode.ts b/src/panelWebView/CommandToCode.ts
similarity index 96%
rename from src/viewpanel/CommandToCode.ts
rename to src/panelWebView/CommandToCode.ts
index 80fbcb3a..46fb32f1 100644
--- a/src/viewpanel/CommandToCode.ts
+++ b/src/panelWebView/CommandToCode.ts
@@ -25,4 +25,5 @@ export enum CommandToCode {
openInEditor = "open-in-editor",
updateMetadata = "update-metadata",
openDashboard = "open-dashboard",
+ selectImage = "select-image",
}
\ No newline at end of file
diff --git a/src/viewpanel/TagType.ts b/src/panelWebView/TagType.ts
similarity index 100%
rename from src/viewpanel/TagType.ts
rename to src/panelWebView/TagType.ts
diff --git a/src/viewpanel/ViewPanel.tsx b/src/panelWebView/ViewPanel.tsx
similarity index 80%
rename from src/viewpanel/ViewPanel.tsx
rename to src/panelWebView/ViewPanel.tsx
index 17744abb..fdcab7da 100644
--- a/src/viewpanel/ViewPanel.tsx
+++ b/src/panelWebView/ViewPanel.tsx
@@ -14,7 +14,15 @@ export interface IViewPanelProps {
}
export const ViewPanel: React.FunctionComponent = (props: React.PropsWithChildren) => {
- const { loading, metadata, settings, folderAndFiles, focusElm, unsetFocus } = useMessages();
+ const { loading, mediaSelecting, metadata, settings, folderAndFiles, focusElm, unsetFocus } = useMessages();
+
+ if (mediaSelecting) {
+ return (
+
+
Continue in the media dashboard to select the image you want to insert.
+
+ );
+ }
if (loading) {
return (
@@ -22,7 +30,7 @@ export const ViewPanel: React.FunctionComponent = (props: React
);
}
- if (!metadata || Object.keys(metadata).length === 0) {
+ if (!metadata || Object.keys(metadata || {}).length === 0) {
return (
= (props: React.Pro
{ settings?.preview?.host && = ({settings, fol
MessageHelper.sendMessage(CommandToCode.createContent);
};
-
return (
diff --git a/src/viewpanel/components/Collapsible.tsx b/src/panelWebView/components/Collapsible.tsx
similarity index 100%
rename from src/viewpanel/components/Collapsible.tsx
rename to src/panelWebView/components/Collapsible.tsx
diff --git a/src/viewpanel/components/CustomScript.tsx b/src/panelWebView/components/CustomScript.tsx
similarity index 100%
rename from src/viewpanel/components/CustomScript.tsx
rename to src/panelWebView/components/CustomScript.tsx
diff --git a/src/panelWebView/components/Fields/ChoiceField.tsx b/src/panelWebView/components/Fields/ChoiceField.tsx
new file mode 100644
index 00000000..85bd3a6e
--- /dev/null
+++ b/src/panelWebView/components/Fields/ChoiceField.tsx
@@ -0,0 +1,42 @@
+import { CheckIcon } from '@heroicons/react/outline';
+import * as React from 'react';
+import { VsLabel } from '../VscodeComponents';
+
+export interface IChoiceFieldProps {
+ label: string;
+ selected: string;
+ choices: string[];
+ onChange: (value: string) => void;
+}
+
+export const ChoiceField: React.FunctionComponent
= ({label, selected, choices, onChange}: React.PropsWithChildren) => {
+ const [ crntSelected, setCrntSelected ] = React.useState(selected);
+
+ const onValueChange = (txtValue: string) => {
+ setCrntSelected(txtValue);
+ onChange(txtValue);
+ };
+
+ const containsSelected = crntSelected && choices.indexOf(crntSelected) !== -1;
+
+ return (
+
+
+
+ {label}
+
+
+
+
onValueChange(e.currentTarget.value)}>
+ { !containsSelected && {choice}
+ ))}
+
+
(({ value, onClick }, ref) => {
+ return (
+
+ {value || "Pick your date"}
+
+ )
+});
+
+export const DateTimeField: React.FunctionComponent = ({label, date, format, onChange}: React.PropsWithChildren) => {
+ const [ dateValue, setDateValue ] = React.useState(date);
+
+ const onDateChange = (date: Date) => {
+ setDateValue(date);
+ onChange(date);
+ };
+
+ React.useEffect(() => {
+ if (dateValue?.toISOString() !== date?.toISOString()) {
+ setDateValue(date);
+ }
+ }, [ date ]);
+
+ return (
+
+
+
+ {label}
+
+
+
+
+ onDateChange(new Date())}>
+ now
+
+
+
= ({label, value, onChange}: React.PropsWithChildren) => {
+ const [ nrValue, setNrValue ] = React.useState(value);
+
+ const onValueChange = (txtValue: string) => {
+ let newValue: number | null = parseInt(txtValue);
+ if (isNaN(newValue)) {
+ newValue = null;
+ }
+
+ setNrValue(newValue);
+ onChange(newValue);
+ };
+
+ return (
+
+
+
+ {label}
+
+
+
+
onValueChange(e.target.value)} />
+
= ({label, fieldName, onChange, value, filePath}: React.PropsWithChildren) => {
+
+ const selectImage = () => {
+ MessageHelper.sendMessage(CommandToCode.selectImage, {
+ filePath,
+ fieldName
+ });
+ };
+
+ return (
+
+
+
+
+
+
+ {
+ value ? (
+
+
+
+
onChange(null)} className={`metadata_field__preview_image__remove`}>Remove image
+
+ ) : (
+
Select image
+ )
+ }
+
+
= ({limit, label, value, rows, onChange}: React.PropsWithChildren) => {
+ const [ text, setText ] = React.useState(value);
+
+ const onTextChange = (txtValue: string) => {
+ setText(txtValue);
+ onChange(txtValue);
+ };
+
+ React.useEffect(() => {
+ if (text !== value) {
+ setText(value);
+ }
+ }, [ value ]);
+
+ let isValid = true;
+ if (limit && limit !== -1) {
+ isValid = ((text || "").length < limit);
+ }
+
+ return (
+
+ 
- 
- 
- 
- 
- 
- 
- 
-
-