From 9dc3f24c82b9b249165fc1ac020a5c52533b1875 Mon Sep 17 00:00:00 2001
From: Curry Yang <1019yanglu@gmail.com>
Date: Thu, 11 Jul 2024 11:47:46 +0800
Subject: [PATCH 1/2] sync status indicator

---
 .../insomnia/src/ui/routes/organization.tsx   | 59 +++++++++++++++----
 1 file changed, 46 insertions(+), 13 deletions(-)

diff --git a/packages/insomnia/src/ui/routes/organization.tsx b/packages/insomnia/src/ui/routes/organization.tsx
index 31fb8ec14ea..5ec0ead2816 100644
--- a/packages/insomnia/src/ui/routes/organization.tsx
+++ b/packages/insomnia/src/ui/routes/organization.tsx
@@ -1,4 +1,4 @@
-import React, { Fragment, useEffect, useState } from 'react';
+import React, { Fragment, useCallback, useEffect, useState } from 'react';
 import {
   Button,
   Link,
@@ -461,24 +461,31 @@ const OrganizationRoute = () => {
 
   const syncOrgsAndProjectsFetcher = useFetcher();
 
-  useEffect(() => {
+  const asyncTaskStatus = syncOrgsAndProjectsFetcher.data?.error ? 'error' : syncOrgsAndProjectsFetcher.state;
+
+  const syncOrgsAndProjects = useCallback(() => {
     const submit = syncOrgsAndProjectsFetcher.submit;
+    console.log('asyncTaskList', asyncTaskList);
+    submit({
+      organizationId,
+      projectId: projectId || '',
+      asyncTaskList,
+    }, {
+      action: '/organization/syncOrgsAndProjectsAction',
+      method: 'POST',
+      encType: 'application/json',
+    });
+  }, [asyncTaskList, organizationId, syncOrgsAndProjectsFetcher.submit, projectId]);
+
+  useEffect(() => {
     // each route navigation will change history state, only submit this action when the asyncTaskList state is not empty
     // currently we have 2 cases that will set the asyncTaskList state
     // 1. first entry
     // 2. when user switch to another organization
     if (asyncTaskList?.length) {
-      submit({
-        organizationId,
-        projectId: projectId || '',
-        asyncTaskList,
-      }, {
-        action: '/organization/syncOrgsAndProjectsAction',
-        method: 'POST',
-        encType: 'application/json',
-      });
+      syncOrgsAndProjects();
     }
-  }, [userSession.id, organizationId, userSession.accountId, syncOrgsAndProjectsFetcher.submit, asyncTaskList, projectId]);
+  }, [organizationId, asyncTaskList, syncOrgsAndProjects]);
 
   useEffect(() => {
     const isIdleAndUninitialized = untrackedProjectsFetcher.state === 'idle' && !untrackedProjectsFetcher.data;
@@ -883,7 +890,32 @@ const OrganizationRoute = () => {
                     )}
                   </ProgressBar>
                 )}
-                <TooltipTrigger>
+                {/* The sync indicator only show when network status is online */}
+                {/* use for show sync organization and projects status(1. first enter app 2. switch organization) */}
+                {status === 'online' && asyncTaskStatus !== 'idle' ? (
+                  <TooltipTrigger>
+                    <Button
+                      className="px-4 py-1 h-full flex items-center justify-center gap-2 aria-pressed:bg-[--hl-sm] text-[--color-font] text-xs hover:bg-[--hl-xs] focus:ring-inset ring-1 ring-transparent focus:ring-[--hl-md] transition-all"
+                      onPress={() => {
+                        asyncTaskStatus === 'error' && syncOrgsAndProjects();
+                      }}
+                    >
+                      <Icon
+                        icon={asyncTaskStatus !== 'error' ? 'spinner' : 'circle'}
+                        className={`${asyncTaskStatus === 'error' ? 'text-[--color-danger]' : 'text-[--color-success]'} w-5 ${asyncTaskStatus !== 'error' ? 'animate-spin' : ''}`}
+                      />
+                      {asyncTaskStatus !== 'error' ? 'Syncing' : 'Sync error: click to retry'}
+                    </Button>
+                    <Tooltip
+                      placement="top"
+                      offset={8}
+                      className="border flex items-center gap-2 select-none text-sm min-w-max border-solid border-[--hl-sm] shadow-lg bg-[--color-bg] text-[--color-font] px-4 py-2 rounded-md overflow-y-auto max-h-[85vh] focus:outline-none"
+                    >
+                      {asyncTaskStatus !== 'error' ? 'Syncing' : 'Sync error: click to retry'}
+                    </Tooltip>
+                  </TooltipTrigger>
+                ) : (
+                    <TooltipTrigger>
                   <Button
                     className="px-4 py-1 h-full flex items-center justify-center gap-2 aria-pressed:bg-[--hl-sm] text-[--color-font] text-xs hover:bg-[--hl-xs] focus:ring-inset ring-1 ring-transparent focus:ring-[--hl-md] transition-all"
                     onPress={() => {
@@ -921,6 +953,7 @@ const OrganizationRoute = () => {
                       : 'Log in to Insomnia to unlock the full product experience.'}
                   </Tooltip>
                 </TooltipTrigger>
+                )}
                 <span className='w-[1px] h-full bg-[--hl-sm]' />
                 <Link>
                   <a

From 1bab903237cd0440a8cff03a5e59b6f5e20be74b Mon Sep 17 00:00:00 2001
From: Curry Yang <1019yanglu@gmail.com>
Date: Mon, 15 Jul 2024 15:27:06 +0800
Subject: [PATCH 2/2] rename path

---
 packages/insomnia/src/ui/index.tsx               | 2 +-
 packages/insomnia/src/ui/routes/organization.tsx | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/insomnia/src/ui/index.tsx b/packages/insomnia/src/ui/index.tsx
index 975e1fb6e9a..aac9b058288 100644
--- a/packages/insomnia/src/ui/index.tsx
+++ b/packages/insomnia/src/ui/index.tsx
@@ -176,7 +176,7 @@ async function renderApp() {
                 action: async (...args) => (await import('./routes/organization')).syncOrganizationsAction(...args),
               },
               {
-                path: 'syncOrgsAndProjectsAction',
+                path: 'sync-orgs-and-projects',
                 action: async (...args) => (await import('./routes/organization')).syncOrgsAndProjectsAction(...args),
               },
               {
diff --git a/packages/insomnia/src/ui/routes/organization.tsx b/packages/insomnia/src/ui/routes/organization.tsx
index 5ec0ead2816..97d3a077bb1 100644
--- a/packages/insomnia/src/ui/routes/organization.tsx
+++ b/packages/insomnia/src/ui/routes/organization.tsx
@@ -465,13 +465,13 @@ const OrganizationRoute = () => {
 
   const syncOrgsAndProjects = useCallback(() => {
     const submit = syncOrgsAndProjectsFetcher.submit;
-    console.log('asyncTaskList', asyncTaskList);
+
     submit({
       organizationId,
       projectId: projectId || '',
       asyncTaskList,
     }, {
-      action: '/organization/syncOrgsAndProjectsAction',
+      action: '/organization/sync-orgs-and-projects',
       method: 'POST',
       encType: 'application/json',
     });