feat: remove feature flag from tests and FeatureFlag.ts

Namatek · Oct 28, 2024 · d225470 · d225470
1 parent 0456914
commit d225470
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 24 deletions.
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter1_1_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter1_1_Spec.ts
@@ -1,14 +1,13 @@
 import { demoTableDataForSelect } from "../../../../../fixtures/Table/DemoTableData";
-import { featureFlagIntercept } from "../../../../../support/Objects/FeatureFlags";
 import {
+  agHelper,
+  assertHelper,
+  deployMode,
+  draggableWidgets,
   entityExplorer,
+  locators,
   propPane,
-  deployMode,
   table,
-  assertHelper,
-  locators,
-  draggableWidgets,
-  agHelper,
 } from "../../../../../support/Objects/ObjectsCore";
 import EditorNavigation, {
   EntityType,
@@ -145,9 +144,6 @@ describe(
 
     it("11. Verify table search includes label and value for table with select column type", () => {
       deployMode.NavigateBacktoEditor();
-      // This flag is turned on to allow the label show in the table select cell content
-      // when this feature is turned on fully, this flag will be removed
-      featureFlagIntercept({ release_table_cell_label_value_enabled: true });
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
       propPane.EnterJSContext("Table data", demoTableDataForSelect);
 
@@ -178,7 +174,6 @@ describe(
     });
 
     it("12. Verify table filter for select column type", function () {
-      featureFlagIntercept({ release_table_cell_label_value_enabled: true });
       table.OpenNFilterTable("role", "is exactly", "Product Manager");
       table.ReadTableRowColumnData(0, 2, "v2").then(($cellData) => {
         expect($cellData).to.eq("Product Manager");

diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Sorting_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Sorting_spec.js
@@ -1,8 +1,7 @@
-import { featureFlagIntercept } from "../../../../../support/Objects/FeatureFlags";
 import * as _ from "../../../../../support/Objects/ObjectsCore";
+import PageList from "../../../../../support/Pages/PageList";
 const testdata = require("../../../../../fixtures/testdata.json");
 const commonlocators = require("../../../../../locators/commonlocators.json");
-import PageList from "../../../../../support/Pages/PageList";
 
 const demoTableData = `
 {{
@@ -117,9 +116,6 @@ describe(
     });
 
     it("2. Verifies that default sorting works for a select column using the value property", function () {
-      // This flag is turned on to allow the label show in the table select cell content
-      // when this feature is turned on fully, this flag will be removed
-      featureFlagIntercept({ release_table_cell_label_value_enabled: true });
       cy.dragAndDropToCanvas("tablewidgetv2", { x: 350, y: 500 });
       _.propPane.EnterJSContext("Table data", demoTableData);
 
@@ -169,9 +165,6 @@ describe(
     });
 
     it("3. Verifies that sorting works for the select column type when sortBy is set to label", function () {
-      // This flag is turned on to allow the label show in the table select cell content
-      // when this feature is turned on fully, this flag will be removed
-      featureFlagIntercept({ release_table_cell_label_value_enabled: true });
       cy.dragAndDropToCanvas("tablewidgetv2", { x: 350, y: 500 });
       _.propPane.EnterJSContext("Table data", demoTableData);
 

diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/Select1_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/Select1_spec.ts
@@ -1,11 +1,10 @@
+import * as _ from "../../../../../../support/Objects/ObjectsCore";
 import {
   PageLeftPane,
   PagePaneSegment,
 } from "../../../../../../support/Pages/EditorNavigation";
 
 const commonlocators = require("../../../../../../locators/commonlocators.json");
-import * as _ from "../../../../../../support/Objects/ObjectsCore";
-import { featureFlagIntercept } from "../../../../../../support/Objects/FeatureFlags";
 
 describe(
   "Table widget - Select column type functionality",
@@ -206,7 +205,6 @@ describe(
 
     it("7. should check that on option select is working", () => {
       _.agHelper.CheckForPageSaveError();
-      featureFlagIntercept({ release_table_cell_label_value_enabled: true });
       cy.openPropertyPane("tablewidgetv2");
       cy.editColumn("step");
       cy.get(".t--property-control-onoptionchange .t--js-toggle").click();

diff --git a/app/client/src/ce/entities/FeatureFlag.ts b/app/client/src/ce/entities/FeatureFlag.ts
@@ -32,8 +32,6 @@ export const FEATURE_FLAG = {
     "rollout_remove_feature_walkthrough_enabled",
   release_drag_drop_building_blocks_enabled:
     "release_drag_drop_building_blocks_enabled",
-  release_table_cell_label_value_enabled:
-    "release_table_cell_label_value_enabled",
   rollout_side_by_side_enabled: "rollout_side_by_side_enabled",
   release_layout_conversion_enabled: "release_layout_conversion_enabled",
   release_anvil_toggle_enabled: "release_anvil_toggle_enabled",
@@ -63,7 +61,6 @@ export const DEFAULT_FEATURE_FLAG_VALUE: FeatureFlags = {
   license_gac_enabled: false,
   release_anvil_enabled: false,
   release_drag_drop_building_blocks_enabled: false,
-  release_table_cell_label_value_enabled: false,
   license_git_branch_protection_enabled: false,
   license_git_continuous_delivery_enabled: false,
   license_widget_rtl_support_enabled: false,