From 00a47bd49448e54baaee2eba96140cb2e8c51011 Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@equinoxOLI.org>
Date: Mon, 2 Aug 2021 18:34:02 -0400
Subject: [PATCH] staff portal: default to Angular portal

TODO: avoid flashing AngularJS portal when logging in from the AngularJS page

Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
---
 Open-ILS/src/eg2/src/app/staff/login.component.ts |  7 ++-----
 Open-ILS/src/eg2/src/app/staff/nav.component.html |  2 +-
 Open-ILS/src/templates/staff/navbar.tt2           |  2 +-
 Open-ILS/web/js/ui/default/staff/app.js           | 16 ++--------------
 Open-ILS/web/js/ui/default/staff/services/auth.js |  2 +-
 5 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/login.component.ts b/Open-ILS/src/eg2/src/app/staff/login.component.ts
index 207c525bdf..d1acd5d7e0 100644
--- a/Open-ILS/src/eg2/src/app/staff/login.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/login.component.ts
@@ -94,11 +94,8 @@ export class StaffLoginComponent implements OnInit {
                         // Force reload of the app after a successful login.
                         // This allows the route resolver to re-run with a
                         // valid auth token and workstation.
-
-                        // Temporarily redirect to AngularJS splash page
-                        // (LP#1848550/LP#1835128)
-                        window.location.href = '/eg/staff/splash';
-                            // this.ngLocation.prepareExternalUrl(url);
+                        window.location.href =
+                            this.ngLocation.prepareExternalUrl(url);
 
                     });
                 }
diff --git a/Open-ILS/src/eg2/src/app/staff/nav.component.html b/Open-ILS/src/eg2/src/app/staff/nav.component.html
index bd57834dbd..ccf652daa0 100644
--- a/Open-ILS/src/eg2/src/app/staff/nav.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/nav.component.html
@@ -3,7 +3,7 @@
     <div class="navbar-nav">
       <div class="nav-item">
         <a i18n class="nav-link with-material-icon" 
-          href="/eg/staff/"
+          href="/eg2/staff/"
           egAccessKey keyCtx="navbar" i18n-keySpec i18n-keyDesc
           keySpec="alt+h" keyDesc="Navigate Home">
           <span class="material-icons">home</span>
diff --git a/Open-ILS/src/templates/staff/navbar.tt2 b/Open-ILS/src/templates/staff/navbar.tt2
index 5daf52d401..2ed58e404e 100644
--- a/Open-ILS/src/templates/staff/navbar.tt2
+++ b/Open-ILS/src/templates/staff/navbar.tt2
@@ -25,7 +25,7 @@
 
   <div class="navbar-collapse collapse" ng-class="!navCollapsed && 'in'">
     <ul class="nav navbar-nav">
-      <li><a href='./' title="[% l('Home') %]" target="_self"
+      <li><a href='/eg2/staff/' title="[% l('Home') %]" target="_self"
         class="glyphicon glyphicon-home"></a><li>
 
       <!-- search -->
diff --git a/Open-ILS/web/js/ui/default/staff/app.js b/Open-ILS/web/js/ui/default/staff/app.js
index 58afd0664d..8d78ab7ebd 100644
--- a/Open-ILS/web/js/ui/default/staff/app.js
+++ b/Open-ILS/web/js/ui/default/staff/app.js
@@ -155,20 +155,8 @@ function($routeProvider , $locationProvider) {
  */
 .controller('SplashCtrl', ['$scope', '$window','egCore', 
     function($scope, $window,egCore) {
-		
-    $scope.focus_search = true;
-	
-	egCore.strings.setPageTitle(
-        egCore.strings['PAGE_TITLE_SPLASH']);
-
-    $scope.catalog_search = function($event) {
-        $scope.focus_search = true;
-        if (!$scope.cat_query) return;
-        if ($event && $event.keyCode != 13) return; // input ng-keypress
-        $window.location.href = 
-            '/eg2/staff/catalog/search?query=' +
-            encodeURIComponent($scope.cat_query);
-    }
+
+    $window.location.href = '/eg2/staff/';
 }])
 
 .controller('AboutCtrl', [
diff --git a/Open-ILS/web/js/ui/default/staff/services/auth.js b/Open-ILS/web/js/ui/default/staff/services/auth.js
index 50818e5b34..f60b48d345 100644
--- a/Open-ILS/web/js/ui/default/staff/services/auth.js
+++ b/Open-ILS/web/js/ui/default/staff/services/auth.js
@@ -147,7 +147,7 @@ function($q , $timeout , $rootScope , $window , $location , egNet , egHatch , $i
 
             // NOTE: egEnv also defines basePath, but we cannot import
             // egEnv here becuase it creates a circular reference.
-            $window.location.href = '/eg/staff' + ws_path;
+            $window.location.href = '/eg2/staff' + ws_path;
             deferred.resolve();
         });
     }
-- 
2.11.0