Merge branch 'main' into issues/4972-flow-hilla-react-module

vaadin · Oct 23, 2024 · 68faed0 · 68faed0
2 parents 87cb181 + 9b3e551
commit 68faed0
Show file tree

Hide file tree

Showing 12 changed files with 107 additions and 16 deletions.
diff --git a/scripts/generator/templates/template-dev-bundle-pom.xml b/scripts/generator/templates/template-dev-bundle-pom.xml
@@ -97,6 +97,7 @@
                 <configuration>
                     <excludes>
                         <exclude>**/*Fake*</exclude>
+                        <exclude>vaadin-featureflags.properties</exclude>
                     </excludes>
                 </configuration>
             </plugin>

diff --git a/scripts/generator/templates/template-hybrid-dev-bundle-pom.xml b/scripts/generator/templates/template-hybrid-dev-bundle-pom.xml
@@ -108,6 +108,7 @@
                 <configuration>
                     <excludes>
                         <exclude>**/*Fake*</exclude>
+                        <exclude>vaadin-featureflags.properties</exclude>
                     </excludes>
                 </configuration>
             </plugin>

diff --git a/scripts/generator/templates/template-release-notes.md b/scripts/generator/templates/template-release-notes.md
@@ -122,7 +122,7 @@ Vaadin Designer supports the following IDEs:
 </tr>
 <tr>
   <th>Gradle</th>
-  <td>Version 8.5 or newer</td>
+  <td>Version 8.7 or newer</td>
 </tr>
 <tr>
   <th>Application server</th>
@@ -145,7 +145,7 @@ Vaadin Flow requires Java Servlet API 6 and Java 17 or newer. It is tested on:
 </tr>
 <tr>
   <th>Spring Boot</th>
-  <td>Version 3.2 or newer
+  <td>Version 3.3 or newer
   </td>
 </tr>
 </table>

diff --git a/scripts/generator/templates/template-vaadin-platform-javadoc-pom.xml b/scripts/generator/templates/template-vaadin-platform-javadoc-pom.xml
@@ -52,6 +52,11 @@
             <artifactId>vaadin-testbench</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-testbench-junit5</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 
     <profiles>
@@ -199,6 +204,13 @@
                     <version>1.4.1</version>
                     <scope>provided</scope>
                 </dependency>
+                <!-- dependency used in ui-tests -->
+                <dependency>
+                    <groupId>com.microsoft.playwright</groupId>
+                    <artifactId>playwright</artifactId>
+                    <version>1.47.0</version>
+                    <scope>provided</scope>
+                </dependency>
             </dependencies>
             <build>
                 <plugins>

