diff --git a/packages/insomnia-analytics/src/events.ts b/packages/insomnia-analytics/src/events.ts index 50dd647742..41466b8b64 100644 --- a/packages/insomnia-analytics/src/events.ts +++ b/packages/insomnia-analytics/src/events.ts @@ -131,6 +131,9 @@ export enum AnalyticsEvent { kongKonnectSyncCompleted = 'kong-konnect-sync-completed', emptyStateSendRequestClicked = 'empty-state-send-request-clicked', emptyStateCreateDocumentClicked = 'empty-state-create-document-clicked', + projectListFiltered = 'project-list-filtered', + projectSwitched = 'project-switched', + organizationSwitched = 'organization-switched', } export enum InsoEvent { diff --git a/packages/insomnia/src/routes/import.scan.tsx b/packages/insomnia/src/routes/import.scan.tsx index d32753c6e8..d59d2c9b06 100644 --- a/packages/insomnia/src/routes/import.scan.tsx +++ b/packages/insomnia/src/routes/import.scan.tsx @@ -9,11 +9,7 @@ import { scanResources, } from '~/common/import'; import type { ImportEntry } from '~/main/importers/entities'; -<<<<<<< HEAD -import { SegmentEvent, trackImportEvent } from '~/ui/analytics'; -======= import { AnalyticsEvent, trackImportEvent } from '~/ui/analytics'; ->>>>>>> origin/develop import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; @@ -31,11 +27,7 @@ export const scanImportResources = async (data: { invariant(typeof source === 'string', 'Source is required.'); invariant(IMPORT_SOURCE_TYPES.includes(source), 'Unsupported import type'); -<<<<<<< HEAD - trackImportEvent(SegmentEvent.importScanned, { source }); -======= trackImportEvent(AnalyticsEvent.importScanned, { source }); ->>>>>>> origin/develop const contentList: ImportEntry[] = []; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId._index.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId._index.tsx index 3e7b72705c..372846b896 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId._index.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId._index.tsx @@ -24,7 +24,6 @@ import { type DashboardSortOrder, dashboardSortOrderName, getAppWebsiteBaseURL, - isKonnectSyncEnabled, } from '~/common/constants'; import { scopeToBgColorMap, scopeToIconMap, scopeToTextColorMap } from '~/common/get-workspace-label'; import { fuzzyMatchAll } from '~/common/misc'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.tsx index cb10b7a739..3cedb19320 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.tsx @@ -7,7 +7,7 @@ import * as reactUse from 'react-use'; import { logout } from '~/account/session'; import { Icon } from '~/basic-components/icon'; -import { DEFAULT_SIDEBAR_SIZE } from '~/common/constants'; +import { DEFAULT_SIDEBAR_SIZE, isKonnectSyncEnabled } from '~/common/constants'; import { CheckAllProjectSyncStatus, getAllLocalFiles, @@ -186,7 +186,10 @@ const Component = ({ loaderData }: Route.ComponentProps) => { collapsible >
- + {isScratchPad && } {!isLearningFeatureDismissed && learningFeature?.active && (
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.tsx index 3b25576382..8868a3db70 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.tsx @@ -1,8 +1,6 @@ import type { IconName, IconProp } from '@fortawesome/fontawesome-svg-core'; import React, { Fragment, useEffect, useMemo, useRef, useState } from 'react'; import { - Breadcrumb, - Breadcrumbs, Button, DropIndicator, GridList, @@ -18,7 +16,6 @@ import { useDragAndDrop, } from 'react-aria-components'; import { type ImperativePanelGroupHandle, Panel, PanelGroup, PanelResizeHandle } from 'react-resizable-panels'; -import { NavLink } from 'react-router'; import { DEFAULT_SIDEBAR_SIZE } from '~/common/constants'; import { debounce } from '~/common/misc'; @@ -29,7 +26,6 @@ import { useEnvironmentCreateActionFetcher } from '~/routes/organization.$organi import { useEnvironmentDeleteActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.delete'; import { useEnvironmentDuplicateActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.duplicate'; import { useEnvironmentUpdateActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.update'; -import { WorkspaceDropdown } from '~/ui/components/dropdowns/workspace-dropdown'; import { EditableInput } from '~/ui/components/editable-input'; import { EnvironmentEditor, @@ -44,7 +40,6 @@ import { AlertModal } from '~/ui/components/modals/alert-modal'; import { InputVaultKeyModal } from '~/ui/components/modals/input-vault-key-modal'; import { OrganizationTabList } from '~/ui/components/tabs/tab-list'; import WorkspacePaneHeader from '~/ui/components/workspace/workspace-pane-header'; -import { INSOMNIA_TAB_HEIGHT } from '~/ui/constant'; import { useOrganizationPermissions } from '~/ui/hooks/use-organization-features'; import { useToggleEnvironmentType } from '~/ui/hooks/use-toggle-environment-type'; import { getDataFromKVPair } from '~/utils/environment-utils'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.tsx index d8f87b6262..9fb20a3190 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.tsx @@ -1,20 +1,9 @@ import type { IconName } from '@fortawesome/fontawesome-svg-core'; import React, { Suspense, useEffect, useLayoutEffect, useRef, useState } from 'react'; -import { - Breadcrumb, - Breadcrumbs, - Button, - GridList, - GridListItem, - Menu, - MenuItem, - MenuTrigger, - Popover, -} from 'react-aria-components'; +import { Button, GridList, GridListItem, Menu, MenuItem, MenuTrigger, Popover } from 'react-aria-components'; import { type ImperativePanelGroupHandle, Panel, PanelGroup, PanelResizeHandle } from 'react-resizable-panels'; import { href, - NavLink, redirect, Route as RouteComponent, Routes, @@ -29,7 +18,6 @@ import { services } from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import { useWorkspaceLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId'; import { useMockRouteDeleteActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.delete'; -import { WorkspaceDropdown } from '~/ui/components/dropdowns/workspace-dropdown'; import { Icon } from '~/ui/components/icon'; import { useDocBodyKeyboardShortcuts } from '~/ui/components/keydown-binder'; import { showModal } from '~/ui/components/modals'; @@ -41,7 +29,6 @@ import { OrganizationTabList } from '~/ui/components/tabs/tab-list'; import { formatMethodName } from '~/ui/components/tags/method-tag'; import { showResourceNotFoundToast } from '~/ui/components/toast-notification'; import WorkspacePaneHeader from '~/ui/components/workspace/workspace-pane-header'; -import { INSOMNIA_TAB_HEIGHT } from '~/ui/constant'; import { useTabNavigate } from '~/ui/hooks/use-insomnia-tab'; import { isPrimaryClickModifier } from '~/ui/utils'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.tsx index fa227febf6..6fb129e9ab 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.tsx @@ -3,8 +3,6 @@ import CodeMirror from 'codemirror'; import type { OpenAPIV3 } from 'openapi-types'; import { Fragment, type ReactNode, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'; import { - Breadcrumb, - Breadcrumbs, Button, GridList, GridListItem, @@ -20,14 +18,14 @@ import { TooltipTrigger, } from 'react-aria-components'; import { type ImperativePanelGroupHandle, Panel, PanelGroup, PanelResizeHandle } from 'react-resizable-panels'; -import { href, NavLink, redirect, useLoaderData } from 'react-router'; +import { href, redirect, useLoaderData } from 'react-router'; import * as reactUse from 'react-use'; import { SwaggerUIBundle } from 'swagger-ui-dist'; import YAML from 'yaml'; import { parseApiSpec } from '~/common/api-specs'; import { DEFAULT_SIDEBAR_SIZE } from '~/common/constants'; -import { debounce, isNotNullOrUndefined } from '~/common/misc'; +import { debounce } from '~/common/misc'; import { models, services } from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import { useWorkspaceLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId'; @@ -38,7 +36,6 @@ import { AnalyticsEvent } from '~/ui/analytics'; import { CodeEditor, type CodeEditorHandle } from '~/ui/components/.client/codemirror/code-editor'; import { DesignEmptyState } from '~/ui/components/design-empty-state'; import { DocumentTab } from '~/ui/components/document-tab'; -import { WorkspaceDropdown } from '~/ui/components/dropdowns/workspace-dropdown'; import { Icon } from '~/ui/components/icon'; import { useDocBodyKeyboardShortcuts } from '~/ui/components/keydown-binder'; import { showError } from '~/ui/components/modals'; @@ -50,7 +47,6 @@ import { OrganizationTabList } from '~/ui/components/tabs/tab-list'; import { formatMethodName } from '~/ui/components/tags/method-tag'; import { showResourceNotFoundToast, showToast } from '~/ui/components/toast-notification'; import WorkspacePaneHeader from '~/ui/components/workspace/workspace-pane-header'; -import { INSOMNIA_TAB_HEIGHT } from '~/ui/constant'; import { useLoaderDeferData } from '~/ui/hooks/use-loader-defer-data'; import { useAIFeatureStatus } from '~/ui/hooks/use-organization-features'; import { useGitVCSVersion } from '~/ui/hooks/use-vcs-version'; @@ -493,8 +489,8 @@ const Component = ({ params }: Route.ComponentProps) => { {isGenerateMockServersWithAIEnabled && (