chore: remove card/dashboard feature flag (#7512) (#7514)

* chore: remove dashboard feature flag

* chore: remove card feature flag (#7503)

Co-authored-by: Sascha Ißbrücker <sissbruecker@vaadin.com>

Author: vaadin-bot

vaadin-card-flow-parent/vaadin-card-flow-integration-tests/src/main/resources/vaadin-featureflags.properties

@@ -24,14 +24,11 @@
 
 import org.slf4j.LoggerFactory;
 
-import com.vaadin.experimental.FeatureFlags;
-import com.vaadin.flow.component.AttachEvent;
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.HasAriaLabel;
 import com.vaadin.flow.component.HasComponents;
 import com.vaadin.flow.component.HasSize;
 import com.vaadin.flow.component.Tag;
-import com.vaadin.flow.component.UI;
 import com.vaadin.flow.component.dependency.JsModule;
 import com.vaadin.flow.component.dependency.NpmPackage;
 import com.vaadin.flow.component.shared.HasThemeVariant;
@@ -64,8 +61,6 @@ public class Card extends Component implements HasSize,
 
     private Element contentRoot;
 
-    private boolean featureFlagEnabled;
-
     /**
      * Sets the component used as the card's media. The media slot is typically
      * used to display an image, icon, or other visual element.
@@ -394,47 +389,6 @@ public Optional<String> getAriaRole() {
         return Optional.ofNullable(getElement().getAttribute("role"));
     }
 
-    @Override
-    protected void onAttach(AttachEvent attachEvent) {
-        super.onAttach(attachEvent);
-        checkFeatureFlag();
-    }
-
-    /**
-     * Gets the feature flags for the current UI.
-     * <p>
-     * Not private in order to support mocking
-     *
-     * @return the current set of feature flags
-     */
-    FeatureFlags getFeatureFlags() {
-        return FeatureFlags
-                .get(UI.getCurrent().getSession().getService().getContext());
-    }
-
-    /**
-     * Only for test use.
-     */
-    void setFeatureFlagEnabled() {
-        featureFlagEnabled = true;
-    }
-
-    /**
-     * Checks whether the Card component feature flag is active. Succeeds if the
-     * flag is enabled, and throws otherwise.
-     *
-     * @throws ExperimentalFeatureException
-     *             when the {@link FeatureFlags#CARD_COMPONENT} feature is not
-     *             enabled
-     */
-    private void checkFeatureFlag() {
-        boolean enabled = featureFlagEnabled
-                || getFeatureFlags().isEnabled(FeatureFlags.CARD_COMPONENT);
-        if (!enabled) {
-            throw new ExperimentalFeatureException();
-        }
-    }
-
     private void initContentRoot() {
         contentRoot = new Element("div");
         contentRoot.getStyle().set("display", "contents");

vaadin-card-flow-parent/vaadin-card-flow/src/main/java/com/vaadin/flow/component/card/Card.java

@@ -44,7 +44,6 @@ public void setup() {
         var ui = new UI();
         UI.setCurrent(ui);
         card = new Card();
-        card.setFeatureFlagEnabled();
         ui.add(card);
     }
 

vaadin-card-flow-parent/vaadin-card-flow/src/main/java/com/vaadin/flow/component/card/ExperimentalFeatureException.java

@@ -22,13 +22,11 @@
 
 import org.slf4j.LoggerFactory;
 
-import com.vaadin.experimental.FeatureFlags;
 import com.vaadin.flow.component.AttachEvent;
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.ComponentEventListener;
 import com.vaadin.flow.component.HasSize;
 import com.vaadin.flow.component.Tag;
-import com.vaadin.flow.component.UI;
 import com.vaadin.flow.component.dependency.JsModule;
 import com.vaadin.flow.component.dependency.NpmPackage;
 import com.vaadin.flow.component.shared.HasThemeVariant;
@@ -77,8 +75,6 @@ public class Dashboard extends Component
 
     private boolean pendingUpdate = false;
 
-    private boolean featureFlagEnabled;
-
     /**
      * Creates an empty dashboard.
      */
@@ -548,7 +544,6 @@ public void setRootHeadingLevel(Integer rootHeadingLevel) {
     @Override
     protected void onAttach(AttachEvent attachEvent) {
         super.onAttach(attachEvent);
-        checkFeatureFlag();
         getElement().executeJs(
                 "Vaadin.FlowComponentHost.patchVirtualContainer(this);");
         customizeItemMovedEvent();
@@ -834,41 +829,6 @@ private static JsonArray getSectionItems(JsonArray items,
         return null;
     }
 
-    /**
-     * Checks whether the Dashboard component feature flag is active. Succeeds
-     * if the flag is enabled, and throws otherwise.
-     *
-     * @throws ExperimentalFeatureException
-     *             when the {@link FeatureFlags#DASHBOARD_COMPONENT} feature is
-     *             not enabled
-     */
-    private void checkFeatureFlag() {
-        boolean enabled = featureFlagEnabled || getFeatureFlags()
-                .isEnabled(FeatureFlags.DASHBOARD_COMPONENT);
-        if (!enabled) {
-            throw new ExperimentalFeatureException();
-        }
-    }
-
-    /**
-     * Gets the feature flags for the current UI.
-     * <p>
-     * Not private in order to support mocking
-     *
-     * @return the current set of feature flags
-     */
-    FeatureFlags getFeatureFlags() {
-        return FeatureFlags
-                .get(UI.getCurrent().getSession().getService().getContext());
-    }
-
-    /**
-     * Only for test use.
-     */
-    void setFeatureFlagEnabled(boolean featureFlagEnabled) {
-        this.featureFlagEnabled = featureFlagEnabled;
-    }
-
     /**
      * The internationalization properties for {@link Dashboard}.
      */

vaadin-card-flow-parent/vaadin-card-flow/src/test/java/com/vaadin/flow/component/card/CardTest.java

@@ -8,11 +8,8 @@
  */
 package com.vaadin.flow.component.dashboard;
 
-import com.vaadin.experimental.FeatureFlags;
-import com.vaadin.flow.component.AttachEvent;
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.Tag;
-import com.vaadin.flow.component.UI;
 import com.vaadin.flow.component.dependency.JsModule;
 import com.vaadin.flow.component.dependency.NpmPackage;
 import com.vaadin.flow.component.shared.SlotUtils;
@@ -37,8 +34,6 @@ public class DashboardWidget extends Component {
 
     private int rowspan = 1;
 
-    private boolean featureFlagEnabled;
-
     /**
      * Creates an empty widget.
      */
@@ -226,12 +221,6 @@ public boolean isVisible() {
         return true;
     }
 
-    @Override
-    protected void onAttach(AttachEvent attachEvent) {
-        super.onAttach(attachEvent);
-        checkFeatureFlag();
-    }
-
     private void notifyParentDashboardOrSection() {
         getParent().ifPresent(parent -> {
             if (parent instanceof Dashboard dashboard) {
@@ -241,39 +230,4 @@ private void notifyParentDashboardOrSection() {
             }
         });
     }
-
-    /**
-     * Checks whether the Dashboard component feature flag is active. Succeeds
-     * if the flag is enabled, and throws otherwise.
-     *
-     * @throws ExperimentalFeatureException
-     *             when the {@link FeatureFlags#DASHBOARD_COMPONENT} feature is
-     *             not enabled
-     */
-    private void checkFeatureFlag() {
-        boolean enabled = featureFlagEnabled || getFeatureFlags()
-                .isEnabled(FeatureFlags.DASHBOARD_COMPONENT);
-        if (!enabled) {
-            throw new ExperimentalFeatureException();
-        }
-    }
-
-    /**
-     * Gets the feature flags for the current UI.
-     * <p>
-     * Not private in order to support mocking
-     *
-     * @return the current set of feature flags
-     */
-    FeatureFlags getFeatureFlags() {
-        return FeatureFlags
-                .get(UI.getCurrent().getSession().getService().getContext());
-    }
-
-    /**
-     * Only for test use.
-     */
-    void setFeatureFlagEnabled(boolean featureFlagEnabled) {
-        this.featureFlagEnabled = featureFlagEnabled;
-    }
 }

vaadin-card-flow-parent/vaadin-card-flow/src/test/java/com/vaadin/flow/component/card/FeatureFlagTest.java

@@ -35,7 +35,6 @@ public class DashboardItemMoveTest extends DashboardTestBase {
     public void setup() {
         super.setup();
         dashboard = getNewDashboard();
-        dashboard.setFeatureFlagEnabled(true);
         dashboard.add(getNewWidget(), getNewWidget());
         dashboard.setEditable(true);
         DashboardSection section = dashboard.addSection();

vaadin-dashboard-flow-parent/vaadin-dashboard-flow-integration-tests/src/main/resources/vaadin-featureflags.properties

@@ -110,14 +110,10 @@ protected static void assertSectionWidgets(DashboardSection section,
     }
 
     protected DashboardWidget getNewWidget() {
-        var widget = new DashboardWidget();
-        widget.setFeatureFlagEnabled(true);
-        return widget;
+        return new DashboardWidget();
     }
 
     protected Dashboard getNewDashboard() {
-        var dashboard = new Dashboard();
-        dashboard.setFeatureFlagEnabled(true);
-        return dashboard;
+        return new Dashboard();
     }
 }