diff --git a/scripts/generator/templates/template-vaadin-spring-bom.xml b/scripts/generator/templates/template-vaadin-spring-bom.xml
@@ -429,6 +429,11 @@
                 <artifactId>vaadin-custom-field-testbench</artifactId>
                 <version>${custom.field.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.vaadin</groupId>
+                <artifactId>vaadin-dashboard-testbench</artifactId>
+                <version>${dashboard.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.vaadin</groupId>
                 <artifactId>vaadin-date-picker-testbench</artifactId>
@@ -610,6 +615,11 @@
                 <artifactId>vaadin-custom-field-flow</artifactId>
                 <version>${custom.field.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.vaadin</groupId>
+                <artifactId>vaadin-dashboard-flow</artifactId>
+                <version>${dashboard.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.vaadin</groupId>
                 <artifactId>vaadin-grid-pro-flow</artifactId>

diff --git a/vaadin-core-internal/pom.xml b/vaadin-core-internal/pom.xml
@@ -217,6 +217,11 @@
             <artifactId>vaadin-menu-bar-flow</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>collaboration-engine</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/vaadin-internal/pom.xml b/vaadin-internal/pom.xml
@@ -59,22 +59,22 @@
 
         <dependency>
             <groupId>com.vaadin</groupId>
-            <artifactId>vaadin-grid-pro-flow</artifactId>
+            <artifactId>vaadin-dashboard-flow</artifactId>
         </dependency>
 
         <dependency>
             <groupId>com.vaadin</groupId>
-            <artifactId>vaadin-map-flow</artifactId>
+            <artifactId>vaadin-grid-pro-flow</artifactId>
         </dependency>
 
         <dependency>
             <groupId>com.vaadin</groupId>
-            <artifactId>vaadin-rich-text-editor-flow</artifactId>
+            <artifactId>vaadin-map-flow</artifactId>
         </dependency>
 
         <dependency>
             <groupId>com.vaadin</groupId>
-            <artifactId>collaboration-engine</artifactId>
+            <artifactId>vaadin-rich-text-editor-flow</artifactId>
         </dependency>
 
     </dependencies>

diff --git a/vaadin-platform-hybrid-test/frontend/views/components/components-view.ts b/vaadin-platform-hybrid-test/frontend/views/components/components-view.ts
@@ -22,6 +22,9 @@ import '@vaadin/confirm-dialog';
 import '@vaadin/cookie-consent';
 import '@vaadin/crud';
 import '@vaadin/crud/src/vaadin-crud-edit-column';
+import '@vaadin/dashboard';
+import '@vaadin/dashboard/src/vaadin-dashboard-section';
+import '@vaadin/dashboard/src/vaadin-dashboard-widget';
 import '@vaadin/date-time-picker';
 import '@vaadin/date-picker';
 import '@vaadin/details';
@@ -76,6 +79,13 @@ import type {
   VirtualList,
   VirtualListItemModel,
 } from '@vaadin/virtual-list';
+import type {
+  Dashboard,
+  DashboardItemModel,
+} from '@vaadin/dashboard';
+import type {
+  DashboardWidget,
+} from '@vaadin/dashboard/vaadin-dashboard-widget';
 import { html, css, } from 'lit';
 import { customElement, query} from 'lit/decorators.js';
 import { View } from '../view';
@@ -85,6 +95,14 @@ type Person = {
   name: string;
 };
 
+type CustomWidget = {
+  title: string;
+  content: string;
+  id?: unknown;
+  colspan?: number;
+  rowspan?: number;
+};
+
 @customElement('components-view')
 export class ComponentsView extends View {
   static get styles() {
@@ -185,6 +203,21 @@ export class ComponentsView extends View {
           </vaadin-grid>
         </vaadin-crud>
 
+        <vaadin-dashboard
+          .items="${[{ title: 'Widget 1', content: 'Content 1'}, { title: 'Widget 2', content: 'Content 2'}]}"
+          .renderer="${(
+            root: HTMLElement,
+            _dashboard: Dashboard<CustomWidget>,
+            model: DashboardItemModel<CustomWidget>
+          ) => {
+              const widget: DashboardWidget = <DashboardWidget>root.firstElementChild || document.createElement('vaadin-dashboard-widget');
+              root.appendChild(widget);
+              widget.widgetTitle = model.item.title;
+              widget.textContent = model.item.content;
+          }}"
+        ></vaadin-dashboard>
+        <vaadin-dashboard-widget></vaadin-dashboard-widget>
+        <vaadin-dashboard-section></vaadin-dashboard-section>
         <vaadin-date-picker></vaadin-date-picker>
         <vaadin-date-time-picker></vaadin-date-time-picker>
         <vaadin-details>

diff --git a/vaadin-platform-test/src/main/java/com/vaadin/platform/test/ComponentsView.java b/vaadin-platform-test/src/main/java/com/vaadin/platform/test/ComponentsView.java
@@ -62,6 +62,9 @@
 import com.vaadin.flow.component.crud.CrudFilter;
 import com.vaadin.flow.component.crud.CrudGrid;
 import com.vaadin.flow.component.customfield.CustomField;
+import com.vaadin.flow.component.dashboard.Dashboard;
+import com.vaadin.flow.component.dashboard.DashboardSection;
+import com.vaadin.flow.component.dashboard.DashboardWidget;
 import com.vaadin.flow.component.datepicker.DatePicker;
 import com.vaadin.flow.component.datetimepicker.DateTimePicker;
 import com.vaadin.flow.component.details.Details;
@@ -648,6 +651,17 @@ protected void setPresentationValue(String newPresentationValue) {
         ReactRouterOutlet reactRouterOutlet = new ReactRouterOutlet();
         FieldSet fieldSet = new FieldSet();
 
+        Dashboard dashboard = new Dashboard();
+        DashboardWidget dashboardWidget = new DashboardWidget();
+        dashboardWidget.setTitle("Widget");
+        dashboardWidget.setContent(new Span("Content"));
+        dashboard.add(dashboardWidget);
+        DashboardSection dashboardSection = dashboard.addSection("Section");
+        DashboardWidget widgetInSection = new DashboardWidget();
+        widgetInSection.setTitle("Widget in Section");
+        widgetInSection.setContent(new Span("Content"));
+        dashboardSection.add(widgetInSection);
+
         // These components are flow internal classes, these lines is to make pass the ComponentUsageTest
         WebComponentUI webComponentUI;
         WebComponentWrapper webComponentWrapper;
@@ -699,6 +713,7 @@ protected void setPresentationValue(String newPresentationValue) {
         components.add(nativeLabel);
         components.add(reactRouterOutlet);
         components.add(fieldSet);
+        components.add(dashboard);
 
         layouts.add(formLayout);
         layouts.add(verticalLayout);

diff --git a/vaadin-prod-bundle/src/main/java/com/vaadin/prodbundle/EagerView.java b/vaadin-prod-bundle/src/main/java/com/vaadin/prodbundle/EagerView.java
@@ -16,6 +16,7 @@
 import com.vaadin.flow.component.cookieconsent.CookieConsent;
 import com.vaadin.flow.component.crud.Crud;
 import com.vaadin.flow.component.customfield.CustomField;
+import com.vaadin.flow.component.dashboard.Dashboard;
 import com.vaadin.flow.component.datepicker.DatePicker;
 import com.vaadin.flow.component.datetimepicker.DateTimePicker;
 import com.vaadin.flow.component.dependency.JsModule;
@@ -83,6 +84,7 @@ public class EagerView extends Div {
     public CookieConsent cookieConsent;
     public Crud<String> crud;
     public CustomField<String> customField;
+    public Dashboard dashboard;
     public DatePicker datePicker;
     public DateTimePicker dateTimePicker;
     public Details details;

diff --git a/vaadin-testbench/pom.xml b/vaadin-testbench/pom.xml
@@ -112,6 +112,11 @@
             <artifactId>vaadin-custom-field-testbench</artifactId>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-dashboard-testbench</artifactId>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>
             <artifactId>vaadin-date-picker-testbench</artifactId>

diff --git a/versions.json b/versions.json
@@ -122,10 +122,10 @@
             "npmName": "@vaadin/field-highlighter"
         },
         "flow": {
-            "javaVersion": "24.6-SNAPSHOT"
+            "javaVersion": "24.6.0.alpha1"
         },
         "flow-cdi": {
-            "javaVersion": "15.0.1"
+            "javaVersion": "15.1.0"
         },
         "flow-form-filler": {
             "javaVersion": "1.1.1"
@@ -143,7 +143,7 @@
             "npmName": "@vaadin/grid"
         },
         "hilla": {
-            "javaVersion": "24.5.0.rc1"
+            "javaVersion": "24.6.0.alpha2"
         },
         "horizontal-layout": {
             "jsVersion": "24.6.0-alpha2",
@@ -354,13 +354,13 @@
             "javaVersion": "{{version}}"
         },
         "vaadin-quarkus": {
-            "javaVersion": "2.1.0.rc1"
+            "javaVersion": "2.1.0"
         },
         "vaadin-renderer": {
             "javaVersion": "{{version}}"
         },
         "vaadin-router": {
-            "jsVersion": "2.0.0-rc4",
+            "jsVersion": "2.0.0",
             "npmName": "@vaadin/router",
             "releasenotes": true
         },
@@ -388,10 +388,10 @@
             "version": "1.0.0"
         },
         "control-center": {
-            "javaVersion": "1.0.0.rc1"
+            "javaVersion": "1.0.0"
         },
         "copilot": {
-            "javaVersion": "24.5.0.rc1"
+            "javaVersion": "24.6.0.alpha1"
         },
         "kubernetes-kit-starter": {
             "javaVersion": "2.2.2"
@@ -408,10 +408,10 @@
             "javaVersion": "2.2.3"
         },
         "ui-tests": {
-            "javaVersion": "1.0-SNAPSHOT"
+            "javaVersion": "1.0.0"
         },
         "vaadin-collaboration-engine": {
-            "javaVersion": "6.3.0.rc1"
+            "javaVersion": "6.3.0"
         }
     },
     "platform": "{{version}}",
@@ -482,6 +482,7 @@
                 "@vaadin/charts",
                 "@vaadin/cookie-consent",
                 "@vaadin/crud",
+                "@vaadin/dashboard",
                 "@vaadin/grid-pro",
                 "@vaadin/map",
                 "@vaadin/rich-text-editor"
@@ -519,6 +520,12 @@
             "mode": "lit",
             "npmName": "@vaadin/crud"
         },
+        "dashboard": {
+            "javaVersion": "{{version}}",
+            "jsVersion": "24.6.0-alpha2",
+            "mode": "lit",
+            "npmName": "@vaadin/dashboard"
+        },
         "grid-pro": {
             "javaVersion": "{{version}}",
             "jsVersion": "24.6.0-alpha2",
@@ -548,7 +555,7 @@
             "pro": true
         },
         "vaadin-feature-pack": {
-            "javaVersion": "24.5.0.rc1"
+            "javaVersion": "24.5.0"
         },
         "vaadin-license-checker": {
             "javaVersion": "1.13.0"