Merge pull request #1 from aspnetboilerplate/abp-ng-module

hikalkan · hikalkan · commit 94ea918db6d8 · 2014-06-15T20:23:15.000+03:00
Abp ng module merged
diff --git a/SimpleTaskSystemSPA_AngularJs_EntityFramework/SimpleTaskSystem.Web/Abp/Framework/scripts/abp.js b/SimpleTaskSystemSPA_AngularJs_EntityFramework/SimpleTaskSystem.Web/Abp/Framework/scripts/abp.js
@@ -1,13 +1,32 @@
 ﻿var abp = abp || {};
 (function () {
 
+    /* Application paths *****************************************/
+
+    //Current application root path (including virtual directory if exists).
+    abp.appPath = abp.appPath || '/';
+
+    //Converts given path to absolute path using abp.appPath variable.
+    abp.toAbsAppPath = function (path) {
+        if (path.indexOf('/') == 0) {
+            path = path.substring(1);
+        }
+
+        return abp.appPath + path;
+    };
+
     /* LOCALIZATON ***********************************************/
     //Implements Localization API that simplifies usage of localization scripts generated by Abp.
 
     abp.localization = abp.localization || {};
 
+    abp.localization.defaultSourceName = undefined;
+
     abp.localization.localize = function (key, sourceName) {
+        sourceName = sourceName || abp.localization.defaultSourceName;
+
         var source = abp.localization.values[sourceName];
+
         if (source == undefined) {
             abp.log.warn('Could not find localization source: ' + sourceName);
             return key;
@@ -248,5 +267,13 @@
 
         return str;
     };
+    
+    function endsWith(str, suffix) {
+        if (suffix.length > str.length) {
+            return false;
+        }
+
+        return str.indexOf(suffix, str.length - suffix.length) !== -1;
+    }
 
 })();
diff --git a/SimpleTaskSystemSPA_AngularJs_EntityFramework/SimpleTaskSystem.Web/Abp/Framework/scripts/libs/abp.spin.js b/SimpleTaskSystemSPA_AngularJs_EntityFramework/SimpleTaskSystem.Web/Abp/Framework/scripts/libs/abp.spin.js
@@ -55,10 +55,16 @@
             }
         }
 
-        if (options.promise) {
-            options.promise.always(function () {
-                abp.ui.clearBusy(elm);
-            });
+        if (options.promise) { //Supports Q and jQuery.Deferred
+            if (options.promise.always) {
+                options.promise.always(function () {
+                    abp.ui.clearBusy(elm);
+                });
+            } else if (options.promise.finally) {
+                options.promise.finally(function () {
+                    abp.ui.clearBusy(elm);
+                });
+            }
         }
     };
 
