#296 Dashboard creation dialog

dcoraboeuf · Jan 30, 2014 · 61de022 · 61de022
1 parent 6676e3a
commit 61de022
Show file tree

Hide file tree

Showing 8 changed files with 102 additions and 14 deletions.
diff --git a/ontrack-client/src/main/java/net/ontrack/client/support/DefaultManageUIClient.java b/ontrack-client/src/main/java/net/ontrack/client/support/DefaultManageUIClient.java
@@ -146,6 +146,11 @@ public ImportResult importCheck(String uuid) {
         );
     }
 
+    @Override
+    public List<BranchSummary> getBranchAll() {
+        return list(getDefaultLocale(), "/ui/manage/branch", BranchSummary.class);
+    }
+
     @Override
     public List<BranchSummary> getBranchList(String project) {
         return list(getDefaultLocale(), format("/ui/manage/project/%s/branch", project), BranchSummary.class);

diff --git a/ontrack-core/src/main/java/net/ontrack/core/ui/ManageUI.java b/ontrack-core/src/main/java/net/ontrack/core/ui/ManageUI.java
@@ -47,6 +47,8 @@ public interface ManageUI {
 
     // Branches
 
+    List<BranchSummary> getBranchAll();
+
     List<BranchSummary> getBranchList(String project);
 
     List<BranchLastStatus> getBranchLastStatusList(Locale locale, String project);

diff --git a/ontrack-web/src/main/java/net/ontrack/web/ui/ManageUIController.java b/ontrack-web/src/main/java/net/ontrack/web/ui/ManageUIController.java
@@ -255,6 +255,17 @@ ImportResult importCheck(@PathVariable String uuid) {
         return exportService.importCheck(uuid);
     }
 
+    @Override
+    @RequestMapping(value = "/ui/manage/branch", method = RequestMethod.GET)
+    @ResponseBody
+    public List<BranchSummary> getBranchAll() {
+        List<BranchSummary> branches = new ArrayList<>();
+        for (ProjectSummary project : getProjectList()) {
+            branches.addAll(managementService.getBranchList(project.getId()));
+        }
+        return branches;
+    }
+
     @Override
     @RequestMapping(value = "/ui/manage/project/{project:[A-Za-z0-9_\\.\\-]+}/validation-stamp-mgt", method = RequestMethod.POST)
     public

diff --git a/ontrack-web/src/main/resources/META-INF/strings/web.ls b/ontrack-web/src/main/resources/META-INF/strings/web.ls
@@ -1184,6 +1184,10 @@ dashboard.custom
     en -> Custom dashboard
     fr -> Dashboard personnalisé
 
+dashboard.custom.branches
+    en -> Selected branches
+    fr -> Branches sélectionnées
+
 [acl]
 
 acl

diff --git a/ontrack-web/src/main/webapp/WEB-INF/views/dashboard-custom.html b/ontrack-web/src/main/webapp/WEB-INF/views/dashboard-custom.html
@@ -2,6 +2,7 @@
 
 <@layout_std
     page="dashboard-custom"
+    style=true
     title=loc('dashboard.custom.list')
     breadcrumbs = {
         loc("home"): ""

diff --git a/ontrack-web/src/main/webapp/static/css/dashboard-custom.css b/ontrack-web/src/main/webapp/static/css/dashboard-custom.css
@@ -0,0 +1,7 @@
+.dashboard-custom-dialog-branch.dashboard-custom-branch-selected {
+    background-color: #ffff00 !important;
+}
+
+.dashboard-custom-dialog-branch {
+    cursor: pointer;
+}
diff --git a/ontrack-web/src/main/webapp/static/js/app/dashboard-custom.js b/ontrack-web/src/main/webapp/static/js/app/dashboard-custom.js
@@ -1,26 +1,65 @@
-define(['jquery','ajax','dialog','dynamic'], function ($, ajax, dialog, dynamic) {
+define(['jquery', 'ajax', 'dialog', 'dynamic'], function ($, ajax, dialog, dynamic) {
 
     // Dashboard creation
-    function createDashboard() {
-        dialog.show({
-            title: 'dashboard.custom'.loc(),
-            templateId: 'dashboard-custom-dialog',
-            submitFn: function (config) {
-                ajax.post({
-                    url: 'ui/manage/dashboard',
+    function createDashboard(btn) {
+        ajax.get({
+            url: 'ui/manage/branch',
+            loading: {
+                el: $(btn)
+            },
+            successFn: function (branches) {
+                dialog.show({
+                    title: 'dashboard.custom'.loc(),
+                    templateId: 'dashboard-custom-dialog',
                     data: {
-                        name: $('#dashboard-custom-name').val()
+                        branches: branches
                     },
-                    successFn: function () {
-                        config.closeFn();
-                        dynamic.reloadSection('dashboard-custom');
+                    initFn: function (config) {
+                        config.form.find('.dashboard-custom-dialog-branch').each(function (i, tr) {
+                            var branchId = $(tr).attr('id');
+                            // TODO Initial state
+                            // TODO Checks for authz
+                            // Selection of branches
+                            $(tr).click(function () {
+                                $(tr).data('branch-selected', !$(tr).data('branch-selected'));
+                                if ($(tr).data('branch-selected')) {
+                                    $(tr).addClass('dashboard-custom-branch-selected');
+                                } else {
+                                    $(tr).removeClass('dashboard-custom-branch-selected');
+                                }
+                            })
+                        })
                     },
-                    errorFn: ajax.simpleAjaxErrorFn(config.errorFn)
+                    submitFn: function (config) {
+                        // Selected branches
+                        var branches = [];
+                        config.form.find('.dashboard-custom-dialog-branch').each(function (i, tr) {
+                            var branchId = $(tr).attr('id');
+                            if ($(tr).data('branch-selected')) {
+                                branches.push(branchId);
+                            }
+                        });
+                        // Posting the creation
+                        ajax.post({
+                            url: 'ui/manage/dashboard',
+                            data: {
+                                name: $('#dashboard-custom-name').val(),
+                                branches: branches
+                            },
+                            successFn: function () {
+                                config.closeFn();
+                                dynamic.reloadSection('dashboard-custom');
+                            },
+                            errorFn: ajax.simpleAjaxErrorFn(config.errorFn)
+                        });
+                    }
                 });
             }
         });
     }
 
-    $('#dashboard-custom-create').click(createDashboard);
+    $('#dashboard-custom-create').click(function () {
+        createDashboard(this);
+    });
 
 });
diff --git a/ontrack-web/src/main/webapp/static/js/app/template/dashboard-custom-dialog.html b/ontrack-web/src/main/webapp/static/js/app/template/dashboard-custom-dialog.html
@@ -5,4 +5,23 @@
             <input type="text" id="dashboard-custom-name" value="" size="40" maxlength="80" required="required" />
         </div>
     </div>
+    <div class="control-group">
+        <label class="control-label">{{loc 'dashboard.custom.branches'}}</label>
+    </div>
+    <div class="control-group">
+        <table class="table table-condensed table-hover">
+            <tbody>
+                {{#branches}}
+                    <tr class="dashboard-custom-dialog-branch" id="{{id}}">
+                        <td>
+                            {{project.name}}
+                        </td>
+                        <td>
+                            {{name}}
+                        </td>
+                    </tr>
+                {{/branches}}
+            </tbody>
+        </table>
+    </div>
 </form>