diff --git a/CHANGELOG.md b/CHANGELOG.md index 25187a7a..46e9a224 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,7 @@ - [#704](https://github.com/estruyf/vscode-front-matter/issues/704): Fix `zod` schema script for optional fields - [#707](https://github.com/estruyf/vscode-front-matter/issues/707): Fix `clearEmpty` issue with `draft` and `boolean` fields which are by default set to `true` - [#711](https://github.com/estruyf/vscode-front-matter/issues/711): Fix in character mapping in the slug field +- [#714](https://github.com/estruyf/vscode-front-matter/issues/714): Fix for taxonomy filtering from taxonomy view to content view ## [9.3.1] - 2023-10-27 diff --git a/src/dashboardWebView/components/Contents/Contents.tsx b/src/dashboardWebView/components/Contents/Contents.tsx index 487df863..ce6d7101 100644 --- a/src/dashboardWebView/components/Contents/Contents.tsx +++ b/src/dashboardWebView/components/Contents/Contents.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; -import { useRecoilState, useRecoilValue } from 'recoil'; -import { NavigationType, Page } from '../../models'; -import { DashboardViewAtom, SettingsSelector } from '../../state'; +import { useRecoilValue } from 'recoil'; +import { Page } from '../../models'; +import { SettingsSelector } from '../../state'; import { Overview } from './Overview'; import { Spinner } from '../Common/Spinner'; import { SponsorMsg } from '../Layout/SponsorMsg'; @@ -23,13 +23,10 @@ export const Contents: React.FunctionComponent = ({ }: React.PropsWithChildren) => { const settings = useRecoilValue(SettingsSelector); const { pageItems } = usePages(pages); - const [, setView] = useRecoilState(DashboardViewAtom); const pageFolders = [...new Set(pageItems.map((page) => page.fmFolder))]; useEffect(() => { - setView(NavigationType.Contents); - Messenger.send(DashboardMessage.sendTelemetry, { event: TelemetryEvent.webviewContentsView }); diff --git a/src/dashboardWebView/components/DataView/DataView.tsx b/src/dashboardWebView/components/DataView/DataView.tsx index fde6a527..ac9b24ab 100644 --- a/src/dashboardWebView/components/DataView/DataView.tsx +++ b/src/dashboardWebView/components/DataView/DataView.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { Header } from '../Header'; -import { useRecoilState, useRecoilValue } from 'recoil'; -import { DashboardViewAtom, SettingsSelector } from '../../state'; +import { useRecoilValue } from 'recoil'; +import { SettingsSelector } from '../../state'; import { DataForm } from './DataForm'; import { useCallback, useEffect, useMemo, useState } from 'react'; import { DataFile } from '../../../models/DataFile'; @@ -36,7 +36,6 @@ export const DataView: React.FunctionComponent = ( const [dataEntries, setDataEntries] = useState(null); const settings = useRecoilValue(SettingsSelector); const { getColors } = useThemeColors(); - const [, setView] = useRecoilState(DashboardViewAtom); const setSchema = (dataFile: DataFile) => { setSelectedData(dataFile); @@ -137,7 +136,6 @@ export const DataView: React.FunctionComponent = ( }, [selectedData, , dataEntries, selectedIndex]); useEffect(() => { - setView(NavigationType.Data); Messenger.listen(messageListener); Messenger.send(DashboardMessage.sendTelemetry, { diff --git a/src/dashboardWebView/components/Media/Media.tsx b/src/dashboardWebView/components/Media/Media.tsx index 9267d7e1..2743c73d 100644 --- a/src/dashboardWebView/components/Media/Media.tsx +++ b/src/dashboardWebView/components/Media/Media.tsx @@ -1,9 +1,8 @@ import { Messenger } from '@estruyf/vscode/dist/client'; import { UploadIcon } from '@heroicons/react/outline'; import * as React from 'react'; -import { useRecoilState, useRecoilValue } from 'recoil'; +import { useRecoilValue } from 'recoil'; import { - DashboardViewAtom, LoadingAtom, MediaFoldersAtom, SelectedMediaFolderAtom, @@ -43,7 +42,6 @@ export const Media: React.FunctionComponent = ( const folders = useRecoilValue(MediaFoldersAtom); const loading = useRecoilValue(LoadingAtom); const { getColors } = useThemeColors(); - const [, setView] = useRecoilState(DashboardViewAtom); const currentStaticFolder = useMemo(() => { if (settings?.staticFolder) { @@ -153,7 +151,6 @@ export const Media: React.FunctionComponent = ( ); useEffect(() => { - setView(NavigationType.Media); Messenger.send(DashboardMessage.sendTelemetry, { event: TelemetryEvent.webviewMediaView }); diff --git a/src/dashboardWebView/components/SnippetsView/Snippets.tsx b/src/dashboardWebView/components/SnippetsView/Snippets.tsx index 83d5a409..75e96b05 100644 --- a/src/dashboardWebView/components/SnippetsView/Snippets.tsx +++ b/src/dashboardWebView/components/SnippetsView/Snippets.tsx @@ -2,14 +2,14 @@ import { Messenger } from '@estruyf/vscode/dist/client'; import { CodeIcon, PlusSmIcon } from '@heroicons/react/outline'; import * as React from 'react'; import { useCallback, useEffect, useMemo, useState } from 'react'; -import { useRecoilState, useRecoilValue } from 'recoil'; +import { useRecoilValue } from 'recoil'; import { FeatureFlag } from '../../../components/features/FeatureFlag'; import { FEATURE_FLAG } from '../../../constants'; import { TelemetryEvent } from '../../../constants/TelemetryEvent'; import { SnippetParser } from '../../../helpers/SnippetParser'; import { DashboardMessage } from '../../DashboardMessage'; import useThemeColors from '../../hooks/useThemeColors'; -import { DashboardViewAtom, ModeAtom, SettingsSelector, ViewDataSelector } from '../../state'; +import { ModeAtom, SettingsSelector, ViewDataSelector } from '../../state'; import { FilterInput } from '../Header/FilterInput'; import { PageLayout } from '../Layout/PageLayout'; import { FormDialog } from '../Modals/FormDialog'; @@ -18,7 +18,6 @@ import { Item } from './Item'; import { NewForm } from './NewForm'; import * as l10n from '@vscode/l10n'; import { LocalizationKey } from '../../../localization'; -import { NavigationType } from '../../models'; export interface ISnippetsProps { } @@ -35,7 +34,6 @@ export const Snippets: React.FunctionComponent = ( const [mediaSnippet, setMediaSnippet] = useState(false); const [snippetFilter, setSnippetFilter] = useState(''); const { getColors } = useThemeColors(); - const [, setView] = useRecoilState(DashboardViewAtom); const snippets = settings?.snippets || {}; const snippetKeys = useMemo(() => { @@ -84,7 +82,6 @@ export const Snippets: React.FunctionComponent = ( }; useEffect(() => { - setView(NavigationType.Snippets); Messenger.send(DashboardMessage.sendTelemetry, { event: TelemetryEvent.webviewSnippetsView }); diff --git a/src/dashboardWebView/components/TaxonomyView/TaxonomyView.tsx b/src/dashboardWebView/components/TaxonomyView/TaxonomyView.tsx index 1ff758eb..d12411ca 100644 --- a/src/dashboardWebView/components/TaxonomyView/TaxonomyView.tsx +++ b/src/dashboardWebView/components/TaxonomyView/TaxonomyView.tsx @@ -2,12 +2,12 @@ import { Messenger } from '@estruyf/vscode/dist/client'; import { ChevronRightIcon, DownloadIcon } from '@heroicons/react/outline'; import * as React from 'react'; import { useEffect, useState } from 'react'; -import { useRecoilState, useRecoilValue } from 'recoil'; +import { useRecoilValue } from 'recoil'; import { TelemetryEvent } from '../../../constants'; import { TaxonomyData } from '../../../models'; import { DashboardMessage } from '../../DashboardMessage'; -import { NavigationType, Page } from '../../models'; -import { DashboardViewAtom, SettingsSelector } from '../../state'; +import { Page } from '../../models'; +import { SettingsSelector } from '../../state'; import { NavigationBar, NavigationItem } from '../Layout'; import { PageLayout } from '../Layout/PageLayout'; import { SponsorMsg } from '../Layout/SponsorMsg'; @@ -25,7 +25,6 @@ export const TaxonomyView: React.FunctionComponent = ({ const settings = useRecoilValue(SettingsSelector); const [taxonomySettings, setTaxonomySettings] = useState(); const [selectedTaxonomy, setSelectedTaxonomy] = useState(`tags`); - const [, setView] = useRecoilState(DashboardViewAtom); const onImport = () => { Messenger.send(DashboardMessage.importTaxonomy); @@ -40,7 +39,6 @@ export const TaxonomyView: React.FunctionComponent = ({ }, [settings?.tags, settings?.categories, settings?.customTaxonomy]); useEffect(() => { - setView(NavigationType.Taxonomy); Messenger.send(DashboardMessage.sendTelemetry, { event: TelemetryEvent.webviewTaxonomyDashboard });