diff --git a/SimpleTaskSystemSPA_AngularJs_EntityFramework/SimpleTaskSystem.Web/Abp/Framework/scripts/libs/angular/abp.ng.js b/SimpleTaskSystemSPA_AngularJs_EntityFramework/SimpleTaskSystem.Web/Abp/Framework/scripts/libs/angular/abp.ng.js
@@ -1,27 +1,76 @@
-﻿var abp = abp || {};
-(function (angular) {
+﻿(function (abp, angular) {
 
     if (!angular) {
         return;
     }
 
-    // 'abp' module ///////////////////////////////////////////////////////////
-
     var abpModule = angular.module('abp', []);
 
-    abpModule.factory('services.tasksystem.task', ['$http', function ($http) {
-        return new function() {
-            this.getTasks = abp.services.tasksystem.task.getTasks;
-
-            //Working on this code!
-            //this.getTasks = function(input) {
-            //    return $http({
-            //        url: '/api/services/tasksystem/task/GetTasks',
-            //        method: 'POST',
-            //        data: JSON.stringify(input)
-            //    });
-            //};
-        };
-    }]);
-
-})(angular || undefined);
+    abpModule.config([
+        '$httpProvider', function ($httpProvider) {
+            $httpProvider.interceptors.push(function ($q) {
+
+                var defaultError = {
+                    message: 'Ajax request is not succeed!',
+                    details: 'Error detail is not sent by server.'
+                };
+
+                return {
+
+                    'request': function (config) {
+                        if (endsWith(config.url, '.cshtml')) {
+                            config.url = abp.appPath + 'AbpAppView/Load?viewUrl=' + config.url;
+                        }
+
+                        return config;
+                    },
+
+                    'response': function (response) {
+                        if (!response.config || !response.config.abp || !response.data) {
+                            return response;
+                        }
+
+                        var originalData = response.data;
+                        var defer = $q.defer();
+
+                        if (originalData.success === true) {
+                            response.data = originalData.result;
+                            defer.resolve(response);
+                        } else { //data.success === false
+                            if (originalData.error) {
+                                abp.message.error(originalData.error.message);
+                            } else {
+                                originalData.error = defaultError;
+                            }
+
+                            abp.log.error(originalData.error.message + ' | ' + originalData.error.details);
+
+                            response.data = originalData.error;
+                            defer.reject(response);
+
+                            if (originalData.unAuthorizedRequest && !originalData.targetUrl) {
+                                location.reload();
+                            }
+                        }
+
+                        if (originalData.targetUrl) {
+                            location.href = originalData.targetUrl;
+                        }
+
+                        return defer.promise;
+                    }
+
+                };
+            });
+        }
+    ]);
+
+    function endsWith(str, suffix) {
+        if (suffix.length > str.length) {
+            return false;
+        }
+
+        return str.indexOf(suffix, str.length - suffix.length) !== -1;
+    }
+
+})((abp || (abp = {})), (angular || undefined));
diff --git a/SimpleTaskSystemSPA_AngularJs_EntityFramework/SimpleTaskSystem.Web/App/Main/app.js b/SimpleTaskSystemSPA_AngularJs_EntityFramework/SimpleTaskSystem.Web/App/Main/app.js
@@ -1,10 +1,6 @@
 ﻿(function () {
     'use strict';
 
-    var getViewUrl = function (path) {
-        return '/AbpAppView/Load?viewUrl=/App/Main/views/' + path + '.cshtml';
-    };
-
     var app = angular.module('app', [
         'ngAnimate',
         'ngRoute',
@@ -21,16 +17,16 @@
     function getRoutes() {
         return [
             {
-                url: '/', //default: /task/new
+                url: '/', //default: /task/list
                 config: {
-                    templateUrl: getViewUrl('task/list'),
+                    templateUrl: '/App/Main/views/task/list.cshtml',
                     menuItem: 'TaskList'
                 }
             },
             {
                 url: '/task/new',
                 config: {
-                    templateUrl: getViewUrl('task/new'),
+                    templateUrl: '/App/Main/views/task/new.cshtml',
                     menuItem: 'NewTask'
                 }
             }
@@ -44,7 +40,7 @@
             $routeProvider.when(r.url, r.config);
         });
 
-        $routeProvider.otherwise({ redirectTo: '/' });
+        $routeProvider.otherwise({ redirectTo: abp.appPath });
     }
 
     app.run(['$rootScope', '$location', '$routeParams', '$route', function ($rootScope, $location, $routeParams, $route) {
diff --git a/SimpleTaskSystemSPA_AngularJs_EntityFramework/SimpleTaskSystem.Web/App/Main/views/task/list.js b/SimpleTaskSystemSPA_AngularJs_EntityFramework/SimpleTaskSystem.Web/App/Main/views/task/list.js
@@ -2,7 +2,7 @@
     var controllerId = 'sts.controllers.views.task.list';
     var app = angular.module('app');
 
-    app.controller(controllerId, ['$scope', 'services.tasksystem.task', function ($scope, taskService) {
+    app.controller(controllerId, ['$scope', 'abp.services.tasksystem.task', function ($scope, taskService) {
         var vm = this;
 
         vm.tasks = [];
@@ -18,10 +18,8 @@
         vm.refreshTasks = function () {
             taskService.getTasks({
                 state: $scope.selectedTaskState > 0 ? $scope.selectedTaskState : null
-            }).done(function (data) {
-                $scope.$apply(function() {
-                    vm.tasks = data.tasks;
-                });
+            }).success(function (data) {
+                vm.tasks = data.tasks;
             });
         };
 
@@ -33,22 +31,17 @@
                 newState = 1;
             }
 
-            abp.services.tasksystem.task.updateTask({
+            taskService.updateTask({
                 taskId: task.id,
                 state: newState
-            }).done(function () {
-                $scope.$apply(function () {
-                    task.state = newState;
-                });
-
+            }).success(function () {
+                task.state = newState;
                 abp.notify.info(vm.localize('TaskUpdatedMessage'));
             });
         };
 
         vm.getTaskCountText = function () {
             return abp.utils.formatString(vm.localize('Xtasks'), vm.tasks.length);
         };
-
-        vm.refreshTasks();
     }]);
 })();
diff --git a/SimpleTaskSystemSPA_AngularJs_EntityFramework/SimpleTaskSystem.Web/App/Main/views/task/new.cshtml b/SimpleTaskSystemSPA_AngularJs_EntityFramework/SimpleTaskSystem.Web/App/Main/views/task/new.cshtml
@@ -1,5 +1,5 @@
 ﻿<div ng-controller="sts.controllers.views.task.new as vm">
-    <form role="form" name="newTaskForm" novalidate>
+    <form id="NewTaskForm" role="form" name="newTaskForm" novalidate>
         <div class="form-group">
             <label for="TaskDescription">@L("TaskDescription")</label>
             <textarea id="TaskDescription" ng-model="vm.task.description" class="form-control" rows="3" placeholder="@L("EnterDescriptionHere")" required></textarea>
diff --git a/SimpleTaskSystemSPA_AngularJs_EntityFramework/SimpleTaskSystem.Web/App/Main/views/task/new.js b/SimpleTaskSystemSPA_AngularJs_EntityFramework/SimpleTaskSystem.Web/App/Main/views/task/new.js
@@ -1,35 +1,34 @@
-﻿(function () {
+﻿(function() {
     var controllerId = 'sts.controllers.views.task.new';
     var app = angular.module('app');
-    app.controller(controllerId, ['$scope', '$location', function ($scope, $location) {
-        var vm = this;
+    app.controller(controllerId, [
+        '$scope', '$location', 'abp.services.tasksystem.task', 'abp.services.tasksystem.person',
+        function($scope, $location, taskService, personService) {
+            var vm = this;
 
-        vm.task = {
-            description: '',
-            assignedPersonId: null
-        };
+            vm.task = {
+                description: '',
+                assignedPersonId: null
+            };
 
-        var localize = abp.localization.getSource('SimpleTaskSystem');
+            var localize = abp.localization.getSource('SimpleTaskSystem');
 
-        vm.people = []; //TODO: Move Person combo to a directive
+            vm.people = []; //TODO: Move Person combo to a directive?
 
-        abp.services.tasksystem.person.getAllPeople({}).done(function (data) {
-            $scope.$apply(function () {
+            personService.getAllPeople().success(function(data) {
                 vm.people = data.people;
             });
-        });
 
-        vm.saveTask = function () {
-            abp.ui.setBusy($('#NewTaskForm'), {
-                promise: abp.services.tasksystem.task.createTask(vm.task)
-                    .done(function () {
-                        abp.notify.info(abp.utils.formatString(localize("TaskCreatedMessage"), vm.task.description));
-                        $scope.$apply(function () {
+            vm.saveTask = function() {
+                abp.ui.setBusy(null, {
+                    promise: taskService.createTask(vm.task)
+                        .success(function() {
+                            abp.notify.info(abp.utils.formatString(localize("TaskCreatedMessage"), vm.task.description));
                             $location.path('/'); //TODO: Look for a better way!
-                        });                           
-                    })
-            });
-        };
+                        })
+                });
+            };
 
-    }]);
+        }
+    ]);
 })();
diff --git a/SimpleTaskSystemSPA_AngularJs_EntityFramework/SimpleTaskSystem.Web/Views/Home/Index.cshtml b/SimpleTaskSystemSPA_AngularJs_EntityFramework/SimpleTaskSystem.Web/Views/Home/Index.cshtml
@@ -16,6 +16,7 @@
     <script src="~/Scripts/angular-ui/ui-utils.min.js"></script>
     
     <script src="~/Abp/Framework/scripts/libs/angular/abp.ng.js"></script>
+    <script src="~/api/AbpServiceProxies/GetAll?type=angular"></script>
 
     <script src="~/App/Main/app.js"></script>
     
diff --git a/SimpleTaskSystemSPA_AngularJs_EntityFramework/SimpleTaskSystem.WebApi/SimpleTaskSystem.WebApi.csproj b/SimpleTaskSystemSPA_AngularJs_EntityFramework/SimpleTaskSystem.WebApi/SimpleTaskSystem.WebApi.csproj
@@ -44,7 +44,7 @@
     </Reference>
     <Reference Include="Abp.Web.Api, Version=0.2.2.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Abp.Web.Api.0.2.2.1\lib\net451\Abp.Web.Api.dll</HintPath>
+      <HintPath>..\..\..\aspnetboilerplate\src\Abp\Framework\Abp.Web.Api\bin\Release\Abp.Web.Api.dll</HintPath>
     </Reference>
     <Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/SimpleTaskSystemSPA_AngularJs_EntityFramework/SimpleTaskSystem.WebApi/packages.config b/SimpleTaskSystemSPA_AngularJs_EntityFramework/SimpleTaskSystem.WebApi/packages.config
@@ -3,7 +3,6 @@
   <package id="Abp" version="0.2.2.1" targetFramework="net451" />
   <package id="Abp.Application" version="0.2.2.1" targetFramework="net451" />
   <package id="Abp.Web" version="0.2.2.1" targetFramework="net451" />
-  <package id="Abp.Web.Api" version="0.2.2.1" targetFramework="net451" />
   <package id="Castle.Core" version="3.3.0" targetFramework="net451" />
   <package id="Castle.Core-log4net" version="3.3.0" targetFramework="net451" />
   <package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net451" />

Original file line number	Diff line number	Diff line change
`@@ -55,10 +55,16 @@`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`58`		`- if (options.promise) {`
`59`		`- options.promise.always(function () {`
`60`		`- abp.ui.clearBusy(elm);`
`61`		`- });`
	`58`	`+ if (options.promise) { //Supports Q and jQuery.Deferred`
	`59`	`+ if (options.promise.always) {`
	`60`	`+ options.promise.always(function () {`
	`61`	`+ abp.ui.clearBusy(elm);`
	`62`	`+ });`
	`63`	`+ } else if (options.promise.finally) {`
	`64`	`+ options.promise.finally(function () {`
	`65`	`+ abp.ui.clearBusy(elm);`
	`66`	`+ });`
	`67`	`+ }`
`62`	`68`	`}`
`63`	`69`	`};`
`64`	`70`