From 034c46bf5b9d4ac2be3cdcab5cf2121b2bb4a41d Mon Sep 17 00:00:00 2001
From: Johannes Millan <johannes.millan@gmail.com>
Date: Sat, 4 Feb 2017 02:35:49 +0100
Subject: [PATCH] add jira config to create project dialog

---
 app/scripts/constants.js                      |   1 +
 .../create-project/create-project-c.html      |   7 +-
 .../create-project/create-project-c.js        |   3 +-
 app/scripts/main/global-services/jira-s.js    |   2 +-
 .../jira-settings/jira-settings-d.html        | 211 +++++++++---------
 5 files changed, 119 insertions(+), 105 deletions(-)

diff --git a/app/scripts/constants.js b/app/scripts/constants.js
index b3276b5de5..7e02bdafc6 100644
--- a/app/scripts/constants.js
+++ b/app/scripts/constants.js
@@ -86,6 +86,7 @@
         }
       },
       jiraSettings: {
+        isJiraEnabled: false,
         isFirstLogin: true,
         isWorklogEnabled: true,
         isAutoWorklog: false,
diff --git a/app/scripts/dialogs/create-project/create-project-c.html b/app/scripts/dialogs/create-project/create-project-c.html
index 55eba4eb3b..755f0ec85a 100644
--- a/app/scripts/dialogs/create-project/create-project-c.html
+++ b/app/scripts/dialogs/create-project/create-project-c.html
@@ -1,5 +1,5 @@
 <md-dialog aria-label="Create a new project"
-           class="was-idle-dialog">
+           class="create-project-dialog">
 
   <md-toolbar>
     <div class="md-toolbar-tools">
@@ -25,6 +25,11 @@
                  required
                  aria-label="Title">
         </md-input-container>
+
+        <jira-settings settings="vm.projectSettings.jiraSettings"
+                       ng-if="vm.IS_ELECTRON"></jira-settings>
+
+        <misc-settings settings="vm.projectSettings.config"></misc-settings>
       </div>
     </md-dialog-content>
 
diff --git a/app/scripts/dialogs/create-project/create-project-c.js b/app/scripts/dialogs/create-project/create-project-c.js
index 1c0998440a..ca1c7ccf89 100644
--- a/app/scripts/dialogs/create-project/create-project-c.js
+++ b/app/scripts/dialogs/create-project/create-project-c.js
@@ -14,8 +14,9 @@
     .controller('CreateProjectCtrl', CreateProjectCtrl);
 
   /* @ngInject */
-  function CreateProjectCtrl($mdDialog, Projects, SimpleToast) {
+  function CreateProjectCtrl($mdDialog, Projects, SimpleToast, IS_ELECTRON) {
     let vm = this;
+    vm.IS_ELECTRON = IS_ELECTRON;
     vm.task = {};
     vm.projectSettings = {};
 
diff --git a/app/scripts/main/global-services/jira-s.js b/app/scripts/main/global-services/jira-s.js
index 431c15623e..9b35ada862 100644
--- a/app/scripts/main/global-services/jira-s.js
+++ b/app/scripts/main/global-services/jira-s.js
@@ -126,7 +126,7 @@
     }
 
     function isSufficientJiraSettings() {
-      return $localStorage.jiraSettings && $localStorage.jiraSettings.host && $localStorage.jiraSettings.userName && $localStorage.jiraSettings.password && $localStorage.jiraSettings.password;
+      return $localStorage.jiraSettings && $localStorage.jiraSettings.isJiraEnabled && $localStorage.jiraSettings.host && $localStorage.jiraSettings.userName && $localStorage.jiraSettings.password && $localStorage.jiraSettings.password;
     }
 
     this.transformIssues = (response) => {
diff --git a/app/scripts/settings/jira-settings/jira-settings-d.html b/app/scripts/settings/jira-settings/jira-settings-d.html
index 89dbee4688..14ef8dc367 100644
--- a/app/scripts/settings/jira-settings/jira-settings-d.html
+++ b/app/scripts/settings/jira-settings/jira-settings-d.html
@@ -1,112 +1,119 @@
 <section>
-  <h2 class="md-title">Jira-Setup</h2>
-  <form>
-    <md-input-container class="md-block">
-      <label>Host</label>
-      <input type="text"
-             ng-model="vm.settings.host">
-    </md-input-container>
-    <md-input-container class="md-block">
-      <label>Username</label>
-      <input type="text"
-             ng-model="vm.settings.userName">
-    </md-input-container>
-    <md-input-container class="md-block">
-      <label>Password</label>
-      <input type="password"
-             ng-model="vm.settings.password">
-    </md-input-container>
-    <md-input-container class="md-block">
-      <label>JQL Query for Tasks</label>
-      <input type="text"
-             ng-model="vm.settings.jqlQuery">
-      <div class="hint">e.g.: assignee = "{{ vm.settings.userName }}" AND resolution = Unresolved ORDER BY updatedDate DESC</div>
-    </md-input-container>
-    <md-switch ng-model="vm.settings.isUpdateIssueFromLocal"
-               aria-label="Update issue description on jira if task notes are updated">
-      Update issue description on jira if task notes are updated
-    </md-switch>
-    <md-button aria-label="Test credentials"
-               class="md-primary md-raised"
-               ng-click="vm.testJiraCredentials()">
-      <ng-md-icon icon="import_export"></ng-md-icon>
-      Test credentials
-    </md-button>
-    <section>
-      <h3 class="md-subtitle">Worklog</h3>
+  <md-switch ng-model="vm.settings.isJiraEnabled"
+             aria-label="Enable Jira Integration">
+    Enable Jira Integration
+  </md-switch>
 
+  <div ng-show="vm.settings.isJiraEnabled">
+    <h2 class="md-title">Jira-Integration</h2>
+    <form>
       <md-input-container class="md-block">
-        <div flex-gt-sm="50">
-          <md-switch ng-model="vm.settings.isWorklogEnabled"
-                     aria-label="open dialog for adding a worklog to jira when task is done">
-            Open worklog dialog for adding a worklog to jira when task is done
-          </md-switch>
-        </div>
-      </md-input-container>
-
-      <md-input-container class="md-block">
-        <div flex-gt-sm="50">
-          <md-switch ng-model="vm.settings.isAddWorklogOnSubTaskDone"
-                     ng-disabled="!vm.settings.isWorklogEnabled"
-                     aria-label="Add worklog when sub task is done">
-            Open worklog dialog when sub task is done and not for tasks with sub tasks themselves
-          </md-switch>
-        </div>
-      </md-input-container>
-
-      <md-input-container class="md-block">
-        <div flex-gt-sm="50">
-          <md-switch ng-model="vm.settings.isAutoWorklog"
-                     ng-disabled="!vm.settings.isWorklogEnabled"
-                     aria-label="(not recommended) send updates to worklog automatically when task is done">
-            (not recommended!) Send updates to worklog automatically without dialog
-          </md-switch>
-        </div>
-      </md-input-container>
-    </section>
-
-
-    <section ng-if="vm.settings.allTransitions">
-      <h3 class="md-subtitle">Default Transitions</h3>
-      <p>Jira enables a wide configuration of transitions usually coming into action as different columns on your jira agile board. That's why we can't make assumptions about where and when to transition your tasks and you need to set it manually.</p>
-      <md-input-container class="md-block">
-        <label>Default transition for OPEN</label>
-        <md-select ng-model="vm.settings.transitions.OPEN"
-                   arial-label="Select default transition for OPEN">
-          <md-option ng-value="'ALWAYS_ASK'"><em>Always ask</em></md-option>
-          <md-option ng-value="'DO_NOT'"><em>Don't transition</em></md-option>
-          <md-option ng-repeat="jiraTransition in vm.settings.allTransitions"
-                     ng-value="jiraTransition.id">
-            {{jiraTransition.id}} - {{jiraTransition.name}}
-          </md-option>
-        </md-select>
+        <label>Host</label>
+        <input type="text"
+               ng-model="vm.settings.host">
       </md-input-container>
       <md-input-container class="md-block">
-        <label>Default transition for IN_PROGRESS</label>
-        <md-select ng-model="vm.settings.transitions.IN_PROGRESS"
-                   arial-label="Select default transition for IN_PROGRESS">
-          <md-option ng-value="'ALWAYS_ASK'"><em>Always ask</em></md-option>
-          <md-option ng-value="'DO_NOT'"><em>Don't transition</em></md-option>
-          <md-option ng-repeat="jiraTransition in vm.settings.allTransitions"
-                     ng-value="jiraTransition.id">
-            {{jiraTransition.id}} - {{jiraTransition.name}}
-          </md-option>
-        </md-select>
+        <label>Username</label>
+        <input type="text"
+               ng-model="vm.settings.userName">
       </md-input-container>
       <md-input-container class="md-block">
-        <label>Default transition for DONE</label>
-        <md-select ng-model="vm.settings.transitions.DONE"
-                   arial-label="Select default transition for DONE">
-          <md-option ng-value="'ALWAYS_ASK'"><em>Always ask</em></md-option>
-          <md-option ng-value="'DO_NOT'"><em>Don't transition</em></md-option>
-          <md-option ng-repeat="jiraTransition in vm.settings.allTransitions"
-                     ng-value="jiraTransition.id">
-            {{jiraTransition.id}} - {{jiraTransition.name}}
-          </md-option>
-        </md-select>
+        <label>Password</label>
+        <input type="password"
+               ng-model="vm.settings.password">
       </md-input-container>
-    </section>
-  </form>
+      <md-input-container class="md-block">
+        <label>JQL Query for Tasks</label>
+        <input type="text"
+               ng-model="vm.settings.jqlQuery">
+        <div class="hint">e.g.: assignee = "{{ vm.settings.userName }}" AND resolution = Unresolved ORDER BY updatedDate DESC</div>
+      </md-input-container>
+      <md-switch ng-model="vm.settings.isUpdateIssueFromLocal"
+                 aria-label="Update issue description on jira if task notes are updated">
+        Update issue description on jira if task notes are updated
+      </md-switch>
+      <md-button aria-label="Test credentials"
+                 class="md-primary md-raised"
+                 ng-click="vm.testJiraCredentials()">
+        <ng-md-icon icon="import_export"></ng-md-icon>
+        Test credentials
+      </md-button>
+      <section>
+        <h3 class="md-subtitle">Worklog</h3>
 
-  <md-divider></md-divider>
+        <md-input-container class="md-block">
+          <div flex-gt-sm="50">
+            <md-switch ng-model="vm.settings.isWorklogEnabled"
+                       aria-label="open dialog for adding a worklog to jira when task is done">
+              Open worklog dialog for adding a worklog to jira when task is done
+            </md-switch>
+          </div>
+        </md-input-container>
+
+        <md-input-container class="md-block">
+          <div flex-gt-sm="50">
+            <md-switch ng-model="vm.settings.isAddWorklogOnSubTaskDone"
+                       ng-disabled="!vm.settings.isWorklogEnabled"
+                       aria-label="Add worklog when sub task is done">
+              Open worklog dialog when sub task is done and not for tasks with sub tasks themselves
+            </md-switch>
+          </div>
+        </md-input-container>
+
+        <md-input-container class="md-block">
+          <div flex-gt-sm="50">
+            <md-switch ng-model="vm.settings.isAutoWorklog"
+                       ng-disabled="!vm.settings.isWorklogEnabled"
+                       aria-label="(not recommended) send updates to worklog automatically when task is done">
+              (not recommended!) Send updates to worklog automatically without dialog
+            </md-switch>
+          </div>
+        </md-input-container>
+      </section>
+
+
+      <section ng-if="vm.settings.allTransitions">
+        <h3 class="md-subtitle">Default Transitions</h3>
+        <p>Jira enables a wide configuration of transitions usually coming into action as different columns on your jira agile board. That's why we can't make assumptions about where and when to transition your tasks and you need to set it manually.</p>
+        <md-input-container class="md-block">
+          <label>Default transition for OPEN</label>
+          <md-select ng-model="vm.settings.transitions.OPEN"
+                     arial-label="Select default transition for OPEN">
+            <md-option ng-value="'ALWAYS_ASK'"><em>Always ask</em></md-option>
+            <md-option ng-value="'DO_NOT'"><em>Don't transition</em></md-option>
+            <md-option ng-repeat="jiraTransition in vm.settings.allTransitions"
+                       ng-value="jiraTransition.id">
+              {{jiraTransition.id}} - {{jiraTransition.name}}
+            </md-option>
+          </md-select>
+        </md-input-container>
+        <md-input-container class="md-block">
+          <label>Default transition for IN_PROGRESS</label>
+          <md-select ng-model="vm.settings.transitions.IN_PROGRESS"
+                     arial-label="Select default transition for IN_PROGRESS">
+            <md-option ng-value="'ALWAYS_ASK'"><em>Always ask</em></md-option>
+            <md-option ng-value="'DO_NOT'"><em>Don't transition</em></md-option>
+            <md-option ng-repeat="jiraTransition in vm.settings.allTransitions"
+                       ng-value="jiraTransition.id">
+              {{jiraTransition.id}} - {{jiraTransition.name}}
+            </md-option>
+          </md-select>
+        </md-input-container>
+        <md-input-container class="md-block">
+          <label>Default transition for DONE</label>
+          <md-select ng-model="vm.settings.transitions.DONE"
+                     arial-label="Select default transition for DONE">
+            <md-option ng-value="'ALWAYS_ASK'"><em>Always ask</em></md-option>
+            <md-option ng-value="'DO_NOT'"><em>Don't transition</em></md-option>
+            <md-option ng-repeat="jiraTransition in vm.settings.allTransitions"
+                       ng-value="jiraTransition.id">
+              {{jiraTransition.id}} - {{jiraTransition.name}}
+            </md-option>
+          </md-select>
+        </md-input-container>
+      </section>
+    </form>
+
+    <md-divider></md-divider>
+  </div>
 </section>
\ No newline at end of file