From 0b1cad7687dfe44718d6957ec896b0c32e6fbb55 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 5 Sep 2013 14:54:40 +1000
Subject: [PATCH] Fixes app.dev to not include ui.sortable. Fixes server vars
 mocks to have an entry for dashboardApiBaseUrl, adds dashboard.mocks to not
 throw an exception when trying access that data.

---
 .gitignore                                    | 10 ++++----
 src/Umbraco.Web.UI.Client/src/app.dev.js      |  2 +-
 .../common/mocks/resources/dashboard.mocks.js | 24 +++++++++++++++++++
 .../src/common/mocks/umbraco.httpbackend.js   |  4 ++--
 .../common/mocks/umbraco.servervariables.js   |  3 ++-
 5 files changed, 34 insertions(+), 9 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/common/mocks/resources/dashboard.mocks.js

diff --git a/.gitignore b/.gitignore
index 62a7c4ff3b..79fd2e30ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -90,12 +90,12 @@ tools/NDepend/
 src/Umbraco.Web.UI/App_Plugins/*
 src/*.psess
 src/*.vspx
-src/Umbraco.Web.UI/umbraco/js/routes.js.*
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js.*
 NDependOut/*
 *.ndproj
 QueryResult.htm
 *.ndproj
-src/Umbraco.Web.UI/umbraco/assets/*
-src/Umbraco.Web.UI/umbraco/lib/*
-src/Umbraco.Web.UI/umbraco/Views/**/*.html
-src/Umbraco.Web.UI/umbraco/Views/**/*.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/*
+src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
diff --git a/src/Umbraco.Web.UI.Client/src/app.dev.js b/src/Umbraco.Web.UI.Client/src/app.dev.js
index 54b6befd02..9a957f8b97 100644
--- a/src/Umbraco.Web.UI.Client/src/app.dev.js
+++ b/src/Umbraco.Web.UI.Client/src/app.dev.js
@@ -6,7 +6,7 @@ var app = angular.module('umbraco', [
 	'umbraco.httpbackend',
     'ngCookies',
     'ngMobile',
-    'ui.sortable',
+    /*'ui.sortable',*/
     'blueimp.fileupload'
 ]);
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/dashboard.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/dashboard.mocks.js
new file mode 100644
index 0000000000..7582db6740
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/dashboard.mocks.js
@@ -0,0 +1,24 @@
+angular.module('umbraco.mocks').
+  factory('dashboardMocks', ['$httpBackend', 'mocksUtils', function ($httpBackend, mocksUtils) {
+      'use strict';
+      
+      function getDashboard(status, data, headers) {
+          //check for existence of a cookie so we can do login/logout in the belle app (ignore for tests).
+          if (!mocksUtils.checkAuth()) {
+              return [401, null, null];
+          }
+          else {
+              //TODO: return real mocked data
+              return [200, [], null];
+          }
+      }
+
+      return {
+          register: function() {
+              
+              $httpBackend
+                  .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Dashboard/GetDashboard'))
+                  .respond(getDashboard);
+          }
+      };
+  }]);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.httpbackend.js b/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.httpbackend.js
index 9f6168d76c..e41e2381e4 100644
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.httpbackend.js
+++ b/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.httpbackend.js
@@ -1,7 +1,7 @@
 var umbracoAppDev = angular.module('umbraco.httpbackend', ['umbraco', 'ngMockE2E', 'umbraco.mocks']);
 
 
-function initBackEnd($httpBackend, contentMocks, mediaMocks, treeMocks, userMocks, contentTypeMocks, sectionMocks, entityMocks, dataTypeMocks) {
+function initBackEnd($httpBackend, contentMocks, mediaMocks, treeMocks, userMocks, contentTypeMocks, sectionMocks, entityMocks, dataTypeMocks, dashboardMocks) {
 
 	console.log("httpBackend inited");
 	
@@ -11,7 +11,7 @@ function initBackEnd($httpBackend, contentMocks, mediaMocks, treeMocks, userMock
     sectionMocks.register();
     treeMocks.register();
     dataTypeMocks.register();
-
+    dashboardMocks.register();
     userMocks.register();
 
     contentTypeMocks.register();
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.servervariables.js b/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.servervariables.js
index 6a59c900e9..e72605bbc9 100644
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.servervariables.js
+++ b/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.servervariables.js
@@ -14,7 +14,8 @@ Umbraco.Sys.ServerVariables = {
         "authenticationApiBaseUrl": "/umbraco/UmbracoApi/Authentication/",
         //For this we'll just provide a file that exists during the mock session since we don't really have legay js tree stuff
         "legacyTreeJs": "/belle/lib/yepnope/empty.js",
-        "entityApiBaseUrl": "/umbraco/UmbracoApi/Entity/"
+        "entityApiBaseUrl": "/umbraco/UmbracoApi/Entity/",
+        "dashboardApiBaseUrl" : "/umbraco/UmbracoApi/Dashboard/"
     },
     umbracoSettings: {
         "umbracoPath": "/umbraco",