From 3bf87752dd1739cc1fbdb472a98ded8a986249ce Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Tue, 14 Feb 2012 23:00:39 +0000
Subject: [PATCH] [MRM-1575] rewrite repositories group page add drag&drop to
 add/remove repositories to/from a group.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1244263 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/webapp/images/edit-delete.png    | Bin 0 -> 1074 bytes
 .../main/webapp/images/user-trash-22-22.png   | Bin 0 -> 1149 bytes
 .../main/webapp/images/user-trash-32-32.png   | Bin 0 -> 1788 bytes
 .../webapp/js/archiva/repository-groups.js    |  43 +++++++++++++++-
 .../archiva/templates/repository-groups.html  |  48 +++++++++++++-----
 .../src/main/webapp/js/archiva/utils.js       |   2 +-
 .../src/main/webapp/js/knockout-sortable.js   |   1 -
 7 files changed, 76 insertions(+), 18 deletions(-)
 create mode 100644 archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/edit-delete.png
 create mode 100644 archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/user-trash-22-22.png
 create mode 100644 archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/user-trash-32-32.png

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/edit-delete.png b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/edit-delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..57513d8cb327486d1007c2425bcd72c3978e056f
GIT binary patch
literal 1074
zcmV-21kL-2P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11FuO$K~y-6jg>)<6jcz%fAwDX?#wRi%&-dtE@&_qFGdqTfd@_e
z0Q(V0JQzcQ-VEUi(U^dViAD_vqgnLm$)hov7z`lD5(y}<abVe<S!SkZ=Dk<tp=V~7
z-9>%LOI3HefA#OGu6kl-{O3A%Zkn|<VQx;?*bruCg>F|?t5pGTMIlnDNTbo{ar}4y
zkbeUY&YnFQ&3+WKd7ykyFs!_g@jWw8HBBiv)wgF(o%$?$D)sbfm#Woo!l45TabcfB
z6*C1@Oby0<3B@oxe!6<;$_K#H!9}HVGF7IJhDOa10+?c|U^cP}y6Ma8UQ&wC>C^yr
z1wTG>=6MgN28R#KSPV}ndqU+%wd7MUm7&d5C<;VGc7m6dyc-Ob`Ue*(Dqtb(R5?k5
zf`MPCky>lmFknRi;C6t!moLAQDpSvf`d(M6waqkafsTXuMgvWO)NVu4F?jw7aOcE{
z7sR>u`p+Giu^4tQ(nvL?kmb02^9=u3#zG)p`J21#_9{?!6YAokw-}d-L;EYq3zia=
zA{GN0BNhS{0~X@Q2C~D4NzEqO>y;_HbTxgry!<urXrlOWy?#>X_B^96zvwdO!F$Ae
z%$L5k+sND;zFNg%#6m>7j|nSxF*T-c|Ha)$kJdk3S@|3oOu*Lfzu8}C%*H!+%KV|2
z&%k*s&+)Yydap%N#hGCOxy!H^%Rl3n%jx{>I~Rcaz%T>oEH3WH>|mUk#=@{Hl28^S
zbC@OKdc?9E@*Fk8=Tlg#1wg)h%Wk#X4==2(eF1cUm;nqsomZJ}3@ygWxJc?iEGv6f
z5~dC`K`I;B`<&G6KuY*uuj=_`^An&63;=T?A})nDVq<Ra)*>++`6*&aAt|H;F(N4-
znMZp)^6NM4Mz2`;s@3`u=mN>iECZbN`mYV^H5qpqqrqeXs6#Yi$(8d*6)@0*42JkC
z*Y*5^2Oj~ez>v{k%Dz8#?1=VyjkKp)D%!eKk(4ke2w>(x1e}ASPj>BwT`7t`FSgqk
zx2grm4ywMM78=`#<&se#5z3};iijZ9D%xHr|7}@6Za#P)SO>ybEkKqz_mb6XGcpVy
z6Xd3e5u!rw5OJ6YZmNR+;ivR-xBL6I8ynvN1)#QNxMw#9gPX5hyV0*+Th1p^&14dT
zE%C-5BBJ+HAHH?}{<}bHyV~(P`++(z1Nd#6-HsOp;wY!Bkqx%(C=y^A$N{%g+^%37
s?Ks+LJ9G>l@A38jI9)e`?gj<;2jJC%#{Hm3(*OVf07*qoM6N<$f@gW^WdHyG

literal 0
HcmV?d00001

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/user-trash-22-22.png b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/user-trash-22-22.png
new file mode 100644
index 0000000000000000000000000000000000000000..05ff0365f5ef4c1934836f934a89ac128b5c1cb3
GIT binary patch
literal 1149
zcmV-@1cLjCP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11NuosK~y-6wUx_j+*K6EKlgWkkNM3^UQKErgjz+5F2pLj5Cp*r
z5^aJJS`Y;{6&G&Y=&FA}3&jT&UFb#^m0DMdbtmo%tzeC|3B@#NS~D}rWM+Q(z3#c!
zMW!)U7aH-v;a<*x@A;l{&pB5)=lDOw2bek<jaREfAFZ#iJrAhu04e236jeXSvff)?
zeUX<wKpYRe|Jb94Cti8^gsMa}0JdgwXI6jbOVhSKaccV5!op7%fzQ<Bk#H;sqQ&=4
z{TQ7*`7Z61WjxROlWOhVVbg!{J$>j9)w*!{!&m3ee%jpcY3(0-<luzubaF0U`e8d&
z=rb4Y-gl7Up<Sa>N2BMwFpS@L_L<k?^XJbaVzv#ewWi%}@WRyF^?GgOxGy5rm6ZlB
zPERvAIf<_|n-z3!<9_@62ewY9i&)vArjA4}d0L<OFKoAp?}yfy;;?eg@!Fg9=ETHP
zqfr<k;xOV6v6Q(bFN8c3id<Mv4eLEanwF%gAO?(BtT@C%X;R|qjVqs=?mggd#8Ind
z!Dt+7lqdLs0z6D)sThqZEzX4~Dx_ILmZlV?rO1UW6SB-;MU$n9)h@q5e?Xj5&9dY^
zPx*+Ge%Tz(fwPWUbuY$Pc8xv^_+0+wTWUcCQ#J`h53OScYNPa$Dy{bH5`YIF#@#9k
zLF;g{R?dO74y~)y;@yNno$E^%2!c8fJvfcRCkSiQYj-g`w1;|q3~L?6*z22&jj=cK
z+@QS(=mHS<gT&DYiVE${JXSPgI}Q-|F}NJ%`BcI|jIoH6XsyZfv=FgNo4`dOH?ph{
z?Z=uNJTJuaV#aqriRV?gHvc_IvP!cx$IV+;!D#}&N?CL%%K`^z9g=11#tO@uz*bzN
z*Gcj)7_3&JF_a2WRMB2Uvvmc9#)!cf!H8v`wv$S<11pOpNe^&n&!^X26KmZck7q57
zqClc>ge+@fOo^vTlC;TkYlgxI#uT6eh6neu+?r>oZb{Zx5nJ{bk)oS)5WAJJrLo#x
za{yvX#0q)2%5v*6BO~|I>$b?V1@@0Wfl?uHWhbUIEZv;zuK@=*lBDNb+0t%SXtdjH
z59hFA5MwZ6$-7HfQIsY}c_BeqLrR0Ee12WLK$a&s=g>N&EHlbdLg#300*j@QBv~Xj
z!#ahr1~Gy$md45)rVvVFnVtI%-ydLMX$DgY)^4<B6vm`kg0m|7`dmKDSyp_2Z@w%l
zlSlmK-0bY0d+t4e80n9;?FVp(Y^b%cfBbR8T5j)qV{&GGzC@9$YrsCGl=5#6#LdO>
zoim@GJ1!za+xZ8r)mN_06d(78E?3Sulu`;90O~;cuTeK71`43#oGX3@F$QB=SBZKw
P00000NkvXXu0mjfHdq!i

literal 0
HcmV?d00001

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/user-trash-32-32.png b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/user-trash-32-32.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b7a462d7db7a51710bc05b5d5306d382f54e505
GIT binary patch
literal 1788
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

literal 0
HcmV?d00001

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js
index eb16a21bd..0c56f49f5 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js
@@ -42,6 +42,13 @@ $(function() {
     this.repositoryGroup=repositoryGroup;
     this.update=update;
     this.repositoryGroupsViewModel=repositoryGroupsViewModel;
+    this.availableRepositories=ko.observableArray([]);
+
+    for (var i=0;i<repositoryGroupsViewModel.managedRepositories().length;i++){
+      if ( $.inArray(repositoryGroupsViewModel.managedRepositories()[i].id(),this.repositoryGroup.repositories())<0){
+        this.availableRepositories.push(repositoryGroupsViewModel.managedRepositories()[i]);
+      }
+    }
 
     repositoryMoved=function(arg){
       $.log("repositoryMoved:"+arg.sourceIndex+" to " + arg.targetIndex);
@@ -53,7 +60,15 @@ $(function() {
       self.repositoryGroup.modified(true);
     }
     this.saveRepositoryGroup=function(repositoryGroup){
-      self.repositoryGroupsViewModel.saveRepositoryGroup(repositoryGroup);
+      if (self.update){
+        self.repositoryGroupsViewModel.saveRepositoryGroup(repositoryGroup);
+      } else {
+        $.log("addRepository group");
+      }
+    }
+
+    this.removeRepository=function(id){
+      $.log("removeRepository:"+id);
     }
   }
 
@@ -129,10 +144,28 @@ $(function() {
               mappedRepositoryGroups[i]
                   .managedRepositories(self.mapManagedRepositoriesToRepositoryGroup(mappedRepositoryGroups[i]));
               mappedRepositoryGroups[i].modified(false);
+              $.log("mappedRepositoryGroups.repositories().length:"+mappedRepositoryGroups[i].repositories().length);
             }
             mainContent.html($("#repositoryGroupsMain").tmpl());
             self.repositoryGroupsViewModel.repositoryGroups(mappedRepositoryGroups);
+            $.log("displayRepositoryGroups#applyBindings before");
             ko.applyBindings(repositoryGroupsViewModel,mainContent.find("#repository-groups-view" ).get(0));
+            $.log("displayRepositoryGroups#applyBindings after");
+
+
+            mainContent.find("#repository-groups-view-tabs").on('show', function (e) {
+              if ($(e.target).attr("href")=="#repository-groups-edit") {
+                var repositoryGroup = new RepositoryGroup();
+                var repositoryGroupViewModel=new RepositoryGroupViewModel(repositoryGroup,false,self);
+                activateRepositoryGroupEditTab();
+                ko.applyBindings(repositoryGroupViewModel,mainContent.find("#repository-groups-edit" ).get(0));
+              }
+              if ($(e.target).attr("href")=="#repository-groups-view") {
+                mainContent.find("#repository-groups-view-tabs-li-edit a").html($.i18n.prop("add"));
+                clearUserMessages();
+              }
+
+            });
 
           }
         }
@@ -141,10 +174,16 @@ $(function() {
     });
 
     this.mapManagedRepositoriesToRepositoryGroup=function(repositoryGroup){
-      var managedRepositories=[];
+      $.log("mapManagedRepositoriesToRepositoryGroup");
+      var managedRepositories=new Array();
+      if (!repositoryGroup.repositories()) {
+        repositoryGroup.repositories(new Array());
+        return managedRepositories;
+      }
       for(var i=0;i<repositoryGroup.repositories().length;i++){
         managedRepositories.push(self.repositoryGroupsViewModel.findManagedRepository(repositoryGroup.repositories()[i]));
       }
+      $.log("end mapManagedRepositoriesToRepositoryGroup");
       return managedRepositories;
     }
 
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repository-groups.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repository-groups.html
index 88581d9a5..f1e4ea90a 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repository-groups.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repository-groups.html
@@ -22,7 +22,9 @@
   </div>
   <ul id="repository-groups-view-tabs" class="nav nav-tabs">
     <li id="repository-groups-view-tabs-li-grid" class="active">
-      <a data-toggle="tab" href="#repository-groups-view" id="repository-groups-view-tabs-a-network-proxies-grid">${$.i18n.prop('repository-groups.grid.tab.title')}</a>
+      <a data-toggle="tab" href="#repository-groups-view" id="repository-groups-view-tabs-a-network-proxies-grid">
+        ${$.i18n.prop('repository-groups.grid.tab.title')}
+      </a>
     </li>
     <li id="repository-groups-view-tabs-li-edit">
       <a data-toggle="tab" href="#repository-groups-edit" id="repository-groups-view-tabs-a-edit">${$.i18n.prop('add')}</a>
@@ -30,17 +32,33 @@
 
   </ul>
   <div id="repository-groups-view-tabs-content" class="tab-content">
-    <div id="repository-groups-view" class="tab-pane active">    
-      <div id="repository-groups-table" data-bind='template:{name:"repository-groups-table-tmpl"}'>
-      </div>
-    </div>
-    <div id="repository-groups-edit" class="tab-pane active">
-      <div id="repository-groups-edit-div" data-bind='template:{name:"repository-group-edit-tmpl"}'></div>
-      <div id="repository-groups-edit-order-div"
-           data-bind="sortable: { template: 'repository-group-edit-order-tmpl',data:repositoryGroup.managedRepositories,afterMove: repositoryMoved}">
-      </div>
-    </div>
-  </div>  
+        <div id="repository-groups-view" class="tab-pane active">
+          <div id="repository-groups-table" data-bind='template:{name:"repository-groups-table-tmpl"}'>
+          </div>
+        </div>
+        <div id="repository-groups-edit" class="tab-pane">
+              <div class="row-fluid">
+                <div class="span5 dotted">
+                  <div id="repository-groups-edit-div" data-bind='template:{name:"repository-group-edit-tmpl"}'></div>
+                  <div id="repository-groups-edit-order-div" style="min-height: 80px"
+                     data-bind="sortable: { template: 'repository-group-edit-order-tmpl',data:repositoryGroup.managedRepositories,afterMove:repositoryMoved}">
+                  </div>
+                </div>
+
+                <div class="span5 dotted">
+                  <h5>${$.i18n.prop('repository.groups.available.repositories')}</h5>
+                  <br/>
+                  <div id="repository-groups-edit-available-repositories" style="min-height: 80px"
+                       data-bind="sortable: { template: 'repository-group-edit-order-tmpl',data:availableRepositories,afterMove:repositoryMoved}">
+
+                  </div>
+                </div>
+
+              </div>
+
+        </div>
+
+  </div>
 </script>
 
 <script id="repository-groups-table-tmpl" type="text/html">
@@ -123,13 +141,15 @@
 </script>
 
 <script id="repository-group-edit-order-tmpl" type="text/html">
-  <div class="well draggable-item span6">
+  <div class="well draggable-item">
     <blockquote>
       ${$data.id()}
       <br/>
       ${$data.name()}
       <br/>
-      ${window.archivaRuntimeInfo.baseUrl}/repository/${$data.id()}
+      <a href="${window.archivaRuntimeInfo.baseUrl}/repository/${$data.id()}" target="_blank">
+        ${window.archivaRuntimeInfo.baseUrl}/repository/${$data.id()}
+      </a>
       <br/>
     </blockquote>
 
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
index dff66bca2..241d161af 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
@@ -209,7 +209,7 @@ mapStringArray=function(data){
     if ($.isArray(data)){
       return $.map(data,function(item){
         return item;
-     });
+      });
     } else {
       return new Array(data);
     }
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout-sortable.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout-sortable.js
index ec928b1ba..5b532f1da 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout-sortable.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout-sortable.js
@@ -110,7 +110,6 @@ ko.bindingHandlers.sortable = {
         ko.utils.domNodeDisposal.addDisposeCallback(element, function() {
             $(element).sortable("destroy");
         });
-
         //we are wrapping the template binding
         return ko.bindingHandlers.template.init(element, function() { return templateOptions; }, allBindingsAccessor, data, context);
     },
-- 
2.39.5