Merge pull request #76 from TAMULib/product-sprint6-70-remove_basicauth

Issue 70: Can Create invalid Remote Project Managers, breaking system.
TAMULib · Sep 14, 2020 · d22ffe1 · d22ffe1
2 parents 2674e50 + 464eeb4
commit d22ffe1
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 257 deletions.
diff --git a/app/directives/remoteProjectManagerFormDirective.js b/app/directives/remoteProjectManagerFormDirective.js
diff --git a/app/index.html b/app/index.html
@@ -193,7 +193,6 @@
 
   <!-- Directives -->
   <script src="directives/customHeaderDirective.js"></script>
-  <script src="directives/remoteProjectManagerFormDirective.js"></script>
 
   <!-- Services -->
   <script src="services/activeSprintsService.js"></script>

diff --git a/app/repo/remoteProjectManagerRepo.js b/app/repo/remoteProjectManagerRepo.js
@@ -2,7 +2,9 @@ app.repo("RemoteProjectManagerRepo", function RemoteProjectManagerRepo($q, WsApi
 
     this.scaffold = {
         name: '',
-        type: ''
+        type: '',
+        url: '',
+        token: ''
     };
 
     this.getTypes = function () {

diff --git a/app/views/directives/remoteProjectManagerForm.html b/app/views/directives/remoteProjectManagerForm.html
diff --git a/app/views/management/remoteProjectManager.html b/app/views/management/remoteProjectManager.html
@@ -6,19 +6,12 @@
   <table class="table table-bordered table-striped remoteProjectManager-table">
     <tr>
       <th>Remote Project Manager</th>
-      <th>Settings</th>
+      <th>URL</th>
       <th class="actions-column text-center">Actions</th>
     </tr>
     <tr ng-repeat="remoteProjectManager in remoteProjectManagers">
       <td title="'Remote Project Manager'">{{remoteProjectManager.name}}</td>
-      <td title="'Settings'">
-        <ul class="list-unstyled">
-          <li ng-repeat="setting in typeSettings(remoteProjectManager.type) | filter:{visible:true}">
-            <label>{{setting.gloss}}:</label>
-            <span>&nbsp;{{remoteProjectManager.settings[setting.key]}}</span>
-          </li>
-        </ul>
-      </td>
+      <td title="'URL'">{{remoteProjectManager.url}}</td>
       <td class="actions-column text-center" title="'Actions'">
         <span class="glyphicon glyphicon-pencil" title="edit" ng-click="editRemoteProjectManager(remoteProjectManager)"></span>
         <span class="glyphicon glyphicon-trash" title="delete" ng-click="confirmDeleteRemoteProjectManager(remoteProjectManager)"></span>

diff --git a/app/views/modals/addRemoteProjectManagerModal.html b/app/views/modals/addRemoteProjectManagerModal.html
@@ -14,7 +14,9 @@ <h4 class="modal-title">Create Remote Project Manager</h4>
 
     <validatedselect id="create-type" options="serviceTypes" optionvalue="value" optionproperty="gloss" model="remoteProjectManagerToCreate" property="type" label="Type" form="remoteProjectManagerForms.create" validations="remoteProjectManagerForms.validations" results="remoteProjectManagerForms.getResults()"></validatedselect>
 
-    <remote-project-manager-form ng-if="remoteProjectManagerToCreate.type" management-settings="typeSettings(remoteProjectManagerToCreate.type)" model="remoteProjectManagerToCreate"></remote-project-manager-form>
+    <validatedinput id="edit-url" model="remoteProjectManagerToCreate" property="url" label="URL" placeholder="URL of the Remote Project Manager" form="remoteProjectManagerForms.create" validations="remoteProjectManagerForms.validations" results="remoteProjectManagerForms.getResults()"></validatedinput>
+
+    <validatedinput id="edit-token" model="remoteProjectManagerToCreate" type="password" property="token" label="Token" placeholder="Token for the Remote Project Manager" form="remoteProjectManagerForms.create" validations="remoteProjectManagerForms.validations" results="remoteProjectManagerForms.getResults()"></validatedinput>
   </div>
 
   <div class="modal-footer">

diff --git a/app/views/modals/editRemoteProjectManagerModal.html b/app/views/modals/editRemoteProjectManagerModal.html
@@ -14,7 +14,9 @@ <h4 class="modal-title">Edit Remote Project Manager</h4>
 
     <validatedselect id="edit-type" options="serviceTypes" optionvalue="value" optionproperty="gloss" model="remoteProjectManagerToEdit" property="type" label="Type" form="remoteProjectManagerForms.edit" validations="remoteProjectManagerForms.validations" results="remoteProjectManagerForms.getResults()"></validatedselect>
 
-    <remote-project-manager-form ng-if="remoteProjectManagerToEdit.type" management-type="remoteProjectManagerToEdit.type" management-settings="typeSettings(remoteProjectManagerToEdit.type)" model="remoteProjectManagerToEdit"></remote-project-manager-form>
+    <validatedinput id="edit-url" model="remoteProjectManagerToEdit" property="url" label="URL" placeholder="URL of the Remote Project Manager" form="remoteProjectManagerForms.edit" validations="remoteProjectManagerForms.validations" results="remoteProjectManagerForms.getResults()"></validatedinput>
+
+    <validatedinput id="edit-token" model="remoteProjectManagerToEdit" type="password" property="token" label="Token" placeholder="Token for the Remote Project Manager" form="remoteProjectManagerForms.edit" validations="remoteProjectManagerForms.validations" results="remoteProjectManagerForms.getResults()"></validatedinput>
   </div>
 
   <div class="modal-footer">

diff --git a/tests/mock/model/mockProduct.js b/tests/mock/model/mockProduct.js
@@ -5,12 +5,9 @@ var dataProduct1 = {
     remoteProjectManager: {
       id: 1,
       name: "Remote Project Manager 1",
-      settings: {
-        password: "password1",
-        url: "url1",
-        username: "username1"
-      },
-      type: "VERSION_ONE"
+      type: "VERSION_ONE",
+      url: "url1",
+      token: "username1:password1"
     },
     scopeId: "scope 1"
   }]
@@ -23,12 +20,9 @@ var dataProduct2 = {
     remoteProjectManager: {
       id: 1,
       name: "Remote Project Manager 1",
-      settings: {
-        password: "password1",
-        url: "url1",
-        username: "username1"
-      },
-      type: "VERSION_ONE"
+      type: "VERSION_ONE",
+      url: "url2",
+      token: "username2:password2"
     },
     scopeId: "scope 2"
   }]
@@ -41,12 +35,9 @@ var dataProduct3 = {
     remoteProjectManager: {
       id: 1,
       name: "Remote Project Manager 1",
-      settings: {
-        password: "password1",
-        url: "url1",
-        username: "username1"
-      },
-      type: "VERSION_ONE"
+      type: "VERSION_ONE",
+      url: "url1",
+      token: "username1:password1"
     },
     scopeId: "scope 3"
   }]

