update to domino-ui 2.0.0-RC3

DominoKit · Sep 11, 2023 · 0bc786b · 0bc786b
1 parent 5039bbc
commit 0bc786b
Show file tree

Hide file tree

Showing 12 changed files with 358 additions and 441 deletions.
diff --git a/.github/workflows/publish-app.yaml b/.github/workflows/publish-app.yaml
@@ -18,11 +18,11 @@ name: Publish-app
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master , version-2 ]
 
 jobs:
   publish-app:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
         java-version: [ 11 ]
@@ -38,7 +38,7 @@ jobs:
         uses: garygrossgarten/github-action-scp@release
         with:
           local: ui-demo-backend/target/ui-demo-backend-HEAD-SNAPSHOT-fat.jar
-          remote: ../home/ubuntu/apps/domino-ui-demo/ui-demo-backend-HEAD-SNAPSHOT-fat.jar
+          remote: ../home/ubuntu/apps/domino-ui-demo2/ui-demo-backend-HEAD-SNAPSHOT-fat.jar
           host: ${{ secrets.DEMO_HOST }}
           username: ${{ secrets.DEMO_SSH_USER }}
           password: ${{ secrets.DEMO_SSH_PASSWORD }}
@@ -48,11 +48,11 @@ jobs:
           host: ${{ secrets.DEMO_HOST }}
           username: ${{ secrets.DEMO_SSH_USER }}
           password: ${{ secrets.DEMO_SSH_PASSWORD }}
-          script: sudo systemctl stop demo
+          script: sudo systemctl stop demo2
       - name: Starting demo app
         uses: appleboy/ssh-action@master
         with:
           host: ${{ secrets.DEMO_HOST }}
           username: ${{ secrets.DEMO_SSH_USER }}
           password: ${{ secrets.DEMO_SSH_PASSWORD }}
-          script: sudo systemctl start demo
+          script: sudo systemctl start demo2
diff --git a/...ation/src/main/java/org/dominokit/domino/animation/client/views/ui/AnimationViewImpl.java b/...ation/src/main/java/org/dominokit/domino/animation/client/views/ui/AnimationViewImpl.java
diff --git a/...table/src/main/java/org/dominokit/domino/datatable/client/views/model/TreeGridSample.java b/...table/src/main/java/org/dominokit/domino/datatable/client/views/model/TreeGridSample.java
diff --git a/...src/main/java/org/dominokit/domino/datatable/client/views/ui/HeaderBarPluginViewImpl.java b/...src/main/java/org/dominokit/domino/datatable/client/views/ui/HeaderBarPluginViewImpl.java
@@ -93,10 +93,8 @@ private void tableHeaderBarPlugin() {
                                         .addCss(dui_green, dui_float_none).element();
                             }
                             return text("");
