MUMUP-2898 Widget Fixes

uPortal-Attic · Apr 11, 2017 · 730e8cd · 730e8cd
1 parent 6060fb9
commit 730e8cd
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/uw-frame-components/js/app-config.js b/uw-frame-components/js/app-config.js
@@ -22,7 +22,7 @@ define(['angular'], function(angular) {
             'shibbolethSessionURL' : null, //'/Shibboleth.sso/Session.json'
             'portalLayoutRestEndpoint' : null, //'/portal/api/layout',
             'widgetApi': {
-              'entry': '/portal/api/marketplace/entry/', // For local testing, change to 'staticFeeds/'
+              'entry': '/portal/api/portlet/', // For local testing, change to 'staticFeeds/'
               'entries': '/portal/api/marketplace/entries.json'
             }
         })

diff --git a/uw-frame-components/portal/widgets/controllers.js b/uw-frame-components/portal/widgets/controllers.js
@@ -39,7 +39,7 @@ define(['angular'], function(angular) {
     /**
      * Initial widget setup -- gets data for a single widget from the provided fname attribute
      */
-    var initializeWidget = function(fname) {
+    var initializeWidget = function(fname, unremovable) {
       // Initialize scope variables
       $scope.widget = {};
       $scope.widgetType = '';
@@ -54,6 +54,7 @@ define(['angular'], function(angular) {
           if (data) {
             $scope.widget = data;
             $scope.widgetType = widgetType(data);
+            $scope.cantRemove = unremovable;
           }
         })
         .catch(function(error) {
@@ -83,7 +84,7 @@ define(['angular'], function(angular) {
 
     // Initialize the widget
     if ($scope.fname) {
-      initializeWidget($scope.fname);
+      initializeWidget($scope.fname, $scope.unremovable);
     } else {
       $log.warn('WidgetCardController didn\'t get an fname.');
     }

diff --git a/uw-frame-components/portal/widgets/directives.js b/uw-frame-components/portal/widgets/directives.js
@@ -11,7 +11,8 @@ define(['angular', 'require'], function(angular, require) {
     return {
       restrict: 'E',
       scope: {
-        fname: '@'
+        fname: '@',
+        unremovable : '=?',
       },
       templateUrl: require.toUrl('./partials/widget-card.html'),
       controller: 'WidgetCardController'

diff --git a/uw-frame-components/portal/widgets/partials/type__option-link.html b/uw-frame-components/portal/widgets/partials/type__option-link.html
@@ -3,7 +3,7 @@
   <!-- OPTION-LINK ICON -->
   <div class="option-link-icon">
     <a href="{{ widget.selectedUrl }}" target="_blank" rel="noopener noreferrer">
-      <frame-widget-icon></frame-widget-icon>
+      <widget-icon></widget-icon>
     </a>
   </div>
 

diff --git a/uw-frame-components/portal/widgets/partials/widget-card.html b/uw-frame-components/portal/widgets/partials/widget-card.html
@@ -70,7 +70,7 @@
       <div ng-switch-when="basic">
         <a tabindex="-1" ng-href="{{ renderUrl() }}" target="{{ widget.target }}" class="basic-widget" rel="noopener noreferrer">
           <div class="widget-icon-container" layout="column" layout-align="center center">
-            <frame-widget-icon></frame-widget-icon>
+            <widget-icon></widget-icon>
           </div>
         </a>
         <launch-button data-href="{{ renderUrl() }}"

diff --git a/uw-frame-components/portal/widgets/services.js b/uw-frame-components/portal/widgets/services.js
@@ -14,8 +14,8 @@ define(['angular'], function(angular) {
     var getSingleWidgetData = function getSingleWidgetData(fname) {
       return $http.get(SERVICE_LOC.widgetApi.entry + fname + '.json')
         .then(function(result) {
-          if (result.data.entry.layoutObject != undefined) {
-            return result.data.entry.layoutObject;
+          if (result.data.portlet != undefined) {
+            return result.data.portlet;
           }
         })
         .catch(function(error) {