diff --git a/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/PropertyPaneSlashCommand_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/PropertyPaneSlashCommand_spec.ts index 31f4b1c7feb1..4271fef029d3 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/PropertyPaneSlashCommand_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/PropertyPaneSlashCommand_spec.ts @@ -1,12 +1,7 @@ -import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags"; import { agHelper, locators, - entityExplorer, propPane, - draggableWidgets, - apiPage, - entityItems, homePage, assertHelper, } from "../../../../support/Objects/ObjectsCore"; @@ -15,12 +10,6 @@ import EditorNavigation, { } from "../../../../support/Pages/EditorNavigation"; describe("Property Pane Suggestions", { tags: ["@tag.JS"] }, () => { - before(() => { - featureFlagIntercept({ - ab_learnability_ease_of_initial_use_enabled: true, - }); - }); - before(function () { agHelper.ClearLocalStorageCache(); }); diff --git a/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/JSEnabledByDefaultExperiment_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/JSEnabledByDefaultExperiment_spec.ts index b1da841ffe3d..45a89965b271 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/JSEnabledByDefaultExperiment_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/JSEnabledByDefaultExperiment_spec.ts @@ -1,5 +1,4 @@ import OneClickBindingLocator from "../../../../locators/OneClickBindingLocator"; -import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags"; import { agHelper, apiPage, @@ -23,10 +22,6 @@ describe( () => { let datasourceName: string; before(() => { - featureFlagIntercept({ - rollout_js_enabled_one_click_binding_enabled: true, - }); - dataSources.CreateDataSource("Postgres"); cy.get("@dsName").then((dsName) => { diff --git a/app/client/cypress/support/e2e.js b/app/client/cypress/support/e2e.js index eb8b6adae26b..dc381136afc0 100644 --- a/app/client/cypress/support/e2e.js +++ b/app/client/cypress/support/e2e.js @@ -139,8 +139,6 @@ before(function () { if (!Cypress.currentTest.titlePath[0].includes(WALKTHROUGH_TEST_PAGE)) { // Adding key FEATURE_WALKTHROUGH (which is used to check if the walkthrough is already shown to the user or not) for non walkthrough cypress tests (to not show walkthrough) addIndexedDBKey(FEATURE_WALKTHROUGH_INDEX_KEY, { - ab_ds_binding_enabled: true, - ab_ds_schema_enabled: true, binding_widget: true, }); } diff --git a/app/client/src/ce/entities/FeatureFlag.ts b/app/client/src/ce/entities/FeatureFlag.ts index 69ac4b7e9c60..d81877b448eb 100644 --- a/app/client/src/ce/entities/FeatureFlag.ts +++ b/app/client/src/ce/entities/FeatureFlag.ts @@ -36,11 +36,7 @@ export const FEATURE_FLAG = { "release_drag_drop_building_blocks_enabled", release_table_cell_label_value_enabled: "release_table_cell_label_value_enabled", - rollout_js_enabled_one_click_binding_enabled: - "rollout_js_enabled_one_click_binding_enabled", rollout_side_by_side_enabled: "rollout_side_by_side_enabled", - ab_learnability_ease_of_initial_use_enabled: - "ab_learnability_ease_of_initial_use_enabled", ab_learnability_discoverability_collapse_all_except_data_enabled: "ab_learnability_discoverability_collapse_all_except_data_enabled", release_layout_conversion_enabled: "release_layout_conversion_enabled", @@ -77,9 +73,7 @@ export const DEFAULT_FEATURE_FLAG_VALUE: FeatureFlags = { ab_appsmith_ai_query: false, release_actions_redesign_enabled: false, rollout_remove_feature_walkthrough_enabled: true, - rollout_js_enabled_one_click_binding_enabled: true, rollout_side_by_side_enabled: false, - ab_learnability_ease_of_initial_use_enabled: true, ab_learnability_discoverability_collapse_all_except_data_enabled: true, release_layout_conversion_enabled: false, release_anvil_toggle_enabled: false, diff --git a/app/client/src/components/editorComponents/CodeEditor/codeEditorUtils.ts b/app/client/src/components/editorComponents/CodeEditor/codeEditorUtils.ts index 0e82d7fe88fe..08e13a6cb279 100644 --- a/app/client/src/components/editorComponents/CodeEditor/codeEditorUtils.ts +++ b/app/client/src/components/editorComponents/CodeEditor/codeEditorUtils.ts @@ -4,9 +4,6 @@ import type { WidgetEntity, ActionEntity } from "ee/entities/DataTree/types"; import { trim } from "lodash"; import { getDynamicStringSegments } from "utils/DynamicBindingUtils"; import { EditorSize } from "./EditorConfig"; -import { selectFeatureFlagCheck } from "ee/selectors/featureFlagsSelectors"; -import store from "store"; -import { FEATURE_FLAG } from "ee/entities/FeatureFlag"; import { SlashCommandMenuOnFocusWidgetProps } from "./constants"; // TODO: Fix this the next time the file is edited @@ -157,12 +154,7 @@ export function shouldShowSlashCommandMenu( widgetType: string = "", propertyPath: string = "", ) { - const isEaseOfUseFlagEnabled = selectFeatureFlagCheck( - store.getState(), - FEATURE_FLAG.ab_learnability_ease_of_initial_use_enabled, - ); return ( - !!isEaseOfUseFlagEnabled && !!SlashCommandMenuOnFocusWidgetProps[widgetType] && SlashCommandMenuOnFocusWidgetProps[widgetType].includes(propertyPath) ); diff --git a/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts b/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts index d066f825510e..5176adc300e6 100644 --- a/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts +++ b/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts @@ -12757,12 +12757,10 @@ export const defaultAppState = { release_datasource_environments_enabled: false, release_appnavigationlogoupload_enabled: false, release_embed_hide_share_settings_enabled: false, - ab_gsheet_schema_enabled: true, release_table_serverside_filtering_enabled: false, license_branding_enabled: false, license_sso_saml_enabled: false, license_sso_oidc_enabled: false, - ab_mock_mongo_schema_enabled: true, license_private_embeds_enabled: false, release_show_publish_app_to_community_enabled: false, license_gac_enabled: false, @@ -12777,7 +12775,6 @@ export const defaultAppState = { release_side_by_side_ide_enabled: false, release_global_add_pane_enabled: false, license_git_unlimited_repo_enabled: false, - ab_ds_binding_enabled: true, ask_ai_js: false, license_connection_pool_size_enabled: false, release_widgetdiscovery_enabled: false, @@ -12788,7 +12785,6 @@ export const defaultAppState = { license_audit_logs_enabled: false, ask_ai_sql: false, release_query_module_enabled: false, - ab_ds_schema_enabled: true, ab_onboarding_flow_start_with_data_dev_only_enabled: false, license_session_limit_enabled: false, rollout_datasource_test_rate_limit_enabled: false, diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useConnectToOptions.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useConnectToOptions.tsx index d63ebc1918ab..235723e24141 100644 --- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useConnectToOptions.tsx +++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useConnectToOptions.tsx @@ -22,9 +22,6 @@ import type { ModuleInstanceData, ModuleInstanceDataState, } from "ee/constants/ModuleInstanceConstants"; -import { selectFeatureFlagCheck } from "ee/selectors/featureFlagsSelectors"; -import { FEATURE_FLAG } from "ee/entities/FeatureFlag"; -import type { AppState } from "ee/reducers"; import type { Module } from "ee/constants/ModuleConstants"; import { getAllModules } from "ee/selectors/modulesSelector"; import { getModuleIcon } from "pages/Editor/utils"; @@ -162,13 +159,6 @@ function useConnectToOptions(props: ConnectToOptionsProps) { const queries = useSelector(getCurrentActions); const pluginsPackageNamesMap = useSelector(getPluginIdPackageNamesMap); - const isJSEnabledByDefaultOnForOneClickBinding = useSelector( - (state: AppState) => - selectFeatureFlagCheck( - state, - FEATURE_FLAG.rollout_js_enabled_one_click_binding_enabled, - ), - ); const { pluginImages, widget } = props; @@ -197,10 +187,7 @@ function useConnectToOptions(props: ConnectToOptionsProps) { value: getBindingValue(widget, query), icon: getQueryIcon(query, pluginImages, modules), onSelect: function (value?: string, valueOption?: DropdownOptionType) { - addBinding( - valueOption?.value, - !!isJSEnabledByDefaultOnForOneClickBinding, - ); + addBinding(valueOption?.value, true); updateConfig({ datasource: "", diff --git a/app/client/src/constants/WalkthroughConstants.ts b/app/client/src/constants/WalkthroughConstants.ts index 9c6460392412..7adfdc3645cc 100644 --- a/app/client/src/constants/WalkthroughConstants.ts +++ b/app/client/src/constants/WalkthroughConstants.ts @@ -1,6 +1,4 @@ export const FEATURE_WALKTHROUGH_KEYS = { - ds_binding: "ab_ds_binding_enabled", - ds_schema: "ab_ds_schema_enabled", binding_widget: "binding_widget", env_walkthrough: "ab_env_walkthrough_enabled", // Signposting keys diff --git a/app/client/src/pages/Editor/DatasourceInfo/QueryTemplates.tsx b/app/client/src/pages/Editor/DatasourceInfo/QueryTemplates.tsx index 15e2c13a9a59..93439d694c15 100644 --- a/app/client/src/pages/Editor/DatasourceInfo/QueryTemplates.tsx +++ b/app/client/src/pages/Editor/DatasourceInfo/QueryTemplates.tsx @@ -1,4 +1,4 @@ -import React, { useCallback, useContext } from "react"; +import React, { useCallback } from "react"; import { useDispatch, useSelector } from "react-redux"; import { createActionRequest } from "actions/pluginActionActions"; import type { AppState } from "ee/reducers"; @@ -21,15 +21,12 @@ import { integrationEditorURL } from "ee/RouteBuilder"; import { MenuItem, Tag } from "@appsmith/ads"; import type { Plugin } from "api/PluginApi"; -import WalkthroughContext from "components/featureWalkthrough/walkthroughContext"; -import { setFeatureWalkthroughShown } from "utils/storage"; import styled from "styled-components"; import { change, getFormValues } from "redux-form"; import { QUERY_EDITOR_FORM_NAME } from "ee/constants/forms"; import { diff } from "deep-diff"; import { UndoRedoToastContext, showUndoRedoToast } from "utils/replayHelpers"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; -import { FEATURE_WALKTHROUGH_KEYS } from "constants/WalkthroughConstants"; import { SUGGESTED_TAG, createMessage } from "ee/constants/messages"; import { transformTextToSentenceCase } from "pages/Editor/utils"; @@ -59,8 +56,6 @@ const TemplateMenuItem = styled(MenuItem)` export function QueryTemplates(props: QueryTemplatesProps) { const dispatch = useDispatch(); - const { isOpened: isWalkthroughOpened, popFeature } = - useContext(WalkthroughContext) || {}; const applicationId = useSelector(getCurrentApplicationId); const actions = useSelector((state: AppState) => state.entities.actions); const basePageId = useSelector(getCurrentBasePageId); @@ -109,11 +104,6 @@ export function QueryTemplates(props: QueryTemplatesProps) { }), ); - if (isWalkthroughOpened) { - popFeature && popFeature("SCHEMA_QUERY_CREATE"); - setFeatureWalkthroughShown(FEATURE_WALKTHROUGH_KEYS.ds_schema, true); - } - history.push( integrationEditorURL({ basePageId, @@ -166,14 +156,8 @@ export function QueryTemplates(props: QueryTemplatesProps) { datasourceId: props.datasourceId, pluginName: plugin?.name || "", templateCommand: template?.title, - isWalkthroughOpened, }); - if (isWalkthroughOpened) { - popFeature && popFeature("SCHEMA_QUERY_UPDATE"); - setFeatureWalkthroughShown(FEATURE_WALKTHROUGH_KEYS.ds_schema, true); - } - showUndoRedoToast( currentAction.name, false, diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyControlsGenerator.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyControlsGenerator.tsx index 13260cf4bcb3..ad0dd01354b4 100644 --- a/app/client/src/pages/Editor/PropertyPane/PropertyControlsGenerator.tsx +++ b/app/client/src/pages/Editor/PropertyPane/PropertyControlsGenerator.tsx @@ -19,6 +19,7 @@ import { getWidgetEnhancementSelector } from "selectors/widgetEnhancementSelecto import equal from "fast-deep-equal/es6"; import { FEATURE_FLAG } from "ee/entities/FeatureFlag"; import { useFeatureFlag } from "utils/hooks/useFeatureFlag"; +import { isAirgapped } from "ee/utils/airgapHelpers"; export interface PropertyControlsGeneratorProps { id: string; @@ -103,10 +104,14 @@ function PropertyControlsGenerator(props: PropertyControlsGeneratorProps) { // eslint-disable-next-line @typescript-eslint/no-explicit-any const widgetProps: any = useSelector(getWidgetPropsForPropertyPane); - const isCollapseAllExceptDataEnabled: boolean = useFeatureFlag( + const isCollapseAllExceptDataEnabledFlag: boolean = useFeatureFlag( FEATURE_FLAG.ab_learnability_discoverability_collapse_all_except_data_enabled, ); + const isCollapseAllExceptDataEnabled = isAirgapped() + ? true + : isCollapseAllExceptDataEnabledFlag; + const enhancementSelector = getWidgetEnhancementSelector( widgetProps?.widgetId, ); diff --git a/app/client/src/widgets/MultiSelectWidgetV2/widget/index.tsx b/app/client/src/widgets/MultiSelectWidgetV2/widget/index.tsx index 18f30c8e577c..d23d86e73cd8 100644 --- a/app/client/src/widgets/MultiSelectWidgetV2/widget/index.tsx +++ b/app/client/src/widgets/MultiSelectWidgetV2/widget/index.tsx @@ -179,12 +179,7 @@ class MultiSelectWidget extends BaseWidget< onFilterUpdate: queryConfig.select.run, }; - if ( - !!MultiSelectWidget.getFeatureFlag( - FEATURE_FLAG.rollout_js_enabled_one_click_binding_enabled, - ) - ) - dynamicPropertyPathList.push({ key: "sourceData" }); + dynamicPropertyPathList.push({ key: "sourceData" }); } return { diff --git a/app/client/src/widgets/SelectWidget/widget/index.tsx b/app/client/src/widgets/SelectWidget/widget/index.tsx index 4e65799a9f15..95cd41d664d3 100644 --- a/app/client/src/widgets/SelectWidget/widget/index.tsx +++ b/app/client/src/widgets/SelectWidget/widget/index.tsx @@ -161,12 +161,8 @@ class SelectWidget extends BaseWidget { serverSideFiltering: true, onFilterUpdate: queryConfig.select.run, }; - if ( - !!SelectWidget.getFeatureFlag( - FEATURE_FLAG.rollout_js_enabled_one_click_binding_enabled, - ) - ) - dynamicPropertyPathList.push({ key: "sourceData" }); + + dynamicPropertyPathList.push({ key: "sourceData" }); } return { diff --git a/app/client/src/widgets/TableWidgetV2/widget/index.tsx b/app/client/src/widgets/TableWidgetV2/widget/index.tsx index 7dfcf3be81b1..e07be46a2efb 100644 --- a/app/client/src/widgets/TableWidgetV2/widget/index.tsx +++ b/app/client/src/widgets/TableWidgetV2/widget/index.tsx @@ -138,7 +138,6 @@ import { } from "layoutSystems/common/utils/constants"; import IconSVG from "../icon.svg"; import ThumbnailSVG from "../thumbnail.svg"; -import { FEATURE_FLAG } from "ee/entities/FeatureFlag"; import { klonaRegularWithTelemetry } from "utils/helpers"; const ReactTableComponent = lazy(async () => @@ -274,12 +273,7 @@ class TableWidgetV2 extends BaseWidget { isVisibleDownload: false, }); - if ( - !!TableWidgetV2.getFeatureFlag( - FEATURE_FLAG.rollout_js_enabled_one_click_binding_enabled, - ) - ) - dynamicPropertyPathList.push({ key: "tableData" }); + dynamicPropertyPathList.push({ key: "tableData" }); } if (queryConfig.create) {