[MRM-1576] rewrite proxies connector page

fix various observable fields which are array
start binding of properties

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1242008 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
index 2b3f5e401d7d92eb7068f6e58fb892ed9ca88aaf..6f4a86e2e4b74db40b9aa694cfc701acb9659122 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
@@ -36,20 +36,23 @@ $(function() {
     this.proxyId.subscribe(function(newValue){self.modified(true)});
 
     //private List<String> blackListPatterns;
-    this.blackListPatterns=ko.observableArray(blackListPatterns);
+    this.blackListPatterns=ko.observableArray(blackListPatterns==null?[]:blackListPatterns);
     this.blackListPatterns.subscribe(function(newValue){self.modified(true)});
 
     //private List<String> whiteListPatterns;
-    this.whiteListPatterns=ko.observableArray(whiteListPatterns);
+    this.whiteListPatterns=ko.observableArray(whiteListPatterns==null?[]:whiteListPatterns);
     this.whiteListPatterns.subscribe(function(newValue){self.modified(true)});
 
     //private Map<String, String> policies;
-    this.policies=ko.observable(policies);
+    this.policies=ko.observableArray(policies==null?[]:policies);
     this.policies.subscribe(function(newValue){self.modified(true)});
 
     //private Map<String, String> properties;
-    this.properties=ko.observable(properties);
-    this.properties.subscribe(function(newValue){self.modified(true)});
+    this.properties=ko.observableArray(properties==null?[]:properties);
+    this.properties.subscribe(function(newValue){
+      $.log("properties modified");
+      self.modified(true);
+    });
 
     //private boolean disabled = false;
     this.disabled=ko.observable(disabled);
@@ -97,9 +100,10 @@ $(function() {
 
   ProxyConnectorViewModel=function(proxyConnector,update,proxyConnectorsViewModel){
     var self=this;
-    this.proxyConnector=ko.observable(proxyConnector);
+    this.proxyConnector=proxyConnector;
     this.proxyConnectorsViewModel=proxyConnectorsViewModel;
     this.update=update;
+    this.modified=ko.observable(false);
     getSelectedPolicyOption=function(id){
       if (!update){
         // we are on add mode so use default option
@@ -123,12 +127,24 @@ $(function() {
     getPolicyOptions=function(id){
       var policyInformations=self.proxyConnectorsViewModel.policyInformations();
       for(i=0;i<policyInformations.length;i++){
-        $.log("getPolicyOptions:"+id+",cur:"+policyInformations[i].id());
         if (policyInformations[i].id()==id){
           return policyInformations[i].options();
         }
       }
     }
+
+    deleteProperty=function(key){
+      $.log("delete property key:"+key);
+    }
+
+    addProperty=function(){
+      var mainContent=$("#main-content");
+      var key=mainContent.find("#property-key").val();
+      var value=mainContent.find("#property-value").val();
+      $.log("add property:"+key+":"+value+",size:"+self.proxyConnector.properties().length);
+      self.proxyConnector.properties().push(new Entry(key,value));
+      $.log("add property:"+key+":"+value+",size:"+self.proxyConnector.properties().length);
+    }
   }
 
   ProxyConnectorsViewModel=function(){
@@ -227,22 +243,16 @@ $(function() {
         }
       });
       var mainContent = $("#main-content");
-      this.gridViewModel.getManagedRepository=getManagedRepository;
+
       ko.applyBindings(this,mainContent.find("#proxyConnectorsTable").get(0));
       removeSmallSpinnerImg("#main-content");
-      this,mainContent.find("#proxy-connectors-view-tabs #proxy-connectors-view-tabs-a-network-proxies-grid").tab('show');
+      mainContent.find("#proxy-connectors-view-tabs #proxy-connectors-view-tabs-a-network-proxies-grid").tab('show');
 
       mainContent.find("#proxy-connectors-view-tabs").on('show', function (e) {
 
         if ($(e.target).attr("href")=="#proxy-connectors-edit") {
-          var proxyConnector=new ProxyConnector();
-          for (i=0;i<self.policyInformations.length;i++){
-            //proxyConnector[]
-          }
-          var proxyConnectorViewModel=new ProxyConnectorViewModel(proxyConnector,false,self);
+          var proxyConnectorViewModel=new ProxyConnectorViewModel(new ProxyConnector(),false,self);
           ko.applyBindings(proxyConnectorViewModel,mainContent.find("#proxy-connectors-edit").get(0));
-          //ko.applyBindings(proxyConnectorViewModel,mainContent.find("#proxy-connector-policies-binding").get(0));
-
         }
         if ($(e.target).attr("href")=="#proxy-connectors-view") {
           $("#proxy-connectors-view-tabs-a-network-proxies-grid").html($.i18n.prop("add"));
@@ -312,12 +322,18 @@ $(function() {
     if (data==null){
       return null;
     }
-    var policies = data.policies == null ? null: $.each(data.policies,function(item){
+    var policies = data.policies == null ? []: $.each(data.policies,function(item){
       return new Entry(item.key, item.value);
     });
-    var properties = data.properties == null ? null: $.each(data.properties,function(item){
+    if (!$.isArray(policies)){
+      policies=[];
+    }
+    var properties = data.properties == null ? []: $.each(data.properties,function(item){
           return new Entry(item.key, item.value);
         });
+    if (!$.isArray(properties)){
+      properties=[];
+    }
     return new ProxyConnector(data.sourceRepoId,data.targetRepoId,data.proxyId,mapStringArray(data.blackListPatterns),
                               mapStringArray(data.whiteListPatterns),policies,properties,
                               data.disabled,data.order);

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
index 022a2b692ab158b6958666b563b1b7f4be3b4b62..0d621eac2cc0d35582712cd1fc3e60833755366c 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
@@ -36,7 +36,7 @@
       </table>
       <div id="proxy-connectorsPagination"></div>
     </div>
-    <div id="proxy-connectors-edit" class="tab-pane" data-bind='template: {name:"proxy-connector-edit-form-tmpl"}'></div>
+    <div id="proxy-connectors-edit" class="tab-pane" data-bind='template: {name:"proxy-connector-edit-form-tmpl",data: proxyConnector}'></div>
   </div>
 
 </script>
@@ -114,7 +114,7 @@
         <div class="controls">
           <select id="proxyId"
                   data-bind="options: proxyConnectorsViewModel.networkProxies, optionsText: 'id',optionsValue:'id',
-                   value: proxyConnector.proxyId, optionsCaption: 'direct connection'"></select>
+                   value: proxyId, optionsCaption: 'direct connection'"></select>
         </div>
       </div>
       <div class="control-group">
@@ -122,7 +122,7 @@
         <div class="controls">
           <select id="sourceRepoId"
                   data-bind="options: proxyConnectorsViewModel.managedRepositories, optionsText: 'id',optionsValue:'id',
-                   value: proxyConnector.sourceRepoId"></select>
+                   value: sourceRepoId"></select>
         </div>
       </div>
       <div class="control-group">
@@ -130,7 +130,7 @@
         <div class="controls">
           <select id="targetRepoId"
                   data-bind="options: proxyConnectorsViewModel.remoteRepositories, optionsText: 'id',optionsValue:'id',
-                   value: proxyConnector.targetRepoId"></select>
+                   value: targetRepoId"></select>
         </div>
       </div>
       <div class="control-group span6">
@@ -144,13 +144,36 @@
                 <tr>
                   <td>${$value.name()}</td>
                   <td>
-                    <select id="policy-${policyId}" data-bind="options: getPolicyOptions(policyId),value:getSelectedPolicyOption(policyId)"></select>
+                    <select id="policy-${policyId}"
+                            data-bind="options: getPolicyOptions(policyId),value:getSelectedPolicyOption(policyId)"></select>
                   </td>
                 </tr>
               {{/each}}
             </tbody>
           </table>
       </div>
+      <div class="control-group span6">
+          <table class="table">
+            <thead>
+              <th colspan="3">${$.i18n.prop('proxy-connector.properties')}</th>
+            </thead>
+            <tbody>
+              {{each properties()}}
+              {{var key=$value.key()}}
+                <tr>
+                  <td>${key}</td>
+                  <td>${$value.value()}</td>
+                  <td><a href="#" data-bind="click: function(){ deleteProperty(key)}">${$.i18n.prop('delete')}</a></td>
+                </tr>
+              {{/each}}
+              <tr>
+                <td><input type="text" id="property-key"/></td>
+                <td><input type="text" id="property-value"/></td>
+                <td><a href="#" data-bind="click: function(){ addProperty() }">${$.i18n.prop('add')}</a></td>
+              </tr>
+            </tbody>
+          </table>
+      </div>
     </fieldset>
   </form>
 </script>