feat: fix scratchpad for the new sidebar (#9815)

Author: ZxBing0066

…e.$workspaceId.debug.tutorial.$panel.tsx …d.project.$projectId.tutorial.$panel.tsxpackages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.tutorial.$panel.tsx renamed to packages/insomnia/src/routes/organization.$organizationId.project.$projectId.tutorial.$panel.tsx packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.tutorial.$panel.tsx renamed to packages/insomnia/src/routes/organization.$organizationId.project.$projectId.tutorial.$panel.tsx

@@ -1,6 +1,5 @@
 import type { IconName, IconPrefix } from '@fortawesome/fontawesome-svg-core';
 import { Button } from 'react-aria-components';
-import { Panel } from 'react-resizable-panels';
 import { href, useNavigate, useParams } from 'react-router';
 
 import { ErrorBoundary } from '~/ui/components/error-boundary';
@@ -102,11 +101,9 @@ const Tutorial = () => {
   const { panel } = useParams() as { panel?: string };
 
   return (
-    <Panel className="pane-one theme--pane" minSize={35} maxSize={90}>
-      <ErrorBoundary showAlert>
-        <TutorialContent panel={panel} />
-      </ErrorBoundary>
-    </Panel>
+    <ErrorBoundary showAlert>
+      <TutorialContent panel={panel} />
+    </ErrorBoundary>
   );
 };
 

packages/insomnia/src/ui/components/panes/scratchpad-tutorial-pane.tsx

@@ -3,7 +3,7 @@ import { Button, GridList, GridListItem } from 'react-aria-components';
 import { href, useNavigate, useParams } from 'react-router';
 import { useLocalStorage } from 'react-use';
 
-import { scratchPadTutorialList } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.tutorial.$panel';
+import { scratchPadTutorialList } from '~/routes/organization.$organizationId.project.$projectId.tutorial.$panel';
 import { Icon } from '~/ui/components/icon';
 
 export const ScratchPadTutorialPanel = () => {
@@ -83,9 +83,7 @@ export const ScratchPadTutorialPanel = () => {
         onSelectionChange={keys => {
           if (keys !== 'all') {
             const selected = Array.from(keys.values())[0].toString();
-            navigate(
-              `/organization/${organizationId}/project/${projectId}/workspace/${workspaceId}/debug/tutorial/${selected}`,
-            );
+            navigate(`/organization/${organizationId}/project/${projectId}/tutorial/${selected}`);
           }
         }}
       >

packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/project-navigation-sidebar.tsx

@@ -465,15 +465,17 @@ export const ProjectNavigationSidebar = ({ storageRules, konnectSyncEnabled }: P
           </div>
         </SearchField>
         {isProjectTabActive ? (
-          <Button
-            aria-label="Create new Project"
-            onPress={() => setIsNewProjectModalOpen(true)}
-            isDisabled={projects.length === 0}
-            className="flex h-full items-center justify-center gap-1 rounded-xs px-2 text-sm text-(--color-font) ring-1 ring-transparent transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset aria-pressed:bg-(--hl-sm)"
-          >
-            <Icon icon="plus" className="h-2.5 w-2.5" />
-            <span>New Project</span>
-          </Button>
+          !isScratchPad && (
+            <Button
+              aria-label="Create new Project"
+              onPress={() => setIsNewProjectModalOpen(true)}
+              isDisabled={projects.length === 0}
+              className="flex h-full items-center justify-center gap-1 rounded-xs px-2 text-sm text-(--color-font) ring-1 ring-transparent transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset aria-pressed:bg-(--hl-sm)"
+            >
+              <Icon icon="plus" className="h-2.5 w-2.5" />
+              <span>New Project</span>
+            </Button>
+          )
         ) : syncing ? (
           <Button
             aria-label="Cancel sync"
@@ -539,16 +541,15 @@ export const ProjectNavigationSidebar = ({ storageRules, konnectSyncEnabled }: P
                     !isScratchPad && navigate(`/organization/${organizationId}/project/${docId}`);
                   } else if (item.kind === 'workspace') {
                     toggleProjectOrWorkspace(docId);
-                    !isScratchPad &&
-                      tabNavigate(
-                        {
-                          organization: organizationId,
-                          project: item.project,
-                          workspace: item.doc,
-                          item: item.doc,
-                        },
-                        { withTab: isPrimaryClickModifier(e), shouldNavigate: true, searchParams },
-                      );
+                    tabNavigate(
+                      {
+                        organization: organizationId,
+                        project: item.project,
+                        workspace: item.doc,
+                        item: item.doc,
+                      },
+                      { withTab: isPrimaryClickModifier(e), shouldNavigate: true, searchParams },
+                    );
                   } else if (item.kind === 'collectionChild') {
                     if (models.requestGroup.isRequestGroup(doc)) {
                       toggleRequestGroup(doc);