From b4d0730158c7bed6be33dd41485cf2bef4bc734f Mon Sep 17 00:00:00 2001
From: James Gatz <jamesgatzos@gmail.com>
Date: Fri, 11 Nov 2022 12:31:09 +0100
Subject: [PATCH] Fix/delete remote project redirect (#5403)

* return an empty list if the project doesn't exist

* display the sync dropdown only for remote collections

* update sync dropdown styles for disconnected collections

* fix refetch the backend project on deletion
---
 .../ui/components/dropdowns/sync-dropdown.tsx    | 16 ++++++++++++++--
 .../ui/components/modals/sync-delete-modal.tsx   |  3 ++-
 .../src/ui/routes/remote-collections.tsx         |  6 ++----
 packages/insomnia/src/ui/routes/root.tsx         |  2 +-
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/packages/insomnia/src/ui/components/dropdowns/sync-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/sync-dropdown.tsx
index 5d89b3e976..b0a7a97561 100644
--- a/packages/insomnia/src/ui/components/dropdowns/sync-dropdown.tsx
+++ b/packages/insomnia/src/ui/components/dropdowns/sync-dropdown.tsx
@@ -327,10 +327,22 @@ export const SyncDropdown: FC<Props> = ({ vcs, workspace, project }) => {
   if (!vcs.hasBackendProject()) {
     return (
       <div>
-        <Dropdown className="wide tall" onOpen={() => refreshVCSAndRefetchRemote()}>
-          <DropdownButton className="btn btn--compact wide">
+        <Dropdown
+          style={{
+            marginLeft: 'var(--padding-md)',
+          }}
+          className="wide tall"
+          onOpen={() => refreshVCSAndRefetchRemote()}
+        >
+          <DropdownButton
+            buttonClass={Button}
+            // @ts-expect-error -- TSCONVERSION
+            size="small"
+            className="btn--clicky-small btn-sync wide text-left overflow-hidden row-spaced"
+          >
             <i className="fa fa-code-fork " /> Setup Sync
           </DropdownButton>
+
           {syncMenuHeader}
           {remoteBackendProjects.length === 0 && (
             <DropdownItem
diff --git a/packages/insomnia/src/ui/components/modals/sync-delete-modal.tsx b/packages/insomnia/src/ui/components/modals/sync-delete-modal.tsx
index 0c0b4f6a04..b28e4f54d3 100644
--- a/packages/insomnia/src/ui/components/modals/sync-delete-modal.tsx
+++ b/packages/insomnia/src/ui/components/modals/sync-delete-modal.tsx
@@ -49,11 +49,12 @@ export const SyncDeleteModal = forwardRef<SyncDeleteModalHandle, Props>(({ vcs }
     try {
       await interceptAccessError({
         action: 'delete',
-        callback: () => vcs.archiveProject(),
+        callback: async () => await vcs.archiveProject(),
         resourceName: state.workspaceName,
         resourceType: strings.collection.singular.toLowerCase(),
       });
       modalRef.current?.hide();
+      state.onHide?.();
     } catch (err) {
       setState(state => ({
         ...state,
diff --git a/packages/insomnia/src/ui/routes/remote-collections.tsx b/packages/insomnia/src/ui/routes/remote-collections.tsx
index 7f75659015..72d9c81c81 100644
--- a/packages/insomnia/src/ui/routes/remote-collections.tsx
+++ b/packages/insomnia/src/ui/routes/remote-collections.tsx
@@ -48,11 +48,9 @@ export const remoteCollectionsLoader: LoaderFunction = async ({ params }): Promi
   const { projectId } = params;
   invariant(typeof projectId === 'string', 'Project Id is required');
 
-  const project = await models.project.getById(projectId);
-
-  invariant(project, 'Project not found');
-
   try {
+    const project = await models.project.getById(projectId);
+    invariant(project, 'Project not found');
     const vcs = getVCS();
     invariant(vcs, 'VCS is not defined');
 
diff --git a/packages/insomnia/src/ui/routes/root.tsx b/packages/insomnia/src/ui/routes/root.tsx
index bf27df07fe..b9f1682fea 100644
--- a/packages/insomnia/src/ui/routes/root.tsx
+++ b/packages/insomnia/src/ui/routes/root.tsx
@@ -117,7 +117,7 @@ const WorkspaceNavigation: FC = () => {
       <Breadcrumb crumbs={crumbs} />
       {isDesign(activeWorkspace) && <ActivityToggle />}
       {isDesign(activeWorkspace) && gitVCS && <GitSyncDropdown key={workspaceId} workspace={activeWorkspace} vcs={gitVCS} />}
-      {isCollection(activeWorkspace) && vcs && <SyncDropdown key={workspaceId} workspace={activeWorkspace} project={activeProject} vcs={vcs} />}
+      {isCollection(activeWorkspace) && isRemoteProject(activeProject) && vcs && <SyncDropdown key={workspaceId} workspace={activeWorkspace} project={activeProject} vcs={vcs} />}
     </Fragment>
   );
 };