-                        }));
-
-        tableConfig.addPlugin(new SelectionPlugin<>());
-        tableConfig
+                        }))
+                .addPlugin(new SelectionPlugin<>())
                 .addPlugin(new HeaderBarPlugin<Contact>("Demo table", "this a sample table with all features")
                         .addActionElement(dataTable -> Icons.close_circle()
                                 .clickable()

diff --git a/...ker/src/main/java/org/dominokit/domino/datepicker/client/views/ui/DatePickerViewImpl.java b/...ker/src/main/java/org/dominokit/domino/datepicker/client/views/ui/DatePickerViewImpl.java
@@ -195,18 +195,16 @@ private void dropdownCalendar() {
 
     @SampleMethod
     private void dateBox() {
-        DateBox aDefault = DateBox.create("myDateBox")
-                .setReadOnly(true)
-                .setPattern("dd.MM.yyyy")
-                .setParseStrict(true)
-                .withPopover((parent, popover) -> popover.addCss(dui_accent_blue));
         ;
         element
-                .appendChild(Button.create("clear").addClickListener(evt -> aDefault.clear()))
                 .appendChild(Card.create("DATE BOX")
                         .setCollapsible(true)
                         .appendChild(Row.create()
-                                .span4(aDefault)
+                                .span4(DateBox.create("myDateBox")
+                                        .setReadOnly(true)
+                                        .setPattern("dd.MM.yyyy")
+                                        .setParseStrict(true)
+                                        .withPopover((parent, popover) -> popover.addCss(dui_accent_blue)))
                                 .span4(DateBox.create("With pattern", new DateTimeFormatInfoImpl_ar())
                                         .setPattern("dd-MM-yyyy")
                                         .withPopover((parent, popover) -> popover.addCss(dui_accent_blue))

diff --git a/.../java/org/dominokit/domino/formsvalidations/client/views/ui/FormsValidationsViewImpl.java b/.../java/org/dominokit/domino/formsvalidations/client/views/ui/FormsValidationsViewImpl.java
@@ -135,10 +135,11 @@ private void initIcons() {
 
     @SampleMethod
     private void initWordCount() {
-        countsCard.appendChild(TextBox.create("Name")
-                .setMaxLength(10)
-        );
-        countsCard.appendChild(TextAreaBox.create("Description").setMaxLength(100));
+        countsCard
+                .appendChild(TextBox.create("Name")
+                        .setMaxLength(10)
+                )
+                .appendChild(TextAreaBox.create("Description").setMaxLength(100));
     }
 
     @SampleMethod

diff --git a/media/src/main/java/org/dominokit/domino/media/client/views/ui/MediaViewImpl.java b/media/src/main/java/org/dominokit/domino/media/client/views/ui/MediaViewImpl.java
@@ -10,6 +10,7 @@
 import org.dominokit.domino.media.client.presenters.MediaProxy;
 import org.dominokit.domino.media.client.views.MediaView;
 import org.dominokit.domino.ui.cards.Card;
+import org.dominokit.domino.ui.elements.DivElement;
 import org.dominokit.domino.ui.media.MediaObject;
 import org.dominokit.domino.ui.typography.BlockHeader;
 
@@ -18,22 +19,22 @@
 public class MediaViewImpl extends BaseDemoView<HTMLDivElement> implements MediaView {
 
     private static final String SAMPLE_TEXT = "Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus.";
-    private HTMLDivElement element;
+    private DivElement element;
 
     @Override
     protected HTMLDivElement init() {
-        element = div().element();
+        element = div();
 
-        element.appendChild(LinkToSourceCode.createLink("media", this.getClass()).element());
-        element.appendChild(BlockHeader.create("MEDIA OBJECT").element());
+        element.appendChild(LinkToSourceCode.createLink("media", this.getClass()));
+        element.appendChild(BlockHeader.create("MEDIA OBJECT"));
 
         defaultMedia();
-        element.appendChild(CodeCard.createCodeCard(CodeResource.INSTANCE.defaultMedia()).element());
+        element.appendChild(CodeCard.createCodeCard(CodeResource.INSTANCE.defaultMedia()));
 
         mediaAlignment();
-        element.appendChild(CodeCard.createCodeCard(CodeResource.INSTANCE.mediaAlignment()).element());
+        element.appendChild(CodeCard.createCodeCard(CodeResource.INSTANCE.mediaAlignment()));
 
-        return element;
+        return element.element();
     }
 
     @SampleMethod
@@ -72,7 +73,7 @@ private void defaultMedia() {
                                 .appendChild(img("http://placehold.it/64x64")
                                         .addCss(dui_w_16, dui_h_16)))
                         .appendChild(text(SAMPLE_TEXT)))
-                .element());
+                );
 
     }
 
@@ -103,7 +104,7 @@ private void mediaAlignment() {
                         .withLeftMedia((parent, leftMedia) -> leftMedia.addCss(dui_self_end))
                         .appendChild(p(SAMPLE_TEXT))
                         .appendChild(p(SAMPLE_TEXT)))
-                .element());
+                );
 
     }
 }
diff --git a/menu/src/main/java/org/dominokit/domino/menu/client/views/ui/MenuViewImpl.java b/menu/src/main/java/org/dominokit/domino/menu/client/views/ui/MenuViewImpl.java
@@ -607,7 +607,7 @@ private void embedIntoElements() {
                                 .appendChild(Column
                                         .span4()
                                         .appendChild(BlockHeader.create("Embed menu", "Embed menu with borders"))
-                                        .appendChild(Accordion.create().addCss(dui_accent, dui_ignore_bg, dui_ignore_fg)
+                                        .appendChild(Accordion.create().addCss(dui_accent, dui_ignore_bg)
                                                 .setMultiOpen(true)
                                                 .appendChild(AccordionPanel.create("Collapsible item 1")
                                                         .expand()

diff --git a/modals/src/main/java/org/dominokit/domino/modals/client/views/ui/ModalsViewImpl.java b/modals/src/main/java/org/dominokit/domino/modals/client/views/ui/ModalsViewImpl.java
@@ -35,7 +35,7 @@
 @SampleClass
 public class ModalsViewImpl extends BaseDemoView<HTMLDivElement> implements ModalsView {
 
-    private static final String SAMPLE_CONTENT = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin sodales orci ante, sed ornare eros vestibulum ut. Ut accumsan vitae eros sit amet tristique. Nullam scelerisque nunc enim, non dignissim nibh faucibus ullamcorper. Fusce pulvinar libero vel ligula iaculis ullamcorper. Integer dapibus, mi ac tempor varius, purus nibh mattis erat, vitae porta nunc nisi non tellus. Vivamus mollis ante non massa egestas fringilla. Vestibulum egestas consectetur nunc at ultricies. Morbi quis consectetur nunc.";
+    private static final String SAMPLE_CONTENT = " Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin sodales orci ante, sed ornare eros vestibulum ut. Ut accumsan vitae eros sit amet tristique. Nullam scelerisque nunc enim, non dignissim nibh faucibus ullamcorper. Fusce pulvinar libero vel ligula iaculis ullamcorper. Integer dapibus, mi ac tempor varius, purus nibh mattis erat, vitae porta nunc nisi non tellus. Vivamus mollis ante non massa egestas fringilla. Vestibulum egestas consectetur nunc at ultricies. Morbi quis consectetur nunc. ";
     private DivElement element;
 
     @Override
@@ -65,13 +65,8 @@ private void initModalsSize() {
 
         // ------------ Default size -------------
 
-        Dialog defaultSizeDialog = Dialog.create();
-
-        Loader loader   = Loader.create(defaultSizeDialog.getModalElement(),
-                        LoaderEffect.BOUNCE)
-                .setLoadingText("workInProgress");
-
-        defaultSizeDialog.withHeader((dialog, header) ->
+        Dialog defaultSizeDialog = Dialog.create()
+                .withHeader((dialog, header) ->
                         header.appendChild(NavBar.create("DEFAULT SIZE")
                                 .addCss(dui_h_8, dui_p_0)
                                 .appendChild(PrefixAddOn.of(Icons.dots_vertical()
@@ -102,11 +97,7 @@ private void initModalsSize() {
                             .appendChild(FooterContent.of(Button.create("CLOSE")
                                     .addClickListener(evt -> dialog.close()))
                             )
-                            .appendChild(FooterContent.of(Button.create(Icons.cursor_default_click(), "CLICK ME")
-                                    .addClickListener(evt -> {
-                                        loader.start();
-                                    })
-                            ));
+                            .appendChild(FooterContent.of(Button.create(Icons.cursor_default_click(), "CLICK ME")));
                 });
 
         Dialog largeSizeDialog = Dialog.create()
@@ -419,7 +410,7 @@ private void initModalColor() {
                     footer.addCss(dui_flex, dui_gap_1, dui_justify_end, dui_bg_d_2);
                     dialog
                             .appendChild(FooterContent.of(Button.create("CLOSE")
-                                            .addCss(dui_bg)
+                                    .addCss(dui_bg)
                                     .addClickListener(evt -> dialog.close()))
                             )
                             .appendChild(FooterContent.of(Button.create(Icons.cursor_default_click(), "CLICK ME")

diff --git a/pom.xml b/pom.xml
@@ -79,13 +79,13 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <vertx.version>3.9.0</vertx.version>
+        <vertx.version>3.9.4</vertx.version>
         <elemento.version>1.0.3</elemento.version>
         <elemental2.version>1.1.0</elemental2.version>
-        <domino.jackson.version>HEAD-SNAPSHOT</domino.jackson.version>
-        <domino.history.version>HEAD-SNAPSHOT</domino.history.version>
-        <domino.ui.version>HEAD-SNAPSHOT</domino.ui.version>
-        <domino.mvp.version>HEAD-SNAPSHOT</domino.mvp.version>
+        <domino.jackson.version>1.0.0</domino.jackson.version>
+        <domino.history.version>1.0.0</domino.history.version>
+        <domino.ui.version>2.0.0-RC3</domino.ui.version>
+        <domino.mvp.version>2.0.0-RC2</domino.mvp.version>
     </properties>
 
     <repositories>

diff --git a/...phy/src/main/java/org/dominokit/domino/typography/client/views/ui/TypographyViewImpl.java b/...phy/src/main/java/org/dominokit/domino/typography/client/views/ui/TypographyViewImpl.java
@@ -166,7 +166,8 @@ private void textStyles() {
                                 .appendChild(p("Text orange color").addCss(dui_overline, dui_fg_orange))
                                 .appendChild(p("Text blue grey color").addCss(dui_overline, dui_fg_blue_grey))
                         )
-                ));
+                )
+        );
     }
 
     @SampleMethod
@@ -187,14 +188,16 @@ private void blockqoute() {
                                     .appendChild(cite().textContent("source title. "))
                                     .appendChild(text("Someone famous in"));
                         })
-                ));
+                )
+        );
 
 
     }
 
     @SampleMethod
     private void lists() {
-        element.appendChild(Row.create()
+        element
+                .appendChild(Row.create()
                 .appendChild(Column.span4()
                         .appendChild(Card.create("UNORDERED LIST")
                                 .setCollapsible(true)

diff --git a/waves/src/main/java/org/dominokit/domino/waves/client/views/ui/WavesViewImpl.java b/waves/src/main/java/org/dominokit/domino/waves/client/views/ui/WavesViewImpl.java
@@ -77,7 +77,8 @@ protected HTMLDivElement init() {
 
     @SampleMethod
     private void waves() {
-        element.appendChild(Row.create()
+        element
+                .appendChild(Row.create()
                 .appendChild(Column.span6()
                         .appendChild(Card.create("COLOR VARIATIONS")
                                 .appendChild(ListGroup.<IsElement<?>>create()