From eba6e2b4e1b9339a9cf9f003f793dfeb6107c65c Mon Sep 17 00:00:00 2001
From: Bill Erickson <berick@esilibrary.com>
Date: Tue, 15 Jul 2014 15:48:29 -0400
Subject: [PATCH] initial tpac integration via eg-embed-frame

Signed-off-by: Bill Erickson <berick@esilibrary.com>
---
 .../src/templates/opac/parts/bookbag_actions.tt2   |  2 +-
 Open-ILS/src/templates/staff/cat/catalog/index.tt2 | 15 ++++++++
 Open-ILS/src/templates/staff/circ/patron/index.tt2 |  2 +-
 .../src/templates/staff/circ/patron/register.tt2   |  2 +-
 .../src/templates/staff/circ/patron/t_edit.tt2     |  2 +-
 Open-ILS/src/templates/staff/css/style.css.tt2     |  3 +-
 Open-ILS/src/templates/staff/navbar.tt2            |  6 +++
 Open-ILS/web/js/ui/default/opac/staff.js           | 42 +++++++++++++--------
 .../web/js/ui/default/staff/cat/catalog/app.js     | 38 +++++++++++++++++++
 .../js/ui/default/staff/circ/patron/register.js    | 12 +++---
 .../staff/services/{lframe.js => eframe.js}        | 44 +++++++++++++++++-----
 11 files changed, 132 insertions(+), 36 deletions(-)
 create mode 100644 Open-ILS/src/templates/staff/cat/catalog/index.tt2
 create mode 100644 Open-ILS/web/js/ui/default/staff/cat/catalog/app.js
 rename Open-ILS/web/js/ui/default/staff/services/{lframe.js => eframe.js} (65%)

diff --git a/Open-ILS/src/templates/opac/parts/bookbag_actions.tt2 b/Open-ILS/src/templates/opac/parts/bookbag_actions.tt2
index de33841e28..611d1fc960 100644
--- a/Open-ILS/src/templates/opac/parts/bookbag_actions.tt2
+++ b/Open-ILS/src/templates/opac/parts/bookbag_actions.tt2
@@ -4,7 +4,7 @@
 
     # Wrap a url to open in a new tab in staff client.
     MACRO opac_wrap(url) BLOCK;
-    	  IF ctx.is_staff;
+    	  IF ctx.is_staff AND NOT ctx.is_browser_staff;
               # void(0) to return false and not go to new page in current tab.
               "javascript:xulG.new_tab(xulG.urls.XUL_OPAC_WRAPPER, {}, {'opac_url' : 'oils://remote" _ url _ "'});void(0);";
           ELSE;
diff --git a/Open-ILS/src/templates/staff/cat/catalog/index.tt2 b/Open-ILS/src/templates/staff/cat/catalog/index.tt2
new file mode 100644
index 0000000000..61e4862ff1
--- /dev/null
+++ b/Open-ILS/src/templates/staff/cat/catalog/index.tt2
@@ -0,0 +1,15 @@
+[%
+  WRAPPER "staff/base.tt2";
+  ctx.page_title = l("Record Buckets"); 
+  ctx.page_app = "egCatalogApp";
+%]
+
+[% BLOCK APP_JS %]
+<script src="[% ctx.media_prefix %]/js/ui/default/staff/services/eframe.js"></script>
+<script src="[% ctx.media_prefix %]/js/ui/default/staff/cat/catalog/app.js"></script>
+[% END %]
+
+<div ng-view></div>
+
+[% END %]
+
diff --git a/Open-ILS/src/templates/staff/circ/patron/index.tt2 b/Open-ILS/src/templates/staff/circ/patron/index.tt2
index 4f38659163..257462f176 100644
--- a/Open-ILS/src/templates/staff/circ/patron/index.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/index.tt2
@@ -9,7 +9,7 @@
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/services/grid.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/services/ui.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/services/user.js"></script>
-<script src="[% ctx.media_prefix %]/js/ui/default/staff/services/lframe.js"></script>
+<script src="[% ctx.media_prefix %]/js/ui/default/staff/services/eframe.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/circ/services/billing.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/circ/services/circ.js"></script>
 [% INCLUDE 'staff/circ/share/circ_strings.tt2' %]
