Merge pull request #4 from Mavtak/fetch

use window.fetch for API calls
Mavtak · Jan 13, 2018 · 996b1b2 · 996b1b2
2 parents 6714f7a + c57d9a3
commit 996b1b2
Show file tree

Hide file tree

Showing 26 changed files with 194 additions and 109 deletions.
diff --git a/Roomie.Web.Frontend/src/angular/computers.pages/ComputerDetailController/script.js b/Roomie.Web.Frontend/src/angular/computers.pages/ComputerDetailController/script.js
@@ -1,6 +1,6 @@
 function ComputerDetailController(
-  $http,
   $state,
+  api,
   pageMenuItems,
   signInState,
   wholePageStatus
@@ -11,14 +11,15 @@ function ComputerDetailController(
   wholePageStatus.set('loading');
   pageMenuItems.reset();
 
-  $http.post('/api/computer', {
+  api({
+    repository: 'computer',
     action: 'read',
     parameters: {
       id: +$state.params.id
     }
   })
     .then(function (result) {
-      controller.computer = result.data.data;
+      controller.computer = result.data;
 
       signInState.set('signed-in');
       wholePageStatus.set('ready');

diff --git a/Roomie.Web.Frontend/src/angular/computers.pages/ComputerListController/script.js b/Roomie.Web.Frontend/src/angular/computers.pages/ComputerListController/script.js
@@ -1,5 +1,5 @@
 function ComputerListController(
-  $http,
+  api,
   pageMenuItems,
   signInState,
   wholePageStatus
@@ -10,11 +10,12 @@ function ComputerListController(
   wholePageStatus.set('loading');
   pageMenuItems.reset();
 
-  $http.post('/api/computer', {
+  api({
+    repository: 'computer',
     action: 'list'
   })
     .then(function (result) {
-      controller.computers = result.data.data;
+      controller.computers = result.data;
 
       signInState.set('signed-in');
       wholePageStatus.set('ready');

diff --git a/Roomie.Web.Frontend/src/angular/computers/add-computer-widget/script.js b/Roomie.Web.Frontend/src/angular/computers/add-computer-widget/script.js
@@ -1,7 +1,7 @@
 import template from './template.html';
 
 function addComputerWidget(
-  $http
+  api
 ) {
 
   return {
@@ -16,7 +16,8 @@ function addComputerWidget(
     scope.model = {};
 
     function add() {
-      $http.post('/api/computer', {
+      api({
+        repository: 'computer',
         action: 'create',
         parameters: scope.model,
       });

diff --git a/Roomie.Web.Frontend/src/angular/computers/run-script-controls/script.js b/Roomie.Web.Frontend/src/angular/computers/run-script-controls/script.js
@@ -1,7 +1,7 @@
 import template from './template.html';
 
 function runScriptControls(
-  $http
+  api
 ) {
 
   return {
@@ -26,7 +26,8 @@ function runScriptControls(
     });
 
     function runScript() {
-      $http.post('/api/computer', {
+      api({
+        repository: 'computer',
         action: 'runScript',
         parameters: Object.assign({}, {
            id: scope.computer.id

diff --git a/Roomie.Web.Frontend/src/angular/computers/web-hook-controls/script.js b/Roomie.Web.Frontend/src/angular/computers/web-hook-controls/script.js
@@ -1,9 +1,9 @@
 import template from './template.html';
 
 function webHookControls(
-  $http,
   $state,
-  $window
+  $window,
+  api
 ) {
 
   return {
@@ -32,7 +32,8 @@ function webHookControls(
     }
 
     function disable() {
-      $http.post('/api/computer', {
+      api({
+        repository: 'computer',
         action: 'disableWebHook',
         parameters: {
           id: scope.computer.id,
@@ -44,7 +45,8 @@ function webHookControls(
     }
 
     function renew() {
-      $http.post('/api/computer', {
+      api({
+        repository: 'computer',
         action: 'renewWebHookKeys',
         parameters: {
           id: scope.computer.id,

diff --git a/Roomie.Web.Frontend/src/angular/data/ManualPoller/script.js b/Roomie.Web.Frontend/src/angular/data/ManualPoller/script.js
@@ -1,5 +1,5 @@
 function ManualPoller(
-  $http
+  api
 ) {
 
   return ManualPoller;
@@ -11,13 +11,14 @@
     var selectItems = options.itemSelector || defaultItemSelector;
 
     this.run = function () {
-      var result = $http.post('/api/' + repository, {
+      var result = api({
+        repository: repository,
         action: 'list',
         parameters: filter,
       }).then(function (response) {
-        if (response.data.error) {
+        if (response.error) {
           if (processErrors) {
-            return processErrors(response.data.error);
+            return processErrors(response.error);
           } else {
             return;
           }
@@ -33,7 +34,7 @@
     };
 
     function selectHttpBody(response) {
-      return response.data.data;
+      return response.data;
     }
 
     function defaultItemSelector(page) {

diff --git a/Roomie.Web.Frontend/src/angular/data/ManualPoller/test.spec.js b/Roomie.Web.Frontend/src/angular/data/ManualPoller/test.spec.js
@@ -1,35 +1,43 @@
 describe('angular roomie.data ManualPoller (factory)', function () {
 
-  var $httpBackend;
+  var $q;
+  var $timeout;
+  var api;
   var ManualPoller;
   var items;
 
   beforeEach(angular.mock.module('roomie.data'));
+
+  beforeEach(angular.mock.module(function ($provide) {
+    api = jasmine.createSpy('api');
+
+    $provide.value('api', api);
+  }));
 
   beforeEach(angular.mock.inject(function ($injector) {
-    $httpBackend = $injector.get('$httpBackend');
+    $q = $injector.get('$q');
+    $timeout = $injector.get('$timeout');
     ManualPoller = $injector.get('ManualPoller');
   }));
 
   beforeEach(function () {
+    api.and.returnValue($q.when({}));
+
     items = [];
   });
 
-  it('POSTs the provided resource', function () {
+  it('submits the API request', function () {
     var manualPoller = new ManualPoller({
       repository: 'derp'
     });
 
-    $httpBackend.when('POST', '/api/derp')
-      .respond({
-        data: {}
-      });
-
-    $httpBackend.expectPOST('/api/derp');
-
     manualPoller.run();
 
-    $httpBackend.flush();
+    expect(api).toHaveBeenCalledWith({
+      repository: 'derp',
+      action: 'list',
+      parameters: undefined,
+    })
   });
 
   describe('item selection', function () {
@@ -40,20 +48,19 @@
         repository: 'derp'
       });
 
-      $httpBackend.when('POST', '/api/derp')
-        .respond({
-          data: {
-            items: [{ id: 'a' }, { id: 'b' }],
-          }
-        });
+      api.and.returnValue($q.when({
+        data: {
+          items: [{ id: 'a' }, { id: 'b' }],
+        }
+      }));
 
       manualPoller.run().then(function (x) {
         actual = x;
       });
 
-      $httpBackend.flush();
+      $timeout.flush();
 
-      expect(actual).toEqual([{ id: 'a' }, { id: 'b' }]);
+      expect(actual).toEqual([{ id: 'a' }, { id: 'b' }]);      
     });
 
     it('selects the items property with an optional override when provided.', function () {
@@ -65,16 +72,15 @@
         }
       });
 
-      $httpBackend.when('POST', '/api/derp')
-        .respond({
-          data: [{ id: 'a' }, { id: 'b' }],
-        });
+      api.and.returnValue($q.when({
+        data: [{ id: 'a' }, { id: 'b' }],
+      }));
 
       manualPoller.run().then(function (x) {
         actual = x;
       });
 
-      $httpBackend.flush();
+      $timeout.flush();
 
       expect(actual).toEqual([{ id: 'a' }, { id: 'b' }]);
     });
@@ -85,12 +91,11 @@
     var theError;
 
     beforeEach(function () {
-      $httpBackend.when('POST', '/api/derp')
-        .respond(200, {
-            error: {
-              something: 'a message maybe'
-            }
-        });
+      api.and.returnValue($q.when({
+        error: {
+          something: 'a message maybe'
+        }
+      }));
     });
 
     describe('when the processErrors option is not set', function () {
@@ -102,7 +107,7 @@
 
           manualPoller.run()
 
-          $httpBackend.flush();
+          $timeout.flush();
       });
 
     });
@@ -119,7 +124,7 @@
 
         manualPoller.run();
 
-        $httpBackend.flush();
+        $timeout.flush();
 
         expect(processErrors.calls.count()).toEqual(1);
         expect(processErrors.calls.mostRecent().args[0]).toEqual({

diff --git a/Roomie.Web.Frontend/src/angular/data/api/index.js b/Roomie.Web.Frontend/src/angular/data/api/index.js
@@ -0,0 +1,7 @@
+import script from './script.js';
+
+export default {
+  type: 'factory',
+  name: script.name,
+  value: script,
+};
diff --git a/Roomie.Web.Frontend/src/angular/data/api/script.js b/Roomie.Web.Frontend/src/angular/data/api/script.js
@@ -0,0 +1,14 @@
+import commonApi from '../../../api.js';
+
+function api(
+  $q
+) {
+  return function (request) {
+    let result = commonApi(request);
+    let wrappedResult = $q.when(result);
+
+    return wrappedResult;
+  }
+}
+
+export default api;
diff --git a/Roomie.Web.Frontend/src/angular/data/module.js b/Roomie.Web.Frontend/src/angular/data/module.js
@@ -1,4 +1,5 @@
 import defineModule from '../defineModule.js';
+import api from './api/index.js';
 import AutomaticPollingUpdater from './AutomaticPollingUpdater/index.js';
 import deviceTypes from './deviceTypes/index.js';
 import ManualPoller from './ManualPoller/index.js';
@@ -8,6 +9,7 @@ import ManualUpdater from './ManualUpdater/index.js';
 let module = defineModule({
   name: 'roomie.data',
   definitions: [
+    api,
     AutomaticPollingUpdater,
     deviceTypes,
     ManualPoller,

diff --git a/Roomie.Web.Frontend/src/angular/devices.data/deviceUtilities/script.js b/Roomie.Web.Frontend/src/angular/devices.data/deviceUtilities/script.js
@@ -1,5 +1,5 @@
 function deviceUtilities(
-  $http
+  api
 ) {
 
   return new DeviceUtilities();
@@ -21,7 +21,8 @@ function deviceUtilities(
     }
 
     function doAction(device, action, args) {
-      $http.post('/api/device', {
+      api({
+        repository: 'device',
         action: action,
         parameters: Object.assign({
           id: device.id,