From b8ede953715646bdc63cb383126ef10da87183c5 Mon Sep 17 00:00:00 2001 From: Rahul Barwal Date: Fri, 22 Mar 2024 08:19:46 +0530 Subject: [PATCH] chore: Refactor feature flag `release_show_create_app_from_templates_enabled` (#31991) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Description Removed the feature flag `release_show_create_app_from_templates_enabled` import and usage in the WorkspaceAction component were refactored. Fixes #`Issue Number` _or_ Fixes `Issue URL` > [!WARNING] > _If no issue exists, please create an issue first, and check with the maintainers if the issue is valid._ ## Automation /ok-to-test tags="@tag.Workspace" ### :mag: Cypress test results > [!IMPORTANT] > Workflow run: > Commit: `8e813e49585b11592412bf1d194d847a7753ea60` > Cypress dashboard url: Click here! > All cypress tests have passed 🎉🎉🎉 --- app/client/cypress/support/Pages/HomePage.ts | 8 ++---- app/client/src/ce/entities/FeatureFlag.ts | 3 --- .../ce/pages/Applications/WorkspaceAction.tsx | 25 ++++++++----------- 3 files changed, 12 insertions(+), 24 deletions(-) diff --git a/app/client/cypress/support/Pages/HomePage.ts b/app/client/cypress/support/Pages/HomePage.ts index 5bba34766ed..343c82017ec 100644 --- a/app/client/cypress/support/Pages/HomePage.ts +++ b/app/client/cypress/support/Pages/HomePage.ts @@ -1,9 +1,8 @@ -import { ObjectsRegistry } from "../Objects/Registry"; -import { REPO, CURRENT_REPO } from "../../fixtures/REPO"; +import { CURRENT_REPO, REPO } from "../../fixtures/REPO"; import HomePageLocators from "../../locators/HomePage"; import SignupPageLocators from "../../locators/SignupPage.json"; +import { ObjectsRegistry } from "../Objects/Registry"; import { AppSidebar, PageLeftPane } from "./EditorNavigation"; -import { featureFlagIntercept } from "../Objects/FeatureFlags"; export class HomePage { private agHelper = ObjectsRegistry.AggregateHelper; private locator = ObjectsRegistry.CommonLocators; @@ -330,9 +329,6 @@ export class HomePage { } public OpenTemplatesDialogInStartFromTemplates() { - featureFlagIntercept({ - release_show_create_app_from_templates_enabled: true, - }); this.agHelper.GetNClick(this._homePageAppCreateBtn, 0, true); this.agHelper.GetNClick(this._newButtonCreateApplicationFromTemplates); this.agHelper.AssertElementVisibility(this._createAppFromTemplatesDialog); diff --git a/app/client/src/ce/entities/FeatureFlag.ts b/app/client/src/ce/entities/FeatureFlag.ts index 8461b0aa9b4..dd89295a46e 100644 --- a/app/client/src/ce/entities/FeatureFlag.ts +++ b/app/client/src/ce/entities/FeatureFlag.ts @@ -44,8 +44,6 @@ export const FEATURE_FLAG = { "rollout_consolidated_page_load_fetch_enabled", release_actions_redesign_enabled: "release_actions_redesign_enabled", rollout_editor_pane_segments_enabled: "rollout_editor_pane_segments_enabled", - release_show_create_app_from_templates_enabled: - "release_show_create_app_from_templates_enabled", rollout_remove_feature_walkthrough_enabled: "rollout_remove_feature_walkthrough_enabled", release_drag_drop_building_blocks_enabled: @@ -90,7 +88,6 @@ export const DEFAULT_FEATURE_FLAG_VALUE: FeatureFlags = { rollout_consolidated_page_load_fetch_enabled: false, release_actions_redesign_enabled: false, rollout_editor_pane_segments_enabled: false, - release_show_create_app_from_templates_enabled: false, rollout_remove_feature_walkthrough_enabled: false, rollout_js_enabled_one_click_binding_enabled: false, rollout_side_by_side_enabled: false, diff --git a/app/client/src/ce/pages/Applications/WorkspaceAction.tsx b/app/client/src/ce/pages/Applications/WorkspaceAction.tsx index 213893ce332..e3fe9c4c371 100644 --- a/app/client/src/ce/pages/Applications/WorkspaceAction.tsx +++ b/app/client/src/ce/pages/Applications/WorkspaceAction.tsx @@ -17,11 +17,9 @@ import { createMessage, } from "@appsmith/constants/messages"; import type { Workspace } from "@appsmith/constants/workspaceConstants"; -import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag"; import { getIsCreatingApplicationByWorkspaceId } from "@appsmith/selectors/applicationSelectors"; import { getIsFetchingApplications } from "@appsmith/selectors/selectedWorkspaceSelectors"; import { hasCreateNewAppPermission } from "@appsmith/utils/permissionHelpers"; -import { useFeatureFlag } from "utils/hooks/useFeatureFlag"; export interface WorkspaceActionProps { workspace: Workspace; @@ -47,9 +45,6 @@ function WorkspaceAction({ const isCreatingApplication = Boolean( useSelector(getIsCreatingApplicationByWorkspaceId(workspace.id)), ); - const isCreateAppFromTemplatesEnabled = useFeatureFlag( - FEATURE_FLAG.release_show_create_app_from_templates_enabled, - ); const openActionMenu = useCallback(() => { setIsActionMenuOpen(true); @@ -97,16 +92,16 @@ function WorkspaceAction({ {createMessage(NEW_APP)} {} - {isCreateAppFromTemplatesEnabled && ( - onStartFromTemplate(workspaceId)} - startIcon="layout-2-line" - > - {createMessage(NEW_APP_FROM_TEMPLATE)} - - )} + + onStartFromTemplate(workspaceId)} + startIcon="layout-2-line" + > + {createMessage(NEW_APP_FROM_TEMPLATE)} + + {enableImportExport && hasCreateNewApplicationPermission && (