diff --git a/Open-ILS/src/templates/staff/circ/patron/register.tt2 b/Open-ILS/src/templates/staff/circ/patron/register.tt2
index 53505a1831..4a3c9ce3df 100644
--- a/Open-ILS/src/templates/staff/circ/patron/register.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/register.tt2
@@ -5,7 +5,7 @@
 %]
 
 [% BLOCK APP_JS %]
-<script src="[% ctx.media_prefix %]/js/ui/default/staff/services/lframe.js"></script>
+<script src="[% ctx.media_prefix %]/js/ui/default/staff/services/eframe.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/circ/patron/register.js"></script>
 <link rel="stylesheet" href="[% ctx.base_path %]/staff/css/circ.css" />
 [% END %]
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
index 379444ad61..26cc7666c9 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
@@ -1,3 +1,3 @@
 <!-- insert the patron registration UI -->
-<eg-legacy-frame url="patron_edit_url" handlers="funcs"></eg-legacy-frame>
+<eg-embed-frame url="patron_edit_url" handlers="funcs"></eg-embed-frame>
 
diff --git a/Open-ILS/src/templates/staff/css/style.css.tt2 b/Open-ILS/src/templates/staff/css/style.css.tt2
index 7d555a7801..0a8becf37b 100644
--- a/Open-ILS/src/templates/staff/css/style.css.tt2
+++ b/Open-ILS/src/templates/staff/css/style.css.tt2
@@ -169,7 +169,8 @@ table.list tr.selected td { /* deprecated? */
   white-space:nowrap;
 }
 
