From 39ca1c16bd26e3501c4f2c3e3d03b2fa9d6d9dc4 Mon Sep 17 00:00:00 2001 From: Rahul Barwal Date: Mon, 1 Jan 2024 17:33:12 +0530 Subject: [PATCH] fix: Add isAirgappedInstance check in Onboarding component (#29860) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Description This pull request adds an isAirgappedInstance check in the Onboarding component. The check ensures that the component behaves correctly in airgapped instances. #### PR fixes following issue(s) Fixes # (issue number) > if no issue exists, please create an issue and ask the maintainers about this first > > #### Media > A video or a GIF is preferred. when using Loom, don’t embed because it looks like it’s a GIF. instead, just link to the video > > #### Type of change > Please delete options that are not relevant. - Bug fix (non-breaking change which fixes an issue) - New feature (non-breaking change which adds functionality) - Breaking change (fix or feature that would cause existing functionality to not work as expected) - Chore (housekeeping or task changes that don't impact user perception) - This change requires a documentation update > > > ## Testing > #### How Has This Been Tested? > Please describe the tests that you ran to verify your changes. Also list any relevant details for your test configuration. > Delete anything that is not relevant - [ ] Manual - [ ] JUnit - [ ] Jest - [ ] Cypress > > #### Test Plan > Add Testsmith test cases links that relate to this PR > > #### Issues raised during DP testing > Link issues raised during DP testing for better visiblity and tracking (copy link from comments dropped on this PR) > > > ## Checklist: #### Dev activity - [ ] My code follows the style guidelines of this project - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] New and existing unit tests pass locally with my changes - [ ] PR is being merged under a feature flag #### QA activity: - [ ] [Speedbreak features](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#speedbreakers-) have been covered - [ ] Test plan covers all impacted features and [areas of interest](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#areas-of-interest-) - [ ] Test plan has been peer reviewed by project stakeholders and other QA members - [ ] Manually tested functionality on DP - [ ] We had an implementation alignment call with stakeholders post QA Round 2 - [ ] Cypress test cases have been added and approved by SDET/manual QA - [ ] Added `Test Plan Approved` label after Cypress tests were reviewed - [ ] Added `Test Plan Approved` label after JUnit tests were reviewed ## Summary by CodeRabbit - **Refactor** - Updated drop target component to support airgapped instances, enhancing functionality in restricted network environments. --- .../common/dropTarget/DropTargetComponent.tsx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/client/src/layoutSystems/common/dropTarget/DropTargetComponent.tsx b/app/client/src/layoutSystems/common/dropTarget/DropTargetComponent.tsx index f8a59b2735..c1c3f4129f 100644 --- a/app/client/src/layoutSystems/common/dropTarget/DropTargetComponent.tsx +++ b/app/client/src/layoutSystems/common/dropTarget/DropTargetComponent.tsx @@ -51,6 +51,7 @@ import { useFeatureFlag } from "utils/hooks/useFeatureFlag"; import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag"; import { useCurrentAppState } from "pages/Editor/IDE/hooks"; import { EditorState as IDEAppState } from "entities/IDE/constants"; +import { isAirgapped } from "@appsmith/utils/airgapHelpers"; export type DropTargetComponentProps = PropsWithChildren<{ snapColumnSpace: number; @@ -82,6 +83,7 @@ function Onboarding() { const showStarterTemplatesInsteadofBlankCanvas = useFeatureFlag( FEATURE_FLAG.ab_show_templates_instead_of_blank_canvas_enabled, ); + const isAirgappedInstance = isAirgapped(); const currentApplicationId = useSelector( (state: AppState) => state.ui.applications.currentApplication?.id, @@ -91,8 +93,14 @@ function Onboarding() { () => showStarterTemplatesInsteadofBlankCanvas && !isMobileCanvas && + isUsersFirstApp && + !isAirgappedInstance, + [ + isMobileCanvas, isUsersFirstApp, - [isMobileCanvas, isUsersFirstApp, showStarterTemplatesInsteadofBlankCanvas], + showStarterTemplatesInsteadofBlankCanvas, + isAirgappedInstance, + ], ); useEffect(() => { (async () => {