Working on dynamic angular javascript proxy

Author: hikalkan

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);
+                });
+            }
         }
     };
 

SimpleTaskSystemSPA_AngularJs_EntityFramework/SimpleTaskSystem.Web/Abp/Framework/scripts/libs/angular/abp.ng.js

@@ -21,30 +21,31 @@
                             return response;
                         }
 
+                        var originalData = response.data;
                         var defer = $q.defer();
 
-                        if (response.data.success === true) {
-                            response.data = response.data.result;
+                        if (originalData.success === true) {
+                            response.data = originalData.result;
                             defer.resolve(response);
                         } else { //data.success === false
-                            if (response.data.error) {
-                                abp.message.error(response.data.error.message);
+                            if (originalData.error) {
+                                abp.message.error(originalData.error.message);
                             } else {
-                                response.data.error = defaultError;
+                                originalData.error = defaultError;
                             }
 
-                            abp.log.error(response.data.error.message + ' | ' + response.data.error.details);
+                            abp.log.error(originalData.error.message + ' | ' + originalData.error.details);
 
-                            response.data = response.data.error;
+                            response.data = originalData.error;
                             defer.reject(response);
 
-                            if (response.data.unAuthorizedRequest && !response.data.targetUrl) {
+                            if (originalData.unAuthorizedRequest && !originalData.targetUrl) {
                                 location.reload();
                             }
                         }
 
-                        if (response.data.targetUrl) {
-                            location.href = data.targetUrl;
+                        if (originalData.targetUrl) {
+                            location.href = originalData.targetUrl;
                         }
 
                         return defer.promise;
@@ -54,19 +55,4 @@
         }
     ]);
 
-    abpModule.factory('services.tasksystem.task', [
-        '$http', function ($http) {
-            return new function () {
-                this.getTasks = function (input) {
-                    return $http({
-                        url: '/api/services/tasksystem/task/GetTasks',
-                        method: 'POST',
-                        data: JSON.stringify(input),
-                        abp: true
-                    });
-                };
-            };
-        }
-    ]);
-
 })((abp || (abp = {})), (angular || undefined));

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 = [];
@@ -31,14 +31,11 @@
                 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'));
             });
         };

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>

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!
-                        });                           
-                    })
-            });
-        };
+                        })
+                });
+            };
 
-    }]);
+        }
+    ]);
 })();

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>
 

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>

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" />