diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/public/workflow-designer.html b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/public/workflow-designer.html index 840fc5ffc..e5f3ceea3 100644 --- a/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/public/workflow-designer.html +++ b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/public/workflow-designer.html @@ -291,50 +291,16 @@
- -
-
-
- - Privacy - -
-
-
- -
-
- - -
-
- -

- Everyone with the link will see this project -

-
-
- -
-
- - -
-
- -

- Only members of this project would be able to access -

-
-
- -
-
- - -
-
- -

- You are the only one able to access this project -

-
-
+
+

Primitives

+
+ + + + - -
-
- - - - - - -
-
@@ -1453,7 +1317,12 @@ jsPlumbInstance.batch(function () { jsPlumbInstance.connect({ - source: "activity-1", + source: "start-button", + target: "start-button-plus" + }); + + jsPlumbInstance.connect({ + source: "start-button-plus", target: "activity-2" }); diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/src/partials/flyoutpanel.html b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/src/partials/flyoutpanel.html index a83a47cdf..c173e30cc 100644 --- a/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/src/partials/flyoutpanel.html +++ b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/src/partials/flyoutpanel.html @@ -1,22 +1,22 @@ -
+
-
-
+
+
-
+
-
-

- New project -

-

- Get started by filling in the information below to create your new project. -

-
+

+ Activities +

-
- -
- -
-
- -
-
-
- -
+
+
+
+ + + + +
+
+
- -
-
- -
-
-
- -
-
+
+
+
+
- -
-
-

- Team Members -

-
-
-
+
- - Tom Warner - +
+

Primitives

- - Tom Warner - - - - Tom Warner - - - - Tom Warner - - - - Tom Warner - - - - -
-
+
+
+
+ + Timer + +

Trigger the workflow at the specified time interval.

+
+
+ + +
- -
-
-
- - Privacy - -
-
-
- -
-
- - -
-
- -

- Everyone with the link will see this project -

-
-
- -
-
- - -
-
- -

- Only members of this project would be able to access -

-
-
- -
-
- - -
-
- -

- You are the only one able to access this project -

-
-
+
+

Primitives

+
+ + + +
- -
-
- - - - - - -
-
diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/src/workflow-designer.html b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/src/workflow-designer.html index f341baa39..0a58d4c0b 100644 --- a/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/src/workflow-designer.html +++ b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/src/workflow-designer.html @@ -1,4 +1,6 @@ - +
@@ -9,7 +11,8 @@
- @@ -24,13 +27,27 @@
  • - +
    + +
    + + + +
    +
    • - +
      • - +
        • @@ -38,36 +55,47 @@
          • - +
            • - +
              • -
                - No +
                + No
                • - +
              • -
                - Yes +
                + Yes
                • - +
                  • -
                    - Yes +
                    + Yes
                    • - +
                  • @@ -87,29 +115,38 @@
                • - +
                  • - +
                    • -
                      - No +
                      + No
                      • - +
                        • -
                          - Yes +
                          + Yes
                          • - +
                            • - +
                          • @@ -120,34 +157,45 @@
                        • -
                          - Yes +
                          + Yes
                          • - +
                            • -
                              - Yes +
                              + Yes
                              • - +
                                • -
                                  - + +
                                  + +
                                  • - +
                                    • - +
                                      • - +
                                    • @@ -202,7 +250,12 @@ jsPlumbInstance.batch(function () { jsPlumbInstance.connect({ - source: "activity-1", + source: "start-button", + target: "start-button-plus" + }); + + jsPlumbInstance.connect({ + source: "start-button-plus", target: "activity-2" }); diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Application/Pages/Designer/Designer.razor b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/Pages/Designer/Designer.razor index 65119946f..7ab3cb2a4 100644 --- a/src/dashboards/blazor/ElsaDashboard.Blazor/Application/Pages/Designer/Designer.razor +++ b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/Pages/Designer/Designer.razor @@ -23,13 +23,26 @@
                                      • - +
                                        + +
                                        + + + +
                                        +
                                        • - +
                                          • - +
                                            • @@ -37,10 +50,10 @@
                                              • - +
                                                • - +
                                                  • @@ -48,7 +61,7 @@
                                                    • - +
                                                  • @@ -58,7 +71,7 @@
                                      • - +
                                        • @@ -66,7 +79,7 @@
                                          • - +
                                        • @@ -86,7 +99,7 @@
                                  • - +
                                    • @@ -97,7 +110,7 @@
                              • - +
                                • @@ -105,10 +118,10 @@
                                  • - +
                                    • - +
                                  • @@ -124,7 +137,7 @@
                          • - +
                            • @@ -132,7 +145,7 @@
                              • - +
                                • @@ -140,13 +153,13 @@
                                  • - +
                                    • - +
                                      • - +
                                    • diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Application/Pages/Designer/Designer.razor.cs b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/Pages/Designer/Designer.razor.cs index 7179700f8..d090bfe80 100644 --- a/src/dashboards/blazor/ElsaDashboard.Blazor/Application/Pages/Designer/Designer.razor.cs +++ b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/Pages/Designer/Designer.razor.cs @@ -16,7 +16,7 @@ namespace ElsaDashboard.Blazor.Application.Pages.Designer { if (firstRender) { - _designerModule = await JS.InvokeAsync("import", "./_content/ElsaDashboard.Blazor.Shared/workflowDesigner.js"); + _designerModule = await JS.InvokeAsync("import", "./_content/ElsaDashboard.Blazor.Application/workflowDesigner.js"); } } @@ -26,6 +26,11 @@ namespace ElsaDashboard.Blazor.Application.Pages.Designer await _designerModule.DisposeAsync(); } + private async ValueTask OnStartClick(MouseEventArgs e) + { + await FlyoutPanelService.ShowAsync(); + } + private async ValueTask OnActivityClick(MouseEventArgs e) { await FlyoutPanelService.ShowAsync(); diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Application/Shared/FlyoutPanel.razor b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/Shared/FlyoutPanel.razor index b47e1b1f7..a09780a6b 100644 --- a/src/dashboards/blazor/ElsaDashboard.Blazor/Application/Shared/FlyoutPanel.razor +++ b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/Shared/FlyoutPanel.razor @@ -1,201 +1,107 @@ 
                                      -
                                      +
                                      -
                                      +
                                      -
                                      -

                                      - New project -

                                      -

                                      - Get started by filling in the information below to create your new project. -

                                      -
                                      +

                                      + Activities +

                                      -
                                      - -
                                      - -
                                      -
                                      - -
                                      -
                                      -
                                      - -
                                      +
                                      +
                                      +
                                      + + + + +
                                      +
                                      +
                                      - -
                                      -
                                      - -
                                      -
                                      -
                                      - -
                                      -
                                      + - -
                                      +
                                      + + @for (var category = 0; category < 3; category++) + {
                                      -

                                      - Team Members -

                                      -
                                      -
                                      -
                                      +

                                      Primitives

                                      - - Tom Warner - - - - Tom Warner - - - - Tom Warner - - - - Tom Warner - - - - Tom Warner - - - - -
                                      -
                                      -
                                      - - -
                                      -
                                      -
                                      - - Privacy - -
                                      -
                                      -
                                      - -
                                      -
                                      - - -
                                      -
                                      - -

                                      - Everyone with the link will see this project -

                                      -
                                      -
                                      - -
                                      -
                                      - - -
                                      -
                                      - -

                                      - Only members of this project would be able to access -

                                      -
                                      -
                                      - -
                                      -
                                      - - -
                                      -
                                      - -

                                      - You are the only one able to access this project -

                                      -
                                      -
                                      - -
                                      -
                                      - +
                                      +
                                      +
                                      + + Timer + +

                                      + Trigger the workflow at the specified time + interval. +

                                      +
                                      +
                                      + + } +
                      - + }
- -
-
- - - - - - -
-