From 9f7fc71d272c99fe0242ec7ad160e3d20b47f490 Mon Sep 17 00:00:00 2001
From: Sangeeth Sivan <74818788+berzerkeer@users.noreply.github.com>
Date: Wed, 26 Apr 2023 12:49:08 +0530
Subject: [PATCH] fix: disable uppy informer and hide welcome tour cta for
 airgap (#22695)

---
 app/client/package.json                       |  2 +-
 .../FirstTimeUserOnboarding/Checklist.tsx     | 39 ++++++++++---------
 .../UserProfile/UserProfileImagePicker.tsx    |  3 ++
 app/client/yarn.lock                          |  8 ++--
 4 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/app/client/package.json b/app/client/package.json
index a5a1647d9c..19aa1a2aa5 100644
--- a/app/client/package.json
+++ b/app/client/package.json
@@ -80,7 +80,7 @@
     "cypress-log-to-output": "^1.1.2",
     "dayjs": "^1.10.6",
     "deep-diff": "^1.0.2",
-    "design-system-old": "npm:@appsmithorg/design-system-old@1.1.4",
+    "design-system-old": "npm:@appsmithorg/design-system-old@1.1.5",
     "downloadjs": "^1.4.7",
     "exceljs": "^4.3.0",
     "fast-deep-equal": "^3.1.3",
diff --git a/app/client/src/pages/Editor/FirstTimeUserOnboarding/Checklist.tsx b/app/client/src/pages/Editor/FirstTimeUserOnboarding/Checklist.tsx
index b0973ba066..74e6c8a0c4 100644
--- a/app/client/src/pages/Editor/FirstTimeUserOnboarding/Checklist.tsx
+++ b/app/client/src/pages/Editor/FirstTimeUserOnboarding/Checklist.tsx
@@ -51,7 +51,7 @@ import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidg
 import { triggerWelcomeTour } from "./Utils";
 import { builderURL, integrationEditorURL } from "RouteBuilder";
 import { ASSETS_CDN_URL } from "constants/ThirdPartyConstants";
-import { getAssetUrl } from "@appsmith/utils/airgapHelpers";
+import { getAssetUrl, isAirgapped } from "@appsmith/utils/airgapHelpers";
 
 const Wrapper = styled.div`
   padding: ${(props) => props.theme.spaces[7]}px 55px;
@@ -217,6 +217,7 @@ function getSuggestedNextActionAndCompletedTasks(
 }
 
 export default function OnboardingChecklist() {
+  const isAirgappedInstance = isAirgapped();
   const dispatch = useDispatch();
   const datasources = useSelector(getDatasources);
   const pageId = useSelector(getCurrentPageId);
@@ -557,23 +558,25 @@ export default function OnboardingChecklist() {
           )}
         </StyledListItem>
       </StyledList>
-      <StyledFooter
-        className="flex"
-        onClick={() => triggerWelcomeTour(dispatch)}
-      >
-        <StyledImg
-          alt="rocket"
-          src={getAssetUrl(`${ASSETS_CDN_URL}/Rocket.png`)}
-        />
-        <Text style={{ lineHeight: "14px" }} type={TextType.P1}>
-          {createMessage(ONBOARDING_CHECKLIST_FOOTER)}
-        </Text>
-        <Icon
-          color={theme.colors.applications.iconColor}
-          icon="chevron-right"
-          iconSize={16}
-        />
-      </StyledFooter>
+      {!isAirgappedInstance && (
+        <StyledFooter
+          className="flex"
+          onClick={() => triggerWelcomeTour(dispatch)}
+        >
+          <StyledImg
+            alt="rocket"
+            src={getAssetUrl(`${ASSETS_CDN_URL}/Rocket.png`)}
+          />
+          <Text style={{ lineHeight: "14px" }} type={TextType.P1}>
+            {createMessage(ONBOARDING_CHECKLIST_FOOTER)}
+          </Text>
+          <Icon
+            color={theme.colors.applications.iconColor}
+            icon="chevron-right"
+            iconSize={16}
+          />
+        </StyledFooter>
+      )}
     </Wrapper>
   );
 }
diff --git a/app/client/src/pages/UserProfile/UserProfileImagePicker.tsx b/app/client/src/pages/UserProfile/UserProfileImagePicker.tsx
index 09ba40575f..499e5a20c2 100644
--- a/app/client/src/pages/UserProfile/UserProfileImagePicker.tsx
+++ b/app/client/src/pages/UserProfile/UserProfileImagePicker.tsx
@@ -7,8 +7,10 @@ import { USER_PHOTO_ASSET_URL } from "constants/userConstants";
 import { DisplayImageUpload } from "design-system-old";
 
 import type Uppy from "@uppy/core";
+import { isAirgapped } from "@appsmith/utils/airgapHelpers";
 
 function FormDisplayImage() {
+  const isAirgappedInstance = isAirgapped();
   const [file, setFile] = useState<any>();
   const dispatch = useDispatch();
   const user = useSelector(getCurrentUser);
@@ -53,6 +55,7 @@ function FormDisplayImage() {
 
   return (
     <DisplayImageUpload
+      disableUppyInformer={isAirgappedInstance}
       onChange={onSelectFile}
       onRemove={removeProfileImage}
       submit={upload}
diff --git a/app/client/yarn.lock b/app/client/yarn.lock
index fe343bbbad..991b0ff03f 100644
--- a/app/client/yarn.lock
+++ b/app/client/yarn.lock
@@ -9969,10 +9969,10 @@ depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"
 
-"design-system-old@npm:@appsmithorg/design-system-old@1.1.4":
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/@appsmithorg/design-system-old/-/design-system-old-1.1.4.tgz#f779945d28297d5c16a4af30929d9988ab033182"
-  integrity sha512-W4ZsbjbvfjBi4U4wNeTPr1JasnxGwwF3/vbzoANd+A2+0vbg1+FkQcr7hwvy1AS/iVgPah+TGIXwk3vTs7WowQ==
+"design-system-old@npm:@appsmithorg/design-system-old@1.1.5":
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/@appsmithorg/design-system-old/-/design-system-old-1.1.5.tgz#4911f997cedebf8c8bc20ddef9bb7e2e657d8be5"
+  integrity sha512-h2XOWYryvmkl5ZjRgQ56HDNaSH+uzR0s7V2ZRt4iZBspXyf0wdf4fCcgIByZesRwLHFLmBPR2hQjOUcEnILVSQ==
   dependencies:
     emoji-mart "3.0.1"