Fix taxonomy filtering from taxonomy view to content view #714

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<IContentsProps> = ({
 }: React.PropsWithChildren<IContentsProps>) => {
   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
     });

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<IDataViewProps> = (
   const [dataEntries, setDataEntries] = useState<any | any[] | null>(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<IDataViewProps> = (
   }, [selectedData, , dataEntries, selectedIndex]);
 
   useEffect(() => {
-    setView(NavigationType.Data);
     Messenger.listen(messageListener);
 
     Messenger.send(DashboardMessage.sendTelemetry, {

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<IMediaProps> = (
   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<IMediaProps> = (
   );
 
   useEffect(() => {
-    setView(NavigationType.Media);
     Messenger.send(DashboardMessage.sendTelemetry, {
       event: TelemetryEvent.webviewMediaView
     });

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<ISnippetsProps> = (
   const [mediaSnippet, setMediaSnippet] = useState(false);
   const [snippetFilter, setSnippetFilter] = useState<string>('');
   const { getColors } = useThemeColors();
-  const [, setView] = useRecoilState(DashboardViewAtom);
 
   const snippets = settings?.snippets || {};
   const snippetKeys = useMemo(() => {
@@ -84,7 +82,6 @@ export const Snippets: React.FunctionComponent<ISnippetsProps> = (
   };
 
   useEffect(() => {
-    setView(NavigationType.Snippets);
     Messenger.send(DashboardMessage.sendTelemetry, {
       event: TelemetryEvent.webviewSnippetsView
     });

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<ITaxonomyViewProps> = ({
   const settings = useRecoilValue(SettingsSelector);
   const [taxonomySettings, setTaxonomySettings] = useState<TaxonomyData>();
   const [selectedTaxonomy, setSelectedTaxonomy] = useState<string | null>(`tags`);
-  const [, setView] = useRecoilState(DashboardViewAtom);
 
   const onImport = () => {
     Messenger.send(DashboardMessage.importTaxonomy);
@@ -40,7 +39,6 @@ export const TaxonomyView: React.FunctionComponent<ITaxonomyViewProps> = ({
   }, [settings?.tags, settings?.categories, settings?.customTaxonomy]);
 
   useEffect(() => {
-    setView(NavigationType.Taxonomy);
     Messenger.send(DashboardMessage.sendTelemetry, {
       event: TelemetryEvent.webviewTaxonomyDashboard
     });