diff --git a/tests/mock/model/mockRemoteProjectManager.js b/tests/mock/model/mockRemoteProjectManager.js
@@ -1,33 +1,24 @@
 var dataRemoteProjectManager1 = {
   id: 1,
   name: "Remote Project Manager 1",
-  settings: {
-    password: "password1",
-    url: "url1",
-    username: "username1"
-  },
+  url: "url1",
+  token: "username1:password1",
   type: "VERSION_ONE"
 };
 
 var dataRemoteProjectManager2 = {
   id: 2,
   name: "Remote Project Manager 2",
-  settings: {
-    password: "password2",
-    url: "url2",
-    username: "username2"
-  },
+  url: "url1",
+  token: "username2:password2",
   type: "VERSION_ONE"
 };
 
 var dataRemoteProjectManager3 = {
   id: 3,
   name: "Remote Project Manager 3",
-  settings: {
-    password: "password3",
-    url: "url3",
-    username: "username3"
-  },
+  url: "url3",
+  token: "username1:password3",
   type: "VERSION_ONE"
 };
 

diff --git a/tests/mock/repo/mockRemoteProjectManagerRepo.js b/tests/mock/repo/mockRemoteProjectManagerRepo.js
@@ -21,7 +21,9 @@ angular.module("mock.remoteProjectManagerRepo", []).service("RemoteProjectManage
 
   repo.scaffold = {
     name: '',
-    type: ''
+    type: '',
+    url: '',
+    token: ''
   };
 
   repo.getTypes = function () {

diff --git a/tests/unit/directives/remoteProjectManagerFormDirectiveTest.js b/tests/unit/directives/remoteProjectManagerFormDirectiveTest.js