From fedf3ecca4d2887977d7d9d2c06daaf5dbcf5e9b Mon Sep 17 00:00:00 2001 From: Dimitri Mitropoulos Date: Thu, 28 Jul 2022 23:46:02 -0400 Subject: [PATCH] INS-1692 removes document preview toggle (#5020) --- .../insomnia/src/models/workspace-meta.ts | 2 - .../src/ui/components/wrapper-design.tsx | 61 +++---------------- 2 files changed, 9 insertions(+), 54 deletions(-) diff --git a/packages/insomnia/src/models/workspace-meta.ts b/packages/insomnia/src/models/workspace-meta.ts index a6ed3deb01..8f001ab502 100644 --- a/packages/insomnia/src/models/workspace-meta.ts +++ b/packages/insomnia/src/models/workspace-meta.ts @@ -25,7 +25,6 @@ export interface BaseWorkspaceMeta { paneHeight: number; paneWidth: number; parentId: string | null; - previewHidden: boolean; sidebarFilter: string; sidebarHidden: boolean; sidebarWidth: number; @@ -52,7 +51,6 @@ export function init(): BaseWorkspaceMeta { paneHeight: DEFAULT_PANE_HEIGHT, paneWidth: DEFAULT_PANE_WIDTH, parentId: null, - previewHidden: false, sidebarFilter: '', sidebarHidden: false, sidebarWidth: DEFAULT_SIDEBAR_WIDTH, diff --git a/packages/insomnia/src/ui/components/wrapper-design.tsx b/packages/insomnia/src/ui/components/wrapper-design.tsx index e9972aaa0e..5a6a9dd5b5 100644 --- a/packages/insomnia/src/ui/components/wrapper-design.tsx +++ b/packages/insomnia/src/ui/components/wrapper-design.tsx @@ -1,19 +1,17 @@ import { IRuleResult } from '@stoplight/spectral-core'; -import { Button, Notice, NoticeTable } from 'insomnia-components'; -import React, { createRef, FC, Fragment, ReactNode, RefObject, useCallback, useEffect, useMemo, useState } from 'react'; +import { Notice, NoticeTable } from 'insomnia-components'; +import React, { createRef, FC, ReactNode, RefObject, useCallback, useEffect, useMemo, useState } from 'react'; import { useSelector } from 'react-redux'; import { useAsync } from 'react-use'; import styled from 'styled-components'; import SwaggerUI from 'swagger-ui-react'; -import { SegmentEvent, trackSegmentEvent } from '../../common/analytics'; import { parseApiSpec, ParsedApiSpec } from '../../common/api-specs'; import { debounce } from '../../common/misc'; import { initializeSpectral, isLintError } from '../../common/spectral'; import * as models from '../../models/index'; import { superFaint } from '../css/css-in-js'; -import previewIcon from '../images/icn-eye.svg'; -import { selectActiveApiSpec, selectActiveWorkspace, selectActiveWorkspaceMeta } from '../redux/selectors'; +import { selectActiveApiSpec } from '../redux/selectors'; import { CodeEditor, UnconnectedCodeEditor } from './codemirror/code-editor'; import { DesignEmptyState } from './design-empty-state'; import { ErrorBoundary } from './error-boundary'; @@ -33,47 +31,6 @@ const EmptySpaceHelper = styled.div({ const spectral = initializeSpectral(); -const RenderPageHeader: FC> = ({ - gitSyncDropdown, - handleActivityChange, -}) => { - const activeWorkspace = useSelector(selectActiveWorkspace); - const activeWorkspaceMeta = useSelector(selectActiveWorkspaceMeta); - const previewHidden = Boolean(activeWorkspaceMeta?.previewHidden); - - const handleTogglePreview = useCallback(async () => { - if (!activeWorkspace) { - return; - } - - const workspaceId = activeWorkspace._id; - await models.workspaceMeta.updateByParentId(workspaceId, { previewHidden: !previewHidden }); - - trackSegmentEvent(SegmentEvent.buttonClick, { - type: 'design preview toggle', - action: previewHidden ? 'show' : 'hide', - }); - }, [activeWorkspace, previewHidden]); - - return ( - - - {gitSyncDropdown} - - } - /> - ); -}; - interface LintMessage extends Notice { range: IRuleResult['range']; } @@ -190,10 +147,9 @@ const RenderEditor: FC<{ editor: RefObject }> = ({ editor }; const RenderPreview: FC = () => { - const activeWorkspaceMeta = useSelector(selectActiveWorkspaceMeta); const activeApiSpec = useSelector(selectActiveApiSpec); - if (!activeApiSpec || activeWorkspaceMeta?.previewHidden) { + if (!activeApiSpec) { return null; } @@ -302,11 +258,12 @@ export const WrapperDesign: FC = ({ return ( } + gridRight={gitSyncDropdown} + /> + )} renderPaneOne={} renderPaneTwo={} renderPageSidebar={}