-.eg-legacy-frame {
+/* embedded UI iframe */
+.eg-embed-frame {
   width: 100%;
   border: none;
   margin: 0px;
diff --git a/Open-ILS/src/templates/staff/navbar.tt2 b/Open-ILS/src/templates/staff/navbar.tt2
index c4ff8691c0..944958f9f7 100644
--- a/Open-ILS/src/templates/staff/navbar.tt2
+++ b/Open-ILS/src/templates/staff/navbar.tt2
@@ -146,6 +146,12 @@
         </a>
         <ul class="dropdown-menu">
           <li>
+            <a href="./cat/catalog/index" target="_self">
+              <span class="glyphicon glyphicon-search"></span>
+              [% l('Search the Catalog') %]
+            </a>
+          </li>
+          <li>
             <a href="./cat/bucket/record/view" target="_self">
               <span class="glyphicon glyphicon-list-alt"></span>
               [% l('Record Buckets') %]
diff --git a/Open-ILS/web/js/ui/default/opac/staff.js b/Open-ILS/web/js/ui/default/opac/staff.js
index ebed5e50f4..adbfd97b55 100644
--- a/Open-ILS/web/js/ui/default/opac/staff.js
+++ b/Open-ILS/web/js/ui/default/opac/staff.js
@@ -1,4 +1,11 @@
 /* staff client integration functions */
+
+// Browser staff client runs the TPAC within an iframe, whose onload
+// is not called until after the page onload is called. window.onload
+// actions are wrapped in timeouts (below) to ensure the wrapping page
+// has a chance to insert the necessary xulG, etc. functions into the
+// window.
+
 function debug(msg){dump(msg+'\n')}
 var eventCache={};
 function attachEvt(scope, name, action) {
@@ -120,21 +127,24 @@ function staff_hold_usr_barcode_changed(isload) {
 }
 window.onload = function() {
     // record details page events
-    var rec = location.href.match(/\/opac\/record\/(\d+)/);
-    if(rec && rec[1]) { 
-        runEvt('rdetail', 'recordRetrieved', rec[1]); 
-        runEvt('rdetail', 'MFHDDrawn');
-    }
-    if(location.href.match(/place_hold/)) {
-        // patron barcode may come from XUL or a CGI param
-        var patron_barcode = xulG.patron_barcode ||
-            document.getElementById('hold_usr_input').value;
-        if(patron_barcode) {
-            staff_hold_usr_barcode_changed(patron_barcode);
-        } else {
-            staff_hold_usr_barcode_changed(true);
+
+    setTimeout(function() {
+        var rec = location.href.match(/\/opac\/record\/(\d+)/);
+        if(rec && rec[1]) { 
+            runEvt('rdetail', 'recordRetrieved', rec[1]); 
+            runEvt('rdetail', 'MFHDDrawn');
         }
-    }
+        if(location.href.match(/place_hold/)) {
+            // patron barcode may come from XUL or a CGI param
+            var patron_barcode = xulG.patron_barcode ||
+                document.getElementById('hold_usr_input').value;
+            if(patron_barcode) {
+                staff_hold_usr_barcode_changed(patron_barcode);
+            } else {
+                staff_hold_usr_barcode_changed(true);
+            }
+        }
+    });
 }
 
 function rdetail_next_prev_actions(index, count, prev, next, start, end, results) {
@@ -167,6 +177,8 @@ function rdetail_next_prev_actions(index, count, prev, next, start, end, results
     ol = window.onload;
     window.onload = function() {
         if(ol) ol(); 
-        runEvt('rdetail', 'nextPrevDrawn', Number(index), Number(count)); 
+        setTimeout(function() {
+            runEvt('rdetail', 'nextPrevDrawn', Number(index), Number(count)); 
+        });
     };
 }
diff --git a/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js b/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js
new file mode 100644
index 0000000000..99ce5f7d83
--- /dev/null
+++ b/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js
@@ -0,0 +1,38 @@
+/**
+ * TPAC Frame App
+ */
+
+angular.module('egCatalogApp', ['ui.bootstrap','ngRoute','egCoreMod'])
+
+.config(function($routeProvider, $locationProvider, $compileProvider) {
+    $locationProvider.html5Mode(true);
+    $compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|blob):/); // grid export
+
+    var resolver = {delay : 
+        ['egStartup', function(egStartup) {return egStartup.go()}]}
+
+    $routeProvider.when('/cat/catalog/index', {
+        template: '<eg-embed-frame url="catalog_url" handlers="handlers"></eg-embed-frame>',
+        controller: 'CatalogCtrl',
+        resolve : resolver
+    });
+
+    $routeProvider.otherwise({redirectTo : '/cat/catalog/index'});
+})
+
+
+/**
+ * */
+.controller('CatalogCtrl',
+       ['$scope','$routeParams','$location','egCore',
+function($scope , $routeParams , $location , egCore) {
+
+    // TODO: is start path configurable in the xul client?
+    var url = $location.absUrl().replace(/\/staff.*/, '/opac/advanced');
+
+    // pass the reg URL into the scope, thus into the 
+    $scope.catalog_url = url;
+
+    $scope.handlers = {};
+}])
+ 
diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/register.js b/Open-ILS/web/js/ui/default/staff/circ/patron/register.js
index a74b023cae..13b4a41ed2 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/register.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/register.js
@@ -15,25 +15,25 @@ angular.module('egPatronRegApp', ['ui.bootstrap','ngRoute','egCoreMod'])
         ['egStartup', function(egStartup) {return egStartup.go()}]}
 
     $routeProvider.when('/circ/patron/register', {
-        template: '<eg-legacy-frame url="reg_url"></eg-legacy-frame>',
+        template: '<eg-embed-frame url="reg_url"></eg-embed-frame>',
         controller: 'PatronRegCtrl',
         resolve : resolver
     });
 
     $routeProvider.when('/circ/patron/register/stage/:stage_username', {
-        template: '<eg-legacy-frame url="reg_url"></eg-legacy-frame>',
+        template: '<eg-embed-frame url="reg_url"></eg-embed-frame>',
         controller: 'PatronRegCtrl',
         resolve : resolver
     });
 
     $routeProvider.when('/circ/patron/register/edit/:edit_id', {
-        template: '<eg-legacy-frame url="reg_url"></eg-legacy-frame>',
+        template: '<eg-embed-frame url="reg_url"></eg-embed-frame>',
         controller: 'PatronRegCtrl',
         resolve : resolver
     });
 
     $routeProvider.when('/circ/patron/register/clone/:clone_id', {
-        template: '<eg-legacy-frame url="reg_url"></eg-legacy-frame>',
+        template: '<eg-embed-frame url="reg_url"></eg-embed-frame>',
         controller: 'PatronRegCtrl',
         resolve : resolver
     });
@@ -45,8 +45,8 @@ angular.module('egPatronRegApp', ['ui.bootstrap','ngRoute','egCoreMod'])
 /**
  * */
 .controller('PatronRegCtrl',
-       ['$scope','$routeParams','$location','$filter','egCore',
-function($scope , $routeParams , $location , $filter , egCore) {
+       ['$scope','$routeParams','$location','egCore',
+function($scope , $routeParams , $location , egCore) {
     
 
     var url = $location.absUrl().replace(/\/staff.*/, '/actor/user/register');
diff --git a/Open-ILS/web/js/ui/default/staff/services/lframe.js b/Open-ILS/web/js/ui/default/staff/services/eframe.js
similarity index 65%
rename from Open-ILS/web/js/ui/default/staff/services/lframe.js
rename to Open-ILS/web/js/ui/default/staff/services/eframe.js
index 26adcdd19a..fa5207ec20 100644
--- a/Open-ILS/web/js/ui/default/staff/services/lframe.js
+++ b/Open-ILS/web/js/ui/default/staff/services/eframe.js
@@ -1,14 +1,14 @@
 angular.module('egCoreMod')
 
 /*
- * Iframe container for legacy embedded interfaces
+ * Iframe container for (mostly legacy) embedded interfaces
  */
-.directive('egLegacyFrame', function() {
+.directive('egEmbedFrame', function() {
     return {
         restrict : 'AE',
         replace : true,
         scope : {
-            // URL to load in the legacy iframe
+            // URL to load in the embed iframe
             url : '=',
 
             // optional hash of functions which augment or override 
@@ -16,8 +16,8 @@ angular.module('egCoreMod')
             handlers : '='
         },
 
-        template : '<iframe src="{{url}}" onload="egLegacyFrameLoader(this)" '
-            + 'class="eg-legacy-frame" style="height:{{height}}px"></iframe>',
+        template : '<iframe src="{{url}}" onload="egEmbedFrameLoader(this)" '
+            + 'class="eg-embed-frame" style="height:{{height}}px"></iframe>',
 
         controller : 
                    ['$scope','$window','$location','egCore',
@@ -27,31 +27,55 @@ angular.module('egCoreMod')
             // leave room for the navbar, padding, margins, etc.
             $scope.height = $window.outerHeight - 250;
 
+            // browser client doesn't use cookies, so we don't load the
+            // (at the time of writing, quite limited) angular.cookies
+            // module.  We could load something, but this seems to work
+            // well enough for setting the auth cookie (at least, until 
+            // it doesn't).
+            //
+            // note: document.cookie is smart enough to leave unreferenced
+            // cookies alone, so contrary to how this might look, it's not 
+            // deleting other cookies (anoncache, etc.)
+            
+            // delete any existing ses cookie
+            $window.document.cookie = "ses=; path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT";
+            // push our authtoken in
+            $window.document.cookie = 'ses=' + egCore.auth.token() + '; path=/; secure'
+
             // $location has functions for modifying paths and search,
             // but they all assume you are staying within the angular
             // app, which we are not.  Build the URLs by hand.
             function open_tab(path) {
                 var url = 'https://' + $window.location.hostname + 
                     egCore.env.basePath + path;
-                console.debug('egLegacyFrame opening tab ' + url);
+                console.debug('egEmbedFrame opening tab ' + url);
                 $window.open(url, '_blank').focus();
             }
 
             // define our own xulG functions to be inserted into the
             // iframe.  NOTE: window-level functions are bad.  Though
             // there is probably a way, I was unable to correctly wire
-            // upda the iframe onload handler within the 
-            // way.  In any event, the code below is meant as a stop-gap
+            // up the iframe onload handler within the controller or link
+            // funcs.  In any event, the code below is meant as a stop-gap
             // for porting dojo, etc. apps to angular apps and should
             // eventually go away.
-            $window.egLegacyFrameLoader = function(iframe) {
+            // NOTE: catalog integration is not a stop-gap
+            $window.egEmbedFrameLoader = function(iframe) {
+
+                console.debug('egEmbedFrameLoader()...');
 
                 // tell the iframe'd window its inside the staff client
                 iframe.contentWindow.IAMXUL = true;
 
                 // also tell it it's inside the browser client, which 
                 // may be needed in a few special cases.
-                iframe.contentWindow.IAMBROWSER = true;
+                iframe.contentWindow.IAMBROWSER /* hear me roar */ = true; 
+
+                // XUL has a dump() function which is occasinally called 
+                // from embedded browsers.
+                iframe.contentWindow.dump = function(msg) {
+                    console.debug('egEmbedFrame:dump(): ' + msg);
+                }
 
                 // define a few commonly used stock xulG handlers. 
                 
-- 
2.11.0